From 14b422f9a3f178fb8e4dea1e8e6a94c6bd2167c5 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 25 Feb 2008 22:16:58 -0500 Subject: [PATCH 1/2] show the desktop change popup before mapping/unmapping all the windows this makes a big difference if the compmgr is being laggy trying to show windows --- openbox/screen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openbox/screen.c b/openbox/screen.c index 730b4c24..346b50c3 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -688,6 +688,9 @@ void screen_set_desktop(guint num, gboolean dofocus) ob_debug("Moving to desktop %d\n", num+1); + if (ob_state() == OB_STATE_RUNNING) + screen_show_desktop_popup(screen_desktop); + /* ignore enter events caused by the move */ ignore_start = event_start_ignore_all_enters(); @@ -718,9 +721,6 @@ void screen_set_desktop(guint num, gboolean dofocus) if (event_curtime != CurrentTime) screen_desktop_user_time = event_curtime; - - if (ob_state() == OB_STATE_RUNNING) - screen_show_desktop_popup(screen_desktop); } void screen_add_desktop(gboolean current) From dd97c9beac2778cddb97603315b21778323a25c7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 26 Feb 2008 00:59:25 -0500 Subject: [PATCH 2/2] change the buttons in the kill prompt from "yes/no" which can be a little confusing to be more clear "cancel/force exit" so people won't do the wrong thing by accident so much --- openbox/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index fbe728d1..26b8dc69 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -3413,8 +3413,8 @@ static void client_prompt_kill(ObClient *self) /* check if we're already prompting */ if (!self->kill_prompt) { ObPromptAnswer answers[] = { - { _("No"), OB_KILL_RESULT_NO }, - { _("Yes"), OB_KILL_RESULT_YES } + { _("Cancel"), OB_KILL_RESULT_NO }, + { _("Force Exit"), OB_KILL_RESULT_YES } }; gchar *m;