Merge branch 'fix-dump-log-errmsg'

[i3/i3] / src / debug.c

diff --git a/src/debug.c b/src/debug.c
index cbdbd3683ddef979ecb40c100ec08b88c92b2b45..30822353db2ab69a4e48e801759e12209f4a011c 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,7 +1,17 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * debug.c: Debugging functions, especially FormatEvent, which prints unhandled
+ *          events.  This code is from xcb-util.
+ *
+ */
 #include <stdio.h>
 #include <xcb/xcb.h>
 
-/* Debug functions here, especially the FormatEvent-stuff, which prints unhandled events */
+#include "log.h"
 
 static const char *labelError[] = {
     "Success",
@@ -208,19 +218,21 @@ int format_event(xcb_generic_event_t *e) {
 
     switch(e->response_type) {
     case 0:
-        printf("Error %s on seqnum %d (%s).\n",
+        DLOG("Error %s on seqnum %d (%s).\n",
             labelError[*((uint8_t *) e + 1)],
             seqnum,
             labelRequest[*((uint8_t *) e + 10)]);
         break;
     default:
-        printf("Event %s following seqnum %d%s.\n",
+        if (e->response_type > sizeof(labelEvent) / sizeof(char*))
+                break;
+        DLOG("Event %s following seqnum %d%s.\n",
             labelEvent[e->response_type],
             seqnum,
             labelSendEvent[sendEvent]);
         break;
     case XCB_KEYMAP_NOTIFY:
-        printf("Event %s%s.\n",
+        DLOG("Event %s%s.\n",
             labelEvent[e->response_type],
             labelSendEvent[sendEvent]);
         break;
@@ -229,7 +241,3 @@ int format_event(xcb_generic_event_t *e) {
     fflush(stdout);
     return 1;
 }
-
-int handle_event(void *ignored, xcb_connection_t *c, xcb_generic_event_t *e) {
-        return format_event(e);
-}