fixed unsigned/signed comparison warnings

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

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 48eaaaf27c74973dcd72966fcc18ebfc6635b0fd..2862b870148519cc3087a3f4a8060dd6f14d964b 100644 (file)
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -121,11 +121,11 @@ void screen::processEvent(const XEvent &e) {
     // root window
     if (e.xproperty.atom == _xatom->getAtom(XAtom::net_number_of_desktops))
       updateNumDesktops();
-    if (e.xproperty.atom == _xatom->getAtom(XAtom::net_current_desktop))
+    else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_current_desktop))
       updateActiveDesktop();
-    if (e.xproperty.atom == _xatom->getAtom(XAtom::net_active_window))
+    else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_active_window))
       updateActiveWindow();
-    if (e.xproperty.atom == _xatom->getAtom(XAtom::net_client_list)) {
+    else if (e.xproperty.atom == _xatom->getAtom(XAtom::net_client_list)) {
       // catch any window unmaps first
       XEvent ev;
       if (XCheckTypedWindowEvent(_epist->getXDisplay(), e.xany.window,
@@ -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;
   }
@@ -279,19 +289,23 @@ void screen::handleKeypress(const XEvent &e) {
       return;
 
     case Action::moveWindowUp:
-      window->move(window->x(), window->y() - it->number());
+      window->move(window->x(), window->y() -
+                   (it->number() != 0 ? it->number(): 1));
       return;
       
     case Action::moveWindowDown:
-      window->move(window->x(), window->y() + it->number());
+      window->move(window->x(), window->y() +
+                   (it->number() != 0 ? it->number(): 1));
       return;
       
     case Action::moveWindowLeft:
-      window->move(window->x() - it->number(), window->y());
+      window->move(window->x() - (it->number() != 0 ? it->number(): 1),
+                   window->y());
       return;
       
     case Action::moveWindowRight:
-      window->move(window->x() + it->number(), window->y());
+      window->move(window->x() + (it->number() != 0 ? it->number(): 1),
+                   window->y());
       return;
       
     case Action::resizeWindowWidth:
@@ -317,6 +331,10 @@ void screen::handleKeypress(const XEvent &e) {
     case Action::toggleMaximizeFull:
       window->toggleMaximize(XWindow::Max_Full);
       return;
+
+    case Action::toggleDecorations:
+      window->decorate(! window->decorated());
+      return;
       
     default:
       assert(false);  // unhandled action type!
@@ -584,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;
     }
@@ -614,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);
 }