Break loop if is_true was set to false in If

[dana/openbox.git] / openbox / actions / if.c

diff --git a/openbox/actions/if.c b/openbox/actions/if.c
index 3d9f0e7..fd8e1bd 100644 (file)
--- a/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@ -75,6 +75,7 @@ typedef struct {
     TypedMatch class;
     TypedMatch name;
     TypedMatch role;
+    TypedMatch type;
 } Query;
 
 typedef struct {
@@ -153,7 +154,7 @@ static void free_typed_match(TypedMatch *tm)
     }
 }
 
-static gboolean check_typed_match(TypedMatch *tm, gchar *s)
+static gboolean check_typed_match(TypedMatch *tm, const gchar *s)
 {
     switch (tm->type) {
     case MATCH_TYPE_PATTERN:
@@ -212,6 +213,9 @@ static void setup_query(Options* o, xmlNodePtr node, QueryTarget target) {
     if ((n = obt_xml_find_node(node, "role"))) {
         setup_typed_match(&q->role, n);
     }
+    if ((n = obt_xml_find_node(node, "type"))) {
+        setup_typed_match(&q->type, n);
+    }
     if ((n = obt_xml_find_node(node, "monitor"))) {
         q->client_monitor = obt_xml_node_int(n);
     }
@@ -283,6 +287,7 @@ static void free_func(gpointer options)
         free_typed_match(&q->class);
         free_typed_match(&q->name);
         free_typed_match(&q->role);
+        free_typed_match(&q->type);
 
         g_slice_free(Query, q);
     }
@@ -308,7 +313,7 @@ static gboolean run_func_if(ObActionsData *data, gpointer options)
     gboolean is_true = TRUE;
 
     guint i;
-    for (i = 0; i < o->queries->len; ++i) {
+    for (i = 0; is_true && i < o->queries->len; ++i) {
         Query *q = g_array_index(o->queries, Query*, i);
         ObClient *query_target = NULL;
 
@@ -322,7 +327,10 @@ static gboolean run_func_if(ObActionsData *data, gpointer options)
         }
 
         /* If there's no client to query, then false. */
-        is_true &= query_target != NULL;
+        if (!query_target) {
+            is_true = FALSE;
+            break;
+        }
 
         if (q->shaded_on)
             is_true &= query_target->shaded;
@@ -398,6 +406,8 @@ static gboolean run_func_if(ObActionsData *data, gpointer options)
         is_true &= check_typed_match(&q->class, query_target->class);
         is_true &= check_typed_match(&q->name, query_target->name);
         is_true &= check_typed_match(&q->role, query_target->role);
+        is_true &= check_typed_match(&q->type,
+                                     client_type_to_string(query_target));
 
         if (q->client_monitor)
             is_true &= client_monitor(query_target) == q->client_monitor - 1;