diff options
author | fluxgen <fluxgen> | 2002-01-08 00:14:40 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-01-08 00:14:40 (GMT) |
commit | 351330461f25a138928e970938c9eb4326b5db7c (patch) | |
tree | ef53d5f96477ad59fa53e65a6725737e3964e6df | |
parent | f8f2b874a7411280d9e4179d140cecb7a261231f (diff) | |
download | fluxbox-351330461f25a138928e970938c9eb4326b5db7c.zip fluxbox-351330461f25a138928e970938c9eb4326b5db7c.tar.bz2 |
Fixed rootcommand so we dont need to depend on class Fluxbox
-rw-r--r-- | src/Theme.hh | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/Theme.hh b/src/Theme.hh index 7b973d1..0365114 100644 --- a/src/Theme.hh +++ b/src/Theme.hh | |||
@@ -42,27 +42,31 @@ | |||
42 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 42 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
43 | // DEALINGS IN THE SOFTWARE. | 43 | // DEALINGS IN THE SOFTWARE. |
44 | 44 | ||
45 | // $Id: Theme.hh,v 1.5 2002/01/08 00:14:40 fluxgen Exp $ | ||
46 | |||
45 | #ifndef _THEME_HH_ | 47 | #ifndef _THEME_HH_ |
46 | #define _THEME_HH_ | 48 | #define _THEME_HH_ |
47 | 49 | ||
48 | 50 | ||
49 | #ifndef _IMAGE_HH_ | 51 | #ifndef _IMAGE_HH_ |
50 | #include "Image.hh" | 52 | #include "Image.hh" |
51 | #endif //_IMAGE_HH_ | 53 | #endif //!_IMAGE_HH_ |
52 | 54 | ||
53 | #ifndef _DRAWUTIL_HH_ | 55 | #ifndef _DRAWUTIL_HH_ |
54 | #include "DrawUtil.hh" | 56 | #include "DrawUtil.hh" |
55 | #endif //_MISC_HH_ | 57 | #endif //!_MISC_HH_ |
56 | 58 | ||
57 | #include <X11/Xlib.h> | 59 | #include <X11/Xlib.h> |
58 | #include <X11/Xresource.h> | 60 | #include <X11/Xresource.h> |
59 | 61 | ||
62 | #include <string> | ||
60 | 63 | ||
61 | class Theme | 64 | class Theme |
62 | { | 65 | { |
63 | public: | 66 | public: |
64 | 67 | ||
65 | Theme(Display *display, Window rootwindow, Colormap colormap, int screennum, BImageControl *ic, const char *filename); | 68 | Theme(Display *display, Window rootwindow, Colormap colormap, |
69 | int screennum, BImageControl *ic, const char *filename, const char *rootcommand); | ||
66 | ~Theme(); | 70 | ~Theme(); |
67 | 71 | ||
68 | 72 | ||
@@ -107,10 +111,8 @@ public: | |||
107 | GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc; | 111 | GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc; |
108 | DrawUtil::Font font; | 112 | DrawUtil::Font font; |
109 | 113 | ||
110 | } ToolbarStyle; | 114 | } ToolbarStyle; |
111 | 115 | ||
112 | void load(const char *filename); | ||
113 | void reconfigure(); | ||
114 | inline WindowStyle &getWindowStyle(void) { return m_windowstyle; } | 116 | inline WindowStyle &getWindowStyle(void) { return m_windowstyle; } |
115 | inline MenuStyle &getMenuStyle(void) { return m_menustyle; } | 117 | inline MenuStyle &getMenuStyle(void) { return m_menustyle; } |
116 | inline ToolbarStyle &getToolbarStyle(void) { return m_toolbarstyle; } | 118 | inline ToolbarStyle &getToolbarStyle(void) { return m_toolbarstyle; } |
@@ -120,7 +122,13 @@ public: | |||
120 | inline unsigned int getFrameWidth(void) const { return m_frame_width; } | 122 | inline unsigned int getFrameWidth(void) const { return m_frame_width; } |
121 | inline const GC &getOpGC(void) const { return m_opgc; } | 123 | inline const GC &getOpGC(void) const { return m_opgc; } |
122 | inline const BColor &getBorderColor(void) const { return m_border_color; } | 124 | inline const BColor &getBorderColor(void) const { return m_border_color; } |
123 | 125 | void load(const char *filename); | |
126 | void reconfigure(); | ||
127 | |||
128 | inline void setRootCommand(std::string command) { m_rootcommand = command; } | ||
129 | |||
130 | |||
131 | |||
124 | private: | 132 | private: |
125 | 133 | ||
126 | void loadMenuStyle(); | 134 | void loadMenuStyle(); |
@@ -155,7 +163,8 @@ private: | |||
155 | Display *m_display; | 163 | Display *m_display; |
156 | XrmDatabase m_database; | 164 | XrmDatabase m_database; |
157 | Colormap m_colormap; | 165 | Colormap m_colormap; |
158 | int m_screennum; | 166 | int m_screennum; |
167 | std::string m_rootcommand; | ||
159 | 168 | ||
160 | }; | 169 | }; |
161 | 170 | ||