From 5718a750e3df1bf5d8cf02687c9d819ae1378a69 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 12 Apr 2020 02:58:47 +0200
Subject: [PATCH] Code cleanup

---
 src/gtoolkit.c | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/gtoolkit.c b/src/gtoolkit.c
index adf64f4..aaa7076 100644
--- a/src/gtoolkit.c
+++ b/src/gtoolkit.c
@@ -123,43 +123,41 @@ int gtoolkit_init(void)
 
 
 /* gtoolkit_main */
+static void _main_event(void);
 static void _main_event_configure(XConfigureEvent * event);
 static void _main_event_expose(XExposeEvent * event);
 
 int gtoolkit_main(void)
+{
+	for(_gt.loop++; _gt.loop >= 1;)
+		while(XPending(_gt.display) > 0)
+			_main_event();
+	return 0;
+}
+
+static void _main_event(void)
 {
 	XEvent event;
 
-	if(_gt.loop != 0)
-		return 1;
-	for(_gt.loop = 1; _gt.loop == 1;)
+	XNextEvent(_gt.display, &event);
+	switch(event.type)
 	{
-		while(XPending(_gt.display) > 0)
-		{
-			XNextEvent(_gt.display, &event);
-			switch(event.type)
-			{
-				case ConfigureNotify:
-					_main_event_configure(
-							&event.xconfigure);
-					break;
-				case Expose:
-					_main_event_expose(&event.xexpose);
-					break;
-				case KeyPress:
-				case KeyRelease:
-				case ClientMessage:
-				default:
+		case ConfigureNotify:
+			_main_event_configure(&event.xconfigure);
+			break;
+		case Expose:
+			_main_event_expose(&event.xexpose);
+			break;
+		case ClientMessage:
+		case KeyPress:
+		case KeyRelease:
+		default:
 #ifdef DEBUG
-					fprintf(stderr, "DEBUG: %s() Event %d\n",
-							__func__, event.type);
+			fprintf(stderr, "DEBUG: %s() Event %d\n", __func__,
+					event.type);
 #endif
-					break;
-			}
-		}
+			break;
 	}
-	_gt.loop = 0;
-	return 0;
 }
 
 static void _main_event_configure(XConfigureEvent * event)