aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2018-02-14 15:08:10 -0500
committerTony Crisci <tony@dubstepdish.com>2018-02-14 15:08:10 -0500
commit083e11ac7c03167d88b4f7532e5311d460e799e2 (patch)
tree3cc0b6a72f4fa4dfd5d6f58bcd23831b74f19bcf /sway/desktop
parent946d9459c57fc38b2536d40a45b7d4c9186b6734 (diff)
parentc6cb87be19dba185e32af59e1e7fd1217a15c08b (diff)
downloadsway-083e11ac7c03167d88b4f7532e5311d460e799e2.tar.xz
fix build for latest api
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 6bbaf938..e250d450 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -216,11 +216,12 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
struct sway_output *soutput = wl_container_of(listener, soutput, frame);
struct wlr_output *wlr_output = data;
struct sway_server *server = soutput->server;
-
float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
wlr_renderer_clear(renderer, &clear_color);
+ wlr_renderer_clear(renderer, &clear_color);
+
int buffer_age = -1;
wlr_output_make_current(wlr_output, &buffer_age);
wlr_renderer_begin(server->renderer, wlr_output);
@@ -254,8 +255,8 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
soutput->last_frame = now;
}
-void output_add_notify(struct wl_listener *listener, void *data) {
- struct sway_server *server = wl_container_of(listener, server, output_add);
+void handle_new_output(struct wl_listener *listener, void *data) {
+ struct sway_server *server = wl_container_of(listener, server, new_output);
struct wlr_output *wlr_output = data;
wlr_log(L_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
@@ -280,12 +281,14 @@ void output_add_notify(struct wl_listener *listener, void *data) {
sway_input_manager_configure_xcursor(input_manager);
- output->frame.notify = output_frame_notify;
wl_signal_add(&wlr_output->events.frame, &output->frame);
+ output->frame.notify = output_frame_notify;
+
+ wl_signal_add(&wlr_output->events.destroy, &output->output_destroy);
+ output->output_destroy.notify = handle_output_destroy;
}
-void output_remove_notify(struct wl_listener *listener, void *data) {
- struct sway_server *server = wl_container_of(listener, server, output_remove);
+void handle_output_destroy(struct wl_listener *listener, void *data) {
struct wlr_output *wlr_output = data;
wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);