aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-02-18 15:11:12 (GMT)
committerrathnor <rathnor>2003-02-18 15:11:12 (GMT)
commitb4ffe4fe21699c7123728aeeb99576a540b3694e (patch)
treef8a133be750f844f3c48f5a631fb8bf088544549 /src/Screen.hh
parentaa602770fbbd4e84154028d3181d275b81ea914d (diff)
downloadfluxbox-b4ffe4fe21699c7123728aeeb99576a540b3694e.zip
fluxbox-b4ffe4fe21699c7123728aeeb99576a540b3694e.tar.bz2
Added layer menus for windows, toolbar, and slit, plus associated
resources. Cleaned up some cruft from the previous layering setup.
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index a68bd32..3135b9c 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.67 2003/02/16 00:36:17 fluxgen Exp $ 25// $Id: Screen.hh,v 1.68 2003/02/18 15:11:08 rathnor Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -36,6 +36,7 @@
36#include "FbWinFrameTheme.hh" 36#include "FbWinFrameTheme.hh"
37#include "MultLayers.hh" 37#include "MultLayers.hh"
38#include "XLayerItem.hh" 38#include "XLayerItem.hh"
39#include "fluxbox.hh"
39 40
40#include <X11/Xlib.h> 41#include <X11/Xlib.h>
41#include <X11/Xresource.h> 42#include <X11/Xresource.h>
@@ -77,7 +78,6 @@ public:
77 int scrn, int number_of_layers); 78 int scrn, int number_of_layers);
78 ~BScreen(); 79 ~BScreen();
79 80
80 inline bool isToolbarOnTop() const { return *resource.toolbar_on_top; }
81 inline bool doToolbarAutoHide() const { return *resource.toolbar_auto_hide; } 81 inline bool doToolbarAutoHide() const { return *resource.toolbar_auto_hide; }
82 inline bool isSloppyFocus() const { return resource.sloppy_focus; } 82 inline bool isSloppyFocus() const { return resource.sloppy_focus; }
83 inline bool isSemiSloppyFocus() const { return resource.semi_sloppy_focus; } 83 inline bool isSemiSloppyFocus() const { return resource.semi_sloppy_focus; }
@@ -105,7 +105,6 @@ public:
105 105
106 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 106 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
107 107
108 inline bool isSlitOnTop() const { return resource.slit_on_top; }
109 inline bool doSlitAutoHide() const { return resource.slit_auto_hide; } 108 inline bool doSlitAutoHide() const { return resource.slit_auto_hide; }
110#ifdef SLIT 109#ifdef SLIT
111 inline Slit *getSlit() { return m_slit.get(); } 110 inline Slit *getSlit() { return m_slit.get(); }
@@ -115,7 +114,6 @@ public:
115 inline int getSlitDirection() const { return resource.slit_direction; } 114 inline int getSlitDirection() const { return resource.slit_direction; }
116 inline void saveSlitPlacement(int p) { resource.slit_placement = p; } 115 inline void saveSlitPlacement(int p) { resource.slit_placement = p; }
117 inline void saveSlitDirection(int d) { resource.slit_direction = d; } 116 inline void saveSlitDirection(int d) { resource.slit_direction = d; }
118 inline void saveSlitOnTop(bool t) { resource.slit_on_top = t; }
119 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; } 117 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; }
120 118
121 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; } 119 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; }
@@ -181,6 +179,10 @@ public:
181 inline int getColPlacementDirection() const { return resource.col_direction; } 179 inline int getColPlacementDirection() const { return resource.col_direction; }
182 inline unsigned int getTabWidth() const { return *resource.tab_width; } 180 inline unsigned int getTabWidth() const { return *resource.tab_width; }
183 inline unsigned int getTabHeight() const { return *resource.tab_height; } 181 inline unsigned int getTabHeight() const { return *resource.tab_height; }
182
183 inline int getSlitLayerNum() const { return (*resource.slit_layernum).getNum(); }
184 inline int getToolbarLayerNum() const { return (*resource.toolbar_layernum).getNum(); }
185
184 inline Tab::Placement getTabPlacement() const { return *resource.tab_placement; } 186 inline Tab::Placement getTabPlacement() const { return *resource.tab_placement; }
185 inline Tab::Alignment getTabAlignment() const { return *resource.tab_alignment; } 187 inline Tab::Alignment getTabAlignment() const { return *resource.tab_alignment; }
186 188
@@ -190,7 +192,6 @@ public:
190 inline void saveSemiSloppyFocus(bool s) { resource.semi_sloppy_focus = s; } 192 inline void saveSemiSloppyFocus(bool s) { resource.semi_sloppy_focus = s; }
191 inline void saveAutoRaise(bool a) { resource.auto_raise = a; } 193 inline void saveAutoRaise(bool a) { resource.auto_raise = a; }
192 inline void saveWorkspaces(int w) { *resource.workspaces = w; } 194 inline void saveWorkspaces(int w) { *resource.workspaces = w; }
193 inline void saveToolbarOnTop(bool r) { *resource.toolbar_on_top = r; }
194 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; } 195 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; }
195 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; } 196 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; }
196 197
@@ -262,7 +263,6 @@ public:
262 std::string getNameOfWorkspace(unsigned int workspace) const; 263 std::string getNameOfWorkspace(unsigned int workspace) const;
263 void changeWorkspaceID(unsigned int); 264 void changeWorkspaceID(unsigned int);
264 void sendToWorkspace(unsigned int workspace, FluxboxWindow *win=0, bool changeworkspace=true); 265 void sendToWorkspace(unsigned int workspace, FluxboxWindow *win=0, bool changeworkspace=true);
265 void raiseWindows(const Workspace::Stack &workspace_stack);
266 void reassociateGroup(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky); 266 void reassociateGroup(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky);
267 void reassociateWindow(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky); 267 void reassociateWindow(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky);
268 void prevFocus() { prevFocus(0); } 268 void prevFocus() { prevFocus(0); }
@@ -375,7 +375,7 @@ private:
375 ScreenResource(ResourceManager &rm, const std::string &scrname, 375 ScreenResource(ResourceManager &rm, const std::string &scrname,
376 const std::string &altscrname); 376 const std::string &altscrname);
377 377
378 Resource<bool> toolbar_on_top, toolbar_auto_hide, 378 Resource<bool> toolbar_auto_hide,
379 image_dither, opaque_move, full_max, 379 image_dither, opaque_move, full_max,
380 max_over_slit, tab_rotate_vertical, 380 max_over_slit, tab_rotate_vertical,
381 sloppy_window_grouping, workspace_warping, 381 sloppy_window_grouping, workspace_warping,
@@ -387,13 +387,14 @@ private:
387 ordered_dither; 387 ordered_dither;
388 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold, 388 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold,
389 tab_width, tab_height; 389 tab_width, tab_height;
390 Resource<Fluxbox::Layer> slit_layernum, toolbar_layernum;
390 int placement_policy, row_direction, col_direction; 391 int placement_policy, row_direction, col_direction;
391 392
392 Resource<Tab::Placement> tab_placement; 393 Resource<Tab::Placement> tab_placement;
393 Resource<Tab::Alignment> tab_alignment; 394 Resource<Tab::Alignment> tab_alignment;
394 Resource<int> toolbar_on_head; 395 Resource<int> toolbar_on_head;
395 396
396 bool slit_on_top, slit_auto_hide; 397 bool slit_auto_hide;
397 int slit_placement, slit_direction; 398 int slit_placement, slit_direction;
398 399
399 unsigned int slit_on_head; 400 unsigned int slit_on_head;