diff options
| -rw-r--r-- | openbox/client.c | 35 | ||||
| -rw-r--r-- | openbox/client.h | 2 | ||||
| -rw-r--r-- | openbox/prompt.c | 13 |
3 files changed, 32 insertions, 18 deletions
diff --git a/openbox/client.c b/openbox/client.c index 98ad7de2..44e027f8 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -820,6 +820,7 @@ void client_unmanage(ObClient *self) g_free(self->wm_command); g_free(self->title); g_free(self->icon_title); + g_free(self->original_title); g_free(self->name); g_free(self->class); g_free(self->role); @@ -1974,6 +1975,7 @@ void client_update_title(ObClient *self) gchar *visible = NULL; g_free(self->title); + g_free(self->original_title); /* try netwm */ if (!PROP_GETS(self->window, net_wm_name, utf8, &data)) { @@ -1990,6 +1992,7 @@ void client_update_title(ObClient *self) data = g_strdup("Unnamed Window"); } } + self->original_title = g_strdup(data); if (self->client_machine) { visible = g_strdup_printf("%s (%s)", data, self->client_machine); @@ -3398,26 +3401,26 @@ static void client_kill_requested(ObPrompt *p, gint result, gpointer data) static void client_prompt_kill(ObClient *self) { - ObPromptAnswer answers[] = { - { _("No"), OB_KILL_RESULT_NO }, - { _("Yes"), OB_KILL_RESULT_YES } - }; - gchar *m; - /* check if we're already prompting */ - if (self->kill_prompt) return; + if (!self->kill_prompt) { + ObPromptAnswer answers[] = { + { _("No"), OB_KILL_RESULT_NO }, + { _("Yes"), OB_KILL_RESULT_YES } + }; + gchar *m; - m = g_strdup_printf - (_("The window \"%s\" does not seem to be responding. Do you want to force it to exit?"), self->title); + m = g_strdup_printf + (_("The window \"%s\" does not seem to be responding. Do you want to force it to exit?"), self->original_title); - self->kill_prompt = prompt_new(m, answers, - sizeof(answers)/sizeof(answers[0]), - OB_KILL_RESULT_NO, /* default = no */ - OB_KILL_RESULT_NO, /* cancel = no */ - client_kill_requested, self); - prompt_show(self->kill_prompt, self); + self->kill_prompt = prompt_new(m, answers, + sizeof(answers)/sizeof(answers[0]), + OB_KILL_RESULT_NO, /* default = no */ + OB_KILL_RESULT_NO, /* cancel = no */ + client_kill_requested, self); + g_free(m); + } - g_free(m); + prompt_show(self->kill_prompt, self); } void client_kill(ObClient *self) diff --git a/openbox/client.h b/openbox/client.h index 4e19bdf8..197fb061 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -120,6 +120,8 @@ struct _ObClient gchar *title; /*! Window title when iconified */ gchar *icon_title; + /*! The title as requested by the client, without any of our own changes */ + gchar *original_title; /*! Hostname of machine running the client */ gchar *client_machine; /*! The command used to run the program. Pre-XSMP window identification. */ diff --git a/openbox/prompt.c b/openbox/prompt.c index 080dc9a8..1c7e2261 100644 --- a/openbox/prompt.c +++ b/openbox/prompt.c @@ -23,6 +23,7 @@ #include "client.h" #include "prop.h" #include "modkeys.h" +#include "event.h" #include "gettext.h" static GList *prompt_list = NULL; @@ -332,7 +333,15 @@ void prompt_show(ObPrompt *self, ObClient *parent) XSizeHints hints; gint i; - if (self->mapped) return; + if (self->mapped) { + /* activate the prompt */ + PROP_MSG(self->super.window, net_active_window, + 1, /* from an application.. */ + event_curtime, + 0, + 0); + return; + } /* set the focused button (if not found then the first button is used) */ self->focus = &self->button[0]; @@ -421,7 +430,7 @@ gboolean prompt_mouse_event(ObPrompt *self, XEvent *e) ObPromptElement *but; if (e->type != ButtonPress && e->type != ButtonRelease && - e->type != MotionNotify) return; + e->type != MotionNotify) return FALSE; /* find the button */ but = NULL; |