X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=47ad3827f2ec2ea55053f088308c1f6c301f5549;hb=e7c332a586280ac1ea9d0f993d637802d64c9f87;hp=d87373481e061776dd101e82c04b49c8bcccdc6a;hpb=098fae70a6d8d15877938080437f0fc20f52bbf5;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index d8737348..47ad3827 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -31,6 +31,18 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+#ifdef    HAVE_STDIO_H
+#  include <stdio.h>
+#endif // HAVE_STDIO_H
+
+#ifdef    HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
+#  include <string.h>
+#endif // HAVE_STRING_H
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
@@ -41,47 +53,27 @@
 #include "Toolbar.h"
 #include "Window.h"
 #include "Workspace.h"
-
 #include "Windowmenu.h"
 #include "Geometry.h"
 #include "Util.h"
 
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef    HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-
-#ifdef    HAVE_STRING_H
-#  include <string.h>
-#endif // HAVE_STRING_H
-
 #include <algorithm>
 #include <vector>
 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;
 
-  stackingList = new LinkedList<OpenboxWindow>;
-  windowList = new LinkedList<OpenboxWindow>;
   clientmenu = new Clientmenu(*this);
 
-  lastfocus = (OpenboxWindow *) 0;
-
   name = (char *) 0;
-  char *tmp = screen.getNameOfWorkspace(id);
-  setName(tmp);
+  setName(screen.getNameOfWorkspace(id));
 }
 
 
 Workspace::~Workspace(void) {
-  delete stackingList;
-  delete windowList;
   delete clientmenu;
 
   if (name)
@@ -89,16 +81,16 @@ 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);
 
   w->setWorkspace(id);
-  w->setWindowNumber(windowList->count());
+  w->setWindowNumber(_windows.size());
 
-  stackingList->insert(w, 0);
-  windowList->insert(w);
+  _zorder.push_front(w);
+  _windows.push_back(w);
 
   clientmenu->insert((const char **) w->getTitle());
   clientmenu->update();
@@ -111,80 +103,83 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
 }
 
 
-const int Workspace::removeWindow(OpenboxWindow *w) {
+int Workspace::removeWindow(OpenboxWindow *w) {
   if (! w) return -1;
 
-  stackingList->remove(w);
+  winVect::iterator winit = std::find(_windows.begin(), _windows.end(), w);
 
-  if (w->isFocused()) {
-    if (w->isTransient() && w->getTransientFor() &&
-	w->getTransientFor()->isVisible()) {
-      w->getTransientFor()->setInputFocus();
-    } else if (screen.sloppyFocus()) {
-      screen.getOpenbox().focusWindow((OpenboxWindow *) 0);
-    } else {
-      OpenboxWindow *top = stackingList->first();
-      if (! top || ! top->setInputFocus()) {
-	screen.getOpenbox().focusWindow((OpenboxWindow *) 0);
-	XSetInputFocus(screen.getOpenbox().getXDisplay(),
-		       screen.getToolbar()->getWindowID(),
-		       RevertToParent, CurrentTime);
-      }
-    }
+  if (winit == _windows.end()) {
+    if (w == _last)
+      _last = (OpenboxWindow *) 0;
+    if (w == _focused)
+      _focused = (OpenboxWindow *) 0;
+    return _windows.size();
   }
   
-  if (lastfocus == w)
-    lastfocus = (OpenboxWindow *) 0;
+  _zorder.remove(w);
 
-  windowList->remove(w->getWindowNumber());
+  if (w == _last)
+    _last = (OpenboxWindow *) 0;
+  if (w == _focused) {
+    OpenboxWindow *fw = (OpenboxWindow *) 0;
+    if (w->isTransient() && w->getTransientFor() &&
+        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);
+  }
+  
+  _windows.erase(winit);
   clientmenu->remove(w->getWindowNumber());
   clientmenu->update();
 
   screen.updateNetizenWindowDel(w->getClientWindow());
 
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  OpenboxWindow *bw = it.current();
-  for (int i = 0; bw; it++, i++, bw = it.current())
-    bw->setWindowNumber(i);
+  winVect::iterator it = _windows.begin();
+  for (int i=0; it != _windows.end(); ++it, ++i)
+    (*it)->setWindowNumber(i);
 
-  return windowList->count();
+  return _windows.size();
 }
 
 
 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;
 }
 
 
 void Workspace::showAll(void) {
-  LinkedListIterator<OpenboxWindow> it(stackingList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current())
-    bw->deiconify(False, False);
+  winList::iterator it;
+  for (it = _zorder.begin(); it != _zorder.end(); ++it)
+    (*it)->deiconify(false, false);
 }
 
 
 void Workspace::hideAll(void) {
-  LinkedList<OpenboxWindow> lst;
-
-  LinkedListIterator<OpenboxWindow> it(stackingList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current())
-    lst.insert(bw, 0);
-
-  LinkedListIterator<OpenboxWindow> it2(&lst);
-  for (OpenboxWindow *bw = it2.current(); bw; it2++, bw = it2.current())
-    if (! bw->isStuck())
-      bw->withdraw();
+  winList::reverse_iterator it;
+  for (it = _zorder.rbegin(); it != _zorder.rend(); ++it)
+    if (!(*it)->isStuck())
+      (*it)->withdraw();
 }
 
 
 void Workspace::removeAll(void) {
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current())
-    bw->iconify();
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+    (*it)->iconify();
 }
 
 
@@ -206,14 +201,14 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
   Workspace *wkspc;
 
   win = bottom;
-  while (True) {
+  while (true) {
     *(curr++) = win->getFrameWindow();
     screen.updateNetizenWindowRaise(win->getClientWindow());
 
     if (! win->isIconic()) {
       wkspc = screen.getWorkspace(win->getWorkspaceNumber());
-      wkspc->stackingList->remove(win);
-      wkspc->stackingList->insert(win, 0);
+      wkspc->_zorder.remove(win);
+      wkspc->_zorder.push_front(win);
     }
 
     if (! win->hasTransient() || ! win->getTransient())
@@ -245,14 +240,14 @@ 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());
 
     if (! win->isIconic()) {
       wkspc = screen.getWorkspace(win->getWorkspaceNumber());
-      wkspc->stackingList->remove(win);
-      wkspc->stackingList->insert(win);
+      wkspc->_zorder.remove(win);
+      wkspc->_zorder.push_back(win);
     }
 
     if (! win->getTransientFor())
@@ -275,48 +270,43 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
 void Workspace::reconfigure(void) {
   clientmenu->reconfigure();
 
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current()) {
-    if (bw->validateClient())
-      bw->reconfigure();
-  }
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+    if ((*it)->validateClient())
+      (*it)->reconfigure();
 }
 
 
 OpenboxWindow *Workspace::getWindow(int index) {
-  if ((index >= 0) && (index < windowList->count()))
-    return windowList->find(index);
+  if ((index >= 0) && (index < (signed)_windows.size()))
+    return _windows[index];
   else
-    return 0;
+    return (OpenboxWindow *) 0;
 }
 
 
-const int Workspace::getCount(void) {
-  return windowList->count();
+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());
 }
 
 
-Bool Workspace::isLastWindow(OpenboxWindow *w) {
-  return (w == windowList->last());
-}
-
 void Workspace::setCurrent(void) {
   screen.changeWorkspaceID(id);
 }
 
 
-void Workspace::setName(char *new_name) {
+void Workspace::setName(const char *new_name) {
   if (name)
     delete [] name;
 
@@ -324,10 +314,10 @@ void Workspace::setName(char *new_name) {
     name = bstrdup(new_name);
   } else {
     name = new char[128];
-    sprintf(name, i18n->getMessage(WorkspaceSet, WorkspaceDefaultNameFormat,
-				   "Workspace %d"), id + 1);
+    sprintf(name, i18n(WorkspaceSet, WorkspaceDefaultNameFormat,
+                       "Workspace %d"), id + 1);
   }
-  
+
   clientmenu->setLabel(name);
   clientmenu->update();
   screen.saveWorkspaceNames();
@@ -335,10 +325,8 @@ void Workspace::setName(char *new_name) {
 
 
 void Workspace::shutdown(void) {
-  while (windowList->count()) {
-    windowList->first()->restore();
-    delete windowList->first();
-  }
+  while (!_windows.empty())
+    _windows[0]->restore();
 }
 
 static rectList calcSpace(const Rect &win, const rectList &spaces) {
@@ -382,49 +370,49 @@ static rectList calcSpace(const Rect &win, const rectList &spaces) {
 
 bool rowRLBT(const Rect &first, const Rect &second){
   if (first.y()+first.h()==second.y()+second.h())
-     return first.x()+first.w()>second.x()+second.w();
+    return first.x()+first.w()>second.x()+second.w();
   return first.y()+first.h()>second.y()+second.h();
 }
- 
+
 bool rowRLTB(const Rect &first, const Rect &second){
   if (first.y()==second.y())
-     return first.x()+first.w()>second.x()+second.w();
+    return first.x()+first.w()>second.x()+second.w();
   return first.y()<second.y();
 }
 
 bool rowLRBT(const Rect &first, const Rect &second){
   if (first.y()+first.h()==second.y()+second.h())
-     return first.x()<second.x();
+    return first.x()<second.x();
   return first.y()+first.h()>second.y()+second.h();
 }
- 
+
 bool rowLRTB(const Rect &first, const Rect &second){
   if (first.y()==second.y())
-     return first.x()<second.x();
+    return first.x()<second.x();
   return first.y()<second.y();
 }
- 
+
 bool colLRTB(const Rect &first, const Rect &second){
   if (first.x()==second.x())
-     return first.y()<second.y();
+    return first.y()<second.y();
   return first.x()<second.x();
 }
- 
+
 bool colLRBT(const Rect &first, const Rect &second){
   if (first.x()==second.x())
-     return first.y()+first.h()>second.y()+second.h();
+    return first.y()+first.h()>second.y()+second.h();
   return first.x()<second.x();
 }
 
 bool colRLTB(const Rect &first, const Rect &second){
   if (first.x()+first.w()==second.x()+second.w())
-     return first.y()<second.y();
+    return first.y()<second.y();
   return first.x()+first.w()>second.x()+second.w();
 }
- 
+
 bool colRLBT(const Rect &first, const Rect &second){
   if (first.x()+first.w()==second.x()+second.w())
-     return first.y()+first.h()>second.y()+second.h();
+    return first.y()+first.h()>second.y()+second.h();
   return first.x()+first.w()>second.x()+second.w();
 }
 
@@ -435,16 +423,15 @@ bool colRLBT(const Rect &first, const Rect &second){
 Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
   const Rect *best;
   rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
   rectList::const_iterator siter;
   spaces.push_back(space); //initially the entire screen is free
-  it.reset();
-  
+
   //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
-                        spaces);
-  
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+    spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
+                       spaces);
+
   //Find first space that fits the window
   best = NULL;
   for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
@@ -490,27 +477,26 @@ Point *Workspace::underMousePlacement(const Size &win_size, const Rect &space) {
 Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
   const Rect *best;
   rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
 
   rectList::const_iterator siter;
   spaces.push_back(space); //initially the entire screen is free
-  it.reset();
-  
+
   //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
-                        spaces);
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+    spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
+                       spaces);
   //Sort spaces by preference
   if(screen.rowPlacementDirection() == BScreen::RightLeft)
-     if(screen.colPlacementDirection() == BScreen::TopBottom)
-        sort(spaces.begin(),spaces.end(),rowRLTB);
-     else
-        sort(spaces.begin(),spaces.end(),rowRLBT);
+    if(screen.colPlacementDirection() == BScreen::TopBottom)
+      sort(spaces.begin(),spaces.end(),rowRLTB);
+    else
+      sort(spaces.begin(),spaces.end(),rowRLBT);
   else
-     if(screen.colPlacementDirection() == BScreen::TopBottom)
-        sort(spaces.begin(),spaces.end(),rowLRTB);
-     else
-        sort(spaces.begin(),spaces.end(),rowLRBT);
+    if(screen.colPlacementDirection() == BScreen::TopBottom)
+      sort(spaces.begin(),spaces.end(),rowLRTB);
+    else
+      sort(spaces.begin(),spaces.end(),rowLRBT);
   best = NULL;
   for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
     if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
@@ -532,27 +518,26 @@ Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
 Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
   const Rect *best;
   rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
 
   rectList::const_iterator siter;
   spaces.push_back(space); //initially the entire screen is free
-  it.reset();
-  
+
   //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
-                        spaces);
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+    spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
+                       spaces);
   //Sort spaces by user preference
   if(screen.colPlacementDirection() == BScreen::TopBottom)
-     if(screen.rowPlacementDirection() == BScreen::LeftRight)
-        sort(spaces.begin(),spaces.end(),colLRTB);
-     else
-        sort(spaces.begin(),spaces.end(),colRLTB);
+    if(screen.rowPlacementDirection() == BScreen::LeftRight)
+      sort(spaces.begin(),spaces.end(),colLRTB);
+    else
+      sort(spaces.begin(),spaces.end(),colRLTB);
   else
-     if(screen.rowPlacementDirection() == BScreen::LeftRight)
-        sort(spaces.begin(),spaces.end(),colLRBT);
-     else
-        sort(spaces.begin(),spaces.end(),colRLBT);
+    if(screen.rowPlacementDirection() == BScreen::LeftRight)
+      sort(spaces.begin(),spaces.end(),colLRBT);
+    else
+      sort(spaces.begin(),spaces.end(),colRLBT);
 
   //Find first space that fits the window
   best = NULL;
@@ -598,7 +583,6 @@ void Workspace::placeWindow(OpenboxWindow &win) {
   const Size window_size(win.area().w()+screen.getBorderWidth() * 2,
                          win.area().h()+screen.getBorderWidth() * 2);
   Point *place = NULL;
-  LinkedListIterator<OpenboxWindow> it(windowList);
 
   switch (screen.placementPolicy()) {
   case BScreen::BestFitPlacement:
@@ -618,7 +602,7 @@ void Workspace::placeWindow(OpenboxWindow &win) {
 
   if (place == NULL)
     place = cascadePlacement(win, space);
- 
+
   ASSERT(place != NULL);  
   if (place->x() + window_size.w() > (signed) space.x() + space.w())
     place->setX(((signed) space.x() + space.w() - window_size.w()) / 2);