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

wayland: refactor: remove ‘struct config’ pointer from wayland struct

Browse source 
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
This commit is contained in:
Daniel Eklöf 2022-04-17 16:29:30 +02:00
parent 7a5e5a80b9
commit 24ee3dcc10
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
9 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
wayland.h
View file

@ -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);