diff options
author | fluxgen <fluxgen> | 2006-03-18 22:01:06 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2006-03-18 22:01:06 (GMT) |
commit | 302c63e2dfbd426144280cc3d0b64a2d416ebe42 (patch) | |
tree | cc0e8bf6d134c5f2ce2c2d1467d9b35829bb7e48 | |
parent | 4b4c46559b52f94103be060b2e182b1d22d10989 (diff) | |
download | fluxbox_paul-302c63e2dfbd426144280cc3d0b64a2d416ebe42.zip fluxbox_paul-302c63e2dfbd426144280cc3d0b64a2d416ebe42.tar.bz2 |
no more session.titlebar.left/right. They are now screen specific and the resources are created on the fly in FluxboxWindow
-rw-r--r-- | src/fluxbox.hh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index ad75957..da0a60a 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -111,15 +111,12 @@ public: | |||
111 | void removeAtomHandler(AtomHandler *atomh); | 111 | void removeAtomHandler(AtomHandler *atomh); |
112 | 112 | ||
113 | /// obsolete | 113 | /// obsolete |
114 | enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENUICON, EMPTY}; | ||
115 | enum TabsAttachArea{ATTACH_AREA_WINDOW= 0, ATTACH_AREA_TITLEBAR}; | 114 | enum TabsAttachArea{ATTACH_AREA_WINDOW= 0, ATTACH_AREA_TITLEBAR}; |
116 | 115 | ||
117 | 116 | ||
118 | bool getIgnoreBorder() const { return *m_rc_ignoreborder; } | 117 | bool getIgnoreBorder() const { return *m_rc_ignoreborder; } |
119 | bool &getPseudoTrans() { return *m_rc_pseudotrans; } | 118 | bool &getPseudoTrans() { return *m_rc_pseudotrans; } |
120 | 119 | ||
121 | const std::vector<Fluxbox::Titlebar>& getTitlebarRight() const { return *m_rc_titlebar_right; } | ||
122 | const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() const { return *m_rc_titlebar_left; } | ||
123 | Fluxbox::TabsAttachArea getTabsAttachArea() const { return *m_rc_tabs_attach_area; } | 120 | Fluxbox::TabsAttachArea getTabsAttachArea() const { return *m_rc_tabs_attach_area; } |
124 | const std::string &getStyleFilename() const { return *m_rc_stylefile; } | 121 | const std::string &getStyleFilename() const { return *m_rc_stylefile; } |
125 | const std::string &getStyleOverlayFilename() const { return *m_rc_styleoverlayfile; } | 122 | const std::string &getStyleOverlayFilename() const { return *m_rc_styleoverlayfile; } |
@@ -198,7 +195,6 @@ public: | |||
198 | /// get screen from number | 195 | /// get screen from number |
199 | BScreen *findScreen(int num); | 196 | BScreen *findScreen(int num); |
200 | 197 | ||
201 | typedef std::vector<Fluxbox::Titlebar> TitlebarList; | ||
202 | /// @return whether the timestamps on the menu changed | 198 | /// @return whether the timestamps on the menu changed |
203 | bool menuTimestampsChanged() const; | 199 | bool menuTimestampsChanged() const; |
204 | bool haveShape() const { return m_have_shape; } | 200 | bool haveShape() const { return m_have_shape; } |
@@ -235,7 +231,6 @@ private: | |||
235 | void handleUnmapNotify(XUnmapEvent &ue); | 231 | void handleUnmapNotify(XUnmapEvent &ue); |
236 | void handleClientMessage(XClientMessageEvent &ce); | 232 | void handleClientMessage(XClientMessageEvent &ce); |
237 | void handleKeyEvent(XKeyEvent &ke); | 233 | void handleKeyEvent(XKeyEvent &ke); |
238 | void setTitlebar(std::vector<Fluxbox::Titlebar>& dir, const char *arg); | ||
239 | 234 | ||
240 | std::auto_ptr<FbAtoms> m_fbatoms; | 235 | std::auto_ptr<FbAtoms> m_fbatoms; |
241 | 236 | ||
@@ -255,7 +250,6 @@ private: | |||
255 | m_rc_groupfile, m_rc_appsfile; | 250 | m_rc_groupfile, m_rc_appsfile; |
256 | 251 | ||
257 | 252 | ||
258 | FbTk::Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right; | ||
259 | FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area; | 253 | FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area; |
260 | FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; | 254 | FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; |
261 | FbTk::Resource<time_t> m_rc_auto_raise_delay; | 255 | FbTk::Resource<time_t> m_rc_auto_raise_delay; |
@@ -300,7 +294,6 @@ private: | |||
300 | std::auto_ptr<Keys> m_key; | 294 | std::auto_ptr<Keys> m_key; |
301 | 295 | ||
302 | //default arguments for titlebar left and right | 296 | //default arguments for titlebar left and right |
303 | static Fluxbox::Titlebar s_titlebar_left[], s_titlebar_right[]; | ||
304 | static Fluxbox *s_singleton; | 297 | static Fluxbox *s_singleton; |
305 | 298 | ||
306 | typedef std::map<AtomHandler *, std::string> AtomHandlerContainer; | 299 | typedef std::map<AtomHandler *, std::string> AtomHandlerContainer; |