alloc colors only when needed, and free them properly on destruction

[chaz/openbox] / otk / display.cc

diff --git a/otk/display.cc b/otk/display.cc
index 21215e2b7ff51ad026287d8f0b6ccdd1418ce17d..9ab8ed2f0b898ab2e8c23aee9e895d8db4120a6f 100644 (file)
--- a/otk/display.cc
+++ b/otk/display.cc
@@ -1,8 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "display.hh"
 #include "screeninfo.hh"
@@ -24,10 +22,6 @@ extern "C" {
 #include <X11/extensions/Xinerama.h>
 #endif // XINERAMA
 
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
 #ifdef    HAVE_SIGNAL_H
 #  include <signal.h>
 #endif // HAVE_SIGNAL_H
@@ -45,6 +39,8 @@ extern "C" {
 #define _(str) gettext(str)
 }
 
+#include <cstdio>
+
 namespace otk {
 
 
@@ -58,7 +54,7 @@ static int xerrorHandler(::Display *d, XErrorEvent *e)
 
     //if (e->error_code != BadWindow)
     {
-      XGetErrorText(d, e->error_code, errtxt, 128);
+      XGetErrorText(d, e->error_code, errtxt, 127);
       printf("X Error: %s\n", errtxt);
       if (e->error_code != BadWindow)
         abort();
@@ -304,4 +300,9 @@ void Display::ungrabKey(unsigned int keycode, unsigned int modifiers,
                grab_window);
 }
 
+void Display::ungrabAllKeys(Window grab_window) const
+{
+  XUngrabKey(_display, AnyKey, AnyModifier, grab_window);
+}
+
 }