aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-03-04 17:47:37 (GMT)
committermarkt <markt>2007-03-04 17:47:37 (GMT)
commit4c1a242968dff12e504f281224819b7cd3850a04 (patch)
tree42a6e3de02153bc8f35cae43f89238d73e9b821a /src/fluxbox.hh
parent9477af82a5835b7336fec8879967abb67f3bd848 (diff)
downloadfluxbox-4c1a242968dff12e504f281224819b7cd3850a04.zip
fluxbox-4c1a242968dff12e504f281224819b7cd3850a04.tar.bz2
moved some code around (regarding event handling) in preparation for upcoming features
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 5613caa..66fdff5 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -141,8 +141,6 @@ public:
141 void maskWindowEvents(Window w, FluxboxWindow *bw) 141 void maskWindowEvents(Window w, FluxboxWindow *bw)
142 { m_masked = w; m_masked_window = bw; } 142 { m_masked = w; m_masked_window = bw; }
143 143
144 void watchKeyRelease(BScreen &screen, unsigned int mods);
145
146 void shutdown(); 144 void shutdown();
147 void load_rc(BScreen &scr); 145 void load_rc(BScreen &scr);
148 void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); } 146 void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); }
@@ -203,8 +201,6 @@ public:
203 BScreen *mouseScreen() { return m_mousescreen; } 201 BScreen *mouseScreen() { return m_mousescreen; }
204 // screen of window that last key event (i.e. focused window) went to 202 // screen of window that last key event (i.e. focused window) went to
205 BScreen *keyScreen() { return m_keyscreen; } 203 BScreen *keyScreen() { return m_keyscreen; }
206 // screen we are watching for modifier changes
207 BScreen *watchingScreen() { return m_watching_screen; }
208 const XEvent &lastEvent() const { return m_last_event; } 204 const XEvent &lastEvent() const { return m_last_event; }
209 205
210 AttentionNoticeHandler &attentionHandler() { return m_attention_handler; } 206 AttentionNoticeHandler &attentionHandler() { return m_attention_handler; }
@@ -228,10 +224,8 @@ private:
228 void handleEvent(XEvent *xe); 224 void handleEvent(XEvent *xe);
229 225
230 void setupConfigFiles(); 226 void setupConfigFiles();
231 void handleButtonEvent(XButtonEvent &be);
232 void handleUnmapNotify(XUnmapEvent &ue); 227 void handleUnmapNotify(XUnmapEvent &ue);
233 void handleClientMessage(XClientMessageEvent &ce); 228 void handleClientMessage(XClientMessageEvent &ce);
234 void handleKeyEvent(XKeyEvent &ke);
235 229
236 std::auto_ptr<FbAtoms> m_fbatoms; 230 std::auto_ptr<FbAtoms> m_fbatoms;
237 231
@@ -272,8 +266,6 @@ private:
272 FluxboxWindow *m_masked_window; 266 FluxboxWindow *m_masked_window;
273 267
274 BScreen *m_mousescreen, *m_keyscreen; 268 BScreen *m_mousescreen, *m_keyscreen;
275 BScreen *m_watching_screen;
276 unsigned int m_watch_keyrelease;
277 269
278 Atom m_fluxbox_pid; 270 Atom m_fluxbox_pid;
279 271