X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FSlit.cc;h=0da4b11dec03dba86992d123560391c5e7952003;hb=b7d0a77d16e034097a15fb7a7175e0882f6dd429;hp=b180714a5b107f05c7ff682541a9af6fec2b9836;hpb=73a3c979b39ae0b51298d16bc5e76b61d31c89d5;p=chaz%2Fopenbox

diff --git a/src/Slit.cc b/src/Slit.cc
index b180714a..0da4b11d 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -47,11 +47,7 @@
 Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
   openbox(scr.getOpenbox()), config(conf)
 {
-  // default values
-  m_placement = CenterRight;
-  m_direction = Vertical;
-  m_ontop = false;
-  m_hidden = m_autohide = false;
+  load();
   
   display = screen.getBaseDisplay().getXDisplay();
   frame.window = frame.pixmap = None;
@@ -60,8 +56,6 @@ Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
   timer->setTimeout(openbox.getAutoRaiseDelay());
   timer->fireOnce(True);
 
-  clientList = new LinkedList<SlitClient>;
-
   slitmenu = new Slitmenu(*this);
 
   XSetWindowAttributes attrib;
@@ -95,7 +89,8 @@ Slit::~Slit() {
   if (timer->isTiming()) timer->stop();
   delete timer;
 
-  delete clientList;
+  clientList.clear();
+  
   delete slitmenu;
 
   screen.getImageControl()->removeImage(frame.pixmap);
@@ -109,6 +104,7 @@ Slit::~Slit() {
 
 
 void Slit::addClient(Window w) {
+  cout << "ADDCLIENT\n";
   openbox.grab();
 
   if (openbox.validateWindow(w)) {
@@ -160,7 +156,8 @@ void Slit::addClient(Window w) {
                  SubstructureNotifyMask | EnterWindowMask);
     XFlush(display);
 
-    clientList->insert(client);
+    clientList.push_back(client);
+    cout << "SLIT COUNT " << clientList.size() << endl;
 
     openbox.saveSlitSearch(client->client_window, this);
     openbox.saveSlitSearch(client->icon_window, this);
@@ -174,7 +171,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);
 
@@ -199,39 +197,39 @@ 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();
 }
 
 void Slit::setOnTop(bool b) {
   m_ontop = b;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".slit.onTop" << ends;
   config.setValue(s.str(), m_ontop ? "True" : "False");
+  s.rdbuf()->freeze(0);
 }
 
 void Slit::setAutoHide(bool b) {
   m_autohide = b;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide" << ends;
   config.setValue(s.str(), m_autohide ? "True" : "False");
+  s.rdbuf()->freeze(0);
 }
 
 void Slit::setPlacement(int p) {
   m_placement = p;
-  cout << "setting " << p << " " << m_placement << endl;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
     ends;
   const char *placement;
@@ -246,15 +244,24 @@ void Slit::setPlacement(int p) {
   case CenterRight: default: placement = "CenterRight"; break;
   }
   config.setValue(s.str(), placement);
+  s.rdbuf()->freeze(0);
 }
 
 void Slit::setDirection(int d) {
   m_direction = d;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".slit.direction" <<
     ends;
   config.setValue(s.str(),
                   m_direction == Horizontal ? "Horizontal" : "Vertical");
+  s.rdbuf()->freeze(0);
+}
+
+void Slit::save() {
+  setOnTop(m_ontop);
+  setAutoHide(m_autohide);
+  setPlacement(m_placement);
+  setDirection(m_direction);
 }
 
 void Slit::load() {
@@ -266,7 +273,6 @@ void Slit::load() {
   rname << rscreen.str() << "slit.placement" << ends;
   rclass << rscreen.str() << "Slit.Placement" << ends;
   if (config.getValue(rname.str(), rclass.str(), s)) {
-    cout << "getting " << s.c_str() << endl;
     if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
       m_placement = TopLeft;
     else if (0 == strncasecmp(s.c_str(), "CenterLeft", s.length()))
@@ -283,7 +289,8 @@ void Slit::load() {
       m_placement = BottomRight;
     else if (0 == strncasecmp(s.c_str(), "CenterRight", s.length()))
       m_placement = CenterRight;
-  }
+  } else
+    m_placement = CenterRight;
 
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "slit.direction" << ends;
@@ -293,35 +300,41 @@ void Slit::load() {
       m_direction = Horizontal;
     else if (0 == strncasecmp(s.c_str(), "Vertical", s.length()))
       m_direction = Vertical;
-  }
+  } else
+    m_direction = Vertical;
  
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "slit.onTop" << ends;
   rclass << rscreen.str() << "Slit.OnTop" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
     m_ontop = b;
+  else
+    m_ontop = false;
 
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "slit.autoHide" << ends;
   rclass << rscreen.str() << "Slit.AutoHide" << ends;
   if (config.getValue(rname.str(), rclass.str(), b))
     m_hidden = m_autohide = b;
+  else
+    m_hidden = m_autohide = false;
+
+  rscreen.rdbuf()->freeze(0);
+  rname.rdbuf()->freeze(0);
+  rclass.rdbuf()->freeze(0);
 }
 
 void Slit::reconfigure(void) {
-  load();
-  
   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)
@@ -337,11 +350,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)
@@ -356,6 +369,7 @@ void Slit::reconfigure(void) {
 
     break;
   }
+  cout << "SLIT SIZE " << frame.area.w() << "," << frame.area.h() << endl;
 
   reposition();
 
@@ -363,7 +377,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);
@@ -384,41 +398,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;
@@ -427,34 +440,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;
@@ -546,13 +559,13 @@ void Slit::reposition(void) {
   Toolbar *tbar = screen.getToolbar();
   int sw = frame.area.w() + (screen.getBorderWidth() * 2),
       sh = frame.area.h() + (screen.getBorderWidth() * 2),
-      tw = tbar->getWidth() + screen.getBorderWidth(),
-      th = tbar->getHeight() + screen.getBorderWidth();
+      tw = tbar->area().w() + screen.getBorderWidth(),
+      th = tbar->area().h() + screen.getBorderWidth();
 
-  if (tbar->getX() < frame.area.x() + sw &&
-      tbar->getX() + tw > frame.area.x() &&
-      tbar->getY() < frame.area.y() + sh &&
-      tbar->getY() + th > frame.area.y()) {
+  if (tbar->area().x() < frame.area.x() + sw &&
+      tbar->area().x() + tw > frame.area.x() &&
+      tbar->area().y() < frame.area.y() + sh &&
+      tbar->area().y() + th > frame.area.y()) {
     if (frame.area.y() < th) {
       frame.area.setY(frame.area.y() + tbar->getExposedHeight());
       if (m_direction == Vertical)
@@ -578,8 +591,8 @@ void Slit::reposition(void) {
 
 
 void Slit::shutdown(void) {
-  while (clientList->count())
-    removeClient(clientList->first());
+  while (clientList.size())
+    removeClient(clientList.front());
 }
 
 
@@ -658,24 +671,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();
 }
 
@@ -705,8 +716,12 @@ Slitmenu::Slitmenu(Slit &sl) : Basemenu(sl.screen), slit(sl) {
 
   update();
 
-  if (slit.onTop()) setItemSelected(2, True);
-  if (slit.autoHide()) setItemSelected(3, True);
+  setValues();
+}
+
+void Slitmenu::setValues() {
+  setItemSelected(2, slit.onTop());
+  setItemSelected(3, slit.autoHide());
 }
 
 
@@ -752,6 +767,7 @@ void Slitmenu::internal_hide(void) {
 
 
 void Slitmenu::reconfigure(void) {
+  setValues();
   directionmenu->reconfigure();
   placementmenu->reconfigure();
 
@@ -771,12 +787,21 @@ Slitmenu::Directionmenu::Directionmenu(Slitmenu &sm)
 
   update();
 
-  if (sm.slit.direction() == Slit::Horizontal)
+  setValues();
+}
+
+
+void Slitmenu::Directionmenu::setValues() {
+  if (slitmenu.slit.direction() == Slit::Horizontal)
     setItemSelected(0, True);
   else
     setItemSelected(1, True);
 }
 
+void Slitmenu::Directionmenu::reconfigure() {
+  setValues();
+}
+
 
 void Slitmenu::Directionmenu::itemSelected(int button, int index) {
   if (button != 1)