X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FSlit.cc;h=2fbce2d11a7b39cf88028c45828aab86697e7367;hb=fa903969765a42df1b2d756ff7a183a2660c1457;hp=2eb940e746b01e53b86402e97dbfc4b550cc65c7;hpb=dfc5f034581f5a26cba5c4811500438f89f0634a;p=chaz%2Fopenbox

diff --git a/src/Slit.cc b/src/Slit.cc
index 2eb940e7..2fbce2d1 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -41,52 +41,57 @@
 #include "Slit.h"
 #include "Toolbar.h"
 
-
-Slit::Slit(BScreen *scr) {
-  screen = scr;
-  openbox = screen->getOpenbox();
-
-  on_top = screen->isSlitOnTop();
-  hidden = do_auto_hide = screen->doSlitAutoHide();
-
-  display = screen->getBaseDisplay()->getXDisplay();
+#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;
 
-  timer = new BTimer(openbox, this);
-  timer->setTimeout(openbox->getAutoRaiseDelay());
+  timer = new BTimer(openbox, *this);
+  timer->setTimeout(openbox.getAutoRaiseDelay());
   timer->fireOnce(True);
 
   clientList = new LinkedList<SlitClient>;
 
-  slitmenu = new Slitmenu(this);
+  slitmenu = new Slitmenu(*this);
 
   XSetWindowAttributes attrib;
   unsigned long create_mask = CWBackPixmap | CWBackPixel | CWBorderPixel |
                               CWColormap | CWOverrideRedirect | CWEventMask;
   attrib.background_pixmap = None;
   attrib.background_pixel = attrib.border_pixel =
-    screen->getBorderColor()->getPixel();
-  attrib.colormap = screen->getColormap();
+    screen.getBorderColor()->getPixel();
+  attrib.colormap = screen.getColormap();
   attrib.override_redirect = True;
   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(),
-                  screen->getDepth(), InputOutput, screen->getVisual(),
+    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);
+  openbox.saveSlitSearch(frame.window, this);
 
   reconfigure();
 }
 
 
 Slit::~Slit() {
-  openbox->grab();
+  openbox.grab();
 
   if (timer->isTiming()) timer->stop();
   delete timer;
@@ -94,20 +99,20 @@ Slit::~Slit() {
   delete clientList;
   delete slitmenu;
 
-  screen->getImageControl()->removeImage(frame.pixmap);
+  screen.getImageControl()->removeImage(frame.pixmap);
 
-  openbox->removeSlitSearch(frame.window);
+  openbox.removeSlitSearch(frame.window);
 
   XDestroyWindow(display, frame.window);
 
-  openbox->ungrab();
+  openbox.ungrab();
 }
 
 
 void Slit::addClient(Window w) {
-  openbox->grab();
+  openbox.grab();
 
-  if (openbox->validateWindow(w)) {
+  if (openbox.validateWindow(w)) {
     SlitClient *client = new SlitClient;
     client->client_window = w;
 
@@ -116,8 +121,8 @@ void Slit::addClient(Window w) {
     if (wmhints) {
       if ((wmhints->flags & IconWindowHint) &&
 	  (wmhints->icon_window != None)) {
-	XMoveWindow(display, client->client_window, screen->getWidth() + 10,
-		    screen->getHeight() + 10);
+	XMoveWindow(display, client->client_window, screen.size().w() + 10,
+		    screen.size().h() + 10);
 	XMapWindow(display, client->client_window);
 
 	client->icon_window = wmhints->icon_window;
@@ -158,26 +163,26 @@ void Slit::addClient(Window w) {
 
     clientList->insert(client);
 
-    openbox->saveSlitSearch(client->client_window, this);
-    openbox->saveSlitSearch(client->icon_window, this);
+    openbox.saveSlitSearch(client->client_window, this);
+    openbox.saveSlitSearch(client->icon_window, this);
     reconfigure();
   }
 
-  openbox->ungrab();
+  openbox.ungrab();
 }
 
 
 void Slit::removeClient(SlitClient *client, Bool remap) {
-  openbox->removeSlitSearch(client->client_window);
-  openbox->removeSlitSearch(client->icon_window);
+  openbox.removeSlitSearch(client->client_window);
+  openbox.removeSlitSearch(client->icon_window);
   clientList->remove(client);
 
-  screen->removeNetizen(client->window);
+  screen.removeNetizen(client->window);
 
-  if (remap && openbox->validateWindow(client->window)) {
+  if (remap && openbox.validateWindow(client->window)) {
     XSelectInput(display, frame.window, NoEventMask);
     XSelectInput(display, client->window, NoEventMask);
-    XReparentWindow(display, client->window, screen->getRootWindow(),
+    XReparentWindow(display, client->window, screen.getRootWindow(),
 		    client->x, client->y);
     XChangeSaveSet(display, client->window, SetModeDelete);
     XSelectInput(display, frame.window, SubstructureRedirectMask |
@@ -191,7 +196,7 @@ void Slit::removeClient(SlitClient *client, Bool remap) {
 
 
 void Slit::removeClient(Window w, Bool remap) {
-  openbox->grab();
+  openbox.grab();
 
   Bool reconf = False;
 
@@ -207,63 +212,160 @@ void Slit::removeClient(Window w, Bool remap) {
 
   if (reconf) reconfigure();
 
-  openbox->ungrab();
+  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");
+}
+
+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");
+}
+
+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);
+}
+
+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");
+}
+
+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;
+}
 
 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;
   }
 
   reposition();
 
-  XSetWindowBorderWidth(display ,frame.window, screen->getBorderWidth());
+  XSetWindowBorderWidth(display ,frame.window, screen.getBorderWidth());
   XSetWindowBorder(display, frame.window,
-                   screen->getBorderColor()->getPixel());
+                   screen.getBorderColor()->getPixel());
 
   if (! clientList->count())
     XUnmapWindow(display, frame.window);
@@ -271,14 +373,14 @@ void Slit::reconfigure(void) {
     XMapWindow(display, frame.window);
 
   Pixmap tmp = frame.pixmap;
-  BImageControl *image_ctrl = screen->getImageControl();
-  BTexture *texture = &(screen->getToolbarStyle()->toolbar);
+  BImageControl *image_ctrl = screen.getImageControl();
+  BTexture *texture = &(screen.getToolbarStyle()->toolbar);
   if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
     frame.pixmap = None;
     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);
   }
@@ -288,13 +390,13 @@ void Slit::reconfigure(void) {
   int x, y;
   it.reset();
 
-  switch (screen->getSlitDirection()) {
+  switch (m_direction) {
   case Vertical:
     x = 0;
-    y = screen->getBevelWidth();
+    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);
@@ -320,17 +422,17 @@ void Slit::reconfigure(void) {
 
       XSendEvent(display, client->window, False, StructureNotifyMask, &event);
 
-      y += client->height + screen->getBevelWidth();
+      y += client->height + screen.getBevelWidth();
     }
 
     break;
 
   case Horizontal:
-    x = screen->getBevelWidth();
+    x = screen.getBevelWidth();
     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);
@@ -356,7 +458,7 @@ void Slit::reconfigure(void) {
 
       XSendEvent(display, client->window, False, StructureNotifyMask, &event);
 
-      x += client->width + screen->getBevelWidth();
+      x += client->width + screen.getBevelWidth();
     }
 
     break;
@@ -368,132 +470,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->getHeight() - 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->getHeight() - 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->getHeight() - 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->getWidth() - 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->getWidth() - frame.width) / 2;
-    frame.y = screen->getHeight() - frame.height
-      - (screen->getBorderWidth() * 2);
-    frame.x_hidden = frame.x;
-    frame.y_hidden = screen->getHeight() - 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->getWidth() - frame.width
-      - (screen->getBorderWidth() * 2);
-    frame.y = 0;
-    if (screen->getSlitDirection() == Vertical) {
-      frame.x_hidden = screen->getWidth() - 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->getWidth() - frame.width
-      - (screen->getBorderWidth() * 2);
-    frame.y = (screen->getHeight() - frame.height) / 2;
-    frame.x_hidden = screen->getWidth() - 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->getWidth() - frame.width
-      - (screen->getBorderWidth() * 2);
-    frame.y = screen->getHeight() - frame.height
-      - (screen->getBorderWidth() * 2);
-    if (screen->getSlitDirection() == Vertical) {
-      frame.x_hidden = screen->getWidth() - screen->getBevelWidth()
-	               - screen->getBorderWidth();
-      frame.y_hidden = frame.y;
-    } else {
-      frame.x_hidden = frame.x;
-      frame.y_hidden = screen->getHeight() - 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),
-      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();
+  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();
+
+  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());
 }
 
 
@@ -506,10 +590,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)) {
+    screen.raiseWindows(w, 1);
+  } else if (e->button == Button2 && !m_ontop) {
     XLowerWindow(display, frame.window);
   } else if (e->button == Button3) {
     if (! slitmenu->isVisible()) {
@@ -520,13 +604,13 @@ void Slit::buttonPressEvent(XButtonEvent *e) {
 
       if (x < 0)
         x = 0;
-      else if (x + slitmenu->getWidth() > screen->getWidth())
-        x = screen->getWidth() - slitmenu->getWidth();
+      else if (x + slitmenu->getWidth() > screen.size().w())
+        x = screen.size().w() - slitmenu->getWidth();
 
       if (y < 0)
         y = 0;
-      else if (y + slitmenu->getHeight() > screen->getHeight())
-        y = screen->getHeight() - slitmenu->getHeight();
+      else if (y + slitmenu->getHeight() > screen.size().h())
+        y = screen.size().h() - slitmenu->getHeight();
 
       slitmenu->move(x, y);
       slitmenu->show();
@@ -538,10 +622,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();
@@ -550,21 +634,21 @@ 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();
   }
 }
 
 
 void Slit::configureRequestEvent(XConfigureRequestEvent *e) {
-  openbox->grab();
+  openbox.grab();
 
-  if (openbox->validateWindow(e->window)) {
+  if (openbox.validateWindow(e->window)) {
     Bool reconf = False;
     XWindowChanges xwc;
 
@@ -596,27 +680,25 @@ void Slit::configureRequestEvent(XConfigureRequestEvent *e) {
 
   }
 
-  openbox->ungrab();
+  openbox.ungrab();
 }
 
 
 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());
 }
 
 
-Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) {
-  slit = sl;
-
+Slitmenu::Slitmenu(Slit &sl) : Basemenu(sl.screen), slit(sl) {
   setLabel(i18n->getMessage(SlitSet, SlitSlitTitle, "Slit"));
   setInternalMenu();
 
-  directionmenu = new Directionmenu(this);
-  placementmenu = new Placementmenu(this);
+  directionmenu = new Directionmenu(*this);
+  placementmenu = new Placementmenu(*this);
 
   insert(i18n->getMessage(CommonSet, CommonDirectionTitle, "Direction"),
 	 directionmenu);
@@ -627,8 +709,12 @@ Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) {
 
   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());
 }
 
 
@@ -647,17 +733,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;
@@ -668,12 +754,13 @@ void Slitmenu::itemSelected(int button, int index) {
 
 void Slitmenu::internal_hide(void) {
   Basemenu::internal_hide();
-  if (slit->doAutoHide())
-    slit->timeout();
+  if (slit.autoHide())
+    slit.timeout();
 }
 
 
 void Slitmenu::reconfigure(void) {
+  setValues();
   directionmenu->reconfigure();
   placementmenu->reconfigure();
 
@@ -681,10 +768,8 @@ void Slitmenu::reconfigure(void) {
 }
 
 
-Slitmenu::Directionmenu::Directionmenu(Slitmenu *sm)
-  : Basemenu(sm->slit->screen) {
-  slitmenu = sm;
-
+Slitmenu::Directionmenu::Directionmenu(Slitmenu &sm)
+  : Basemenu(sm.slit.screen), slitmenu(sm) {
   setLabel(i18n->getMessage(SlitSet, SlitSlitDirection, "Slit Direction"));
   setInternalMenu();
 
@@ -695,12 +780,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)
@@ -709,7 +803,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);
@@ -720,13 +814,12 @@ void Slitmenu::Directionmenu::itemSelected(int button, int index) {
   }
 
   hide();
-  slitmenu->slit->reconfigure();
+  slitmenu.slit.reconfigure();
 }
 
 
-Slitmenu::Placementmenu::Placementmenu(Slitmenu *sm)
-  : Basemenu(sm->slit->screen) {
-  slitmenu = sm;
+Slitmenu::Placementmenu::Placementmenu(Slitmenu &sm)
+  : Basemenu(sm.slit.screen), slitmenu(sm) {
 
   setLabel(i18n->getMessage(SlitSet, SlitSlitPlacement, "Slit Placement"));
   setMinimumSublevels(3);
@@ -764,10 +857,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();
+  slitmenu.slit.reconfigure();
 }
 
-
 #endif // SLIT