163 lines
5.3 KiB
Diff
163 lines
5.3 KiB
Diff
|
From bf8e50786ee0c7e20024b8aa8c82a744351b87b1 Mon Sep 17 00:00:00 2001
|
||
|
From: Palanix <palanixyt@gmail.com>
|
||
|
Date: Mon, 4 Apr 2022 16:08:29 +0200
|
||
|
Subject: [PATCH] Updated patch now allowing setting x and y
|
||
|
|
||
|
---
|
||
|
config.def.h | 12 +++++----
|
||
|
dwl.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-------
|
||
|
2 files changed, 71 insertions(+), 14 deletions(-)
|
||
|
|
||
|
diff --git a/config.def.h b/config.def.h
|
||
|
index 4f131dda..9bd1b7d0 100644
|
||
|
--- a/config.def.h
|
||
|
+++ b/config.def.h
|
||
|
@@ -25,14 +25,16 @@ static const Layout layouts[] = {
|
||
|
{ "[M]", monocle },
|
||
|
};
|
||
|
|
||
|
-/* monitors */
|
||
|
+/* monitors
|
||
|
+ * The order in which monitors are defined determines their position.
|
||
|
+ * Non-configured monitors are always added to the left. */
|
||
|
static const MonitorRule monrules[] = {
|
||
|
- /* name mfact nmaster scale layout rotate/reflect */
|
||
|
- /* example of a HiDPI laptop monitor:
|
||
|
- { "eDP-1", 0.5, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
|
||
|
+ /* name mfact nmaster scale layout rotate/reflect x y resx resy rate adaptive*/
|
||
|
+ /* example of a HiDPI laptop monitor at 120Hz:
|
||
|
+ { "eDP-1", 0.5, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 0, 0, 120.000, 1},
|
||
|
*/
|
||
|
/* defaults */
|
||
|
- { NULL, 0.55, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
|
||
|
+ { NULL, 0.55, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 0, 0, 0, 0},
|
||
|
};
|
||
|
|
||
|
/* keyboard */
|
||
|
diff --git a/dwl.c b/dwl.c
|
||
|
index d0f5afc8..5f306c59 100644
|
||
|
--- a/dwl.c
|
||
|
+++ b/dwl.c
|
||
|
@@ -191,6 +191,12 @@ typedef struct {
|
||
|
float scale;
|
||
|
const Layout *lt;
|
||
|
enum wl_output_transform rr;
|
||
|
+ int x;
|
||
|
+ int y;
|
||
|
+ int resx;
|
||
|
+ int resy;
|
||
|
+ int rate;
|
||
|
+ int adaptive_true;
|
||
|
} MonitorRule;
|
||
|
|
||
|
typedef struct {
|
||
|
@@ -263,6 +269,7 @@ static void requeststartdrag(struct wl_listener *listener, void *data);
|
||
|
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||
|
static void run(char *startup_cmd);
|
||
|
static Client *selclient(void);
|
||
|
+static void set_mode(struct wlr_output *output, int width, int height, float refresh_rate);
|
||
|
static void setcursor(struct wl_listener *listener, void *data);
|
||
|
static void setfloating(Client *c, int floating);
|
||
|
static void setfullscreen(Client *c, int fullscreen);
|
||
|
@@ -868,18 +875,51 @@ createlayersurface(struct wl_listener *listener, void *data)
|
||
|
wlr_layer_surface->current = old_state;
|
||
|
}
|
||
|
|
||
|
+void
|
||
|
+set_mode(struct wlr_output *output, int width, int height,
|
||
|
+ float refresh_rate) {
|
||
|
+ // Not all floating point integers can be represented exactly
|
||
|
+ // as (int)(1000 * mHz / 1000.f)
|
||
|
+ // round() the result to avoid any error
|
||
|
+ struct wlr_output_mode *mode, *best = NULL;
|
||
|
+ int mhz = (int)((refresh_rate * 1000) + 0.5);
|
||
|
+
|
||
|
+ if (wl_list_empty(&output->modes)) {
|
||
|
+ wlr_output_set_custom_mode(output, width, height,
|
||
|
+ refresh_rate > 0 ? mhz : 0);
|
||
|
+ return;
|
||
|
+ }
|
||
|
+
|
||
|
+ wl_list_for_each(mode, &output->modes, link) {
|
||
|
+ if (mode->width == width && mode->height == height) {
|
||
|
+ if (mode->refresh == mhz) {
|
||
|
+ best = mode;
|
||
|
+ break;
|
||
|
+ }
|
||
|
+ if (best == NULL || mode->refresh > best->refresh) {
|
||
|
+ best = mode;
|
||
|
+ }
|
||
|
+ }
|
||
|
+ }
|
||
|
+ if (!best) {
|
||
|
+ best = wlr_output_preferred_mode(output);
|
||
|
+ }
|
||
|
+ wlr_output_set_mode(output, best);
|
||
|
+}
|
||
|
+
|
||
|
void
|
||
|
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;
|
||
|
+ const struct wlr_output_mode *wlr_output_mode;
|
||
|
+ int32_t resx,resy,rate;
|
||
|
const MonitorRule *r;
|
||
|
Monitor *m = wlr_output->data = ecalloc(1, sizeof(*m));
|
||
|
m->wlr_output = wlr_output;
|
||
|
|
||
|
- wlr_output_init_render(wlr_output, alloc, drw);
|
||
|
-
|
||
|
+ wlr_output_set_mode(wlr_output, wlr_output_preferred_mode(wlr_output));
|
||
|
/* Initialize monitor state using configured rules */
|
||
|
for (size_t i = 0; i < LENGTH(m->layers); i++)
|
||
|
wl_list_init(&m->layers[i]);
|
||
|
@@ -892,16 +932,31 @@ createmon(struct wl_listener *listener, void *data)
|
||
|
wlr_xcursor_manager_load(cursor_mgr, r->scale);
|
||
|
m->lt[0] = m->lt[1] = r->lt;
|
||
|
wlr_output_set_transform(wlr_output, r->rr);
|
||
|
+
|
||
|
+ wlr_output_mode = wlr_output_preferred_mode(wlr_output);
|
||
|
+
|
||
|
+ if (r->rate)
|
||
|
+ rate = r->rate;
|
||
|
+ else
|
||
|
+ rate = wlr_output_mode->refresh;
|
||
|
+ if (r->resx)
|
||
|
+ resx = r->resx;
|
||
|
+ else
|
||
|
+ resx = wlr_output_mode->width;
|
||
|
+ if (r->resy)
|
||
|
+ resy = r->resy;
|
||
|
+ else
|
||
|
+ resy = wlr_output_mode->height;
|
||
|
+
|
||
|
+ set_mode(wlr_output, resx, resy, rate);
|
||
|
+
|
||
|
+ if (r->adaptive_true)
|
||
|
+ wlr_output_enable_adaptive_sync(wlr_output, 1);
|
||
|
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_set_mode(wlr_output, wlr_output_preferred_mode(wlr_output));
|
||
|
- wlr_output_enable_adaptive_sync(wlr_output, 1);
|
||
|
+ wlr_output_init_render(wlr_output, alloc, drw);
|
||
|
|
||
|
/* Set up event listeners */
|
||
|
LISTEN(&wlr_output->events.frame, &m->frame, rendermon);
|
||
|
@@ -921,7 +976,7 @@ createmon(struct wl_listener *listener, void *data)
|
||
|
* output (such as DPI, scale factor, manufacturer, etc).
|
||
|
*/
|
||
|
m->scene_output = wlr_scene_output_create(scene, wlr_output);
|
||
|
- wlr_output_layout_add_auto(output_layout, wlr_output);
|
||
|
+ wlr_output_layout_add(output_layout, wlr_output,r->x, r->y);
|
||
|
|
||
|
/* If length == 1 we need update selmon.
|
||
|
* Maybe it will change in run(). */
|