changeState after a setState request

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index d47a1540f83133130d2cf4e3e14c29e7c4914ba3..60208ef0aa9d4215d7ec0e3a2335a4d584772115 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -520,8 +520,8 @@ void Screen::manageWindow(Window window)
     openbox->bindings()->fireEvent(&data);
   }
 
-  EventData data(_number, client, EventAction::DisplayingWindow, 0);
-  openbox->bindings()->fireEvent(&data);
+  EventData ddata(_number, client, EventAction::DisplayingWindow, 0);
+  openbox->bindings()->fireEvent(&ddata);
 
   // if on the current desktop.. (or all desktops)
   if (client->desktop() == _desktop ||
@@ -546,8 +546,8 @@ void Screen::manageWindow(Window window)
 
   openbox->bindings()->grabButtons(true, client);
 
-  EventData data(_number, client, EventAction::NewWindow, 0);
-  openbox->bindings()->fireEvent(&data);
+  EventData ndata(_number, client, EventAction::NewWindow, 0);
+  openbox->bindings()->fireEvent(&ndata);
 
 #ifdef DEBUG
   printf("Managed window 0x%lx frame 0x%lx\n",
@@ -608,6 +608,10 @@ void Screen::unmanageWindow(Client *client)
   // remove from the screen's list
   clients.remove(client);
 
+  // once the client is out of the list, update our strut to remove it's
+  // influence
+  updateStrut();
+
   // unfocus the client (calls the focus callbacks)
   client->unfocus();