X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=bebc82d17705d59763ed827038b478b4e4e3d9b4;hb=7bae794382c7a64a6427b16d1339b98120a5166f;hp=7e9d0ea0b15bec5c9d69855a174d7262fcc109b0;hpb=f7e3eb57294f9e73da2e342b503ca360485ae130;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index 7e9d0ea0..bebc82d1 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -23,8 +23,12 @@ extern "C" {
 #include "openbox.hh"
 #include "frame.hh"
 #include "bindings.hh"
+#include "python.hh"
 #include "otk/display.hh"
 
+#include <vector>
+#include <algorithm>
+
 static bool running;
 static int anotherWMRunning(Display *display, XErrorEvent *) {
   printf(_("Another window manager already running on display %s.\n"),
@@ -37,7 +41,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)
 {
@@ -74,10 +78,23 @@ 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
+  // 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(),
@@ -90,6 +107,11 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config)
                                      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;
@@ -109,10 +131,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;
 }
 
@@ -165,17 +192,19 @@ 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 OBScreen::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();
 }
 
 
@@ -191,31 +220,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->width() - (current_left + current_right),
-                _info->height() - (current_top + current_bottom));
+  _area.setRect(_strut.left, _strut.top,
+                _info->width() - (_strut.left + _strut.right),
+                _info->height() - (_strut.top + _strut.bottom));
 
 /*
 #ifdef    XINERAMA
@@ -247,15 +254,115 @@ 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();
@@ -267,9 +374,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();
@@ -278,19 +385,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;
 }
 
 
@@ -323,14 +443,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;
@@ -393,17 +505,19 @@ void OBScreen::manageWindow(Window window)
   // XXX: if on the current desktop..
   client->frame->show();
  
-  // XXX: handle any requested states such as shaded/maximized
+  // XXX: handle any requested states such as maximized
 
   otk::OBDisplay::ungrab();
 
   // 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();
 
-  // grab buttons on the window
-  Openbox::instance->bindings()->grabMouse(true, client);
+  Openbox::instance->bindings()->grabButtons(true, client);
 }
 
 
@@ -411,10 +525,19 @@ void OBScreen::unmanageWindow(OBClient *client)
 {
   OBFrame *frame = client->frame;
 
-  // ungrab buttons on the window
-  Openbox::instance->bindings()->grabMouse(false, client);
+  Openbox::instance->bindings()->grabButtons(false, client);
 
-  // XXX: pass around focus if this window was focused
+  // 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());
@@ -454,4 +577,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();
+}
+
 }