From b20ef1556a582bdf91578b17344feb0048ca208b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 1 Mar 2008 11:45:33 -0500 Subject: remove some debug prints --- openbox/prompt.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'openbox') diff --git a/openbox/prompt.c b/openbox/prompt.c index d3a1ab7b..0278757e 100644 --- a/openbox/prompt.c +++ b/openbox/prompt.c @@ -264,7 +264,6 @@ static void prompt_layout(ObPrompt *self) self->button[i].width = bw; self->button[i].height = bh; RrMinSize(prompt_a_focus, &bw, &bh); - g_print("button w %d h %d\n", bw, bh); self->button[i].width = MAX(self->button[i].width, bw); self->button[i].height = MAX(self->button[i].height, bh); RrMinSize(prompt_a_press, &bw, &bh); @@ -388,8 +387,6 @@ static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a, a->texture[4].data.lineart.x2 = e->width - r - 1; a->texture[4].data.lineart.y1 = t; a->texture[4].data.lineart.y2 = e->height - b - 1; - - g_print("setting x2 %d\n", e->width - r - 1); } static void render_button(ObPrompt *self, ObPromptElement *e) @@ -508,8 +505,6 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e) if (e->type != KeyPress) return FALSE; - g_print("key 0x%x 0x%x\n", e->xkey.keycode, ob_keycode(OB_KEY_TAB)); - shift_mask = modkeys_key_to_mask(OB_MODKEY_KEY_SHIFT); shift = !!(e->xkey.state & shift_mask); -- cgit v1.2.3 From 4d098217301086d5ab142d6c4184f01d18c8b329 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 2 Mar 2008 02:50:19 -0500 Subject: add a SessionLogout action --- openbox/actions/all.c | 1 + openbox/actions/all.h | 1 + openbox/actions/session.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ openbox/session.c | 17 ++++++++++++ openbox/session.h | 2 ++ 5 files changed, 91 insertions(+) create mode 100644 openbox/actions/session.c (limited to 'openbox') diff --git a/openbox/actions/all.c b/openbox/actions/all.c index 47141ac6..c86c4281 100644 --- a/openbox/actions/all.c +++ b/openbox/actions/all.c @@ -9,6 +9,7 @@ void action_all_startup(void) action_reconfigure_startup(); action_exit_startup(); action_restart_startup(); + action_session_startup(); action_cyclewindows_startup(); action_breakchroot_startup(); action_close_startup(); diff --git a/openbox/actions/all.h b/openbox/actions/all.h index 5f3f573f..4fbd6ff5 100644 --- a/openbox/actions/all.h +++ b/openbox/actions/all.h @@ -10,6 +10,7 @@ void action_showdesktop_startup(); void action_reconfigure_startup(); void action_exit_startup(); void action_restart_startup(); +void action_session_startup(); void action_cyclewindows_startup(); void action_breakchroot_startup(); void action_close_startup(); diff --git a/openbox/actions/session.c b/openbox/actions/session.c new file mode 100644 index 00000000..0031a273 --- /dev/null +++ b/openbox/actions/session.c @@ -0,0 +1,70 @@ +#include "openbox/actions.h" +#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; +} Options; + +static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); +static gboolean logout_func(ObActionsData *data, gpointer options); + +void action_session_startup(void) +{ + actions_register("SessionLogout", setup_func, NULL, logout_func, + NULL, NULL); +} + +static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) +{ + xmlNodePtr n; + Options *o; + + o = g_new0(Options, 1); + + if ((n = parse_find_node("prompt", node))) + o->prompt = parse_bool(doc, n); + + return o; +} + +static void prompt_cb(ObPrompt *p, gint result, gpointer data) +{ + Options *o = data; + if (result) + session_request_logout(o->silent); + g_free(o); + prompt_unref(p); +} + +/* Always return FALSE because its not interactive */ +static gboolean logout_func(ObActionsData *data, gpointer options) +{ + Options *o = options; + + if (o->prompt) { + Options *o2; + ObPrompt *p; + ObPromptAnswer answers[] = { + { _("Cancel"), 0 }, + { _("Log out"), 1 } + }; + + o2 = g_memdup(o, sizeof(Options)); + p = prompt_new(_("Are you sure you want to log out?"), + answers, 2, 0, 0, prompt_cb, o2); + prompt_show(p, NULL, FALSE); + } + else + prompt_cb(NULL, 1, NULL); + + return FALSE; +} + +#endif diff --git a/openbox/session.c b/openbox/session.c index 0f74ec28..4483c051 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -33,6 +33,7 @@ GSList *session_desktop_names = NULL; void session_startup(gint argc, gchar **argv) {} void session_shutdown(gboolean permanent) {} GList* session_state_find(struct _ObClient *c) { return NULL; } +void session_request_logout(gboolean silent) {} #else #include "debug.h" @@ -804,4 +805,20 @@ static void session_load_file(const gchar *path) xmlFreeDoc(doc); } +void session_request_logout(gboolean silent) +{ + if (sm_conn) { + SmcRequestSaveYourself(sm_conn, + SmSaveBoth, + TRUE, /* logout */ + (silent ? + SmInteractStyleNone : SmInteractStyleAny), + TRUE, /* if false, with GSM, it shows the old + logout prompt */ + TRUE); /* global */ + } + else + g_message(_("Not connected to a session manager")); +} + #endif diff --git a/openbox/session.h b/openbox/session.h index b4ce6d91..e2307a6f 100644 --- a/openbox/session.h +++ b/openbox/session.h @@ -53,4 +53,6 @@ void session_shutdown(gboolean permanent); GList* session_state_find(struct _ObClient *c); +void session_request_logout(gboolean silent); + #endif -- cgit v1.2.3 From fc085fd66c2b06281df959285c5046fa5994e19e Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 2 Mar 2008 03:18:38 -0500 Subject: make the prompt option default to 'true' for Exit and SessionLogout --- openbox/actions/exit.c | 1 + openbox/actions/session.c | 1 + 2 files changed, 2 insertions(+) (limited to 'openbox') diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c index 19b78e9c..747514f6 100644 --- a/openbox/actions/exit.c +++ b/openbox/actions/exit.c @@ -21,6 +21,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) Options *o; o = g_new0(Options, 1); + o->prompt = TRUE; if ((n = parse_find_node("prompt", node))) o->prompt = parse_bool(doc, n); diff --git a/openbox/actions/session.c b/openbox/actions/session.c index 0031a273..0117e07c 100644 --- a/openbox/actions/session.c +++ b/openbox/actions/session.c @@ -27,6 +27,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) Options *o; o = g_new0(Options, 1); + o->prompt = TRUE; if ((n = parse_find_node("prompt", node))) o->prompt = parse_bool(doc, n); -- cgit v1.2.3 From e8ce4dbb8fa8f415759745d57bb1c971ea360ec5 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 2 Mar 2008 04:16:17 -0500 Subject: don't let you use left to go "up to parent" on menus which don't have any parent --- openbox/event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'openbox') diff --git a/openbox/event.c b/openbox/event.c index a487e1b8..5c4700ae 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1682,7 +1682,8 @@ static gboolean event_handle_menu_keyboard(XEvent *ev) else if (keycode == ob_keycode(OB_KEY_LEFT)) { /* Left goes to the parent menu */ - menu_frame_select(frame, NULL, TRUE); + if (frame->parent) + menu_frame_select(frame, NULL, TRUE); ret = TRUE; } -- cgit v1.2.3