sway

commit 142cb80e6f6f094fb3e5a353883322430142d516
parent 76bcc142cfd8aa8b004daaf733c01e99f2faab81
Author: blinxen <h-k-81@hotmail.com>
Date:   Mon, 13 Oct 2025 21:55:52 +0200

Rename dbusmenu functions to adhere to the style guide

Diffstat:
M
include/swaybar/tray/dbusmenu.h
 | 
12
++++++------
M
swaybar/input.c
 | 
12
++++++------
M
swaybar/tray/dbusmenu.c
 | 
12
++++++------

3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/include/swaybar/tray/dbusmenu.h b/include/swaybar/tray/dbusmenu.h
@@ -10,20 +10,20 @@ void swaybar_dbusmenu_open(struct swaybar_sni *sni,
 
 void swaybar_dbusmenu_destroy(struct swaybar_dbusmenu *menu);
 
-bool dbusmenu_pointer_button(void *data, struct wl_pointer *wl_pointer,
+bool sway_dbusmenu_pointer_button(void *data, struct wl_pointer *wl_pointer,
 		uint32_t serial, uint32_t time_, uint32_t button, uint32_t state);
 
-bool dbusmenu_pointer_motion(struct swaybar_seat *seat, struct wl_pointer *wl_pointer,
+bool sway_dbusmenu_pointer_motion(struct swaybar_seat *seat, struct wl_pointer *wl_pointer,
 		uint32_t time_, wl_fixed_t surface_x, wl_fixed_t surface_y);
 
-bool dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial,
+bool sway_dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial,
 		struct wl_surface *surface, wl_fixed_t surface_x, wl_fixed_t surface_y);
 
-bool dbusmenu_pointer_leave(void *data, struct wl_pointer *wl_pointer, uint32_t serial,
+bool sway_dbusmenu_pointer_leave(void *data, struct wl_pointer *wl_pointer, uint32_t serial,
 		struct wl_surface *surface);
 
-bool dbusmenu_pointer_frame(struct swaybar_seat *data, struct wl_pointer *wl_pointer);
+bool sway_dbusmenu_pointer_frame(struct swaybar_seat *data, struct wl_pointer *wl_pointer);
 
-bool dbusmenu_pointer_axis(struct swaybar_seat *data, struct wl_pointer *wl_pointer);
+bool sway_dbusmenu_pointer_axis(struct swaybar_seat *data, struct wl_pointer *wl_pointer);
 
 #endif
diff --git a/swaybar/input.c b/swaybar/input.c
@@ -138,7 +138,7 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
 
 #if HAVE_TRAY
 	struct swaybar_config *config = seat->bar->config;
-	if (!config->tray_hidden && dbusmenu_pointer_enter(data, wl_pointer, serial,
+	if (!config->tray_hidden && sway_dbusmenu_pointer_enter(data, wl_pointer, serial,
 		surface, surface_x, surface_y)) {
 		return;
 	}
@@ -150,7 +150,7 @@ static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
 	struct swaybar_seat *seat = data;
 #if HAVE_TRAY
 	struct swaybar_config *config = seat->bar->config;
-	if (!config->tray_hidden && dbusmenu_pointer_leave(data, wl_pointer, serial,
+	if (!config->tray_hidden && sway_dbusmenu_pointer_leave(data, wl_pointer, serial,
 		surface)) {
 		return;
 	}
@@ -166,7 +166,7 @@ static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
 	seat->pointer.y = wl_fixed_to_double(surface_y);
 #if HAVE_TRAY
 	struct swaybar_config *config = seat->bar->config;
-	if (!config->tray_hidden && dbusmenu_pointer_motion(data, wl_pointer, time,
+	if (!config->tray_hidden && sway_dbusmenu_pointer_motion(data, wl_pointer, time,
 		surface_x, surface_y)) {
 		return;
 	}
@@ -210,7 +210,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
 	struct swaybar_seat *seat = data;
 #if HAVE_TRAY
 	struct swaybar_config *config = seat->bar->config;
-	if (!config->tray_hidden && dbusmenu_pointer_button(seat, wl_pointer, serial,
+	if (!config->tray_hidden && sway_dbusmenu_pointer_button(seat, wl_pointer, serial,
 		time, button, state)) {
 		return;
 	}
@@ -334,7 +334,7 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
 
 #if HAVE_TRAY
 	struct swaybar_config *config = seat->bar->config;
-	if (!config->tray_hidden && dbusmenu_pointer_axis(data, wl_pointer)) {
+	if (!config->tray_hidden && sway_dbusmenu_pointer_axis(data, wl_pointer)) {
 		return;
 	}
 #endif
@@ -357,7 +357,7 @@ static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
 
 #if HAVE_TRAY
 	struct swaybar_config *config = seat->bar->config;
-	if (!config->tray_hidden && dbusmenu_pointer_frame(data, wl_pointer)) {
+	if (!config->tray_hidden && sway_dbusmenu_pointer_frame(data, wl_pointer)) {
 		return;
 	}
 #endif
diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c
@@ -1158,7 +1158,7 @@ pointer_motion_process_item(struct swaybar_dbusmenu_menu *focused_menu,
 	}
 }
 
-bool dbusmenu_pointer_motion(struct swaybar_seat *seat,
+bool sway_dbusmenu_pointer_motion(struct swaybar_seat *seat,
 		struct wl_pointer *wl_pointer, uint32_t time_, wl_fixed_t surface_x,
 		wl_fixed_t surface_y) {
 	struct swaybar_tray *tray = seat->bar->tray;
@@ -1234,7 +1234,7 @@ static void close_unfocused_child_menus(struct swaybar_dbusmenu_menu *menu,
 	}
 }
 
-bool dbusmenu_pointer_frame(struct swaybar_seat *data,
+bool sway_dbusmenu_pointer_frame(struct swaybar_seat *data,
 		struct wl_pointer *wl_pointer) {
 	struct swaybar_tray *tray = data->bar->tray;
 	if (!(tray && tray->menu && tray->menu_pointer_focus)) {
@@ -1243,7 +1243,7 @@ bool dbusmenu_pointer_frame(struct swaybar_seat *data,
 	return true;
 }
 
-bool dbusmenu_pointer_axis(struct swaybar_seat *data,
+bool sway_dbusmenu_pointer_axis(struct swaybar_seat *data,
 		struct wl_pointer *wl_pointer) {
 	struct swaybar_tray *tray = data->bar->tray;
 	if (!(tray && tray->menu && tray->menu_pointer_focus)) {
@@ -1252,7 +1252,7 @@ bool dbusmenu_pointer_axis(struct swaybar_seat *data,
 	return true;
 }
 
-bool dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer,
+bool sway_dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer,
 		uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x,
 		wl_fixed_t surface_y) {
 	struct swaybar_seat *seat = data;
@@ -1284,7 +1284,7 @@ bool dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer,
 	return true;
 }
 
-bool dbusmenu_pointer_leave(void *data, struct wl_pointer *wl_pointer,
+bool sway_dbusmenu_pointer_leave(void *data, struct wl_pointer *wl_pointer,
 		uint32_t serial, struct wl_surface *surface) {
 	struct swaybar_seat *seat = data;
 	struct swaybar_tray *tray = seat->bar->tray;
@@ -1348,7 +1348,7 @@ static bool dbusmenu_pointer_button_left(struct swaybar_dbusmenu *dbusmenu,
 	return true;
 }
 
-bool dbusmenu_pointer_button(void *data, struct wl_pointer *wl_pointer,
+bool sway_dbusmenu_pointer_button(void *data, struct wl_pointer *wl_pointer,
 		uint32_t serial, uint32_t time_, uint32_t button, uint32_t state) {
 	struct swaybar_seat *seat = data;
 	struct swaybar_tray *tray = seat->bar->tray;