From 54d270e3599b5a0c2952115933ff1431ecfebd08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Fri, 28 Aug 2015 08:26:27 +0200 Subject: [PATCH] Support a special value "__focused__" as a command criterion pattern for class, instance, title, window_role and workspace. This special value will match if the window's property equals that of the currently focused window. relates to #1770 --- docs/userguide | 24 +++++++++++++++++------- src/match.c | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/docs/userguide b/docs/userguide index 25f5a4ba..e2429449 100644 --- a/docs/userguide +++ b/docs/userguide @@ -1604,25 +1604,35 @@ for_window [class="^evil-app$"] floating enable, move container to workspace 4 The criteria which are currently implemented are: class:: - Compares the window class (the second part of WM_CLASS) + Compares the window class (the second part of WM_CLASS). Use the + special value +__focused__+ to match all windows having the same window + class as the currently focused window. instance:: - Compares the window instance (the first part of WM_CLASS) + Compares the window instance (the first part of WM_CLASS). Use the + special value +__focused__+ to match all windows having the same window + instance as the currently focused window. window_role:: - Compares the window role (WM_WINDOW_ROLE). + Compares the window role (WM_WINDOW_ROLE). Use the special value + +__focused__+ to match all windows having the same window role as the + currently focused window. window_type:: - Compare the window type (_NET_WM_WINDOW_TYPE). Possible values are - +normal+, +dialog+, +utility+, +toolbar+, +splash+, +menu+, +dropdown_menu+, - +popup_menu+ and +toolti+. + Compare the window type (_NET_WM_WINDOW_TYPE). Possible values are + +normal+, +dialog+, +utility+, +toolbar+, +splash+, +menu+, +dropdown_menu+, + +popup_menu+ and +toolti+. id:: Compares the X11 window ID, which you can get via +xwininfo+ for example. title:: Compares the X11 window title (_NET_WM_NAME or WM_NAME as fallback). + Use the special value +__focused__+ to match all windows having the + same window title as the currently focused window. urgent:: Compares the urgent state of the window. Can be "latest" or "oldest". Matches the latest or oldest urgent window, respectively. (The following aliases are also available: newest, last, recent, first) workspace:: - Compares the workspace name of the workspace the window belongs to. + Compares the workspace name of the workspace the window belongs to. Use + the special value +__focused__+ to match all windows in the currently + focused workspace. con_mark:: Compares the mark set for this container, see <>. con_id:: diff --git a/src/match.c b/src/match.c index b95cf234..20af38f6 100644 --- a/src/match.c +++ b/src/match.c @@ -90,8 +90,12 @@ bool match_matches_window(Match *match, i3Window *window) { LOG("Checking window 0x%08x (class %s)\n", window->id, window->class_class); if (match->class != NULL) { - if (window->class_class != NULL && - regex_matches(match->class, window->class_class)) { + if (window->class_class == NULL) + return false; + if (strcmp(match->class->pattern, "__focused__") == 0 && + strcmp(window->class_class, focused->window->class_class) == 0) { + LOG("window class matches focused window\n"); + } else if (regex_matches(match->class, window->class_class)) { LOG("window class matches (%s)\n", window->class_class); } else { return false; @@ -99,8 +103,12 @@ bool match_matches_window(Match *match, i3Window *window) { } if (match->instance != NULL) { - if (window->class_instance != NULL && - regex_matches(match->instance, window->class_instance)) { + if (window->class_instance == NULL) + return false; + if (strcmp(match->instance->pattern, "__focused__") == 0 && + strcmp(window->class_instance, focused->window->class_instance) == 0) { + LOG("window instance matches focused window\n"); + } else if (regex_matches(match->instance, window->class_instance)) { LOG("window instance matches (%s)\n", window->class_instance); } else { return false; @@ -117,17 +125,27 @@ bool match_matches_window(Match *match, i3Window *window) { } if (match->title != NULL) { - if (window->name != NULL && - regex_matches(match->title, i3string_as_utf8(window->name))) { - LOG("title matches (%s)\n", i3string_as_utf8(window->name)); + if (window->name == NULL) + return false; + + const char *title = i3string_as_utf8(window->name); + if (strcmp(match->title->pattern, "__focused__") == 0 && + strcmp(title, i3string_as_utf8(focused->window->name)) == 0) { + LOG("window title matches focused window\n"); + } else if (regex_matches(match->title, title)) { + LOG("title matches (%s)\n", title); } else { return false; } } if (match->window_role != NULL) { - if (window->role != NULL && - regex_matches(match->window_role, window->role)) { + if (window->role == NULL) + return false; + if (strcmp(match->window_role->pattern, "__focused__") == 0 && + strcmp(window->role, focused->window->role) == 0) { + LOG("window role matches focused window\n"); + } else if (regex_matches(match->window_role, window->role)) { LOG("window_role matches (%s)\n", window->role); } else { return false; @@ -182,7 +200,10 @@ bool match_matches_window(Match *match, i3Window *window) { if (ws == NULL) return false; - if (regex_matches(match->workspace, ws->name)) { + if (strcmp(match->workspace->pattern, "__focused__") == 0 && + strcmp(ws->name, con_get_workspace(focused)->name) == 0) { + LOG("workspace matches focused workspace\n"); + } else if (regex_matches(match->workspace, ws->name)) { LOG("workspace matches (%s)\n", ws->name); } else { return false;