X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frenderstyle.hh;h=0f512148e94e6f503885b13528726a13b541680c;hb=33a6fde970f29c8aeb4237cbf467d01ab4bcd73e;hp=7bebf418efbab22dfb2449f97bd9f03774f63540;hpb=17d63184998b747e1a0554dc4364a36238b039e1;p=chaz%2Fopenbox

diff --git a/otk/renderstyle.hh b/otk/renderstyle.hh
index 7bebf418..0f512148 100644
--- a/otk/renderstyle.hh
+++ b/otk/renderstyle.hh
@@ -5,7 +5,9 @@
 #include "rendertexture.hh"
 #include "rendercolor.hh"
 #include "font.hh"
+#include "ustring.hh"
 
+#include <list>
 #include <string>
 
 namespace otk {
@@ -16,17 +18,39 @@ 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;
+
+  std::string _root_args;
   
   RenderColor *_text_color_focus;
   RenderColor *_text_color_unfocus;
@@ -59,22 +83,23 @@ private:
   RenderTexture *_grip_unfocus;
 
   Font *_label_font;
-  TextJustify _label_justify;
+  Justify _label_justify;
 
   PixmapMask *_max_mask;
   PixmapMask *_icon_mask;
-  PixmapMask *_stick_mask;
+  PixmapMask *_alldesk_mask;
   PixmapMask *_close_mask;
 
   int _handle_width;
   int _bevel_width;
 
 public:
-  RenderStyle(int screen, const std::string &stylefile);
   virtual ~RenderStyle();
 
   inline int screen() const { return _screen; }
   
+  inline const std::string& rootArgs() const { return _root_args; }
+  
   inline RenderColor *textFocusColor() const { return _text_color_focus; }
   inline RenderColor *textUnfocusColor() const { return _text_color_unfocus; }
 
@@ -116,11 +141,11 @@ 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; }
-  inline PixmapMask *stickyMask() const { return _stick_mask; }
+  inline PixmapMask *alldesktopsMask() const { return _alldesk_mask; }
   inline PixmapMask *closeMask() const { return _close_mask; }
   
   inline int handleWidth() const { return _handle_width; }
@@ -129,4 +154,4 @@ public:
 
 }
 
-#endif // __rendertexture_hh
+#endif // __renderstyle_hh