X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=6c1551b5153dd0ef0990b7992859441895656c1a;hb=5face4c6f35172761367f63ac0b6eaf62d84e532;hp=f9485595f5ef22df21f8b876cbb73899f14af9a4;hpb=26bef30a57e0a23be2dc3dd5418f305c43684bb1;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index f9485595..6c1551b5 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -29,6 +29,7 @@ extern "C" {
 #include "bindings.hh"
 #include "python.hh"
 #include "otk/display.hh"
+#include "otk/property.hh"
 
 #include <vector>
 #include <algorithm>
@@ -45,18 +46,19 @@ static int anotherWMRunning(Display *display, XErrorEvent *) {
 namespace ob {
 
 
-OBScreen::OBScreen(int screen)
-  : OBWidget(OBWidget::Type_Root),
-    _number(screen)
+Screen::Screen(int screen)
+  : WidgetBase(WidgetBase::Type_Root),
+    _number(screen),
+    _style(screen, "")
 {
-  assert(screen >= 0); assert(screen < ScreenCount(otk::OBDisplay::display));
-  _info = otk::OBDisplay::screenInfo(screen);
+  assert(screen >= 0); assert(screen < ScreenCount(**otk::display));
+  _info = otk::display->screenInfo(screen);
 
   ::running = false;
   XErrorHandler old = XSetErrorHandler(::anotherWMRunning);
-  XSelectInput(otk::OBDisplay::display, _info->rootWindow(),
-               OBScreen::event_mask);
-  XSync(otk::OBDisplay::display, false);
+  XSelectInput(**otk::display, _info->rootWindow(),
+               Screen::event_mask);
+  XSync(**otk::display, false);
   XSetErrorHandler(old);
 
   _managed = !::running;
@@ -65,27 +67,19 @@ OBScreen::OBScreen(int screen)
   printf(_("Managing screen %d: visual 0x%lx, depth %d\n"),
          _number, XVisualIDFromVisual(_info->visual()), _info->depth());
 
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::openbox_pid,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     (unsigned long) getpid());
+  otk::Property::set(_info->rootWindow(), otk::Property::atoms.openbox_pid,
+                     otk::Property::atoms.cardinal, (unsigned long) getpid());
 
   // set the mouse cursor for the root window (the default cursor)
-  XDefineCursor(otk::OBDisplay::display, _info->rootWindow(),
-                Openbox::instance->cursors().session);
-
-  // initialize the shit that is used for all drawing on the screen
-  _image_control = new otk::BImageControl(Openbox::instance->timerManager(),
-                                          _info, true);
-  _image_control->installRootColormap();
-  _root_cmap_installed = True;
-
-  // initialize the screen's style
-  _style.setImageControl(_image_control);
-  std::string stylepath;
+  XDefineCursor(**otk::display, _info->rootWindow(),
+                openbox->cursors().session);
+
+  // XXX: initialize the screen's style
+  /*
+  otk::ustring stylepath;
   python_get_string("theme", &stylepath);
   otk::Configuration sconfig(false);
-  sconfig.setFile(otk::expandTilde(stylepath));
+  sconfig.setFile(otk::expandTilde(stylepath.c_str()));
   if (!sconfig.load()) {
     sconfig.setFile(otk::expandTilde(DEFAULTSTYLE));
     if (!sconfig.load()) {
@@ -94,6 +88,8 @@ OBScreen::OBScreen(int screen)
     }
   }
   _style.load(sconfig);
+  */
+  otk::display->renderControl(_number)->drawRoot(*_style.rootColor());
 
   // set up notification of netwm support
   changeSupportedAtoms();
@@ -101,23 +97,21 @@ OBScreen::OBScreen(int screen)
   // Set the netwm properties for geometry
   unsigned long geometry[] = { _info->width(),
                                _info->height() };
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_desktop_geometry,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     geometry, 2);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_desktop_geometry,
+                     otk::Property::atoms.cardinal, geometry, 2);
 
   // Set the net_desktop_names property
-  std::vector<std::string> names;
+  std::vector<otk::ustring> names;
   python_get_stringlist("desktop_names", &names);
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_desktop_names,
-                                     otk::OBProperty::utf8,
-                                     names);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_desktop_names,
+                     otk::Property::utf8, names);
   // the above set() will cause the updateDesktopNames to fire right away so
   // we have a list of desktop names
 
   if (!python_get_long("number_of_desktops", &_num_desktops))
-    _num_desktops = 4;
+    _num_desktops = 1;
   changeNumDesktops(_num_desktops); // set the hint
 
   _desktop = 0;
@@ -126,10 +120,10 @@ OBScreen::OBScreen(int screen)
   // create the window which gets focus when no clients get it
   XSetWindowAttributes attr;
   attr.override_redirect = true;
-  _focuswindow = XCreateWindow(otk::OBDisplay::display, _info->rootWindow(),
+  _focuswindow = XCreateWindow(**otk::display, _info->rootWindow(),
                                -100, -100, 1, 1, 0, 0, InputOnly,
                                _info->visual(), CWOverrideRedirect, &attr);
-  XMapWindow(otk::OBDisplay::display, _focuswindow);
+  XMapRaised(**otk::display, _focuswindow);
   
   // these may be further updated if any pre-existing windows are found in
   // the manageExising() function
@@ -137,49 +131,45 @@ OBScreen::OBScreen(int screen)
   calcArea();          // initialize the available working area
 
   // register this class as the event handler for the root window
-  Openbox::instance->registerHandler(_info->rootWindow(), this);
+  openbox->registerHandler(_info->rootWindow(), this);
 
   // call the python Startup callbacks
-  EventData *data = new_event_data(_number, 0, EventShutdown, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_XDECREF((PyObject*)data);
+  EventData data(_number, 0, EventAction::Shutdown, 0);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-OBScreen::~OBScreen()
+Screen::~Screen()
 {
   if (! _managed) return;
 
-  XSelectInput(otk::OBDisplay::display, _info->rootWindow(), NoEventMask);
+  XSelectInput(**otk::display, _info->rootWindow(), NoEventMask);
   
   // unmanage all windows
   while (!clients.empty())
     unmanageWindow(clients.front());
 
   // call the python Shutdown callbacks
-  EventData *data = new_event_data(_number, 0, EventShutdown, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_XDECREF((PyObject*)data);
+  EventData data(_number, 0, EventAction::Shutdown, 0);
+  openbox->bindings()->fireEvent(&data);
 
-  XDestroyWindow(otk::OBDisplay::display, _focuswindow);
-  XDestroyWindow(otk::OBDisplay::display, _supportwindow);
-
-  delete _image_control;
+  XDestroyWindow(**otk::display, _focuswindow);
+  XDestroyWindow(**otk::display, _supportwindow);
 }
 
 
-void OBScreen::manageExisting()
+void Screen::manageExisting()
 {
   unsigned int i, j, nchild;
   Window r, p, *children;
-  XQueryTree(otk::OBDisplay::display, _info->rootWindow(), &r, &p,
+  XQueryTree(**otk::display, _info->rootWindow(), &r, &p,
              &children, &nchild);
 
   // preen the window list of all icon windows... for better dockapp support
   for (i = 0; i < nchild; i++) {
     if (children[i] == None) continue;
 
-    XWMHints *wmhints = XGetWMHints(otk::OBDisplay::display,
+    XWMHints *wmhints = XGetWMHints(**otk::display,
                                     children[i]);
 
     if (wmhints) {
@@ -203,7 +193,7 @@ void OBScreen::manageExisting()
       continue;
 
     XWindowAttributes attrib;
-    if (XGetWindowAttributes(otk::OBDisplay::display, children[i], &attrib)) {
+    if (XGetWindowAttributes(**otk::display, children[i], &attrib)) {
       if (attrib.override_redirect) continue;
 
       if (attrib.map_state != IsUnmapped) {
@@ -216,11 +206,11 @@ void OBScreen::manageExisting()
 }
 
 
-void OBScreen::updateStrut()
+void Screen::updateStrut()
 {
   _strut.left = _strut.right = _strut.top = _strut.bottom = 0;
 
-  OBClient::List::iterator it, end = clients.end();
+  Client::List::iterator it, end = clients.end();
   for (it = clients.begin(); it != end; ++it) {
     const otk::Strut &s = (*it)->strut();
     _strut.left = std::max(_strut.left, s.left);
@@ -232,7 +222,7 @@ void OBScreen::updateStrut()
 }
 
 
-void OBScreen::calcArea()
+void Screen::calcArea()
 {
   otk::Rect old_area = _area;
 
@@ -271,111 +261,101 @@ void OBScreen::calcArea()
 #endif // XINERAMA
 */
   
-  if (old_area != _area)
+  //if (old_area != _area)
     // XXX: re-maximize windows
 
   changeWorkArea();
 }
 
 
-void OBScreen::changeSupportedAtoms()
+void Screen::changeSupportedAtoms()
 {
   // create the netwm support window
-  _supportwindow = XCreateSimpleWindow(otk::OBDisplay::display,
+  _supportwindow = XCreateSimpleWindow(**otk::display,
                                        _info->rootWindow(),
                                        0, 0, 1, 1, 0, 0, 0);
-  assert(_supportwindow != None);
 
   // set supporting window
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_supporting_wm_check,
-                                     otk::OBProperty::Atom_Window,
-                                     _supportwindow);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_supporting_wm_check,
+                     otk::Property::atoms.window, _supportwindow);
 
   //set properties on the supporting window
-  Openbox::instance->property()->set(_supportwindow,
-                                     otk::OBProperty::net_wm_name,
-                                     otk::OBProperty::utf8,
-                                     "Openbox");
-  Openbox::instance->property()->set(_supportwindow,
-                                     otk::OBProperty::net_supporting_wm_check,
-                                     otk::OBProperty::Atom_Window,
-                                     _supportwindow);
+  otk::Property::set(_supportwindow, otk::Property::atoms.net_wm_name,
+                     otk::Property::utf8, "Openbox");
+  otk::Property::set(_supportwindow,
+                     otk::Property::atoms.net_supporting_wm_check,
+                     otk::Property::atoms.window, _supportwindow);
 
   
   Atom supported[] = {
-      otk::OBProperty::net_current_desktop,
-      otk::OBProperty::net_number_of_desktops,
-      otk::OBProperty::net_desktop_geometry,
-      otk::OBProperty::net_desktop_viewport,
-      otk::OBProperty::net_active_window,
-      otk::OBProperty::net_workarea,
-      otk::OBProperty::net_client_list,
-      otk::OBProperty::net_client_list_stacking,
-      otk::OBProperty::net_desktop_names,
-      otk::OBProperty::net_close_window,
-      otk::OBProperty::net_wm_name,
-      otk::OBProperty::net_wm_visible_name,
-      otk::OBProperty::net_wm_icon_name,
-      otk::OBProperty::net_wm_visible_icon_name,
+    otk::Property::atoms.net_current_desktop,
+    otk::Property::atoms.net_number_of_desktops,
+    otk::Property::atoms.net_desktop_geometry,
+    otk::Property::atoms.net_desktop_viewport,
+    otk::Property::atoms.net_active_window,
+    otk::Property::atoms.net_workarea,
+    otk::Property::atoms.net_client_list,
+    otk::Property::atoms.net_client_list_stacking,
+    otk::Property::atoms.net_desktop_names,
+    otk::Property::atoms.net_close_window,
+    otk::Property::atoms.net_wm_name,
+    otk::Property::atoms.net_wm_visible_name,
+    otk::Property::atoms.net_wm_icon_name,
+    otk::Property::atoms.net_wm_visible_icon_name,
 /*
-      otk::OBProperty::net_wm_desktop,
+    otk::Property::atoms.net_wm_desktop,
 */
-      otk::OBProperty::net_wm_strut,
-      otk::OBProperty::net_wm_window_type,
-      otk::OBProperty::net_wm_window_type_desktop,
-      otk::OBProperty::net_wm_window_type_dock,
-      otk::OBProperty::net_wm_window_type_toolbar,
-      otk::OBProperty::net_wm_window_type_menu,
-      otk::OBProperty::net_wm_window_type_utility,
-      otk::OBProperty::net_wm_window_type_splash,
-      otk::OBProperty::net_wm_window_type_dialog,
-      otk::OBProperty::net_wm_window_type_normal,
+    otk::Property::atoms.net_wm_strut,
+    otk::Property::atoms.net_wm_window_type,
+    otk::Property::atoms.net_wm_window_type_desktop,
+    otk::Property::atoms.net_wm_window_type_dock,
+    otk::Property::atoms.net_wm_window_type_toolbar,
+    otk::Property::atoms.net_wm_window_type_menu,
+    otk::Property::atoms.net_wm_window_type_utility,
+    otk::Property::atoms.net_wm_window_type_splash,
+    otk::Property::atoms.net_wm_window_type_dialog,
+    otk::Property::atoms.net_wm_window_type_normal,
 /*
-      otk::OBProperty::net_wm_moveresize,
-      otk::OBProperty::net_wm_moveresize_size_topleft,
-      otk::OBProperty::net_wm_moveresize_size_topright,
-      otk::OBProperty::net_wm_moveresize_size_bottomleft,
-      otk::OBProperty::net_wm_moveresize_size_bottomright,
-      otk::OBProperty::net_wm_moveresize_move,
+    otk::Property::atoms.net_wm_moveresize,
+    otk::Property::atoms.net_wm_moveresize_size_topleft,
+    otk::Property::atoms.net_wm_moveresize_size_topright,
+    otk::Property::atoms.net_wm_moveresize_size_bottomleft,
+    otk::Property::atoms.net_wm_moveresize_size_bottomright,
+    otk::Property::atoms.net_wm_moveresize_move,
 */
-/*
-      otk::OBProperty::net_wm_allowed_actions,
-      otk::OBProperty::net_wm_action_move,
-      otk::OBProperty::net_wm_action_resize,
-      otk::OBProperty::net_wm_action_shade,
-      otk::OBProperty::net_wm_action_maximize_horz,
-      otk::OBProperty::net_wm_action_maximize_vert,
-      otk::OBProperty::net_wm_action_change_desktop,
-      otk::OBProperty::net_wm_action_close,
-*/
-      otk::OBProperty::net_wm_state,
-      otk::OBProperty::net_wm_state_modal,
-      otk::OBProperty::net_wm_state_maximized_vert,
-      otk::OBProperty::net_wm_state_maximized_horz,
-      otk::OBProperty::net_wm_state_shaded,
-      otk::OBProperty::net_wm_state_skip_taskbar,
-      otk::OBProperty::net_wm_state_skip_pager,
-      otk::OBProperty::net_wm_state_hidden,
-      otk::OBProperty::net_wm_state_fullscreen,
-      otk::OBProperty::net_wm_state_above,
-      otk::OBProperty::net_wm_state_below,
-    };
+    otk::Property::atoms.net_wm_allowed_actions,
+    otk::Property::atoms.net_wm_action_move,
+    otk::Property::atoms.net_wm_action_resize,
+    otk::Property::atoms.net_wm_action_minimize,
+    otk::Property::atoms.net_wm_action_shade,
+/*    otk::Property::atoms.net_wm_action_stick,*/
+    otk::Property::atoms.net_wm_action_maximize_horz,
+    otk::Property::atoms.net_wm_action_maximize_vert,
+    otk::Property::atoms.net_wm_action_fullscreen,
+    otk::Property::atoms.net_wm_action_change_desktop,
+    otk::Property::atoms.net_wm_action_close,
+
+    otk::Property::atoms.net_wm_state,
+    otk::Property::atoms.net_wm_state_modal,
+    otk::Property::atoms.net_wm_state_maximized_vert,
+    otk::Property::atoms.net_wm_state_maximized_horz,
+    otk::Property::atoms.net_wm_state_shaded,
+    otk::Property::atoms.net_wm_state_skip_taskbar,
+    otk::Property::atoms.net_wm_state_skip_pager,
+    otk::Property::atoms.net_wm_state_hidden,
+    otk::Property::atoms.net_wm_state_fullscreen,
+    otk::Property::atoms.net_wm_state_above,
+    otk::Property::atoms.net_wm_state_below,
+  };
   const int num_supported = sizeof(supported)/sizeof(Atom);
 
-  // convert to the atom values
-  for (int i = 0; i < num_supported; ++i)
-    supported[i] =
-      Openbox::instance->property()->atom((otk::OBProperty::Atoms)supported[i]);
-  
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_supported,
-                                     otk::OBProperty::Atom_Atom,
-                                     supported, num_supported);
+  otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_supported,
+                     otk::Property::atoms.atom, supported, num_supported);
 }
 
 
-void OBScreen::changeClientList()
+void Screen::changeClientList()
 {
   Window *windows;
   unsigned int size = clients.size();
@@ -386,17 +366,15 @@ void OBScreen::changeClientList()
     
     windows = new Window[size];
     win_it = windows;
-    OBClient::List::const_iterator it = clients.begin();
-    const OBClient::List::const_iterator end = clients.end();
+    Client::List::const_iterator it = clients.begin();
+    const Client::List::const_iterator end = clients.end();
     for (; it != end; ++it, ++win_it)
       *win_it = (*it)->window();
   } else
     windows = (Window*) 0;
 
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_client_list,
-                                     otk::OBProperty::Atom_Window,
-                                     windows, size);
+  otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_client_list,
+                     otk::Property::atoms.window, windows, size);
 
   if (size)
     delete [] windows;
@@ -405,7 +383,7 @@ void OBScreen::changeClientList()
 }
 
 
-void OBScreen::changeStackingList()
+void Screen::changeStackingList()
 {
   Window *windows;
   unsigned int size = _stacking.size();
@@ -413,30 +391,29 @@ void OBScreen::changeStackingList()
   assert(size == clients.size()); // just making sure.. :)
 
   
-  // create an array of the window ids
+  // create an array of the window ids (from bottom to top, reverse order!)
   if (size > 0) {
     Window *win_it;
     
     windows = new Window[size];
     win_it = windows;
-    OBClient::List::const_iterator it = _stacking.begin();
-    const OBClient::List::const_iterator end = _stacking.end();
+    Client::List::const_reverse_iterator it = _stacking.rbegin();
+    const Client::List::const_reverse_iterator end = _stacking.rend();
     for (; it != end; ++it, ++win_it)
       *win_it = (*it)->window();
   } else
     windows = (Window*) 0;
 
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_client_list_stacking,
-                                     otk::OBProperty::Atom_Window,
-                                     windows, size);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_client_list_stacking,
+                     otk::Property::atoms.window, windows, size);
 
   if (size)
     delete [] windows;
 }
 
 
-void OBScreen::changeWorkArea() {
+void Screen::changeWorkArea() {
   unsigned long *dims = new unsigned long[4 * _num_desktops];
   for (long i = 0; i < _num_desktops; ++i) {
     // XXX: this could be different for each workspace
@@ -445,208 +422,235 @@ void OBScreen::changeWorkArea() {
     dims[(i * 4) + 2] = _area.width();
     dims[(i * 4) + 3] = _area.height();
   }
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_workarea,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     dims, 4 * _num_desktops);
+  otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_workarea,
+                     otk::Property::atoms.cardinal, dims, 4 * _num_desktops);
   delete [] dims;
 }
 
 
-void OBScreen::manageWindow(Window window)
+void Screen::manageWindow(Window window)
 {
-  OBClient *client = 0;
+  Client *client = 0;
   XWMHints *wmhint;
   XSetWindowAttributes attrib_set;
 
+  otk::display->grab();
+
   // is the window a docking app
-  if ((wmhint = XGetWMHints(otk::OBDisplay::display, window))) {
+  if ((wmhint = XGetWMHints(**otk::display, window))) {
     if ((wmhint->flags & StateHint) &&
         wmhint->initial_state == WithdrawnState) {
       //slit->addClient(w); // XXX: make dock apps work!
+      otk::display->ungrab();
+
       XFree(wmhint);
       return;
     }
     XFree(wmhint);
   }
 
-  otk::OBDisplay::grab();
-
   // choose the events we want to receive on the CLIENT window
-  attrib_set.event_mask = OBClient::event_mask;
-  attrib_set.do_not_propagate_mask = OBClient::no_propagate_mask;
-  XChangeWindowAttributes(otk::OBDisplay::display, window,
+  attrib_set.event_mask = Client::event_mask;
+  attrib_set.do_not_propagate_mask = Client::no_propagate_mask;
+  XChangeWindowAttributes(**otk::display, window,
                           CWEventMask|CWDontPropagate, &attrib_set);
 
-  // create the OBClient class, which gets all of the hints on the window
-  client = new OBClient(_number, window);
+  // create the Client class, which gets all of the hints on the window
+  client = new Client(_number, window);
   // register for events
-  Openbox::instance->registerHandler(window, client);
+  openbox->registerHandler(window, client);
   // add to the wm's map
-  Openbox::instance->addClient(window, client);
+  openbox->addClient(window, client);
 
   // we dont want a border on the client
   client->toggleClientBorder(false);
   
   // specify that if we exit, the window should not be destroyed and should be
   // reparented back to root automatically
-  XChangeSaveSet(otk::OBDisplay::display, window, SetModeInsert);
-
-  if (!client->positionRequested()) {
-    // XXX: position the window intelligenty
-  }
+  XChangeSaveSet(**otk::display, window, SetModeInsert);
 
   // create the decoration frame for the client window
-  client->frame = new OBFrame(client, &_style);
+  client->frame = new Frame(client, &_style);
+  // register the plate for events (map req's)
+  // this involves removing itself from the handler list first, since it is
+  // auto added to the list, being a widget. we won't get any events on the
+  // plate except for events for the client (SubstructureRedirectMask)
+  openbox->clearHandler(client->frame->plate());
+  openbox->registerHandler(client->frame->plate(), client);
 
   // add to the wm's map
-  Openbox::instance->addClient(client->frame->window(), client);
-  Openbox::instance->addClient(client->frame->plate(), client);
-  Openbox::instance->addClient(client->frame->titlebar(), client);
-  Openbox::instance->addClient(client->frame->label(), client);
-  Openbox::instance->addClient(client->frame->button_max(), client);
-  Openbox::instance->addClient(client->frame->button_iconify(), client);
-  Openbox::instance->addClient(client->frame->button_stick(), client);
-  Openbox::instance->addClient(client->frame->button_close(), client);
-  Openbox::instance->addClient(client->frame->handle(), client);
-  Openbox::instance->addClient(client->frame->grip_left(), client);
-  Openbox::instance->addClient(client->frame->grip_right(), client);
-
-  bool shown = false;
-  
+  openbox->addClient(client->frame->window(), client);
+  openbox->addClient(client->frame->plate(), client);
+  openbox->addClient(client->frame->titlebar(), client);
+  openbox->addClient(client->frame->label(), client);
+  openbox->addClient(client->frame->button_max(), client);
+  openbox->addClient(client->frame->button_iconify(), client);
+  openbox->addClient(client->frame->button_alldesk(), client);
+  openbox->addClient(client->frame->button_close(), client);
+  openbox->addClient(client->frame->handle(), client);
+  openbox->addClient(client->frame->grip_left(), client);
+  openbox->addClient(client->frame->grip_right(), client);
+
+  // reparent the client to the frame
+  client->frame->grabClient();
+
+  if (!(openbox->state() == Openbox::State_Starting ||
+        client->positionRequested())) {
+    // position the window intelligenty .. hopefully :)
+    // call the python PLACEWINDOW binding
+    EventData data(_number, client, EventAction::PlaceWindow, 0);
+    openbox->bindings()->fireEvent(&data);
+  }
+
   // if on the current desktop.. (or all desktops)
   if (client->desktop() == _desktop ||
       client->desktop() == (signed)0xffffffff) {
-    shown = true;
     client->frame->show();
   }
- 
-  // XXX: handle any requested states such as maximized
 
-  otk::OBDisplay::ungrab();
+  client->applyStartupState();
+
+  otk::display->ungrab();
 
   // add to the screen's list
   clients.push_back(client);
   // this puts into the stacking order, then raises it
   _stacking.push_back(client);
-  restack(true, client);
+  raiseWindow(client);
   // update the root properties
   changeClientList();
 
-  Openbox::instance->bindings()->grabButtons(true, client);
-
-  if (shown) {
-    // XXX: make this optional or more intelligent
-    if (client->normal())
-      client->focus();
-  }
+  openbox->bindings()->grabButtons(true, client);
 
   // call the python NEWWINDOW binding
-  EventData *data = new_event_data(_number, window, EventNewWindow, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_DECREF((PyObject*)data);
+  EventData data(_number, client, EventAction::NewWindow, 0);
+  openbox->bindings()->fireEvent(&data);
 
-  printf("Managed window 0x%lx\n", window);
+#ifdef DEBUG
+  printf("Managed window 0x%lx frame 0x%lx\n",
+         window, client->frame->window());
+#endif
 }
 
 
-void OBScreen::unmanageWindow(OBClient *client)
+void Screen::unmanageWindow(Client *client)
 {
-  OBFrame *frame = client->frame;
+  Frame *frame = client->frame;
 
   // call the python CLOSEWINDOW binding 
-  EventData *data = new_event_data(_number, client->window(),
-                                   EventCloseWindow, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_DECREF((PyObject*)data);
+  EventData data(_number, client, EventAction::CloseWindow, 0);
+  openbox->bindings()->fireEvent(&data);
 
-  Openbox::instance->bindings()->grabButtons(false, client);
-
-  // remove from the stacking order
-  _stacking.remove(client);
-  
-  // pass around focus if this window was focused XXX do this better!
-  if (Openbox::instance->focusedClient() == client) {
-    OBClient *newfocus = 0;
-    OBClient::List::iterator it, end = _stacking.end();
-    for (it = _stacking.begin(); it != end; ++it)
-      if ((*it)->desktop() == _desktop && (*it)->normal() && (*it)->focus()) {
-        newfocus = *it;
-        break;
-      }
-    if (!newfocus)
-      client->unfocus();
-  }
+  openbox->bindings()->grabButtons(false, client);
 
   // remove from the wm's map
-  Openbox::instance->removeClient(client->window());
-  Openbox::instance->removeClient(frame->window());
-  Openbox::instance->removeClient(frame->plate());
-  Openbox::instance->removeClient(frame->titlebar());
-  Openbox::instance->removeClient(frame->label());
-  Openbox::instance->removeClient(frame->button_max());
-  Openbox::instance->removeClient(frame->button_iconify());
-  Openbox::instance->removeClient(frame->button_stick());
-  Openbox::instance->removeClient(frame->button_close());
-  Openbox::instance->removeClient(frame->handle());
-  Openbox::instance->removeClient(frame->grip_left());
-  Openbox::instance->removeClient(frame->grip_right());
+  openbox->removeClient(client->window());
+  openbox->removeClient(frame->window());
+  openbox->removeClient(frame->plate());
+  openbox->removeClient(frame->titlebar());
+  openbox->removeClient(frame->label());
+  openbox->removeClient(frame->button_max());
+  openbox->removeClient(frame->button_iconify());
+  openbox->removeClient(frame->button_alldesk());
+  openbox->removeClient(frame->button_close());
+  openbox->removeClient(frame->handle());
+  openbox->removeClient(frame->grip_left());
+  openbox->removeClient(frame->grip_right());
   // unregister for handling events
-  Openbox::instance->clearHandler(client->window());
+  openbox->clearHandler(client->window());
   
   // remove the window from our save set
-  XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete);
+  XChangeSaveSet(**otk::display, client->window(), SetModeDelete);
 
   // we dont want events no more
-  XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
+  XSelectInput(**otk::display, client->window(), NoEventMask);
 
   frame->hide();
 
   // give the client its border back
   client->toggleClientBorder(true);
 
+  // reparent the window out of the frame
+  frame->releaseClient();
+
+#ifdef DEBUG
+  Window framewin = client->frame->window();
+#endif
   delete client->frame;
   client->frame = 0;
 
+  // remove from the stacking order
+  _stacking.remove(client);
+
   // remove from the screen's list
   clients.remove(client);
+
+  // unfocus the client (calls the focus callbacks)
+  client->unfocus();
+
+#ifdef DEBUG
+  printf("Unmanaged window 0x%lx frame 0x%lx\n", client->window(), framewin);
+#endif
+  
   delete client;
 
   // update the root properties
   changeClientList();
 }
 
-void OBScreen::restack(bool raise, OBClient *client)
+void Screen::lowerWindow(Client *client)
 {
-  const int layer = client->layer();
-  std::vector<Window> wins;
+  Window wins[2];  // only ever restack 2 windows.
+
+  assert(!_stacking.empty()); // this would be bad
+
+  Client::List::iterator it = --_stacking.end();
+  const Client::List::iterator end = _stacking.begin();
+
+  for (; it != end && (*it)->layer() < client->layer(); --it);
+  if (*it == client) return;          // already the bottom, return
+
+  wins[0] = (*it)->frame->window();
+  wins[1] = client->frame->window();
 
   _stacking.remove(client);
+  _stacking.insert(++it, client);
 
-  // the stacking list is from highest to lowest
+  XRestackWindows(**otk::display, wins, 2);
+  changeStackingList();
+}
+
+void Screen::raiseWindow(Client *client)
+{
+  Window wins[2];  // only ever restack 2 windows.
+
+  assert(!_stacking.empty()); // this would be bad
+
+  // remove the client before looking so we can't run into ourselves
+  _stacking.remove(client);
   
-  OBClient::List::iterator it = _stacking.begin(), end = _stacking.end();
-  // insert the windows above this window
-  for (; it != end; ++it) {
-    if ((*it)->layer() < layer || (raise && (*it)->layer() == layer))
-      break;
-    wins.push_back((*it)->frame->window());
-  }
-  // insert our client
-  wins.push_back(client->frame->window());
+  Client::List::iterator it = _stacking.begin();
+  const Client::List::iterator end = _stacking.end();
+
+  // the stacking list is from highest to lowest
+  for (; it != end && (*it)->layer() > client->layer(); ++it);
+
+  /*
+    if our new position is the top, we want to stack under the _focuswindow
+    otherwise, we want to stack under the previous window in the stack.
+  */
+  wins[0] = (it == _stacking.begin() ? _focuswindow :
+             ((*(--Client::List::const_iterator(it)))->frame->window()));
+  wins[1] = client->frame->window();
+
   _stacking.insert(it, client);
-  // insert the remaining below this window
-  for (; it != end; ++it)
-    wins.push_back((*it)->frame->window());
 
-  XRestackWindows(otk::OBDisplay::display, &wins[0], wins.size());
+  XRestackWindows(**otk::display, wins, 2);
   changeStackingList();
 }
 
-void OBScreen::changeDesktop(long desktop)
+void Screen::changeDesktop(long desktop)
 {
-  assert(desktop >= 0 && desktop < _num_desktops);
-
   if (!(desktop >= 0 && desktop < _num_desktops)) return;
 
   printf("Moving to desktop %ld\n", desktop);
@@ -654,14 +658,13 @@ void OBScreen::changeDesktop(long desktop)
   long old = _desktop;
   
   _desktop = desktop;
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_current_desktop,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     _desktop);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_current_desktop,
+                     otk::Property::atoms.cardinal, _desktop);
 
   if (old == _desktop) return;
-  
-  OBClient::List::iterator it, end = clients.end();
+
+  Client::List::iterator it, end = clients.end();
   for (it = clients.begin(); it != end; ++it) {
     if ((*it)->desktop() == old) {
       (*it)->frame->hide();
@@ -669,9 +672,13 @@ void OBScreen::changeDesktop(long desktop)
       (*it)->frame->show();
     }
   }
+
+  // force the callbacks to fire
+  if (!openbox->focusedClient())
+    openbox->setFocusedClient(0);
 }
 
-void OBScreen::changeNumDesktops(long num)
+void Screen::changeNumDesktops(long num)
 {
   assert(num > 0);
   
@@ -680,18 +687,17 @@ void OBScreen::changeNumDesktops(long num)
   // XXX: move windows on desktops that will no longer exist!
   
   _num_desktops = num;
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_number_of_desktops,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     _num_desktops);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_number_of_desktops,
+                     otk::Property::atoms.cardinal, _num_desktops);
 
   // set the viewport hint
   unsigned long *viewport = new unsigned long[_num_desktops * 2];
   memset(viewport, 0, sizeof(unsigned long) * _num_desktops * 2);
-  Openbox::instance->property()->set(_info->rootWindow(),
-                                     otk::OBProperty::net_desktop_viewport,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     viewport, _num_desktops * 2);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_desktop_viewport,
+                     otk::Property::atoms.cardinal,
+                     viewport, _num_desktops * 2);
   delete [] viewport;
 
   // update the work area hint
@@ -699,97 +705,83 @@ void OBScreen::changeNumDesktops(long num)
 }
 
 
-void OBScreen::updateDesktopNames()
+void Screen::updateDesktopNames()
 {
-  const otk::OBProperty *property = Openbox::instance->property();
-
   unsigned long num = (unsigned) -1;
   
-  if (!property->get(_info->rootWindow(),
-                     otk::OBProperty::net_desktop_names,
-                     otk::OBProperty::utf8, &num, &_desktop_names))
+  if (!otk::Property::get(_info->rootWindow(),
+                          otk::Property::atoms.net_desktop_names,
+                          otk::Property::utf8, &num, &_desktop_names))
     _desktop_names.clear();
   while ((long)_desktop_names.size() < _num_desktops)
     _desktop_names.push_back("Unnamed");
 }
 
 
-void OBScreen::setDesktopName(long i, const std::string &name)
+void Screen::setDesktopName(long i, const otk::ustring &name)
 {
   assert(i >= 0);
 
   if (i >= _num_desktops) return;
 
-  const otk::OBProperty *property = Openbox::instance->property();
-  
-  otk::OBProperty::StringVect newnames = _desktop_names;
+  otk::Property::StringVect newnames = _desktop_names;
   newnames[i] = name;
-  property->set(_info->rootWindow(), otk::OBProperty::net_desktop_names,
-                otk::OBProperty::utf8, newnames);
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_desktop_names,
+                     otk::Property::utf8, newnames);
 }
 
 
-void OBScreen::propertyHandler(const XPropertyEvent &e)
+void Screen::propertyHandler(const XPropertyEvent &e)
 {
-  otk::OtkEventHandler::propertyHandler(e);
-
-  const otk::OBProperty *property = Openbox::instance->property();
+  otk::EventHandler::propertyHandler(e);
 
   // compress changes to a single property into a single change
   XEvent ce;
-  while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+  while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
     // XXX: it would be nice to compress ALL changes to a property, not just
     //      changes in a row without other props between.
     if (ce.xproperty.atom != e.atom) {
-      XPutBackEvent(otk::OBDisplay::display, &ce);
+      XPutBackEvent(**otk::display, &ce);
       break;
     }
   }
 
-  if (e.atom == property->atom(otk::OBProperty::net_desktop_names)) 
+  if (e.atom == otk::Property::atoms.net_desktop_names)
     updateDesktopNames();
 }
 
 
-void OBScreen::clientMessageHandler(const XClientMessageEvent &e)
+void Screen::clientMessageHandler(const XClientMessageEvent &e)
 {
-  otk::OtkEventHandler::clientMessageHandler(e);
+  otk::EventHandler::clientMessageHandler(e);
 
   if (e.format != 32) return;
 
-  const otk::OBProperty *property = Openbox::instance->property();
-
-  if (e.message_type == property->atom(otk::OBProperty::net_current_desktop)) {
+  if (e.message_type == otk::Property::atoms.net_current_desktop) {
     changeDesktop(e.data.l[0]);
-  } else if (e.message_type ==
-             property->atom(otk::OBProperty::net_number_of_desktops)) {
+  } else if (e.message_type == otk::Property::atoms.net_number_of_desktops) {
     changeNumDesktops(e.data.l[0]);
   }
   // XXX: so many client messages to handle here! ..or not.. they go to clients
 }
 
 
-void OBScreen::mapRequestHandler(const XMapRequestEvent &e)
+void Screen::mapRequestHandler(const XMapRequestEvent &e)
 {
-  otk::OtkEventHandler::mapRequestHandler(e);
+  otk::EventHandler::mapRequestHandler(e);
 
 #ifdef    DEBUG
   printf("MapRequest for 0x%lx\n", e.window);
 #endif // DEBUG
 
-  /*
-    MapRequest events come here even after the window exists instead of going
-    right to the client window, because of how they are sent and their struct
-    layout.
-  */
-  OBClient *c = Openbox::instance->findClient(e.window);
-
+  Client *c = openbox->findClient(e.window);
   if (c) {
-    if (c->shaded())
-      c->shade(false);
-    // XXX: uniconify the window
-    c->focus();
+#ifdef DEBUG
+    printf("DEBUG: MAP REQUEST CAUGHT IN SCREEN. IGNORED.\n");
+#endif
   } else
     manageWindow(e.window);
 }
+
 }