X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=619b520548e8f6b6e12e7b4fd775ae04f91f2526;hb=ae093dba2fb97124bb4af3eaf4070b46f07dfd74;hp=89ea8e7bc9fa31742555909c87c9178f1b6a38af;hpb=57fb41c8060eaa2f29b25b08e3813b3dc140f165;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 89ea8e7b..619b5205 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -63,13 +63,11 @@ typedef std::vector<Rect> rectList;
 
 Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
   cascade_x = cascade_y = 0;
-  _focused = (OpenboxWindow *) 0;
+  _focused = _last = (OpenboxWindow *) 0;
   id = i;
 
   clientmenu = new Clientmenu(*this);
 
-  lastfocus = (OpenboxWindow *) 0;
-
   name = (char *) 0;
   setName(screen.getNameOfWorkspace(id));
 }
@@ -83,7 +81,7 @@ Workspace::~Workspace(void) {
 }
 
 
-const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
+int Workspace::addWindow(OpenboxWindow *w, bool place) {
   if (! w) return -1;
 
   if (place) placeWindow(*w);
@@ -105,29 +103,28 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
 }
 
 
-const int Workspace::removeWindow(OpenboxWindow *w) {
+int Workspace::removeWindow(OpenboxWindow *w) {
   if (! w) return -1;
 
   _zorder.remove(w);
 
   if (w->isFocused()) {
+    if (w == _last)
+      _last = (OpenboxWindow *) 0;
+    
+    OpenboxWindow *fw = (OpenboxWindow *) 0;
     if (w->isTransient() && w->getTransientFor() &&
-	w->getTransientFor()->isVisible()) {
-      w->getTransientFor()->setInputFocus();
-    } else {
-      if (screen.sloppyFocus() ||               // sloppy focus
-          _zorder.empty() ||                    // click focus but no windows
-          !_zorder.front()->setInputFocus()) {  // tried window, but wont focus
-	screen.getOpenbox().focusWindow((OpenboxWindow *) 0);
-        XSetInputFocus(screen.getOpenbox().getXDisplay(),
-                       PointerRoot, None, CurrentTime);
-      }
-    }
+	w->getTransientFor()->isVisible())
+      fw = w->getTransientFor();
+    else if (screen.sloppyFocus())             // sloppy focus
+      fw = (OpenboxWindow *) 0;
+    else if (!_zorder.empty())                 // click focus
+      fw = _zorder.front();
+
+    if (!(fw != (OpenboxWindow *) 0 && fw->setInputFocus()))
+      screen.getOpenbox().focusWindow(0);
   }
   
-  if (lastfocus == w)
-    lastfocus = (OpenboxWindow *) 0;
-
   _windows.erase(_windows.begin() + w->getWindowNumber());
   clientmenu->remove(w->getWindowNumber());
   clientmenu->update();
@@ -148,6 +145,8 @@ void Workspace::focusWindow(OpenboxWindow *win) {
   if (_focused != (OpenboxWindow *) 0)
     clientmenu->setItemSelected(_focused->getWindowNumber(), false);
   _focused = win;
+  if (win != (OpenboxWindow *) 0)
+    _last = win;
 }
 
 
@@ -191,7 +190,7 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
   Workspace *wkspc;
 
   win = bottom;
-  while (True) {
+  while (true) {
     *(curr++) = win->getFrameWindow();
     screen.updateNetizenWindowRaise(win->getClientWindow());
 
@@ -230,7 +229,7 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
   Window *nstack = new Window[i], *curr = nstack;
   Workspace *wkspc;
 
-  while (True) {
+  while (true) {
     *(curr++) = win->getFrameWindow();
     screen.updateNetizenWindowLower(win->getClientWindow());
 
@@ -268,25 +267,25 @@ void Workspace::reconfigure(void) {
 
 
 OpenboxWindow *Workspace::getWindow(int index) {
-  if ((index >= 0) && (index < _windows.size()))
+  if ((index >= 0) && (index < (signed)_windows.size()))
     return _windows[index];
   else
     return (OpenboxWindow *) 0;
 }
 
 
-const int Workspace::getCount(void) {
-  return _windows.size();
+int Workspace::getCount(void) {
+  return (signed)_windows.size();
 }
 
 
 void Workspace::update(void) {
   clientmenu->update();
-  screen.getToolbar()->redrawWindowLabel(True);
+  screen.getToolbar()->redrawWindowLabel(true);
 }
 
 
-Bool Workspace::isCurrent(void) {
+bool Workspace::isCurrent(void) {
   return (id == screen.getCurrentWorkspaceID());
 }