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

diff --git a/otk/renderstyle.hh b/otk/renderstyle.hh
index 7bebf418..69745533 100644
--- a/otk/renderstyle.hh
+++ b/otk/renderstyle.hh
@@ -7,6 +7,7 @@
 #include "font.hh"
 
 #include <string>
+#include <list>
 
 namespace otk {
 
@@ -16,17 +17,35 @@ 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);
+  
+  enum Justify {
+    LeftTopJustify,
+    RightBottomJustify,
     CenterJustify
   };
 
 private:
   int _screen;
   std::string _file;
+
+  RenderColor *_root_color;
   
   RenderColor *_text_color_focus;
   RenderColor *_text_color_unfocus;
@@ -59,11 +78,11 @@ 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;
@@ -75,6 +94,8 @@ public:
 
   inline int screen() const { return _screen; }
   
+  inline RenderColor *rootColor() const { return _root_color; }
+  
   inline RenderColor *textFocusColor() const { return _text_color_focus; }
   inline RenderColor *textUnfocusColor() const { return _text_color_unfocus; }
 
@@ -116,11 +137,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; }