mirrors/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2025-11-03 09:01:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

no conditional needed for output modes

Browse source 
If the output backend doesn't support modes, get_preferred_mode will
return NULL, and set_mode will accept NULL.
This commit is contained in:
Devin J. Pohly 2020-05-03 11:45:47 -05:00
parent b19afa10f3
commit 1a30d9908d
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dwl.c
View file

@ -392,22 +392,14 @@ createmon(struct wl_listener *listener, void *data)
/* This event is raised by the backend when a new output (aka a display or /* This event is raised by the backend when a new output (aka a display or
* monitor) becomes available. */ * monitor) becomes available. */
struct wlr_output *wlr_output = data; struct wlr_output *wlr_output = data;
struct wlr_output_mode *mode;
Monitor *m; Monitor *m;
const MonitorRule *r; const MonitorRule *r;
/* Some backends don't have modes. DRM+KMS does, and we need to set a mode /* The mode is a tuple of (width, height, refresh rate), and each
* before we can use the output. The mode is a tuple of (width, height, * monitor supports only a specific set of modes. We just pick the
* refresh rate), and each monitor supports only a specific set of modes. We * monitor's preferred mode; a more sophisticated compositor would let
* just pick the monitor's preferred mode, a more sophisticated compositor * the user configure it. */
* would let the user configure it. */ wlr_output_set_mode(wlr_output, wlr_output_preferred_mode(wlr_output));
if (!wl_list_empty(&wlr_output->modes)) {
mode = wlr_output_preferred_mode(wlr_output);
wlr_output_set_mode(wlr_output, mode);
wlr_output_enable(wlr_output, 1);
if (!wlr_output_commit(wlr_output))
return;
}
/* Allocates and configures monitor state using configured rules */ /* Allocates and configures monitor state using configured rules */
m = wlr_output->data = calloc(1, sizeof(*m)); m = wlr_output->data = calloc(1, sizeof(*m));
@ -429,6 +421,10 @@ createmon(struct wl_listener *listener, void *data)
wl_signal_add(&wlr_output->events.frame, &m->frame); wl_signal_add(&wlr_output->events.frame, &m->frame);
wl_list_insert(&mons, &m->link); wl_list_insert(&mons, &m->link);
wlr_output_enable(wlr_output, 1);
if (!wlr_output_commit(wlr_output))
return;
/* Adds this to the output layout. The add_auto function arranges outputs /* Adds this to the output layout. The add_auto function arranges outputs
* from left-to-right in the order they appear. A more sophisticated * from left-to-right in the order they appear. A more sophisticated
* compositor would let the user configure the arrangement of outputs in the * compositor would let the user configure the arrangement of outputs in the