aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-19 22:45:51 (GMT)
committerfluxgen <fluxgen>2003-05-19 22:45:51 (GMT)
commitf911c4035fe86ed4c85a79f96aaab30902d56f89 (patch)
tree9c3ae59db318c26049fd4fda0850d0687378809e /src/Screen.hh
parent0e9eefef1123a6bc21f89f6e6356351e46e4a3e1 (diff)
downloadfluxbox-f911c4035fe86ed4c85a79f96aaab30902d56f89.zip
fluxbox-f911c4035fe86ed4c85a79f96aaab30902d56f89.tar.bz2
cleaning
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh49
1 files changed, 23 insertions, 26 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 59a26c1..d156013 100644
--- a/src/Screen.hh
+++ b/src/Screen.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: Screen.hh,v 1.101 2003/05/19 15:32:46 rathnor Exp $ 25// $Id: Screen.hh,v 1.102 2003/05/19 22:45:51 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -126,8 +126,8 @@ public:
126 inline const ToolbarHandler &toolbarHandler() const { return *m_toolbarhandler; } 126 inline const ToolbarHandler &toolbarHandler() const { return *m_toolbarhandler; }
127 inline ToolbarHandler &toolbarHandler() { return *m_toolbarhandler; } 127 inline ToolbarHandler &toolbarHandler() { return *m_toolbarhandler; }
128 128
129 inline Workspace *getWorkspace(unsigned int w) { return ( w < workspacesList.size() ? workspacesList[w] : 0); } 129 inline Workspace *getWorkspace(unsigned int w) { return ( w < m_workspaces_list.size() ? m_workspaces_list[w] : 0); }
130 inline Workspace *currentWorkspace() { return current_workspace; } 130 inline Workspace *currentWorkspace() { return m_current_workspace; }
131 131
132 const FbTk::Menu *getWorkspacemenu() const { return workspacemenu.get(); } 132 const FbTk::Menu *getWorkspacemenu() const { return workspacemenu.get(); }
133 FbTk::Menu *getWorkspacemenu() { return workspacemenu.get(); } 133 FbTk::Menu *getWorkspacemenu() { return workspacemenu.get(); }
@@ -137,10 +137,10 @@ public:
137 /* 137 /*
138 maximum screen bounds for given window 138 maximum screen bounds for given window
139 */ 139 */
140 unsigned int maxLeft(FbTk::FbWindow &win) const; 140 unsigned int maxLeft(const FbTk::FbWindow &win) const;
141 unsigned int maxRight(FbTk::FbWindow &win) const; 141 unsigned int maxRight(const FbTk::FbWindow &win) const;
142 unsigned int maxTop(FbTk::FbWindow &win) const; 142 unsigned int maxTop(const FbTk::FbWindow &win) const;
143 unsigned int maxBottom(FbTk::FbWindow &win) const; 143 unsigned int maxBottom(const FbTk::FbWindow &win) const;
144 144
145 inline unsigned int width() const { return rootWindow().width(); } 145 inline unsigned int width() const { return rootWindow().width(); }
146 inline unsigned int height() const { return rootWindow().height(); } 146 inline unsigned int height() const { return rootWindow().height(); }
@@ -149,16 +149,16 @@ public:
149 typedef std::list<WinClient *> FocusedWindows; 149 typedef std::list<WinClient *> FocusedWindows;
150 150
151 /// @return number of workspaces 151 /// @return number of workspaces
152 inline unsigned int getCount() const { return workspacesList.size(); } 152 inline unsigned int getCount() const { return m_workspaces_list.size(); }
153 /// @return number of icons 153 /// @return number of icons
154 inline unsigned int getIconCount() const { return iconList.size(); } 154 inline unsigned int getIconCount() const { return m_icon_list.size(); }
155 inline const Icons &getIconList() const { return iconList; } 155 inline const Icons &getIconList() const { return m_icon_list; }
156 inline Icons &getIconList() { return iconList; } 156 inline Icons &getIconList() { return m_icon_list; }
157 inline const FocusedWindows &getFocusedList() const { return focused_list; } 157 inline const FocusedWindows &getFocusedList() const { return focused_list; }
158 inline FocusedWindows &getFocusedList() { return focused_list; } 158 inline FocusedWindows &getFocusedList() { return focused_list; }
159 WinClient *getLastFocusedWindow(int workspace = -1); 159 WinClient *getLastFocusedWindow(int workspace = -1);
160 const Workspaces &getWorkspacesList() const { return workspacesList; } 160 const Workspaces &getWorkspacesList() const { return m_workspaces_list; }
161 const WorkspaceNames &getWorkspaceNames() const { return workspaceNames; } 161 const WorkspaceNames &getWorkspaceNames() const { return m_workspace_names; }
162 /** 162 /**
163 @name Screen signals 163 @name Screen signals
164 */ 164 */
@@ -369,7 +369,8 @@ private:
369 bool root_colormap_installed, managed, geom_visible, cycling_focus; 369 bool root_colormap_installed, managed, geom_visible, cycling_focus;
370 GC opGC; 370 GC opGC;
371 Pixmap geom_pixmap; 371 Pixmap geom_pixmap;
372 FbTk::FbWindow geom_window; 372
373 FbTk::FbWindow m_geom_window;
373 374
374 std::auto_ptr<FbTk::ImageControl> m_image_control; 375 std::auto_ptr<FbTk::ImageControl> m_image_control;
375 std::auto_ptr<FbTk::Menu> m_configmenu; 376 std::auto_ptr<FbTk::Menu> m_configmenu;
@@ -379,9 +380,9 @@ private:
379 typedef std::list<FbTk::Menu *> Rootmenus; 380 typedef std::list<FbTk::Menu *> Rootmenus;
380 typedef std::list<Netizen *> Netizens; 381 typedef std::list<Netizen *> Netizens;
381 382
382 Rootmenus rootmenuList; 383 Rootmenus m_rootmenu_list;
383 Netizens netizenList; 384 Netizens m_netizen_list;
384 Icons iconList; 385 Icons m_icon_list;
385 386
386 // This list keeps the order of window focusing for this screen 387 // This list keeps the order of window focusing for this screen
387 // Screen global so it works for sticky windows too. 388 // Screen global so it works for sticky windows too.
@@ -391,14 +392,11 @@ private:
391 392
392 std::auto_ptr<Slit> m_slit; 393 std::auto_ptr<Slit> m_slit;
393 394
394 Workspace *current_workspace; 395 Workspace *m_current_workspace;
395 std::auto_ptr<FbTk::Menu> workspacemenu; 396 std::auto_ptr<FbTk::Menu> workspacemenu;
396 397
397 unsigned int geom_w, geom_h; 398 WorkspaceNames m_workspace_names;
398 unsigned long event_mask; 399 Workspaces m_workspaces_list;
399
400 WorkspaceNames workspaceNames;
401 Workspaces workspacesList;
402 400
403 Window auto_group_window; 401 Window auto_group_window;
404 402
@@ -449,15 +447,14 @@ private:
449 bool m_xinerama_avail; 447 bool m_xinerama_avail;
450 int m_xinerama_num_heads; 448 int m_xinerama_num_heads;
451 449
452#ifdef XINERAMA
453 // Xinerama related private data 450 // Xinerama related private data
454 451
455 int m_xinerama_center_x, m_xinerama_center_y; 452 int m_xinerama_center_x, m_xinerama_center_y;
456 453
457 struct XineramaHeadInfo { 454 struct XineramaHeadInfo {
458 int x, y, width, height; 455 int x, y, width, height;
459 } *m_xinerama_headinfo; 456 } *m_xinerama_headinfo;
460#endif 457
461}; 458};
462 459
463 460