Merge branch 'master' into diagonal-dpi

This commit is contained in:
Daniel Eklöf 2020-07-28 20:01:56 +02:00
commit 295083059c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
19 changed files with 423 additions and 68 deletions

View file

@ -275,6 +275,9 @@ struct wl_window {
struct wl_surface *search_surface;
struct wl_subsurface *search_sub_surface;
struct wl_surface *scrollback_indicator_surface;
struct wl_subsurface *scrollback_indicator_sub_surface;
struct wl_callback *frame_callback;
tll(const struct monitor *) on_outputs; /* Outputs we're mapped on */