diff options
-rw-r--r-- | include/sway/server.h | 3 | ||||
-rw-r--r-- | include/sway/surface.h | 11 | ||||
-rw-r--r-- | sway/desktop/surface.c | 24 | ||||
-rw-r--r-- | sway/meson.build | 1 | ||||
-rw-r--r-- | sway/server.c | 4 |
5 files changed, 43 insertions, 0 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index cd411d3b..5b34852c 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -28,6 +28,8 @@ struct sway_server { | |||
28 | struct wlr_backend *noop_backend; | 28 | struct wlr_backend *noop_backend; |
29 | 29 | ||
30 | struct wlr_compositor *compositor; | 30 | struct wlr_compositor *compositor; |
31 | struct wl_listener compositor_new_surface; | ||
32 | |||
31 | struct wlr_data_device_manager *data_device_manager; | 33 | struct wlr_data_device_manager *data_device_manager; |
32 | 34 | ||
33 | struct sway_input_manager *input; | 35 | struct sway_input_manager *input; |
@@ -99,6 +101,7 @@ void server_fini(struct sway_server *server); | |||
99 | bool server_start(struct sway_server *server); | 101 | bool server_start(struct sway_server *server); |
100 | void server_run(struct sway_server *server); | 102 | void server_run(struct sway_server *server); |
101 | 103 | ||
104 | void handle_compositor_new_surface(struct wl_listener *listener, void *data); | ||
102 | void handle_new_output(struct wl_listener *listener, void *data); | 105 | void handle_new_output(struct wl_listener *listener, void *data); |
103 | 106 | ||
104 | void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); | 107 | void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); |
diff --git a/include/sway/surface.h b/include/sway/surface.h new file mode 100644 index 00000000..06874af2 --- /dev/null +++ b/include/sway/surface.h | |||
@@ -0,0 +1,11 @@ | |||
1 | #ifndef _SWAY_SURFACE_H | ||
2 | #define _SWAY_SURFACE_H | ||
3 | #include <wlr/types/wlr_surface.h> | ||
4 | |||
5 | struct sway_surface { | ||
6 | struct wlr_surface *wlr_surface; | ||
7 | |||
8 | struct wl_listener destroy; | ||
9 | }; | ||
10 | |||
11 | #endif | ||
diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c new file mode 100644 index 00000000..41d4ce3f --- /dev/null +++ b/sway/desktop/surface.c | |||
@@ -0,0 +1,24 @@ | |||
1 | #include <stdlib.h> | ||
2 | #include <wlr/types/wlr_surface.h> | ||
3 | #include "sway/server.h" | ||
4 | #include "sway/surface.h" | ||
5 | |||
6 | void handle_destroy(struct wl_listener *listener, void *data) { | ||
7 | struct sway_surface *surface = wl_container_of(listener, surface, destroy); | ||
8 | |||
9 | surface->wlr_surface->data = NULL; | ||
10 | wl_list_remove(&surface->destroy.link); | ||
11 | |||
12 | free(surface); | ||
13 | } | ||
14 | |||
15 | void handle_compositor_new_surface(struct wl_listener *listener, void *data) { | ||
16 | struct wlr_surface *wlr_surface = data; | ||
17 | |||
18 | struct sway_surface *surface = calloc(1, sizeof(struct sway_surface)); | ||
19 | surface->wlr_surface = wlr_surface; | ||
20 | wlr_surface->data = surface; | ||
21 | |||
22 | surface->destroy.notify = handle_destroy; | ||
23 | wl_signal_add(&wlr_surface->events.destroy, &surface->destroy); | ||
24 | } | ||
diff --git a/sway/meson.build b/sway/meson.build index 76a31d73..12540154 100644 --- a/sway/meson.build +++ b/sway/meson.build | |||
@@ -16,6 +16,7 @@ sway_sources = files( | |||
16 | 'desktop/layer_shell.c', | 16 | 'desktop/layer_shell.c', |
17 | 'desktop/output.c', | 17 | 'desktop/output.c', |
18 | 'desktop/render.c', | 18 | 'desktop/render.c', |
19 | 'desktop/surface.c', | ||
19 | 'desktop/transaction.c', | 20 | 'desktop/transaction.c', |
20 | 'desktop/xdg_shell.c', | 21 | 'desktop/xdg_shell.c', |
21 | 22 | ||
diff --git a/sway/server.c b/sway/server.c index e2d54947..c97d098a 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -59,6 +59,10 @@ bool server_init(struct sway_server *server) { | |||
59 | wlr_renderer_init_wl_display(renderer, server->wl_display); | 59 | wlr_renderer_init_wl_display(renderer, server->wl_display); |
60 | 60 | ||
61 | server->compositor = wlr_compositor_create(server->wl_display, renderer); | 61 | server->compositor = wlr_compositor_create(server->wl_display, renderer); |
62 | server->compositor_new_surface.notify = handle_compositor_new_surface; | ||
63 | wl_signal_add(&server->compositor->events.new_surface, | ||
64 | &server->compositor_new_surface); | ||
65 | |||
62 | server->data_device_manager = | 66 | server->data_device_manager = |
63 | wlr_data_device_manager_create(server->wl_display); | 67 | wlr_data_device_manager_create(server->wl_display); |
64 | 68 | ||