X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=6eaa5cc577190461a0ca2fd6022b5705ddfe758e;hb=8cbabdcb93a61110a111f77d6f0f51cf3f6dd834;hp=17a8c225849c875f717f4a658496ecf2eb947ccb;hpb=059bc4dc24b68d637c3608c05344c53c64cc2c4b;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index 17a8c225..6eaa5cc5 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -10,6 +10,7 @@
 #include "python.hh"
 #include "otk/display.hh"
 #include "otk/property.hh"
+#include "otk/util.hh"
 
 extern "C" {
 #ifdef    HAVE_UNISTD_H
@@ -68,8 +69,9 @@ Screen::Screen(int screen)
 
   // initialize the screen's style
   otk::RenderStyle::setStyle(_number, _config.theme);
-  otk::display->renderControl(_number)->
-    drawRoot(*otk::RenderStyle::style(_number)->rootColor());
+  // draw the root window
+  otk::bexec("obsetroot " + otk::RenderStyle::style(_number)->rootArgs(),
+             _info->displayString());
 
   // set up notification of netwm support
   changeSupportedAtoms();
@@ -669,7 +671,7 @@ void Screen::unmanageWindow(Client *client)
   client->_modal = false;
   
   // unfocus the client (calls the focus callbacks)
-  client->unfocus();
+  if (client->focused()) client->unfocus();
 
 #ifdef DEBUG
   printf("Unmanaged window 0x%lx frame 0x%lx\n", client->window(), framewin);