Add basic XIM support for key events.
This commit is contained in:
@ -16,9 +16,11 @@
|
||||
#include "../events.hpp"
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
unsigned rk_events_mask = KeyPressMask | KeyReleaseMask;
|
||||
extern Display * rk_display;
|
||||
extern Window rk_window;
|
||||
extern XIC rk_input_context;
|
||||
|
||||
unsigned rk_events_mask = KeyPressMask | KeyReleaseMask;
|
||||
|
||||
rk_uint rk_consume_events(
|
||||
rk_event * events,
|
||||
@ -28,21 +30,44 @@ rk_uint rk_consume_events(
|
||||
}
|
||||
XEvent x11_event;
|
||||
unsigned nevents = 0;
|
||||
for ( ; nevents < max_events ; ++nevents) {
|
||||
if (XCheckWindowEvent(rk_display, rk_window, rk_events_mask, &x11_event)) {
|
||||
rk_event & event = events[nevents];
|
||||
switch (x11_event.type) {
|
||||
case KeyPress:
|
||||
event.type = RK_EVENT_KEY_PRESS;
|
||||
event.key.keycode = x11_event.xkey.keycode;
|
||||
break;
|
||||
case KeyRelease:
|
||||
event.type = RK_EVENT_KEY_RELEASE;
|
||||
event.key.keycode = x11_event.xkey.keycode;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
wchar_t string[256];
|
||||
KeySym keysym;
|
||||
Status status;
|
||||
while (nevents < max_events && XCheckWindowEvent(rk_display, rk_window, rk_events_mask, &x11_event)) {
|
||||
if (XFilterEvent(&x11_event, 0)) {
|
||||
continue;
|
||||
}
|
||||
rk_event & event = events[nevents++];
|
||||
switch (x11_event.type) {
|
||||
case KeyPress:
|
||||
event.type = RK_EVENT_KEY_PRESS;
|
||||
event.key.code = x11_event.xkey.keycode;
|
||||
XwcLookupString(rk_input_context, &x11_event.xkey, string, 256, &keysym, &status);
|
||||
switch (status) {
|
||||
case XLookupChars:
|
||||
event.key.symbol = XLookupKeysym(&x11_event.xkey, 0);
|
||||
event.key.character = string[0];
|
||||
break;
|
||||
case XLookupKeySym:
|
||||
event.key.symbol = keysym;
|
||||
event.key.character = 0;
|
||||
break;
|
||||
case XLookupBoth:
|
||||
event.key.symbol = keysym;
|
||||
event.key.character = string[0];
|
||||
break;
|
||||
default:
|
||||
event.key.symbol = 0;
|
||||
event.key.character = 0;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case KeyRelease:
|
||||
event.type = RK_EVENT_KEY_RELEASE;
|
||||
event.key.code = x11_event.xkey.keycode;
|
||||
event.key.symbol = XLookupKeysym(&x11_event.xkey, 0);
|
||||
event.key.character = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return nevents;
|
||||
|
Reference in New Issue
Block a user