]> git.lizzy.rs Git - bspwm.git/blobdiff - query.c
Start parsing modifiers after the last colon
[bspwm.git] / query.c
diff --git a/query.c b/query.c
index 2db5ed9d221c720dc087a24d3b117d2674f000bd..800b3ce6609bba07a51b2126602a61478b5acf5a 100644 (file)
--- a/query.c
+++ b/query.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, Bastien Dejean
+/* Copyright (c) 2012, Bastien Dejean
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those
- * of the authors and should not be interpreted as representing official policies,
- * either expressed or implied, of the FreeBSD Project.
  */
 
 #include <stdio.h>
-#include <strings.h>
 #include <string.h>
 #include "bspwm.h"
 #include "desktop.h"
 #include "history.h"
-#include "messages.h"
+#include "parse.h"
 #include "monitor.h"
 #include "tree.h"
 #include "query.h"
 
-void query_monitors(coordinates_t loc, domain_t dom, FILE *rsp)
+void query_tree(FILE *rsp)
 {
+       fprintf(rsp, "{");
+       fprintf(rsp, "\"focusedMonitorName\":\"%s\",", mon->name);
+       fprintf(rsp, "\"clientsCount\":%i,", clients_count);
+       fprintf(rsp, "\"monitors\":");
+       fprintf(rsp, "[");
        for (monitor_t *m = mon_head; m != NULL; m = m->next) {
-               if (loc.monitor != NULL && m != loc.monitor)
-                       continue;
-               if (dom != DOMAIN_DESKTOP) {
-                       if (dom == DOMAIN_MONITOR) {
-                               fprintf(rsp, "%s\n", m->name);
-                               continue;
-                       } else {
-                               fprintf(rsp, "%s %ux%u%+i%+i %i,%i,%i,%i%s\n", m->name,
-                                        m->rectangle.width,m->rectangle.height, m->rectangle.x, m->rectangle.y,
-                                        m->top_padding, m->right_padding, m->bottom_padding, m->left_padding,
-                                        (m == mon ? " *" : ""));
-                       }
+               query_monitor(m, rsp);
+               if (m->next != NULL) {
+                       fprintf(rsp, ",");
                }
-               query_desktops(m, dom, loc, (dom == DOMAIN_DESKTOP ? 0 : 1), rsp);
        }
+       fprintf(rsp, "]");
+       fprintf(rsp,",");
+       fprintf(rsp, "\"focusHistory\":");
+       query_history(rsp);
+       fprintf(rsp,",");
+       fprintf(rsp, "\"stackingList\":");
+       query_stack(rsp);
+       fprintf(rsp, "}");
+
 }
 
-void query_desktops(monitor_t *m, domain_t dom, coordinates_t loc, unsigned int depth, FILE *rsp)
+void query_monitor(monitor_t *m, FILE *rsp)
 {
+       fprintf(rsp, "{");
+       fprintf(rsp, "\"name\":\"%s\",", m->name);
+       fprintf(rsp, "\"id\":%u,", m->id);
+       fprintf(rsp, "\"wired\":%s,", BOOL_STR(m->wired));
+       fprintf(rsp, "\"topPadding\":%i,", m->top_padding);
+       fprintf(rsp, "\"rightPadding\":%i,", m->right_padding);
+       fprintf(rsp, "\"bottomPadding\":%i,", m->bottom_padding);
+       fprintf(rsp, "\"leftPadding\":%i,", m->left_padding);
+       fprintf(rsp, "\"stickyCount\":%i,", m->sticky_count);
+       fprintf(rsp, "\"rectangle\":");
+       query_rectangle(m->rectangle, rsp);
+       fprintf(rsp,",");
+       fprintf(rsp, "\"focusedDesktopName\":\"%s\",", m->desk->name);
+       fprintf(rsp, "\"desktops\":");
+       fprintf(rsp, "[");
        for (desktop_t *d = m->desk_head; d != NULL; d = d->next) {
-               if (loc.desktop != NULL && d != loc.desktop)
-                       continue;
-               for (unsigned int i = 0; i < depth; i++)
-                       fprintf(rsp, "\t");
-               if (dom == DOMAIN_DESKTOP) {
-                       fprintf(rsp, "%s\n", d->name);
-                       continue;
-               } else {
-                       fprintf(rsp, "%s %u %i %i,%i,%i,%i %c %c%s\n", d->name, d->border_width,
-                               d->window_gap,
-                               d->top_padding, d->right_padding, d->bottom_padding, d->left_padding,
-                               (d->layout == LAYOUT_TILED ? 'T' : 'M'), (d->floating ? 'f' : '-'),
-                               (d == m->desk ? " *" : ""));
+               query_desktop(d, rsp);
+               if (d->next != NULL) {
+                       fprintf(rsp,",");
                }
-               query_tree(d, d->root, rsp, depth + 1);
        }
+       fprintf(rsp, "]");
+       fprintf(rsp, "}");
 }
 
-void query_tree(desktop_t *d, node_t *n, FILE *rsp, unsigned int depth)
+void query_desktop(desktop_t *d, FILE *rsp)
 {
-       if (n == NULL)
-               return;
+       fprintf(rsp, "{");
+       fprintf(rsp, "\"name\":\"%s\",", d->name);
+       fprintf(rsp, "\"layout\":\"%s\",", LAYOUT_STR(d->layout));
+       fprintf(rsp, "\"topPadding\":%i,", d->top_padding);
+       fprintf(rsp, "\"rightPadding\":%i,", d->right_padding);
+       fprintf(rsp, "\"bottomPadding\":%i,", d->bottom_padding);
+       fprintf(rsp, "\"leftPadding\":%i,", d->left_padding);
+       fprintf(rsp, "\"windowGap\":%i,", d->window_gap);
+       fprintf(rsp, "\"borderWidth\":%u,", d->border_width);
+       fprintf(rsp, "\"focusedNodeId\":%u,", d->focus != NULL ? d->focus->id : 0);
+       fprintf(rsp, "\"root\":");
+       query_node(d->root, rsp);
+       fprintf(rsp, "}");
+}
+
+void query_node(node_t *n, FILE *rsp)
+{
+       if (n == NULL) {
+               fprintf(rsp, "null");
+       } else {
+               fprintf(rsp, "{");
+               fprintf(rsp, "\"id\":%u,", n->id);
+               fprintf(rsp, "\"splitType\":\"%s\",", SPLIT_TYPE_STR(n->split_type));
+               fprintf(rsp, "\"splitRatio\":%lf,", n->split_ratio);
+               fprintf(rsp, "\"birthRotation\":%i,", n->birth_rotation);
+               fprintf(rsp, "\"vacant\":%s,", BOOL_STR(n->vacant));
+               fprintf(rsp, "\"sticky\":%s,", BOOL_STR(n->sticky));
+               fprintf(rsp, "\"private\":%s,", BOOL_STR(n->private));
+               fprintf(rsp, "\"locked\":%s,", BOOL_STR(n->locked));
+               fprintf(rsp, "\"presel\":");
+               query_presel(n->presel, rsp);
+               fprintf(rsp,",");
+               fprintf(rsp, "\"rectangle\":");
+               query_rectangle(n->rectangle, rsp);
+               fprintf(rsp,",");
+               fprintf(rsp, "\"firstChild\":");
+               query_node(n->first_child, rsp);
+               fprintf(rsp,",");
+               fprintf(rsp, "\"secondChild\":");
+               query_node(n->second_child, rsp);
+               fprintf(rsp,",");
+               fprintf(rsp, "\"client\":");
+               query_client(n->client, rsp);
+               fprintf(rsp, "}");
+       }
+}
+
+void query_presel(presel_t *p, FILE *rsp)
+{
+       if (p == NULL) {
+               fprintf(rsp, "null");
+       } else {
+               fprintf(rsp, "{\"splitDir\":\"%s\",\"splitRatio\":%lf}", SPLIT_DIR_STR(p->split_dir), p->split_ratio);
+       }
+}
 
-       for (unsigned int i = 0; i < depth; i++)
-               fprintf(rsp, "\t");
-
-       if (is_leaf(n)) {
-               client_t *c = n->client;
-               fprintf(rsp, "%c %s %s 0x%X %u %ux%u%+i%+i %c %c%c%c%c%c%c%c%c%s\n",
-                        (n->birth_rotation == 90 ? 'a' : (n->birth_rotation == 270 ? 'c' : 'm')),
-                        c->class_name, c->instance_name, c->window, c->border_width,
-                        c->floating_rectangle.width, c->floating_rectangle.height,
-                        c->floating_rectangle.x, c->floating_rectangle.y,
-                        (n->split_dir == DIR_UP ? 'U' : (n->split_dir == DIR_RIGHT ? 'R' : (n->split_dir == DIR_DOWN ? 'D' : 'L'))),
-                        (c->floating ? 'f' : '-'), (c->pseudo_tiled ? 'd' : '-'), (c->fullscreen ? 'F' : '-'),
-                        (c->urgent ? 'u' : '-'), (c->locked ? 'l' : '-'), (c->sticky ? 's' : '-'),
-                        (c->private ? 'i' : '-'), (n->split_mode ? 'p' : '-'),
-                        (n == d->focus ? " *" : ""));
+void query_client(client_t *c, FILE *rsp)
+{
+       if (c == NULL) {
+               fprintf(rsp, "null");
        } else {
-               fprintf(rsp, "%c %c %lf\n", (n->split_type == TYPE_HORIZONTAL ? 'H' : 'V'),
-                       (n->birth_rotation == 90 ? 'a' : (n->birth_rotation == 270 ? 'c' : 'm')), n->split_ratio);
+               fprintf(rsp, "{");
+               fprintf(rsp, "\"className\":\"%s\",", c->class_name);
+               fprintf(rsp, "\"instanceName\":\"%s\",", c->instance_name);
+               fprintf(rsp, "\"borderWidth\":%u,", c->border_width);
+               fprintf(rsp, "\"state\":\"%s\",", STATE_STR(c->state));
+               fprintf(rsp, "\"lastState\":\"%s\",", STATE_STR(c->last_state));
+               fprintf(rsp, "\"layer\":\"%s\",", LAYER_STR(c->layer));
+               fprintf(rsp, "\"lastLayer\":\"%s\",", LAYER_STR(c->last_layer));
+               fprintf(rsp, "\"urgent\":%s,", BOOL_STR(c->urgent));
+               fprintf(rsp, "\"icccmFocus\":%s,", BOOL_STR(c->icccm_focus));
+               fprintf(rsp, "\"icccmInput\":%s,", BOOL_STR(c->icccm_input));
+               fprintf(rsp, "\"minWidth\":%u,", c->min_width);
+               fprintf(rsp, "\"maxWidth\":%u,", c->max_width);
+               fprintf(rsp, "\"minHeight\":%u,", c->min_height);
+               fprintf(rsp, "\"maxHeight\":%u,", c->max_height);
+               fprintf(rsp, "\"wmStatesCount\":%i,", c->wm_states_count);
+               fprintf(rsp, "\"wmState\":");
+               query_wm_state(c->wm_state, c->wm_states_count, rsp);
+               fprintf(rsp,",");
+               fprintf(rsp, "\"tiledRectangle\":");
+               query_rectangle(c->tiled_rectangle, rsp);
+               fprintf(rsp,",");
+               fprintf(rsp, "\"floatingRectangle\":");
+               query_rectangle(c->floating_rectangle, rsp);
+               fprintf(rsp, "}");
        }
+}
+
+void query_rectangle(xcb_rectangle_t r, FILE *rsp)
+{
+               fprintf(rsp, "{\"x\":%i,\"y\":%i,\"width\":%u,\"height\":%u}", r.x, r.y, r.width, r.height);
+}
 
-       query_tree(d, n->first_child, rsp, depth + 1);
-       query_tree(d, n->second_child, rsp, depth + 1);
+void query_wm_state(xcb_atom_t *wm_state, int wm_states_count, FILE *rsp)
+{
+       fprintf(rsp, "[");
+       for (int i = 0; i < wm_states_count; i++) {
+               fprintf(rsp, "%u", wm_state[i]);
+               if (i < wm_states_count - 1) {
+                       fprintf(rsp, ",");
+               }
+       }
+       fprintf(rsp, "]");
 }
 
-void query_history(coordinates_t loc, FILE *rsp)
+void query_history(FILE *rsp)
 {
+       fprintf(rsp, "[");
        for (history_t *h = history_head; h != NULL; h = h->next) {
-               if ((loc.monitor != NULL && h->loc.monitor != loc.monitor)
-                               || (loc.desktop != NULL && h->loc.desktop != loc.desktop))
-                       continue;
-               xcb_window_t win = XCB_NONE;
-               if (h->loc.node != NULL)
-                       win = h->loc.node->client->window;
-               fprintf(rsp, "%s %s 0x%X\n", h->loc.monitor->name, h->loc.desktop->name, win);
+               query_coordinates(&h->loc, rsp);
+               if (h->next != NULL) {
+                       fprintf(rsp, ",");
+               }
        }
+       fprintf(rsp, "]");
+}
+
+void query_coordinates(coordinates_t *loc, FILE *rsp)
+{
+       fprintf(rsp, "{\"monitorName\":\"%s\",\"desktopName\":\"%s\",\"nodeId\":%u}", loc->monitor->name, loc->desktop->name, loc->node!=NULL?loc->node->id:0);
 }
 
 void query_stack(FILE *rsp)
 {
-       for (stacking_list_t *s = stack_head; s != NULL; s = s->next)
-               fprintf(rsp, "0x%X\n", s->node->client->window);
+       fprintf(rsp, "[");
+       for (stacking_list_t *s = stack_head; s != NULL; s = s->next) {
+               fprintf(rsp, "%u", s->node->id);
+               if (s->next != NULL) {
+                       fprintf(rsp, ",");
+               }
+       }
+       fprintf(rsp, "]");
 }
 
-void query_windows(coordinates_t loc, FILE *rsp)
+void query_node_ids(coordinates_t loc, node_select_t *sel, FILE *rsp)
 {
        for (monitor_t *m = mon_head; m != NULL; m = m->next) {
-               if (loc.monitor != NULL && m != loc.monitor)
+               if (loc.monitor != NULL && m != loc.monitor) {
                        continue;
+               }
                for (desktop_t *d = m->desk_head; d != NULL; d = d->next) {
-                       if (loc.desktop != NULL && d != loc.desktop)
+                       if (loc.desktop != NULL && d != loc.desktop) {
                                continue;
-                       for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root)) {
-                               if (loc.node != NULL && n != loc.node)
-                                       continue;
-                               fprintf(rsp, "0x%X\n", n->client->window);
                        }
+                       query_node_ids_in(d->root, d, m, loc, sel, rsp);
                }
        }
 }
 
-bool node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
+void query_node_ids_in(node_t *n, desktop_t *d, monitor_t *m, coordinates_t loc, node_select_t *sel, FILE *rsp)
 {
-       client_select_t sel = {CLIENT_TYPE_ALL, CLIENT_CLASS_ALL, CLIENT_MODE_ALL, false, false};
-       char *tok;
-       while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
-               tok[0] = '\0';
-               tok++;
-               if (streq("tiled", tok)) {
-                       sel.type = CLIENT_TYPE_TILED;
-               } else if (streq("floating", tok)) {
-                       sel.type = CLIENT_TYPE_FLOATING;
-               } else if (streq("like", tok)) {
-                       sel.class = CLIENT_CLASS_EQUAL;
-               } else if (streq("unlike", tok)) {
-                       sel.class = CLIENT_CLASS_DIFFER;
-               } else if (streq("manual", tok)) {
-                       sel.mode = CLIENT_MODE_MANUAL;
-               } else if (streq("automatic", tok)) {
-                       sel.mode = CLIENT_MODE_AUTOMATIC;
-               } else if (streq("urgent", tok)) {
-                       sel.urgent = true;
-               } else if (streq("local", tok)) {
-                       sel.local = true;
+       if (n == NULL) {
+               return;
+       } else {
+               coordinates_t ref = {mon, mon->desk, mon->desk->focus};
+               coordinates_t trg = {m, d, n};
+               if ((loc.node == NULL || n == loc.node) &&
+                   (sel == NULL || node_matches(&trg, &ref, *sel))) {
+                       fprintf(rsp, "0x%07X\n", n->id);
                }
+               query_node_ids_in(n->first_child, d, m, loc, sel, rsp);
+               query_node_ids_in(n->second_child, d, m, loc, sel, rsp);
+       }
+}
+
+void query_desktop_names(coordinates_t loc, desktop_select_t *sel, FILE *rsp)
+{
+       for (monitor_t *m = mon_head; m != NULL; m = m->next) {
+               if (loc.monitor != NULL && m != loc.monitor) {
+                       continue;
+               }
+               for (desktop_t *d = m->desk_head; d != NULL; d = d->next) {
+                       coordinates_t ref = {mon, mon->desk, NULL};
+                       coordinates_t trg = {m, d, NULL};
+                       if ((loc.desktop != NULL && d != loc.desktop) ||
+                           (sel != NULL && !desktop_matches(&trg, &ref, *sel))) {
+                               continue;
+                       }
+                       fprintf(rsp, "%s\n", d->name);
+               }
+       }
+}
+
+void query_monitor_names(coordinates_t loc, monitor_select_t *sel, FILE *rsp)
+{
+       for (monitor_t *m = mon_head; m != NULL; m = m->next) {
+               coordinates_t ref = {mon, NULL, NULL};
+               coordinates_t trg = {m, NULL, NULL};
+               if ((loc.monitor != NULL && m != loc.monitor) ||
+                       (sel != NULL && !monitor_matches(&trg, &ref, *sel))) {
+                       continue;
+               }
+               fprintf(rsp, "%s\n", m->name);
+       }
+}
+
+node_select_t make_node_select(void)
+{
+       node_select_t sel = {
+               .automatic = OPTION_NONE,
+               .focused = OPTION_NONE,
+               .local = OPTION_NONE,
+               .leaf = OPTION_NONE,
+               .tiled = OPTION_NONE,
+               .pseudo_tiled = OPTION_NONE,
+               .floating = OPTION_NONE,
+               .fullscreen = OPTION_NONE,
+               .locked = OPTION_NONE,
+               .sticky = OPTION_NONE,
+               .private = OPTION_NONE,
+               .urgent = OPTION_NONE,
+               .same_class = OPTION_NONE,
+               .below = OPTION_NONE,
+               .normal = OPTION_NONE,
+               .above = OPTION_NONE
+       };
+       return sel;
+}
+
+desktop_select_t make_desktop_select(void)
+{
+       desktop_select_t sel = {
+               .occupied = OPTION_NONE,
+               .focused = OPTION_NONE,
+               .urgent = OPTION_NONE,
+               .local = OPTION_NONE
+       };
+       return sel;
+}
+
+monitor_select_t make_monitor_select(void)
+{
+       monitor_select_t sel = {
+               .occupied = OPTION_NONE,
+               .focused = OPTION_NONE
+       };
+       return sel;
+}
+
+bool node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
+{
+       node_select_t sel = make_node_select();
+
+       char *colon = strrchr(desc, ':');
+
+       if (!parse_node_modifiers(colon != NULL ? colon : desc, &sel)) {
+               return false;
        }
 
        dst->monitor = ref->monitor;
@@ -178,8 +344,8 @@ bool node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
        history_dir_t hdi;
        if (parse_direction(desc, &dir)) {
                dst->node = nearest_neighbor(ref->monitor, ref->desktop, ref->node, dir, sel);
-               if (dst->node == NULL && num_monitors > 1) {
-                       monitor_t *m = nearest_monitor(ref->monitor, dir, (desktop_select_t) {DESKTOP_STATUS_ALL, false, false});
+               if (dst->node == NULL && mon_head != mon_tail) {
+                       monitor_t *m = nearest_monitor(ref->monitor, dir, make_monitor_select());
                        if (m != NULL) {
                                coordinates_t loc = {m, m->desk, m->desk->focus};
                                if (node_matches(&loc, ref, sel)) {
@@ -204,10 +370,45 @@ bool node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
                        dst->desktop = mon->desk;
                        dst->node = mon->desk->focus;
                }
+       } else if (*desc == '@') {
+               desc++;
+               if (colon != NULL) {
+                       *colon = '\0';
+                       if (desktop_from_desc(desc, ref, dst)) {
+                               desc = colon + 1;
+                       } else {
+                               return false;
+                       }
+               }
+               dst->node = (*desc == '/' ? dst->desktop->root : dst->desktop->focus);
+               char *move = strtok(desc, PTH_TOK);
+               while (move != NULL && dst->node != NULL) {
+                       if (streq("first", move) || streq("1", move)) {
+                               dst->node = dst->node->first_child;
+                       } else if (streq("second", move) || streq("2", move)) {
+                               dst->node = dst->node->second_child;
+                       } else if (streq("parent", move)) {
+                               dst->node = dst->node->parent;
+                       } else if (streq("brother", move)) {
+                               dst->node = brother_tree(dst->node);
+                       } else {
+                               direction_t dir;
+                               if (parse_direction(move, &dir)) {
+                                       dst->node = find_fence(dst->node, dir);
+                               } else {
+                                       return false;
+                               }
+                       }
+                       move = strtok(NULL, PTH_TOK);
+               }
+               if (dst->node != NULL) {
+                       return node_matches(dst, ref, sel);
+               }
        } else {
-               long int wid;
-               if (parse_window_id(desc, &wid))
-                       locate_window(wid, dst);
+               uint32_t id;
+               if (parse_id(desc, &id) && find_by_id(id, dst)) {
+                       return node_matches(dst, ref, sel);
+               }
        }
 
        return (dst->node != NULL);
@@ -215,27 +416,18 @@ bool node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 
 bool desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 {
-       desktop_select_t sel = {DESKTOP_STATUS_ALL, false, false};
-       char *tok;
-       while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
-               tok[0] = '\0';
-               tok++;
-               if (streq("free", tok)) {
-                       sel.status = DESKTOP_STATUS_FREE;
-               } else if (streq("occupied", tok)) {
-                       sel.status = DESKTOP_STATUS_OCCUPIED;
-               } else if (streq("urgent", tok)) {
-                       sel.urgent = true;
-               } else if (streq("local", tok)) {
-                       sel.local = true;
-               }
+       desktop_select_t sel = make_desktop_select();
+
+       char *colon = strrchr(desc, ':');
+
+       if (!parse_desktop_modifiers(colon != NULL ? colon : desc, &sel)) {
+               return false;
        }
 
        dst->desktop = NULL;
 
        cycle_dir_t cyc;
        history_dir_t hdi;
-       char *colon;
        int idx;
        if (parse_cycle_direction(desc, &cyc)) {
                dst->monitor = ref->monitor;
@@ -250,19 +442,28 @@ bool desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
                        dst->monitor = mon;
                        dst->desktop = mon->desk;
                }
-       } else if ((colon = strchr(desc, ':')) != NULL) {
+       } else if (colon != NULL) {
                *colon = '\0';
                if (monitor_from_desc(desc, ref, dst)) {
                        if (streq("focused", colon + 1)) {
-                               dst->desktop = dst->monitor->desk;
+                               coordinates_t loc = {dst->monitor, dst->monitor->desk, NULL};
+                               if (desktop_matches(&loc, ref, sel)) {
+                                       dst->desktop = dst->monitor->desk;
+                               }
                        } else if (parse_index(colon + 1, &idx)) {
-                               desktop_from_index(idx, dst, dst->monitor);
+                               if (desktop_from_index(idx, dst, dst->monitor)) {
+                                       return desktop_matches(dst, ref, sel);
+                               }
                        }
                }
        } else if (parse_index(desc, &idx)) {
-               desktop_from_index(idx, dst, NULL);
+               if (desktop_from_index(idx, dst, NULL)) {
+                       return desktop_matches(dst, ref, sel);
+               }
        } else {
-               locate_desktop(desc, dst);
+               if (locate_desktop(desc, dst)) {
+                       return desktop_matches(dst, ref, sel);
+               }
        }
 
        return (dst->desktop != NULL);
@@ -270,16 +471,10 @@ bool desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 
 bool monitor_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 {
-       desktop_select_t sel = {DESKTOP_STATUS_ALL, false, false};
-       char *tok;
-       while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
-               tok[0] = '\0';
-               tok++;
-               if (streq("free", tok)) {
-                       sel.status = DESKTOP_STATUS_FREE;
-               } else if (streq("occupied", tok)) {
-                       sel.status = DESKTOP_STATUS_OCCUPIED;
-               }
+       monitor_select_t sel = make_monitor_select();
+
+       if (!parse_monitor_modifiers(desc, &sel)) {
+               return false;
        }
 
        dst->monitor = NULL;
@@ -298,18 +493,24 @@ bool monitor_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
                history_find_monitor(HISTORY_OLDER, ref, dst, sel);
        } else if (streq("primary", desc)) {
                if (pri_mon != NULL) {
-                       coordinates_t loc = {pri_mon, pri_mon->desk, NULL};
-                       if (desktop_matches(&loc, ref, sel))
+                       coordinates_t loc = {pri_mon, NULL, NULL};
+                       if (monitor_matches(&loc, ref, sel)) {
                                dst->monitor = pri_mon;
+                       }
                }
        } else if (streq("focused", desc)) {
-               coordinates_t loc = {mon, mon->desk, NULL};
-               if (desktop_matches(&loc, ref, sel))
+               coordinates_t loc = {mon, NULL, NULL};
+               if (monitor_matches(&loc, ref, sel)) {
                        dst->monitor = mon;
+               }
        } else if (parse_index(desc, &idx)) {
-               monitor_from_index(idx, dst);
+               if (monitor_from_index(idx, dst)) {
+                       monitor_matches(dst, ref, sel);
+               }
        } else {
-               locate_monitor(desc, dst);
+               if (locate_monitor(desc, dst)) {
+                       return monitor_matches(dst, ref, sel);
+               }
        }
 
        return (dst->monitor != NULL);
@@ -317,113 +518,230 @@ bool monitor_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 
 bool locate_window(xcb_window_t win, coordinates_t *loc)
 {
-       for (monitor_t *m = mon_head; m != NULL; m = m->next)
-               for (desktop_t *d = m->desk_head; d != NULL; d = d->next)
-                       for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root))
-                               if (n->client->window == win) {
+       for (monitor_t *m = mon_head; m != NULL; m = m->next) {
+               for (desktop_t *d = m->desk_head; d != NULL; d = d->next) {
+                       for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root)) {
+                               if (n->id == win) {
                                        loc->monitor = m;
                                        loc->desktop = d;
                                        loc->node = n;
                                        return true;
                                }
+                       }
+               }
+       }
        return false;
 }
 
 bool locate_desktop(char *name, coordinates_t *loc)
 {
-       for (monitor_t *m = mon_head; m != NULL; m = m->next)
-               for (desktop_t *d = m->desk_head; d != NULL; d = d->next)
+       for (monitor_t *m = mon_head; m != NULL; m = m->next) {
+               for (desktop_t *d = m->desk_head; d != NULL; d = d->next) {
                        if (streq(d->name, name)) {
                                loc->monitor = m;
                                loc->desktop = d;
                                return true;
                        }
+               }
+       }
        return false;
 }
 
 bool locate_monitor(char *name, coordinates_t *loc)
 {
-       for (monitor_t *m = mon_head; m != NULL; m = m->next)
+       for (monitor_t *m = mon_head; m != NULL; m = m->next) {
                if (streq(m->name, name)) {
                        loc->monitor = m;
                        return true;
                }
+       }
        return false;
 }
 
 bool desktop_from_index(int i, coordinates_t *loc, monitor_t *mm)
 {
        for (monitor_t *m = mon_head; m != NULL; m = m->next) {
-               if (mm != NULL && m != mm)
+               if (mm != NULL && m != mm) {
                        continue;
-               for (desktop_t *d = m->desk_head; d != NULL; d = d->next, i--)
+               }
+               for (desktop_t *d = m->desk_head; d != NULL; d = d->next, i--) {
                        if (i == 1) {
                                loc->monitor = m;
                                loc->desktop = d;
                                loc->node = NULL;
                                return true;
                        }
+               }
        }
        return false;
 }
 
 bool monitor_from_index(int i, coordinates_t *loc)
 {
-       for (monitor_t *m = mon_head; m != NULL; m = m->next, i--)
+       for (monitor_t *m = mon_head; m != NULL; m = m->next, i--) {
                if (i == 1) {
                        loc->monitor = m;
                        loc->desktop = NULL;
                        loc->node = NULL;
                        return true;
                }
+       }
        return false;
 }
 
-bool node_matches(coordinates_t *loc, coordinates_t *ref, client_select_t sel)
+bool node_matches(coordinates_t *loc, coordinates_t *ref, node_select_t sel)
 {
-       if (loc->node == NULL)
+       if (loc->node == NULL) {
                return false;
+       }
 
-       if (sel.type != CLIENT_TYPE_ALL &&
-           is_tiled(loc->node->client)
-           ? sel.type == CLIENT_TYPE_FLOATING
-           : sel.type == CLIENT_TYPE_TILED)
+       if (sel.focused != OPTION_NONE &&
+           loc->node != mon->desk->focus
+           ? sel.focused == OPTION_TRUE
+           : sel.focused == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.class != CLIENT_CLASS_ALL && ref->node != NULL &&
-           streq(loc->node->client->class_name, ref->node->client->class_name)
-           ? sel.class == CLIENT_CLASS_DIFFER
-           : sel.class == CLIENT_CLASS_EQUAL)
+       if (sel.automatic != OPTION_NONE &&
+           loc->node->presel != NULL
+           ? sel.automatic == OPTION_TRUE
+           : sel.automatic == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.mode != CLIENT_MODE_ALL &&
-           loc->node->split_mode == MODE_MANUAL
-           ? sel.mode == CLIENT_MODE_AUTOMATIC
-           : sel.mode == CLIENT_MODE_MANUAL)
+       if (sel.local != OPTION_NONE &&
+           loc->desktop != ref->desktop
+           ? sel.local == OPTION_TRUE
+           : sel.local == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.local && loc->desktop != ref->desktop)
+       if (sel.leaf != OPTION_NONE &&
+           loc->node->client == NULL
+           ? sel.leaf == OPTION_TRUE
+           : sel.leaf == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.urgent && !loc->node->client->urgent)
+#define NFLAG(p) \
+       if (sel.p != OPTION_NONE && \
+           !loc->node->p \
+           ? sel.p == OPTION_TRUE \
+           : sel.p == OPTION_FALSE) { \
+               return false; \
+       }
+       NFLAG(sticky)
+       NFLAG(private)
+       NFLAG(locked)
+#undef WFLAG
+
+       if (loc->node->client == NULL &&
+               (sel.same_class != OPTION_NONE ||
+                sel.tiled != OPTION_NONE ||
+                sel.pseudo_tiled != OPTION_NONE ||
+                sel.floating != OPTION_NONE ||
+                sel.fullscreen != OPTION_NONE ||
+                sel.below != OPTION_NONE ||
+                sel.normal != OPTION_NONE ||
+                sel.above != OPTION_NONE ||
+                sel.urgent != OPTION_NONE)) {
                return false;
+       }
+
+       if (ref->node != NULL && ref->node->client != NULL &&
+           sel.same_class != OPTION_NONE &&
+           streq(loc->node->client->class_name, ref->node->client->class_name)
+           ? sel.same_class == OPTION_FALSE
+           : sel.same_class == OPTION_TRUE) {
+               return false;
+       }
+
+#define WSTATE(p, e) \
+       if (sel.p != OPTION_NONE && \
+           loc->node->client->state != e \
+           ? sel.p == OPTION_TRUE \
+           : sel.p == OPTION_FALSE) { \
+               return false; \
+       }
+       WSTATE(tiled, STATE_TILED)
+       WSTATE(pseudo_tiled, STATE_PSEUDO_TILED)
+       WSTATE(floating, STATE_FLOATING)
+       WSTATE(fullscreen, STATE_FULLSCREEN)
+#undef WSTATE
+
+#define WLAYER(p, e) \
+       if (sel.p != OPTION_NONE && \
+           loc->node->client->layer != e \
+           ? sel.p == OPTION_TRUE \
+           : sel.p == OPTION_FALSE) { \
+               return false; \
+       }
+       WLAYER(below, LAYER_BELOW)
+       WLAYER(normal, LAYER_NORMAL)
+       WLAYER(above, LAYER_ABOVE)
+#undef WLAYER
+
+#define WFLAG(p) \
+       if (sel.p != OPTION_NONE && \
+           !loc->node->client->p \
+           ? sel.p == OPTION_TRUE \
+           : sel.p == OPTION_FALSE) { \
+               return false; \
+       }
+       WFLAG(urgent)
+#undef WFLAG
 
        return true;
 }
 
 bool desktop_matches(coordinates_t *loc, coordinates_t *ref, desktop_select_t sel)
 {
-       if (sel.status != DESKTOP_STATUS_ALL &&
+       if (sel.occupied != OPTION_NONE &&
            loc->desktop->root == NULL
-           ? sel.status == DESKTOP_STATUS_OCCUPIED
-           : sel.status == DESKTOP_STATUS_FREE)
+           ? sel.occupied == OPTION_TRUE
+           : sel.occupied == OPTION_FALSE) {
+               return false;
+       }
+
+       if (sel.focused != OPTION_NONE &&
+           mon->desk != loc->desktop
+           ? sel.focused == OPTION_TRUE
+           : sel.focused == OPTION_FALSE) {
+               return false;
+       }
+
+       if (sel.urgent != OPTION_NONE &&
+           !is_urgent(loc->desktop)
+           ? sel.urgent == OPTION_TRUE
+           : sel.urgent == OPTION_FALSE) {
+               return false;
+       }
+
+       if (sel.local != OPTION_NONE &&
+           ref->monitor != loc->monitor
+           ? sel.local == OPTION_TRUE
+           : sel.local == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.urgent && !is_urgent(loc->desktop))
+       return true;
+}
+
+bool monitor_matches(coordinates_t *loc, __attribute__((unused)) coordinates_t *ref, monitor_select_t sel)
+{
+       if (sel.occupied != OPTION_NONE &&
+           loc->monitor->desk->root == NULL
+           ? sel.occupied == OPTION_TRUE
+           : sel.occupied == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.local && ref->monitor != loc->monitor)
+       if (sel.focused != OPTION_NONE &&
+           mon != loc->monitor
+           ? sel.focused == OPTION_TRUE
+           : sel.focused == OPTION_FALSE) {
                return false;
+       }
 
        return true;
 }