nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3408 from orestisf1993/__focused__-crash 

match_matches_window: Check if focused->window exists
This commit is contained in:
Ingo Bürk 2018-09-19 14:42:28 +02:00 committed by GitHub
parent ea559966b5 515dd45f59
commit bde4f40b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/match.c
View File

@ -87,31 +87,30 @@ void match_copy(Match *dest, Match *src) {
bool match_matches_window(Match *match, i3Window *window) { bool match_matches_window(Match *match, i3Window *window) {
LOG("Checking window 0x%08x (class %s)\n", window->id, window->class_class); LOG("Checking window 0x%08x (class %s)\n", window->id, window->class_class);
if (match->class != NULL) { #define GET_FIELD_str(field) (field)
if (window->class_class == NULL) #define GET_FIELD_i3string(field) (i3string_as_utf8(field))
return false; #define CHECK_WINDOW_FIELD(match_field, window_field, type) \
if (strcmp(match->class->pattern, "__focused__") == 0 && do { \
strcmp(window->class_class, focused->window->class_class) == 0) { if (match->match_field != NULL) { \
LOG("window class matches focused window\n"); if (window->window_field == NULL) { \
} else if (regex_matches(match->class, window->class_class)) { return false; \
LOG("window class matches (%s)\n", window->class_class); } \
} else { \
return false; const char *window_field_str = GET_FIELD_##type(window->window_field); \
} if (strcmp(match->match_field->pattern, "__focused__") == 0 && \
} focused && focused->window && focused->window->window_field && \
strcmp(window_field_str, GET_FIELD_##type(focused->window->window_field)) == 0) { \
LOG("window " #match_field " matches focused window\n"); \
} else if (regex_matches(match->match_field, window_field_str)) { \
LOG("window " #match_field " matches (%s)\n", window_field_str); \
} else { \
return false; \
} \
} \
} while (0)
if (match->instance != NULL) { CHECK_WINDOW_FIELD(class, class_class, str);
if (window->class_instance == NULL) CHECK_WINDOW_FIELD(instance, class_instance, str);
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;
}
}
if (match->id != XCB_NONE) { if (match->id != XCB_NONE) {
if (window->id == match->id) { if (window->id == match->id) {
@ -122,33 +121,8 @@ bool match_matches_window(Match *match, i3Window *window) {
} }
} }
if (match->title != NULL) { CHECK_WINDOW_FIELD(title, name, i3string);
if (window->name == NULL) CHECK_WINDOW_FIELD(window_role, role, str);
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)
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;
}
}
if (match->window_type != UINT32_MAX) { if (match->window_type != UINT32_MAX) {
if (window->window_type == match->window_type) { if (window->window_type == match->window_type) {

10
testcases/t/251-command-criteria-focused.t
View File

@ -105,6 +105,16 @@ is(@{get_ws($ws)->{nodes}}, 2, 'sanity check: workspace contains two windows');
cmd '[workspace=__focused__] move to workspace trash'; cmd '[workspace=__focused__] move to workspace trash';
is(@{get_ws($ws)->{nodes}}, 0, '__focused__ works for workspace'); is(@{get_ws($ws)->{nodes}}, 0, '__focused__ works for workspace');
###############################################################################
# 6: Test that __focused__ in command criteria when no window is focused does
# not crash i3.
# See issue: #3406
###############################################################################
fresh_workspace;
cmd '[class=__focused__] focus';
does_i3_live;
############################################################################### ###############################################################################
done_testing; done_testing;