summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Resource.hh3
-rw-r--r--src/Screen.hh46
2 files changed, 23 insertions, 26 deletions
diff --git a/src/Resource.hh b/src/Resource.hh
index 38bea30..9b314e7 100644
--- a/src/Resource.hh
+++ b/src/Resource.hh
@@ -19,6 +19,8 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Resource.hh,v 1.2 2002/01/21 02:11:49 fluxgen Exp $
23
22#ifndef _RESOURCE_HH_ 24#ifndef _RESOURCE_HH_
23#define _RESOURCE_HH_ 25#define _RESOURCE_HH_
24 26
@@ -103,5 +105,4 @@ private:
103 105
104}; 106};
105 107
106
107#endif //_RESOURCE_HH_ 108#endif //_RESOURCE_HH_
diff --git a/src/Screen.hh b/src/Screen.hh
index c03de84..dc7aead 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.11 2002/01/20 02:25:35 fluxgen Exp $ 25// $Id: Screen.hh,v 1.12 2002/01/21 02:12:11 fluxgen Exp $
26 26
27#ifndef _SCREEN_HH_ 27#ifndef _SCREEN_HH_
28#define _SCREEN_HH_ 28#define _SCREEN_HH_
@@ -30,8 +30,6 @@
30 30
31#include "Theme.hh" 31#include "Theme.hh"
32 32
33// forward declaration
34class BScreen;
35#ifndef _BASEDISPLAY_HH_ 33#ifndef _BASEDISPLAY_HH_
36#include "BaseDisplay.hh" 34#include "BaseDisplay.hh"
37#endif 35#endif
@@ -105,8 +103,8 @@ public:
105 inline const bool doMaxOverSlit(void) { return *resource.max_over_slit; } 103 inline const bool doMaxOverSlit(void) { return *resource.max_over_slit; }
106 inline const bool doOpaqueMove(void) { return *resource.opaque_move; } 104 inline const bool doOpaqueMove(void) { return *resource.opaque_move; }
107 inline const bool doFullMax(void) { return *resource.full_max; } 105 inline const bool doFullMax(void) { return *resource.full_max; }
108 inline const bool doFocusNew(void) { return resource.focus_new; } 106 inline const bool doFocusNew(void) { return *resource.focus_new; }
109 inline const bool doFocusLast(void) { return resource.focus_last; } 107 inline const bool doFocusLast(void) { return *resource.focus_last; }
110 108
111 inline const GC &getOpGC() const { return theme->getOpGC(); } 109 inline const GC &getOpGC() const { return theme->getOpGC(); }
112 110
@@ -156,32 +154,30 @@ public:
156 154
157 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } 155 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; }
158 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } 156 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; }
159 inline void saveSloppyFocus(Bool s) { resource.sloppy_focus = s; } 157 inline void saveSloppyFocus(bool s) { resource.sloppy_focus = s; }
160 inline void saveSemiSloppyFocus(Bool s) { resource.semi_sloppy_focus = s; } 158 inline void saveSemiSloppyFocus(bool s) { resource.semi_sloppy_focus = s; }
161 inline void saveAutoRaise(Bool a) { resource.auto_raise = a; } 159 inline void saveAutoRaise(bool a) { resource.auto_raise = a; }
162 inline void saveWorkspaces(int w) { resource.workspaces = w; } 160 inline void saveWorkspaces(int w) { *resource.workspaces = w; }
163 inline void saveToolbarOnTop(Bool r) { resource.toolbar_on_top = r; } 161 inline void saveToolbarOnTop(bool r) { *resource.toolbar_on_top = r; }
164 inline void saveToolbarAutoHide(Bool r) { resource.toolbar_auto_hide = r; } 162 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; }
165 inline void saveToolbarWidthPercent(int w) { resource.toolbar_width_percent = w; } 163 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; }
166 inline void saveToolbarPlacement(Toolbar::Placement p) { *resource.toolbar_placement = p; } 164 inline void saveToolbarPlacement(Toolbar::Placement p) { *resource.toolbar_placement = p; }
167 inline void savePlacementPolicy(int p) { resource.placement_policy = p; } 165 inline void savePlacementPolicy(int p) { resource.placement_policy = p; }
168 inline void saveRowPlacementDirection(int d) { resource.row_direction = d; } 166 inline void saveRowPlacementDirection(int d) { resource.row_direction = d; }
169 inline void saveColPlacementDirection(int d) { resource.col_direction = d; } 167 inline void saveColPlacementDirection(int d) { resource.col_direction = d; }
170 inline void saveEdgeSnapThreshold(int t) { resource.edge_snap_threshold = t; } 168 inline void saveEdgeSnapThreshold(int t) { resource.edge_snap_threshold = t; }
171 inline void saveImageDither(Bool d) { resource.image_dither = d; } 169 inline void saveImageDither(bool d) { resource.image_dither = d; }
172 inline void saveMaxOverSlit(Bool m) { resource.max_over_slit = m; } 170 inline void saveMaxOverSlit(bool m) { resource.max_over_slit = m; }
173 inline void saveOpaqueMove(Bool o) { resource.opaque_move = o; } 171 inline void saveOpaqueMove(bool o) { resource.opaque_move = o; }
174 inline void saveFullMax(Bool f) { resource.full_max = f; } 172 inline void saveFullMax(bool f) { resource.full_max = f; }
175 inline void saveFocusNew(Bool f) { resource.focus_new = f; } 173 inline void saveFocusNew(bool f) { resource.focus_new = f; }
176 inline void saveFocusLast(Bool f) { resource.focus_last = f; } 174 inline void saveFocusLast(bool f) { resource.focus_last = f; }
177 inline void saveTabWidth(unsigned int w) { resource.tab_width = w; } 175 inline void saveTabWidth(unsigned int w) { resource.tab_width = w; }
178 inline void saveTabHeight(unsigned int h) { resource.tab_height = h; } 176 inline void saveTabHeight(unsigned int h) { resource.tab_height = h; }
179 inline void saveTabPlacement(Tab::Placement p) { *resource.tab_placement = p; } 177 inline void saveTabPlacement(Tab::Placement p) { *resource.tab_placement = p; }
180 inline void saveTabAlignment(Tab::Alignment a) { *resource.tab_alignment = a; } 178 inline void saveTabAlignment(Tab::Alignment a) { *resource.tab_alignment = a; }
181 inline void saveTabRotateVertical(Bool r) 179 inline void saveTabRotateVertical(Bool r) { resource.tab_rotate_vertical = r; }
182 { resource.tab_rotate_vertical = r; } 180 inline void saveSloppyWindowGrouping(Bool s) { resource.sloppy_window_grouping = s; }
183 inline void saveSloppyWindowGrouping(Bool s)
184 { resource.sloppy_window_grouping = s; }
185 inline void iconUpdate(void) { iconmenu->update(); } 181 inline void iconUpdate(void) { iconmenu->update(); }
186 inline Iconmenu *getIconmenu(void) { return iconmenu; } 182 inline Iconmenu *getIconmenu(void) { return iconmenu; }
187 183
@@ -287,9 +283,9 @@ private:
287 Resource<bool> toolbar_on_top, toolbar_auto_hide, 283 Resource<bool> toolbar_on_top, toolbar_auto_hide,
288 image_dither, opaque_move, full_max, 284 image_dither, opaque_move, full_max,
289 max_over_slit, tab_rotate_vertical, 285 max_over_slit, tab_rotate_vertical,
290 sloppy_window_grouping; 286 sloppy_window_grouping, focus_last, focus_new;
291 Resource<std::string> rootcommand; 287 Resource<std::string> rootcommand;
292 bool auto_raise, sloppy_focus, semi_sloppy_focus, focus_new, focus_last, 288 bool auto_raise, sloppy_focus, semi_sloppy_focus,
293 ordered_dither; 289 ordered_dither;
294 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold, 290 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold,
295 tab_width, tab_height; 291 tab_width, tab_height;