sync with the 2.0 branch

[chaz/openbox] / src / BaseDisplay.cc

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 21f9ab532a46a3faf29dec38748443d04f7f656f..51d79399c41ca6ba18d1fb14238f5551e02f55ef 100644 (file)
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -35,6 +35,10 @@ extern "C" {
 #  include <X11/extensions/shape.h>
 #endif // SHAPE
 
+#ifdef    XINERAMA
+#  include <X11/extensions/Xinerama.h>
+#endif // XINERAMA
+
 #ifdef    HAVE_FCNTL_H
 #  include <fcntl.h>
 #endif // HAVE_FCNTL_H
@@ -78,7 +82,7 @@ extern "C" {
 #endif // HAVE_SYS_WAIT_H
 }
 
-#include <sstream>
+#include <string>
 using std::string;
 
 #include "i18n.hh"
@@ -232,13 +236,27 @@ BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name) {
   shape.extensions = False;
 #endif // SHAPE
 
+#ifdef    XINERAMA
+  if (XineramaQueryExtension(display, &xinerama.event_basep,
+                             &xinerama.error_basep) &&
+      XineramaQueryVersion(display, &xinerama.major, &xinerama.minor)) {
+#ifdef    DEBUG
+    fprintf(stderr,
+            "BaseDisplay::BaseDisplay: Found Xinerama version %d.%d\n",
+            xinerama.major, xinerama.minor);
+#endif // DEBUG
+    xinerama.extensions = True;
+  } else {
+    xinerama.extensions = False;
+  }
+#endif // XINERAMA
+
   XSetErrorHandler((XErrorHandler) handleXErrors);
 
   screenInfoList.reserve(ScreenCount(display));
   for (int i = 0; i < ScreenCount(display); ++i)
     screenInfoList.push_back(ScreenInfo(this, i));
 
-#ifndef   NOCLOBBER
   NumLockMask = ScrollLockMask = 0;
 
   const XModifierKeymap* const modmap = XGetModifierMapping(display);
@@ -268,20 +286,16 @@ BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name) {
   MaskList[0] = 0;
   MaskList[1] = LockMask;
   MaskList[2] = NumLockMask;
-  MaskList[3] = ScrollLockMask;
-  MaskList[4] = LockMask | NumLockMask;
-  MaskList[5] = NumLockMask  | ScrollLockMask;
-  MaskList[6] = LockMask | ScrollLockMask;
-  MaskList[7] = LockMask | NumLockMask | ScrollLockMask;
+  MaskList[3] = LockMask | NumLockMask;
+  MaskList[4] = ScrollLockMask;
+  MaskList[5] = ScrollLockMask | LockMask;
+  MaskList[6] = ScrollLockMask | NumLockMask;
+  MaskList[7] = ScrollLockMask | LockMask | NumLockMask;
   MaskListLength = sizeof(MaskList) / sizeof(MaskList[0]);
 
   if (modmap) XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
-#else  // NOCLOBBER
-  NumLockMask = 0;
-  ScrollLockMask = 0;
-#endif // NOCLOBBER
 
-  gccache = 0;
+  gccache = (BGCCache *) 0;
 }
 
 
@@ -359,36 +373,32 @@ void BaseDisplay::removeTimer(BTimer *timer) {
 /*
  * Grabs a button, but also grabs the button in every possible combination
  * with the keyboard lock keys, so that they do not cancel out the event.
+
+ * 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 BaseDisplay::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,
-                             Cursor cursor) const {
-#ifndef   NOCLOBBER
-  for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
+                             Cursor cursor, bool allow_scroll_lock) const {
+  unsigned int length = (allow_scroll_lock) ? MaskListLength / 2:
+                                              MaskListLength;
+  for (size_t cnt = 0; cnt < length; ++cnt)
     XGrabButton(display, button, modifiers | MaskList[cnt], grab_window,
                 owner_events, event_mask, pointer_mode, keyboard_mode,
                 confine_to, cursor);
-#else  // NOCLOBBER
-  XGrabButton(display, button, modifiers, grab_window,
-              owner_events, event_mask, pointer_mode, keyboard_mode,
-              confine_to, cursor);
-#endif // NOCLOBBER
 }
 
+
 /*
  * Releases the grab on a button, and ungrabs all possible combinations of the
  * keyboard lock keys.
  */
 void BaseDisplay::ungrabButton(unsigned int button, unsigned int modifiers,
                                Window grab_window) const {
-#ifndef   NOCLOBBER
   for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
     XUngrabButton(display, button, modifiers | MaskList[cnt], grab_window);
-#else  // NOCLOBBER
-  XUngrabButton(display, button, modifiers, grab_window);
-#endif // NOCLOBBER
 }
 
 
@@ -399,10 +409,11 @@ const ScreenInfo* BaseDisplay::getScreenInfo(unsigned int s) const {
 }
 
 
-BGCCache *BaseDisplay::gcCache(void) const
-{
-    if (! gccache) gccache = new BGCCache(this);
-    return gccache;
+BGCCache* BaseDisplay::gcCache(void) const {
+  if (! gccache)
+    gccache = new BGCCache(this, screenInfoList.size());
+  
+  return gccache;
 }
 
 
@@ -468,7 +479,44 @@ ScreenInfo::ScreenInfo(BaseDisplay *d, unsigned int num) {
   if (pos != string::npos)
     default_string.resize(pos);
 
-  std::ostringstream formatter;
-  formatter << "DISPLAY=" << default_string << '.' << screen_number;
-  display_string = formatter.str();
+  display_string = string("DISPLAY=") + default_string + '.' +
+    itostring(static_cast<unsigned long>(screen_number));
+  
+#ifdef    XINERAMA
+  xinerama_active = False;
+
+  if (d->hasXineramaExtensions()) {
+    if (d->getXineramaMajorVersion() == 1) {
+      // we know the version 1(.1?) protocol
+
+      /*
+         in this version of Xinerama, we can't query on a per-screen basis, but
+         in future versions we should be able, so the 'activeness' is checked
+         on a pre-screen basis anyways.
+      */
+      if (XineramaIsActive(d->getXDisplay())) {
+        /*
+           If Xinerama is being used, there there is only going to be one screen
+           present. We still, of course, want to use the screen class, but that
+           is why no screen number is used in this function call. There should
+           never be more than one screen present with Xinerama active.
+        */
+        int num;
+        XineramaScreenInfo *info = XineramaQueryScreens(d->getXDisplay(), &num);
+        if (num > 0 && info) {
+          xinerama_areas.reserve(num);
+          for (int i = 0; i < num; ++i) {
+            xinerama_areas.push_back(Rect(info[i].x_org, info[i].y_org,
+                                          info[i].width, info[i].height));
+          }
+          XFree(info);
+
+          // if we can't find any xinerama regions, then we act as if it is not
+          // active, even though it said it was
+          xinerama_active = True;
+        }
+      }
+    }
+  }
+#endif // XINERAMA
 }