|
|
|
@ -3,7 +3,8 @@
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <pcre.h>
|
|
|
|
#define PCRE2_CODE_UNIT_WIDTH 8
|
|
|
|
|
|
|
|
#include <pcre2.h>
|
|
|
|
#include "sway/criteria.h"
|
|
|
|
#include "sway/criteria.h"
|
|
|
|
#include "sway/tree/container.h"
|
|
|
|
#include "sway/tree/container.h"
|
|
|
|
#include "sway/config.h"
|
|
|
|
#include "sway/config.h"
|
|
|
|
@ -40,17 +41,19 @@ bool criteria_is_empty(struct criteria *criteria) {
|
|
|
|
char *error = NULL;
|
|
|
|
char *error = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
// Returns error string on failure or NULL otherwise.
|
|
|
|
// Returns error string on failure or NULL otherwise.
|
|
|
|
static bool generate_regex(pcre **regex, char *value) {
|
|
|
|
static bool generate_regex(pcre2_code **regex, char *value) {
|
|
|
|
const char *reg_err;
|
|
|
|
int errorcode;
|
|
|
|
int offset;
|
|
|
|
PCRE2_SIZE offset;
|
|
|
|
|
|
|
|
|
|
|
|
*regex = pcre_compile(value, PCRE_UTF8 | PCRE_UCP, ®_err, &offset, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
*regex = pcre2_compile((PCRE2_SPTR)value, PCRE2_ZERO_TERMINATED, PCRE2_UTF | PCRE2_UCP, &errorcode, &offset, NULL);
|
|
|
|
if (!*regex) {
|
|
|
|
if (!*regex) {
|
|
|
|
|
|
|
|
PCRE2_UCHAR buffer[256];
|
|
|
|
|
|
|
|
pcre2_get_error_message(errorcode, buffer, sizeof(buffer));
|
|
|
|
|
|
|
|
|
|
|
|
const char *fmt = "Regex compilation for '%s' failed: %s";
|
|
|
|
const char *fmt = "Regex compilation for '%s' failed: %s";
|
|
|
|
int len = strlen(fmt) + strlen(value) + strlen(reg_err) - 3;
|
|
|
|
int len = strlen(fmt) + strlen(value) + strlen((char*) buffer) - 3;
|
|
|
|
error = malloc(len);
|
|
|
|
error = malloc(len);
|
|
|
|
snprintf(error, len, fmt, value, reg_err);
|
|
|
|
snprintf(error, len, fmt, value, buffer);
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -66,7 +69,7 @@ static bool pattern_create(struct pattern **pattern, char *value) {
|
|
|
|
if (strcmp(value, "__focused__") == 0) {
|
|
|
|
if (strcmp(value, "__focused__") == 0) {
|
|
|
|
(*pattern)->match_type = PATTERN_FOCUSED;
|
|
|
|
(*pattern)->match_type = PATTERN_FOCUSED;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
(*pattern)->match_type = PATTERN_PCRE;
|
|
|
|
(*pattern)->match_type = PATTERN_PCRE2;
|
|
|
|
if (!generate_regex(&(*pattern)->regex, value)) {
|
|
|
|
if (!generate_regex(&(*pattern)->regex, value)) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
@ -77,7 +80,7 @@ static bool pattern_create(struct pattern **pattern, char *value) {
|
|
|
|
static void pattern_destroy(struct pattern *pattern) {
|
|
|
|
static void pattern_destroy(struct pattern *pattern) {
|
|
|
|
if (pattern) {
|
|
|
|
if (pattern) {
|
|
|
|
if (pattern->regex) {
|
|
|
|
if (pattern->regex) {
|
|
|
|
pcre_free(pattern->regex);
|
|
|
|
pcre2_code_free(pattern->regex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(pattern);
|
|
|
|
free(pattern);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -99,8 +102,11 @@ void criteria_destroy(struct criteria *criteria) {
|
|
|
|
free(criteria);
|
|
|
|
free(criteria);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int regex_cmp(const char *item, const pcre *regex) {
|
|
|
|
static int regex_cmp(const char *item, const pcre2_code *regex) {
|
|
|
|
return pcre_exec(regex, NULL, item, strlen(item), 0, 0, NULL, 0);
|
|
|
|
pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(regex, NULL);
|
|
|
|
|
|
|
|
int result = pcre2_match(regex, (PCRE2_SPTR)item, strlen(item), 0, 0, match_data, NULL);
|
|
|
|
|
|
|
|
pcre2_match_data_free(match_data);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
@ -192,7 +198,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PATTERN_PCRE:
|
|
|
|
case PATTERN_PCRE2:
|
|
|
|
if (regex_cmp(title, criteria->title->regex) != 0) {
|
|
|
|
if (regex_cmp(title, criteria->title->regex) != 0) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -212,7 +218,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PATTERN_PCRE:
|
|
|
|
case PATTERN_PCRE2:
|
|
|
|
if (regex_cmp(shell, criteria->shell->regex) != 0) {
|
|
|
|
if (regex_cmp(shell, criteria->shell->regex) != 0) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -232,7 +238,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PATTERN_PCRE:
|
|
|
|
case PATTERN_PCRE2:
|
|
|
|
if (regex_cmp(app_id, criteria->app_id->regex) != 0) {
|
|
|
|
if (regex_cmp(app_id, criteria->app_id->regex) != 0) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -264,7 +270,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PATTERN_PCRE:
|
|
|
|
case PATTERN_PCRE2:
|
|
|
|
if (regex_cmp(class, criteria->class->regex) != 0) {
|
|
|
|
if (regex_cmp(class, criteria->class->regex) != 0) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -284,7 +290,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PATTERN_PCRE:
|
|
|
|
case PATTERN_PCRE2:
|
|
|
|
if (regex_cmp(instance, criteria->instance->regex) != 0) {
|
|
|
|
if (regex_cmp(instance, criteria->instance->regex) != 0) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -304,7 +310,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PATTERN_PCRE:
|
|
|
|
case PATTERN_PCRE2:
|
|
|
|
if (regex_cmp(window_role, criteria->window_role->regex) != 0) {
|
|
|
|
if (regex_cmp(window_role, criteria->window_role->regex) != 0) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -363,7 +369,7 @@ static bool criteria_matches_view(struct criteria *criteria,
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PATTERN_PCRE:
|
|
|
|
case PATTERN_PCRE2:
|
|
|
|
if (regex_cmp(ws->name, criteria->workspace->regex) != 0) {
|
|
|
|
if (regex_cmp(ws->name, criteria->workspace->regex) != 0) {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
ndren
3 years ago
committed by
GitHub