From 4044b942e74b59599e82bb4834a730c32e49820d Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 22 Jun 2007 19:15:07 +0000 Subject: let you use "last" in desktop action --- openbox/actions/desktop.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'openbox/actions') diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c index 2d2014e4..6da47740 100644 --- a/openbox/actions/desktop.c +++ b/openbox/actions/desktop.c @@ -3,6 +3,7 @@ #include typedef struct { + gboolean last; guint desktop; } Options; @@ -26,8 +27,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) o = g_new0(Options, 1); - if ((n = parse_find_node("desktop", node))) - o->desktop = parse_int(doc, n) - 1; + if ((n = parse_find_node("desktop", node))) { + gchar *s = parse_string(doc, n); + if (!g_ascii_strcasecmp(s, "last")) + o->last = TRUE; + else + o->desktop = parse_int(doc, n) - 1; + g_free(s); + } return o; } @@ -42,9 +49,15 @@ static void free_func(gpointer options) static gboolean run_func(ObActionsData *data, gpointer options) { Options *o = options; + guint d; - if (o->desktop < screen_num_desktops) - screen_set_desktop(o->desktop, TRUE); + if (o->last) + d = screen_last_desktop; + else + d = o->desktop; + + if (d < screen_num_desktops) + screen_set_desktop(d, TRUE); return FALSE; } -- cgit v1.2.3