query: extend "monitor" query & add missing docs

diff --git a/docs/labwc-actions.5.scd b/docs/labwc-actions.5.scd
index a417d15897f7143a68e7e9f8a3e215a82852b21b..d008260710b92e88d4f65c69bd0ed5c01df42d15 100644 (file)
--- a/docs/labwc-actions.5.scd
+++ b/docs/labwc-actions.5.scd
@@ -425,6 +425,11 @@ Actions that execute other actions. Used in keyboard/mouse bindings.
                        Whether the client has full server-side decorations,
                        borders only, or no server-side decorations.
 
+               *monitor* [current|left|right|<monitor_name>]
+                       Whether the client is on a monitor relative to the to
+                       the currently focused monitor (current, left, or right)
+                       or on a monitor with the supplied <monitor_name>.
+
                This argument is optional.
 
        *then*

diff --git a/src/view.c b/src/view.c
index 1d8dc7f954c6b6ceeb96fc59c2cb8db114a8ed46..df7a1116039cbc55c8840bd677caebdca3cb6d6d 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -199,8 +199,20 @@ view_matches_query(struct view *view, struct view_query *query)
        }
 
        if (query->monitor) {
-               struct output *target = output_from_name(view->server, query->monitor);
-               if (target != view->output) {
+               struct output *current = output_nearest_to_cursor(view->server);
+
+               if (!strcasecmp(query->monitor, "current") && current != view->output) {
+                       return false;
+               }
+               if (!strcasecmp(query->monitor, "left") &&
+                       output_get_adjacent(current, VIEW_EDGE_LEFT, false) != view->output) {
+                       return false;
+               }
+               if (!strcasecmp(query->monitor, "right") &&
+                       output_get_adjacent(current, VIEW_EDGE_RIGHT, false) != view->output) {
+                       return false;
+               }
+               if (output_from_name(view->server, query->monitor) != view->output) {
                        return false;
                }
        }