X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=util%2Fepist%2Fscreen.cc;h=2862b870148519cc3087a3f4a8060dd6f14d964b;hb=a04483857afd7a447c9b89e2e8cf23f971ce5b06;hp=31a90233abf87de9def9fd10910732d201163878;hpb=f44e3ed9a7232a38b454e293daee2f3e7009ad54;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 31a90233..2862b870 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -242,6 +242,16 @@ void screen::handleKeypress(const XEvent &e) {
     execCommand(it->string());
     return;
 
+  case Action::showRootMenu:
+    _xatom->sendClientMessage(rootWindow(), XAtom::openbox_show_root_menu,
+                              None);
+    return;
+
+  case Action::showWorkspaceMenu:
+    _xatom->sendClientMessage(rootWindow(), XAtom::openbox_show_workspace_menu,
+                              None);
+    return;
+
   default:
     break;
   }
@@ -592,25 +602,26 @@ void screen::changeWorkspaceVert(const int num) const {
   assert(_managed);
   const Config *conf = _epist->getConfig();
   int width = conf->getNumberValue(Config::workspaceColumns);
+  int num_desktops = (signed)_num_desktops;
+  int active_desktop = (signed)_active_desktop;
+  int wnum = 0;
 
-  if (width > _num_desktops || width <= 0)
+  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;
+    wnum = active_desktop - width;
     if (wnum < 0) {
-      wnum = _num_desktops/width * width + _active_desktop;
-      if (wnum >= _num_desktops)
-        wnum = _num_desktops - 1;
+      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;
+    wnum = active_desktop + width;
+    if (wnum >= num_desktops) {
+      wnum = (active_desktop + width) % num_desktops - 1;
       if (wnum < 0)
         wnum = 0;
     }
@@ -622,28 +633,30 @@ void screen::changeWorkspaceHorz(const int num) const {
   assert(_managed);
   const Config *conf = _epist->getConfig();
   int width = conf->getNumberValue(Config::workspaceColumns);
-  int wnum;
+  int num_desktops = (signed)_num_desktops;
+  int active_desktop = (signed)_active_desktop;
+  int wnum = 0;
   
-  if (width > _num_desktops || width <= 0)
+  if (width > num_desktops || width <= 0)
     return;
 
   if (num < 0) {
-    if (_active_desktop % width != 0)
-      changeWorkspace(_active_desktop - 1);
+    if (active_desktop % width != 0)
+      changeWorkspace(active_desktop - 1);
     else {
-      wnum = _active_desktop + width - 1;
-      if (wnum >= _num_desktops)
-        wnum = _num_desktops - 1;
+      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;
+    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;
+      wnum = active_desktop - width + 1;
   }
   changeWorkspace(wnum);
 }