Merge branch 'backport' into work
Dana Jansens danakj@orodu.net
5 files changed,
49 insertions(+),
14 deletions(-)
M
openbox/actions/session.c
→
openbox/actions/session.c
@@ -3,10 +3,6 @@ #include "openbox/prompt.h"
#include "openbox/session.h" #include "gettext.h" -#ifndef USE_SM -void action_logout_startup(void) {} -#else - typedef struct { gboolean prompt; gboolean silent;@@ -38,8 +34,13 @@
static void prompt_cb(ObPrompt *p, gint result, gpointer data) { Options *o = data; - if (result) + if (result) { +#ifndef USE_SM session_request_logout(o->silent); +#else + g_message(_("The SessionLogout actions is not available since Openbox was built without session management support")); +#endif + } g_free(o); prompt_unref(p); }@@ -67,5 +68,3 @@ prompt_cb(NULL, 1, NULL);
return FALSE; } - -#endif
M
openbox/client.c
→
openbox/client.c
@@ -414,6 +414,12 @@ ob_debug_type(OB_DEBUG_FOCUS, "Going to try activate new window? %s",
activate ? "yes" : "no"); if (activate) { gboolean raise = FALSE; + gboolean relative_focused = FALSE; + + relative_focused = (focus_client != NULL && + client_search_focus_tree_full(self) != NULL && + client_search_focus_group_full(self) != NULL); + /* This is focus stealing prevention */ ob_debug_type(OB_DEBUG_FOCUS,@@ -444,10 +450,8 @@ ob_debug_type(OB_DEBUG_FOCUS,
"Not focusing the window because its on another " "desktop"); } - /* If something is focused, and it's not our relative... */ - else if (focus_client && client_search_focus_tree_full(self) == NULL && - client_search_focus_group_full(self) == NULL) - { + /* If something is focused... */ + else if (focus_client) { /* If the user is working in another window right now, then don't steal focus */ if (event_last_user_time && launch_time &&@@ -461,8 +465,9 @@ ob_debug_type(OB_DEBUG_FOCUS,
"Not focusing the window because the user is " "working in another window"); } - /* If it's a transient (and its parents aren't focused) */ - else if (client_has_parent(self)) { + /* If the new window is a transient (and its relatives aren't + focused) */ + else if (client_has_parent(self) && !relative_focused) { activate = FALSE; ob_debug_type(OB_DEBUG_FOCUS, "Not focusing the window because it is a "@@ -488,8 +493,11 @@ ob_debug_type(OB_DEBUG_FOCUS,
"Not focusing the window because another window " "would get the focus anyway"); } + /* Don't move focus if the window is not visible on the current + desktop and none of its relatives are focused */ else if (!(self->desktop == screen_desktop || - self->desktop == DESKTOP_ALL)) + self->desktop == DESKTOP_ALL) && + !relative_focused) { activate = FALSE; raise = TRUE;
M
openbox/prompt.c
→
openbox/prompt.c
@@ -28,6 +28,7 @@ #include "obt/prop.h"
#include "gettext.h" static GList *prompt_list = NULL; +static GList *prompt_msg_list = NULL; /* we construct these */ static RrAppearance *prompt_a_bg;@@ -121,6 +122,9 @@ }
void prompt_shutdown(gboolean reconfig) { + while (prompt_msg_list) + prompt_cancel(prompt_msg_list->data); + RrAppearanceFree(prompt_a_button); RrAppearanceFree(prompt_a_focus); RrAppearanceFree(prompt_a_press);@@ -215,6 +219,9 @@ void prompt_unref(ObPrompt *self)
{ if (self && --self->ref == 0) { gint i; + + if (self->mapped) + prompt_hide(self); prompt_list = g_list_remove(prompt_list, self);@@ -599,3 +606,21 @@ {
if (self->func) self->func(self, self->cancel_result, self->data); prompt_hide(self); } + +static void prompt_show_message_cb(ObPrompt *p, int res, gpointer data) +{ + prompt_msg_list = g_list_remove(prompt_msg_list, p); + prompt_unref(p); +} + +void prompt_show_message(const gchar *msg, const gchar *answer) +{ + ObPrompt *p; + ObPromptAnswer ans[] = { + { answer, 0 } + }; + + p = prompt_new(msg, ans, 1, 0, 0, prompt_show_message_cb, NULL); + prompt_msg_list = g_list_prepend(prompt_msg_list, p); + prompt_show(p, NULL, FALSE); +}
M
openbox/prompt.h
→
openbox/prompt.h
@@ -107,4 +107,6 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e);
gboolean prompt_mouse_event(ObPrompt *self, XEvent *e); void prompt_cancel(ObPrompt *self); +void prompt_show_message(const gchar *msg, const gchar *answer); + #endif
M
po/POTFILES.in
→
po/POTFILES.in
@@ -2,6 +2,7 @@ # List of source files containing translatable strings.
openbox/actions.c openbox/actions/execute.c openbox/actions/exit.c +openbox/actions/session.c openbox/client.c openbox/client_list_combined_menu.c openbox/client_list_menu.c