X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FSlit.cc;h=66cdc583809a5eaf5c14af1e35d92a7efbd250f0;hb=ae093dba2fb97124bb4af3eaf4070b46f07dfd74;hp=e20c9b6ec9082b8d2729810bfdf9c10e6f7da488;hpb=75c0a76a53bc31b162590fc767f5b2fe73ad07df;p=chaz%2Fopenbox

diff --git a/src/Slit.cc b/src/Slit.cc
index e20c9b6e..66cdc583 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -41,11 +41,12 @@
 #include "Slit.h"
 #include "Toolbar.h"
 
-#include <string>
 #include <strstream>
+#include <string>
+using std::ends;
 
-Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
-  openbox(scr.getOpenbox()), config(conf)
+Slit::Slit(BScreen &scr, Resource &conf) : openbox(scr.getOpenbox()),
+  screen(scr), config(conf)
 {
   load();
   
@@ -53,11 +54,9 @@ Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
   frame.window = frame.pixmap = None;
 
   timer = new BTimer(openbox, *this);
-  timer->setTimeout(openbox.getAutoRaiseDelay());
+  // the time out is set in ::reconfigure()
   timer->fireOnce(True);
 
-  clientList = new LinkedList<SlitClient>;
-
   slitmenu = new Slitmenu(*this);
 
   XSetWindowAttributes attrib;
@@ -91,7 +90,8 @@ Slit::~Slit() {
   if (timer->isTiming()) timer->stop();
   delete timer;
 
-  delete clientList;
+  clientList.clear();
+  
   delete slitmenu;
 
   screen.getImageControl()->removeImage(frame.pixmap);
@@ -156,7 +156,7 @@ void Slit::addClient(Window w) {
                  SubstructureNotifyMask | EnterWindowMask);
     XFlush(display);
 
-    clientList->insert(client);
+    clientList.push_back(client);
 
     openbox.saveSlitSearch(client->client_window, this);
     openbox.saveSlitSearch(client->icon_window, this);
@@ -170,7 +170,8 @@ void Slit::addClient(Window w) {
 void Slit::removeClient(SlitClient *client, Bool remap) {
   openbox.removeSlitSearch(client->client_window);
   openbox.removeSlitSearch(client->icon_window);
-  clientList->remove(client);
+
+  clientList.remove(client);
 
   screen.removeNetizen(client->window);
 
@@ -195,17 +196,16 @@ void Slit::removeClient(Window w, Bool remap) {
 
   Bool reconf = False;
 
-  LinkedListIterator<SlitClient> it(clientList);
-  for (SlitClient *tmp = it.current(); tmp; it++, tmp = it.current()) {
-    if (tmp->window == w) {
-      removeClient(tmp, remap);
+  slitClientList::iterator it;
+  for (it = clientList.begin(); it != clientList.end(); it++)
+    if ((*it)->window == w) {
+      removeClient(*it, remap);
       reconf = True;
-
       break;
     }
-  }
 
-  if (reconf) reconfigure();
+  if (reconf)
+    reconfigure();
 
   openbox.ungrab();
 }
@@ -229,8 +229,8 @@ void Slit::setAutoHide(bool b) {
 void Slit::setPlacement(int p) {
   m_placement = p;
   std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
-    ends;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.placement"
+    << ends;
   const char *placement;
   switch (m_placement) {
   case TopLeft: placement = "TopLeft"; break;
@@ -249,8 +249,8 @@ void Slit::setPlacement(int p) {
 void Slit::setDirection(int d) {
   m_direction = d;
   std::ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".slit.direction" <<
-    ends;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.direction"
+    << ends;
   config.setValue(s.str(),
                   m_direction == Horizontal ? "Horizontal" : "Vertical");
   s.rdbuf()->freeze(0);
@@ -292,6 +292,7 @@ void Slit::load() {
     m_placement = CenterRight;
 
   rname.seekp(0); rclass.seekp(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
   rname << rscreen.str() << "slit.direction" << ends;
   rclass << rscreen.str() << "Slit.Direction" << ends;
   if (config.getValue(rname.str(), rclass.str(), s)) {
@@ -303,6 +304,7 @@ void Slit::load() {
     m_direction = Vertical;
  
   rname.seekp(0); rclass.seekp(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
   rname << rscreen.str() << "slit.onTop" << ends;
   rclass << rscreen.str() << "Slit.OnTop" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
@@ -311,6 +313,7 @@ void Slit::load() {
     m_ontop = false;
 
   rname.seekp(0); rclass.seekp(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
   rname << rscreen.str() << "slit.autoHide" << ends;
   rclass << rscreen.str() << "Slit.AutoHide" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
@@ -319,22 +322,22 @@ void Slit::load() {
     m_hidden = m_autohide = false;
 
   rscreen.rdbuf()->freeze(0);
-  rname.rdbuf()->freeze(0);
-  rclass.rdbuf()->freeze(0);
+  rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
 }
 
 void Slit::reconfigure(void) {
+  timer->setTimeout(openbox.getAutoRaiseDelay());
+
   frame.area.setSize(0, 0);
-  LinkedListIterator<SlitClient> it(clientList);
-  SlitClient *client;
+  slitClientList::const_iterator it;
 
   switch (m_direction) {
   case Vertical:
-    for (client = it.current(); client; it++, client = it.current()) {
-      frame.area.setH(frame.area.h() + client->height + screen.getBevelWidth());
+    for (it = clientList.begin(); it != clientList.end(); it++) {
+      frame.area.setH(frame.area.h() + (*it)->height + screen.getBevelWidth());
 
-      if (frame.area.w() < client->width)
-        frame.area.setW(client->width);
+      if (frame.area.w() < (*it)->width)
+        frame.area.setW((*it)->width);
     }
 
     if (frame.area.w() < 1)
@@ -350,11 +353,11 @@ void Slit::reconfigure(void) {
     break;
 
   case Horizontal:
-    for (client = it.current(); client; it++, client = it.current()) {
-      frame.area.setW(frame.area.w() + client->width + screen.getBevelWidth());
+    for (it = clientList.begin(); it != clientList.end(); it++) {
+      frame.area.setW(frame.area.w() + (*it)->width + screen.getBevelWidth());
 
-      if (frame.area.h() < client->height)
-        frame.area.setH(client->height);
+      if (frame.area.h() < (*it)->height)
+        frame.area.setH((*it)->height);
     }
 
     if (frame.area.w() < 1)
@@ -376,7 +379,7 @@ void Slit::reconfigure(void) {
   XSetWindowBorder(display, frame.window,
                    screen.getBorderColor()->getPixel());
 
-  if (! clientList->count())
+  if (! clientList.size())
     XUnmapWindow(display, frame.window);
   else
     XMapWindow(display, frame.window);
@@ -397,41 +400,40 @@ void Slit::reconfigure(void) {
   XClearWindow(display, frame.window);
 
   int x, y;
-  it.reset();
 
   switch (m_direction) {
   case Vertical:
     x = 0;
     y = screen.getBevelWidth();
 
-    for (client = it.current(); client; it++, client = it.current()) {
-      x = (frame.area.w() - client->width) / 2;
+    for (it = clientList.begin(); it != clientList.end(); it++) {
+      x = (frame.area.w() - (*it)->width) / 2;
 
-      XMoveResizeWindow(display, client->window, x, y,
-                        client->width, client->height);
-      XMapWindow(display, client->window);
+      XMoveResizeWindow(display, (*it)->window, x, y,
+                        (*it)->width, (*it)->height);
+      XMapWindow(display, (*it)->window);
 
       // for ICCCM compliance
-      client->x = x;
-      client->y = y;
+      (*it)->x = x;
+      (*it)->y = y;
 
       XEvent event;
       event.type = ConfigureNotify;
 
       event.xconfigure.display = display;
-      event.xconfigure.event = client->window;
-      event.xconfigure.window = client->window;
+      event.xconfigure.event = (*it)->window;
+      event.xconfigure.window = (*it)->window;
       event.xconfigure.x = x;
       event.xconfigure.y = y;
-      event.xconfigure.width = client->width;
-      event.xconfigure.height = client->height;
+      event.xconfigure.width = (*it)->width;
+      event.xconfigure.height = (*it)->height;
       event.xconfigure.border_width = 0;
       event.xconfigure.above = frame.window;
       event.xconfigure.override_redirect = False;
 
-      XSendEvent(display, client->window, False, StructureNotifyMask, &event);
+      XSendEvent(display, (*it)->window, False, StructureNotifyMask, &event);
 
-      y += client->height + screen.getBevelWidth();
+      y += (*it)->height + screen.getBevelWidth();
     }
 
     break;
@@ -440,34 +442,34 @@ void Slit::reconfigure(void) {
     x = screen.getBevelWidth();
     y = 0;
 
-    for (client = it.current(); client; it++, client = it.current()) {
-      y = (frame.area.h() - client->height) / 2;
+    for (it = clientList.begin(); it != clientList.end(); it++) {
+      y = (frame.area.h() - (*it)->height) / 2;
 
-      XMoveResizeWindow(display, client->window, x, y,
-                        client->width, client->height);
-      XMapWindow(display, client->window);
+      XMoveResizeWindow(display, (*it)->window, x, y,
+                        (*it)->width, (*it)->height);
+      XMapWindow(display, (*it)->window);
 
       // for ICCCM compliance
-      client->x = x;
-      client->y = y;
+      (*it)->x = x;
+      (*it)->y = y;
 
       XEvent event;
       event.type = ConfigureNotify;
 
       event.xconfigure.display = display;
-      event.xconfigure.event = client->window;
-      event.xconfigure.window = client->window;
+      event.xconfigure.event = (*it)->window;
+      event.xconfigure.window = (*it)->window;
       event.xconfigure.x = x;
       event.xconfigure.y = y;
-      event.xconfigure.width = client->width;
-      event.xconfigure.height = client->height;
+      event.xconfigure.width = (*it)->width;
+      event.xconfigure.height = (*it)->height;
       event.xconfigure.border_width = 0;
       event.xconfigure.above = frame.window;
       event.xconfigure.override_redirect = False;
 
-      XSendEvent(display, client->window, False, StructureNotifyMask, &event);
+      XSendEvent(display, (*it)->window, False, StructureNotifyMask, &event);
 
-      x += client->width + screen.getBevelWidth();
+      x += (*it)->width + screen.getBevelWidth();
     }
 
     break;
@@ -591,8 +593,8 @@ void Slit::reposition(void) {
 
 
 void Slit::shutdown(void) {
-  while (clientList->count())
-    removeClient(clientList->first());
+  while (clientList.size())
+    removeClient(clientList.front());
 }
 
 
@@ -671,24 +673,22 @@ void Slit::configureRequestEvent(XConfigureRequestEvent *e) {
 
     XConfigureWindow(display, e->window, e->value_mask, &xwc);
 
-    LinkedListIterator<SlitClient> it(clientList);
-    SlitClient *client = it.current();
-    for (; client; it++, client = it.current())
+    slitClientList::iterator it = clientList.begin();
+    for (; it != clientList.end(); it++) {
+      SlitClient *client = *it;
       if (client->window == e->window)
         if (client->width != ((unsigned) e->width) ||
             client->height != ((unsigned) e->height)) {
           client->width = (unsigned) e->width;
           client->height = (unsigned) e->height;
-
           reconf = True;
-
           break;
         }
+    }
 
-    if (reconf) reconfigure();
-
+    if (reconf)
+      reconfigure();
   }
-
   openbox.ungrab();
 }
 
@@ -802,6 +802,7 @@ void Slitmenu::Directionmenu::setValues() {
 
 void Slitmenu::Directionmenu::reconfigure() {
   setValues();
+  Basemenu::reconfigure();
 }