reintroduce regexrules patch

This commit is contained in:
wochap 2024-03-06 18:27:15 -05:00
parent 69579f1c9d
commit ffe5e43292
No known key found for this signature in database
GPG Key ID: FE4CF844E73095E1

View File

@ -0,0 +1,64 @@
diff --git a/config.def.h b/config.def.h
index db0babc..ff23b6f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -25,6 +25,7 @@ static const Rule rules[] = {
{ "Gimp", NULL, 0, 1, -1 },
*/
{ "firefox", NULL, 1 << 8, 0, -1 },
+ { "^kitty$", NULL, 0, 0, -1 },
};
/* layout(s) */
diff --git a/dwl.c b/dwl.c
index ef27a1d..df29577 100644
--- a/dwl.c
+++ b/dwl.c
@@ -10,6 +10,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
+#include <regex.h>
#include <wayland-server-core.h>
#include <wlr/backend.h>
#include <wlr/backend/libinput.h>
@@ -327,6 +328,7 @@ static Monitor *xytomon(double x, double y);
static void xytonode(double x, double y, struct wlr_surface **psurface,
Client **pc, LayerSurface **pl, double *nx, double *ny);
static void zoom(const Arg *arg);
+static int regex_match(const char *pattern, const char *str);
/* variables */
static const char broken[] = "broken";
@@ -430,8 +432,8 @@ applyrules(Client *c)
title = broken;
for (r = rules; r < END(rules); r++) {
- if ((!r->title || strstr(title, r->title))
- && (!r->id || strstr(appid, r->id))) {
+ if ((!r->title || regex_match(r->title, title))
+ && (!r->id || regex_match(r->id, appid))) {
c->isfloating = r->isfloating;
newtags |= r->tags;
i = 0;
@@ -2746,6 +2748,19 @@ zoom(const Arg *arg)
arrange(selmon);
}
+int
+regex_match(const char *pattern, const char *str) {
+ regex_t regex;
+ int reti;
+ if (regcomp(&regex, pattern, REG_EXTENDED) != 0)
+ return 0;
+ reti = regexec(&regex, str, (size_t)0, NULL, 0);
+ regfree(&regex);
+ if (reti == 0)
+ return 1;
+ return 0;
+}
+
#ifdef XWAYLAND
void
activatex11(struct wl_listener *listener, void *data)