Stachelbeere1248/dwl
1
Fork 0
Code Issues Pull requests Releases Wiki Activity Actions

Merge branch 'stachelbeere1248/patched/skipfocus' into stachelbeere1248/fullpatched

Browse source
This commit is contained in:
Stachelbeere1248 2025-02-17 21:09:17 +01:00
commit 82415b33ac
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config.def.h
View file

@ -32,10 +32,11 @@ static const char *const autostart[] = {
/* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */ /* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
static const Rule rules[] = { static const Rule rules[] = {
/* app_id title tags mask isfloating monitor */ /* app_id title tags mask isfloating skipfocus monitor */
/* examples: */ /* examples: */
{ "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */ { "Gimp_EXAMPLE", NULL, 0, 1, 0, -1 }, /* Start on currently visible tags floating, not tiled */
{ "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */ { "firefox_EXAMPLE", NULL, 1 << 8, 0, 0, -1 }, /* Start on ONLY tag "9" */
{ "mako_EXAMPLE", NULL, 0, 1, 1, -1 }, /* Start floating and skip focus
}; };
/* layout(s) */ /* layout(s) */

23
dwl.c
View file

@ -142,7 +142,7 @@ typedef struct {
#endif #endif
unsigned int bw; unsigned int bw;
uint32_t tags; uint32_t tags;
int isfloating, isurgent, isfullscreen; int isfloating, isurgent, isfullscreen, skipfocus;
uint32_t resize; /* configure serial of a pending resize */ uint32_t resize; /* configure serial of a pending resize */
} Client; } Client;
@ -241,6 +241,7 @@ typedef struct {
const char *title; const char *title;
uint32_t tags; uint32_t tags;
int isfloating; int isfloating;
int skipfocus;
int monitor; int monitor;
} Rule; } Rule;
@ -510,6 +511,7 @@ applyrules(Client *c)
if ((!r->title || strstr(title, r->title)) if ((!r->title || strstr(title, r->title))
&& (!r->id || strstr(appid, r->id))) { && (!r->id || strstr(appid, r->id))) {
c->isfloating = r->isfloating; c->isfloating = r->isfloating;
c->skipfocus = r->skipfocus;
newtags |= r->tags; newtags |= r->tags;
i = 0; i = 0;
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
@ -1692,6 +1694,13 @@ focusclient(Client *c, int lift)
if (locked) if (locked)
return; return;
if (c && c->skipfocus != 0){
if (c -> skipfocus == 1) {
c->skipfocus = 0;
}
return;
}
/* Raise client in stacking order if requested */ /* Raise client in stacking order if requested */
if (c && lift) if (c && lift)
wlr_scene_node_raise_to_top(&c->scene->node); wlr_scene_node_raise_to_top(&c->scene->node);
@ -2099,11 +2108,13 @@ mapnotify(struct wl_listener *listener, void *data)
printstatus(); printstatus();
unset_fullscreen: unset_fullscreen:
m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); if (!c->skipfocus) {
wl_list_for_each(w, &clients, link) { m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y);
if (w != c && w != p && w->isfullscreen && m == w->mon && (w->tags & c->tags)) wl_list_for_each(w, &clients, link) {
setfullscreen(w, 0); if (w != c && w != p && w->isfullscreen && m == w->mon && (w->tags & c->tags))
} setfullscreen(w, 0);
}
}
} }
void void