mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 14:04:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

commands: implement 3 missing criteria from i3

Browse Source 
* con_id
* floating
* tiling
This commit is contained in:
lbonn 2017-10-08 00:24:42 +02:00
parent fd7c4bacbd
commit d879e5b15d
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sway/criteria.c
View File

@ -12,9 +12,12 @@
enum criteria_type { // *must* keep in sync with criteria_strings[] enum criteria_type { // *must* keep in sync with criteria_strings[]
CRIT_CLASS, CRIT_CLASS,
CRIT_CON_ID,
CRIT_CON_MARK, CRIT_CON_MARK,
CRIT_FLOATING,
CRIT_ID, CRIT_ID,
CRIT_INSTANCE, CRIT_INSTANCE,
CRIT_TILING,
CRIT_TITLE, CRIT_TITLE,
CRIT_URGENT, CRIT_URGENT,
CRIT_WINDOW_ROLE, CRIT_WINDOW_ROLE,
@ -25,9 +28,12 @@ enum criteria_type { // *must* keep in sync with criteria_strings[]
static const char * const criteria_strings[CRIT_LAST] = { static const char * const criteria_strings[CRIT_LAST] = {
[CRIT_CLASS] = "class", [CRIT_CLASS] = "class",
[CRIT_CON_ID] = "con_id",
[CRIT_CON_MARK] = "con_mark", [CRIT_CON_MARK] = "con_mark",
[CRIT_FLOATING] = "floating",
[CRIT_ID] = "id", [CRIT_ID] = "id",
[CRIT_INSTANCE] = "instance", [CRIT_INSTANCE] = "instance",
[CRIT_TILING] = "tiling",
[CRIT_TITLE] = "title", [CRIT_TITLE] = "title",
[CRIT_URGENT] = "urgent", // either "latest" or "oldest" ... [CRIT_URGENT] = "urgent", // either "latest" or "oldest" ...
[CRIT_WINDOW_ROLE] = "window_role", [CRIT_WINDOW_ROLE] = "window_role",
@ -263,6 +269,15 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
matches++; matches++;
} }
break; break;
case CRIT_CON_ID: {
char *endptr;
size_t crit_id = strtoul(crit->raw, &endptr, 10);
if (*endptr == 0 && cont->id == crit_id) {
++matches;
}
break;
}
case CRIT_CON_MARK: case CRIT_CON_MARK:
if (crit->regex && cont->marks && (list_seq_find(cont->marks, (int (*)(const void *, const void *))regex_cmp, crit->regex) != -1)) { if (crit->regex && cont->marks && (list_seq_find(cont->marks, (int (*)(const void *, const void *))regex_cmp, crit->regex) != -1)) {
// Make sure it isn't matching the NUL string // Make sure it isn't matching the NUL string
@ -271,6 +286,11 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
} }
} }
break; break;
case CRIT_FLOATING:
if (cont->is_floating) {
matches++;
}
break;
case CRIT_ID: case CRIT_ID:
if (!cont->app_id) { if (!cont->app_id) {
// ignore // ignore
@ -290,6 +310,11 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
matches++; matches++;
} }
break; break;
case CRIT_TILING:
if (!cont->is_floating) {
matches++;
}
break;
case CRIT_TITLE: case CRIT_TITLE:
if (!cont->name) { if (!cont->name) {
// ignore // ignore