aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-12 14:58:29 (GMT)
committerfluxgen <fluxgen>2002-04-12 14:58:29 (GMT)
commit17227b5d090efe35af8f4fbc4788aaceb190df5c (patch)
tree2dfc0a1fc5baa73694f69018027a237b46fd12d1
parent58fb11717af73f65f1cc1a2c4705a85223565f58 (diff)
downloadfluxbox_paul-17227b5d090efe35af8f4fbc4788aaceb190df5c.zip
fluxbox_paul-17227b5d090efe35af8f4fbc4788aaceb190df5c.tar.bz2
added workspace_warping option and removed some const
-rw-r--r--src/Screen.hh65
1 files changed, 34 insertions, 31 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 025b65c..b98e089 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.29 2002/04/09 23:20:40 fluxgen Exp $ 25// $Id: Screen.hh,v 1.30 2002/04/12 14:58:29 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -70,21 +70,22 @@ public:
70 int scrn); 70 int scrn);
71 ~BScreen(); 71 ~BScreen();
72 72
73 inline const bool isToolbarOnTop(void) { return *resource.toolbar_on_top; } 73 inline bool isToolbarOnTop(void) { return *resource.toolbar_on_top; }
74 inline const bool doToolbarAutoHide(void) { return *resource.toolbar_auto_hide; } 74 inline bool doToolbarAutoHide(void) { return *resource.toolbar_auto_hide; }
75 inline const bool isSloppyFocus(void) { return resource.sloppy_focus; } 75 inline bool isSloppyFocus(void) { return resource.sloppy_focus; }
76 inline const bool isSemiSloppyFocus(void) { return resource.semi_sloppy_focus; } 76 inline bool isSemiSloppyFocus(void) { return resource.semi_sloppy_focus; }
77 inline const bool isRootColormapInstalled(void) { return root_colormap_installed; } 77 inline bool isRootColormapInstalled(void) { return root_colormap_installed; }
78 inline const bool isScreenManaged(void) { return managed; } 78 inline bool isScreenManaged(void) { return managed; }
79 inline const bool isTabRotateVertical(void) { return *resource.tab_rotate_vertical; } 79 inline bool isTabRotateVertical(void) { return *resource.tab_rotate_vertical; }
80 inline const bool isSloppyWindowGrouping(void) { return *resource.sloppy_window_grouping; } 80 inline bool isSloppyWindowGrouping(void) { return *resource.sloppy_window_grouping; }
81 inline const bool doAutoRaise(void) { return resource.auto_raise; } 81 inline bool isWorkspaceWarping(void) { return *resource.workspace_warping; }
82 inline const bool doImageDither(void) { return *resource.image_dither; } 82 inline bool doAutoRaise(void) { return resource.auto_raise; }
83 inline const bool doMaxOverSlit(void) { return *resource.max_over_slit; } 83 inline bool doImageDither(void) { return *resource.image_dither; }
84 inline const bool doOpaqueMove(void) { return *resource.opaque_move; } 84 inline bool doMaxOverSlit(void) { return *resource.max_over_slit; }
85 inline const bool doFullMax(void) { return *resource.full_max; } 85 inline bool doOpaqueMove(void) { return *resource.opaque_move; }
86 inline const bool doFocusNew(void) { return *resource.focus_new; } 86 inline bool doFullMax(void) { return *resource.full_max; }
87 inline const bool doFocusLast(void) { return *resource.focus_last; } 87 inline bool doFocusNew(void) { return *resource.focus_new; }
88 inline bool doFocusLast(void) { return *resource.focus_last; }
88 89
89 inline const GC &getOpGC() const { return theme->getOpGC(); } 90 inline const GC &getOpGC() const { return theme->getOpGC(); }
90 91
@@ -93,11 +94,11 @@ public:
93 inline Rootmenu *getRootmenu(void) { return rootmenu; } 94 inline Rootmenu *getRootmenu(void) { return rootmenu; }
94 inline std::string &getRootCommand(void) { return *resource.rootcommand; } 95 inline std::string &getRootCommand(void) { return *resource.rootcommand; }
95#ifdef SLIT 96#ifdef SLIT
96 inline const Bool &isSlitOnTop(void) const { return resource.slit_on_top; } 97 inline const bool isSlitOnTop(void) const { return resource.slit_on_top; }
97 inline const Bool &doSlitAutoHide(void) const { return resource.slit_auto_hide; } 98 inline const bool doSlitAutoHide(void) const { return resource.slit_auto_hide; }
98 inline Slit *getSlit(void) { return slit; } 99 inline Slit *getSlit(void) { return slit; }
99 inline const int &getSlitPlacement(void) const { return resource.slit_placement; } 100 inline const int getSlitPlacement(void) const { return resource.slit_placement; }
100 inline const int &getSlitDirection(void) const { return resource.slit_direction; } 101 inline const int getSlitDirection(void) const { return resource.slit_direction; }
101 inline void saveSlitPlacement(int p) { resource.slit_placement = p; } 102 inline void saveSlitPlacement(int p) { resource.slit_placement = p; }
102 inline void saveSlitDirection(int d) { resource.slit_direction = d; } 103 inline void saveSlitDirection(int d) { resource.slit_direction = d; }
103 inline void saveSlitOnTop(Bool t) { resource.slit_on_top = t; } 104 inline void saveSlitOnTop(Bool t) { resource.slit_on_top = t; }
@@ -133,15 +134,15 @@ public:
133#ifdef XINERAMA 134#ifdef XINERAMA
134 inline const int getToolbarOnHead(void) { return *resource.toolbar_on_head; } 135 inline const int getToolbarOnHead(void) { return *resource.toolbar_on_head; }
135#endif // XINERAMA 136#endif // XINERAMA
136 inline const int getToolbarWidthPercent(void) { return *resource.toolbar_width_percent; } 137 inline int getToolbarWidthPercent(void) { return *resource.toolbar_width_percent; }
137 inline const int getPlacementPolicy(void) const { return resource.placement_policy; } 138 inline int getPlacementPolicy(void) const { return resource.placement_policy; }
138 inline const int getEdgeSnapThreshold(void) { return *resource.edge_snap_threshold; } 139 inline int getEdgeSnapThreshold(void) { return *resource.edge_snap_threshold; }
139 inline const int getRowPlacementDirection(void) const { return resource.row_direction; } 140 inline int getRowPlacementDirection(void) const { return resource.row_direction; }
140 inline const int getColPlacementDirection(void) const { return resource.col_direction; } 141 inline int getColPlacementDirection(void) const { return resource.col_direction; }
141 inline const unsigned int getTabWidth(void) { return *resource.tab_width; } 142 inline unsigned int getTabWidth(void) { return *resource.tab_width; }
142 inline const unsigned int getTabHeight(void) { return *resource.tab_height; } 143 inline unsigned int getTabHeight(void) { return *resource.tab_height; }
143 inline const Tab::Placement getTabPlacement(void) { return *resource.tab_placement; } 144 inline Tab::Placement getTabPlacement(void) { return *resource.tab_placement; }
144 inline const Tab::Alignment getTabAlignment(void) { return *resource.tab_alignment; } 145 inline Tab::Alignment getTabAlignment(void) { return *resource.tab_alignment; }
145 146
146 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } 147 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; }
147 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } 148 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; }
@@ -173,6 +174,7 @@ public:
173 inline void saveTabAlignment(Tab::Alignment a) { *resource.tab_alignment = a; } 174 inline void saveTabAlignment(Tab::Alignment a) { *resource.tab_alignment = a; }
174 inline void saveTabRotateVertical(bool r) { resource.tab_rotate_vertical = r; } 175 inline void saveTabRotateVertical(bool r) { resource.tab_rotate_vertical = r; }
175 inline void saveSloppyWindowGrouping(bool s) { resource.sloppy_window_grouping = s; } 176 inline void saveSloppyWindowGrouping(bool s) { resource.sloppy_window_grouping = s; }
177 inline void saveWorkspaceWarping(bool s) { resource.workspace_warping = s; }
176 inline void iconUpdate(void) { iconmenu->update(); } 178 inline void iconUpdate(void) { iconmenu->update(); }
177 inline Iconmenu *getIconmenu(void) { return iconmenu; } 179 inline Iconmenu *getIconmenu(void) { return iconmenu; }
178 180
@@ -295,7 +297,8 @@ private:
295 Resource<bool> toolbar_on_top, toolbar_auto_hide, 297 Resource<bool> toolbar_on_top, toolbar_auto_hide,
296 image_dither, opaque_move, full_max, 298 image_dither, opaque_move, full_max,
297 max_over_slit, tab_rotate_vertical, 299 max_over_slit, tab_rotate_vertical,
298 sloppy_window_grouping, focus_last, focus_new; 300 sloppy_window_grouping, workspace_warping,
301 focus_last, focus_new;
299 Resource<std::string> rootcommand; 302 Resource<std::string> rootcommand;
300 bool auto_raise, sloppy_focus, semi_sloppy_focus, 303 bool auto_raise, sloppy_focus, semi_sloppy_focus,
301 ordered_dither; 304 ordered_dither;
@@ -334,7 +337,7 @@ private:
334 337
335 void createStyleMenu(Rootmenu *menu, bool newmenu, const char *label, const char *directory); 338 void createStyleMenu(Rootmenu *menu, bool newmenu, const char *label, const char *directory);
336protected: 339protected:
337 Bool parseMenuFile(std::ifstream &, Rootmenu *, int&); 340 bool parseMenuFile(std::ifstream &, Rootmenu *, int&);
338 341
339 bool readDatabaseTexture(char *, char *, BTexture *, unsigned long); 342 bool readDatabaseTexture(char *, char *, BTexture *, unsigned long);
340 bool readDatabaseColor(char *, char *, BColor *, unsigned long); 343 bool readDatabaseColor(char *, char *, BColor *, unsigned long);