m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X11: handle Keypad input correctly

Browse Source
This commit is contained in:
Thomas Bernard 2018-06-30 10:25:50 +02:00
parent 84070b43b2
commit e704ae45be
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/input.c
View File

@ -2,6 +2,7 @@
*/ */
/* Grafx2 - The Ultimate 256-color bitmap paint program /* Grafx2 - The Ultimate 256-color bitmap paint program
Copyright 2018 Thomas Bernard
Copyright 2009 Franck Charlet Copyright 2009 Franck Charlet
Copyright 2007 Adrien Destugues Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud) Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
@ -1271,18 +1272,27 @@ int Get_input(int sleep_time)
//printf("sym = %04lx %s\t\tmod=%04x\n", sym, XKeysymToString(sym), mod); //printf("sym = %04lx %s\t\tmod=%04x\n", sym, XKeysymToString(sym), mod);
Key = mod | (sym & 0x0fff); Key = mod | (sym & 0x0fff);
//sym = XkbKeycodeToKeysym(X11_display, event.xkey.keycode, 0, event.xkey.state); //sym = XkbKeycodeToKeysym(X11_display, event.xkey.keycode, 0, event.xkey.state);
if ((sym & 0xf000) != 0xf000) // test for standard key if (((sym & 0xf000) != 0xf000) || IsKeypadKey(sym)) // test for standard key or KeyPad
{ {
int count; int count;
char buffer[16]; char buffer[16];
static XComposeStatus status; static XComposeStatus status;
count = XLookupString(&event.xkey, buffer, sizeof(buffer), count = XLookupString(&event.xkey, buffer, sizeof(buffer),
&sym, &status); &sym, &status);
//printf(" sym = %04lx %s %d %s\n", sym, XKeysymToString(sym), count, buffer); if (count == 1) {
Key_ANSI = Key_UNICODE = (word)buffer[0] & 0x00ff;
}
else if((sym & 0xf000) != 0xf000)
{
Key_UNICODE = sym; Key_UNICODE = sym;
if (sym < 0x100) if (sym < 0x100)
Key_ANSI = sym; Key_ANSI = sym;
} }
}
else
{
Key_UNICODE = Key_ANSI = 0;
}
user_feedback_required = 1; user_feedback_required = 1;
} }
break; break;