rm prefixes for all elements in the otk namepsace

[chaz/openbox] / otk / display.cc

diff --git a/otk/display.cc b/otk/display.cc
index 3a15ff22ecb16b05a30fee590047b359ce108759..05a937e0cf937097f6a87c887f17568dc0729c4c 100644 (file)
--- a/otk/display.cc
+++ b/otk/display.cc
@@ -7,22 +7,27 @@
 #include "display.hh"
 #include "screeninfo.hh"
 #include "gccache.hh"
+#include "util.hh"
 
 extern "C" {
 #include <X11/keysym.h>
 
+#ifdef    XKB
+#include <X11/XKBlib.h>
+#endif // XKB
+
 #ifdef    SHAPE
 #include <X11/extensions/shape.h>
 #endif // SHAPE
 
+#ifdef    XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif // XINERAMA
+
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-
 #ifdef    HAVE_SIGNAL_H
 #  include <signal.h>
 #endif // HAVE_SIGNAL_H
@@ -43,20 +48,22 @@ extern "C" {
 namespace otk {
 
 
-Display *OBDisplay::display = (Display*) 0;
-bool OBDisplay::_shape = false;
-int  OBDisplay::_shape_event_basep = 0;
-bool OBDisplay::_xinerama = false;
-int  OBDisplay::_xinerama_event_basep = 0;
-unsigned int OBDisplay::_mask_list[8];
-unsigned int OBDisplay::_scrollLockMask = 0;
-unsigned int OBDisplay::_numLockMask = 0;
-OBDisplay::ScreenInfoList OBDisplay::_screenInfoList;
-BGCCache *OBDisplay::_gccache = (BGCCache*) 0;
-int OBDisplay::_grab_count = 0;
+::Display *Display::display = (::Display*) 0;
+bool Display::_xkb = false;
+int  Display::_xkb_event_basep = 0;
+bool Display::_shape = false;
+int  Display::_shape_event_basep = 0;
+bool Display::_xinerama = false;
+int  Display::_xinerama_event_basep = 0;
+unsigned int Display::_mask_list[8];
+unsigned int Display::_scrollLockMask = 0;
+unsigned int Display::_numLockMask = 0;
+Display::ScreenInfoList Display::_screenInfoList;
+GCCache *Display::_gccache = (GCCache*) 0;
+int Display::_grab_count = 0;
 
 
-int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e)
+int Display::xerrorHandler(::Display *d, XErrorEvent *e)
 {
 #ifdef DEBUG
   char errtxt[128];
@@ -65,6 +72,8 @@ int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e)
   {
     XGetErrorText(d, e->error_code, errtxt, 128);
     printf("X Error: %s\n", errtxt);
+    if (e->error_code != BadWindow)
+      abort();
   }
 #else
   (void)d;
@@ -75,7 +84,7 @@ int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e)
 }
 
 
-void OBDisplay::initialize(char *name)
+void Display::initialize(char *name)
 {
   int junk;
   (void)junk;
@@ -98,13 +107,14 @@ line argument.\n\n"));
   // set the DISPLAY environment variable for any lauched children, to the
   // display we're using, so they open in the right place.
   // XXX rm -> std::string dtmp = "DISPLAY=" + DisplayString(display);
-  if (putenv(const_cast<char*>((std::string("DISPLAY=") +
-                                DisplayString(display)).c_str()))) {
-    printf(_("warning: couldn't set environment variable 'DISPLAY'\n"));
-    perror("putenv()");
-  }
+  putenv(std::string("DISPLAY=") + DisplayString(display));
   
   // find the availability of X extensions we like to use
+#ifdef XKB
+  _xkb = XkbQueryExtension(display, &junk, &_xkb_event_basep, &junk, NULL, 
+                           NULL);
+#endif
+
 #ifdef SHAPE
   _shape = XShapeQueryExtension(display, &_shape_event_basep, &junk);
 #endif
@@ -156,11 +166,11 @@ line argument.\n\n"));
   for (int i = 0; i < ScreenCount(display); ++i)
     _screenInfoList.push_back(ScreenInfo(i));
 
-  _gccache = new BGCCache(_screenInfoList.size());
+  _gccache = new GCCache(_screenInfoList.size());
 }
 
 
-void OBDisplay::destroy()
+void Display::destroy()
 {
   delete _gccache;
   while (_grab_count > 0)
@@ -169,14 +179,24 @@ void OBDisplay::destroy()
 }
 
 
-const ScreenInfo* OBDisplay::screenInfo(int snum) {
+const ScreenInfo* Display::screenInfo(int snum) {
   assert(snum >= 0);
   assert(snum < static_cast<int>(_screenInfoList.size()));
   return &_screenInfoList[snum];
 }
 
 
-void OBDisplay::grab()
+const ScreenInfo* Display::findScreen(Window root)
+{
+  ScreenInfoList::iterator it, end = _screenInfoList.end();
+  for (it = _screenInfoList.begin(); it != end; ++it)
+    if (it->rootWindow() == root)
+      return &(*it);
+  return 0;
+}
+
+
+void Display::grab()
 {
   if (_grab_count == 0)
     XGrabServer(display);
@@ -184,7 +204,7 @@ void OBDisplay::grab()
 }
 
 
-void OBDisplay::ungrab()
+void Display::ungrab()
 {
   if (_grab_count == 0) return;
   _grab_count--;
@@ -205,7 +225,7 @@ void OBDisplay::ungrab()
  * if allow_scroll_lock is true then only the top half of the lock mask
  * table is used and scroll lock is ignored.  This value defaults to false.
  */
-void OBDisplay::grabButton(unsigned int button, unsigned int modifiers,
+void Display::grabButton(unsigned int button, unsigned int modifiers,
                          Window grab_window, bool owner_events,
                          unsigned int event_mask, int pointer_mode,
                          int keyboard_mode, Window confine_to,
@@ -213,7 +233,7 @@ void OBDisplay::grabButton(unsigned int button, unsigned int modifiers,
   unsigned int length = (allow_scroll_lock) ? 8 / 2:
                                               8;
   for (size_t cnt = 0; cnt < length; ++cnt)
-    XGrabButton(otk::OBDisplay::display, button, modifiers | _mask_list[cnt],
+    XGrabButton(Display::display, button, modifiers | _mask_list[cnt],
                 grab_window, owner_events, event_mask, pointer_mode,
                 keyboard_mode, confine_to, cursor);
 }
@@ -223,14 +243,14 @@ void OBDisplay::grabButton(unsigned int button, unsigned int modifiers,
  * Releases the grab on a button, and ungrabs all possible combinations of the
  * keyboard lock keys.
  */
-void OBDisplay::ungrabButton(unsigned int button, unsigned int modifiers,
+void Display::ungrabButton(unsigned int button, unsigned int modifiers,
                            Window grab_window) {
   for (size_t cnt = 0; cnt < 8; ++cnt)
-    XUngrabButton(otk::OBDisplay::display, button, modifiers | _mask_list[cnt],
+    XUngrabButton(Display::display, button, modifiers | _mask_list[cnt],
                   grab_window);
 }
 
-void OBDisplay::grabKey(unsigned int keycode, unsigned int modifiers,
+void Display::grabKey(unsigned int keycode, unsigned int modifiers,
                         Window grab_window, bool owner_events,
                         int pointer_mode, int keyboard_mode,
                         bool allow_scroll_lock)
@@ -238,15 +258,15 @@ void OBDisplay::grabKey(unsigned int keycode, unsigned int modifiers,
   unsigned int length = (allow_scroll_lock) ? 8 / 2:
                                               8;
   for (size_t cnt = 0; cnt < length; ++cnt)
-    XGrabKey(otk::OBDisplay::display, keycode, modifiers | _mask_list[cnt],
+    XGrabKey(Display::display, keycode, modifiers | _mask_list[cnt],
                 grab_window, owner_events, pointer_mode, keyboard_mode);
 }
 
-void OBDisplay::ungrabKey(unsigned int keycode, unsigned int modifiers,
+void Display::ungrabKey(unsigned int keycode, unsigned int modifiers,
                           Window grab_window)
 {
   for (size_t cnt = 0; cnt < 8; ++cnt)
-    XUngrabKey(otk::OBDisplay::display, keycode, modifiers | _mask_list[cnt],
+    XUngrabKey(Display::display, keycode, modifiers | _mask_list[cnt],
                grab_window);
 }