diff options
| author | José Expósito <jose.exposito89@gmail.com> | 2021-06-10 20:06:23 +0200 |
|---|---|---|
| committer | José Expósito <jose.exposito89@gmail.com> | 2021-08-03 16:52:39 +0000 |
| commit | f36ccc3c11fc053f7747c6e705e819f2d24ac90f (patch) | |
| tree | c05d6dacd38f390dffc651a1cd3b7b1e5cb91ff5 | |
| parent | c21f20cc5a6072b7727d3269a0cc3213d78483d3 (diff) | |
| download | libinput-f36ccc3c11fc053f7747c6e705e819f2d24ac90f.tar.gz | |
tools/debug-gui: move gtk_main_quit to a function
Wrap the calls to gtk_main_quit in its own function.
Refactor, no functional changes.
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
| -rw-r--r-- | tools/libinput-debug-gui.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/tools/libinput-debug-gui.c b/tools/libinput-debug-gui.c index 54b9d073..249d3a6a 100644 --- a/tools/libinput-debug-gui.c +++ b/tools/libinput-debug-gui.c @@ -845,6 +845,12 @@ map_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) } static void +window_quit(struct window *w) +{ + gtk_main_quit(); +} + +static void window_init(struct window *w) { list_init(&w->evdev_devices); @@ -859,7 +865,7 @@ window_init(struct window *w) gtk_window_set_resizable(GTK_WINDOW(w->win), TRUE); gtk_widget_realize(w->win); g_signal_connect(G_OBJECT(w->win), "map-event", G_CALLBACK(map_event_cb), w); - g_signal_connect(G_OBJECT(w->win), "delete-event", G_CALLBACK(gtk_main_quit), NULL); + g_signal_connect(G_OBJECT(w->win), "delete-event", G_CALLBACK(window_quit), w); w->area = gtk_drawing_area_new(); gtk_widget_set_events(w->area, 0); @@ -1520,7 +1526,7 @@ handle_event_libinput(GIOChannel *source, GIOCondition condition, gpointer data) case LIBINPUT_EVENT_KEYBOARD_KEY: if (handle_event_keyboard(ev, w)) { libinput_event_destroy(ev); - gtk_main_quit(); + window_quit(w); return FALSE; } break; @@ -1579,7 +1585,10 @@ usage(void) { static gboolean signal_handler(void *data) { - gtk_main_quit(); + struct libinput *li = data; + struct window *w = libinput_get_user_data(li); + + window_quit(w); return FALSE; } @@ -1597,8 +1606,6 @@ main(int argc, char **argv) if (!gtk_init_check(&argc, &argv)) return 77; - g_unix_signal_add(SIGINT, signal_handler, NULL); - tools_init_options(&options); while (1) { @@ -1673,6 +1680,8 @@ main(int argc, char **argv) libinput_set_user_data(li, &w); + g_unix_signal_add(SIGINT, signal_handler, li); + window_init(&w); w.options = options; sockets_init(li); |