regex rules

This commit is contained in:
2023-02-24 20:00:11 +01:00
parent 5fbf07dca5
commit 856309ce96
2 changed files with 2196 additions and 4 deletions

View File

@@ -22,6 +22,7 @@
*/ */
#include <errno.h> #include <errno.h>
#include <locale.h> #include <locale.h>
#include <regex.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@@ -149,6 +150,7 @@ static void arrangemon(Monitor *m);
static void attach(Client *c); static void attach(Client *c);
static void attachstack(Client *c); static void attachstack(Client *c);
static void buttonpress(XEvent *e); static void buttonpress(XEvent *e);
static void compileregexes(void);
static void checkotherwm(void); static void checkotherwm(void);
static void cleanup(void); static void cleanup(void);
static void cleanupmon(Monitor *mon); static void cleanupmon(Monitor *mon);
@@ -274,6 +276,8 @@ static Window root, wmcheckwin;
/* compile-time check if all tags fit into an unsigned int bit array. */ /* compile-time check if all tags fit into an unsigned int bit array. */
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; }; struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
static regex_t regexcache[LENGTH(rules)][3];
/* function implementations */ /* function implementations */
void void
applyrules(Client *c) applyrules(Client *c)
@@ -293,10 +297,10 @@ applyrules(Client *c)
for (i = 0; i < LENGTH(rules); i++) { for (i = 0; i < LENGTH(rules); i++) {
r = &rules[i]; r = &rules[i];
if ((!r->title || strstr(c->name, r->title)) if((!r->title || !regexec(&regexcache[i][2], c->name, 0, NULL, 0)) &&
&& (!r->class || strstr(class, r->class)) (!r->class || !regexec(&regexcache[i][0], class, 0, NULL, 0)) &&
&& (!r->instance || strstr(instance, r->instance))) (!r->instance || !regexec(&regexcache[i][1], instance, 0, NULL, 0))) {
{
c->isfloating = r->isfloating; c->isfloating = r->isfloating;
c->tags |= r->tags; c->tags |= r->tags;
for (m = mons; m && m->num != r->monitor; m = m->next); for (m = mons; m && m->num != r->monitor; m = m->next);
@@ -531,6 +535,36 @@ clientmessage(XEvent *e)
} }
} }
void
compileregexes(void)
{
char regex_error_buffer[256];
int i;
int status;
const Rule *r;
for(i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
if (r->class) {
if ((status = regcomp(&regexcache[i][0], r->class, REG_EXTENDED | REG_NOSUB))) {
regerror(status, &regexcache[i][0], regex_error_buffer, sizeof(regex_error_buffer));
die("Error compiling /%s/: %s", r->class, regex_error_buffer);
}
}
if (r->instance) {
if ((status = regcomp(&regexcache[i][1], r->instance, REG_EXTENDED | REG_NOSUB))) {
regerror(status, &regexcache[i][1], regex_error_buffer, sizeof(regex_error_buffer));
die("Error compiling /%s/: %s", r->instance, regex_error_buffer);
}
}
if (r->title) {
if ((status = regcomp(&regexcache[i][2], r->title, REG_EXTENDED | REG_NOSUB))) {
regerror(status, &regexcache[i][2], regex_error_buffer, sizeof(regex_error_buffer));
die("Error compiling /%s/: %s", r->title, regex_error_buffer);
}
}
}
}
void void
configure(Client *c) configure(Client *c)
{ {
@@ -2143,6 +2177,7 @@ main(int argc, char *argv[])
fputs("warning: no locale support\n", stderr); fputs("warning: no locale support\n", stderr);
if (!(dpy = XOpenDisplay(NULL))) if (!(dpy = XOpenDisplay(NULL)))
die("dwm: cannot open display"); die("dwm: cannot open display");
compileregexes();
checkotherwm(); checkotherwm();
setup(); setup();
#ifdef __OpenBSD__ #ifdef __OpenBSD__

2157
dwm/.dwm/dwm.c.orig Normal file

File diff suppressed because it is too large Load Diff