Use glib memory functions to simplify the code #546.

diff --git a/src/events.c b/src/events.c
index 41a9975..f50ecf0 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -3,9 +3,9 @@
 
 /* this is only to queue GDK key events, in order to later send them if the map didn't match */
 static struct {
-    GdkEventKey **queue;               /* queue holding submitted events */
-    int           qlen;                /* pointer to last char in queue */
-    bool          processing;          /* whether or not events are processing */
+    GdkEventKey **queue;        /* queue holding submitted events */
+    int           qlen;         /* pointer to last char in queue */
+    bool          processing;   /* whether or not events are processing */
 } events = {0};
 
 /**
@@ -13,47 +13,32 @@ static struct {
  */
 void queue_event(GdkEventKey *e)
 {
-    GdkEventKey **newqueue = realloc(events.queue, (events.qlen + 1) * sizeof **newqueue);
-
-    if (newqueue == NULL) {
-        // error allocating memory
-        return;
-    }
-
-    events.queue = newqueue;
+    events.queue = g_realloc(events.queue, (events.qlen + 1) * sizeof(GdkEventKey*));
 
     /* copy memory (otherwise event gets cleared by gdk) */
-    GdkEventKey *tmp = malloc(sizeof *tmp);
-    memcpy(tmp, e, sizeof *e);
-
-    if (tmp == NULL) {
-        // error allocating memory
-        return;
-    }
-
-    events.queue[events.qlen] = tmp;
+    events.queue[events.qlen] = g_memdup(e, sizeof(GdkEventKey));
     events.qlen ++;
 }
 
 void process_event(GdkEventKey* event)
 {
-    if (event == NULL) {
+    if (!event) {
         return;
     }
 
-    events.processing = true; /* signal not to queue other events */
-    gtk_main_do_event ((GdkEvent *) event);
-    events.processing = false;
-    free(event);
+    events.processing = TRUE; /* signal not to queue other events */
+    gtk_main_do_event((GdkEvent*)event);
+    events.processing = FALSE;
 }
 
 /**
  * Process events in the queue, sending the key events to GDK.
  */
-void process_events()
+void process_events(void)
 {
     for (int i = 0; i < events.qlen; ++i) {
-        process_event(events.queue[i]); /* process & free the event */
+        process_event(events.queue[i]);
+        g_free(events.queue[i]);
         /* TODO take into account qk mapped key? */
     }
 
@@ -62,9 +47,9 @@ void process_events()
 
 /**
  * Check if the events are currently processing (i.e. being sent to GDK
- * unhandled).  Provided in order to encapsulate the "events" global struct.
+ * unhandled). Provided in order to encapsulate the "events" global struct.
  */
-bool is_processing_events()
+gboolean is_processing_events(void)
 {
     return events.processing;
 }
@@ -73,10 +58,10 @@ bool is_processing_events()
  * Clear the event queue by resetting the length. Provided in order to
  * encapsulate the "events" global struct.
  */
-void free_events()
+void free_events(void)
 {
     for (int i = 0; i < events.qlen; ++i) {
-        free(events.queue[i]);
+        g_free(events.queue[i]);
     }
 
     events.qlen = 0;

diff --git a/src/events.h b/src/events.h
index 565de6b..75e335b 100644 (file)
--- a/src/events.h
+++ b/src/events.h
@@ -8,8 +8,8 @@
 #include "map.h"
 
 void queue_event(GdkEventKey *e);
-void process_events();
-bool is_processing_events();
-void free_events();
+void process_events(void);
+gboolean is_processing_events(void);
+void free_events(void);
 
 #endif /* end of include guard: _MAP_H */

diff --git a/src/map.c b/src/map.c
index bb35808..7e323be 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -327,7 +327,7 @@ gboolean on_map_keypress(GtkWidget *widget, GdkEventKey* event, Client *c)
 {
     if (is_processing_events()) {
         /* events are processing, pass all keys unmodified */
-        return false;
+        return FALSE;
     }
 
     guint state  = event->state;