mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-07 04:34:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bindings

Browse source
This commit is contained in:
Daniel Eklöf 2020-03-09 18:49:44 +01:00
commit fc7b3b2d85
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
7 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
wayland.c
View file

@ -727,6 +727,11 @@ wayl_init(const struct config *conf, struct fdm *fdm)
wayl->fdm = fdm;
wayl->kbd.repeat.fd = -1;
if (!fdm_hook_add(fdm, &fdm_hook, wayl, FDM_HOOK_PRIORITY_LOW)) {
LOG_ERR("failed to add FDM hook");
goto out;
}
wayl->display = wl_display_connect(NULL);
if (wayl->display == NULL) {
LOG_ERR("failed to connect to wayland; no compositor running?");
@ -775,9 +780,10 @@ wayl_init(const struct config *conf, struct fdm *fdm)
if (wayl->primary_selection_device_manager == NULL)
LOG_WARN("no primary selection available");
if (conf->presentation_timings && wayl->presentation == NULL)
LOG_WARN("presentation time interface not implemented by compositor; "
"timings will not be available");
if (conf->presentation_timings && wayl->presentation == NULL) {
LOG_ERR("presentation time interface not implemented by compositor");
goto out;
}
tll_foreach(wayl->monitors, it) {
LOG_INFO(
@ -851,11 +857,6 @@ wayl_init(const struct config *conf, struct fdm *fdm)
goto out;
}
if (!fdm_hook_add(fdm, &fdm_hook, wayl, FDM_HOOK_PRIORITY_LOW)) {
LOG_ERR("failed to add FDM hook");
goto out;
}
return wayl;
out: