X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fscreeninfo.cc;h=2838c897f888f46180dd3b7f355f2ecc205d21ec;hb=4ef15148365c223b8e810611a10dc27dc5fba355;hp=087f4efdcfb5d301e18eaf10d3dfbad64cdca5b8;hpb=c97915f445017d36667a6ad32767fa41d14d23b1;p=chaz%2Fopenbox

diff --git a/otk/screeninfo.cc b/otk/screeninfo.cc
index 087f4efd..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,13 +15,15 @@ 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(**display, _screen);
 
-  _rect.setSize(WidthOfScreen(ScreenOfDisplay(**display,
-                                              _screen)),
+  _size = Size(WidthOfScreen(ScreenOfDisplay(**display,
+                                             _screen)),
                HeightOfScreen(ScreenOfDisplay(**display,
                                               _screen)));
   /*