chore: small refactor p2

Author: dy-tea

include/foreign_capture.h

@@ -0,0 +1,4 @@
+#pragma once
+
+void foreign_capture_init(void);
+void foreign_capture_fini(void);

include/lock.h

@@ -2,14 +2,7 @@
 
 #include <wayland-server.h>
 
-typedef struct session_lock_t {
-	struct wlr_session_lock_v1 *session_lock;
-	struct wlr_scene_tree *scene_tree;
-
-	struct wl_listener new_surface;
-	struct wl_listener unlock;
-	struct wl_listener destroy;
-} session_lock_t;
-
-void handle_new_session_lock(struct wl_listener *listener, void *data);
 void destroy_lock_surface(struct wl_listener *listener, void *data);
+
+void session_lock_init(void);
+void session_lock_fini(void);

include/once.h

@@ -0,0 +1,13 @@
+#include <wlr/util/log.h>
+
+#if DEBUG
+#define ONCE() \
+  do { \
+    static int _called_once_flag_##__LINE__ = 0; \
+    if (_called_once_flag_##__LINE__) \
+     	wlr_log(WLR_ERROR, "Function %s called more than once", __func__); \
+    _called_once_flag_##__LINE__ = 1; \
+  } while(0)
+#else
+#define ONCE() ;
+#endif

include/output.h

@@ -65,7 +65,7 @@ typedef struct output_t {
 	struct output_t *prev, *next;
 } output_t;
 
-void handle_new_output(struct wl_listener *listener, void *data);
+void output_create(struct wlr_output *wlr_output);
 void output_enable(output_t *output);
 void output_disable(output_t *output);
 void output_destroy(output_t *output);

include/toplevel.h

@@ -89,8 +89,6 @@ void toplevel_send_frame_done(toplevel_t *toplevel);
 
 void toplevel_freeze_sibling_buffers(desktop_t *d, node_t *n);
 
-void handle_new_toplevel_capture_request(struct wl_listener *listener, void *data);
-
 void toplevel_set_effect(toplevel_t *tl, surface_effect_t effect, bool enabled);
 void toplevel_set_border_radius(toplevel_t *tl, float radius);
 void toplevel_set_shadow(toplevel_t *tl, bool enabled);

include/xwayland.h

@@ -97,12 +97,12 @@ typedef struct xwayland_unmanaged_t {
 	struct wl_listener override_redirect;
 } xwayland_unmanaged_t;
 
-void handle_xwayland_ready(struct wl_listener *listener, void *data);
-void handle_xwayland_surface(struct wl_listener *listener, void *data);
-
 void xwayland_view_close(xwayland_toplevel_t *xwayland_view);
 void xwayland_view_set_activated(xwayland_toplevel_t *xwayland_view, bool activated);
 
 void xwayland_set_effect(xwayland_toplevel_t *xwayland_view, surface_effect_t effect, bool enabled);
 void xwayland_set_border_radius(xwayland_toplevel_t *xwayland_view, float radius);
 void xwayland_set_shadow(xwayland_toplevel_t *xwayland_view, bool enabled);
+
+void xwayland_init(void);
+void xwayland_fini(void);

meson.build

@@ -5,6 +5,9 @@ project(
 )
 
 add_project_arguments('-DWLR_USE_UNSTABLE', language: 'c')
+if get_option('debug')
+	add_project_arguments('-DDEBUG', language: 'c')
+endif
 
 wayland_protos = dependency('wayland-protocols')
 
@@ -106,6 +109,7 @@ executable(
 		'src' / 'effects.c',
 		'src' / 'effects_gles2.c',
 		'src' / 'effects_vk.c',
+		'src' / 'foreign_capture.c',
 		'src' / 'gesture.c',
 		'src' / 'global_shortcuts.c',
 		'src' / 'idle.c',

src/animation.c

@@ -1,6 +1,7 @@
 #include "animation.h"
 #include "bezier.h"
 #include "layer.h"
+#include "once.h"
 #include "output.h"
 #include "spring.h"
 #include "surface.h"
@@ -12,7 +13,6 @@
 #include <stdlib.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_scene.h>
-#include <wlr/util/log.h>
 
 #define SPRING_FIXED_DT 0.001
 #define SPRING_MAX_STEPS 10
@@ -295,13 +295,15 @@ bool animation_type_get_enabled(const char *type_name) {
 }
 
 void animation_init(void) {
+	ONCE();
 	wl_list_init(&animations);
 
 	for (int i = 0; i < ANIM_TYPE_COUNT; i++)
 		anim_type_configs[i].enabled = true;
 }
 
 void animation_fini(void) {
+	ONCE();
 	animation_entry_t *entry, *tmp;
 	wl_list_for_each_safe(entry, tmp, &animations, link) {
 		if (entry->from_opacity != entry->to_opacity && entry->scene_tree) {

src/backend.c

@@ -1,5 +1,6 @@
 #include "input.h"
 #include "keyboard.h"
+#include "once.h"
 #include "output.h"
 #include "pointer.h"
 #include "seat.h"
@@ -66,7 +67,17 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 	}
 }
 
+static void handle_new_output(struct wl_listener *listener, void *data) {
+	(void)listener;
+	struct wlr_output *wlr_output = data;
+	if (!wlr_output)
+		return;
+
+	output_create(wlr_output);
+}
+
 void backend_init(void) {
+	ONCE();
 	server.backend = wlr_backend_autocreate(wl_display_get_event_loop(server.wl_display),
 		&server.session);
 	if (server.backend == NULL) {
@@ -93,6 +104,7 @@ void backend_init(void) {
 }
 
 void backend_fini(void) {
+	ONCE();
 	wl_list_remove(&server.new_input.link);
 	wl_list_remove(&server.new_output.link);
 }

src/bell.c

@@ -1,7 +1,7 @@
 #include "config.h"
+#include "once.h"
 #include "server.h"
 #include <wlr/types/wlr_xdg_system_bell_v1.h>
-#include <wlr/util/log.h>
 
 static int handle_system_bell_timer(void *data) {
 	(void)data;
@@ -24,6 +24,7 @@ static void handle_ring_system_bell(struct wl_listener *listener, void *data) {
 }
 
 void bell_init(void) {
+	ONCE();
 	server.xdg_system_bell = wlr_xdg_system_bell_v1_create(server.wl_display, 1);
 	if (!server.xdg_system_bell) {
 		wlr_log(WLR_ERROR, "Failed to create xdg system bell");
@@ -34,5 +35,6 @@ void bell_init(void) {
 }
 
 void bell_fini(void) {
+	ONCE();
 	wl_list_remove(&server.ring_system_bell.link);
 }