X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbasedisplay.hh;h=aa1481ca5f004f9fc56d8dd62e2bbe2bdaa2c3a6;hb=0089719c806599a405c2def0e1e84a0ac99d9937;hp=117c49d73abd9eae34dcf351181a121991c62e4d;hpb=86bef745b9e974f664752c6cc56f7e6ec5642efc;p=chaz%2Fopenbox

diff --git a/src/basedisplay.hh b/src/basedisplay.hh
index 117c49d7..aa1481ca 100644
--- a/src/basedisplay.hh
+++ b/src/basedisplay.hh
@@ -2,59 +2,19 @@
 #ifndef   __BaseDisplay_hh
 #define   __BaseDisplay_hh
 
+#include "screeninfo.hh"
+#include "timer.hh"
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 }
 
 #include <vector>
-#include <string>
 
 // forward declaration
-class BaseDisplay;
 class BGCCache;
 
-#include "timer.hh"
-#include "util.hh"
-
-class ScreenInfo {
-private:
-  BaseDisplay *basedisplay;
-  Visual *visual;
-  Window root_window;
-  Colormap colormap;
-
-  int depth;
-  unsigned int screen_number;
-  std::string display_string;
-  Rect rect;
-#ifdef XINERAMA
-  RectList xinerama_areas;
-  bool xinerama_active;
-#endif
-
-public:
-  ScreenInfo(BaseDisplay *d, unsigned int num);
-
-  inline BaseDisplay *getBaseDisplay(void) const { return basedisplay; }
-  inline Visual *getVisual(void) const { return visual; }
-  inline Window getRootWindow(void) const { return root_window; }
-  inline Colormap getColormap(void) const { return colormap; }
-  inline int getDepth(void) const { return depth; }
-  inline unsigned int getScreenNumber(void) const
-    { return screen_number; }
-  inline const Rect& getRect(void) const { return rect; }
-  inline unsigned int getWidth(void) const { return rect.width(); }
-  inline unsigned int getHeight(void) const { return rect.height(); }
-  inline const std::string& displayString(void) const
-  { return display_string; }
-#ifdef XINERAMA
-  inline const RectList &getXineramaAreas(void) const { return xinerama_areas; }
-  inline bool isXineramaActive(void) const { return xinerama_active; }
-#endif
-};
-
-
 class BaseDisplay: public TimerQueueManager {
 private:
   struct BShape {