diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-12 00:22:40 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-12 00:22:40 (GMT) |
commit | 93b0c5322a7482d83e38657b36e9814f8415e47b (patch) | |
tree | 0e7bfe2e975e0b9bd88334975c691e98513c1c14 /src/fluxbox.hh | |
parent | 72a45fae3c39323206e7d19913bb3ab17a691691 (diff) | |
download | fluxbox-93b0c5322a7482d83e38657b36e9814f8415e47b.zip fluxbox-93b0c5322a7482d83e38657b36e9814f8415e47b.tar.bz2 |
refactor menu reloading, added FbTk::AutoReloadHelper
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r-- | src/fluxbox.hh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index e7c7556..8b22a04 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -136,8 +136,6 @@ public: | |||
136 | void shutdown(); | 136 | void shutdown(); |
137 | void load_rc(BScreen &scr); | 137 | void load_rc(BScreen &scr); |
138 | void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); } | 138 | void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); } |
139 | void saveMenuFilename(const char *); | ||
140 | void clearMenuFilenames(); | ||
141 | void saveWindowSearch(Window win, WinClient *winclient); | 139 | void saveWindowSearch(Window win, WinClient *winclient); |
142 | // some windows relate to the group, not the client, so we record separately | 140 | // some windows relate to the group, not the client, so we record separately |
143 | // searchWindow on these windows will give the active client in the group | 141 | // searchWindow on these windows will give the active client in the group |
@@ -149,8 +147,6 @@ public: | |||
149 | void removeGroupSearch(Window win); | 147 | void removeGroupSearch(Window win); |
150 | void restart(const char *command = 0); | 148 | void restart(const char *command = 0); |
151 | void reconfigure(); | 149 | void reconfigure(); |
152 | void rereadMenu(); | ||
153 | /// reloads the menus if the timestamps changed | ||
154 | 150 | ||
155 | /// handle any system signal sent to the application | 151 | /// handle any system signal sent to the application |
156 | void handleSignal(int signum); | 152 | void handleSignal(int signum); |
@@ -176,8 +172,6 @@ public: | |||
176 | typedef std::list<BScreen *> ScreenList; | 172 | typedef std::list<BScreen *> ScreenList; |
177 | const ScreenList screenList() const { return m_screen_list; } | 173 | const ScreenList screenList() const { return m_screen_list; } |
178 | 174 | ||
179 | /// @return whether the timestamps on the menu changed | ||
180 | bool menuTimestampsChanged() const; | ||
181 | bool haveShape() const { return m_have_shape; } | 175 | bool haveShape() const { return m_have_shape; } |
182 | int shapeEventbase() const { return m_shape_eventbase; } | 176 | int shapeEventbase() const { return m_shape_eventbase; } |
183 | void getDefaultDataFilename(const char *name, std::string &) const; | 177 | void getDefaultDataFilename(const char *name, std::string &) const; |
@@ -190,14 +184,6 @@ public: | |||
190 | AttentionNoticeHandler &attentionHandler() { return m_attention_handler; } | 184 | AttentionNoticeHandler &attentionHandler() { return m_attention_handler; } |
191 | 185 | ||
192 | private: | 186 | private: |
193 | |||
194 | typedef struct MenuTimestamp { | ||
195 | std::string filename; | ||
196 | time_t timestamp; | ||
197 | } MenuTimestamp; | ||
198 | |||
199 | |||
200 | |||
201 | std::string getRcFilename(); | 187 | std::string getRcFilename(); |
202 | void load_rc(); | 188 | void load_rc(); |
203 | 189 | ||
@@ -241,7 +227,6 @@ private: | |||
241 | // will have it's window being the group index | 227 | // will have it's window being the group index |
242 | std::multimap<Window, WinClient *> m_group_search; | 228 | std::multimap<Window, WinClient *> m_group_search; |
243 | 229 | ||
244 | std::list<MenuTimestamp *> m_menu_timestamps; | ||
245 | ScreenList m_screen_list; | 230 | ScreenList m_screen_list; |
246 | 231 | ||
247 | FluxboxWindow *m_masked_window; | 232 | FluxboxWindow *m_masked_window; |