X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=fcbe2ea6a4991dae3115e0b7f97ae9af84fa77bf;hb=c33ccf60cba94249b4a4d1e1832aa0ea0e28a22c;hp=80b9083d6992d5e2db1c2551272a2e68cdd21886;hpb=745e840547b5443ecfb9b6f0a4f14b0d035d59c2;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index 80b9083d..fcbe2ea6 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -23,8 +23,11 @@ extern "C" {
 #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"),
@@ -75,7 +78,7 @@ OBScreen::OBScreen(int screen)
   // initialize the screen's style
   _style.setImageControl(_image_control);
   std::string stylepath;
-  Openbox::instance->getConfigString("theme", &stylepath);
+  python_get_string("theme", &stylepath);
   otk::Configuration sconfig(false);
   sconfig.setFile(otk::expandTilde(stylepath));
   if (!sconfig.load()) {
@@ -86,8 +89,11 @@ OBScreen::OBScreen(int screen)
     }
   }
   _style.load(sconfig);
-  
-  // Set the netwm atoms for geomtery and viewport
+
+  // set up notification of netwm support
+  setSupportedAtoms();
+
+  // Set the netwm properties for geometry and viewport
   unsigned long geometry[] = { _info->width(),
                                _info->height() };
   Openbox::instance->property()->set(_info->rootWindow(),
@@ -100,6 +106,11 @@ OBScreen::OBScreen(int screen)
                                      otk::OBProperty::Atom_Cardinal,
                                      viewport, 2);
 
+  // Set the net_desktop_names property
+  std::vector<std::string> names;
+  python_get_stringlist("desktop_names", &names);
+  _root.setDesktopNames(names);
+  
   // create the window which gets focus when no clients get it
   XSetWindowAttributes attr;
   attr.override_redirect = true;
@@ -119,10 +130,15 @@ OBScreen::~OBScreen()
 {
   if (! _managed) return;
 
+  XSelectInput(otk::OBDisplay::display, _info->rootWindow(), NoEventMask);
+  
   // unmanage all windows
   while (!clients.empty())
     unmanageWindow(clients.front());
 
+  XDestroyWindow(otk::OBDisplay::display, _focuswindow);
+  XDestroyWindow(otk::OBDisplay::display, _supportwindow);
+
   delete _image_control;
 }
 
@@ -257,15 +273,117 @@ void OBScreen::calcArea()
 }
 
 
+void OBScreen::setSupportedAtoms()
+{
+  // create the netwm support window
+  _supportwindow = XCreateSimpleWindow(otk::OBDisplay::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);
+
+  //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);
+
+  
+  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::OBProperty::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::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::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,
+    };
+  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);
+}
+
+
 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();
@@ -277,9 +395,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();
@@ -288,19 +406,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;
 }
 
 
@@ -401,8 +532,13 @@ void OBScreen::manageWindow(Window window)
 
   // 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);
   // update the root properties
   setClientList();
+
+  Openbox::instance->bindings()->grabButtons(true, client);
 }
 
 
@@ -410,7 +546,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());
@@ -450,4 +598,31 @@ void OBScreen::unmanageWindow(OBClient *client)
   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();
+}
+
 }