jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2025-10-27 18:24:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated patch now allowing setting x and y

Browse Source
This commit is contained in:
Palanix 2022-04-04 16:08:29 +02:00 committed by Leonardo Hernández Hernández
parent 5c4542c118
commit ddd4285a27
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
2 changed files with 73 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.def.h
View File

@ -28,14 +28,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 custom*/
/* 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, 0},
*/
/* 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, 1},
};
/* keyboard */

75
dwl.c
View File

@ -197,6 +197,13 @@ typedef struct {
float scale;
const Layout *lt;
enum wl_output_transform rr;
int x;
int y;
int resx;
int resy;
float rate;
int adaptive_true;
int custom;
} MonitorRule;
typedef struct {
@ -286,6 +293,7 @@ static void requeststartdrag(struct wl_listener *listener, void *data);
static void resize(Client *c, struct wlr_box geo, int interact, int draw_borders);
static void run(char *startup_cmd);
static Client *selclient(void);
static void set_mode(struct wlr_output *output, int custom, 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);
@ -1044,19 +1052,53 @@ createlayersurface(struct wl_listener *listener, void *data)
wlr_layer_surface->current = old_state;
}
void
set_mode(struct wlr_output *output, int custom, 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) || custom) {
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;
float rate;
const MonitorRule *r;
size_t i;
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 (i = 0; i < LENGTH(m->layers); i++)
wl_list_init(&m->layers[i]);
@ -1069,16 +1111,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, r->custom, 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);
@ -1098,7 +1155,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);
}
void