X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.hh;h=a1f369569c1c81822bd38774d4336939f8b0672e;hb=373de009f7e98b0c6f3a78f31c1e5c120cd722ed;hp=57a03b0b2979d15c89fff63c409c9afc57eb90c1;hpb=7bf96a9123a9f6b29a4c6168f7391db72f374f8a;p=chaz%2Fopenbox

diff --git a/src/screen.hh b/src/screen.hh
index 57a03b0b..a1f36956 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -1,26 +1,4 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-// Screen.hh for Blackbox - an X11 Window manager
-// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
-// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
 #ifndef   __Screen_hh
 #define   __Screen_hh
 
@@ -42,38 +20,35 @@ extern "C" {
 #include <list>
 #include <vector>
 
-#include "color.hh"
-#include "texture.hh"
-#include "image.hh"
+#include "otk/color.hh"
+#include "otk/font.hh"
+#include "otk/texture.hh"
+#include "otk/image.hh"
 #include "timer.hh"
 #include "workspace.hh"
 #include "blackbox.hh"
 
-class Slit; // forward reference
-class BFont;
+namespace ob {
+
 class XAtom;
 struct Strut;
 
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
 
-#ifdef    BITMAPBUTTONS
 struct PixmapMask {
   Pixmap mask;
   unsigned int w, h;
 };
-#endif // BITMAPBUTTONS
 
 struct WindowStyle {
-  BColor l_text_focus, l_text_unfocus, b_pic_focus,
+  otk::BColor l_text_focus, l_text_unfocus, b_pic_focus,
     b_pic_unfocus;
-  BTexture f_focus, f_unfocus, t_focus, t_unfocus, l_focus, l_unfocus,
+  otk::BTexture f_focus, f_unfocus, t_focus, t_unfocus, l_focus, l_unfocus,
     h_focus, h_unfocus, b_focus, b_unfocus, b_pressed, b_pressed_focus,
     b_pressed_unfocus, g_focus, g_unfocus;
 
-#ifdef    BITMAPBUTTONS
   PixmapMask close_button, max_button, icon_button, stick_button;
-#endif // BITMAPBUTTONS
-  BFont *font;
+  otk::BFont *font;
 
   TextJustify justify;
 
@@ -81,7 +56,7 @@ struct WindowStyle {
                  unsigned int max_length, unsigned int modifier) const;
 };
 
-class BScreen : public ScreenInfo {
+class BScreen : public otk::ScreenInfo {
 private:
   bool root_colormap_installed, managed, geom_visible;
   GC opGC;
@@ -89,7 +64,7 @@ private:
   Window geom_window;
 
   Blackbox *blackbox;
-  BImageControl *image_control;
+  otk::BImageControl *image_control;
   Configuration *config;
   XAtom *xatom;
 
@@ -103,7 +78,7 @@ private:
   unsigned int geom_w, geom_h;
   unsigned long event_mask;
 
-  Rect usableArea;
+  otk::Rect usableArea;
 #ifdef    XINERAMA
   RectList xineramaUsableArea;
 #endif // XINERAMA
@@ -124,7 +99,7 @@ private:
     int snap_to_windows, snap_to_edges;
     unsigned int snap_offset;
 
-    BColor border_color;
+    otk::BColor border_color;
 
     unsigned int workspaces;
     int placement_policy,
@@ -142,21 +117,19 @@ private:
   BScreen(const BScreen&);
   BScreen& operator=(const BScreen&);
 
-#ifdef    BITMAPBUTTONS
   void readDatabaseMask(const std::string &rname,
                         PixmapMask &pixmapMask,
                         const Configuration &style);
-#endif // BITMAPBUTTONS
   
-  BTexture readDatabaseTexture(const std::string &rname,
+  otk::BTexture readDatabaseTexture(const std::string &rname,
                                const std::string &default_color,
                                const Configuration &style, 
                                bool allowNoTexture = false);
-  BColor readDatabaseColor(const std::string &rname,
+  otk::BColor readDatabaseColor(const std::string &rname,
                            const std::string &default_color,
                            const Configuration &style);
-  BFont *readDatabaseFont(const std::string &rbasename,
-                          const Configuration &style);
+  otk::BFont *readDatabaseFont(const std::string &rbasename,
+                               const Configuration &style);
 
   void LoadStyle(void);
 
@@ -210,8 +183,8 @@ public:
   inline const GC &getOpGC(void) const { return opGC; }
 
   inline Blackbox *getBlackbox(void) { return blackbox; }
-  inline BColor *getBorderColor(void) { return &resource.border_color; }
-  inline BImageControl *getImageControl(void) { return image_control; }
+  inline otk::BColor *getBorderColor(void) { return &resource.border_color; }
+  inline otk::BImageControl *getImageControl(void) { return image_control; }
 
   Workspace *getWorkspace(unsigned int index) const;
 
@@ -292,7 +265,7 @@ public:
 
   // allAvailableAreas should be used whenever possible instead of this function
   // as then Xinerama will work correctly.
-  const Rect& availableArea(void) const;
+  const otk::Rect& availableArea(void) const;
 #ifdef    XINERAMA
   const RectList& allAvailableAreas(void) const;
 #endif // XINERAMA
@@ -336,5 +309,6 @@ public:
   void propertyNotifyEvent(const XPropertyEvent *pe);
 };
 
+}
 
 #endif // __Screen_hh