diff options
author | fluxgen <fluxgen> | 2003-04-14 15:28:52 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-04-14 15:28:52 (GMT) |
commit | fd6d2d20d9a15fa12abe24a0ed10362c7e096470 (patch) | |
tree | 7027aa9a331044d73bf4917528ce89ac8b29bf29 /src/fluxbox.hh | |
parent | 2928b32f3a399527113325de3db39cd75db4ee8e (diff) | |
download | fluxbox-fd6d2d20d9a15fa12abe24a0ed10362c7e096470.zip fluxbox-fd6d2d20d9a15fa12abe24a0ed10362c7e096470.tar.bz2 |
merged with embedded-tab-branch
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r-- | src/fluxbox.hh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index 4d441e2..e214979 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.46 2003/04/07 13:56:20 fluxgen Exp $ | 25 | // $Id: fluxbox.hh,v 1.47 2003/04/14 15:25:14 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FLUXBOX_HH | 27 | #ifndef FLUXBOX_HH |
28 | #define FLUXBOX_HH | 28 | #define FLUXBOX_HH |
@@ -65,7 +65,6 @@ | |||
65 | 65 | ||
66 | class AtomHandler; | 66 | class AtomHandler; |
67 | class FluxboxWindow; | 67 | class FluxboxWindow; |
68 | class Tab; | ||
69 | 68 | ||
70 | /** | 69 | /** |
71 | main class for the window manager. | 70 | main class for the window manager. |
@@ -81,9 +80,7 @@ public: | |||
81 | 80 | ||
82 | static Fluxbox *instance() { return singleton; } | 81 | static Fluxbox *instance() { return singleton; } |
83 | 82 | ||
84 | inline bool useTabs() { return *m_rc_tabs; } | ||
85 | inline bool useIconBar() { return *m_rc_iconbar; } | 83 | inline bool useIconBar() { return *m_rc_iconbar; } |
86 | inline void saveTabs(bool value) { *m_rc_tabs = value; } | ||
87 | inline void saveIconBar(bool value) { m_rc_iconbar = value; } | 84 | inline void saveIconBar(bool value) { m_rc_iconbar = value; } |
88 | #ifdef HAVE_GETPID | 85 | #ifdef HAVE_GETPID |
89 | inline Atom getFluxboxPidAtom() const { return fluxbox_pid; } | 86 | inline Atom getFluxboxPidAtom() const { return fluxbox_pid; } |
@@ -99,8 +96,6 @@ public: | |||
99 | inline const Time &getDoubleClickInterval() const { return resource.double_click_interval; } | 96 | inline const Time &getDoubleClickInterval() const { return resource.double_click_interval; } |
100 | inline const Time &getLastTime() const { return last_time; } | 97 | inline const Time &getLastTime() const { return last_time; } |
101 | 98 | ||
102 | Tab *searchTab(Window); | ||
103 | |||
104 | /// obsolete | 99 | /// obsolete |
105 | enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY}; | 100 | enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY}; |
106 | 101 | ||
@@ -156,15 +151,12 @@ public: | |||
156 | void saveTitlebarFilename(const char *); | 151 | void saveTitlebarFilename(const char *); |
157 | void saveSlitlistFilename(const char *val) { m_rc_slitlistfile = (val == 0 ? "" : val); } | 152 | void saveSlitlistFilename(const char *val) { m_rc_slitlistfile = (val == 0 ? "" : val); } |
158 | void saveWindowSearch(Window, FluxboxWindow *); | 153 | void saveWindowSearch(Window, FluxboxWindow *); |
159 | void saveTabSearch(Window, Tab *); | ||
160 | void saveGroupSearch(Window, FluxboxWindow *); | 154 | void saveGroupSearch(Window, FluxboxWindow *); |
161 | void save_rc(); | 155 | void save_rc(); |
162 | void removeWindowSearch(Window); | 156 | void removeWindowSearch(Window); |
163 | void removeTabSearch(Window); | ||
164 | void removeGroupSearch(Window); | 157 | void removeGroupSearch(Window); |
165 | void restart(const char * = 0); | 158 | void restart(const char * = 0); |
166 | void reconfigure(); | 159 | void reconfigure(); |
167 | void reconfigureTabs(); | ||
168 | void rereadMenu(); | 160 | void rereadMenu(); |
169 | void checkMenu(); | 161 | void checkMenu(); |
170 | 162 | ||
@@ -218,7 +210,7 @@ private: | |||
218 | void handleClientMessage(XClientMessageEvent &ce); | 210 | void handleClientMessage(XClientMessageEvent &ce); |
219 | void handleKeyEvent(XKeyEvent &ke); | 211 | void handleKeyEvent(XKeyEvent &ke); |
220 | void doWindowAction(Keys::KeyAction action, const int param); | 212 | void doWindowAction(Keys::KeyAction action, const int param); |
221 | 213 | ||
222 | ResourceManager m_resourcemanager, m_screen_rm; | 214 | ResourceManager m_resourcemanager, m_screen_rm; |
223 | 215 | ||
224 | //--- Resources | 216 | //--- Resources |
@@ -236,8 +228,6 @@ private: | |||
236 | 228 | ||
237 | std::map<Window, FluxboxWindow *> windowSearch; | 229 | std::map<Window, FluxboxWindow *> windowSearch; |
238 | std::map<Window, FluxboxWindow *> groupSearch; | 230 | std::map<Window, FluxboxWindow *> groupSearch; |
239 | typedef std::map<Window, Tab *> TabList; | ||
240 | TabList tabSearch; | ||
241 | 231 | ||
242 | std::list<MenuTimestamp *> menuTimestamps; | 232 | std::list<MenuTimestamp *> menuTimestamps; |
243 | typedef std::list<BScreen *> ScreenList; | 233 | typedef std::list<BScreen *> ScreenList; |