aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authormathias <mathias>2006-06-22 07:46:12 (GMT)
committermathias <mathias>2006-06-22 07:46:12 (GMT)
commitdedbd7e46816ebce6628d9357cc7feee7a61ab57 (patch)
treeff8e90f26edffb6d579857e9f68d86c378a7320c /src/fluxbox.hh
parent535a88ce907641ef5648787bfa5d507d2581b86f (diff)
downloadfluxbox_pavel-dedbd7e46816ebce6628d9357cc7feee7a61ab57.zip
fluxbox_pavel-dedbd7e46816ebce6628d9357cc7feee7a61ab57.tar.bz2
Added patch from Jim Ramsay (i dot am at jimramsay dot com) to freely
define the used modkey. Added new action SetModKey too
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 206fcd4..8a2e27d 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -139,7 +139,10 @@ public:
139 139
140 unsigned int getCacheLife() const { return *m_rc_cache_life * 60000; } 140 unsigned int getCacheLife() const { return *m_rc_cache_life * 60000; }
141 unsigned int getCacheMax() const { return *m_rc_cache_max; } 141 unsigned int getCacheMax() const { return *m_rc_cache_max; }
142 bool useMod1() const { return *m_rc_use_mod1; } 142
143
144 unsigned int getModKey() const;
145 void setModKey(const char*);
143 146
144 void maskWindowEvents(Window w, FluxboxWindow *bw) 147 void maskWindowEvents(Window w, FluxboxWindow *bw)
145 { m_masked = w; m_masked_window = bw; } 148 { m_masked = w; m_masked_window = bw; }
@@ -177,7 +180,7 @@ public:
177 void handleSignal(int signum); 180 void handleSignal(int signum);
178 void update(FbTk::Subject *changed); 181 void update(FbTk::Subject *changed);
179 /** 182 /**
180 * Sends update signal to atomhandlers, 183 * Sends update signal to atomhandlers,
181 * @param screen the new screen 184 * @param screen the new screen
182 * @param old_screen the old screen if any, can be the same as new screen 185 * @param old_screen the old screen if any, can be the same as new screen
183 */ 186 */
@@ -212,7 +215,7 @@ public:
212 const XEvent &lastEvent() const { return m_last_event; } 215 const XEvent &lastEvent() const { return m_last_event; }
213 216
214 AttentionNoticeHandler &attentionHandler() { return m_attention_handler; } 217 AttentionNoticeHandler &attentionHandler() { return m_attention_handler; }
215 218
216private: 219private:
217 220
218 typedef struct MenuTimestamp { 221 typedef struct MenuTimestamp {
@@ -258,7 +261,7 @@ private:
258 FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area; 261 FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area;
259 FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; 262 FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max;
260 FbTk::Resource<time_t> m_rc_auto_raise_delay; 263 FbTk::Resource<time_t> m_rc_auto_raise_delay;
261 FbTk::Resource<bool> m_rc_use_mod1; /// temporary!, to disable mod1 for resize/move 264 FbTk::Resource<std::string> m_rc_mod_key;
262 265
263 typedef std::map<Window, WinClient *> WinClientMap; 266 typedef std::map<Window, WinClient *> WinClientMap;
264 WinClientMap m_window_search; 267 WinClientMap m_window_search;