gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

it always bothered me that this key was called 'colon' when it's clearly a (single-)quote

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-09-09 16:20:52 +02:00
parent b6a0d94577
commit dc74c49351
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/emulator.h
View file

@ -38,7 +38,7 @@
#define HPKEY_UP 10 #define HPKEY_UP 10
#define HPKEY_NXT 11 #define HPKEY_NXT 11
#define HPKEY_COLON 12 #define HPKEY_QUOTE 12
#define HPKEY_STO 13 #define HPKEY_STO 13
#define HPKEY_EVAL 14 #define HPKEY_EVAL 14
#define HPKEY_LEFT 15 #define HPKEY_LEFT 15

16
src/ui.c
View file

@ -742,7 +742,7 @@ button_t buttons_sx[ NB_KEYS ] = {
.right = 0, .right = 0,
.sub = 0 }, .sub = 0 },
{.name = "COLON", {.name = "QUOTE",
.x = 0, .x = 0,
.y = 100, .y = 100,
.w = 36, .w = 36,
@ -750,9 +750,9 @@ button_t buttons_sx[ NB_KEYS ] = {
.lc = WHITE, .lc = WHITE,
.label = 0, .label = 0,
.font_size = 0, .font_size = 0,
.lw = colon_width, .lw = quote_width,
.lh = colon_height, .lh = quote_height,
.lb = colon_bitmap, .lb = quote_bitmap,
.letter = "M", .letter = "M",
.left = "UP", .left = "UP",
.is_menu = 0, .is_menu = 0,
@ -1537,7 +1537,7 @@ button_t buttons_gx[ NB_KEYS ] = {
.right = "MENU", .right = "MENU",
.sub = 0 }, .sub = 0 },
{.name = "COLON", {.name = "QUOTE",
.x = 0, .x = 0,
.y = 100, .y = 100,
.w = 36, .w = 36,
@ -1545,9 +1545,9 @@ button_t buttons_gx[ NB_KEYS ] = {
.lc = WHITE, .lc = WHITE,
.label = 0, .label = 0,
.font_size = 0, .font_size = 0,
.lw = colon_width, .lw = quote_width,
.lh = colon_height, .lh = quote_height,
.lb = colon_bitmap, .lb = quote_bitmap,
.letter = "M", .letter = "M",
.left = "UP", .left = "UP",
.is_menu = 0, .is_menu = 0,

6
src/ui_inner.h
View file

@ -297,9 +297,9 @@ static unsigned char minus_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
static unsigned char plus_bitmap[] = { 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0xff, 0x03, static unsigned char plus_bitmap[] = { 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0xff, 0x03,
0xff, 0x03, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00 }; 0xff, 0x03, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00 };
#define colon_width 2 #define quote_width 2
#define colon_height 10 #define quote_height 10
static unsigned char colon_bitmap[] = { 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static unsigned char quote_bitmap[] = { 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
/* Below used only for X11 */ /* Below used only for X11 */
#define last_width 120 #define last_width 120

2
src/ui_sdl2.c
View file

@ -298,7 +298,7 @@ static int sdlkey_to_hpkey( SDL_Keycode k )
case SDLK_l: case SDLK_l:
return HPKEY_NXT; return HPKEY_NXT;
case SDLK_m: case SDLK_m:
return HPKEY_COLON; return HPKEY_QUOTE;
case SDLK_n: case SDLK_n:
return HPKEY_STO; return HPKEY_STO;
case SDLK_o: case SDLK_o:

2
src/ui_text.c
View file

@ -439,7 +439,7 @@ void text_get_event( void )
hpkey = HPKEY_NXT; hpkey = HPKEY_NXT;
break; break;
case 'm': case 'm':
hpkey = HPKEY_COLON; hpkey = HPKEY_QUOTE;
break; break;
case 'n': case 'n':
hpkey = HPKEY_STO; hpkey = HPKEY_STO;

6
src/ui_x11.c
View file

@ -1992,7 +1992,7 @@ static void decode_key( XEvent* xev, KeySym sym, char* buf, int buflen )
break; break;
case XK_m: case XK_m:
case XK_M: case XK_M:
key_event( HPKEY_COLON, xev ); key_event( HPKEY_QUOTE, xev );
break; break;
case XK_n: case XK_n:
case XK_N: case XK_N:
@ -2638,7 +2638,7 @@ void x11_get_event( void )
paste[ paste_size++ ] = HPKEY_RIGHT; paste[ paste_size++ ] = HPKEY_RIGHT;
} else { } else {
flag |= 4; flag |= 4;
paste[ paste_size++ ] = HPKEY_COLON; paste[ paste_size++ ] = HPKEY_QUOTE;
} }
break; break;
case 'a': case 'a':
@ -2731,7 +2731,7 @@ void x11_get_event( void )
paste[ paste_size++ ] = HPKEY_ALPHA; paste[ paste_size++ ] = HPKEY_ALPHA;
if ( islower( c ) ) if ( islower( c ) )
paste[ paste_size++ ] = HPKEY_SHL; paste[ paste_size++ ] = HPKEY_SHL;
paste[ paste_size++ ] = HPKEY_COLON; paste[ paste_size++ ] = HPKEY_QUOTE;
break; break;
case 'n': case 'n':
case 'N': case 'N':