#include "openbox/session.h"
#include "gettext.h"
-#ifndef USE_SM
-void action_logout_startup(void) {}
-#else
-
typedef struct {
gboolean prompt;
gboolean silent;
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);
}
return FALSE;
}
-
-#endif
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,
"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 &&
"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 "
"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;
#include "gettext.h"
static GList *prompt_list = NULL;
+static GList *prompt_msg_list = NULL;
/* we construct these */
static RrAppearance *prompt_a_bg;
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);
if (self && --self->ref == 0) {
gint i;
+ if (self->mapped)
+ prompt_hide(self);
+
prompt_list = g_list_remove(prompt_list, self);
for (i = 0; i < self->n_buttons; ++i) {
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);
+}
gboolean prompt_mouse_event(ObPrompt *self, XEvent *e);
void prompt_cancel(ObPrompt *self);
+void prompt_show_message(const gchar *msg, const gchar *answer);
+
#endif
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