diff options
Diffstat (limited to 'source/view.c')
-rw-r--r-- | source/view.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/source/view.c b/source/view.c index ffde0a32..13f5a6e9 100644 --- a/source/view.c +++ b/source/view.c @@ -1310,7 +1310,32 @@ static void rofi_view_mainloop_iter ( RofiViewState *state, xcb_generic_event_t int len = 0; key = xkb_state_key_get_one_sym ( xkb->state, xkpe->detail ); - len = xkb_state_key_get_utf8 ( xkb->state, xkpe->detail, pad, sizeof ( pad ) ); + + if ( ( key != XKB_KEY_NoSymbol ) && ( xkb_compose_state_feed ( xkb->compose.state, key ) == XKB_COMPOSE_FEED_ACCEPTED ) ) { + switch ( xkb_compose_state_get_status ( xkb->compose.state ) ) + { + case XKB_COMPOSE_COMPOSING: + g_debug ( "[COMPOSE] composing" ); + key = XKB_KEY_NoSymbol; + break; + case XKB_COMPOSE_COMPOSED: + g_debug ( "[COMPOSE] composed" ); + key = xkb_compose_state_get_one_sym ( xkb->compose.state ); + len = xkb_compose_state_get_utf8 ( xkb->compose.state, pad, sizeof ( pad ) ); + break; + case XKB_COMPOSE_CANCELLED: + g_debug ( "[COMPOSE] cancelled" ); + case XKB_COMPOSE_NOTHING: + break; + } + if ( key == XKB_KEY_NoSymbol ) { + break; + } + } + + if ( len == 0 ) { + len = xkb_state_key_get_utf8 ( xkb->state, xkpe->detail, pad, sizeof ( pad ) ); + } if ( key != XKB_KEY_NoSymbol ) { // Handling of paste |