X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frenderstyle.hh;h=69c26a7fa189ecf5666e20c3dba0f01cde283462;hb=50002f2ceb4234145f3977bb14752dc930ada26c;hp=2d2c325041b5241121183dffdc90058fa858004c;hpb=9a64438a5a53624e5f5c7c3dbb5123e246693e5e;p=chaz%2Fopenbox

diff --git a/otk/renderstyle.hh b/otk/renderstyle.hh
index 2d2c3250..69c26a7f 100644
--- a/otk/renderstyle.hh
+++ b/otk/renderstyle.hh
@@ -5,8 +5,9 @@
 #include "rendertexture.hh"
 #include "rendercolor.hh"
 #include "font.hh"
+#include "ustring.hh"
 
-#include <string>
+#include <list>
 
 namespace otk {
 
@@ -16,17 +17,37 @@ struct PixmapMask {
   PixmapMask() { mask = None; w = h = 0; }
 };
 
+class RenderStyle;
+
+class StyleNotify {
+public:
+  //! Called when the style is changed on the same screen as the handler.
+  virtual void styleChanged(const RenderStyle &) {}
+};
+
 class RenderStyle {
+  static RenderStyle **_styles;
+  static std::list<StyleNotify*> *_notifies;
 public:
-  enum TextJustify {
-    LeftJustify,
-    RightJustify,
+  static void initialize();
+  static void destroy();
+  static void registerNotify(int screen, StyleNotify *n);
+  static void unregisterNotify(int screen, StyleNotify *n);
+  static RenderStyle *style(int screen);
+  static bool setStyle(int screen, const ustring &stylefile);
+  
+  enum Justify {
+    LeftTopJustify,
+    RightBottomJustify,
     CenterJustify
   };
 
 private:
+  static bool loadStyle(RenderStyle *s, int screen, const ustring &stylefile);
+  static void defaultStyle(RenderStyle *s, int screen);
+  
   int _screen;
-  std::string _file;
+  ustring _file;
 
   RenderColor *_root_color;
   
@@ -61,7 +82,7 @@ private:
   RenderTexture *_grip_unfocus;
 
   Font *_label_font;
-  TextJustify _label_justify;
+  Justify _label_justify;
 
   PixmapMask *_max_mask;
   PixmapMask *_icon_mask;
@@ -72,7 +93,6 @@ private:
   int _bevel_width;
 
 public:
-  RenderStyle(int screen, const std::string &stylefile);
   virtual ~RenderStyle();
 
   inline int screen() const { return _screen; }
@@ -120,7 +140,7 @@ public:
   inline RenderTexture *gripUnfocusBackground() const { return _grip_unfocus; }
 
   inline Font *labelFont() const { return _label_font; }
-  inline TextJustify labelTextJustify() const { return _label_justify; }
+  inline Justify labelTextJustify() const { return _label_justify; }
 
   inline PixmapMask *maximizeMask() const { return _max_mask; }
   inline PixmapMask *iconifyMask() const { return _icon_mask; }