aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2020-03-02 12:40:19 +0100
committerLibravatar Drew DeVault <sir@cmpwn.com>2020-03-04 03:09:43 +0100
commitc0811fcf8736961725f7aa848e740f38f2bdf6ed (patch)
treec5d361234a4c4fc4225526791153324e91cd0dbf
parentipc-server: improve error message (diff)
downloadsway-c0811fcf8736961725f7aa848e740f38f2bdf6ed.tar.gz
sway-c0811fcf8736961725f7aa848e740f38f2bdf6ed.tar.zst
sway-c0811fcf8736961725f7aa848e740f38f2bdf6ed.zip
Make handle_destroy and output_repaint_timer_handler static
-rw-r--r--include/sway/output.h2
-rw-r--r--sway/desktop/output.c2
-rw-r--r--sway/desktop/surface.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/include/sway/output.h b/include/sway/output.h
index 9117f350..ccc1097f 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -78,8 +78,6 @@ typedef void (*sway_surface_iterator_func_t)(struct sway_output *output, struct
78 struct wlr_surface *surface, struct wlr_box *box, float rotation, 78 struct wlr_surface *surface, struct wlr_box *box, float rotation,
79 void *user_data); 79 void *user_data);
80 80
81int output_repaint_timer_handler(void *data);
82
83void output_damage_whole(struct sway_output *output); 81void output_damage_whole(struct sway_output *output);
84 82
85void output_damage_surface(struct sway_output *output, double ox, double oy, 83void output_damage_surface(struct sway_output *output, double ox, double oy,
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index f5c84d96..16c6fc54 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -507,7 +507,7 @@ static bool scan_out_fullscreen_view(struct sway_output *output,
507 return wlr_output_commit(wlr_output); 507 return wlr_output_commit(wlr_output);
508} 508}
509 509
510int output_repaint_timer_handler(void *data) { 510static int output_repaint_timer_handler(void *data) {
511 struct sway_output *output = data; 511 struct sway_output *output = data;
512 if (output->wlr_output == NULL) { 512 if (output->wlr_output == NULL) {
513 return 0; 513 return 0;
diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c
index 35af2870..767b2045 100644
--- a/sway/desktop/surface.c
+++ b/sway/desktop/surface.c
@@ -5,7 +5,7 @@
5#include "sway/server.h" 5#include "sway/server.h"
6#include "sway/surface.h" 6#include "sway/surface.h"
7 7
8void handle_destroy(struct wl_listener *listener, void *data) { 8static void handle_destroy(struct wl_listener *listener, void *data) {
9 struct sway_surface *surface = wl_container_of(listener, surface, destroy); 9 struct sway_surface *surface = wl_container_of(listener, surface, destroy);
10 10
11 surface->wlr_surface->data = NULL; 11 surface->wlr_surface->data = NULL;