aboutsummaryrefslogtreecommitdiff
path: root/src/FbPager.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbPager.hh')
-rw-r--r--src/FbPager.hh23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/FbPager.hh b/src/FbPager.hh
index 02fe1b6..429590c 100644
--- a/src/FbPager.hh
+++ b/src/FbPager.hh
@@ -1,6 +1,6 @@
1// FbPager.hh for FbPager 1// FbPager.hh for FbPager
2// Copyright (c) 2003-2007 Henrik Kinnunen (fluxgen at fluxbox org) 2// Copyright (c) 2003-2007 Henrik Kinnunen (fluxgen at fluxbox org)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation 6// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@ class ClientHandler;
46class FbPager:public FbTk::EventHandler, public Pager, private FbTk::NotCopyable { 46class FbPager:public FbTk::EventHandler, public Pager, private FbTk::NotCopyable {
47public: 47public:
48 enum Alignment { LEFT_TO_RIGHT, TOP_TO_BOTTOM}; 48 enum Alignment { LEFT_TO_RIGHT, TOP_TO_BOTTOM};
49 FbPager(int screen_num, bool withdraw, 49 FbPager(int screen_num, bool withdraw,
50 bool show_resources, 50 bool show_resources,
51 int layer_flags, 51 int layer_flags,
52 const char *resource_filename=0); 52 const char *resource_filename=0);
@@ -61,8 +61,8 @@ public:
61 */ 61 */
62 //@{ 62 //@{
63 void handleEvent(XEvent &event); 63 void handleEvent(XEvent &event);
64 void buttonPressEvent(XButtonEvent &event); 64 void buttonPressEvent(XButtonEvent &event);
65 void buttonReleaseEvent(XButtonEvent &event); 65 void buttonReleaseEvent(XButtonEvent &event);
66 void motionNotifyEvent(XMotionEvent &event); 66 void motionNotifyEvent(XMotionEvent &event);
67 void exposeEvent(XExposeEvent &event); 67 void exposeEvent(XExposeEvent &event);
68 //@} 68 //@}
@@ -83,6 +83,11 @@ public:
83 return false; 83 return false;
84 return true; 84 return true;
85 } 85 }
86
87 void eraseAllWindows();
88
89 void addWindows(const WindowsAndWorkspaces& windows);
90
86private: 91private:
87 void clientMessageEvent(XClientMessageEvent &event); 92 void clientMessageEvent(XClientMessageEvent &event);
88 void propertyEvent(XPropertyEvent &event); 93 void propertyEvent(XPropertyEvent &event);
@@ -90,7 +95,7 @@ private:
90 95
91 96
92 void alignWorkspaces(); 97 void alignWorkspaces();
93 98
94 void sendChangeToWorkspace(unsigned int num); 99 void sendChangeToWorkspace(unsigned int num);
95 void updateWindowHints(Window win); 100 void updateWindowHints(Window win);
96 void load(const std::string &filename); 101 void load(const std::string &filename);
@@ -99,13 +104,13 @@ private:
99 FbTk::FbWindow m_window; 104 FbTk::FbWindow m_window;
100 105
101 typedef std::vector<Workspace *> WorkspaceList; 106 typedef std::vector<Workspace *> WorkspaceList;
102 typedef std::list<ClientHandler *> ClientHandlerList; 107 typedef std::vector<ClientHandler *> ClientHandlerList;
103 typedef std::set<Window> WindowList; 108 typedef std::set<Window> WindowList;
104 109
105 ClientHandlerList m_clienthandlers; 110 ClientHandlerList m_clienthandlers;
106 WorkspaceList m_workspaces; 111 WorkspaceList m_workspaces;
107 WindowList m_windows; 112 WindowList m_windows;
108 113
109 unsigned int m_curr_workspace; 114 unsigned int m_curr_workspace;
110 115
111 struct MoveWindow { 116 struct MoveWindow {
@@ -135,7 +140,7 @@ private:
135 FbTk::Resource<std::string> m_prev_workspace_button; 140 FbTk::Resource<std::string> m_prev_workspace_button;
136 FbTk::Resource<int> m_move_in_workspace_button; 141 FbTk::Resource<int> m_move_in_workspace_button;
137 FbTk::Resource<int> m_drag_to_workspace_button; 142 FbTk::Resource<int> m_drag_to_workspace_button;
138 143
139 FbTk::Resource<Alignment> m_align; 144 FbTk::Resource<Alignment> m_align;
140 FbTk::Resource<std::string> m_color_str; 145 FbTk::Resource<std::string> m_color_str;
141 FbTk::Resource<std::string> m_window_color_str, m_focused_window_color_str; 146 FbTk::Resource<std::string> m_window_color_str, m_focused_window_color_str;
@@ -152,7 +157,7 @@ private:
152 std::string m_button_queue; 157 std::string m_button_queue;
153 XButtonEvent m_last_button_event; 158 XButtonEvent m_last_button_event;
154 int m_last_workspace_num; 159 int m_last_workspace_num;
155 160
156}; 161};
157 162
158} // end namespace FbPager 163} // end namespace FbPager