diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-12-31 15:12:48 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-12-31 15:12:48 +0000 |
| commit | b100a82c2a1aa75bb8a27e2d2a1235b36359a161 (patch) | |
| tree | 0b593225c27bcc5977f7c5ecb97416025b5f1b60 | |
| parent | wayland: remove empty line (diff) | |
wayland: only bind to 'presentation' interface if -p,--presentation-timings
| -rw-r--r-- | main.c | 2 | ||||
| -rw-r--r-- | wayland.c | 20 | ||||
| -rw-r--r-- | wayland.h | 4 |
3 files changed, 16 insertions, 10 deletions
@@ -235,7 +235,7 @@ main(int argc, char *const *argv) if ((fdm = fdm_init()) == NULL) goto out; - if ((wayl = wayl_init(fdm)) == NULL) + if ((wayl = wayl_init(&conf, fdm)) == NULL) goto out; if (!as_server && (term = term_init( @@ -21,6 +21,7 @@ #define LOG_ENABLE_DBG 0 #include "log.h" +#include "config.h" #include "terminal.h" #include "input.h" #include "render.h" @@ -341,14 +342,16 @@ handle_global(void *data, struct wl_registry *registry, } else if (strcmp(interface, wp_presentation_interface.name) == 0) { - const uint32_t required = 1; - if (!verify_iface_version(interface, version, required)) - return; + if (wayl->conf->presentation_timings) { + const uint32_t required = 1; + if (!verify_iface_version(interface, version, required)) + return; - wayl->presentation = wl_registry_bind( - wayl->registry, name, &wp_presentation_interface, required); - wp_presentation_add_listener( - wayl->presentation, &presentation_listener, wayl); + wayl->presentation = wl_registry_bind( + wayl->registry, name, &wp_presentation_interface, required); + wp_presentation_add_listener( + wayl->presentation, &presentation_listener, wayl); + } } } @@ -520,9 +523,10 @@ fdm_repeat(struct fdm *fdm, int fd, int events, void *data) } struct wayland * -wayl_init(struct fdm *fdm) +wayl_init(const struct config *conf, struct fdm *fdm) { struct wayland *wayl = calloc(1, sizeof(*wayl)); + wayl->conf = conf; wayl->fdm = fdm; wayl->kbd.repeat.fd = -1; @@ -100,8 +100,10 @@ struct wl_window { tll(const struct monitor *) on_outputs; /* Outputs we're mapped on */ }; +struct config; struct terminal; struct wayland { + const struct config *conf; struct fdm *fdm; struct wl_display *display; struct wl_registry *registry; @@ -166,7 +168,7 @@ struct wayland { struct terminal *moused; }; -struct wayland *wayl_init(struct fdm *fdm); +struct wayland *wayl_init(const struct config *conf, struct fdm *fdm); void wayl_destroy(struct wayland *wayl); struct terminal *wayl_terminal_from_surface( |
