configure request optimizations

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index 18105f2a847a05faf1bec34bcfa6d649b6c45e7d..d50ef6a32a40178db2a3fc3eee4d02f9e6fc5885 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -93,7 +93,7 @@ OBScreen::OBScreen(int screen)
   // set up notification of netwm support
   setSupportedAtoms();
 
-  // Set the netwm atoms for geomtery and viewport
+  // Set the netwm properties for geometry and viewport
   unsigned long geometry[] = { _info->width(),
                                _info->height() };
   Openbox::instance->property()->set(_info->rootWindow(),
@@ -106,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;
@@ -304,9 +309,7 @@ void OBScreen::setSupportedAtoms()
       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,
@@ -361,7 +364,8 @@ void OBScreen::setSupportedAtoms()
 
   // convert to the atom values
   for (int i = 0; i < num_supported; ++i)
-    supported[i] = Openbox::instance->property()->atom(supported[i]);
+    supported[i] =
+      Openbox::instance->property()->atom((otk::OBProperty::Atoms)supported[i]);
   
   Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_supported,
@@ -522,7 +526,7 @@ 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();