diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-04-17 14:29:30 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-04-17 14:34:04 +0000 |
| commit | 24ee3dcc10c5e1cf57456cc39fa0b5e8700a06ed (patch) | |
| tree | f5871e5c51a51600326a001ca592afddb3fa01f8 /wayland.h | |
| parent | key-binding: NOINLINE a couple of functions, for a minor code size reduction (diff) | |
wayland: refactor: remove ‘struct config’ pointer from wayland struct
The global config doesn’t necessarily reflect the correct
configuration to use - we should *always* use the current terminal
instance’s conf pointer.
* Move selection override modifier mask to the key_binding_set struct
* Always warn if XDG activation is unavailable, not just if
bell.urgent is set (we no longer have access to this information)
* Pass ‘bool presentation_timings’ as a parameter to wayl_init()
* Remove ‘presentation_timings’ member from the ‘terminal’ struct
Closes #932
Diffstat (limited to 'wayland.h')
| -rw-r--r-- | wayland.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -6,6 +6,7 @@ #include <uchar.h> #include <wayland-client.h> +#include <xkbcommon/xkbcommon.h> /* Wayland protocols */ #include <presentation-time.h> @@ -22,7 +23,6 @@ #include <fcft/fcft.h> #include <tllist.h> -#include "config.h" #include "fdm.h" /* Forward declarations */ @@ -354,10 +354,8 @@ struct wl_window { int resize_timeout_fd; }; -struct config; struct terminal; struct wayland { - const struct config *conf; struct fdm *fdm; struct key_binding_manager *key_binding_manager; @@ -381,6 +379,7 @@ struct wayland { struct xdg_activation_v1 *xdg_activation; #endif + bool presentation_timings; struct wp_presentation *presentation; uint32_t presentation_clock_id; @@ -395,8 +394,9 @@ struct wayland { tll(struct terminal *) terms; }; -struct wayland *wayl_init(const struct config *conf, struct fdm *fdm, - struct key_binding_manager *key_binding_manager); +struct wayland *wayl_init( + struct fdm *fdm, struct key_binding_manager *key_binding_manager, + bool presentation_timings); void wayl_destroy(struct wayland *wayl); bool wayl_reload_xcursor_theme(struct seat *seat, int new_scale); |
