Skip to content

Commit dc74c49

Browse files
it always bothered me that this key was called 'colon' when it's clearly a (single-)quote
1 parent b6a0d94 commit dc74c49

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

src/emulator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#define HPKEY_UP 10
3939
#define HPKEY_NXT 11
4040

41-
#define HPKEY_COLON 12
41+
#define HPKEY_QUOTE 12
4242
#define HPKEY_STO 13
4343
#define HPKEY_EVAL 14
4444
#define HPKEY_LEFT 15

src/ui.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -742,17 +742,17 @@ button_t buttons_sx[ NB_KEYS ] = {
742742
.right = 0,
743743
.sub = 0 },
744744

745-
{.name = "COLON",
745+
{.name = "QUOTE",
746746
.x = 0,
747747
.y = 100,
748748
.w = 36,
749749
.h = 26,
750750
.lc = WHITE,
751751
.label = 0,
752752
.font_size = 0,
753-
.lw = colon_width,
754-
.lh = colon_height,
755-
.lb = colon_bitmap,
753+
.lw = quote_width,
754+
.lh = quote_height,
755+
.lb = quote_bitmap,
756756
.letter = "M",
757757
.left = "UP",
758758
.is_menu = 0,
@@ -1537,17 +1537,17 @@ button_t buttons_gx[ NB_KEYS ] = {
15371537
.right = "MENU",
15381538
.sub = 0 },
15391539

1540-
{.name = "COLON",
1540+
{.name = "QUOTE",
15411541
.x = 0,
15421542
.y = 100,
15431543
.w = 36,
15441544
.h = 26,
15451545
.lc = WHITE,
15461546
.label = 0,
15471547
.font_size = 0,
1548-
.lw = colon_width,
1549-
.lh = colon_height,
1550-
.lb = colon_bitmap,
1548+
.lw = quote_width,
1549+
.lh = quote_height,
1550+
.lb = quote_bitmap,
15511551
.letter = "M",
15521552
.left = "UP",
15531553
.is_menu = 0,

src/ui_inner.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@ static unsigned char minus_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
297297
static unsigned char plus_bitmap[] = { 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0xff, 0x03,
298298
0xff, 0x03, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00 };
299299

300-
#define colon_width 2
301-
#define colon_height 10
302-
static unsigned char colon_bitmap[] = { 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
300+
#define quote_width 2
301+
#define quote_height 10
302+
static unsigned char quote_bitmap[] = { 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
303303

304304
/* Below used only for X11 */
305305
#define last_width 120

src/ui_sdl2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static int sdlkey_to_hpkey( SDL_Keycode k )
298298
case SDLK_l:
299299
return HPKEY_NXT;
300300
case SDLK_m:
301-
return HPKEY_COLON;
301+
return HPKEY_QUOTE;
302302
case SDLK_n:
303303
return HPKEY_STO;
304304
case SDLK_o:

src/ui_text.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ void text_get_event( void )
439439
hpkey = HPKEY_NXT;
440440
break;
441441
case 'm':
442-
hpkey = HPKEY_COLON;
442+
hpkey = HPKEY_QUOTE;
443443
break;
444444
case 'n':
445445
hpkey = HPKEY_STO;

src/ui_x11.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,7 @@ static void decode_key( XEvent* xev, KeySym sym, char* buf, int buflen )
19921992
break;
19931993
case XK_m:
19941994
case XK_M:
1995-
key_event( HPKEY_COLON, xev );
1995+
key_event( HPKEY_QUOTE, xev );
19961996
break;
19971997
case XK_n:
19981998
case XK_N:
@@ -2638,7 +2638,7 @@ void x11_get_event( void )
26382638
paste[ paste_size++ ] = HPKEY_RIGHT;
26392639
} else {
26402640
flag |= 4;
2641-
paste[ paste_size++ ] = HPKEY_COLON;
2641+
paste[ paste_size++ ] = HPKEY_QUOTE;
26422642
}
26432643
break;
26442644
case 'a':
@@ -2731,7 +2731,7 @@ void x11_get_event( void )
27312731
paste[ paste_size++ ] = HPKEY_ALPHA;
27322732
if ( islower( c ) )
27332733
paste[ paste_size++ ] = HPKEY_SHL;
2734-
paste[ paste_size++ ] = HPKEY_COLON;
2734+
paste[ paste_size++ ] = HPKEY_QUOTE;
27352735
break;
27362736
case 'n':
27372737
case 'N':

0 commit comments

Comments
 (0)