diff options
author | fluxgen <fluxgen> | 2004-04-18 21:16:06 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2004-04-18 21:16:06 (GMT) |
commit | 5fb30d4bfc04206367bc46fee6c22fd3835721cf (patch) | |
tree | 32a4e237a7b562c9cdeca78c1b5936123be13709 /src/fluxbox.hh | |
parent | dd37eb9d4e284b40c7216834874036684188b125 (diff) | |
download | fluxbox_pavel-5fb30d4bfc04206367bc46fee6c22fd3835721cf.zip fluxbox_pavel-5fb30d4bfc04206367bc46fee6c22fd3835721cf.tar.bz2 |
changed atomhandlerlist to a map so we can get atomhandlers by name, patch from Mathias Gumz
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r-- | src/fluxbox.hh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index f063a1b..8c4630f 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.hh,v 1.84 2004/03/21 09:00:25 rathnor Exp $ | 25 | // $Id: fluxbox.hh,v 1.85 2004/04/18 21:16:06 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FLUXBOX_HH | 27 | #ifndef FLUXBOX_HH |
28 | #define FLUXBOX_HH | 28 | #define FLUXBOX_HH |
@@ -101,7 +101,8 @@ public: | |||
101 | inline unsigned int getUpdateDelayTime() const { return *m_rc_update_delay_time; } | 101 | inline unsigned int getUpdateDelayTime() const { return *m_rc_update_delay_time; } |
102 | inline Time getLastTime() const { return m_last_time; } | 102 | inline Time getLastTime() const { return m_last_time; } |
103 | 103 | ||
104 | void addAtomHandler(AtomHandler *atomh); | 104 | const AtomHandler* getAtomHandler(std::string name); |
105 | void addAtomHandler(AtomHandler *atomh, std::string name= ""); | ||
105 | void removeAtomHandler(AtomHandler *atomh); | 106 | void removeAtomHandler(AtomHandler *atomh); |
106 | 107 | ||
107 | /// obsolete | 108 | /// obsolete |
@@ -292,7 +293,11 @@ private: | |||
292 | //default arguments for titlebar left and right | 293 | //default arguments for titlebar left and right |
293 | static Fluxbox::Titlebar s_titlebar_left[], s_titlebar_right[]; | 294 | static Fluxbox::Titlebar s_titlebar_left[], s_titlebar_right[]; |
294 | static Fluxbox *s_singleton; | 295 | static Fluxbox *s_singleton; |
295 | std::vector<AtomHandler *> m_atomhandler; | 296 | |
297 | typedef std::map<AtomHandler *, std::string> AtomHandlerContainer; | ||
298 | typedef AtomHandlerContainer::iterator AtomHandlerContainerIt; | ||
299 | |||
300 | AtomHandlerContainer m_atomhandler; | ||
296 | std::vector<Toolbar *> m_toolbars; | 301 | std::vector<Toolbar *> m_toolbars; |
297 | 302 | ||
298 | bool m_starting; | 303 | bool m_starting; |