From 2c342cc0b4f59e5fa6e3bb1c9419952c07a45f09 Mon Sep 17 00:00:00 2001 From: Palanix Date: Fri, 25 Sep 2026 18:21:11 +0200 Subject: [PATCH] Update monitorconfig to 0.9 --- patches/monitorconfig/README.md | 1 + patches/monitorconfig/monitorconfig-0.9.patch | 94 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 patches/monitorconfig/monitorconfig-0.9.patch diff --git a/patches/monitorconfig/README.md b/patches/monitorconfig/README.md index 45b655e..33014bf 100644 --- a/patches/monitorconfig/README.md +++ b/patches/monitorconfig/README.md @@ -4,6 +4,7 @@ Allows more monitor configuration in config.h ### Download - [git branch](https://codeberg.org/Palanix/dwl/src/branch/monitorconfig) - [wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/monitorconfig/monitorconfig-wlroots-next-f4249db.patch) +- [0.9](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/monitorconfig/monitorconfig-0.9.patch) - [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/monitorconfig/monitorconfig-0.8.patch) ### Authors diff --git a/patches/monitorconfig/monitorconfig-0.9.patch b/patches/monitorconfig/monitorconfig-0.9.patch new file mode 100644 index 0000000..42d323b --- /dev/null +++ b/patches/monitorconfig/monitorconfig-0.9.patch @@ -0,0 +1,94 @@ +From 55494409072aad907aea0c02c796d56a9e925459 Mon Sep 17 00:00:00 2001 +From: Palanix +Date: Mon, 4 Apr 2022 16:08:29 +0200 +Subject: [PATCH] Updated patch now allowing setting x and y +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: Leonardo Hernández Hernández +--- + config.def.h | 12 ++++++++---- + dwl.c | 25 +++++++++++++++++++------ + 2 files changed, 27 insertions(+), 10 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 13c5322..2d1fcb5 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -41,10 +41,14 @@ static const Layout layouts[] = { + * WARNING: negative values other than (-1, -1) cause problems with Xwayland clients due to + * https://gitlab.freedesktop.org/xorg/xserver/-/issues/899 */ + static const MonitorRule monrules[] = { +- /* name mfact nmaster scale layout rotate/reflect x y +- * example of a HiDPI laptop monitor: +- { "eDP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, */ +- { NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, ++ /* name mfact nmaster scale layout rotate/reflect x y resx resy rate mode adaptive*/ ++ /* example of a HiDPI laptop monitor at 120Hz: { "eDP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 0, 0, 120.000f, 1, 1}, */ ++ /* ++ * mode let's the user decide on how dwl should implement the modes: ++ * -1 Sets a custom mode following the users choice ++ * All other number's set the mode at the index n, 0 is the standard mode; see wlr-randr ++ */ ++ { NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1, 0, 0, 0.0f, 0 ,1}, + /* default monitor rule: can be changed but cannot be eliminated; at least one monitor rule must exist */ + }; + +diff --git a/dwl.c b/dwl.c +index 4cfd0fd..755a826 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -235,6 +235,11 @@ typedef struct { + const Layout *lt; + enum wl_output_transform rr; + int x, y; ++ int resx; ++ int resy; ++ float rate; ++ int mode; ++ int adaptive; + } MonitorRule; + + typedef struct { +@@ -1139,6 +1144,7 @@ createmon(struct wl_listener *listener, void *data) + /* This event is raised by the backend when a new output (aka a display or + * monitor) becomes available. */ + struct wlr_output *wlr_output = data; ++ struct wlr_output_mode *mode = wl_container_of(wlr_output->modes.next, mode, link); + const MonitorRule *r; + size_t i; + struct wlr_output_state state; +@@ -1167,16 +1173,23 @@ createmon(struct wl_listener *listener, void *data) + strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); + wlr_output_state_set_scale(&state, r->scale); + wlr_output_state_set_transform(&state, r->rr); ++ ++ wlr_output_state_set_adaptive_sync_enabled(&state, r->adaptive); ++ ++ if(r->mode == -1) ++ wlr_output_state_set_custom_mode(&state, r->resx, r->resy, ++ (int) (r->rate > 0 ? r->rate * 1000 : 0)); ++ else if (!wl_list_empty(&wlr_output->modes)) { ++ for (int j = 0; j < r->mode; j++) { ++ mode = wl_container_of(mode->link.next, mode, link); ++ } ++ wlr_output_state_set_mode(&state, mode); ++ } ++ + break; + } + } + +- /* The mode is a tuple of (width, height, refresh rate), and each +- * monitor supports only a specific set of modes. We just pick the +- * monitor's preferred mode; a more sophisticated compositor would let +- * the user configure it. */ +- wlr_output_state_set_mode(&state, wlr_output_preferred_mode(wlr_output)); +- + /* Set up event listeners */ + LISTEN(&wlr_output->events.frame, &m->frame, rendermon); + LISTEN(&wlr_output->events.destroy, &m->destroy, cleanupmon); +-- +2.55.0 +