]> git.lizzy.rs Git - bspwm.git/blobdiff - query.c
Neutralize obscuring windows in `pseudo_focus`
[bspwm.git] / query.c
diff --git a/query.c b/query.c
index c737b388e2c4724755869014446a6b34e0378c34..767d10d55867f0d6def34f753d4d1a3f107e3df8 100644 (file)
--- a/query.c
+++ b/query.c
@@ -1,16 +1,15 @@
-/*
- * 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
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * 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 <stdlib.h>
 #include <strings.h>
 #include <string.h>
 #include "bspwm.h"
 #include "tree.h"
 #include "query.h"
 
-void query_monitors(coordinates_t loc, domain_t dom, char *rsp)
+void query_monitors(coordinates_t loc, domain_t dom, FILE *rsp)
 {
-       char line[MAXLEN];
        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) {
-                               snprintf(line, sizeof(line), "%s\n", m->name);
-                               strncat(rsp, line, REMLEN(rsp));
+                               fprintf(rsp, "%s\n", m->name);
                                continue;
                        } else {
-                               snprintf(line, sizeof(line), "%s %ux%u%+i%+i %i,%i,%i,%i", m->name,
+                               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);
-                               strncat(rsp, line, REMLEN(rsp));
-                               if (m == mon)
-                                       strncat(rsp, " *", REMLEN(rsp));
-                               strncat(rsp, "\n", REMLEN(rsp));
+                                        m->top_padding, m->right_padding, m->bottom_padding, m->left_padding,
+                                        (m == mon ? " *" : ""));
                        }
                }
                query_desktops(m, dom, loc, (dom == DOMAIN_DESKTOP ? 0 : 1), rsp);
        }
 }
 
-void query_desktops(monitor_t *m, domain_t dom, coordinates_t loc, unsigned int depth, char *rsp)
+void query_desktops(monitor_t *m, domain_t dom, coordinates_t loc, unsigned int depth, FILE *rsp)
 {
-       char line[MAXLEN];
        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++)
-                       strncat(rsp, "  ", REMLEN(rsp));
+                       fprintf(rsp, "\t");
                if (dom == DOMAIN_DESKTOP) {
-                       snprintf(line, sizeof(line), "%s\n", d->name);
-                       strncat(rsp, line, REMLEN(rsp));
+                       fprintf(rsp, "%s\n", d->name);
                        continue;
                } else {
-                       snprintf(line, sizeof(line), "%s %u %i %i,%i,%i,%i %c %c", 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' : '-'));
-                       strncat(rsp, line, REMLEN(rsp));
-                       if (d == m->desk)
-                               strncat(rsp, " *", REMLEN(rsp));
-                       strncat(rsp, "\n", REMLEN(rsp));
+                       fprintf(rsp, "%s %u %i %i,%i,%i,%i %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 == m->desk ? " *" : ""));
                }
                query_tree(d, d->root, rsp, depth + 1);
        }
 }
 
-void query_tree(desktop_t *d, node_t *n, char *rsp, unsigned int depth)
+void query_tree(desktop_t *d, node_t *n, FILE *rsp, unsigned int depth)
 {
        if (n == NULL)
                return;
 
-       char line[MAXLEN];
-
        for (unsigned int i = 0; i < depth; i++)
-               strncat(rsp, "  ", REMLEN(rsp));
+               fprintf(rsp, "\t");
 
        if (is_leaf(n)) {
                client_t *c = n->client;
-               snprintf(line, sizeof(line), "%c %s %s 0x%X %u %ux%u%+i%+i %c %c%c%c%c%c%c%c%c",
+               fprintf(rsp, "%c %s %s 0x%X %u %ux%u%+i%+i %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->split_mode == MODE_AUTOMATIC ? '-' : 'p'),
+                        (c->state == STATE_TILED ? '-' : (c->state == STATE_FLOATING ? 'f' : (c->state == STATE_FULLSCREEN ? 'F' : 'p'))),
+                        (c->layer == LAYER_NORMAL ? '-' : (c->layer == LAYER_ABOVE ? 'a' : 'b')),
+                        (c->urgent ? 'u' : '-'), (c->locked ? 'l' : '-'), (c->sticky ? 's' : '-'), (c->private ? 'i' : '-'),
+                        (n == d->focus ? " *" : ""));
        } else {
-               snprintf(line, sizeof(line), "%c %c %lf", (n->split_type == TYPE_HORIZONTAL ? 'H' : 'V'),
+               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);
        }
 
-       strncat(rsp, line, REMLEN(rsp));
-
-       if (n == d->focus)
-               strncat(rsp, " *", REMLEN(rsp));
-       strncat(rsp, "\n", REMLEN(rsp));
-
        query_tree(d, n->first_child, rsp, depth + 1);
        query_tree(d, n->second_child, rsp, depth + 1);
 }
 
-void query_history(coordinates_t loc, char *rsp)
+void query_history(coordinates_t loc, FILE *rsp)
 {
-       char line[MAXLEN];
        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))
@@ -134,26 +114,18 @@ void query_history(coordinates_t loc, char *rsp)
                xcb_window_t win = XCB_NONE;
                if (h->loc.node != NULL)
                        win = h->loc.node->client->window;
-               snprintf(line, sizeof(line), "%s %s 0x%X", h->loc.monitor->name, h->loc.desktop->name, win);
-               strncat(rsp, line, REMLEN(rsp));
-               strncat(rsp, "\n", REMLEN(rsp));
+               fprintf(rsp, "%s %s 0x%X\n", h->loc.monitor->name, h->loc.desktop->name, win);
        }
 }
 
-void query_stack(char *rsp)
+void query_stack(FILE *rsp)
 {
-       char line[MAXLEN];
-       for (stacking_list_t *s = stack_head; s != NULL; s = s->next) {
-               snprintf(line, sizeof(line), "0x%X", s->node->client->window);
-               strncat(rsp, line, REMLEN(rsp));
-               strncat(rsp, "\n", REMLEN(rsp));
-       }
+       for (stacking_list_t *s = stack_head; s != NULL; s = s->next)
+               fprintf(rsp, "0x%X\n", s->node->client->window);
 }
 
-void query_windows(coordinates_t loc, char *rsp)
+void query_windows(coordinates_t loc, FILE *rsp)
 {
-       char line[MAXLEN];
-
        for (monitor_t *m = mon_head; m != NULL; m = m->next) {
                if (loc.monitor != NULL && m != loc.monitor)
                        continue;
@@ -163,34 +135,111 @@ void query_windows(coordinates_t loc, char *rsp)
                        for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root)) {
                                if (loc.node != NULL && n != loc.node)
                                        continue;
-                               snprintf(line, sizeof(line), "0x%X\n", n->client->window);
-                               strncat(rsp, line, REMLEN(rsp));
+                               fprintf(rsp, "0x%X\n", n->client->window);
                        }
                }
        }
 }
 
+client_select_t make_client_select(void)
+{
+       client_select_t sel = {
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE,
+               NULL
+       };
+       return sel;
+}
+
+desktop_select_t make_desktop_select(void)
+{
+       desktop_select_t sel = {
+               OPTION_NONE,
+               OPTION_NONE,
+               OPTION_NONE
+       };
+       return sel;
+}
+
+void cleanup_client_select(client_select_t *sel)
+{
+       free(sel->layer);
+}
+
 bool node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 {
-       client_select_t sel = {CLIENT_TYPE_ALL, CLIENT_CLASS_ALL, false, false, false};
+       client_select_t sel = make_client_select();
        char *tok;
        while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
                tok[0] = '\0';
                tok++;
                if (streq("tiled", tok)) {
-                       sel.type = CLIENT_TYPE_TILED;
+                       sel.tiled = OPTION_TRUE;
+               } else if (streq("nontiled", tok)) {
+                       sel.tiled = OPTION_FALSE;
+               } else if (streq("pseudotiled", tok)) {
+                       sel.pseudo_tiled = OPTION_TRUE;
+               } else if (streq("nonpseudotiled", tok)) {
+                       sel.pseudo_tiled = OPTION_FALSE;
                } else if (streq("floating", tok)) {
-                       sel.type = CLIENT_TYPE_FLOATING;
+                       sel.floating = OPTION_TRUE;
+               } else if (streq("nonfloating", tok)) {
+                       sel.floating = OPTION_FALSE;
                } else if (streq("like", tok)) {
-                       sel.class = CLIENT_CLASS_EQUAL;
+                       sel.same_class = OPTION_TRUE;
                } else if (streq("unlike", tok)) {
-                       sel.class = CLIENT_CLASS_DIFFER;
-               } else if (streq("urgent", tok)) {
-                       sel.urgent = true;
+                       sel.same_class = OPTION_FALSE;
+               } else if (streq("automatic", tok)) {
+                       sel.automatic = OPTION_TRUE;
                } else if (streq("manual", tok)) {
-                       sel.manual = true;
+                       sel.automatic = OPTION_FALSE;
+               } else if (streq("fullscreen", tok)) {
+                       sel.fullscreen = OPTION_TRUE;
+               } else if (streq("nonfullscreen", tok)) {
+                       sel.fullscreen = OPTION_FALSE;
+               } else if (streq("urgent", tok)) {
+                       sel.urgent = OPTION_TRUE;
+               } else if (streq("nonurgent", tok)) {
+                       sel.urgent = OPTION_FALSE;
                } else if (streq("local", tok)) {
-                       sel.local = true;
+                       sel.local = OPTION_TRUE;
+               } else if (streq("foreign", tok)) {
+                       sel.local = OPTION_FALSE;
+               } else if (streq("private", tok)) {
+                       sel.private = OPTION_TRUE;
+               } else if (streq("public", tok)) {
+                       sel.private = OPTION_FALSE;
+               } else if (streq("sticky", tok)) {
+                       sel.sticky = OPTION_TRUE;
+               } else if (streq("nonsticky", tok)) {
+                       sel.sticky = OPTION_FALSE;
+               } else if (streq("locked", tok)) {
+                       sel.locked = OPTION_TRUE;
+               } else if (streq("unlocked", tok)) {
+                       sel.locked = OPTION_FALSE;
+               } else if (streq("focused", tok)) {
+                       sel.focused = OPTION_TRUE;
+               } else if (streq("unfocused", tok)) {
+                       sel.focused = OPTION_FALSE;
+               } else if (streq("below", tok)) {
+                       sel.layer = malloc(sizeof(stack_layer_t));
+                       *(sel.layer) = LAYER_BELOW;
+               } else if (streq("normal", tok)) {
+                       sel.layer = malloc(sizeof(stack_layer_t));
+                       *(sel.layer) = LAYER_NORMAL;
+               } else if (streq("above", tok)) {
+                       sel.layer = malloc(sizeof(stack_layer_t));
+                       *(sel.layer) = LAYER_ABOVE;
                }
        }
 
@@ -203,6 +252,17 @@ 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, make_desktop_select());
+                       if (m != NULL) {
+                               coordinates_t loc = {m, m->desk, m->desk->focus};
+                               if (node_matches(&loc, ref, sel)) {
+                                       dst->monitor = m;
+                                       dst->desktop = m->desk;
+                                       dst->node = m->desk->focus;
+                               }
+                       }
+               }
        } else if (parse_cycle_direction(desc, &cyc)) {
                dst->node = closest_node(ref->monitor, ref->desktop, ref->node, cyc, sel);
        } else if (parse_history_direction(desc, &hdi)) {
@@ -224,24 +284,30 @@ bool node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
                        locate_window(wid, dst);
        }
 
+       cleanup_client_select(&sel);
+
        return (dst->node != NULL);
 }
 
 bool desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 {
-       desktop_select_t sel = {DESKTOP_STATUS_ALL, false, false};
+       desktop_select_t sel = make_desktop_select();
        char *tok;
        while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
                tok[0] = '\0';
                tok++;
                if (streq("free", tok)) {
-                       sel.status = DESKTOP_STATUS_FREE;
+                       sel.occupied = OPTION_FALSE;
                } else if (streq("occupied", tok)) {
-                       sel.status = DESKTOP_STATUS_OCCUPIED;
+                       sel.occupied = OPTION_TRUE;
                } else if (streq("urgent", tok)) {
-                       sel.urgent = true;
+                       sel.urgent = OPTION_TRUE;
+               } else if (streq("nonurgent", tok)) {
+                       sel.urgent = OPTION_FALSE;
                } else if (streq("local", tok)) {
-                       sel.local = true;
+                       sel.local = OPTION_TRUE;
+               } else if (streq("foreign", tok)) {
+                       sel.local = OPTION_FALSE;
                }
        }
 
@@ -264,13 +330,17 @@ bool desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
                        dst->monitor = mon;
                        dst->desktop = mon->desk;
                }
-       } else if ((colon = index(desc, ':')) != NULL) {
+       } else if ((colon = strchr(desc, ':')) != NULL) {
                *colon = '\0';
-               if (streq("focused", desc))
-                       if (monitor_from_desc(colon + 1, ref, dst))
+               if (monitor_from_desc(desc, ref, dst)) {
+                       if (streq("focused", colon + 1)) {
                                dst->desktop = dst->monitor->desk;
+                       } else if (parse_index(colon + 1, &idx)) {
+                               desktop_from_index(idx, dst, dst->monitor);
+                       }
+               }
        } else if (parse_index(desc, &idx)) {
-               desktop_from_index(idx, dst);
+               desktop_from_index(idx, dst, NULL);
        } else {
                locate_desktop(desc, dst);
        }
@@ -280,15 +350,15 @@ 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};
+       desktop_select_t sel = make_desktop_select();
        char *tok;
        while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
                tok[0] = '\0';
                tok++;
                if (streq("free", tok)) {
-                       sel.status = DESKTOP_STATUS_FREE;
+                       sel.occupied = OPTION_FALSE;
                } else if (streq("occupied", tok)) {
-                       sel.status = DESKTOP_STATUS_OCCUPIED;
+                       sel.occupied = OPTION_TRUE;
                }
        }
 
@@ -361,9 +431,11 @@ bool locate_monitor(char *name, coordinates_t *loc)
        return false;
 }
 
-bool desktop_from_index(int i, coordinates_t *loc)
+bool desktop_from_index(int i, coordinates_t *loc, monitor_t *mm)
 {
-       for (monitor_t *m = mon_head; m != NULL; m = m->next)
+       for (monitor_t *m = mon_head; m != NULL; m = m->next) {
+               if (mm != NULL && m != mm)
+                       continue;
                for (desktop_t *d = m->desk_head; d != NULL; d = d->next, i--)
                        if (i == 1) {
                                loc->monitor = m;
@@ -371,6 +443,7 @@ bool desktop_from_index(int i, coordinates_t *loc)
                                loc->node = NULL;
                                return true;
                        }
+       }
        return false;
 }
 
@@ -388,43 +461,107 @@ bool monitor_from_index(int i, coordinates_t *loc)
 
 bool node_matches(coordinates_t *loc, coordinates_t *ref, client_select_t sel)
 {
-       if (sel.type != CLIENT_TYPE_ALL &&
-           is_tiled(loc->node->client)
-           ? sel.type == CLIENT_TYPE_FLOATING
-           : sel.type == CLIENT_TYPE_TILED)
+       if (loc->node == NULL)
+               return false;
+
+#define WSTATE(prop) \
+       if (sel.prop != OPTION_NONE && \
+           !loc->node->client->prop \
+           ? sel.prop == OPTION_TRUE \
+           : sel.prop == OPTION_FALSE) { \
+               return false; \
+       }
+       WSTATE(locked)
+       WSTATE(sticky)
+       WSTATE(private)
+       WSTATE(urgent)
+#undef MATCHSTATE
+
+       if (sel.tiled != OPTION_NONE &&
+           loc->node->client->state != STATE_TILED
+           ? sel.tiled == OPTION_TRUE
+           : sel.tiled == OPTION_FALSE) {
+               return false;
+       }
+
+       if (sel.pseudo_tiled != OPTION_NONE &&
+           loc->node->client->state != STATE_PSEUDO_TILED
+           ? sel.pseudo_tiled == OPTION_TRUE
+           : sel.pseudo_tiled == OPTION_FALSE) {
+               return false;
+       }
+
+       if (sel.floating != OPTION_NONE &&
+           loc->node->client->state != STATE_FLOATING
+           ? sel.floating == OPTION_TRUE
+           : sel.floating == OPTION_FALSE) {
+               return false;
+       }
+
+       if (sel.fullscreen != OPTION_NONE &&
+           loc->node->client->state != STATE_FULLSCREEN
+           ? sel.fullscreen == OPTION_TRUE
+           : sel.fullscreen == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.class != CLIENT_CLASS_ALL &&
+       if (sel.same_class != OPTION_NONE && ref->node != NULL &&
            streq(loc->node->client->class_name, ref->node->client->class_name)
-           ? sel.class == CLIENT_CLASS_DIFFER
-           : sel.class == CLIENT_CLASS_EQUAL)
+           ? sel.same_class == OPTION_FALSE
+           : sel.same_class == OPTION_TRUE) {
+               return false;
+       }
+
+       if (sel.automatic != OPTION_NONE &&
+           loc->node->split_mode == MODE_MANUAL
+           ? sel.automatic == OPTION_TRUE
+           : sel.automatic == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.manual && loc->node->split_mode != 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.layer != NULL && loc->node->client->layer != *(sel.layer)) {
                return false;
+       }
 
-       if (sel.urgent && !loc->node->client->urgent)
+       if (sel.focused != OPTION_NONE &&
+           loc->node != loc->desktop->focus
+           ? sel.focused == OPTION_TRUE
+           : sel.focused == OPTION_FALSE) {
                return false;
+       }
 
        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.urgent && !is_urgent(loc->desktop))
+       if (sel.urgent != OPTION_NONE &&
+           !is_urgent(loc->desktop)
+           ? sel.urgent == OPTION_TRUE
+           : sel.urgent == OPTION_FALSE) {
                return false;
+       }
 
-       if (sel.local && ref->monitor != loc->monitor)
+       if (sel.local != OPTION_NONE &&
+           ref->monitor != loc->monitor
+           ? sel.local == OPTION_TRUE
+           : sel.local == OPTION_FALSE) {
                return false;
+       }
 
        return true;
 }