refactor all the session stuff. yay, it works properly now.

[chaz/openbox] / openbox / debug.c

diff --git a/openbox/debug.c b/openbox/debug.c
index 4152c15ee0f973bc18fb0f34db7a366c244baa32..0fceba489d64e90c79178b041830d7e9b1c07f2f 100644 (file)
--- a/openbox/debug.c
+++ b/openbox/debug.c
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    debug.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,6 +16,8 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
+#include "debug.h"
+
 #include <glib.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -28,11 +30,47 @@ void ob_debug_show_output(gboolean enable)
     show = enable;
 }
 
-void ob_debug(gchar *a, ...)
+void ob_debug(const gchar *a, ...)
 {
     va_list vl;
 
     if (show) {
+        fprintf(stderr, "DEBUG: ");
+        va_start(vl, a);
+        vfprintf(stderr, a, vl);
+        va_end(vl);
+    }
+}
+
+static gboolean enabled_types[OB_DEBUG_TYPE_NUM] = {FALSE};
+
+void ob_debug_enable(ObDebugType type, gboolean enable)
+{
+    g_assert(type < OB_DEBUG_TYPE_NUM);
+    enabled_types[type] = enable;
+}
+
+void ob_debug_type(ObDebugType type, const gchar *a, ...)
+{
+    va_list vl;
+
+    g_assert(type < OB_DEBUG_TYPE_NUM);
+
+    if (show && enabled_types[type]) {
+        switch (type) {
+        case OB_DEBUG_FOCUS:
+            fprintf(stderr, "FOCUS: ");
+            break;
+        case OB_DEBUG_APP_BUGS:
+            fprintf(stderr, "APPLICATION BUG: ");
+            break;
+        case OB_DEBUG_SM:
+            fprintf(stderr, "SESSION: ");
+            break;
+        default:
+            g_assert_not_reached();
+        }
+
         va_start(vl, a);
         vfprintf(stderr, a, vl);
         va_end(vl);