aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-30 15:04:06 (GMT)
committerfluxgen <fluxgen>2003-06-30 15:04:06 (GMT)
commitaab42a4c098ebfdad9145e9a2a50cc1d3671a5f0 (patch)
tree393e167373c634d31f1a1ee1dc030bb4c9decbb2
parent6a5fff9ae18862a93dbf80b9b6c6c731ce334893 (diff)
downloadfluxbox-aab42a4c098ebfdad9145e9a2a50cc1d3671a5f0.zip
fluxbox-aab42a4c098ebfdad9145e9a2a50cc1d3671a5f0.tar.bz2
added mouse and key screen so we can determine which screen we are on for some commands
-rw-r--r--src/fluxbox.hh11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 7870b89..cf1e9a8 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.62 2003/06/12 14:33:14 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.63 2003/06/30 15:04:06 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -187,7 +187,10 @@ public:
187 bool haveShape() const { return m_have_shape; } 187 bool haveShape() const { return m_have_shape; }
188 int shapeEventbase() const { return m_shape_eventbase; } 188 int shapeEventbase() const { return m_shape_eventbase; }
189 void getDefaultDataFilename(char *, std::string &); 189 void getDefaultDataFilename(char *, std::string &);
190 190 BScreen *mouseScreen() { return m_mousescreen; }
191 BScreen *keyScreen() { return m_keyscreen; }
192 BScreen *watchingScreen() { return m_watching_screen; }
193 const XEvent &lastEvent() const { return m_last_event; }
191private: 194private:
192 195
193 typedef struct MenuTimestamp { 196 typedef struct MenuTimestamp {
@@ -215,7 +218,6 @@ private:
215 void handleUnmapNotify(XUnmapEvent &ue); 218 void handleUnmapNotify(XUnmapEvent &ue);
216 void handleClientMessage(XClientMessageEvent &ce); 219 void handleClientMessage(XClientMessageEvent &ce);
217 void handleKeyEvent(XKeyEvent &ke); 220 void handleKeyEvent(XKeyEvent &ke);
218 void doWindowAction(int action, const int param);
219 void setTitlebar(std::vector<Fluxbox::Titlebar>& dir, const char *arg); 221 void setTitlebar(std::vector<Fluxbox::Titlebar>& dir, const char *arg);
220 222
221 std::auto_ptr<FbAtoms> m_fbatoms; 223 std::auto_ptr<FbAtoms> m_fbatoms;
@@ -244,6 +246,7 @@ private:
244 FluxboxWindow *m_focused_window, *m_masked_window; 246 FluxboxWindow *m_focused_window, *m_masked_window;
245 FbTk::Timer m_timer; 247 FbTk::Timer m_timer;
246 248
249 BScreen *m_mousescreen, *m_keyscreen;
247 BScreen *m_watching_screen; 250 BScreen *m_watching_screen;
248 unsigned int m_watch_keyrelease; 251 unsigned int m_watch_keyrelease;
249 252
@@ -255,12 +258,12 @@ private:
255 std::string m_rc_file; ///< resource filename 258 std::string m_rc_file; ///< resource filename
256 char **m_argv; 259 char **m_argv;
257 int m_argc; 260 int m_argc;
261 XEvent m_last_event;
258 262
259 std::auto_ptr<Keys> m_key; 263 std::auto_ptr<Keys> m_key;
260 264
261 //default arguments for titlebar left and right 265 //default arguments for titlebar left and right
262 static Fluxbox::Titlebar s_titlebar_left[], s_titlebar_right[]; 266 static Fluxbox::Titlebar s_titlebar_left[], s_titlebar_right[];
263
264 static Fluxbox *s_singleton; 267 static Fluxbox *s_singleton;
265 std::vector<AtomHandler *> m_atomhandler; 268 std::vector<AtomHandler *> m_atomhandler;
266 bool m_starting; 269 bool m_starting;