pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

bar/wayland: use preferred monitor if user didn't specify one

Browse source
This commit is contained in:
Daniel Eklöf 2019-09-22 12:08:08 +02:00
parent 18e9d67d77
commit f29f96be96
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bar/wayland.c
View file

@ -51,6 +51,7 @@ struct monitor {
int width_px; int width_px;
int height_px; int height_px;
bool preferred;
int scale; int scale;
}; };
@ -269,6 +270,8 @@ static void
output_mode(void *data, struct wl_output *wl_output, uint32_t flags, output_mode(void *data, struct wl_output *wl_output, uint32_t flags,
int32_t width, int32_t height, int32_t refresh) int32_t width, int32_t height, int32_t refresh)
{ {
struct monitor *mon = data;
mon->preferred = flags & WL_OUTPUT_MODE_PREFERRED;
} }
static void static void
@ -588,12 +591,16 @@ setup(struct bar *_bar)
mon->name, mon->width_px, mon->height_px, mon->name, mon->width_px, mon->height_px,
mon->x, mon->y, mon->width_mm, mon->height_mm); mon->x, mon->y, mon->width_mm, mon->height_mm);
/* TODO: detect primary output when user hasn't specified a monitor */ if (bar->monitor == NULL && mon->preferred) {
if (bar->monitor == NULL) /* User didn't specify a monitor, and this is the default one */
backend->monitor = mon; backend->monitor = mon;
else if (strcmp(bar->monitor, mon->name) == 0) }
else if (bar->monitor != NULL && strcmp(bar->monitor, mon->name) == 0) {
/* User specified a monitor, and this is one */
backend->monitor = mon; backend->monitor = mon;
} }
}
if (backend->monitor == NULL) { if (backend->monitor == NULL) {
LOG_ERR("failed to find the specified monitor: %s", LOG_ERR("failed to find the specified monitor: %s",