this might fix focusLast which was previously borken when closing a window and the...

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index de66ac236345b9797e7d0f237c893dcbb76f2174..538cfbeda95e3112c6e6c5fff6252cd7c264b968 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -134,7 +134,7 @@ void client_set_list()
 }
 
 /*
-  void client_foreach_transient(ObClient *self, ObClientForeachFunc func, void *data)
+  void client_foreach_transient(ObClient *self, ObClientForeachFunc func, gpointer data)
   {
   GSList *it;
 
@@ -144,7 +144,7 @@ void client_set_list()
   }
   }
 
-  void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, void *data)
+  void client_foreach_ancestor(ObClient *self, ObClientForeachFunc func, gpointer data)
   {
   if (self->transient_for) {
   if (self->transient_for != OB_TRAN_GROUP) {
@@ -415,6 +415,10 @@ void client_unmanage(ObClient *self)
     keyboard_grab_for_client(self, FALSE);
     mouse_grab_for_client(self, FALSE);
 
+    /* potentially fix focusLast */
+    if (config_focus_last)
+        grab_pointer(TRUE, OB_CURSOR_NONE);
+
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, self->window, SetModeDelete);
 
@@ -518,6 +522,9 @@ void client_unmanage(ObClient *self)
      
     /* update the list hints */
     client_set_list();
+
+    if (config_focus_last)
+        grab_pointer(FALSE, OB_CURSOR_NONE);
 }
 
 static void client_urgent_notify(ObClient *self)
@@ -720,6 +727,11 @@ static void client_get_all(ObClient *self)
     client_get_mwm_hints(self);
     client_get_type(self);/* this can change the mwmhints for special cases */
 
+    /* The transient hint is used to pick a type, but the type can also affect
+       transiency (dialogs are always made transients). This is Havoc's idea,
+       but it is needed to make some apps work right (eg tsclient). */
+    client_update_transient_for(self);
+
     client_get_state(self);
 
     {
@@ -928,6 +940,9 @@ void client_update_transient_for(ObClient *self)
                 }
             }
         }
+    } else if (self->type == OB_CLIENT_TYPE_DIALOG && self->group) {
+        self->transient = TRUE;
+        target = OB_TRAN_GROUP;
     } else
         self->transient = FALSE;