fixed bugs, got otkapp to select on a fd, modded widget to make use of otkapp, press...

[chaz/openbox] / otk / font.hh

diff --git a/otk/font.hh b/otk/font.hh
index c070bbff9a4511d2589878eca0f171c3daba0d7e..8afd2bd10bd6aa22efe753061ec3dc66ebfa344b 100644 (file)
--- a/otk/font.hh
+++ b/otk/font.hh
@@ -4,19 +4,18 @@
 
 extern "C" {
 #include <X11/Xlib.h>
-
 #include <X11/Xft/Xft.h>
 }
 
 #include <assert.h>
-
 #include <string>
 
+namespace otk {
+
 class BGCCache;
 class BGCCacheItem;
 class BColor;
-
-#include "screen.hh"
+class ScreenInfo;
 
 class BFont {
   /*
@@ -36,8 +35,7 @@ public:
    * instance members
    */
 private:
-  Display          *_display;
-  BScreen          *_screen;
+  int               _screen_num;
 
   std::string       _family;
   bool              _simplename;  // true if not spec'd as a -*-* string
@@ -58,7 +56,7 @@ private:
 
 public:
   // loads an Xft font
-  BFont(Display *d, BScreen *screen, const std::string &family, int size,
+  BFont(int screen_num, const std::string &family, int size,
         bool bold, bool italic, bool shadow, unsigned char offset, 
         unsigned char tint, bool antialias = True);
   virtual ~BFont(void);
@@ -79,4 +77,6 @@ public:
                   const std::string &string) const;
 };
 
+}
+
 #endif // __Font_hh