merge the C branch into HEAD

[chaz/openbox] / otk / screeninfo.cc

diff --git a/otk/screeninfo.cc b/otk/screeninfo.cc
index a5fafc5a47903b6c5cfd14da5808c8b13533bf01..368ae982893f4d90dd65ff57daecd662acfbb38c 100644 (file)
--- a/otk/screeninfo.cc
+++ b/otk/screeninfo.cc
@@ -1,8 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -17,71 +15,27 @@ using std::string;
 
 namespace otk {
 
-ScreenInfo::ScreenInfo(unsigned int num) {
+ScreenInfo::ScreenInfo(int num) {
+  assert(num >= 0 && num < ScreenCount(**display));
+  
   _screen = num;
 
-  _root_window = RootWindow(OBDisplay::display, _screen);
+  _root_window = RootWindow(**display, _screen);
 
-  _rect.setSize(WidthOfScreen(ScreenOfDisplay(OBDisplay::display,
-                                              _screen)),
-               HeightOfScreen(ScreenOfDisplay(OBDisplay::display,
+  _size = Size(WidthOfScreen(ScreenOfDisplay(**display,
+                                             _screen)),
+               HeightOfScreen(ScreenOfDisplay(**display,
                                               _screen)));
-  /*
-    If the default depth is at least 8 we will use that,
-    otherwise we try to find the largest TrueColor visual.
-    Preference is given to 24 bit over larger depths if 24 bit is an option.
-  */
-
-  _depth = DefaultDepth(OBDisplay::display, _screen);
-  _visual = DefaultVisual(OBDisplay::display, _screen);
-  _colormap = DefaultColormap(OBDisplay::display, _screen);
-  
-  if (_depth < 8) {
-    // search for a TrueColor Visual... if we can't find one...
-    // we will use the default visual for the screen
-    XVisualInfo vinfo_template, *vinfo_return;
-    int vinfo_nitems;
-    int best = -1;
-
-    vinfo_template.screen = _screen;
-    vinfo_template.c_class = TrueColor;
-
-    vinfo_return = XGetVisualInfo(OBDisplay::display,
-                                  VisualScreenMask | VisualClassMask,
-                                  &vinfo_template, &vinfo_nitems);
-    if (vinfo_return) {
-      int max_depth = 1;
-      for (int i = 0; i < vinfo_nitems; ++i) {
-        if (vinfo_return[i].depth > max_depth) {
-          if (max_depth == 24 && vinfo_return[i].depth > 24)
-            break;          // prefer 24 bit over 32
-          max_depth = vinfo_return[i].depth;
-          best = i;
-        }
-      }
-      if (max_depth < _depth) best = -1;
-    }
-
-    if (best != -1) {
-      _depth = vinfo_return[best].depth;
-      _visual = vinfo_return[best].visual;
-      _colormap = XCreateColormap(OBDisplay::display, _root_window, _visual,
-                                  AllocNone);
-    }
-
-    XFree(vinfo_return);
-  }
-
   // get the default display string and strip the screen number
-  string default_string = DisplayString(OBDisplay::display);
+  string default_string = DisplayString(**display);
   const string::size_type pos = default_string.rfind(".");
   if (pos != string::npos)
     default_string.resize(pos);
 
   _display_string = string("DISPLAY=") + default_string + '.' +
-    otk::itostring(static_cast<unsigned long>(_screen));
-  
-#ifdef    XINERAMA
+    itostring(static_cast<unsigned long>(_screen));
+
+#if 0 //def    XINERAMA
   _xinerama_active = False;
 
   if (d->hasXineramaExtensions()) {
@@ -93,7 +47,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
         in future versions we should be able, so the 'activeness' is checked
         on a pre-screen basis anyways.
       */
-      if (XineramaIsActive(OBDisplay::display)) {
+      if (XineramaIsActive(**display)) {
         /*
           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
@@ -101,8 +55,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
           never be more than one screen present with Xinerama active.
         */
         int num;
-        XineramaScreenInfo *info = XineramaQueryScreens(OBDisplay::display,
-                                                        &num);
+        XineramaScreenInfo *info = XineramaQueryScreens(**display, &num);
         if (num > 0 && info) {
           _xinerama_areas.reserve(num);
           for (int i = 0; i < num; ++i) {
@@ -113,12 +66,16 @@ ScreenInfo::ScreenInfo(unsigned int num) {
 
           // 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;
+          _xinerama_active = true;
         }
       }
     }
   }
+#else
+  _xinerama_active = false;
 #endif // XINERAMA
+  if (!_xinerama_active)
+    _xinerama_areas.push_back(Rect(Point(0, 0), _size));
 }
 
 }