X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fif.c;h=a99435272ad27d82b2687b1aaa69d09b47978c83;hb=9614dd8da2cd34475d84bf9b5366f6e73481ca6c;hp=8d2f281f0eb941d36c18b3b0dbd6e551d17ddf83;hpb=fdabb69f4f25596df972caa76c85c2aeba26226e;p=chaz%2Fopenbox

diff --git a/openbox/actions/if.c b/openbox/actions/if.c
index 8d2f281f..a9943527 100644
--- a/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@ -19,6 +19,17 @@ typedef struct {
     gboolean iconic_off;
     gboolean focused;
     gboolean unfocused;
+    gboolean urgent_on;
+    gboolean urgent_off;
+    gboolean decor_off;
+    gboolean decor_on;
+    gboolean omnipresent_on;
+    gboolean omnipresent_off;
+    gboolean desktop_current;
+    gboolean desktop_other;
+    guint    desktop_number;
+    guint    screendesktop_number;
+    GPatternSpec *matchtitle;
     GSList *thenacts;
     GSList *elseacts;
 } Options;
@@ -29,7 +40,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_if_startup(void)
 {
-    actions_register("If", setup_func, free_func, run_func, NULL, NULL);
+    actions_register("If", setup_func, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -37,63 +48,102 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
 
-    if ((n = obt_parse_find_node(node, "shaded"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "shaded"))) {
+        if (obt_xml_node_bool(n))
             o->shaded_on = TRUE;
         else
             o->shaded_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "maximized"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "maximized"))) {
+        if (obt_xml_node_bool(n))
             o->maxfull_on = TRUE;
         else
             o->maxfull_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "maximizedhorizontal"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "maximizedhorizontal"))) {
+        if (obt_xml_node_bool(n))
             o->maxhorz_on = TRUE;
         else
             o->maxhorz_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "maximizedvertical"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "maximizedvertical"))) {
+        if (obt_xml_node_bool(n))
             o->maxvert_on = TRUE;
         else
             o->maxvert_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "iconified"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "iconified"))) {
+        if (obt_xml_node_bool(n))
             o->iconic_on = TRUE;
         else
             o->iconic_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "focused"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "focused"))) {
+        if (obt_xml_node_bool(n))
             o->focused = TRUE;
         else
             o->unfocused = TRUE;
     }
+    if ((n = obt_xml_find_node(node, "urgent"))) {
+        if (obt_xml_node_bool(n))
+            o->urgent_on = TRUE;
+        else
+            o->urgent_off = TRUE;
+    }
+    if ((n = obt_xml_find_node(node, "undecorated"))) {
+        if (obt_xml_node_bool(n))
+            o->decor_off = TRUE;
+        else
+            o->decor_on = TRUE;
+    }
+    if ((n = obt_xml_find_node(node, "desktop"))) {
+        gchar *s;
+        if ((s = obt_xml_node_string(n))) {
+            if (!g_ascii_strcasecmp(s, "current"))
+                o->desktop_current = TRUE;
+            if (!g_ascii_strcasecmp(s, "other"))
+                o->desktop_other = TRUE;
+            else
+                o->desktop_number = atoi(s);
+            g_free(s);
+        }
+    }
+    if ((n = obt_xml_find_node(node, "omnipresent"))) {
+        if (obt_xml_node_bool(n))
+            o->omnipresent_on = TRUE;
+        else
+            o->omnipresent_off = TRUE;
+    if ((n = obt_xml_find_node(node, "activedesktop"))) {
+        o->screendesktop_number = obt_xml_node_int(n);
+    }
+    if ((n = obt_xml_find_node(node, "title"))) {
+        gchar *s;
+        if ((s = obt_xml_node_string(n))) {
+            o->matchtitle = g_pattern_spec_new(s);
+            g_free(s);
+        }
+    }
 
-    if ((n = obt_parse_find_node(node, "then"))) {
+    if ((n = obt_xml_find_node(node, "then"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->xmlChildrenNode, "action");
+        m = obt_xml_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
-            if (action) o->thenacts = g_slist_prepend(o->thenacts, action);
-            m = obt_parse_find_node(m->next, "action");
+            if (action) o->thenacts = g_slist_append(o->thenacts, action);
+            m = obt_xml_find_node(m->next, "action");
         }
     }
-    if ((n = obt_parse_find_node(node, "else"))) {
+    if ((n = obt_xml_find_node(node, "else"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->xmlChildrenNode, "action");
+        m = obt_xml_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
-            if (action) o->elseacts = g_slist_prepend(o->elseacts, action);
-            m = obt_parse_find_node(m->next, "action");
+            if (action) o->elseacts = g_slist_append(o->elseacts, action);
+            m = obt_xml_find_node(m->next, "action");
         }
     }
 
@@ -112,8 +162,10 @@ static void free_func(gpointer options)
         actions_act_unref(o->elseacts->data);
         o->elseacts = g_slist_delete_link(o->elseacts, o->elseacts);
     }
+    if (o->matchtitle)
+        g_pattern_spec_free(o->matchtitle);
 
-    g_free(o);
+    g_slice_free(Options, o);
 }
 
 /* Always return FALSE because its not interactive */
@@ -123,18 +175,34 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     GSList *acts;
     ObClient *c = data->client;
 
-    if ((!o->shaded_on || (c && c->shaded)) &&
-        (!o->shaded_off || (c && !c->shaded)) &&
-        (!o->iconic_on || (c && c->iconic)) &&
-        (!o->iconic_off || (c && !c->iconic)) &&
-        (!o->maxhorz_on || (c && c->max_horz)) &&
-        (!o->maxhorz_off || (c && !c->max_horz)) &&
-        (!o->maxvert_on || (c && c->max_vert)) &&
-        (!o->maxvert_off || (c && !c->max_vert)) &&
-        (!o->maxfull_on || (c && c->max_vert && c->max_horz)) &&
-        (!o->maxfull_off || (c && !(c->max_vert && c->max_horz))) &&
-        (!o->focused || (c && (c == focus_client))) &&
-        (!o->unfocused || (c && !(c == focus_client))))
+    if (c &&
+        (!o->shaded_on   ||  c->shaded) &&
+        (!o->shaded_off  || !c->shaded) &&
+        (!o->iconic_on   ||  c->iconic) &&
+        (!o->iconic_off  || !c->iconic) &&
+        (!o->maxhorz_on  ||  c->max_horz) &&
+        (!o->maxhorz_off || !c->max_horz) &&
+        (!o->maxvert_on  ||  c->max_vert) &&
+        (!o->maxvert_off || !c->max_vert) &&
+        (!o->maxfull_on  ||  (c->max_vert && c->max_horz)) &&
+        (!o->maxfull_off || !(c->max_vert && c->max_horz)) &&
+        (!o->focused     ||  (c == focus_client)) &&
+        (!o->unfocused   || !(c == focus_client)) &&
+        (!o->urgent_on   ||  (c->urgent || c->demands_attention)) &&
+        (!o->urgent_off  || !(c->urgent || c->demands_attention)) &&
+        (!o->decor_off   ||  (c->undecorated || !(c->decorations & OB_FRAME_DECOR_TITLEBAR))) &&
+        (!o->decor_on    ||  (!c->undecorated && (c->decorations & OB_FRAME_DECOR_TITLEBAR))) &&
+        (!o->omnipresent_on  || (c->desktop == DESKTOP_ALL)) &&
+        (!o->omnipresent_off || (c->desktop != DESKTOP_ALL)) &&
+        (!o->desktop_current || ((c->desktop == screen_desktop) ||
+                                 (c->desktop == DESKTOP_ALL))) &&
+        (!o->desktop_other   || ((c->desktop != screen_desktop) &&
+                                 (c->desktop != DESKTOP_ALL))) &&
+        (!o->desktop_number  || ((c->desktop == o->desktop_number - 1) ||
+                                 (c->desktop == DESKTOP_ALL))) &&
+        (!o->screendesktop_number || screen_desktop == o->screendesktop_number - 1) &&
+        (!o->matchtitle ||
+         (g_pattern_match_string(o->matchtitle, c->original_title))))
     {
         acts = o->thenacts;
     }