summaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 46f86c4..d06937b 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.98 2003/05/15 23:25:36 fluxgen Exp $ 25// $Id: Screen.hh,v 1.99 2003/05/18 22:00:04 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -69,7 +69,7 @@ public:
69 typedef std::vector<Workspace *> Workspaces; 69 typedef std::vector<Workspace *> Workspaces;
70 typedef std::vector<std::string> WorkspaceNames; 70 typedef std::vector<std::string> WorkspaceNames;
71 71
72 BScreen(ResourceManager &rm, 72 BScreen(FbTk::ResourceManager &rm,
73 const std::string &screenname, const std::string &altscreenname, 73 const std::string &screenname, const std::string &altscreenname,
74 int scrn, int number_of_layers); 74 int scrn, int number_of_layers);
75 ~BScreen(); 75 ~BScreen();
@@ -111,7 +111,7 @@ public:
111 111
112 inline Slit::Placement getSlitPlacement() const { return *resource.slit_placement; } 112 inline Slit::Placement getSlitPlacement() const { return *resource.slit_placement; }
113 inline Slit::Direction getSlitDirection() const { return *resource.slit_direction; } 113 inline Slit::Direction getSlitDirection() const { return *resource.slit_direction; }
114 inline Resource<int> &slitAlphaResource() { return resource.slit_alpha; } 114 inline FbTk::Resource<int> &slitAlphaResource() { return resource.slit_alpha; }
115 inline void saveSlitPlacement(Slit::Placement p) { resource.slit_placement = p; } 115 inline void saveSlitPlacement(Slit::Placement p) { resource.slit_placement = p; }
116 inline void saveSlitDirection(Slit::Direction d) { resource.slit_direction = d; } 116 inline void saveSlitDirection(Slit::Direction d) { resource.slit_direction = d; }
117 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; } 117 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; }
@@ -178,8 +178,8 @@ public:
178 inline int getToolbarOnHead() { return *resource.toolbar_on_head; } 178 inline int getToolbarOnHead() { return *resource.toolbar_on_head; }
179 179
180 inline int getToolbarWidthPercent() const { return *resource.toolbar_width_percent; } 180 inline int getToolbarWidthPercent() const { return *resource.toolbar_width_percent; }
181 inline Resource<int> &getToolbarWidthPercentResource() { return resource.toolbar_width_percent; } 181 inline FbTk::Resource<int> &getToolbarWidthPercentResource() { return resource.toolbar_width_percent; }
182 inline const Resource<int> &getToolbarWidthPercentResource() const { return resource.toolbar_width_percent; } 182 inline const FbTk::Resource<int> &getToolbarWidthPercentResource() const { return resource.toolbar_width_percent; }
183 inline ToolbarHandler::ToolbarMode toolbarMode() const { return *resource.toolbar_mode; } 183 inline ToolbarHandler::ToolbarMode toolbarMode() const { return *resource.toolbar_mode; }
184 inline int getPlacementPolicy() const { return resource.placement_policy; } 184 inline int getPlacementPolicy() const { return resource.placement_policy; }
185 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } 185 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; }
@@ -388,31 +388,31 @@ private:
388 FbRootWindow m_root_window; 388 FbRootWindow m_root_window;
389 389
390 struct ScreenResource { 390 struct ScreenResource {
391 ScreenResource(ResourceManager &rm, const std::string &scrname, 391 ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname,
392 const std::string &altscrname); 392 const std::string &altscrname);
393 393
394 Resource<bool> toolbar_auto_hide, 394 FbTk::Resource<bool> toolbar_auto_hide,
395 image_dither, opaque_move, full_max, 395 image_dither, opaque_move, full_max,
396 max_over_slit, 396 max_over_slit,
397 sloppy_window_grouping, workspace_warping, 397 sloppy_window_grouping, workspace_warping,
398 desktop_wheeling, show_window_pos, 398 desktop_wheeling, show_window_pos,
399 focus_last, focus_new, 399 focus_last, focus_new,
400 antialias, auto_raise, click_raises; 400 antialias, auto_raise, click_raises;
401 Resource<std::string> rootcommand; 401 FbTk::Resource<std::string> rootcommand;
402 Resource<Fluxbox::FocusModel> focus_model; 402 FbTk::Resource<Fluxbox::FocusModel> focus_model;
403 bool ordered_dither; 403 bool ordered_dither;
404 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold, 404 FbTk::Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold,
405 menu_alpha; 405 menu_alpha;
406 Resource<Fluxbox::Layer> slit_layernum, toolbar_layernum; 406 FbTk::Resource<Fluxbox::Layer> slit_layernum, toolbar_layernum;
407 int placement_policy, row_direction, col_direction; 407 int placement_policy, row_direction, col_direction;
408 408
409 Resource<ToolbarHandler::ToolbarMode> toolbar_mode; 409 FbTk::Resource<ToolbarHandler::ToolbarMode> toolbar_mode;
410 Resource<int> toolbar_on_head; 410 FbTk::Resource<int> toolbar_on_head;
411 Resource<Toolbar::Placement> toolbar_placement; 411 FbTk::Resource<Toolbar::Placement> toolbar_placement;
412 Resource<bool> slit_auto_hide; 412 FbTk::Resource<bool> slit_auto_hide;
413 Resource<Slit::Placement> slit_placement; 413 FbTk::Resource<Slit::Placement> slit_placement;
414 Resource<Slit::Direction> slit_direction; 414 FbTk::Resource<Slit::Direction> slit_direction;
415 Resource<int> slit_alpha; 415 FbTk::Resource<int> slit_alpha;
416 416
417 unsigned int slit_on_head; 417 unsigned int slit_on_head;
418 418