]> Dogcows Code - chaz/openbox/blobdiff - src/screen.cc
only show prints for debug builds
[chaz/openbox] / src / screen.cc
index 26347539a5d4abbbb3daed5b40be910ff99db191..9ff1f2b7a14414ce24adbcb86d943edf8512f2b9 100644 (file)
@@ -9,6 +9,10 @@ extern "C" {
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
+#ifdef    HAVE_STRING_H
+#  include <string.h>
+#endif // HAVE_STRING_H
+
 #ifdef    HAVE_UNISTD_H
 #  include <sys/types.h>
 #  include <unistd.h>
@@ -22,7 +26,13 @@ extern "C" {
 #include "client.hh"
 #include "openbox.hh"
 #include "frame.hh"
+#include "bindings.hh"
+#include "python.hh"
 #include "otk/display.hh"
+#include "otk/property.hh"
+
+#include <vector>
+#include <algorithm>
 
 static bool running;
 static int anotherWMRunning(Display *display, XErrorEvent *) {
@@ -36,90 +46,133 @@ static int anotherWMRunning(Display *display, XErrorEvent *) {
 namespace ob {
 
 
-OBScreen::OBScreen(int screen, const otk::Configuration &config)
-  : _number(screen),
-    _root(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->getRootWindow(),
-               OBScreen::event_mask);
-  XSync(otk::OBDisplay::display, false);
+  XSelectInput(**otk::display, _info->rootWindow(),
+               Screen::event_mask);
+  XSync(**otk::display, false);
   XSetErrorHandler(old);
 
   _managed = !::running;
   if (! _managed) return; // was unable to manage the screen
 
+#ifdef DEBUG
   printf(_("Managing screen %d: visual 0x%lx, depth %d\n"),
-         _number, XVisualIDFromVisual(_info->getVisual()), _info->getDepth());
+         _number, XVisualIDFromVisual(_info->visual()), _info->depth());
+#endif
 
-  Openbox::instance->property()->set(_info->getRootWindow(),
-                                     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->getRootWindow(),
-                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);
-  _style.load(config);
+  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.c_str()));
+  if (!sconfig.load()) {
+    sconfig.setFile(otk::expandTilde(DEFAULTSTYLE));
+    if (!sconfig.load()) {
+      printf(_("Unable to load default style: %s. Aborting.\n"), DEFAULTSTYLE);
+      ::exit(1);
+    }
+  }
+  _style.load(sconfig);
+  */
+  otk::display->renderControl(_number)->drawRoot(*_style.rootColor());
+
+  // set up notification of netwm support
+  changeSupportedAtoms();
+
+  // Set the netwm properties for geometry
+  unsigned long geometry[] = { _info->width(),
+                               _info->height() };
+  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<otk::ustring> names;
+  python_get_stringlist("DESKTOP_NAMES", &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
+
+  _desktop = 0;
+  
+  if (!python_get_long("NUMBER_OF_DESKTOPS", &_num_desktops))
+    _num_desktops = 1;
+  changeNumDesktops(_num_desktops); // set the hint
+
+  changeDesktop(0); // set the hint
+
+  // create the window which gets focus when no clients get it
+  XSetWindowAttributes attr;
+  attr.override_redirect = true;
+  _focuswindow = XCreateWindow(**otk::display, _info->rootWindow(),
+                               -100, -100, 1, 1, 0, 0, InputOnly,
+                               _info->visual(), CWOverrideRedirect, &attr);
+  XMapRaised(**otk::display, _focuswindow);
   
-  // Set the netwm atoms for geomtery and viewport
-  unsigned long geometry[] = { _info->getWidth(),
-                               _info->getHeight() };
-  Openbox::instance->property()->set(_info->getRootWindow(),
-                                     otk::OBProperty::net_desktop_geometry,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     geometry, 2);
-  unsigned long viewport[] = { 0, 0 };
-  Openbox::instance->property()->set(_info->getRootWindow(),
-                                     otk::OBProperty::net_desktop_viewport,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     viewport, 2);
-
   // these may be further updated if any pre-existing windows are found in
   // the manageExising() function
-  setClientList();     // initialize the client lists, which will be empty
+  changeClientList();  // initialize the client lists, which will be empty
   calcArea();          // initialize the available working area
+
+  // register this class as the event handler for the root window
+  openbox->registerHandler(_info->rootWindow(), this);
+
+  // call the python Startup callbacks
+  EventData data(_number, 0, EventAction::Startup, 0);
+  openbox->bindings()->fireEvent(&data);
 }
 
 
-OBScreen::~OBScreen()
+Screen::~Screen()
 {
   if (! _managed) return;
 
+  XSelectInput(**otk::display, _info->rootWindow(), NoEventMask);
+  
   // unmanage all windows
-  while (!_clients.empty())
-    unmanageWindow(_clients.front());
+  while (!clients.empty())
+    unmanageWindow(clients.front());
 
-  delete _image_control;
+  // call the python Shutdown callbacks
+  EventData data(_number, 0, EventAction::Shutdown, 0);
+  openbox->bindings()->fireEvent(&data);
+
+  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->getRootWindow(), &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) {
@@ -143,7 +196,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) {
@@ -156,21 +209,23 @@ void OBScreen::manageExisting()
 }
 
 
-//! Adds a window's strut to the screen's list of reserved spaces
-void OBScreen::addStrut(otk::Strut *strut)
-{
-  _struts.push_back(strut);
-}
-
-
-//! Removes a window's strut from the screen's list of reserved spaces
-void OBScreen::removeStrut(otk::Strut *strut)
+void Screen::updateStrut()
 {
-  _struts.remove(strut);
+  _strut.left = _strut.right = _strut.top = _strut.bottom = 0;
+
+  ClientList::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);
+    _strut.right = std::max(_strut.right, s.right);
+    _strut.top = std::max(_strut.top, s.top);
+    _strut.bottom = std::max(_strut.bottom, s.bottom);
+  }
+  calcArea();
 }
 
 
-void OBScreen::calcArea()
+void Screen::calcArea()
 {
   otk::Rect old_area = _area;
 
@@ -182,31 +237,9 @@ void OBScreen::calcArea()
 #endif // XINERAMA
 */
   
-  /* these values represent offsets from the screen edge
-   * we look for the biggest offset on each edge and then apply them
-   * all at once
-   * do not be confused by the similarity to the names of Rect's members
-   */
-  unsigned int current_left = 0, current_right = 0, current_top = 0,
-    current_bottom = 0;
-
-  StrutList::const_iterator it = _struts.begin(), end = _struts.end();
-
-  for(; it != end; ++it) {
-    otk::Strut *strut = *it;
-    if (strut->left > current_left)
-      current_left = strut->left;
-    if (strut->top > current_top)
-      current_top = strut->top;
-    if (strut->right > current_right)
-      current_right = strut->right;
-    if (strut->bottom > current_bottom)
-      current_bottom = strut->bottom;
-  }
-
-  _area.setRect(current_left, current_top,
-                _info->getWidth() - (current_left + current_right),
-                _info->getHeight() - (current_top + current_bottom));
+  _area.setRect(_strut.left, _strut.top,
+                _info->width() - (_strut.left + _strut.right),
+                _info->height() - (_strut.top + _strut.bottom));
 
 /*
 #ifdef    XINERAMA
@@ -230,213 +263,608 @@ void OBScreen::calcArea()
   }
 #endif // XINERAMA
 */
-  
-  if (old_area != _area)
-    // XXX: re-maximize windows
+  if (old_area != _area) {
+    // the area has changed, adjust all the maximized windows
+    ClientList::iterator it, end = clients.end();
+    for (it = clients.begin(); it != end; ++it)
+      (*it)->remaximize();
+  }
 
-  setWorkArea();
+  changeWorkArea();
 }
 
 
-void OBScreen::setClientList()
+void Screen::changeSupportedAtoms()
+{
+  // create the netwm support window
+  _supportwindow = XCreateSimpleWindow(**otk::display,
+                                       _info->rootWindow(),
+                                       0, 0, 1, 1, 0, 0, 0);
+
+  // set supporting window
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_supporting_wm_check,
+                     otk::Property::atoms.window, _supportwindow);
+
+  //set properties on the supporting window
+  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::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::Property::atoms.net_wm_desktop,
+*/
+    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::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::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);
+
+  otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_supported,
+                     otk::Property::atoms.atom, supported, num_supported);
+}
+
+
+void Screen::changeClientList()
 {
   Window *windows;
+  unsigned int size = clients.size();
 
   // create an array of the window ids
-  if (_clients.size() > 0) {
+  if (size > 0) {
     Window *win_it;
     
-    windows = new Window[_clients.size()];
+    windows = new Window[size];
     win_it = windows;
-    ClientList::const_iterator it = _clients.begin();
-    const ClientList::const_iterator end = _clients.end();
+    ClientList::const_iterator it = clients.begin();
+    const ClientList::const_iterator end = clients.end();
     for (; it != end; ++it, ++win_it)
       *win_it = (*it)->window();
   } else
     windows = (Window*) 0;
 
-  Openbox::instance->property()->set(_info->getRootWindow(),
-                                     otk::OBProperty::net_client_list,
-                                     otk::OBProperty::Atom_Window,
-                                     windows, _clients.size());
+  otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_client_list,
+                     otk::Property::atoms.window, windows, size);
 
-  if (_clients.size())
+  if (size)
     delete [] windows;
 
-  setStackingList();
+  changeStackingList();
 }
 
 
-void OBScreen::setStackingList()
+void Screen::changeStackingList()
 {
-  // The below comment is wrong now hopefully :> but ill keep it here for
-  // reference anyways
-  /*
-    Get the stacking order from all of the workspaces.
-    We start with the current workspace so that the sticky windows will be
-    in the right order on the current workspace.
-  */
-  /*
-  Openbox::instance->property()->set(_info->getRootWindow(),
-                                     otk::OBProperty::net_client_list_stacking,
-                                     otk::OBProperty::Atom_Window,
-                                     _stacking, _stacking.size());
-  */
-}
+  Window *windows;
+  unsigned int size = _stacking.size();
 
+  assert(size == clients.size()); // just making sure.. :)
 
-void OBScreen::setWorkArea() {
-  unsigned long area[] = { _area.x(), _area.y(),
-                           _area.width(), _area.height() };
-  Openbox::instance->property()->set(_info->getRootWindow(),
-                                     otk::OBProperty::net_workarea,
-                                     otk::OBProperty::Atom_Cardinal,
-                                     area, 4);
-  /*
-  if (workspacesList.size() > 0) {
-    unsigned long *dims = new unsigned long[4 * workspacesList.size()];
-    for (unsigned int i = 0, m = workspacesList.size(); i < m; ++i) {
-      // XXX: this could be different for each workspace
-      const otk::Rect &area = availableArea();
-      dims[(i * 4) + 0] = area.x();
-      dims[(i * 4) + 1] = area.y();
-      dims[(i * 4) + 2] = area.width();
-      dims[(i * 4) + 3] = area.height();
-    }
-    xatom->set(getRootWindow(), otk::OBProperty::net_workarea,
-               otk::OBProperty::Atom_Cardinal,
-               dims, 4 * workspacesList.size());
-    delete [] dims;
+  
+  // 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;
+    ClientList::const_reverse_iterator it = _stacking.rbegin();
+    const ClientList::const_reverse_iterator end = _stacking.rend();
+    for (; it != end; ++it, ++win_it)
+      *win_it = (*it)->window();
   } else
-    xatom->set(getRootWindow(), otk::OBProperty::net_workarea,
-               otk::OBProperty::Atom_Cardinal, 0, 0);
-  */
-}
+    windows = (Window*) 0;
 
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_client_list_stacking,
+                     otk::Property::atoms.window, windows, size);
+
+  if (size)
+    delete [] windows;
+}
 
-void OBScreen::loadStyle(const otk::Configuration &config)
-{
-  _style.load(config);
 
-  // XXX: make stuff redraw!
+void Screen::changeWorkArea() {
+  unsigned long *dims = new unsigned long[4 * _num_desktops];
+  for (long i = 0; i < _num_desktops; ++i) {
+    dims[(i * 4) + 0] = _area.x();
+    dims[(i * 4) + 1] = _area.y();
+    dims[(i * 4) + 2] = _area.width();
+    dims[(i * 4) + 3] = _area.height();
+  }
+  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;
+  XEvent e;
+  XWindowAttributes attrib;
+
+  otk::display->grab();
 
+  // check if it has already been unmapped by the time we started mapping
+  // the grab does a sync so we don't have to here
+  if (XCheckTypedWindowEvent(**otk::display, window, DestroyNotify, &e) ||
+      XCheckTypedWindowEvent(**otk::display, window, UnmapNotify, &e)) {
+    XPutBackEvent(**otk::display, &e);
+    
+    otk::display->ungrab();
+    return; // don't manage it
+  }
+  
+  if (!XGetWindowAttributes(**otk::display, window, &attrib) ||
+      attrib.override_redirect) {
+    otk::display->ungrab();
+    return; // don't manage it
+  }
+  
   // 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->getWindow(), 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);
-
-  // XXX: if on the current desktop..
-  client->frame->show();
-  // XXX: handle any requested states such as shaded/maximized
+  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) {
+    // position the window intelligenty .. hopefully :)
+    // call the python PLACEWINDOW binding
+    EventData data(_number, client, EventAction::PlaceWindow, 0);
+    openbox->bindings()->fireEvent(&data);
+  }
+
+  EventData ddata(_number, client, EventAction::DisplayingWindow, 0);
+  openbox->bindings()->fireEvent(&ddata);
+
+  // if on the current desktop.. (or all desktops)
+  if (client->desktop() == _desktop ||
+      client->desktop() == (signed)0xffffffff) {
+    client->frame->show();
+  }
+
+  client->applyStartupState();
 
-  otk::OBDisplay::ungrab();
+  otk::display->ungrab();
 
   // add to the screen's list
-  _clients.push_back(client);
+  clients.push_back(client);
+  // once the client is in the list, update our strut to include the new
+  // client's (it is good that this happens after window placement!)
+  updateStrut();
+  // this puts into the stacking order, then raises it
+  _stacking.push_back(client);
+  raiseWindow(client);
   // update the root properties
-  setClientList();
+  changeClientList();
+
+  openbox->bindings()->grabButtons(true, client);
+
+  EventData ndata(_number, client, EventAction::NewWindow, 0);
+  openbox->bindings()->fireEvent(&ndata);
+
+#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(_number, client, EventAction::CloseWindow, 0);
+  openbox->bindings()->fireEvent(&data);
 
-  // XXX: pass around focus if this window was focused
+  openbox->bindings()->grabButtons(false, client);
 
   // remove from the wm's map
-  Openbox::instance->removeClient(client->window());
-  Openbox::instance->removeClient(frame->getWindow());
-  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);
+  clients.remove(client);
+
+  // once the client is out of the list, update our strut to remove it's
+  // influence
+  updateStrut();
+
+  // unset modal before dropping our focus
+  client->setModal(false);
+  
+  // 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
-  setClientList();
+  changeClientList();
+}
+
+void Screen::lowerWindow(Client *client)
+{
+  Window wins[2];  // only ever restack 2 windows.
+
+  assert(!_stacking.empty()); // this would be bad
+
+  ClientList::iterator it = --_stacking.end();
+  const ClientList::iterator end = _stacking.begin();
+
+  if (client->modal() && client->transientFor()) {
+    // don't let a modal window lower below its transient_for
+    it = std::find(_stacking.begin(), _stacking.end(), client->transientFor());
+    assert(it != _stacking.end());
+
+    wins[0] = (it == _stacking.begin() ? _focuswindow :
+               ((*(--ClientList::const_iterator(it)))->frame->window()));
+    wins[1] = client->frame->window();
+    if (wins[0] == wins[1]) return; // already right above the window
+
+    _stacking.remove(client);
+    _stacking.insert(it, client);
+  } else {
+    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);
+  }
+
+  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);
+  
+  ClientList::iterator it = _stacking.begin();
+  const ClientList::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 :
+             ((*(--ClientList::const_iterator(it)))->frame->window()));
+  wins[1] = client->frame->window();
+
+  _stacking.insert(it, client);
+
+  XRestackWindows(**otk::display, wins, 2);
+
+  // if the window has a modal child, then raise it after us to put it on top
+  if (client->modalChild())
+    raiseWindow(client->modalChild());
+  else
+    changeStackingList(); // no need to do this twice!
+}
+
+void Screen::changeDesktop(long desktop)
+{
+  if (!(desktop >= 0 && desktop < _num_desktops)) return;
+
+  printf("Moving to desktop %ld\n", desktop);
+  
+  long old = _desktop;
+  
+  _desktop = desktop;
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_current_desktop,
+                     otk::Property::atoms.cardinal, _desktop);
+
+  if (old == _desktop) return;
+
+  ClientList::iterator it, end = clients.end();
+  for (it = clients.begin(); it != end; ++it) {
+    if ((*it)->desktop() == old) {
+      (*it)->frame->hide();
+    } else if ((*it)->desktop() == _desktop) {
+      (*it)->frame->show();
+    }
+  }
+
+  // force the callbacks to fire
+  if (!openbox->focusedClient())
+    openbox->setFocusedClient(0);
+}
+
+void Screen::changeNumDesktops(long num)
+{
+  assert(num > 0);
+  
+  if (!(num > 0)) return;
+
+  // move windows on desktops that will no longer exist!
+  ClientList::iterator it, end = clients.end();
+  for (it = clients.begin(); it != end; ++it) {
+    int d = (*it)->desktop();
+    if (d >= num && !(d == (signed) 0xffffffff ||
+                      d == Client::ICONIC_DESKTOP)) {
+      XEvent ce;
+      ce.xclient.type = ClientMessage;
+      ce.xclient.message_type = otk::Property::atoms.net_wm_desktop;
+      ce.xclient.display = **otk::display;
+      ce.xclient.window = (*it)->window();
+      ce.xclient.format = 32;
+      ce.xclient.data.l[0] = num - 1;
+      XSendEvent(**otk::display, _info->rootWindow(), False,
+                 SubstructureNotifyMask | SubstructureRedirectMask, &ce);
+    }
+  }
+
+  _num_desktops = num;
+  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);
+  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
+  changeWorkArea();
+
+  // change our desktop if we're on one that no longer exists!
+  if (_desktop >= num)
+    changeDesktop(num - 1);
+}
+
+
+void Screen::updateDesktopNames()
+{
+  unsigned long num = (unsigned) -1;
+  
+  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 Screen::setDesktopName(long i, const otk::ustring &name)
+{
+  assert(i >= 0);
+
+  if (i >= _num_desktops) return;
+
+  otk::Property::StringVect newnames = _desktop_names;
+  newnames[i] = name;
+  otk::Property::set(_info->rootWindow(),
+                     otk::Property::atoms.net_desktop_names,
+                     otk::Property::utf8, newnames);
+}
+
+
+void Screen::installColormap(bool install) const
+{
+  if (install)
+    XInstallColormap(**otk::display, _info->colormap());
+  else
+    XUninstallColormap(**otk::display, _info->colormap());
+}
+
+
+void Screen::propertyHandler(const XPropertyEvent &e)
+{
+  otk::EventHandler::propertyHandler(e);
+
+  // compress changes to a single property into a single change
+  XEvent ce;
+  while (XCheckTypedWindowEvent(**otk::display, _info->rootWindow(),
+                                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::display, &ce);
+      break;
+    }
+  }
+
+  if (e.atom == otk::Property::atoms.net_desktop_names)
+    updateDesktopNames();
+}
+
+
+void Screen::clientMessageHandler(const XClientMessageEvent &e)
+{
+  otk::EventHandler::clientMessageHandler(e);
+
+  if (e.format != 32) return;
+
+  if (e.message_type == otk::Property::atoms.net_current_desktop) {
+    changeDesktop(e.data.l[0]);
+  } else if (e.message_type == otk::Property::atoms.net_number_of_desktops) {
+    changeNumDesktops(e.data.l[0]);
+  }
+}
+
+
+void Screen::mapRequestHandler(const XMapRequestEvent &e)
+{
+  otk::EventHandler::mapRequestHandler(e);
+
+#ifdef    DEBUG
+  printf("MapRequest for 0x%lx\n", e.window);
+#endif // DEBUG
+
+  Client *c = openbox->findClient(e.window);
+  if (c) {
+#ifdef DEBUG
+    printf("DEBUG: MAP REQUEST CAUGHT IN SCREEN. IGNORED.\n");
+#endif
+  } else
+    manageWindow(e.window);
 }
 
 }
This page took 0.045256 seconds and 4 git commands to generate.