diff options
| author | sghctoma <sghctoma@gmail.com> | 2018-09-02 18:32:31 +0200 |
|---|---|---|
| committer | sghctoma <sghctoma@gmail.com> | 2018-09-02 18:32:31 +0200 |
| commit | 3b2b8c18446bb98ec0e5eea46fb1212b7bf64445 (patch) | |
| tree | 1efb3ccee04a7589a1c963b3cace215ca8236c56 /include/wlr | |
| parent | 2bd6fbf20ebb055d4871ffb8eedefa7d7aa60ee8 (diff) | |
| parent | 95d05acda511e8559ab87a3d8956ee942ca1999e (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-freebsd-direct-session
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_screencopy_v1.h | 1 | ||||
| -rw-r--r-- | include/wlr/xwayland.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/wlr/types/wlr_screencopy_v1.h b/include/wlr/types/wlr_screencopy_v1.h index 822fb3d0..aba32a45 100644 --- a/include/wlr/types/wlr_screencopy_v1.h +++ b/include/wlr/types/wlr_screencopy_v1.h @@ -10,6 +10,7 @@ #define WLR_TYPES_WLR_SCREENCOPY_V1_H #include <wayland-server.h> +#include <wlr/types/wlr_box.h> struct wlr_screencopy_manager_v1 { struct wl_global *global; diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 2eda768a..cf1c2cd1 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -138,6 +138,7 @@ struct wlr_xwayland_surface { struct wl_event_source *ping_timer; // _NET_WM_STATE + bool modal; bool fullscreen; bool maximized_vert, maximized_horz; @@ -150,6 +151,7 @@ struct wlr_xwayland_surface { struct wl_signal request_resize; struct wl_signal request_maximize; struct wl_signal request_fullscreen; + struct wl_signal request_activate; struct wl_signal map; struct wl_signal unmap; |