WE DONT USE BASE DISPLAY FOR ANYTHING ANY MORE!!@^!*@*!! YAY

[chaz/openbox] / otk / screeninfo.cc

diff --git a/otk/screeninfo.cc b/otk/screeninfo.cc
index 22ec6d02e02e6871c1474cace057901c75b518ff..c1c0c2acc80e563d52e58272241e592660170015 100644 (file)
--- a/otk/screeninfo.cc
+++ b/otk/screeninfo.cc
@@ -4,8 +4,14 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+extern "C" {
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+}
+
 #include "screeninfo.hh"
 #include "display.hh"
+#include "src/util.hh"
 
 using std::string;
 
@@ -14,7 +20,7 @@ namespace otk {
 ScreenInfo::ScreenInfo(unsigned int num) {
   screen_number = num;
 
-  root_window = RootWindow(ob::OBDisplay::display, screen_number);
+  root_window = RootWindow(OBDisplay::display, screen_number);
 
   rect.setSize(WidthOfScreen(ScreenOfDisplay(OBDisplay::display,
                                              screen_number)),
@@ -73,7 +79,7 @@ ScreenInfo::ScreenInfo(unsigned int num) {
     default_string.resize(pos);
 
   display_string = string("DISPLAY=") + default_string + '.' +
-    itostring(static_cast<unsigned long>(screen_number));
+    ob::itostring(static_cast<unsigned long>(screen_number));
   
 #ifdef    XINERAMA
   xinerama_active = False;