merge the C branch into HEAD

1 files changed, 32 insertions, 0 deletions

diff --git a/c/xerror.c b/c/xerror.c
new file mode 100644
index 00000000..49a795f8
--- /dev/null
+++ b/c/xerror.c
@@ -0,0 +1,32 @@
+#include "openbox.h"
+#include <glib.h>
+#include <X11/Xlib.h>
+
+static gboolean xerror_ignore = FALSE;
+
+int xerror_handler(Display *d, XErrorEvent *e)
+{
+#ifdef DEBUG
+    if (!xerror_ignore) {
+	char errtxt[128];
+	  
+	/*if (e->error_code != BadWindow) */
+	{
+	    XGetErrorText(d, e->error_code, errtxt, 127);
+	    if (e->error_code == BadWindow)
+		g_warning("X Error: %s", errtxt);
+	    else
+		g_error("X Error: %s", errtxt);
+	}
+    }
+#else
+    (void)d; (void)e;
+#endif
+    return 0;
+}
+
+void xerror_set_ignore(gboolean ignore)
+{
+    XSync(ob_display, FALSE);
+    xerror_ignore = ignore;
+}