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

Merge branch 'xcb-fallback-to-non-primary-monitor'

Browse source 
Closes #20
This commit is contained in:
Daniel Eklöf 2020-12-04 22:09:05 +01:00
commit 45d9dbcb34
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -30,6 +30,8 @@
* mpd: fix compilation with clang
(https://codeberg.org/dnkl/yambar/issues/16).
* Crash when the alpha component in a color value was 0.
* XCB: Fallback to non-primary monitor when the primary monitor is
disconnected (https://codeberg.org/dnkl/yambar/issues/20)
### Security

25
bar/xcb.c
View file

@ -101,27 +101,38 @@ setup(struct bar *_bar)
mon->width, mon->height, mon->x, mon->y,
mon->width_in_millimeters, mon->height_in_millimeters);
if (!((bar->monitor == NULL && mon->primary) ||
(bar->monitor != NULL && strcmp(bar->monitor, name) == 0)))
{
/* User wants a specific monitor, and this is not the one */
if (bar->monitor != NULL && strcmp(bar->monitor, name) != 0) {
free(name);
continue;
}
free(name);
backend->x = mon->x;
backend->y = mon->y;
bar->width = mon->width;
backend->y += bar->location == BAR_TOP ? 0
: screen->height_in_pixels - bar->height_with_border;
found_monitor = true;
break;
if ((bar->monitor != NULL && strcmp(bar->monitor, name) == 0) ||
(bar->monitor == NULL && mon->primary))
{
/* Exact match */
free(name);
break;
}
free(name);
}
free(monitors);
if (!found_monitor) {
LOG_ERR("no matching monitor");
if (bar->monitor == NULL)
LOG_ERR("no monitors found");
else
LOG_ERR("no monitor '%s'", bar->monitor);
/* TODO: cleanup */
return false;
}