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

diff --git a/src/screen.cc b/src/screen.cc
index 18c63327..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)
 {
@@ -73,9 +77,19 @@ 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->width(),
                                _info->height() };
@@ -89,6 +103,14 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config)
                                      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;
 }
@@ -241,15 +267,16 @@ 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
@@ -258,9 +285,9 @@ void OBScreen::setClientList()
   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,19 +296,32 @@ 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;
 }
 
 
@@ -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;
@@ -389,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);
 }
 
 
@@ -399,7 +436,19 @@ 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());
@@ -432,11 +481,38 @@ void OBScreen::unmanageWindow(OBClient *client)
   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();
+}
+
 }