-#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include "bspwm.h"
#include "tree.h"
-#include "settings.h"
#include "messages.h"
+#include "history.h"
#include "query.h"
void query_monitors(coordinates_t loc, domain_t dom, char *rsp)
strncat(rsp, line, REMLEN(rsp));
continue;
} else {
- snprintf(line, sizeof(line), "%s %ux%u%+i%+i", m->name, m->rectangle.width, m->rectangle.height, m->rectangle.x, m->rectangle.y);
+ snprintf(line, sizeof(line), "%s %ux%u%+i%+i %i,%i,%i,%i", 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, line, REMLEN(rsp));
continue;
} else {
- snprintf(line, sizeof(line), "%s %c", d->name, (d->layout == LAYOUT_TILED ? 'T' : 'M'));
+ snprintf(line, sizeof(line), "%s %i %c", d->name, d->window_gap, (d->layout == LAYOUT_TILED ? 'T' : 'M'));
strncat(rsp, line, REMLEN(rsp));
if (d == m->desk)
strncat(rsp, " @", REMLEN(rsp));
if (is_leaf(n)) {
client_t *c = n->client;
- snprintf(line, sizeof(line), "%c %s %X %u %ux%u%+i%+i %c%c%c%c%c", (n->birth_rotation == 90 ? 'a' : (n->birth_rotation == 270 ? 'c' : 'm')), c->class_name, c->window, c->border_width, c->floating_rectangle.width, c->floating_rectangle.height, c->floating_rectangle.x, c->floating_rectangle.y, (c->floating ? 'f' : '-'), (c->transient ? 't' : '-'), (c->fullscreen ? 'F' : '-'), (c->urgent ? 'u' : '-'), (c->locked ? 'l' : '-'));
+ snprintf(line, sizeof(line), "%c %s %X %u %ux%u%+i%+i %c %c%c%c%c%c%c", (n->birth_rotation == 90 ? 'a' : (n->birth_rotation == 270 ? 'c' : 'm')), c->class_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->transient ? 't' : '-'), (c->fullscreen ? 'F' : '-'), (c->urgent ? 'u' : '-'), (c->locked ? 'l' : '-'), (n->split_mode ? 'p' : '-'));
} else {
snprintf(line, sizeof(line), "%c %c %.2f", (n->split_type == TYPE_HORIZONTAL ? 'H' : 'V'), (n->birth_rotation == 90 ? 'a' : (n->birth_rotation == 270 ? 'c' : 'm')), n->split_ratio);
}
client_select_t sel;
sel.type = CLIENT_TYPE_ALL;
sel.class = CLIENT_CLASS_ALL;
+ sel.mode = CLIENT_MODE_ALL;
+ sel.urgency = CLIENT_URGENCY_ALL;
char *tok;
while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
tok[0] = '\0';
sel.class = CLIENT_CLASS_EQUAL;
} else if (streq("unlike", tok)) {
sel.class = CLIENT_CLASS_DIFFER;
+ } else if (streq("automatic", tok)) {
+ sel.mode = CLIENT_MODE_AUTOMATIC;
+ } else if (streq("manual", tok)) {
+ sel.mode = CLIENT_MODE_MANUAL;
+ } else if (streq("urgent", tok)) {
+ sel.urgency = CLIENT_URGENCY_ON;
+ } else if (streq("nonurgent", tok)) {
+ sel.urgency = CLIENT_URGENCY_OFF;
}
}
direction_t dir;
cycle_dir_t cyc;
if (parse_direction(desc, &dir)) {
- dst->node = nearest_neighbor(dst->desktop, ref->node, dir);
+ dst->node = nearest_neighbor(dst->desktop, ref->node, dir, sel);
} else if (parse_cycle_direction(desc, &cyc)) {
dst->node = closest_node(ref->desktop, ref->node, cyc, sel);
} else if (streq("last", desc)) {
- dst->node = history_get(ref->desktop->history, 1);
+ dst->node = history_last(ref->desktop->history, ref->node, sel);
} else if (streq("biggest", desc)) {
- dst->node = find_biggest(ref->desktop);
+ dst->node = find_biggest(ref->desktop, ref->node, sel);
} else if (streq("focused", desc)) {
- dst->monitor = mon;
- dst->desktop = mon->desk;
- dst->node = mon->desk->focus;
+ if (node_matches(ref->node, mon->desk->focus, sel)) {
+ dst->monitor = mon;
+ dst->desktop = mon->desk;
+ dst->node = mon->desk->focus;
+ }
} else {
long int wid;
if (parse_window_id(desc, &wid))
bool desktop_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
{
desktop_select_t sel;
- sel = DESKTOP_ALL;
+ sel.status = DESKTOP_STATUS_ALL;
+ sel.urgency = DESKTOP_URGENCY_ALL;
char *tok;
while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
tok[0] = '\0';
tok++;
if (streq("free", tok)) {
- sel = DESKTOP_FREE;
+ sel.status = DESKTOP_STATUS_FREE;
} else if (streq("occupied", tok)) {
- sel = DESKTOP_OCCUPIED;
+ sel.status = DESKTOP_STATUS_OCCUPIED;
+ } else if (streq("urgent", tok)) {
+ sel.urgency = DESKTOP_URGENCY_ON;
+ } else if (streq("nonurgent", tok)) {
+ sel.urgency = DESKTOP_URGENCY_OFF;
}
}
dst->desktop = NULL;
cycle_dir_t cyc;
+ int idx;
if (parse_cycle_direction(desc, &cyc)) {
dst->monitor = ref->monitor;
dst->desktop = closest_desktop(ref->monitor, ref->desktop, cyc, sel);
+ } else if (parse_index(desc, &idx)) {
+ desktop_from_index(idx, dst);
} else if (streq("last", desc)) {
- dst->monitor = mon;
- dst->desktop = mon->last_desk;
+ if (mon->last_desk != NULL && desktop_matches(mon->last_desk, sel)) {
+ dst->monitor = mon;
+ dst->desktop = mon->last_desk;
+ }
} else if (streq("focused", desc)) {
- dst->monitor = mon;
- dst->desktop = mon->desk;
+ if (desktop_matches(mon->desk, sel)) {
+ dst->monitor = mon;
+ dst->desktop = mon->desk;
+ }
} else {
locate_desktop(desc, dst);
}
bool monitor_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
{
desktop_select_t sel;
- sel = DESKTOP_ALL;
+ sel.status = DESKTOP_STATUS_ALL;
+ sel.urgency = DESKTOP_URGENCY_ALL;
char *tok;
while ((tok = strrchr(desc, CAT_CHR)) != NULL) {
tok[0] = '\0';
tok++;
if (streq("free", tok)) {
- sel = DESKTOP_FREE;
+ sel.status = DESKTOP_STATUS_FREE;
} else if (streq("occupied", tok)) {
- sel = DESKTOP_OCCUPIED;
+ sel.status = DESKTOP_STATUS_OCCUPIED;
}
}
direction_t dir;
cycle_dir_t cyc;
+ int idx;
if (parse_direction(desc, &dir)) {
- dst->monitor = nearest_monitor(ref->monitor, dir);
+ dst->monitor = nearest_monitor(ref->monitor, dir, sel);
} else if (parse_cycle_direction(desc, &cyc)) {
dst->monitor = closest_monitor(ref->monitor, cyc, sel);
+ } else if (parse_index(desc, &idx)) {
+ monitor_from_index(idx, dst);
} else if (streq("last", desc)) {
- dst->monitor = last_mon;
+ if (last_mon != NULL && desktop_matches(last_mon->desk, sel))
+ dst->monitor = last_mon;
+ } else if (streq("primary", desc)) {
+ if (pri_mon != NULL && desktop_matches(pri_mon->desk, sel))
+ dst->monitor = pri_mon;
} else if (streq("focused", desc)) {
- dst->monitor = mon;
+ if (desktop_matches(mon->desk, sel))
+ dst->monitor = mon;
} else {
locate_monitor(desc, dst);
}
}
return false;
}
+
+bool desktop_from_index(int i, 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, 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--)
+ if (i == 1) {
+ loc->monitor = m;
+ loc->desktop = NULL;
+ loc->node = NULL;
+ return true;
+ }
+ return false;
+}
+
+/**
+ * Check if the specified node matches the selection criteria.
+ *
+ * Arguments:
+ * node_t *c - the active node
+ * node_t *t - the node to test
+ * client_sel_t sel - the selection criteria
+ *
+ * Returns true if the node matches.
+ **/
+bool node_matches(node_t *c, node_t *t, client_select_t sel)
+{
+ if (sel.type != CLIENT_TYPE_ALL &&
+ is_tiled(t->client)
+ ? sel.type == CLIENT_TYPE_FLOATING
+ : sel.type == CLIENT_TYPE_TILED
+ ) return false;
+
+ if (sel.class != CLIENT_CLASS_ALL &&
+ streq(c->client->class_name, t->client->class_name)
+ ? sel.class == CLIENT_CLASS_DIFFER
+ : sel.class == CLIENT_CLASS_EQUAL
+ ) return false;
+
+ if (sel.mode != CLIENT_MODE_ALL &&
+ t->split_mode == MODE_MANUAL
+ ? sel.mode == CLIENT_MODE_AUTOMATIC
+ : sel.mode == CLIENT_MODE_MANUAL)
+ return false;
+
+ if (sel.urgency != CLIENT_URGENCY_ALL &&
+ t->client->urgent
+ ? sel.urgency == CLIENT_URGENCY_OFF
+ : sel.urgency == CLIENT_URGENCY_ON
+ ) return false;
+
+ return true;
+}
+
+bool desktop_matches(desktop_t *t, desktop_select_t sel) {
+ if (sel.status != DESKTOP_STATUS_ALL &&
+ t->root == NULL
+ ? sel.status == DESKTOP_STATUS_OCCUPIED
+ : sel.status == DESKTOP_STATUS_FREE
+ ) return false;
+
+ if (sel.urgency != DESKTOP_URGENCY_ALL &&
+ is_urgent(t)
+ ? sel.urgency == DESKTOP_URGENCY_OFF
+ : sel.urgency == DESKTOP_URGENCY_ON
+ ) return false;
+
+ return true;
+}
projects / bspwm.git / blobdiff