From 0ed712244f683dae9f39cea37559e9eed9315b04 Mon Sep 17 00:00:00 2001 From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:56:10 +0200 Subject: [PATCH] rebase to upstream/main --- patches/dim-unfocused/README.md | 3 +- .../dim-unfocused-20240903.patch | 216 ++++++++++++++++++ patches/dim-unfocused/dim-unfocused.patch | 18 +- patches/gaplessgrid/README.md | 5 +- ...30714.patch => gaplessgrid-20230801.patch} | 0 .../gaplessgrid/gaplessgrid-20240714.patch | 89 ++++++++ patches/gaplessgrid/gaplessgrid.patch | 8 +- patches/skipfocus/README.md | 5 +- patches/skipfocus/skipfocus-20240714.patch | 81 +++++++ patches/skipfocus/skipfocus.patch | 16 +- patches/winview/README.md | 3 +- patches/winview/winview-20240606.patch | 42 ++++ patches/winview/winview.patch | 12 +- 13 files changed, 466 insertions(+), 32 deletions(-) create mode 100644 patches/dim-unfocused/dim-unfocused-20240903.patch rename patches/gaplessgrid/{gaplessgrid-20230714.patch => gaplessgrid-20230801.patch} (100%) create mode 100644 patches/gaplessgrid/gaplessgrid-20240714.patch create mode 100644 patches/skipfocus/skipfocus-20240714.patch create mode 100644 patches/winview/winview-20240606.patch diff --git a/patches/dim-unfocused/README.md b/patches/dim-unfocused/README.md index 3bf1c9a..dad3ef0 100644 --- a/patches/dim-unfocused/README.md +++ b/patches/dim-unfocused/README.md @@ -8,7 +8,8 @@ There are also two functions that can be bound to a `Key` or `Button`, 2. `toggledimmingclient`: Which toggles dimming for the focused window, as if the client had `neverdim` applied to it. This overwrites an applied `Rule`. ### Download -- [2024-09-03](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/dim-unfocused/dim-unfocused.patch) +- [2024-09-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/dim-unfocused/dim-unfocused.patch) +- [2024-09-03](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/dim-unfocused/dim-unfocused-20240903.patch) - [2024-07-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/dim-unfocused/dim-unfocused-20240714.patch) - [2024-05-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/dim-unfocused/dim-unfocused-20240516.patch) - [2024-04-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/dim-unfocused/dim-unfocused-20240416.patch) diff --git a/patches/dim-unfocused/dim-unfocused-20240903.patch b/patches/dim-unfocused/dim-unfocused-20240903.patch new file mode 100644 index 0000000..fc48b0b --- /dev/null +++ b/patches/dim-unfocused/dim-unfocused-20240903.patch @@ -0,0 +1,216 @@ +diff --git a/client.h b/client.h +index dabea35..3a31c25 100644 +--- a/client.h ++++ b/client.h +@@ -319,6 +319,12 @@ client_set_border_color(Client *c, const float color[static 4]) + wlr_scene_rect_set_color(c->border[i], color); + } + ++static inline void ++client_set_dimmer_state(Client *c, const int dim) ++{ ++ wlr_scene_node_set_enabled(&c->dimmer->node, DIMOPT && !c->neverdim && dim); ++} ++ + static inline void + client_set_fullscreen(Client *c, int fullscreen) + { +diff --git a/config.def.h b/config.def.h +index 22d2171..4ca21c9 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -10,6 +10,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ + static const float rootcolor[] = COLOR(0x222222ff); + static const float bordercolor[] = COLOR(0x444444ff); + static const float focuscolor[] = COLOR(0x005577ff); ++static const float unfocuseddim[] = COLOR(0x00000088); + static const float urgentcolor[] = COLOR(0xff0000ff); + /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ + static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */ +@@ -22,10 +23,11 @@ static int log_level = WLR_ERROR; + + /* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */ + static const Rule rules[] = { +- /* app_id title tags mask isfloating monitor */ +- /* examples: */ +- { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */ +- { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */ ++ /* app_id title tags mask isfloating neverdim monitor */ ++ /* examples: ++ { "Gimp_example", NULL, 0, 1, 0, -1 }, ++ */ ++ { "firefox_example", NULL, 1 << 8, 0, 1, -1 }, + }; + + /* layout(s) */ +@@ -140,8 +142,9 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XKB_KEY_space, setlayout, {0} }, ++ { MODKEY, XKB_KEY_apostrophe, toggledimming, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, +- { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, ++ { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, + { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, + { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, +@@ -172,5 +175,6 @@ static const Key keys[] = { + static const Button buttons[] = { + { MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} }, + { MODKEY, BTN_MIDDLE, togglefloating, {0} }, ++ { MODKEY|ShiftMask, BTN_MIDDLE, toggledimmingclient, {0} }, + { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, + }; +diff --git a/dwl.c b/dwl.c +index 9021e44..e1f32e9 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -112,6 +112,7 @@ typedef struct { + Monitor *mon; + struct wlr_scene_tree *scene; + struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ ++ struct wlr_scene_rect *dimmer; + struct wlr_scene_tree *scene_surface; + struct wl_list link; + struct wl_list flink; +@@ -141,7 +142,7 @@ typedef struct { + #endif + unsigned int bw; + uint32_t tags; +- int isfloating, isurgent, isfullscreen; ++ int isfloating, isurgent, isfullscreen, neverdim; + uint32_t resize; /* configure serial of a pending resize */ + } Client; + +@@ -231,6 +232,7 @@ typedef struct { + const char *title; + uint32_t tags; + int isfloating; ++ int neverdim; + int monitor; + } Rule; + +@@ -338,6 +340,8 @@ static void startdrag(struct wl_listener *listener, void *data); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); + static void tile(Monitor *m); ++static void toggledimming(const Arg *arg); ++static void toggledimmingclient(const Arg *arg); + static void togglefloating(const Arg *arg); + static void togglefullscreen(const Arg *arg); + static void toggletag(const Arg *arg); +@@ -410,6 +414,7 @@ static struct wlr_output_layout *output_layout; + static struct wlr_box sgeom; + static struct wl_list mons; + static Monitor *selmon; ++static int DIMOPT = 1; + + #ifdef XWAYLAND + static void activatex11(struct wl_listener *listener, void *data); +@@ -466,6 +471,7 @@ applyrules(Client *c) + if ((!r->title || strstr(title, r->title)) + && (!r->id || strstr(appid, r->id))) { + c->isfloating = r->isfloating; ++ c->neverdim = r-> neverdim; + newtags |= r->tags; + i = 0; + wl_list_for_each(m, &mons, link) { +@@ -1366,8 +1372,10 @@ focusclient(Client *c, int lift) + + /* Don't change border color if there is an exclusive focus or we are + * handling a drag operation */ +- if (!exclusive_focus && !seat->drag) ++ if (!exclusive_focus && !seat->drag) { + client_set_border_color(c, focuscolor); ++ client_set_dimmer_state(c, 0); ++ } + } + + /* Deactivate old client if focus is changing */ +@@ -1385,7 +1393,7 @@ focusclient(Client *c, int lift) + * and probably other clients */ + } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { + client_set_border_color(old_c, bordercolor); +- ++ client_set_dimmer_state(old_c, 1); + client_activate_surface(old, 0); + } + } +@@ -1682,8 +1690,7 @@ void + mapnotify(struct wl_listener *listener, void *data) + { + /* Called when the surface is mapped, or ready to display on-screen. */ +- Client *p = NULL; +- Client *w, *c = wl_container_of(listener, c, map); ++ Client *p, *w, *d, *c = wl_container_of(listener, c, map); + Monitor *m; + int i; + +@@ -1717,6 +1724,10 @@ mapnotify(struct wl_listener *listener, void *data) + c->border[i]->node.data = c; + } + ++ c->dimmer = wlr_scene_rect_create(c->scene, 0, 0, unfocuseddim); ++ c->dimmer->node.data = c; ++ client_set_dimmer_state(c, 1); ++ + /* Initialize client geometry with room for border */ + client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT); + c->geom.width += 2 * c->bw; +@@ -1735,6 +1746,10 @@ mapnotify(struct wl_listener *listener, void *data) + setmon(c, p->mon, p->tags); + } else { + applyrules(c); ++ d = focustop(selmon); ++ if (d) { ++ client_set_dimmer_state(d, 0); ++ } + } + printstatus(); + +@@ -2161,7 +2176,7 @@ resize(Client *c, struct wlr_box geo, int interact) + c->geom = geo; + applybounds(c, bbox); + +- /* Update scene-graph, including borders */ ++ /* Update scene-graph, including borders and dimmer*/ + wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y); + wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw); + wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw); +@@ -2171,6 +2186,8 @@ resize(Client *c, struct wlr_box geo, int interact) + wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw); + wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw); + wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw); ++ wlr_scene_rect_set_size(c->dimmer, c->geom.width - 2*c->bw, c-> geom.height - 2*c->bw); ++ wlr_scene_node_set_position(&c->dimmer->node, c->bw, c->bw); + + /* this is a no-op if size hasn't changed */ + c->resize = client_set_size(c, c->geom.width - 2 * c->bw, +@@ -2682,6 +2699,27 @@ tile(Monitor *m) + } + } + ++void toggledimming(const Arg *arg) ++{ ++ Client *c; ++ DIMOPT ^= 1; ++ wl_list_for_each(c, &clients, link) ++ { ++ client_set_dimmer_state(c, 1); ++ } ++ c = focustop(selmon); ++ if (c) ++ client_set_dimmer_state(c, 0); ++} ++ ++void ++toggledimmingclient(const Arg *arg) ++{ ++ Client *sel = focustop(selmon); ++ if (sel) ++ sel -> neverdim ^= 1; ++} ++ + void + togglefloating(const Arg *arg) + { diff --git a/patches/dim-unfocused/dim-unfocused.patch b/patches/dim-unfocused/dim-unfocused.patch index fc48b0b..f73d886 100644 --- a/patches/dim-unfocused/dim-unfocused.patch +++ b/patches/dim-unfocused/dim-unfocused.patch @@ -62,7 +62,7 @@ index 22d2171..4ca21c9 100644 { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, }; diff --git a/dwl.c b/dwl.c -index 9021e44..e1f32e9 100644 +index dc0c861..dcc3ece 100644 --- a/dwl.c +++ b/dwl.c @@ -112,6 +112,7 @@ typedef struct { @@ -115,7 +115,7 @@ index 9021e44..e1f32e9 100644 newtags |= r->tags; i = 0; wl_list_for_each(m, &mons, link) { -@@ -1366,8 +1372,10 @@ focusclient(Client *c, int lift) +@@ -1365,8 +1371,10 @@ focusclient(Client *c, int lift) /* Don't change border color if there is an exclusive focus or we are * handling a drag operation */ @@ -127,7 +127,7 @@ index 9021e44..e1f32e9 100644 } /* Deactivate old client if focus is changing */ -@@ -1385,7 +1393,7 @@ focusclient(Client *c, int lift) +@@ -1384,7 +1392,7 @@ focusclient(Client *c, int lift) * and probably other clients */ } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { client_set_border_color(old_c, bordercolor); @@ -136,7 +136,7 @@ index 9021e44..e1f32e9 100644 client_activate_surface(old, 0); } } -@@ -1682,8 +1690,7 @@ void +@@ -1681,8 +1689,7 @@ void mapnotify(struct wl_listener *listener, void *data) { /* Called when the surface is mapped, or ready to display on-screen. */ @@ -146,7 +146,7 @@ index 9021e44..e1f32e9 100644 Monitor *m; int i; -@@ -1717,6 +1724,10 @@ mapnotify(struct wl_listener *listener, void *data) +@@ -1716,6 +1723,10 @@ mapnotify(struct wl_listener *listener, void *data) c->border[i]->node.data = c; } @@ -157,7 +157,7 @@ index 9021e44..e1f32e9 100644 /* Initialize client geometry with room for border */ client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT); c->geom.width += 2 * c->bw; -@@ -1735,6 +1746,10 @@ mapnotify(struct wl_listener *listener, void *data) +@@ -1734,6 +1745,10 @@ mapnotify(struct wl_listener *listener, void *data) setmon(c, p->mon, p->tags); } else { applyrules(c); @@ -168,7 +168,7 @@ index 9021e44..e1f32e9 100644 } printstatus(); -@@ -2161,7 +2176,7 @@ resize(Client *c, struct wlr_box geo, int interact) +@@ -2160,7 +2175,7 @@ resize(Client *c, struct wlr_box geo, int interact) c->geom = geo; applybounds(c, bbox); @@ -177,7 +177,7 @@ index 9021e44..e1f32e9 100644 wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y); wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw); wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw); -@@ -2171,6 +2186,8 @@ resize(Client *c, struct wlr_box geo, int interact) +@@ -2170,6 +2185,8 @@ resize(Client *c, struct wlr_box geo, int interact) wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw); wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw); wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw); @@ -186,7 +186,7 @@ index 9021e44..e1f32e9 100644 /* this is a no-op if size hasn't changed */ c->resize = client_set_size(c, c->geom.width - 2 * c->bw, -@@ -2682,6 +2699,27 @@ tile(Monitor *m) +@@ -2681,6 +2698,27 @@ tile(Monitor *m) } } diff --git a/patches/gaplessgrid/README.md b/patches/gaplessgrid/README.md index 2e36bae..6921d54 100644 --- a/patches/gaplessgrid/README.md +++ b/patches/gaplessgrid/README.md @@ -1,8 +1,11 @@ ### Description Arranges windows in a grid. Except it adjusts the number of windows in the first few columns to avoid empty cells. +On widescreens (w > 2*h), it splits to three columns before splitting rows. + ### Download -- [2024-07-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid.patch) +- [2024-09-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid.patch) +- [2024-07-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid-20240714.patch) - [2023-08-01](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid-20230801.patch) - [git branch](https://codeberg.org/dhruva_sambrani/dwl/src/branch/gaplessgrid) diff --git a/patches/gaplessgrid/gaplessgrid-20230714.patch b/patches/gaplessgrid/gaplessgrid-20230801.patch similarity index 100% rename from patches/gaplessgrid/gaplessgrid-20230714.patch rename to patches/gaplessgrid/gaplessgrid-20230801.patch diff --git a/patches/gaplessgrid/gaplessgrid-20240714.patch b/patches/gaplessgrid/gaplessgrid-20240714.patch new file mode 100644 index 0000000..cf430b9 --- /dev/null +++ b/patches/gaplessgrid/gaplessgrid-20240714.patch @@ -0,0 +1,89 @@ +diff --git a/config.def.h b/config.def.h +index 22d2171..014a909 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -34,6 +34,7 @@ static const Layout layouts[] = { + { "[]=", tile }, + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, ++ { "###", gaplessgrid }, + }; + + /* monitors */ +@@ -139,6 +140,7 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, ++ { MODKEY, XKB_KEY_g, setlayout, {.v = &layouts[3]} }, + { MODKEY, XKB_KEY_space, setlayout, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, + { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, +diff --git a/dwl.c b/dwl.c +index 145fd01..dae1d1a 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -287,6 +287,7 @@ static void focusmon(const Arg *arg); + static void focusstack(const Arg *arg); + static Client *focustop(Monitor *m); + static void fullscreennotify(struct wl_listener *listener, void *data); ++static void gaplessgrid(Monitor *m); + static void handlesig(int signo); + static void incnmaster(const Arg *arg); + static void inputdevice(struct wl_listener *listener, void *data); +@@ -1467,6 +1468,56 @@ handlesig(int signo) + } + } + ++void ++gaplessgrid(Monitor *m) ++{ ++ unsigned int n = 0, i = 0, ch, cw, cn, rn, rows, cols; ++ Client *c; ++ ++ wl_list_for_each(c, &clients, link) ++ if (VISIBLEON(c, m) && !c->isfloating) ++ n++; ++ if (n == 0) ++ return; ++ ++ /* grid dimensions */ ++ for (cols = 0; cols <= (n / 2); cols++) ++ if ((cols * cols) >= n) ++ break; ++ ++ if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */ ++ cols = 2; ++ ++ /* widescreen is better if 3 columns */ ++ if (n >= 3 && n <= 6 && (m->w.width / m->w.height) > 1) ++ cols = 3; ++ ++ rows = n / cols; ++ ++ /* window geometries */ ++ cw = cols ? m->w.width / cols : m->w.width; ++ cn = 0; /* current column number */ ++ rn = 0; /* current row number */ ++ wl_list_for_each(c, &clients, link) { ++ unsigned int cx, cy; ++ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) ++ continue; ++ ++ if ((i / rows + 1) > (cols - n % cols)) ++ rows = n / cols + 1; ++ ch = rows ? m->w.height / rows : m->w.height; ++ cx = m->w.x + cn * cw; ++ cy = m->w.y + rn * ch; ++ resize(c, (struct wlr_box) { cx, cy, cw, ch}, 0); ++ rn++; ++ if (rn >= rows) { ++ rn = 0; ++ cn++; ++ } ++ i++; ++ } ++} ++ + void + incnmaster(const Arg *arg) + { diff --git a/patches/gaplessgrid/gaplessgrid.patch b/patches/gaplessgrid/gaplessgrid.patch index cf430b9..2af1072 100644 --- a/patches/gaplessgrid/gaplessgrid.patch +++ b/patches/gaplessgrid/gaplessgrid.patch @@ -19,18 +19,18 @@ index 22d2171..014a909 100644 { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, diff --git a/dwl.c b/dwl.c -index 145fd01..dae1d1a 100644 +index dc0c861..875d8cd 100644 --- a/dwl.c +++ b/dwl.c -@@ -287,6 +287,7 @@ static void focusmon(const Arg *arg); - static void focusstack(const Arg *arg); +@@ -292,6 +292,7 @@ static void focusstack(const Arg *arg); static Client *focustop(Monitor *m); static void fullscreennotify(struct wl_listener *listener, void *data); + static void gpureset(struct wl_listener *listener, void *data); +static void gaplessgrid(Monitor *m); static void handlesig(int signo); static void incnmaster(const Arg *arg); static void inputdevice(struct wl_listener *listener, void *data); -@@ -1467,6 +1468,56 @@ handlesig(int signo) +@@ -1510,6 +1511,56 @@ handlesig(int signo) } } diff --git a/patches/skipfocus/README.md b/patches/skipfocus/README.md index b82f2c2..4fb6e8a 100644 --- a/patches/skipfocus/README.md +++ b/patches/skipfocus/README.md @@ -8,8 +8,9 @@ Adds a rule-based ability to skip automatically focusing a window on creation. E | 2 | skipfocus entirely | ### Download -- [20240714](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus.patch) -- [20240108](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus20240108.patch) +- [2024-09-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus.patch) +- [2024-07-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus-20240714.patch) +- [2024-01-08](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus-20240108.patch) - [git branch](https://codeberg.org/dhruva_sambrani/dwl/src/branch/skipfocus) ### Authors diff --git a/patches/skipfocus/skipfocus-20240714.patch b/patches/skipfocus/skipfocus-20240714.patch new file mode 100644 index 0000000..2715fb9 --- /dev/null +++ b/patches/skipfocus/skipfocus-20240714.patch @@ -0,0 +1,81 @@ +diff --git a/config.def.h b/config.def.h +index 22d2171..9f6599c 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -22,10 +22,11 @@ static int log_level = WLR_ERROR; + + /* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */ + static const Rule rules[] = { +- /* app_id title tags mask isfloating monitor */ ++ /* app_id title tags mask isfloating skipfocus monitor */ + /* examples: */ +- { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */ +- { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */ ++ { "Gimp_EXAMPLE", NULL, 0, 1, 0, -1 }, /* Start on currently visible tags floating, not tiled */ ++ { "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) */ +diff --git a/dwl.c b/dwl.c +index 145fd01..ec9d1af 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -138,7 +138,7 @@ typedef struct { + #endif + unsigned int bw; + uint32_t tags; +- int isfloating, isurgent, isfullscreen; ++ int isfloating, isurgent, isfullscreen, skipfocus; + uint32_t resize; /* configure serial of a pending resize */ + } Client; + +@@ -229,6 +229,7 @@ typedef struct { + const char *title; + uint32_t tags; + int isfloating; ++ int skipfocus; + int monitor; + } Rule; + +@@ -465,6 +466,7 @@ applyrules(Client *c) + if ((!r->title || strstr(title, r->title)) + && (!r->id || strstr(appid, r->id))) { + c->isfloating = r->isfloating; ++ c->skipfocus = r->skipfocus; + newtags |= r->tags; + i = 0; + wl_list_for_each(m, &mons, link) { +@@ -1323,6 +1325,13 @@ focusclient(Client *c, int lift) + if (locked) + return; + ++ if (c && c->skipfocus != 0){ ++ if (c -> skipfocus == 1) { ++ c->skipfocus = 0; ++ } ++ return; ++ } ++ + /* Raise client in stacking order if requested */ + if (c && lift) + wlr_scene_node_raise_to_top(&c->scene->node); +@@ -1692,11 +1701,13 @@ mapnotify(struct wl_listener *listener, void *data) + printstatus(); + + unset_fullscreen: +- m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); +- wl_list_for_each(w, &clients, link) { +- if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags)) +- setfullscreen(w, 0); +- } ++ if (!c->skipfocus) { ++ m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); ++ wl_list_for_each(w, &clients, link) { ++ if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags)) ++ setfullscreen(w, 0); ++ } ++ } + } + + void diff --git a/patches/skipfocus/skipfocus.patch b/patches/skipfocus/skipfocus.patch index 2715fb9..ed445ec 100644 --- a/patches/skipfocus/skipfocus.patch +++ b/patches/skipfocus/skipfocus.patch @@ -18,10 +18,10 @@ index 22d2171..9f6599c 100644 /* layout(s) */ diff --git a/dwl.c b/dwl.c -index 145fd01..ec9d1af 100644 +index dc0c861..b6a4cbb 100644 --- a/dwl.c +++ b/dwl.c -@@ -138,7 +138,7 @@ typedef struct { +@@ -141,7 +141,7 @@ typedef struct { #endif unsigned int bw; uint32_t tags; @@ -30,7 +30,7 @@ index 145fd01..ec9d1af 100644 uint32_t resize; /* configure serial of a pending resize */ } Client; -@@ -229,6 +229,7 @@ typedef struct { +@@ -231,6 +231,7 @@ typedef struct { const char *title; uint32_t tags; int isfloating; @@ -38,7 +38,7 @@ index 145fd01..ec9d1af 100644 int monitor; } Rule; -@@ -465,6 +466,7 @@ applyrules(Client *c) +@@ -466,6 +467,7 @@ applyrules(Client *c) if ((!r->title || strstr(title, r->title)) && (!r->id || strstr(appid, r->id))) { c->isfloating = r->isfloating; @@ -46,7 +46,7 @@ index 145fd01..ec9d1af 100644 newtags |= r->tags; i = 0; wl_list_for_each(m, &mons, link) { -@@ -1323,6 +1325,13 @@ focusclient(Client *c, int lift) +@@ -1343,6 +1345,13 @@ focusclient(Client *c, int lift) if (locked) return; @@ -60,19 +60,19 @@ index 145fd01..ec9d1af 100644 /* Raise client in stacking order if requested */ if (c && lift) wlr_scene_node_raise_to_top(&c->scene->node); -@@ -1692,11 +1701,13 @@ mapnotify(struct wl_listener *listener, void *data) +@@ -1738,11 +1747,13 @@ mapnotify(struct wl_listener *listener, void *data) printstatus(); unset_fullscreen: - m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); - wl_list_for_each(w, &clients, link) { -- if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags)) +- if (w != c && w != p && w->isfullscreen && m == w->mon && (w->tags & c->tags)) - setfullscreen(w, 0); - } + if (!c->skipfocus) { + m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); + wl_list_for_each(w, &clients, link) { -+ if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags)) ++ if (w != c && w != p && w->isfullscreen && m == w->mon && (w->tags & c->tags)) + setfullscreen(w, 0); + } + } diff --git a/patches/winview/README.md b/patches/winview/README.md index 322d992..6c44eee 100644 --- a/patches/winview/README.md +++ b/patches/winview/README.md @@ -26,7 +26,8 @@ This patch is inspired from . Citing > An example of how to insert this line can be found in the default config file template, config.def.h. ### Download -- [2023-11-26](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/winview/winview.patch) +- [2024-09-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/winview/winview-20240918.patch) +- [2024-06-06](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/winview/winview-20240606.patch) - [git branch](https://codeberg.org/dhruva_sambrani/dwl/src/branch/winview) ### Authors diff --git a/patches/winview/winview-20240606.patch b/patches/winview/winview-20240606.patch new file mode 100644 index 0000000..d3fc099 --- /dev/null +++ b/patches/winview/winview-20240606.patch @@ -0,0 +1,42 @@ +diff --git a/config.def.h b/config.def.h +index a784eb4..d09ee55 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -140,6 +140,7 @@ static const Key keys[] = { + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, + { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, + { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, ++ { MODKEY, XKB_KEY_o, winview, {0}}, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, + { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, +diff --git a/dwl.c b/dwl.c +index 6f041a0..65df112 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -346,6 +346,7 @@ static void urgent(struct wl_listener *listener, void *data); + static void view(const Arg *arg); + static void virtualkeyboard(struct wl_listener *listener, void *data); + static void virtualpointer(struct wl_listener *listener, void *data); ++static void winview(const Arg *a); + 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); +@@ -2877,6 +2878,17 @@ virtualpointer(struct wl_listener *listener, void *data) + wlr_cursor_map_input_to_output(cursor, &pointer.base, event->suggested_output); + } + ++void ++winview(const Arg *a) { ++ Arg b = {0}; ++ Client *sel = focustop(selmon); ++ if(!sel) ++ return; ++ b.ui = sel -> tags; ++ view(&b); ++ return; ++} ++ + Monitor * + xytomon(double x, double y) + { diff --git a/patches/winview/winview.patch b/patches/winview/winview.patch index d3fc099..66e6b20 100644 --- a/patches/winview/winview.patch +++ b/patches/winview/winview.patch @@ -1,8 +1,8 @@ diff --git a/config.def.h b/config.def.h -index a784eb4..d09ee55 100644 +index 22d2171..b812525 100644 --- a/config.def.h +++ b/config.def.h -@@ -140,6 +140,7 @@ static const Key keys[] = { +@@ -143,6 +143,7 @@ static const Key keys[] = { { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, @@ -11,10 +11,10 @@ index a784eb4..d09ee55 100644 { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, diff --git a/dwl.c b/dwl.c -index 6f041a0..65df112 100644 +index dc0c861..5c6862c 100644 --- a/dwl.c +++ b/dwl.c -@@ -346,6 +346,7 @@ static void urgent(struct wl_listener *listener, void *data); +@@ -351,6 +351,7 @@ static void urgent(struct wl_listener *listener, void *data); static void view(const Arg *arg); static void virtualkeyboard(struct wl_listener *listener, void *data); static void virtualpointer(struct wl_listener *listener, void *data); @@ -22,8 +22,8 @@ index 6f041a0..65df112 100644 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); -@@ -2877,6 +2878,17 @@ virtualpointer(struct wl_listener *listener, void *data) - wlr_cursor_map_input_to_output(cursor, &pointer.base, event->suggested_output); +@@ -2942,6 +2943,17 @@ virtualpointer(struct wl_listener *listener, void *data) + wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); } +void