nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cant consistently tell if we should use WM_DESTROY after the first time they try close a window.. so just kill when "not responding" is showing

Browse source
This commit is contained in:
Dana Jansens 2008-01-15 22:51:04 -05:00
parent d5c824cfd4
commit f9f32d9fba
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openbox/client.c
View file

@ -3212,10 +3212,8 @@ static void client_ping_event(ObClient *self, gboolean dead)
client_update_title(self); client_update_title(self);
if (!dead) { if (!dead) {
/* the window has started responding again, so don't kill it the first /* try kill it nicely the first time again, if it started responding
time they click on close, even if it stops responding again in the at some point */
future */
self->close_tried_destroy = FALSE;
self->close_tried_term = FALSE; self->close_tried_term = FALSE;
} }
} }
@ -3230,14 +3228,12 @@ void client_close(ObClient *self)
/* don't use client_kill(), we should only kill based on PID in /* don't use client_kill(), we should only kill based on PID in
response to a lack of PING replies */ response to a lack of PING replies */
XKillClient(ob_display, self->window); XKillClient(ob_display, self->window);
else if (self->not_responding && self->close_tried_destroy) else if (self->not_responding)
client_kill(self); client_kill(self);
else { else {
PROP_MSG_TO(self->window, self->window, wm_protocols, PROP_MSG_TO(self->window, self->window, wm_protocols,
prop_atoms.wm_delete_window, event_curtime, 0, 0, 0, prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
NoEventMask); NoEventMask);
self->close_tried_destroy = TRUE;
self->close_tried_term = FALSE;
} }
} }

2
openbox/client.h
View file

@ -231,8 +231,6 @@ struct _ObClient
/*! Indicates if the client is trying to close but has stopped responding /*! Indicates if the client is trying to close but has stopped responding
to pings */ to pings */
gboolean not_responding; gboolean not_responding;
/*! We tried to close the window with a DESTROY message */
gboolean close_tried_destroy;
/*! We tried to close the window with a SIGTERM */ /*! We tried to close the window with a SIGTERM */
gboolean close_tried_term; gboolean close_tried_term;

5
openbox/ping.c
View file

@ -87,7 +87,8 @@ void ping_got_pong(Time timestamp)
for (it = ping_targets; it != NULL; it = g_slist_next(it)) { for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
t = it->data; t = it->data;
if (t->sent == timestamp) { if (t->sent == timestamp) {
/*ob_debug("Got PONG with timestamp %lu\n", timestamp);*/ ob_debug("Got PONG with timestamp %lu for %s\n", timestamp,
t->client->title);
if (t->waiting > PING_TIMEOUT_WARN) { if (t->waiting > PING_TIMEOUT_WARN) {
/* we had notified that they weren't responding, so now we /* we had notified that they weren't responding, so now we
need to notify that they are again */ need to notify that they are again */
@ -106,7 +107,7 @@ void ping_got_pong(Time timestamp)
static void ping_send(ObPingTarget *t) static void ping_send(ObPingTarget *t)
{ {
t->sent = event_get_server_time(); t->sent = event_get_server_time();
/*ob_debug("PINGing client 0x%x at %lu\n", t->client->window, t->sent);*/ ob_debug("PINGing client %s at %lu\n", t->client->title, t->sent);
PROP_MSG_TO(t->client->window, t->client->window, wm_protocols, PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0, prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0,
NoEventMask); NoEventMask);