diff options
author | fluxgen <fluxgen> | 2002-04-09 12:13:44 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-04-09 12:13:44 (GMT) |
commit | 674aa1fc9519ea82df248ef2925a2b78af10fa3a (patch) | |
tree | bca3a720cf81097497edfc6d8d0ca93fcea54218 | |
parent | 30fe2fb8feb4a1405ea164424a2b8336d2f5a8f4 (diff) | |
download | fluxbox_paul-674aa1fc9519ea82df248ef2925a2b78af10fa3a.zip fluxbox_paul-674aa1fc9519ea82df248ef2925a2b78af10fa3a.tar.bz2 |
minor fixes
-rw-r--r-- | src/Screen.hh | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index c34809d..4c8ffae 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.27 2002/04/03 12:08:54 fluxgen Exp $ | 25 | // $Id: Screen.hh,v 1.28 2002/04/09 12:13:44 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SCREEN_HH | 27 | #ifndef SCREEN_HH |
28 | #define SCREEN_HH | 28 | #define SCREEN_HH |
@@ -98,13 +98,13 @@ public: | |||
98 | inline Slit *getSlit(void) { return slit; } | 98 | inline Slit *getSlit(void) { return slit; } |
99 | inline const int &getSlitPlacement(void) const { return resource.slit_placement; } | 99 | inline const int &getSlitPlacement(void) const { return resource.slit_placement; } |
100 | inline const int &getSlitDirection(void) const { return resource.slit_direction; } | 100 | inline const int &getSlitDirection(void) const { return resource.slit_direction; } |
101 | inline void saveSlitPlacement(int p) { resource.slit_placement = p; } | 101 | inline void saveSlitPlacement(int p) { resource.slit_placement = p; } |
102 | inline void saveSlitDirection(int d) { resource.slit_direction = d; } | 102 | inline void saveSlitDirection(int d) { resource.slit_direction = d; } |
103 | inline void saveSlitOnTop(Bool t) { resource.slit_on_top = t; } | 103 | inline void saveSlitOnTop(Bool t) { resource.slit_on_top = t; } |
104 | inline void saveSlitAutoHide(Bool t) { resource.slit_auto_hide = t; } | 104 | inline void saveSlitAutoHide(Bool t) { resource.slit_auto_hide = t; } |
105 | #ifdef XINERAMA | 105 | #ifdef XINERAMA |
106 | inline const unsigned int getSlitOnHead(void) const { return resource.slit_on_head; } | 106 | inline const unsigned int getSlitOnHead(void) const { return resource.slit_on_head; } |
107 | inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; } | 107 | inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; } |
108 | #endif // XINERAMA | 108 | #endif // XINERAMA |
109 | 109 | ||
110 | #endif // SLIT | 110 | #endif // SLIT |
@@ -143,36 +143,36 @@ public: | |||
143 | inline const Tab::Placement getTabPlacement(void) { return *resource.tab_placement; } | 143 | inline const Tab::Placement getTabPlacement(void) { return *resource.tab_placement; } |
144 | inline const Tab::Alignment getTabAlignment(void) { return *resource.tab_alignment; } | 144 | inline const Tab::Alignment getTabAlignment(void) { return *resource.tab_alignment; } |
145 | 145 | ||
146 | inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } | 146 | inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } |
147 | inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } | 147 | inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } |
148 | inline void saveSloppyFocus(bool s) { resource.sloppy_focus = s; } | 148 | inline void saveSloppyFocus(bool s) { resource.sloppy_focus = s; } |
149 | inline void saveSemiSloppyFocus(bool s) { resource.semi_sloppy_focus = s; } | 149 | inline void saveSemiSloppyFocus(bool s) { resource.semi_sloppy_focus = s; } |
150 | inline void saveAutoRaise(bool a) { resource.auto_raise = a; } | 150 | inline void saveAutoRaise(bool a) { resource.auto_raise = a; } |
151 | inline void saveWorkspaces(int w) { *resource.workspaces = w; } | 151 | inline void saveWorkspaces(int w) { *resource.workspaces = w; } |
152 | inline void saveToolbarOnTop(bool r) { *resource.toolbar_on_top = r; } | 152 | inline void saveToolbarOnTop(bool r) { *resource.toolbar_on_top = r; } |
153 | inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; } | 153 | inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; } |
154 | inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; } | 154 | inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; } |
155 | inline void saveToolbarPlacement(Toolbar::Placement p) { *resource.toolbar_placement = p; } | 155 | inline void saveToolbarPlacement(Toolbar::Placement p) { *resource.toolbar_placement = p; } |
156 | #ifdef XINERAMA | 156 | #ifdef XINERAMA |
157 | inline void saveToolbarOnHead(int head) { *resource.toolbar_on_head = head; } | 157 | inline void saveToolbarOnHead(int head) { *resource.toolbar_on_head = head; } |
158 | #endif // XINERAMA | 158 | #endif // XINERAMA |
159 | 159 | ||
160 | inline void savePlacementPolicy(int p) { resource.placement_policy = p; } | 160 | inline void savePlacementPolicy(int p) { resource.placement_policy = p; } |
161 | inline void saveRowPlacementDirection(int d) { resource.row_direction = d; } | 161 | inline void saveRowPlacementDirection(int d) { resource.row_direction = d; } |
162 | inline void saveColPlacementDirection(int d) { resource.col_direction = d; } | 162 | inline void saveColPlacementDirection(int d) { resource.col_direction = d; } |
163 | inline void saveEdgeSnapThreshold(int t) { resource.edge_snap_threshold = t; } | 163 | inline void saveEdgeSnapThreshold(int t) { resource.edge_snap_threshold = t; } |
164 | inline void saveImageDither(bool d) { resource.image_dither = d; } | 164 | inline void saveImageDither(bool d) { resource.image_dither = d; } |
165 | inline void saveMaxOverSlit(bool m) { resource.max_over_slit = m; } | 165 | inline void saveMaxOverSlit(bool m) { resource.max_over_slit = m; } |
166 | inline void saveOpaqueMove(bool o) { resource.opaque_move = o; } | 166 | inline void saveOpaqueMove(bool o) { resource.opaque_move = o; } |
167 | inline void saveFullMax(bool f) { resource.full_max = f; } | 167 | inline void saveFullMax(bool f) { resource.full_max = f; } |
168 | inline void saveFocusNew(bool f) { resource.focus_new = f; } | 168 | inline void saveFocusNew(bool f) { resource.focus_new = f; } |
169 | inline void saveFocusLast(bool f) { resource.focus_last = f; } | 169 | inline void saveFocusLast(bool f) { resource.focus_last = f; } |
170 | inline void saveTabWidth(unsigned int w) { resource.tab_width = w; } | 170 | inline void saveTabWidth(unsigned int w) { resource.tab_width = w; } |
171 | inline void saveTabHeight(unsigned int h) { resource.tab_height = h; } | 171 | inline void saveTabHeight(unsigned int h) { resource.tab_height = h; } |
172 | inline void saveTabPlacement(Tab::Placement p) { *resource.tab_placement = p; } | 172 | inline void saveTabPlacement(Tab::Placement p) { *resource.tab_placement = p; } |
173 | inline void saveTabAlignment(Tab::Alignment a) { *resource.tab_alignment = a; } | 173 | inline void saveTabAlignment(Tab::Alignment a) { *resource.tab_alignment = a; } |
174 | inline void saveTabRotateVertical(Bool r) { resource.tab_rotate_vertical = r; } | 174 | inline void saveTabRotateVertical(bool r) { resource.tab_rotate_vertical = r; } |
175 | inline void saveSloppyWindowGrouping(Bool s) { resource.sloppy_window_grouping = s; } | 175 | inline void saveSloppyWindowGrouping(bool s) { resource.sloppy_window_grouping = s; } |
176 | inline void iconUpdate(void) { iconmenu->update(); } | 176 | inline void iconUpdate(void) { iconmenu->update(); } |
177 | inline Iconmenu *getIconmenu(void) { return iconmenu; } | 177 | inline Iconmenu *getIconmenu(void) { return iconmenu; } |
178 | 178 | ||
@@ -243,7 +243,6 @@ public: | |||
243 | // prevFocus/nextFocus option bits | 243 | // prevFocus/nextFocus option bits |
244 | enum { CYCLESKIPLOWERTABS = 0x01, CYCLESKIPSTUCK = 0x02, CYCLESKIPSHADED = 0x04, | 244 | enum { CYCLESKIPLOWERTABS = 0x01, CYCLESKIPSTUCK = 0x02, CYCLESKIPSHADED = 0x04, |
245 | CYCLEDEFAULT = 0x00 }; | 245 | CYCLEDEFAULT = 0x00 }; |
246 | |||
247 | private: | 246 | private: |
248 | bool doSkipWindow(const FluxboxWindow *w, int options); | 247 | bool doSkipWindow(const FluxboxWindow *w, int options); |
249 | #ifdef GNOME | 248 | #ifdef GNOME |