aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-03-24 16:31:13 (GMT)
committermarkt <markt>2007-03-24 16:31:13 (GMT)
commit1829dd5780c9cd818884cb84ae1ea51a4d4d35ca (patch)
treeaffbf9ced07d3c52c04dd49a81e14be117326360 /src/Screen.hh
parent5c811e63012f160b5e60a38deca10d01b5d23e69 (diff)
downloadfluxbox-1829dd5780c9cd818884cb84ae1ea51a4d4d35ca.zip
fluxbox-1829dd5780c9cd818884cb84ae1ea51a4d4d35ca.tar.bz2
colossal multi-patch, encompassing all of what I did yesterday without internet access
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index c2e493b..352a015 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -55,6 +55,7 @@
55#include <memory> 55#include <memory>
56#include <map> 56#include <map>
57 57
58class Focusable;
58class FluxboxWindow; 59class FluxboxWindow;
59class Netizen; 60class Netizen;
60class FbWinFrameTheme; 61class FbWinFrameTheme;
@@ -217,7 +218,7 @@ public:
217 void buttonPressEvent(XButtonEvent &be); 218 void buttonPressEvent(XButtonEvent &be);
218 void notifyUngrabKeyboard(); 219 void notifyUngrabKeyboard();
219 220
220 void startTypeAheadFocus(std::list<WinClient *> &winlist, int opts); 221 void startTypeAheadFocus(std::list<Focusable *> &winlist, int opts);
221 void cycleFocus(int opts, bool reverse); 222 void cycleFocus(int opts, bool reverse);
222 223
223 FbTk::Menu *createMenu(const std::string &label); 224 FbTk::Menu *createMenu(const std::string &label);
@@ -488,8 +489,8 @@ private:
488 489
489 bool m_cycling, m_typing_ahead; 490 bool m_cycling, m_typing_ahead;
490 int m_cycle_opts; 491 int m_cycle_opts;
491 FbTk::TypeAhead<std::list<WinClient *>, WinClient *> m_type_ahead; 492 FbTk::TypeAhead<std::list<Focusable *>, Focusable *> m_type_ahead;
492 std::list<WinClient *> m_matches; 493 std::list<Focusable *> m_matches;
493 494
494 // Xinerama related private data 495 // Xinerama related private data
495 bool m_xinerama_avail; 496 bool m_xinerama_avail;