merge the sticky window fix from 1.2.

CHANGELOG

@@ -1,6 +1,8 @@
 Changelog for Openbox:
 
 2.0.0:
+ * fixed sticky windows behavior.                       (Ben Jansens)
+
  * make reconfigure reset the timeout values for
    windows, the slit, and the toolbar, so that a new
    autoRaiseDelay value will take effect without having

src/BaseDisplay.cc

@@ -492,7 +492,6 @@ static RETSIGTYPE signalhandler(int sig) {
       }
     }
   }
-  }
 
 
   const Bool BaseDisplay::validateWindow(Window window) {
@@ -540,6 +539,13 @@ static RETSIGTYPE signalhandler(int sig) {
     timerList.remove(timer);
   }
 
+<<<<<<< BaseDisplay.cc
+=======
+void BaseDisplay::removeTimer(BTimer *timer) {
+  ASSERT(timer != (BTimer *) 0);
+  timerList.remove(timer);
+}
+>>>>>>> 1.13.4.1
 
   /*
    * Grabs a button, but also grabs the button in every possible combination with

src/Screen.cc

@@ -1976,11 +1976,9 @@ void BScreen::load() {
       workspacemenu->setItemSelected(current_workspace->getWorkspaceID() + 2,
                                      False);
 
-      if (openbox.focusedWindow() &&
-          openbox.focusedWindow()->getScreen() == this &&
-          (! openbox.focusedWindow()->isStuck())) {
+    OpenboxWindow *fw = openbox.focusedWindow();
+    if (fw && fw->getScreen() == this)
       openbox.focusWindow(0);
-      }
 
       current_workspace = getWorkspace(id);
 

src/Window.cc

@@ -314,9 +314,14 @@ OpenboxWindow::~OpenboxWindow(void) {
     XUngrabPointer(display, CurrentTime);
   }
 
-  if (workspace_number != -1 && window_number != -1)
+  if (workspace_number != -1 && window_number != -1) {
+    if (flags.stuck) {
+      // make sure no other workspaces think that we're focused
+      for (int i=0; i < screen->getWorkspaceCount(); i++)
+        screen->getWorkspace(i)->removeWindow(this);
+    } else
       screen->getWorkspace(workspace_number)->removeWindow(this);
-  else if (flags.iconic)
+  } else if (flags.iconic)
     screen->removeIcon(this);
 
   if (timer) {

src/Workspace.cc

@@ -106,12 +106,21 @@ int Workspace::addWindow(OpenboxWindow *w, bool place) {
 int Workspace::removeWindow(OpenboxWindow *w) {
   if (! w) return -1;
 
-  _zorder.remove(w);
+  winVect::iterator winit = std::find(_windows.begin(), _windows.end(), w);
 
-  if (w->isFocused()) {
+  if (winit == _windows.end()) {
     if (w == _last)
       _last = (OpenboxWindow *) 0;
+    if (w == _focused)
+      _focused = (OpenboxWindow *) 0;
+    return _windows.size();
+  }
   
+  _zorder.remove(w);
+
+  if (w == _last)
+    _last = (OpenboxWindow *) 0;
+  if (w == _focused) {
     OpenboxWindow *fw = (OpenboxWindow *) 0;
     if (w->isTransient() && w->getTransientFor() &&
         w->getTransientFor()->isVisible())
@@ -125,7 +134,7 @@ int Workspace::removeWindow(OpenboxWindow *w) {
       screen.getOpenbox().focusWindow(0);
   }
   
-  _windows.erase(_windows.begin() + w->getWindowNumber());
+  _windows.erase(winit);
   clientmenu->remove(w->getWindowNumber());
   clientmenu->update();
 
@@ -140,11 +149,13 @@ int Workspace::removeWindow(OpenboxWindow *w) {
 
 
 void Workspace::focusWindow(OpenboxWindow *win) {
-  if (win != (OpenboxWindow *) 0)
-    clientmenu->setItemSelected(win->getWindowNumber(), true);
   if (_focused != (OpenboxWindow *) 0)
     clientmenu->setItemSelected(_focused->getWindowNumber(), false);
   _focused = win;
+  // make sure the focused window belongs to this workspace before highlighting
+  // it in the menu (sticky windows arent in this workspace's menu).
+  if (_focused != (OpenboxWindow *) 0 && _focused->getWorkspaceNumber() == id)
+    clientmenu->setItemSelected(_focused->getWindowNumber(), true);
   if (win != (OpenboxWindow *) 0)
     _last = win;
 }

src/openbox.cc

@@ -1088,6 +1088,9 @@ void Openbox::focusWindow(OpenboxWindow *win) {
   if (win && !win->isIconic()) {
     current_screen = win->getScreen();
     tbar = current_screen->getToolbar();
+    if (win->isStuck())
+      wkspc = current_screen->getCurrentWorkspace();
+    else
       wkspc = current_screen->getWorkspace(win->getWorkspaceNumber());
     win->setFocusFlag(true);
     wkspc->focusWindow(win);