X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FWorkspace.cc;h=130b0b409421cff847407abc55e3bbb18ca51f96;hb=ba6e2034e7a0bea0e2a71d3e90a808f02bdb5629;hp=c31b3efaa02b6dd9502de838461467fc22b242cd;hpb=424d476f7cd0ccc2def4f14119cd4fc3171d0159;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index c31b3efa..130b0b40 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -68,7 +68,7 @@ Workspace::Workspace(BScreen *scrn, int i) {
 
   stackingList = new LinkedList<OpenboxWindow>;
   windowList = new LinkedList<OpenboxWindow>;
-  clientmenu = new Clientmenu(this);
+  clientmenu = new Clientmenu(*this);
 
   lastfocus = (OpenboxWindow *) 0;
 
@@ -120,12 +120,12 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
 	w->getTransientFor()->isVisible()) {
       w->getTransientFor()->setInputFocus();
     } else if (screen->isSloppyFocus()) {
-      screen->getOpenbox()->setFocusedWindow((OpenboxWindow *) 0);
+      screen->getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
     } else {
       OpenboxWindow *top = stackingList->first();
       if (! top || ! top->setInputFocus()) {
-	screen->getOpenbox()->setFocusedWindow((OpenboxWindow *) 0);
-	XSetInputFocus(screen->getOpenbox()->getXDisplay(),
+	screen->getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
+	XSetInputFocus(screen->getOpenbox().getXDisplay(),
 		       screen->getToolbar()->getWindowID(),
 		       RevertToParent, CurrentTime);
       }
@@ -251,12 +251,12 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
     win = win->getTransientFor();
   }
 
-  screen->getOpenbox()->grab();
+  screen->getOpenbox().grab();
 
-  XLowerWindow(screen->getBaseDisplay()->getXDisplay(), *nstack);
-  XRestackWindows(screen->getBaseDisplay()->getXDisplay(), nstack, i);
+  XLowerWindow(screen->getBaseDisplay().getXDisplay(), *nstack);
+  XRestackWindows(screen->getBaseDisplay().getXDisplay(), nstack, i);
 
-  screen->getOpenbox()->ungrab();
+  screen->getOpenbox().ungrab();
 
   delete [] nstack;
 }