alex/rust_minifb
1
0
Fork 0
mirror of https://github.com/italicsjenga/rust_minifb.git synced 2025-01-27 19:16:34 +11:00
Code Issues Projects Releases Packages Wiki Activity

Support for keypad on Linux

Browse source
This commit is contained in:
Daniel Collin 2016-07-08 20:13:28 +02:00
parent 1ca62fa111
commit d4c9413835
1 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/native/x11/X11MiniFB.c
View file

@ -34,6 +34,7 @@ static int s_setup_done = 0;
static Visual* s_visual; static Visual* s_visual;
static int s_screen_width; static int s_screen_width;
static int s_screen_height; static int s_screen_height;
static int s_keyb_ext = 0;
static XContext s_context; static XContext s_context;
static Atom s_wm_delete_window; static Atom s_wm_delete_window;
@ -98,6 +99,12 @@ static void init_cursors() {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static int setup_display() { static int setup_display() {
int major = 1;
int minor = 0;
int majorOpcode = 0;
int eventBase = 0;
int errorBase = 0;
int depth, i, formatCount, convDepth = -1; int depth, i, formatCount, convDepth = -1;
XPixmapFormatValues* formats; XPixmapFormatValues* formats;
@ -148,6 +155,8 @@ static int setup_display() {
init_cursors(); init_cursors();
s_keyb_ext = XkbQueryExtension(s_display, &majorOpcode, &eventBase, &errorBase, &major, &minor);
return 1; return 1;
} }
@ -281,6 +290,43 @@ void mfb_set_cursor_style(void* window_info, int cursor)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static int handle_special_keys(WindowInfo* info, XEvent* event, int down) {
int keySym;
if (!s_keyb_ext)
return 0;
keySym = XkbKeycodeToKeysym(s_display, event->xkey.keycode, 0, 1);
switch (keySym)
{
case XK_KP_0:
case XK_KP_1:
case XK_KP_2:
case XK_KP_3:
case XK_KP_4:
case XK_KP_5:
case XK_KP_6:
case XK_KP_7:
case XK_KP_8:
case XK_KP_9:
case XK_KP_Separator:
case XK_KP_Decimal:
case XK_KP_Equal:
case XK_KP_Enter:
{
if (info->key_callback) {
info->key_callback(info->rust_data, keySym, down);
return 1;
}
}
}
return 0;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static int process_event(XEvent* event) { static int process_event(XEvent* event) {
KeySym sym; KeySym sym;
@ -304,6 +350,9 @@ static int process_event(XEvent* event) {
{ {
sym = XLookupKeysym(&event->xkey, 0); sym = XLookupKeysym(&event->xkey, 0);
if (handle_special_keys(info, event, 1))
break;
if (info->key_callback) if (info->key_callback)
info->key_callback(info->rust_data, sym, 1); info->key_callback(info->rust_data, sym, 1);
@ -318,6 +367,9 @@ static int process_event(XEvent* event) {
case KeyRelease: case KeyRelease:
{ {
if (handle_special_keys(info, event, 0))
break;
sym = XLookupKeysym(&event->xkey, 0); sym = XLookupKeysym(&event->xkey, 0);
if (info->key_callback) if (info->key_callback)