summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc5
-rw-r--r--src/Screen.hh6
-rw-r--r--src/fluxbox.cc6
3 files changed, 10 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 6bbe39f..e27a9db 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -16,13 +16,13 @@
16// 16//
17// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 17// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 18// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 19// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 20// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 21// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
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.cc,v 1.48 2002/05/07 13:54:42 fluxgen Exp $ 25// $Id: Screen.cc,v 1.49 2002/05/08 10:12:17 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -202,6 +202,7 @@ max_over_slit(rm, true, scrname+".maxOverSlit",altscrname+".MaxOverSlit"),
202tab_rotate_vertical(rm, true, scrname+".tab.rotatevertical", altscrname+".Tab.RotateVertical"), 202tab_rotate_vertical(rm, true, scrname+".tab.rotatevertical", altscrname+".Tab.RotateVertical"),
203sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"), 203sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"),
204workspace_warping(rm, true, scrname+".workspacewarping", altscrname+".WorkspaceWarping"), 204workspace_warping(rm, true, scrname+".workspacewarping", altscrname+".WorkspaceWarping"),
205desktop_wheeling(rm, true, scrname+".desktopwheeling", altscrname+".DesktopWheeling"),
205focus_last(rm, true, scrname+".focusLastWindow", altscrname+".FocusLastWindow"), 206focus_last(rm, true, scrname+".focusLastWindow", altscrname+".FocusLastWindow"),
206focus_new(rm, true, scrname+".focusNewWindows", altscrname+".FocusNewWindows"), 207focus_new(rm, true, scrname+".focusNewWindows", altscrname+".FocusNewWindows"),
207rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), 208rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
diff --git a/src/Screen.hh b/src/Screen.hh
index 9492d50..12529e3 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.31 2002/04/19 09:34:10 fluxgen Exp $ 25// $Id: Screen.hh,v 1.32 2002/05/08 10:10:19 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -79,6 +79,7 @@ public:
79 inline bool isTabRotateVertical(void) { return *resource.tab_rotate_vertical; } 79 inline bool isTabRotateVertical(void) { return *resource.tab_rotate_vertical; }
80 inline bool isSloppyWindowGrouping(void) { return *resource.sloppy_window_grouping; } 80 inline bool isSloppyWindowGrouping(void) { return *resource.sloppy_window_grouping; }
81 inline bool isWorkspaceWarping(void) { return *resource.workspace_warping; } 81 inline bool isWorkspaceWarping(void) { return *resource.workspace_warping; }
82 inline bool isDesktopWheeling(void) { return *resource.desktop_wheeling; }
82 inline bool doAutoRaise(void) { return resource.auto_raise; } 83 inline bool doAutoRaise(void) { return resource.auto_raise; }
83 inline bool doImageDither(void) { return *resource.image_dither; } 84 inline bool doImageDither(void) { return *resource.image_dither; }
84 inline bool doMaxOverSlit(void) { return *resource.max_over_slit; } 85 inline bool doMaxOverSlit(void) { return *resource.max_over_slit; }
@@ -175,6 +176,7 @@ public:
175 inline void saveTabRotateVertical(bool r) { resource.tab_rotate_vertical = r; } 176 inline void saveTabRotateVertical(bool r) { resource.tab_rotate_vertical = r; }
176 inline void saveSloppyWindowGrouping(bool s) { resource.sloppy_window_grouping = s; } 177 inline void saveSloppyWindowGrouping(bool s) { resource.sloppy_window_grouping = s; }
177 inline void saveWorkspaceWarping(bool s) { resource.workspace_warping = s; } 178 inline void saveWorkspaceWarping(bool s) { resource.workspace_warping = s; }
179 inline void saveDesktopWheeling(bool s) { resource.desktop_wheeling = s; }
178 inline void iconUpdate(void) { iconmenu->update(); } 180 inline void iconUpdate(void) { iconmenu->update(); }
179 inline Iconmenu *getIconmenu(void) { return iconmenu; } 181 inline Iconmenu *getIconmenu(void) { return iconmenu; }
180 182
@@ -298,7 +300,7 @@ private:
298 image_dither, opaque_move, full_max, 300 image_dither, opaque_move, full_max,
299 max_over_slit, tab_rotate_vertical, 301 max_over_slit, tab_rotate_vertical,
300 sloppy_window_grouping, workspace_warping, 302 sloppy_window_grouping, workspace_warping,
301 focus_last, focus_new; 303 desktop_wheeling, focus_last, focus_new;
302 Resource<std::string> rootcommand; 304 Resource<std::string> rootcommand;
303 bool auto_raise, sloppy_focus, semi_sloppy_focus, 305 bool auto_raise, sloppy_focus, semi_sloppy_focus,
304 ordered_dither; 306 ordered_dither;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index f61eca2..d4aefa2 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -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: fluxbox.cc,v 1.56 2002/05/08 09:33:11 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.57 2002/05/08 10:14:51 fluxgen Exp $
26 26
27//Use GNU extensions 27//Use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -973,9 +973,9 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
973 checkMenu(); 973 checkMenu();
974 screen->getRootmenu()->show(); 974 screen->getRootmenu()->show();
975 } 975 }
976 } else if (be.button == 4) { 976 } else if (screen->isDesktopWheeling() && be.button == 4) {
977 screen->nextWorkspace(1); 977 screen->nextWorkspace(1);
978 } else if (be.button == 5) { 978 } else if (screen->isDesktopWheeling() && be.button == 5) {
979 screen->prevWorkspace(1); 979 screen->prevWorkspace(1);
980 } 980 }
981 } 981 }