mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-x11: Use XKB detectable autorepeat if possible

Browse Source 
If we have XCB XKB support, use XKB's detectable autorepeat, which
generates repeat sequences as a series of
press-press-press-[...]-release events, rather than
press-release-press-release-[...].

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone
2012-06-22 13:21:36 +01:00
committed by Kristian Høgsberg
parent 62b33b6964
commit 3ee91e1879
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-x11.c
+31 -2
View File
@@ -148,6 +148,9 @@ x11_compositor_setup_xkb(struct x11_compositor *c)
return; return;
#else #else
const xcb_query_extension_reply_t *ext; const xcb_query_extension_reply_t *ext;
xcb_generic_error_t *error;
xcb_xkb_per_client_flags_cookie_t pcf;
xcb_xkb_per_client_flags_reply_t *pcf_reply;
c->has_xkb = 0; c->has_xkb = 0;
c->xkb_event_base = 0; c->xkb_event_base = 0;
@@ -159,6 +162,21 @@ x11_compositor_setup_xkb(struct x11_compositor *c)
} }
c->xkb_event_base = ext->first_event; c->xkb_event_base = ext->first_event;
pcf = xcb_xkb_per_client_flags(c->conn,
XCB_XKB_ID_USE_CORE_KBD,
XCB_XKB_PER_CLIENT_FLAG_DETECTABLE_AUTO_REPEAT,
XCB_XKB_PER_CLIENT_FLAG_DETECTABLE_AUTO_REPEAT,
0,
0,
0);
pcf_reply = xcb_xkb_per_client_flags_reply(c->conn, pcf, &error);
free(pcf_reply);
if (error) {
weston_log("failed to set XKB per-client flags, not using "
"detectable repeat\n");
return;
}
c->has_xkb = 1; c->has_xkb = 1;
#endif #endif
} }
@@ -672,9 +690,10 @@ x11_compositor_handle_event(int fd, uint32_t mask, void *data)
while (x11_compositor_next_event(c, &event, mask)) { while (x11_compositor_next_event(c, &event, mask)) {
switch (prev ? prev->response_type & ~0x80 : 0x80) { switch (prev ? prev->response_type & ~0x80 : 0x80) {
case XCB_KEY_RELEASE: case XCB_KEY_RELEASE:
/* Suppress key repeat events; this is only used if we
* don't have XCB XKB support. */
key_release = (xcb_key_press_event_t *) prev; key_release = (xcb_key_press_event_t *) prev;
key_press = (xcb_key_press_event_t *) event; key_press = (xcb_key_press_event_t *) event;
/* XXX use XkbSetDetectableAutoRepeat */
if ((event->response_type & ~0x80) == XCB_KEY_PRESS && if ((event->response_type & ~0x80) == XCB_KEY_PRESS &&
key_release->time == key_press->time && key_release->time == key_press->time &&
key_release->detail == key_press->detail) { key_release->detail == key_press->detail) {
@@ -737,7 +756,17 @@ x11_compositor_handle_event(int fd, uint32_t mask, void *data)
WL_KEYBOARD_KEY_STATE_PRESSED); WL_KEYBOARD_KEY_STATE_PRESSED);
break; break;
case XCB_KEY_RELEASE: case XCB_KEY_RELEASE:
prev = event; /* If we don't have XKB, we need to use the lame
* autorepeat detection above. */
if (!c->has_xkb) {
prev = event;
break;
}
key_release = (xcb_key_press_event_t *) event;
notify_key(&c->base.seat->seat,
weston_compositor_get_time(),
key_release->detail - 8,
WL_KEYBOARD_KEY_STATE_RELEASED);
break; break;
case XCB_BUTTON_PRESS: case XCB_BUTTON_PRESS:
x11_compositor_deliver_button_event(c, event, 1); x11_compositor_deliver_button_event(c, event, 1);