X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FSlit.cc;h=38af8b93ffce389f104cc4c97a1eb3fa2f9b59bf;hb=0a3cfdfcb956024639a05549a50586e3d826b42e;hp=97d881c73db8fde3bea7ad1b0a18451a7ac342cb;hpb=44e3582d5e08556c7b1136cfd9a49546cf5fcae0;p=chaz%2Fopenbox

diff --git a/src/Slit.cc b/src/Slit.cc
index 97d881c7..38af8b93 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -41,11 +41,19 @@
 #include "Slit.h"
 #include "Toolbar.h"
 
-
-Slit::Slit(BScreen &scr) : screen(scr), openbox(scr.getOpenbox()) {
-  on_top = screen.isSlitOnTop();
-  hidden = do_auto_hide = screen.doSlitAutoHide();
-
+#include <string>
+#include <strstream>
+
+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;
 
@@ -68,12 +76,12 @@ Slit::Slit(BScreen &scr) : screen(scr), openbox(scr.getOpenbox()) {
   attrib.event_mask = SubstructureRedirectMask | ButtonPressMask |
                       EnterWindowMask | LeaveWindowMask;
 
-  frame.x = frame.y = 0;
-  frame.width = frame.height = 1;
-
+  frame.area = Rect(0, 0, 1, 1);
+  
   frame.window =
-    XCreateWindow(display, screen.getRootWindow(), frame.x, frame.y,
-		  frame.width, frame.height, screen.getBorderWidth(),
+    XCreateWindow(display, screen.getRootWindow(),
+                  frame.area.x(), frame.area.y(),
+		  frame.area.w(), frame.area.h(), screen.getBorderWidth(),
                   screen.getDepth(), InputOutput, screen.getVisual(),
                   create_mask, &attrib);
   openbox.saveSlitSearch(frame.window, this);
@@ -207,51 +215,155 @@ void Slit::removeClient(Window w, Bool remap) {
   openbox.ungrab();
 }
 
+void Slit::setOnTop(bool b) {
+  m_ontop = b;
+  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;
+  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;
+  ostrstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
+    ends;
+  const char *placement;
+  switch (m_placement) {
+  case TopLeft: placement = "TopLeft"; break;
+  case CenterLeft: placement = "CenterLeft"; break;
+  case BottomLeft: placement = "BottomLeft"; break;
+  case TopCenter: placement = "TopCenter"; break;
+  case BottomCenter: placement = "BottomCenter"; break;
+  case TopRight: placement = "TopRight"; break;
+  case BottomRight: placement = "BottomRight"; break;
+  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;
+  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() {
+  std::ostrstream rscreen, rname, rclass;
+  std::string s;
+  bool b;
+  rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
+
+  rname << rscreen.str() << "slit.placement" << ends;
+  rclass << rscreen.str() << "Slit.Placement" << ends;
+  if (config.getValue(rname.str(), rclass.str(), s)) {
+    if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
+      m_placement = TopLeft;
+    else if (0 == strncasecmp(s.c_str(), "CenterLeft", s.length()))
+      m_placement = CenterLeft;
+    else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length()))
+      m_placement = BottomLeft;
+    else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length()))
+      m_placement = TopCenter;
+    else if (0 == strncasecmp(s.c_str(), "BottomCenter", s.length()))
+      m_placement = BottomCenter;
+    else if (0 == strncasecmp(s.c_str(), "TopRight", s.length()))
+      m_placement = TopRight;
+    else if (0 == strncasecmp(s.c_str(), "BottomRight", s.length()))
+      m_placement = BottomRight;
+    else if (0 == strncasecmp(s.c_str(), "CenterRight", s.length()))
+      m_placement = CenterRight;
+  }
+
+  rname.seekp(0); rclass.seekp(0);
+  rname << rscreen.str() << "slit.direction" << ends;
+  rclass << rscreen.str() << "Slit.Direction" << ends;
+  if (config.getValue(rname.str(), rclass.str(), s)) {
+    if (0 == strncasecmp(s.c_str(), "Horizontal", s.length()))
+      m_direction = Horizontal;
+    else if (0 == strncasecmp(s.c_str(), "Vertical", s.length()))
+      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;
+
+  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;
+  rscreen.rdbuf()->freeze(0);
+  rname.rdbuf()->freeze(0);
+  rclass.rdbuf()->freeze(0);
+}
 
 void Slit::reconfigure(void) {
-  frame.width = 0;
-  frame.height = 0;
+  frame.area.setSize(0, 0);
   LinkedListIterator<SlitClient> it(clientList);
   SlitClient *client;
 
-  switch (screen.getSlitDirection()) {
+  switch (m_direction) {
   case Vertical:
     for (client = it.current(); client; it++, client = it.current()) {
-      frame.height += client->height + screen.getBevelWidth();
+      frame.area.setH(frame.area.h() + client->height + screen.getBevelWidth());
 
-      if (frame.width < client->width)
-        frame.width = client->width;
+      if (frame.area.w() < client->width)
+        frame.area.setW(client->width);
     }
 
-    if (frame.width < 1)
-      frame.width = 1;
+    if (frame.area.w() < 1)
+      frame.area.setW(1);
     else
-      frame.width += (screen.getBevelWidth() * 2);
+      frame.area.setW(frame.area.w() + (screen.getBevelWidth() * 2));
 
-    if (frame.height < 1)
-      frame.height = 1;
+    if (frame.area.h() < 1)
+      frame.area.setH(1);
     else
-      frame.height += screen.getBevelWidth();
+      frame.area.setH(frame.area.h() + screen.getBevelWidth());
 
     break;
 
   case Horizontal:
     for (client = it.current(); client; it++, client = it.current()) {
-      frame.width += client->width + screen.getBevelWidth();
+      frame.area.setW(frame.area.w() + client->width + screen.getBevelWidth());
 
-      if (frame.height < client->height)
-        frame.height = client->height;
+      if (frame.area.h() < client->height)
+        frame.area.setH(client->height);
     }
 
-    if (frame.width < 1)
-      frame.width = 1;
+    if (frame.area.w() < 1)
+      frame.area.setW(1);
     else
-      frame.width += screen.getBevelWidth();
+      frame.area.setW(frame.area.w() + screen.getBevelWidth());
 
-    if (frame.height < 1)
-      frame.height = 1;
+    if (frame.area.h() < 1)
+      frame.area.setH(1);
     else
-      frame.height += (screen.getBevelWidth() * 2);
+      frame.area.setH(frame.area.h() + (screen.getBevelWidth() * 2));
 
     break;
   }
@@ -275,7 +387,7 @@ void Slit::reconfigure(void) {
     XSetWindowBackground(display, frame.window,
 			 texture->getColor()->getPixel());
   } else {
-    frame.pixmap = image_ctrl->renderImage(frame.width, frame.height,
+    frame.pixmap = image_ctrl->renderImage(frame.area.w(), frame.area.h(),
 					   texture);
     XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap);
   }
@@ -285,13 +397,13 @@ void Slit::reconfigure(void) {
   int x, y;
   it.reset();
 
-  switch (screen.getSlitDirection()) {
+  switch (m_direction) {
   case Vertical:
     x = 0;
     y = screen.getBevelWidth();
 
     for (client = it.current(); client; it++, client = it.current()) {
-      x = (frame.width - client->width) / 2;
+      x = (frame.area.w() - client->width) / 2;
 
       XMoveResizeWindow(display, client->window, x, y,
                         client->width, client->height);
@@ -327,7 +439,7 @@ void Slit::reconfigure(void) {
     y = 0;
 
     for (client = it.current(); client; it++, client = it.current()) {
-      y = (frame.height - client->height) / 2;
+      y = (frame.area.h() - client->height) / 2;
 
       XMoveResizeWindow(display, client->window, x, y,
                         client->width, client->height);
@@ -365,132 +477,114 @@ void Slit::reconfigure(void) {
 
 void Slit::reposition(void) {
   // place the slit in the appropriate place
-  switch (screen.getSlitPlacement()) {
+  switch (m_placement) {
   case TopLeft:
-    frame.x = 0;
-    frame.y = 0;
-    if (screen.getSlitDirection() == Vertical) {
-      frame.x_hidden = screen.getBevelWidth() - screen.getBorderWidth()
-	               - frame.width;
-      frame.y_hidden = 0;
+    frame.area.setOrigin(0, 0);
+    if (m_direction == Vertical) {
+      frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
+                           - frame.area.w(), 0);
     } else {
-      frame.x_hidden = 0;
-      frame.y_hidden = screen.getBevelWidth() - screen.getBorderWidth()
-	               - frame.height;
+      frame.hidden = Point(0, screen.getBevelWidth() - screen.getBorderWidth()
+                           - frame.area.h());
     }
     break;
 
   case CenterLeft:
-    frame.x = 0;
-    frame.y = (screen.size().h() - frame.height) / 2;
-    frame.x_hidden = screen.getBevelWidth() - screen.getBorderWidth()
-	             - frame.width;
-    frame.y_hidden = frame.y;
+    frame.area.setOrigin(0, (screen.size().h() - frame.area.h()) / 2);
+    frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
+                         - frame.area.w(), frame.area.y());
     break;
 
   case BottomLeft:
-    frame.x = 0;
-    frame.y = screen.size().h() - frame.height
-      - (screen.getBorderWidth() * 2);
-    if (screen.getSlitDirection() == Vertical) {
-      frame.x_hidden = screen.getBevelWidth() - screen.getBorderWidth()
-	               - frame.width;
-      frame.y_hidden = frame.y;
-    } else {
-      frame.x_hidden = 0;
-      frame.y_hidden = screen.size().h() - screen.getBevelWidth()
-	               - screen.getBorderWidth();
-    }
+    frame.area.setOrigin(0, screen.size().h() - frame.area.h()
+                         - (screen.getBorderWidth() * 2));
+    if (m_direction == Vertical)
+      frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
+                           - frame.area.w(), frame.area.y());
+    else
+      frame.hidden = Point(0, screen.size().h() - screen.getBevelWidth()
+                           - screen.getBorderWidth());
     break;
 
   case TopCenter:
-    frame.x = (screen.size().w() - frame.width) / 2;
-    frame.y = 0;
-    frame.x_hidden = frame.x;
-    frame.y_hidden = screen.getBevelWidth() - screen.getBorderWidth()
-                     - frame.height;
+    frame.area.setOrigin((screen.size().w() - frame.area.w()) / 2, 0);
+    frame.hidden = Point(frame.area.x(), screen.getBevelWidth()
+                         - screen.getBorderWidth() - frame.area.h());
     break;
 
   case BottomCenter:
-    frame.x = (screen.size().h() - frame.width) / 2;
-    frame.y = screen.size().h() - frame.height
-      - (screen.getBorderWidth() * 2);
-    frame.x_hidden = frame.x;
-    frame.y_hidden = screen.size().h() - screen.getBevelWidth()
-                     - screen.getBorderWidth();
+    frame.area.setOrigin((screen.size().w() - frame.area.w()) / 2,
+                         screen.size().h() - frame.area.h()
+                         - (screen.getBorderWidth() * 2));
+    frame.hidden = Point(frame.area.x(), screen.size().h()
+                         - screen.getBevelWidth() - screen.getBorderWidth());
     break;
 
   case TopRight:
-    frame.x = screen.size().w() - frame.width
-      - (screen.getBorderWidth() * 2);
-    frame.y = 0;
-    if (screen.getSlitDirection() == Vertical) {
-      frame.x_hidden = screen.size().w() - screen.getBevelWidth()
-	               - screen.getBorderWidth();
-      frame.y_hidden = 0;
-    } else {
-      frame.x_hidden = frame.x;
-      frame.y_hidden = screen.getBevelWidth() - screen.getBorderWidth()
-                       - frame.height;
-    }
+    frame.area.setOrigin(screen.size().w() - frame.area.w()
+                         - (screen.getBorderWidth() * 2), 0);
+    if (m_direction == Vertical)
+      frame.hidden = Point(screen.size().w() - screen.getBevelWidth()
+                           - screen.getBorderWidth(), 0);
+    else
+      frame.hidden = Point(frame.area.x(), screen.getBevelWidth()
+                           - screen.getBorderWidth() - frame.area.h());
     break;
 
   case CenterRight:
   default:
-    frame.x = screen.size().w() - frame.width
-      - (screen.getBorderWidth() * 2);
-    frame.y = (screen.size().h() - frame.height) / 2;
-    frame.x_hidden = screen.size().w() - screen.getBevelWidth()
-                     - screen.getBorderWidth();
-    frame.y_hidden = frame.y;
+    frame.area.setOrigin(screen.size().w() - frame.area.w()
+                         - (screen.getBorderWidth() * 2),
+                         (screen.size().h() - frame.area.h()) / 2);
+    frame.hidden = Point(screen.size().w() - screen.getBevelWidth()
+                         - screen.getBorderWidth(), frame.area.y());
     break;
 
   case BottomRight:
-    frame.x = screen.size().w() - frame.width
-      - (screen.getBorderWidth() * 2);
-    frame.y = screen.size().h() - frame.height
-      - (screen.getBorderWidth() * 2);
-    if (screen.getSlitDirection() == Vertical) {
-      frame.x_hidden = screen.size().w() - screen.getBevelWidth()
-	               - screen.getBorderWidth();
-      frame.y_hidden = frame.y;
-    } else {
-      frame.x_hidden = frame.x;
-      frame.y_hidden = screen.size().h() - screen.getBevelWidth()
-                       - screen.getBorderWidth();
-    }
+    frame.area.setOrigin(screen.size().w() - frame.area.w()
+                         - (screen.getBorderWidth() * 2),
+                         screen.size().h() - frame.area.h()
+                         - (screen.getBorderWidth() * 2));
+    if (m_direction == Vertical)
+      frame.hidden = Point(screen.size().w() - screen.getBevelWidth()
+                           - screen.getBorderWidth(), frame.area.y());
+    else
+      frame.hidden = Point(frame.area.x(), screen.size().h() -
+                           screen.getBevelWidth() - screen.getBorderWidth());
     break;
   }
 
   Toolbar *tbar = screen.getToolbar();
-  int sw = frame.width + (screen.getBorderWidth() * 2),
-      sh = frame.height + (screen.getBorderWidth() * 2),
+  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();
 
-  if (tbar->getX() < frame.x + sw && tbar->getX() + tw > frame.x &&
-      tbar->getY() < frame.y + sh && tbar->getY() + th > frame.y) {
-    if (frame.y < th) {
-      frame.y += tbar->getExposedHeight();
-      if (screen.getSlitDirection() == Vertical)
-        frame.y_hidden += tbar->getExposedHeight();
+  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 (frame.area.y() < th) {
+      frame.area.setY(frame.area.y() + tbar->getExposedHeight());
+      if (m_direction == Vertical)
+        frame.hidden.setY(frame.hidden.y() + tbar->getExposedHeight());
       else
-	frame.y_hidden = frame.y;
+	frame.hidden.setY(frame.area.y());
     } else {
-      frame.y -= tbar->getExposedHeight();
-      if (screen.getSlitDirection() == Vertical)
-        frame.y_hidden -= tbar->getExposedHeight();
+      frame.area.setY(frame.area.y() - tbar->getExposedHeight());
+      if (m_direction == Vertical)
+        frame.hidden.setY(frame.area.y() - tbar->getExposedHeight());
       else
-	frame.y_hidden = frame.y;
+	frame.hidden.setY(frame.area.y());
     }
   }
 
-  if (hidden)
-    XMoveResizeWindow(display, frame.window, frame.x_hidden,
-		      frame.y_hidden, frame.width, frame.height);
+  if (m_hidden)
+    XMoveResizeWindow(display, frame.window, frame.hidden.x(),
+		      frame.hidden.y(), frame.area.w(), frame.area.h());
   else
-    XMoveResizeWindow(display, frame.window, frame.x,
-		      frame.y, frame.width, frame.height);
+    XMoveResizeWindow(display, frame.window, frame.area.x(),
+		      frame.area.y(), frame.area.w(), frame.area.h());
 }
 
 
@@ -503,10 +597,10 @@ void Slit::shutdown(void) {
 void Slit::buttonPressEvent(XButtonEvent *e) {
   if (e->window != frame.window) return;
 
-  if (e->button == Button1 && (! on_top)) {
+  if (e->button == Button1 && !m_ontop) {
     Window w[1] = { frame.window };
     screen.raiseWindows(w, 1);
-  } else if (e->button == Button2 && (! on_top)) {
+  } else if (e->button == Button2 && !m_ontop) {
     XLowerWindow(display, frame.window);
   } else if (e->button == Button3) {
     if (! slitmenu->isVisible()) {
@@ -535,10 +629,10 @@ void Slit::buttonPressEvent(XButtonEvent *e) {
 
 
 void Slit::enterNotifyEvent(XCrossingEvent *) {
-  if (! do_auto_hide)
+  if (!m_autohide)
     return;
 
-  if (hidden) {
+  if (m_hidden) {
     if (! timer->isTiming()) timer->start();
   } else {
     if (timer->isTiming()) timer->stop();
@@ -547,13 +641,13 @@ void Slit::enterNotifyEvent(XCrossingEvent *) {
 
 
 void Slit::leaveNotifyEvent(XCrossingEvent *) {
-  if (! do_auto_hide)
+  if (!m_autohide)
     return;
 
-  if (hidden) {
+  if (m_hidden) {
     if (timer->isTiming()) timer->stop();
   } else if (! slitmenu->isVisible()) {
-    if (! timer->isTiming()) timer->start();
+    if (!timer->isTiming()) timer->start();
   }
 }
 
@@ -598,11 +692,11 @@ void Slit::configureRequestEvent(XConfigureRequestEvent *e) {
 
 
 void Slit::timeout(void) {
-  hidden = ! hidden;
-  if (hidden)
-    XMoveWindow(display, frame.window, frame.x_hidden, frame.y_hidden);
+  m_hidden = !m_hidden;
+  if (m_hidden)
+    XMoveWindow(display, frame.window, frame.hidden.x(), frame.hidden.y());
   else
-    XMoveWindow(display, frame.window, frame.x, frame.y);
+    XMoveWindow(display, frame.window, frame.area.x(), frame.area.y());
 }
 
 
@@ -622,8 +716,12 @@ Slitmenu::Slitmenu(Slit &sl) : Basemenu(sl.screen), slit(sl) {
 
   update();
 
-  if (slit.isOnTop()) setItemSelected(2, True);
-  if (slit.doAutoHide()) setItemSelected(3, True);
+  setValues();
+}
+
+void Slitmenu::setValues() {
+  setItemSelected(2, slit.onTop());
+  setItemSelected(3, slit.autoHide());
 }
 
 
@@ -642,17 +740,17 @@ void Slitmenu::itemSelected(int button, int index) {
 
   switch (item->function()) {
   case 1: { // always on top
-    Bool change = ((slit.isOnTop()) ?  False : True);
-    slit.on_top = change;
+    bool change = ((slit.onTop()) ?  false : true);
+    slit.setOnTop(change);
     setItemSelected(2, change);
 
-    if (slit.isOnTop()) slit.screen.raiseWindows((Window *) 0, 0);
+    if (slit.onTop()) slit.screen.raiseWindows((Window *) 0, 0);
     break;
   }
 
   case 2: { // auto hide
-    Bool change = ((slit.doAutoHide()) ?  False : True);
-    slit.do_auto_hide = change;
+    Bool change = ((slit.autoHide()) ?  false : true);
+    slit.setAutoHide(change);
     setItemSelected(3, change);
 
     break;
@@ -663,12 +761,13 @@ void Slitmenu::itemSelected(int button, int index) {
 
 void Slitmenu::internal_hide(void) {
   Basemenu::internal_hide();
-  if (slit.doAutoHide())
+  if (slit.autoHide())
     slit.timeout();
 }
 
 
 void Slitmenu::reconfigure(void) {
+  setValues();
   directionmenu->reconfigure();
   placementmenu->reconfigure();
 
@@ -688,12 +787,21 @@ Slitmenu::Directionmenu::Directionmenu(Slitmenu &sm)
 
   update();
 
-  if (sm.slit.screen.getSlitDirection() == 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)
@@ -702,7 +810,7 @@ void Slitmenu::Directionmenu::itemSelected(int button, int index) {
   BasemenuItem *item = find(index);
   if (! item) return;
 
-  slitmenu.slit.screen.saveSlitDirection(item->function());
+  slitmenu.slit.setDirection(item->function());
 
   if (item->function() == Slit::Horizontal) {
     setItemSelected(0, True);
@@ -756,10 +864,9 @@ void Slitmenu::Placementmenu::itemSelected(int button, int index) {
   BasemenuItem *item = find(index);
   if (! (item && item->function())) return;
 
-  slitmenu.slit.screen.saveSlitPlacement(item->function());
+  slitmenu.slit.setPlacement(item->function());
   hide();
   slitmenu.slit.reconfigure();
 }
 
-
 #endif // SLIT