X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=83c3e3d2bb660621affa86c957b66ff288af30e8;hb=113181910a42893edb5e642e37546ab635bcac58;hp=8e01a466590194a6b11f7aa6527078be460c5a1e;hpb=44e3582d5e08556c7b1136cfd9a49546cf5fcae0;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 8e01a466..83c3e3d2 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -64,10 +64,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_UNISTD_H
 #  include <sys/types.h>
@@ -175,7 +178,6 @@ Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc)
   } else {
     rc_file = bstrdup(rc);
   }
-  symlink_rc(rc_file);
   config.setFile(rc_file);
 
   no_focus = False;
@@ -381,15 +383,16 @@ void Openbox::process_event(XEvent *e) {
 	      screen->getRootmenu()->show();
 	    }
           } else if (e->xbutton.button == 4) {
-            if ((screen->getCurrentWorkspaceID()-1)<0)
-              screen->changeWorkspaceID(screen->getWorkspaceCount()-1);
+            if ((screen->getCurrentWorkspaceID() + 1) >
+                screen->getWorkspaceCount() - 1)
+              screen->changeWorkspaceID(0);
             else
-              screen->changeWorkspaceID(screen->getCurrentWorkspaceID()-1);
+              screen->changeWorkspaceID(screen->getCurrentWorkspaceID() + 1);
           } else if (e->xbutton.button == 5) {
-            if ((screen->getCurrentWorkspaceID()+1)>screen->getWorkspaceCount()-1)
-              screen->changeWorkspaceID(0);
+            if ((screen->getCurrentWorkspaceID() - 1) < 0)
+              screen->changeWorkspaceID(screen->getWorkspaceCount() - 1);
             else
-              screen->changeWorkspaceID(screen->getCurrentWorkspaceID()+1);
+              screen->changeWorkspaceID(screen->getCurrentWorkspaceID() - 1);
           }
         }
       }
@@ -1642,15 +1645,3 @@ void Openbox::setFocusedWindow(OpenboxWindow *win) {
   if (old_screen && old_screen != screen)
     old_screen->updateNetizenWindowFocus();
 }
-
-#warning TODO: wrap in appropriate #ifdefs.
-
-void Openbox::symlink_rc(const char*rcfile)const{
-  char *homedir = getenv("HOME");
-  
-  char *link_file = new char[strlen(homedir) + strlen("/.blackoxrc") + 1];
-  sprintf(link_file, "%s/.blackboxrc", homedir);
-  if(symlink(rcfile, link_file) == -1){
-    perror("Cannot create symlink");
-  }
-}