diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
commit | a2fbb20a616444213ff3967b33eed7f4561e3978 (patch) | |
tree | 276a133eb78d6e0655bc164693650454d43a22ca /include | |
parent | Add comment about usage to arrange_windows declaration (diff) | |
parent | Merge pull request #2172 from apreiml/fix-keybinding-modifier-handling (diff) | |
download | sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.gz sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.zst sway-a2fbb20a616444213ff3967b33eed7f4561e3978.zip |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/output.h | 4 | ||||
-rw-r--r-- | include/sway/server.h | 9 | ||||
-rw-r--r-- | include/sway/xwayland.h | 25 |
3 files changed, 32 insertions, 6 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index e6ca0d02..19fc5e99 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -32,6 +32,10 @@ struct sway_output { | |||
32 | struct wl_list link; | 32 | struct wl_list link; |
33 | 33 | ||
34 | pid_t bg_pid; | 34 | pid_t bg_pid; |
35 | |||
36 | struct { | ||
37 | struct wl_signal destroy; | ||
38 | } events; | ||
35 | }; | 39 | }; |
36 | 40 | ||
37 | void output_damage_whole(struct sway_output *output); | 41 | void output_damage_whole(struct sway_output *output); |
diff --git a/include/sway/server.h b/include/sway/server.h index 0efc6baa..1e1aa3cc 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -11,8 +11,8 @@ | |||
11 | #include <wlr/types/wlr_xdg_shell.h> | 11 | #include <wlr/types/wlr_xdg_shell.h> |
12 | #include <wlr/render/wlr_renderer.h> | 12 | #include <wlr/render/wlr_renderer.h> |
13 | // TODO WLR: make Xwayland optional | 13 | // TODO WLR: make Xwayland optional |
14 | #include <wlr/xwayland.h> | ||
15 | #include "list.h" | 14 | #include "list.h" |
15 | #include "sway/xwayland.h" | ||
16 | 16 | ||
17 | struct sway_server { | 17 | struct sway_server { |
18 | struct wl_display *wl_display; | 18 | struct wl_display *wl_display; |
@@ -38,12 +38,9 @@ struct sway_server { | |||
38 | struct wlr_xdg_shell *xdg_shell; | 38 | struct wlr_xdg_shell *xdg_shell; |
39 | struct wl_listener xdg_shell_surface; | 39 | struct wl_listener xdg_shell_surface; |
40 | 40 | ||
41 | struct wlr_xwayland *xwayland; | 41 | struct sway_xwayland xwayland; |
42 | struct wlr_xcursor_manager *xcursor_manager; | ||
43 | struct wl_listener xwayland_surface; | 42 | struct wl_listener xwayland_surface; |
44 | 43 | struct wl_listener xwayland_ready; | |
45 | struct wlr_wl_shell *wl_shell; | ||
46 | struct wl_listener wl_shell_surface; | ||
47 | 44 | ||
48 | bool debug_txn_timings; | 45 | bool debug_txn_timings; |
49 | 46 | ||
diff --git a/include/sway/xwayland.h b/include/sway/xwayland.h new file mode 100644 index 00000000..78d1053b --- /dev/null +++ b/include/sway/xwayland.h | |||
@@ -0,0 +1,25 @@ | |||
1 | #ifndef SWAY_XWAYLAND_H | ||
2 | #define SWAY_XWAYLAND_H | ||
3 | |||
4 | #include <wlr/xwayland.h> | ||
5 | #include <xcb/xproto.h> | ||
6 | |||
7 | enum atom_name { | ||
8 | NET_WM_WINDOW_TYPE_DIALOG, | ||
9 | NET_WM_WINDOW_TYPE_UTILITY, | ||
10 | NET_WM_WINDOW_TYPE_TOOLBAR, | ||
11 | NET_WM_WINDOW_TYPE_SPLASH, | ||
12 | NET_WM_STATE_MODAL, | ||
13 | ATOM_LAST, | ||
14 | }; | ||
15 | |||
16 | struct sway_xwayland { | ||
17 | struct wlr_xwayland *wlr_xwayland; | ||
18 | struct wlr_xcursor_manager *xcursor_manager; | ||
19 | |||
20 | xcb_atom_t atoms[ATOM_LAST]; | ||
21 | }; | ||
22 | |||
23 | void handle_xwayland_ready(struct wl_listener *listener, void *data); | ||
24 | |||
25 | #endif | ||