Don't trust WM_PROTOCOLS

[bspwm.git] / rules.c

diff --git a/rules.c b/rules.c
index b7e71b8327e22a21e77d68d2023624babe5db893..b5a96fd417a2be7d142e56fe1b10bf0fea4a66c3 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -6,20 +6,62 @@
 #include "bspwm.h"
 #include "ewmh.h"
 #include "rules.h"
+#include "query.h"
+
+void add_rule(rule_t *r)
+{
+    if (rule_head == NULL) {
+        rule_head = rule_tail = r;
+    } else {
+        rule_tail->next = r;
+        r->prev = rule_tail;
+        rule_tail = r;
+    }
+}
+
+void remove_rule(rule_t *r)
+{
+    if (r == NULL)
+        return;
+    rule_t *prev = r->prev;
+    rule_t *next = r->next;
+    if (prev != NULL)
+        prev->next = next;
+    if (next != NULL)
+        next->prev = prev;
+    if (r == rule_head)
+        rule_head = next;
+    if (r == rule_tail)
+        rule_tail = prev;
+    free(r);
+}
+
+void remove_rule_by_uid(unsigned int uid)
+{
+    remove_rule(find_rule(uid));
+}
+
+rule_t *find_rule(unsigned int uid)
+{
+    for (rule_t *r = rule_head; r != NULL; r = r->next)
+        if (r->uid == uid)
+            return r;
+    return NULL;
+}
 
 bool is_match(rule_t *r, xcb_window_t win)
 {
-    xcb_icccm_get_wm_class_reply_t reply; 
+    xcb_icccm_get_wm_class_reply_t reply;
     if (xcb_icccm_get_wm_class_reply(dpy, xcb_icccm_get_wm_class(dpy, win), &reply, NULL) == 1
-            && (strcmp(reply.class_name, r->cause.name) == 0
-                || strcmp(reply.instance_name, r->cause.name) == 0)) {
+            && (streq(reply.class_name, r->cause.name)
+                || streq(reply.instance_name, r->cause.name))) {
         xcb_icccm_get_wm_class_reply_wipe(&reply);
         return true;
     }
     return false;
 }
 
-void handle_rules(xcb_window_t win, monitor_t **m, desktop_t **d, bool *floating, bool *transient, bool *fullscreen, bool *takes_focus, bool *manage)
+void handle_rules(xcb_window_t win, monitor_t **m, desktop_t **d, bool *floating, bool *follow, bool *transient, bool *fullscreen, bool *takes_focus, bool *manage)
 {
     xcb_ewmh_get_atoms_reply_t win_type;
 
@@ -41,7 +83,8 @@ void handle_rules(xcb_window_t win, monitor_t **m, desktop_t **d, bool *floating
     xcb_size_hints_t size_hints;
 
     if (xcb_icccm_get_wm_normal_hints_reply(dpy, xcb_icccm_get_wm_normal_hints(dpy, win), &size_hints, NULL) == 1) {
-        if (size_hints.min_width == size_hints.max_width
+        if (size_hints.min_width > 0 && size_hints.min_height > 0
+                && size_hints.min_width == size_hints.max_width
                 && size_hints.min_height == size_hints.max_height)
             *floating = true;
     }
@@ -71,11 +114,42 @@ void handle_rules(xcb_window_t win, monitor_t **m, desktop_t **d, bool *floating
             rule_effect_t efc = rule->effect;
             if (efc.floating)
                 *floating = true;
-            if (efc.monitor != NULL && efc.desktop != NULL) {
-                *m = efc.monitor;
-                *d = efc.desktop;
+            if (efc.follow)
+                *follow = true;
+            if (efc.focus)
+                *takes_focus = true;
+            if (efc.desc[0] != '\0') {
+                coordinates_t ref = {*m, *d, NULL};
+                coordinates_t loc;
+                if (desktop_from_desc(efc.desc, &ref, &loc)) {
+                    *m = loc.monitor;
+                    *d = loc.desktop;
+                }
             }
         }
         rule = rule->next;
     }
 }
+
+void list_rules(char *pattern, char *rsp)
+{
+    char line[MAXLEN];
+
+    for (rule_t *r = rule_head; r != NULL; r = r->next) {
+        if (pattern != NULL && !streq(pattern, r->cause.name))
+            continue;
+        snprintf(line, sizeof(line), "%2X %s", r->uid, r->cause.name);
+        strncat(rsp, line, REMLEN(rsp));
+        if (r->effect.floating)
+            strncat(rsp, " --floating", REMLEN(rsp));
+        if (r->effect.follow)
+            strncat(rsp, " --follow", REMLEN(rsp));
+        if (r->effect.focus)
+            strncat(rsp, " --focus", REMLEN(rsp));
+        if (r->effect.desc[0] != '\0') {
+            snprintf(line, sizeof(line), " -d %s", r->effect.desc);
+            strncat(rsp, line, REMLEN(rsp));
+        }
+        strncat(rsp, "\n", REMLEN(rsp));
+    }
+}