X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=f38a38fc2fab25ae2571689ecc418992034d597c;hb=126d9fc846adfc6aee3d4cdd566f9b712b82f98c;hp=01abd83c0c341a7f7deadf026bd7db5cda8d7d4b;hpb=9860b76c50e5ecacc85921539058eab4c655c38d;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index 01abd83c..f38a38fc 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -22,8 +22,12 @@ extern "C" {
 #include "client.hh"
 #include "openbox.hh"
 #include "frame.hh"
+#include "bindings.hh"
+#include "python.hh"
 #include "otk/display.hh"
 
+#include <vector>
+
 static bool running;
 static int anotherWMRunning(Display *display, XErrorEvent *) {
   printf(_("Another window manager already running on display %s.\n"),
@@ -36,7 +40,7 @@ static int anotherWMRunning(Display *display, XErrorEvent *) {
 namespace ob {
 
 
-OBScreen::OBScreen(int screen, const otk::Configuration &config)
+OBScreen::OBScreen(int screen)
   : _number(screen),
     _root(screen)
 {
@@ -45,7 +49,7 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config)
 
   ::running = false;
   XErrorHandler old = XSetErrorHandler(::anotherWMRunning);
-  XSelectInput(otk::OBDisplay::display, _info->getRootWindow(),
+  XSelectInput(otk::OBDisplay::display, _info->rootWindow(),
                OBScreen::event_mask);
   XSync(otk::OBDisplay::display, false);
   XSetErrorHandler(old);
@@ -54,15 +58,15 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config)
   if (! _managed) return; // was unable to manage the screen
 
   printf(_("Managing screen %d: visual 0x%lx, depth %d\n"),
-         _number, XVisualIDFromVisual(_info->getVisual()), _info->getDepth());
+         _number, XVisualIDFromVisual(_info->visual()), _info->depth());
 
-  Openbox::instance->property()->set(_info->getRootWindow(),
+  Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::openbox_pid,
                                      otk::OBProperty::Atom_Cardinal,
                                      (unsigned long) getpid());
 
   // set the mouse cursor for the root window (the default cursor)
-  XDefineCursor(otk::OBDisplay::display, _info->getRootWindow(),
+  XDefineCursor(otk::OBDisplay::display, _info->rootWindow(),
                 Openbox::instance->cursors().session);
 
   // initialize the shit that is used for all drawing on the screen
@@ -73,22 +77,40 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config)
 
   // initialize the screen's style
   _style.setImageControl(_image_control);
-  _style.load(config);
+  std::string stylepath;
+  python_get_string("theme", &stylepath);
+  otk::Configuration sconfig(false);
+  sconfig.setFile(otk::expandTilde(stylepath));
+  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);
 
-  
   // Set the netwm atoms for geomtery and viewport
-  unsigned long geometry[] = { _info->getWidth(),
-                               _info->getHeight() };
-  Openbox::instance->property()->set(_info->getRootWindow(),
+  unsigned long geometry[] = { _info->width(),
+                               _info->height() };
+  Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_desktop_geometry,
                                      otk::OBProperty::Atom_Cardinal,
                                      geometry, 2);
   unsigned long viewport[] = { 0, 0 };
-  Openbox::instance->property()->set(_info->getRootWindow(),
+  Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_desktop_viewport,
                                      otk::OBProperty::Atom_Cardinal,
                                      viewport, 2);
 
+  // create the window which gets focus when no clients get it
+  XSetWindowAttributes attr;
+  attr.override_redirect = true;
+  _focuswindow = XCreateWindow(otk::OBDisplay::display, _info->rootWindow(),
+                               -100, -100, 1, 1, 0, 0, InputOnly,
+                               _info->visual(), CWOverrideRedirect, &attr);
+  XMapWindow(otk::OBDisplay::display, _focuswindow);
+  
   // 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
@@ -100,9 +122,13 @@ OBScreen::~OBScreen()
 {
   if (! _managed) return;
 
+  XSelectInput(otk::OBDisplay::display, _info->rootWindow(), NoEventMask);
+  
   // unmanage all windows
-  while (!_clients.empty())
-    unmanageWindow(_clients.front());
+  while (!clients.empty())
+    unmanageWindow(clients.front());
+
+  XDestroyWindow(otk::OBDisplay::display, _focuswindow);
 
   delete _image_control;
 }
@@ -112,7 +138,7 @@ void OBScreen::manageExisting()
 {
   unsigned int i, j, nchild;
   Window r, p, *children;
-  XQueryTree(otk::OBDisplay::display, _info->getRootWindow(), &r, &p,
+  XQueryTree(otk::OBDisplay::display, _info->rootWindow(), &r, &p,
              &children, &nchild);
 
   // preen the window list of all icon windows... for better dockapp support
@@ -205,8 +231,8 @@ void OBScreen::calcArea()
   }
 
   _area.setRect(current_left, current_top,
-                _info->getWidth() - (current_left + current_right),
-                _info->getHeight() - (current_top + current_bottom));
+                _info->width() - (current_left + current_right),
+                _info->height() - (current_top + current_bottom));
 
 /*
 #ifdef    XINERAMA
@@ -241,26 +267,27 @@ void OBScreen::calcArea()
 void OBScreen::setClientList()
 {
   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(),
+  Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_client_list,
                                      otk::OBProperty::Atom_Window,
-                                     windows, _clients.size());
+                                     windows, size);
 
-  if (_clients.size())
+  if (size)
     delete [] windows;
 
   setStackingList();
@@ -269,26 +296,39 @@ void OBScreen::setClientList()
 
 void OBScreen::setStackingList()
 {
-  // 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(),
+  Window *windows;
+  unsigned int size = _stacking.size();
+
+  assert(size == clients.size()); // just making sure.. :)
+
+  
+  // create an array of the window ids
+  if (size > 0) {
+    Window *win_it;
+    
+    windows = new Window[size];
+    win_it = windows;
+    ClientList::const_iterator it = _stacking.begin();
+    const ClientList::const_iterator end = _stacking.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_stacking,
                                      otk::OBProperty::Atom_Window,
-                                     _stacking, _stacking.size());
-  */
+                                     windows, size);
+
+  if (size)
+    delete [] windows;
 }
 
 
 void OBScreen::setWorkArea() {
   unsigned long area[] = { _area.x(), _area.y(),
                            _area.width(), _area.height() };
-  Openbox::instance->property()->set(_info->getRootWindow(),
+  Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_workarea,
                                      otk::OBProperty::Atom_Cardinal,
                                      area, 4);
@@ -314,14 +354,6 @@ void OBScreen::setWorkArea() {
 }
 
 
-void OBScreen::loadStyle(const otk::Configuration &config)
-{
-  _style.load(config);
-
-  // XXX: make stuff redraw!
-}
-
-
 void OBScreen::manageWindow(Window window)
 {
   OBClient *client = 0;
@@ -343,18 +375,19 @@ void OBScreen::manageWindow(Window window)
 
   // choose the events we want to receive on the CLIENT window
   attrib_set.event_mask = OBClient::event_mask;
-  attrib_set.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask |
-                                     ButtonMotionMask;
+  attrib_set.do_not_propagate_mask = OBClient::no_propagate_mask;
   XChangeWindowAttributes(otk::OBDisplay::display, window,
                           CWEventMask|CWDontPropagate, &attrib_set);
 
   // create the OBClient class, which gets all of the hints on the window
-  Openbox::instance->addClient(window, client = new OBClient(_number, window));
+  client = new OBClient(_number, window);
   // register for events
   Openbox::instance->registerHandler(window, client);
+  // add to the wm's map
+  Openbox::instance->addClient(window, client);
 
   // we dont want a border on the client
-  XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
+  client->toggleClientBorder(false);
   
   // specify that if we exit, the window should not be destroyed and should be
   // reparented back to root automatically
@@ -367,6 +400,19 @@ void OBScreen::manageWindow(Window window)
   // create the decoration frame for the client window
   client->frame = new OBFrame(client, &_style);
 
+  // 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);
+
   // XXX: if on the current desktop..
   client->frame->show();
  
@@ -375,9 +421,14 @@ void OBScreen::manageWindow(Window window)
   otk::OBDisplay::ungrab();
 
   // add to the screen's list
-  _clients.push_back(client);
+  clients.push_back(client);
+  // this puts into the stacking order, then raises it
+  _stacking.push_back(client);
+  restack(true, client);
   // update the root properties
   setClientList();
+
+  Openbox::instance->bindings()->grabButtons(true, client);
 }
 
 
@@ -385,8 +436,33 @@ void OBScreen::unmanageWindow(OBClient *client)
 {
   OBFrame *frame = client->frame;
 
-  // XXX: pass around focus if this window was focused
+  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;
+    if (!_stacking.empty())
+      newfocus = _stacking.front();
+    if (! (newfocus && newfocus->focus()))
+      client->unfocus();
+  }
 
+  // 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());
   // unregister for handling events
   Openbox::instance->clearHandler(client->window());
   
@@ -397,20 +473,46 @@ void OBScreen::unmanageWindow(OBClient *client)
   XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
 
   frame->hide();
-  
-  // we dont want a border on the client
-  XSetWindowBorderWidth(otk::OBDisplay::display, client->window(),
-                        client->borderWidth());
+
+  // give the client its border back
+  client->toggleClientBorder(true);
 
   delete client->frame;
   client->frame = 0;
 
   // remove from the screen's list
-  _clients.remove(client);
+  clients.remove(client);
   delete client;
 
   // update the root properties
   setClientList();
 }
 
+void OBScreen::restack(bool raise, OBClient *client)
+{
+  const int layer = client->layer();
+  std::vector<Window> wins;
+
+  _stacking.remove(client);
+
+  // the stacking list is from highest to lowest
+  
+  ClientList::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());
+  _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());
+  setStackingList();
+}
+
 }