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

diff --git a/src/screen.cc b/src/screen.cc
index 51e3aa16..01abd83c 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -21,6 +21,7 @@ extern "C" {
 #include "screen.hh"
 #include "client.hh"
 #include "openbox.hh"
+#include "frame.hh"
 #include "otk/display.hh"
 
 static bool running;
@@ -35,8 +36,9 @@ static int anotherWMRunning(Display *display, XErrorEvent *) {
 namespace ob {
 
 
-OBScreen::OBScreen(int screen)
-  : _number(screen)
+OBScreen::OBScreen(int screen, const otk::Configuration &config)
+  : _number(screen),
+    _root(screen)
 {
   assert(screen >= 0); assert(screen < ScreenCount(otk::OBDisplay::display));
   _info = otk::OBDisplay::screenInfo(screen);
@@ -62,18 +64,21 @@ OBScreen::OBScreen(int screen)
   // 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);
 
   
   // Set the netwm atoms for geomtery and viewport
-  unsigned long geometry[] = { _size.x(),
-                               _size.y() };
+  unsigned long geometry[] = { _info->getWidth(),
+                               _info->getHeight() };
   Openbox::instance->property()->set(_info->getRootWindow(),
                                      otk::OBProperty::net_desktop_geometry,
                                      otk::OBProperty::Atom_Cardinal,
@@ -88,10 +93,6 @@ OBScreen::OBScreen(int screen)
   // the manageExising() function
   setClientList();     // initialize the client lists, which will be empty
   calcArea();          // initialize the available working area
-
-  manageExisting();
-
-  // XXX: "change to" the first workspace to initialize stuff
 }
 
 
@@ -99,6 +100,10 @@ OBScreen::~OBScreen()
 {
   if (! _managed) return;
 
+  // unmanage all windows
+  while (!_clients.empty())
+    unmanageWindow(_clients.front());
+
   delete _image_control;
 }
 
@@ -142,7 +147,7 @@ void OBScreen::manageExisting()
       if (attrib.override_redirect) continue;
 
       if (attrib.map_state != IsUnmapped) {
-        // XXX: manageWindow(children[i]);
+        manageWindow(children[i]);
       }
     }
   }
@@ -312,11 +317,100 @@ void OBScreen::setWorkArea() {
 void OBScreen::loadStyle(const otk::Configuration &config)
 {
   _style.load(config);
-  if (Openbox::instance->state() == Openbox::State_Starting)
-    return;
 
   // XXX: make stuff redraw!
 }
 
 
+void OBScreen::manageWindow(Window window)
+{
+  OBClient *client = 0;
+  XWMHints *wmhint;
+  XSetWindowAttributes attrib_set;
+
+  // is the window a docking app
+  if ((wmhint = XGetWMHints(otk::OBDisplay::display, window))) {
+    if ((wmhint->flags & StateHint) &&
+        wmhint->initial_state == WithdrawnState) {
+      //slit->addClient(w); // XXX: make dock apps work!
+      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 = ButtonPressMask | ButtonReleaseMask |
+                                     ButtonMotionMask;
+  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));
+  // register for events
+  Openbox::instance->registerHandler(window, client);
+
+  // we dont want a border on the client
+  XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
+  
+  // 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
+  }
+
+  // create the decoration frame for the client window
+  client->frame = new OBFrame(client, &_style);
+
+  // XXX: if on the current desktop..
+  client->frame->show();
+ 
+  // XXX: handle any requested states such as shaded/maximized
+
+  otk::OBDisplay::ungrab();
+
+  // add to the screen's list
+  _clients.push_back(client);
+  // update the root properties
+  setClientList();
+}
+
+
+void OBScreen::unmanageWindow(OBClient *client)
+{
+  OBFrame *frame = client->frame;
+
+  // XXX: pass around focus if this window was focused
+
+  // unregister for handling events
+  Openbox::instance->clearHandler(client->window());
+  
+  // remove the window from our save set
+  XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete);
+
+  // we dont want events no more
+  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());
+
+  delete client->frame;
+  client->frame = 0;
+
+  // remove from the screen's list
+  _clients.remove(client);
+  delete client;
+
+  // update the root properties
+  setClientList();
+}
+
 }