From b66c0d87972c1333f75cb924e4e349c63bd1e8c2 Mon Sep 17 00:00:00 2001
From: tokyo4j <hrak1529@gmail.com>
Date: Sat, 22 Feb 2025 15:21:32 +0900
Subject: [PATCH] magnifier: rename some functions

---
 include/magnifier.h        | 10 +++++-----
 src/action.c               |  6 +++---
 src/common/scene-helpers.c |  4 ++--
 src/magnifier.c            | 10 +++++-----
 src/server.c               |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/magnifier.h b/include/magnifier.h
index daa6d7a3..afe79e22 100644
--- a/include/magnifier.h
+++ b/include/magnifier.h
@@ -14,12 +14,12 @@ enum magnify_dir {
 	MAGNIFY_DECREASE
 };
 
-void magnify_toggle(struct server *server);
-void magnify_set_scale(struct server *server, enum magnify_dir dir);
+void magnifier_toggle(struct server *server);
+void magnifier_set_scale(struct server *server, enum magnify_dir dir);
 bool output_wants_magnification(struct output *output);
-void magnify(struct output *output, struct wlr_buffer *output_buffer,
+void magnifier_draw(struct output *output, struct wlr_buffer *output_buffer,
 	struct wlr_box *damage);
-bool is_magnify_on(void);
-void magnify_reset(void);
+bool magnifier_is_enabled(void);
+void magnifier_reset(void);
 
 #endif /* LABWC_MAGNIFIER_H */
diff --git a/src/action.c b/src/action.c
index 3b03558c..a9fa40b7 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1319,13 +1319,13 @@ actions_run(struct view *activator, struct server *server,
 			rc.tablet.force_mouse_emulation = !rc.tablet.force_mouse_emulation;
 			break;
 		case ACTION_TYPE_TOGGLE_MAGNIFY:
-			magnify_toggle(server);
+			magnifier_toggle(server);
 			break;
 		case ACTION_TYPE_ZOOM_IN:
-			magnify_set_scale(server, MAGNIFY_INCREASE);
+			magnifier_set_scale(server, MAGNIFY_INCREASE);
 			break;
 		case ACTION_TYPE_ZOOM_OUT:
-			magnify_set_scale(server, MAGNIFY_DECREASE);
+			magnifier_set_scale(server, MAGNIFY_DECREASE);
 			break;
 		case ACTION_TYPE_WARP_CURSOR:
 			{
diff --git a/src/common/scene-helpers.c b/src/common/scene-helpers.c
index cc9e4db6..a8558ab1 100644
--- a/src/common/scene-helpers.c
+++ b/src/common/scene-helpers.c
@@ -114,8 +114,8 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
 	}
 
 	struct wlr_box additional_damage = {0};
-	if (state->buffer && is_magnify_on()) {
-		magnify(output, state->buffer, &additional_damage);
+	if (state->buffer && magnifier_is_enabled()) {
+		magnifier_draw(output, state->buffer, &additional_damage);
 	}
 
 	bool committed = wlr_output_commit_state(wlr_output, state);
diff --git a/src/magnifier.c b/src/magnifier.c
index fded35fd..d9f316c1 100644
--- a/src/magnifier.c
+++ b/src/magnifier.c
@@ -17,7 +17,7 @@ static struct wlr_texture *tmp_texture = NULL;
 #define CLAMP(in, lower, upper) MAX(MIN((in), (upper)), (lower))
 
 void
-magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage)
+magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage)
 {
 	int width, height;
 	double x, y;
@@ -258,7 +258,7 @@ enable_magnifier(struct server *server, bool enable)
 
 /* Toggles magnification on and off */
 void
-magnify_toggle(struct server *server)
+magnifier_toggle(struct server *server)
 {
 	enable_magnifier(server, !magnify_on);
 
@@ -270,7 +270,7 @@ magnify_toggle(struct server *server)
 
 /* Increases and decreases magnification scale */
 void
-magnify_set_scale(struct server *server, enum magnify_dir dir)
+magnifier_set_scale(struct server *server, enum magnify_dir dir)
 {
 	struct output *output = output_nearest_to_cursor(server);
 
@@ -296,7 +296,7 @@ magnify_set_scale(struct server *server, enum magnify_dir dir)
 
 /* Reset any buffers held by the magnifier */
 void
-magnify_reset(void)
+magnifier_reset(void)
 {
 	if (tmp_texture && tmp_buffer) {
 		wlr_texture_destroy(tmp_texture);
@@ -308,7 +308,7 @@ magnify_reset(void)
 
 /* Report whether magnification is enabled */
 bool
-is_magnify_on(void)
+magnifier_is_enabled(void)
 {
 	return magnify_on;
 }
diff --git a/src/server.c b/src/server.c
index 03fd5cd0..2c546309 100644
--- a/src/server.c
+++ b/src/server.c
@@ -413,7 +413,7 @@ handle_renderer_lost(struct wl_listener *listener, void *data)
 
 	reload_config_and_theme(server);
 
-	magnify_reset();
+	magnifier_reset();
 
 	wlr_allocator_destroy(old_allocator);
 	wlr_renderer_destroy(old_renderer);