fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 11:19:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/debug-gui: move gtk_main_quit to a function

Browse source 
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>
This commit is contained in:
José Expósito 2021-06-10 20:06:23 +02:00
parent c21f20cc5a
commit f36ccc3c11
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/libinput-debug-gui.c
View file

@ -844,6 +844,12 @@ map_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
); );
} }
static void
window_quit(struct window *w)
{
gtk_main_quit();
}
static void static void
window_init(struct window *w) window_init(struct window *w)
{ {
@ -859,7 +865,7 @@ window_init(struct window *w)
gtk_window_set_resizable(GTK_WINDOW(w->win), TRUE); gtk_window_set_resizable(GTK_WINDOW(w->win), TRUE);
gtk_widget_realize(w->win); 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), "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(); w->area = gtk_drawing_area_new();
gtk_widget_set_events(w->area, 0); 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: case LIBINPUT_EVENT_KEYBOARD_KEY:
if (handle_event_keyboard(ev, w)) { if (handle_event_keyboard(ev, w)) {
libinput_event_destroy(ev); libinput_event_destroy(ev);
gtk_main_quit(); window_quit(w);
return FALSE; return FALSE;
} }
break; break;
@ -1579,7 +1585,10 @@ usage(void) {
static gboolean static gboolean
signal_handler(void *data) signal_handler(void *data)
{ {
gtk_main_quit(); struct libinput *li = data;
struct window *w = libinput_get_user_data(li);
window_quit(w);
return FALSE; return FALSE;
} }
@ -1597,8 +1606,6 @@ main(int argc, char **argv)
if (!gtk_init_check(&argc, &argv)) if (!gtk_init_check(&argc, &argv))
return 77; return 77;
g_unix_signal_add(SIGINT, signal_handler, NULL);
tools_init_options(&options); tools_init_options(&options);
while (1) { while (1) {
@ -1673,6 +1680,8 @@ main(int argc, char **argv)
libinput_set_user_data(li, &w); libinput_set_user_data(li, &w);
g_unix_signal_add(SIGINT, signal_handler, li);
window_init(&w); window_init(&w);
w.options = options; w.options = options;
sockets_init(li); sockets_init(li);