mirror of
https://github.com/davatorium/rofi.git
synced 2024-11-18 13:54:36 -05:00
Fix ime and enable build option (#1999)
This commit is contained in:
parent
8604addae2
commit
8b612f08cf
2 changed files with 6 additions and 18 deletions
|
@ -1,4 +1,4 @@
|
|||
option('drun', type: 'boolean', value: true, description: 'Desktop file mode')
|
||||
option('window', type: 'boolean', value: true, description: 'Window switcher mode')
|
||||
option('check', type: 'feature', description: 'Build and run libcheck-based tests')
|
||||
option('imdkit', type: 'boolean', value: false, description: 'IMDKit support')
|
||||
option('imdkit', type: 'boolean', value: true, description: 'IMDKit support')
|
||||
|
|
22
source/xcb.c
22
source/xcb.c
|
@ -1383,14 +1383,7 @@ static void main_loop_x11_event_handler_view(xcb_generic_event_t *event) {
|
|||
}
|
||||
case XCB_KEY_RELEASE: {
|
||||
xcb_key_release_event_t *xkre = (xcb_key_release_event_t *)event;
|
||||
#ifdef XCB_IMDKIT
|
||||
if (xcb->ic) {
|
||||
xcb_xim_forward_event(xcb->im, xcb->ic, xkre);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
rofi_key_release_event_handler(xkre, state);
|
||||
}
|
||||
rofi_key_release_event_handler(xkre, state);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
@ -1408,13 +1401,7 @@ void x11_event_handler_fowarding(G_GNUC_UNUSED xcb_xim_t *im,
|
|||
if (state == NULL) {
|
||||
return;
|
||||
}
|
||||
uint8_t type = event->response_type & ~0x80;
|
||||
if (type == XCB_KEY_PRESS) {
|
||||
rofi_key_press_event_handler(event, state);
|
||||
} else if (type == XCB_KEY_RELEASE) {
|
||||
xcb_key_release_event_t *xkre = (xcb_key_release_event_t *)event;
|
||||
rofi_key_release_event_handler(xkre, state);
|
||||
}
|
||||
rofi_key_press_event_handler(event, state);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -1435,9 +1422,10 @@ static gboolean main_loop_x11_event_handler(xcb_generic_event_t *ev,
|
|||
}
|
||||
|
||||
#ifdef XCB_IMDKIT
|
||||
if (xcb->im && xcb_xim_filter_event(xcb->im, ev)) {
|
||||
if (xcb->im
|
||||
&& (ev->response_type & ~0x80) != XCB_KEY_PRESS
|
||||
&& !xcb_xim_filter_event(xcb->im, ev))
|
||||
return G_SOURCE_CONTINUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
uint8_t type = ev->response_type & ~0x80;
|
||||
|
|
Loading…
Reference in a new issue