X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fscreeninfo.cc;h=2838c897f888f46180dd3b7f355f2ecc205d21ec;hb=8269fc2b3965d12ba308caa554bfa7ee037fba13;hp=a5fafc5a47903b6c5cfd14da5808c8b13533bf01;hpb=06de24ec6666578759eff2b348e50f5e8e20f3bd;p=chaz%2Fopenbox

diff --git a/otk/screeninfo.cc b/otk/screeninfo.cc
index a5fafc5a..2838c897 100644
--- 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,14 +15,16 @@ 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,
@@ -32,9 +32,9 @@ ScreenInfo::ScreenInfo(unsigned int num) {
     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);
+  _depth = DefaultDepth(**display, _screen);
+  _visual = DefaultVisual(**display, _screen);
+  _colormap = DefaultColormap(**display, _screen);
   
   if (_depth < 8) {
     // search for a TrueColor Visual... if we can't find one...
@@ -46,7 +46,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
     vinfo_template.screen = _screen;
     vinfo_template.c_class = TrueColor;
 
-    vinfo_return = XGetVisualInfo(OBDisplay::display,
+    vinfo_return = XGetVisualInfo(**display,
                                   VisualScreenMask | VisualClassMask,
                                   &vinfo_template, &vinfo_nitems);
     if (vinfo_return) {
@@ -65,7 +65,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
     if (best != -1) {
       _depth = vinfo_return[best].depth;
       _visual = vinfo_return[best].visual;
-      _colormap = XCreateColormap(OBDisplay::display, _root_window, _visual,
+      _colormap = XCreateColormap(**display, _root_window, _visual,
                                   AllocNone);
     }
 
@@ -73,15 +73,15 @@ ScreenInfo::ScreenInfo(unsigned int num) {
   }
 
   // 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));
+    itostring(static_cast<unsigned long>(_screen));
   
-#ifdef    XINERAMA
+#if 0 //def    XINERAMA
   _xinerama_active = False;
 
   if (d->hasXineramaExtensions()) {
@@ -93,7 +93,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 +101,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) {