1 files changed, 74 insertions, 65 deletions

diff --git a/src/Theme.hh b/src/Theme.hh
index c090a19..1401716 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -1,5 +1,5 @@
 // Theme.hh for fluxbox 
-// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -42,85 +42,92 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 //  DEALINGS IN THE SOFTWARE.
 
-#ifndef _THEME_HH_
-#define _THEME_HH_
+// $Id: Theme.hh,v 1.9 2002/05/15 09:35:49 fluxgen Exp $
 
+#ifndef THEME_HH
+#define THEME_HH
 
 #include "Image.hh"
+#include "DrawUtil.hh"
+#include "Font.hh"
+
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
-#include "Rotated.hh" // TODO: should bake this into misc.hh some day
+#include <string>
 
-typedef struct FFont 
+class Theme
 {
-        enum FontJustify {Left=0, Right, Center};
+public: 
+                
+        Theme(Display *display, Window rootwindow, Colormap colormap, 
+                int screennum, BImageControl *ic, const char *filename, const char *rootcommand);
+        ~Theme();       
         
-        XFontSet set;
-        XFontSetExtents *set_extents;
-        XFontStruct *fontstruct;
-        FontJustify justify;
-} FFont;
-
-typedef struct LabelStyle
-{
-        BTexture l_focus, l_unfocus,
-                t_focus, t_unfocus;     
-        GC l_text_focus_gc, l_text_unfocus_gc;
-        FFont font;
-        BColor l_text_focus, l_text_unfocus;
-} LabelStyle;
-
-typedef struct WindowStyle:public LabelStyle {
-        BColor f_focus, f_unfocus, b_pic_focus,
-                b_pic_unfocus;
-        BTexture h_focus, h_unfocus,
-                b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
-        GC b_pic_focus_gc, b_pic_unfocus_gc;
-
-        struct t_tab:public LabelStyle {
-                BColor border_color;
-                unsigned int border_width;
-                unsigned int border_width_2x;
-                XRotFontStruct *rot_font;
-        } tab;
         
-} WindowStyle;
-
-typedef struct ToolbarStyle {
-        BColor l_text, w_text, c_text, b_pic;
-        BTexture toolbar, label, window, button, pressed, clock;
-        GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc;
-        FFont font;
-
-} ToolbarStyle;
+        typedef struct MenuStyle {
+                MenuStyle(Display *display):titlefont(display, "fixed"),
+                        framefont(display, "fixed") { }
+                BColor t_text, f_text, h_text, d_text;
+                BTexture title, frame, hilite;
+                GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
+                FbTk::Font titlefont, framefont;
+                DrawUtil::Font::FontJustify framefont_justify;
+                DrawUtil::Font::FontJustify titlefont_justify;
+                int bullet, bullet_pos;
+        } MenuStyle;
+        
+        typedef struct LabelStyle
+        {
+                BTexture l_focus, l_unfocus,
+                        t_focus, t_unfocus;     
+                GC l_text_focus_gc, l_text_unfocus_gc;
+                DrawUtil::Font font;
+                BColor l_text_focus, l_text_unfocus;
+        } LabelStyle;
 
-typedef struct MenuStyle {
-        BColor t_text, f_text, h_text, d_text;
-        BTexture title, frame, hilite;
-        GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
-        FFont titlefont, framefont;
-        int bullet, bullet_pos;
-} MenuStyle;
+        
+        typedef struct WindowStyle:public LabelStyle {
+                BColor f_focus, f_unfocus, b_pic_focus,
+                        b_pic_unfocus;
+                BTexture h_focus, h_unfocus,
+                        b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
+                GC b_pic_focus_gc, b_pic_unfocus_gc;
+
+                struct t_tab:public LabelStyle {
+                        BColor border_color;
+                        unsigned int border_width;
+                        unsigned int border_width_2x;
+                        DrawUtil::XRotFontStruct *rot_font;
+                } tab;
+        
+        } WindowStyle;
 
-//singleton class
-class Theme
-{
-public: 
-        Theme(Display *display, Colormap colormap, int screennum, BImageControl *ic, const char *filename);
-        ~Theme();       
+        
+        typedef struct ToolbarStyle {
+                BColor l_text, w_text, c_text, b_pic;
+                BTexture toolbar, label, window, button, pressed, clock;
+                GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc;
+                DrawUtil::Font font;
 
+        } ToolbarStyle; 
+        
+        inline WindowStyle &getWindowStyle(void) { return m_windowstyle; }
+        inline MenuStyle &getMenuStyle(void) { return m_menustyle; }
+        inline ToolbarStyle &getToolbarStyle(void) { return m_toolbarstyle; }
+        inline unsigned int getBevelWidth(void) const { return m_bevel_width; }
+        inline unsigned int getBorderWidth(void) const { return m_border_width; }
+        inline unsigned int getHandleWidth(void) const { return m_handle_width; }
+        inline unsigned int getFrameWidth(void) const { return m_frame_width; }
+        inline const GC &getOpGC(void) const { return m_opgc; }
+        inline const BColor &getBorderColor(void) const { return m_border_color; }
         void load(const char *filename);
         void reconfigure();
-        inline WindowStyle *getWindowStyle(void) { return &m_windowstyle; }
-        inline MenuStyle *getMenuStyle(void) { return &m_menustyle; }
-        inline ToolbarStyle *getToolbarStyle(void) { return &m_toolbarstyle; }
-        inline const unsigned int & getBevelWidth(void) const { return m_bevel_width; }
-        inline const unsigned int & getBorderWidth(void) const { return m_border_width; }
-        inline const unsigned int & getHandleWidth(void) const { return m_handle_width; }
-        inline const unsigned int & getFrameWidth(void) const { return m_frame_width; }
-        inline const GC &getOpGC(void) const { return m_opgc; }
-        inline const BColor & getBorderColor(void) const { return m_border_color; }
+        
+        inline void setRootCommand(std::string command) { m_rootcommand = command; }
+        
+        
+        
 private:
         
         void loadMenuStyle();
@@ -156,6 +163,8 @@ private:
         XrmDatabase m_database;
         Colormap m_colormap;
         int m_screennum;
+        std::string m_rootcommand;
+
 };