gitmodules: Update libnkutils and libgwater

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2017-10-14 16:43:02 +02:00
parent bcb5844b6d
commit 4e4e3917aa
No known key found for this signature in database
GPG Key ID: AC203F96E2C34BB7
4 changed files with 9 additions and 9 deletions

View File

@ -138,7 +138,7 @@ void setup_abe ( void )
}
}
static gboolean binding_trigger_action ( guint64 scope, gpointer user_data )
static gboolean binding_trigger_action ( guint64 scope, G_GNUC_UNUSED gpointer target, gpointer user_data )
{
return rofi_view_trigger_action ( rofi_view_get_active (), scope, GPOINTER_TO_UINT ( user_data ) );
}

View File

@ -695,14 +695,14 @@ static void main_loop_x11_event_handler_view ( xcb_generic_event_t *event )
xcb_button_press_event_t *bpe = (xcb_button_press_event_t *) event;
xcb->last_timestamp = bpe->time;
rofi_view_handle_mouse_motion ( state, bpe->event_x, bpe->event_y );
nk_bindings_seat_handle_button ( xcb->bindings_seat, bpe->detail, NK_BINDINGS_BUTTON_STATE_PRESS, bpe->time );
nk_bindings_seat_handle_button ( xcb->bindings_seat, NULL, bpe->detail, NK_BINDINGS_BUTTON_STATE_PRESS, bpe->time );
break;
}
case XCB_BUTTON_RELEASE:
{
xcb_button_release_event_t *bre = (xcb_button_release_event_t *) event;
xcb->last_timestamp = bre->time;
nk_bindings_seat_handle_button ( xcb->bindings_seat, bre->detail, NK_BINDINGS_BUTTON_STATE_RELEASE, bre->time );
nk_bindings_seat_handle_button ( xcb->bindings_seat, NULL, bre->detail, NK_BINDINGS_BUTTON_STATE_RELEASE, bre->time );
if ( config.click_to_exit == TRUE ) {
if ( !xcb->mouse_seen ) {
rofi_view_temp_click_to_exit ( state, bre->event );
@ -722,7 +722,7 @@ static void main_loop_x11_event_handler_view ( xcb_generic_event_t *event )
for ( gint8 bi = 0; bi < 7; ++bi ) {
if ( kne->keys[by] & ( 1 << bi ) ) {
// X11 keycodes starts at 8
nk_bindings_seat_handle_key ( xcb->bindings_seat, ( 8 * by + bi ) + 8, NK_BINDINGS_KEY_STATE_PRESSED );
nk_bindings_seat_handle_key ( xcb->bindings_seat, NULL, ( 8 * by + bi ) + 8, NK_BINDINGS_KEY_STATE_PRESSED );
}
}
}
@ -734,7 +734,7 @@ static void main_loop_x11_event_handler_view ( xcb_generic_event_t *event )
gchar *text;
xcb->last_timestamp = xkpe->time;
text = nk_bindings_seat_handle_key_with_modmask ( xcb->bindings_seat, xkpe->state, xkpe->detail, NK_BINDINGS_KEY_STATE_PRESS );
text = nk_bindings_seat_handle_key_with_modmask ( xcb->bindings_seat, NULL, xkpe->state, xkpe->detail, NK_BINDINGS_KEY_STATE_PRESS );
if ( text != NULL ) {
rofi_view_handle_text ( state, text );
}
@ -744,7 +744,7 @@ static void main_loop_x11_event_handler_view ( xcb_generic_event_t *event )
{
xcb_key_release_event_t *xkre = (xcb_key_release_event_t *) event;
xcb->last_timestamp = xkre->time;
nk_bindings_seat_handle_key ( xcb->bindings_seat, xkre->detail, NK_BINDINGS_KEY_STATE_RELEASE );
nk_bindings_seat_handle_key ( xcb->bindings_seat, NULL, xkre->detail, NK_BINDINGS_KEY_STATE_RELEASE );
break;
}
default:
@ -783,7 +783,7 @@ static gboolean main_loop_x11_event_handler ( xcb_generic_event_t *ev, G_GNUC_UN
case XCB_XKB_STATE_NOTIFY:
{
xcb_xkb_state_notify_event_t *ksne = (xcb_xkb_state_notify_event_t *) ev;
nk_bindings_seat_update_mask ( xcb->bindings_seat,
nk_bindings_seat_update_mask ( xcb->bindings_seat, NULL,
ksne->baseMods,
ksne->latchedMods,
ksne->lockedMods,

@ -1 +1 @@
Subproject commit 60e5e71e09e573bd5c7839ce4a892747ea232526
Subproject commit e6faf48267ae40547cb86c125f265f54f382df1c

@ -1 +1 @@
Subproject commit eeb2ab5203de13196f202c51d94711e9c2f829db
Subproject commit 3d388108f8177c99296b48acd787e3f1bf6c2709