X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=b3678664dfca630110fa9bacc49c42a82863846e;hb=67e5cb217e62e61928a7c399148f7d4a0bcfee0b;hp=194a737c0e5330aee6f6d489b2b63e9e2b84378e;hpb=ba6e2034e7a0bea0e2a71d3e90a808f02bdb5629;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 194a737c..b3678664 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -55,6 +55,7 @@
 #include "Window.h"
 #include "Workspace.h"
 #include "Workspacemenu.h"
+#include "Util.h"
 
 #include <string>
 #include <algorithm>
@@ -174,7 +175,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;
@@ -337,14 +337,14 @@ void Openbox::process_event(XEvent *e) {
 	    if (my < 0) my = 0;
 
 	    if (mx + screen->getWorkspacemenu()->getWidth() >
-		screen->getWidth())
-	      mx = screen->getWidth() -
+		screen->size().w())
+	      mx = screen->size().w() -
 		screen->getWorkspacemenu()->getWidth() -
 		screen->getBorderWidth();
 
 	    if (my + screen->getWorkspacemenu()->getHeight() >
-		screen->getHeight())
-	      my = screen->getHeight() -
+		screen->size().h())
+	      my = screen->size().h() -
 		screen->getWorkspacemenu()->getHeight() -
 		screen->getBorderWidth();
 
@@ -363,13 +363,13 @@ void Openbox::process_event(XEvent *e) {
 	    if (mx < 0) mx = 0;
 	    if (my < 0) my = 0;
 
-	    if (mx + screen->getRootmenu()->getWidth() > screen->getWidth())
-	      mx = screen->getWidth() -
+	    if (mx + screen->getRootmenu()->getWidth() > screen->size().w())
+	      mx = screen->size().w() -
 		screen->getRootmenu()->getWidth() -
 		screen->getBorderWidth();
 
-	    if (my + screen->getRootmenu()->getHeight() > screen->getHeight())
-		my = screen->getHeight() -
+	    if (my + screen->getRootmenu()->getHeight() > screen->size().h())
+		my = screen->size().h() -
 		  screen->getRootmenu()->getHeight() -
 		  screen->getBorderWidth();
 
@@ -1209,9 +1209,9 @@ void Openbox::load_rc(void) {
 
 
 void Openbox::load_rc(BScreen *screen) {
-  assert (screen != NULL);
+  ASSERT (screen != NULL);
   const int screen_number = screen->getScreenNumber();
-  assert (screen_number >= 0);
+  ASSERT (screen_number >= 0);
 
   if (!config.load())
     return;
@@ -1641,15 +1641,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");
-  }
-}