changeWorkspaceHorz() now cycles

[chaz/openbox] / util / epist / screen.cc

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index d767c268136460746db411b83b4bee3e6fc14040..48eaaaf27c74973dcd72966fcc18ebfc6635b0fd 100644 (file)
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 // screen.cc for Epistrophy - a key handler for NETWM/EWMH window managers.
 // Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
 //
@@ -48,7 +48,7 @@ using std::string;
 #include "../../src/XAtom.hh"
 #include "screen.hh"
 #include "epist.hh"
-
+#include "config.hh"
 
 screen::screen(epist *epist, int number) 
   : _clients(epist->clientsList()),
@@ -59,7 +59,7 @@ screen::screen(epist *epist, int number)
   _number = number;
   _info = _epist->getScreenInfo(_number);
   _root = _info->getRootWindow();
-  
+
   // find a window manager supporting NETWM, waiting for it to load if we must
   int count = 20;  // try for 20 seconds
   _managed = false;
@@ -222,6 +222,22 @@ void screen::handleKeypress(const XEvent &e) {
     changeWorkspace(it->number());
     return;
 
+  case Action::upWorkspace:
+    changeWorkspaceVert(-1);
+    return;
+
+  case Action::downWorkspace:
+    changeWorkspaceVert(1);
+    return;
+
+  case Action::leftWorkspace:
+    changeWorkspaceHorz(-1);
+    return;
+
+  case Action::rightWorkspace:
+    changeWorkspaceHorz(1);
+    return;
+
   case Action::execute:
     execCommand(it->string());
     return;
@@ -475,6 +491,7 @@ void screen::cycleWindow(const bool forward, const int increment,
                          const bool allscreens, const bool alldesktops,
                          const bool sameclass, const string &cn) const {
   assert(_managed);
+  assert(increment > 0);
 
   if (_clients.empty()) return;
 
@@ -486,7 +503,7 @@ void screen::cycleWindow(const bool forward, const int increment,
     begin = _clients.begin(),
     end = _clients.end();
 
-  const XWindow *t;
+  const XWindow *t = 0;
   
   for (int x = 0; x < increment; ++x) {
     while (1) {
@@ -499,8 +516,7 @@ void screen::cycleWindow(const bool forward, const int increment,
       } else {
         if (target == begin)
           target = end;
-        for (int x = 0; x < increment; ++x)
-          --target;
+        --target;
       }
 
       // must be no window to focus
@@ -532,8 +548,10 @@ void screen::cycleWindow(const bool forward, const int increment,
 }
 
 
-void screen::cycleWorkspace(const bool forward, const int increment, const bool loop) const {
+void screen::cycleWorkspace(const bool forward, const int increment,
+                            const bool loop) const {
   assert(_managed);
+  assert(increment > 0);
 
   unsigned int destination = _active_desktop;
 
@@ -562,6 +580,66 @@ void screen::changeWorkspace(const int num) const {
   _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num);
 }
 
+void screen::changeWorkspaceVert(const int num) const {
+  assert(_managed);
+  const Config *conf = _epist->getConfig();
+  int width = conf->getNumberValue(Config::workspaceColumns);
+
+  if (width > _num_desktops || width <= 0)
+    return;
+
+  int wnum;
+  
+  // a cookie to the person that makes this pretty
+  if (num < 0) {
+    wnum = _active_desktop - width;
+    if (wnum < 0) {
+      wnum = _num_desktops/width * width + _active_desktop;
+      if (wnum >= _num_desktops)
+        wnum = _num_desktops - 1;
+    }
+  }
+  else {
+    wnum = _active_desktop + width;
+    if (wnum >= _num_desktops) {
+      wnum = (_active_desktop + width) % _num_desktops - 1;
+      if (wnum < 0)
+        wnum = 0;
+    }
+  }
+  changeWorkspace(wnum);
+}
+
+void screen::changeWorkspaceHorz(const int num) const {
+  assert(_managed);
+  const Config *conf = _epist->getConfig();
+  int width = conf->getNumberValue(Config::workspaceColumns);
+  int wnum;
+  
+  if (width > _num_desktops || width <= 0)
+    return;
+
+  if (num < 0) {
+    if (_active_desktop % width != 0)
+      changeWorkspace(_active_desktop - 1);
+    else {
+      wnum = _active_desktop + width - 1;
+      if (wnum >= _num_desktops)
+        wnum = _num_desktops - 1;
+    }
+  }
+  else {
+    if (_active_desktop % width != width - 1) {
+      wnum = _active_desktop + 1;
+      if (wnum >= _num_desktops)
+        wnum = _num_desktops / width * width;
+    }
+    else
+      wnum = _active_desktop - width + 1;
+  }
+  changeWorkspace(wnum);
+}
+
 void screen::grabKey(const KeyCode keyCode, const int modifierMask) const {
 
   Display *display = _epist->getXDisplay();