aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-10-24 17:09:26 (GMT)
committermarkt <markt>2007-10-24 17:09:26 (GMT)
commitf3afe787c1209cf1357493924a4f7eb7864def54 (patch)
treed0c0c3eca154ab538fbc1fb3c62081e9250c05bd /src/Screen.hh
parent74eb584a312aba21b21eccb6c49ade1571aa3740 (diff)
downloadfluxbox-f3afe787c1209cf1357493924a4f7eb7864def54.zip
fluxbox-f3afe787c1209cf1357493924a4f7eb7864def54.tar.bz2
introduced workspacename for ClientPattern, and some miscellaneous cleanup
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh21
1 files changed, 5 insertions, 16 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 37edaa7..f5641e2 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -30,10 +30,8 @@
30#include "FbWinFrame.hh" 30#include "FbWinFrame.hh"
31#include "FbRootWindow.hh" 31#include "FbRootWindow.hh"
32#include "MenuTheme.hh" 32#include "MenuTheme.hh"
33#include "PlacementStrategy.hh"
34 33
35#include "FbTk/EventHandler.hh" 34#include "FbTk/EventHandler.hh"
36#include "FbTk/TypeAhead.hh"
37#include "FbTk/Resource.hh" 35#include "FbTk/Resource.hh"
38#include "FbTk/Subject.hh" 36#include "FbTk/Subject.hh"
39#include "FbTk/MultLayers.hh" 37#include "FbTk/MultLayers.hh"
@@ -67,7 +65,7 @@ class Strut;
67class Slit; 65class Slit;
68class HeadArea; 66class HeadArea;
69class FocusControl; 67class FocusControl;
70class PlacementStrategy; 68class ScreenPlacement;
71 69
72namespace FbTk { 70namespace FbTk {
73class Menu; 71class Menu;
@@ -240,13 +238,6 @@ public:
240 void notifyUngrabKeyboard(); 238 void notifyUngrabKeyboard();
241 239
242 /** 240 /**
243 * Prepares type a head focus
244 * @param winlist a list of focusables
245 * @param pat pattern to match windows with
246 */
247 void startTypeAheadFocus(std::list<Focusable *> &winlist,
248 const ClientPattern *pat = 0);
249 /**
250 * Cycles focus of windows 241 * Cycles focus of windows
251 * @param opts focus options 242 * @param opts focus options
252 * @param pat specific pattern to match windows with 243 * @param pat specific pattern to match windows with
@@ -313,8 +304,8 @@ public:
313 bool isShuttingdown() const { return m_shutdown; } 304 bool isShuttingdown() const { return m_shutdown; }
314 bool isRestart(); 305 bool isRestart();
315 306
316 PlacementStrategy &placementStrategy() { return *m_placement_strategy; } 307 ScreenPlacement &placementStrategy() { return *m_placement_strategy; }
317 const PlacementStrategy &placementStrategy() const { return *m_placement_strategy; } 308 const ScreenPlacement &placementStrategy() const { return *m_placement_strategy; }
318 309
319 int addWorkspace(); 310 int addWorkspace();
320 int removeLastWorkspace(); 311 int removeLastWorkspace();
@@ -579,17 +570,15 @@ private:
579 const std::string m_name, m_altname; 570 const std::string m_name, m_altname;
580 571
581 FocusControl *m_focus_control; 572 FocusControl *m_focus_control;
582 PlacementStrategy *m_placement_strategy; 573 ScreenPlacement *m_placement_strategy;
583 574
584 // This is a map of windows to clients for clients that had a left 575 // This is a map of windows to clients for clients that had a left
585 // window set, but that window wasn't present at the time 576 // window set, but that window wasn't present at the time
586 typedef std::map<Window, WinClient *> Groupables; 577 typedef std::map<Window, WinClient *> Groupables;
587 Groupables m_expecting_groups; 578 Groupables m_expecting_groups;
588 579
589 bool m_cycling, m_typing_ahead; 580 bool m_cycling;
590 const ClientPattern *m_cycle_opts; 581 const ClientPattern *m_cycle_opts;
591 FbTk::TypeAhead<std::list<Focusable *>, Focusable *> m_type_ahead;
592 std::list<Focusable *> m_matches;
593 582
594 // Xinerama related private data 583 // Xinerama related private data
595 bool m_xinerama_avail; 584 bool m_xinerama_avail;