From aeda6aba55c2fa1318482f4e36212c99be155bf7 Mon Sep 17 00:00:00 2001 From: kub Date: Tue, 4 Feb 2025 21:57:42 +0100 Subject: [PATCH] platform, virtual keyboard improvements --- pico/sms.c | 2 +- platform/common/emu.c | 4 ++-- platform/common/keyboard.c | 18 ++++++++++++------ platform/common/keyboard.h | 2 +- platform/common/menu_pico.c | 9 +++++++-- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/pico/sms.c b/pico/sms.c index 83f021db..6833cfdc 100644 --- a/pico/sms.c +++ b/pico/sms.c @@ -571,7 +571,7 @@ static void z80_sms_out(unsigned short a, unsigned char d) if ((PicoIn.AHW & PAHW_SC) && (a & 0x2) && !(d & 0x80)) { // For SC-3000: 8255 control port. BSR mode used for printer and tape. // debug hack to copy printer data to stdout. - // Printer data is sent at about 4 KBaud, 10 bits per character: + // Printer data is sent at about 4.7 KBaud, 10 bits per character: // start=0, 8 data bits (LSB first), stop=1. data line is inverted. // no Baud tracking needed as all bits are sent through here. static int chr, bit; diff --git a/platform/common/emu.c b/platform/common/emu.c index 8bd90de1..9c6f942c 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -1560,8 +1560,8 @@ static void emu_loop_prep(void) vkbd = NULL; if (currentConfig.keyboard == 2) { - if (PicoIn.AHW & PAHW_SMS) vkbd = &vkbd_sc3000; - else if (PicoIn.AHW & PAHW_PICO) vkbd = &vkbd_pico; + if (PicoIn.AHW & PAHW_SMS) vkbd = vkbd_init(0); + else if (PicoIn.AHW & PAHW_PICO) vkbd = vkbd_init(1); } PicoIn.opt &= ~POPT_EN_KBD; if (((PicoIn.AHW & PAHW_PICO) || (PicoIn.AHW & PAHW_SC)) && currentConfig.keyboard) diff --git a/platform/common/keyboard.c b/platform/common/keyboard.c index 21cab7e8..4719b6b4 100644 --- a/platform/common/keyboard.c +++ b/platform/common/keyboard.c @@ -13,6 +13,8 @@ #include "../libpicofe/plat.h" #include "emu.h" // for menuscreen hack +#define KBD_ROWS 5 + // pico static struct key kbd_pico_row1[] = { { 0, "esc", "esc", PEVB_KBD_ESCAPE }, @@ -90,7 +92,7 @@ static struct key kbd_pico_row5[] = { { 0 }, }; -struct key *kbd_pico[] = +struct key *kbd_pico[KBD_ROWS+1] = { kbd_pico_row1, kbd_pico_row2, kbd_pico_row3, kbd_pico_row4, kbd_pico_row5, NULL }; @@ -174,7 +176,7 @@ static struct key kbd_sc3000_row5[] = { { 0 }, }; -struct key *kbd_sc3000[] = +struct key *kbd_sc3000[KBD_ROWS+1] = { kbd_sc3000_row1, kbd_sc3000_row2, kbd_sc3000_row3, kbd_sc3000_row4, kbd_sc3000_row5, NULL }; @@ -198,6 +200,7 @@ void vkbd_draw(struct vkbd *vkbd) { int i, j, k; struct key *key; + int ypos = (vkbd->top ? 0 : g_screen_height - KBD_ROWS*me_sfont_h); // HACK: smalltext_out is only available on menuscreen :-/ g_menuscreen_ptr = (u16 *)g_screen_ptr; @@ -212,7 +215,7 @@ if (g_screen_width >= 320) { for (i = 0; vkbd->kbd[i]; i++) { // darken background for (j = 0; j < me_sfont_h; j++) { - u16 *p = (u16 *)g_menuscreen_ptr + (i*me_sfont_h+j)*g_menuscreen_pp; + u16 *p = (u16 *)g_menuscreen_ptr + (ypos+i*me_sfont_h+j)*g_menuscreen_pp; for (k = 0; k < g_menuscreen_w; k++) { u16 v = *p; *p++ = PXMASKH(v,1)>>1; @@ -230,7 +233,7 @@ if (g_screen_width >= 320) { PXMAKE(0xa0, 0xa0, 0xa0); char *text = (vkbd->shift ? key->upper : key->lower); int xpos = key->xpos*me_sfont_w * g_menuscreen_w/320; - smalltext_out16(xpos, i*me_sfont_h, text, color); + smalltext_out16(xpos, ypos+i*me_sfont_h, text, color); } } } @@ -259,13 +262,14 @@ int vkbd_update(struct vkbd *vkbd, int input, int *actions) } if (pressed & (1<top = !vkbd->top; + plat_video_clear_buffers(); // if renderer isn't using full screen } if (pressed & (1<shift = !vkbd->shift; } if (pressed & (1<meta[i][0] != -1; i++) if (vkbd->y == vkbd->meta[i][0] && vkbd->x == vkbd->meta[i][1]) vkbd->meta_state = (vkbd->meta_state ^ (1<meta+1, 0, sizeof(*vkbd) - sizeof(vkbd->kbd) - sizeof(vkbd->meta)); + int offs = (u8 *)vkbd->meta - (u8 *)vkbd + sizeof(vkbd->meta); + memset((u8 *)vkbd + offs, 0, sizeof(*vkbd) - offs); + vkbd->top = 1; return vkbd; } diff --git a/platform/common/keyboard.h b/platform/common/keyboard.h index c660aff3..6a66f3ef 100644 --- a/platform/common/keyboard.h +++ b/platform/common/keyboard.h @@ -29,4 +29,4 @@ extern struct vkbd vkbd_sc3000; int vkbd_find_xpos(struct key *keys, int xpos); void vkbd_draw(struct vkbd *vkbd); int vkbd_update(struct vkbd *vkbd, int input, int *actions); - +struct vkbd *vkbd_init(int is_pico); diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index b8092e86..d5b435e7 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -427,11 +427,16 @@ static void kbd_draw(struct key *desc[], int shift, int xoffs, int yoffs, struct int i, j; struct key *key; + if (g_menuscreen_w >= 480) + xoffs -= 50; for (i = 0; desc[i]; i++) { for (j = 0, key = &desc[i][j]; key->lower; j++, key++) { int color = (key != hi ? PXMAKE(0xa0, 0xa0, 0xa0) : PXMAKE(0xff, 0xff, 0xff)); char *text = (shift ? key->upper : key->lower); + if (g_menuscreen_w >= 480) + text_out16_(xoffs + key->xpos*me_mfont_w, yoffs + i*me_mfont_h, text, color); + else smalltext_out16(xoffs + key->xpos*me_sfont_w, yoffs + i*me_sfont_h, text, color); } } @@ -524,11 +529,11 @@ int key_config_kbd_loop(int id, int keys) for (is_down = 1; is_down; ) kc = in_update_keycode(&bind_dev_id, &is_down, NULL, -1); - in_bind_kbd_key(dev, bc, -1); + in_bind_kbd_key(dev, bc, 0); in_bind_kbd_key(bind_dev_id, kc, kbd[keyy][keyx].key); } if (inp & PBTN_MA2) { - in_bind_kbd_key(dev, bc, -1); + in_bind_kbd_key(dev, bc, 0); } } -- 2.39.5