show [Not Responding] in the titlebar when closing an app and it stops responding...

diff --git a/openbox/client.c b/openbox/client.c
index 0f592ebe72df9595c79d22840252039f124cf171..a4d045dcd0903bb0bddb240e5b556a40421a90c2 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -40,6 +40,7 @@
 #include "keyboard.h"
 #include "mouse.h"
 #include "render/render.h"
+#include "gettext.h"
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
@@ -93,6 +94,7 @@ static GSList *client_search_all_top_parents_internal(ObClient *self,
                                                       gboolean bylayer,
                                                       ObStackingLayer layer);
 static void client_call_notifies(ObClient *self, GSList *list);
+static void client_ping_event(ObClient *self, gboolean dead);
 
 
 void client_startup(gboolean reconfig)
@@ -1947,6 +1949,12 @@ void client_update_title(ObClient *self)
     } else
         visible = data;
 
+    if (self->not_responding) {
+        data = visible;
+        visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
+        g_free(data);
+    }
+
     PROP_SETS(self->window, net_wm_visible_name, visible);
     self->title = visible;
 
@@ -1970,6 +1978,12 @@ void client_update_title(ObClient *self)
     } else
         visible = data;
 
+    if (self->not_responding) {
+        data = visible;
+        visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
+        g_free(data);
+    }
+
     PROP_SETS(self->window, net_wm_visible_icon_name, visible);
     self->icon_title = visible;
 }
@@ -3168,10 +3182,8 @@ void client_shade(ObClient *self, gboolean shade)
 
 static void client_ping_event(ObClient *self, gboolean dead)
 {
-    if (dead)
-        ob_debug("client 0x%x window 0x%x is not responding !!\n");
-    else
-        ob_debug("client 0x%x window 0x%x started responding again..\n");
+    self->not_responding = dead;
+    client_update_title(self);
 }
 
 void client_close(ObClient *self)
@@ -3195,7 +3207,8 @@ void client_close(ObClient *self)
                 prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
                 NoEventMask);
 
-    ping_start(self, client_ping_event);
+    if (self->ping)
+        ping_start(self, client_ping_event);
 }
 
 void client_kill(ObClient *self)

diff --git a/openbox/client.h b/openbox/client.h
index 49ff72bcdc204599963c1d76a7cf66047c43e0bd..672b3822f60d997091140e9294fbcc8c0aa812df 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -222,6 +222,9 @@ struct _ObClient
 
     /*! Will the client respond to pings? */
     gboolean ping;
+    /*! Indicates if the client is trying to close but has stopped responding
+      to pings */
+    gboolean not_responding;
 
 #ifdef SYNC
     /*! The client wants to sync during resizes */

diff --git a/openbox/ping.c b/openbox/ping.c
index d8c10c833ea518148bcc615863b567c091f3a75a..687dd7f48461baef99b04012d5959bf7494038dd 100644 (file)
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -48,6 +48,8 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h)
     GSList *it;
     ObPingTarget *t;
 
+    g_assert(client->ping == TRUE);
+
     /* make sure we're not already pinging it */
     for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
         t = it->data;