X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fping.c;h=7cb47669988f036fbfcdfdaa26171ff582e0e415;hb=HEAD;hp=065cb60a8a6f3f39903653c1b8cd5713e14750ef;hpb=299687110d478a4928932f72031c345b27a01840;p=chaz%2Fopenbox

diff --git a/openbox/ping.c b/openbox/ping.c
index 065cb60a..7cb47669 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -19,38 +19,37 @@
 
 #include "ping.h"
 #include "client.h"
-#include "prop.h"
 #include "event.h"
 #include "debug.h"
-#include "mainloop.h"
 #include "openbox.h"
+#include "obt/prop.h"
 
 typedef struct _ObPingTarget
 {
     ObClient *client;
     ObPingEventHandler h;
     guint32 id;
+    guint loopid;
     gint waiting;
 } ObPingTarget;
 
-static GHashTable *ping_targets = NULL;
 static GHashTable *ping_ids     = NULL;
 static guint32     ping_next_id = 1;
 
-#define PING_TIMEOUT (G_USEC_PER_SEC * 3)
+#define PING_TIMEOUT 3000 /* in MS */
 /*! Warn the user after this many PING_TIMEOUT intervals */
-#define PING_TIMEOUT_WARN 3
+#define PING_TIMEOUT_WARN 2
 
 static void     ping_send(ObPingTarget *t);
 static void     ping_end(ObClient *client, gpointer data);
 static gboolean ping_timeout(gpointer data);
+static gboolean find_client(gpointer key, gpointer value, gpointer client);
 
 void ping_startup(gboolean reconfigure)
 {
     if (reconfigure) return;
 
-    ping_targets = g_hash_table_new(g_direct_hash, g_int_equal);
-    ping_ids = g_hash_table_new(g_direct_hash, g_int_equal);
+    ping_ids = g_hash_table_new(g_int_hash, g_int_equal);
 
     /* listen for clients to disappear */
     client_add_destroy_notify(ping_end, NULL);
@@ -60,8 +59,8 @@ void ping_shutdown(gboolean reconfigure)
 {
     if (reconfigure) return;
 
-    g_hash_table_unref(ping_targets);
     g_hash_table_unref(ping_ids);
+    ping_ids = NULL;
 
     client_remove_destroy_notify(ping_end);
 }
@@ -70,27 +69,25 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h)
 {
     ObPingTarget *t;
 
+    /* make sure the client supports ping! */
     g_assert(client->ping == TRUE);
 
-    /* make sure we're not already pinging it */
-    g_assert(g_hash_table_lookup(ping_targets, &client) == NULL);
+    /* make sure we're not already pinging the client */
+    if (g_hash_table_find(ping_ids, find_client, client) != NULL) return;
 
-    t = g_new0(ObPingTarget, 1);
+    t = g_slice_new0(ObPingTarget);
     t->client = client;
     t->h = h;
 
-    g_hash_table_insert(ping_targets, &t->client, t);
-
-    ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
-                             t, g_direct_equal, NULL);
+    t->loopid = g_timeout_add_full(G_PRIORITY_DEFAULT, PING_TIMEOUT,
+                                   ping_timeout, t, NULL);
     /* act like we just timed out immediately, to start the pinging process
-       now instead of after the first delay */
+       now instead of after the first delay.  this makes sure the client
+       ends up in the ping_ids hash table now. */
     ping_timeout(t);
-}
 
-void ping_stop(struct _ObClient *c)
-{
-    ping_end(c, NULL);
+    /* make sure we can remove the client later */
+    g_assert(g_hash_table_find(ping_ids, find_client, client) != NULL);
 }
 
 void ping_got_pong(guint32 id)
@@ -98,16 +95,25 @@ void ping_got_pong(guint32 id)
     ObPingTarget *t;
 
     if ((t = g_hash_table_lookup(ping_ids, &id))) {
-        /*g_print("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
+        /*ob_debug("-PONG: '%s' (id %u)", t->client->title, t->id);*/
         if (t->waiting > PING_TIMEOUT_WARN) {
             /* we had notified that they weren't responding, so now we
                need to notify that they are again */
             t->h(t->client, FALSE);
         }
         t->waiting = 0; /* not waiting for a reply anymore */
+
+        /* we got a pong so we're happy now */
+        ping_end(t->client, NULL);
     }
     else
-        ob_debug("Got PONG with id %u but not waiting for one\n", id);
+        ob_debug("Got PONG with id %u but not waiting for one", id);
+}
+
+static gboolean find_client(gpointer key, gpointer value, gpointer client)
+{
+    ObPingTarget *t = value;
+    return t->client == client;
 }
 
 static void ping_send(ObPingTarget *t)
@@ -124,10 +130,10 @@ static void ping_send(ObPingTarget *t)
         g_hash_table_insert(ping_ids, &t->id, t);
     }
 
-    /*g_print("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
-    PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
-                prop_atoms.net_wm_ping, t->id, t->client->window, 0, 0,
-                NoEventMask);
+    /*ob_debug("+PING: '%s' (id %u)", t->client->title, t->id);*/
+    OBT_PROP_MSG_TO(t->client->window, t->client->window, WM_PROTOCOLS,
+                    OBT_PROP_ATOM(NET_WM_PING), t->id, t->client->window, 0, 0,
+                    NoEventMask);
 }
 
 static gboolean ping_timeout(gpointer data)
@@ -149,13 +155,11 @@ static void ping_end(ObClient *client, gpointer data)
 {
     ObPingTarget *t;
 
-    t = g_hash_table_lookup(ping_targets, &client);
-    g_assert(t);
+    if ((t = g_hash_table_find(ping_ids, find_client, client))) {
+        g_hash_table_remove(ping_ids, &t->id);
 
-    g_hash_table_remove(ping_targets, &t->client);
-    g_hash_table_remove(ping_ids, &t->id);
+        g_source_remove(t->loopid);
 
-    ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);
-
-    g_free(t);
+        g_slice_free(ObPingTarget, t);
+    }
 }