From 78916c6a94a7496376b683fa9bf8dbb60d2cdc34 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Mon, 9 Jan 2017 08:17:16 +0100 Subject: [PATCH] Give up and quit rofi after failed to grab keyboard in <5 sec. --- source/rofi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/rofi.c b/source/rofi.c index 24e2f28c..3158ec34 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -587,28 +587,28 @@ unsigned int lazy_grab_retry_count_pt = 0; static gboolean lazy_grab_pointer ( G_GNUC_UNUSED gpointer data ) { // After 5 sec. - if ( lazy_grab_retry_count_kb > ( 5 * 1000 ) ) { - fprintf ( stderr, "Failed to grab keyboard after %u times. Giving up.\n", lazy_grab_retry_count_kb ); - g_main_loop_quit ( main_loop ); + if ( lazy_grab_retry_count_pt > ( 5 * 1000 ) ) { + fprintf ( stderr, "Failed to grab pointer after %u times. Giving up.\n", lazy_grab_retry_count_pt ); return G_SOURCE_REMOVE; } if ( take_pointer ( xcb_stuff_get_root_window ( xcb ), 0 ) ) { return G_SOURCE_REMOVE; } - lazy_grab_retry_count_kb++; + lazy_grab_retry_count_pt++; return G_SOURCE_CONTINUE; } static gboolean lazy_grab_keyboard ( G_GNUC_UNUSED gpointer data ) { // After 5 sec. - if ( lazy_grab_retry_count_pt > ( 5 * 1000 ) ) { - fprintf ( stderr, "Failed to grab pointer after %u times. Giving up.\n", lazy_grab_retry_count_pt ); + if ( lazy_grab_retry_count_kb > ( 5 * 1000 ) ) { + fprintf ( stderr, "Failed to grab keyboard after %u times. Giving up.\n", lazy_grab_retry_count_kb ); + g_main_loop_quit ( main_loop ); return G_SOURCE_REMOVE; } if ( take_keyboard ( xcb_stuff_get_root_window ( xcb ), 0 ) ) { return G_SOURCE_REMOVE; } - lazy_grab_retry_count_pt++; + lazy_grab_retry_count_kb ++; return G_SOURCE_CONTINUE; }