From a88c77eaac07e564bf52fdb6937c4bae8aa41985 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Mar 2023 17:05:25 +1100 Subject: [PATCH] Cleanup: use struct comments for gwl_registry_handlers declaration --- intern/ghost/intern/GHOST_SystemWayland.cpp | 115 ++++++++++---------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp index 0e4279af2f4..45535223b23 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cpp +++ b/intern/ghost/intern/GHOST_SystemWayland.cpp @@ -5217,96 +5217,97 @@ static void gwl_registry_wp_primary_selection_device_manager_remove(GWL_Display static const GWL_RegistryHandler gwl_registry_handlers[] = { /* Low level interfaces. */ { - &wl_compositor_interface.name, - gwl_registry_compositor_add, - nullptr, - gwl_registry_compositor_remove, + /*interface_p*/ &wl_compositor_interface.name, + /*add_fn*/ gwl_registry_compositor_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_compositor_remove, }, { - &wl_shm_interface.name, - gwl_registry_wl_shm_add, - nullptr, - gwl_registry_wl_shm_remove, + /*interface_p*/ &wl_shm_interface.name, + /*add_fn*/ gwl_registry_wl_shm_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_wl_shm_remove, }, { - &xdg_wm_base_interface.name, - gwl_registry_xdg_wm_base_add, - nullptr, - gwl_registry_xdg_wm_base_remove, + /*interface_p*/ &xdg_wm_base_interface.name, + /*add_fn*/ gwl_registry_xdg_wm_base_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_xdg_wm_base_remove, }, /* Managers. */ { - &zxdg_decoration_manager_v1_interface.name, - gwl_registry_xdg_decoration_manager_add, - nullptr, - gwl_registry_xdg_decoration_manager_remove, + /*interface_p*/ &zxdg_decoration_manager_v1_interface.name, + /*add_fn*/ gwl_registry_xdg_decoration_manager_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_xdg_decoration_manager_remove, }, { - &zxdg_output_manager_v1_interface.name, - gwl_registry_xdg_output_manager_add, - nullptr, - gwl_registry_xdg_output_manager_remove, + /*interface_p*/ &zxdg_output_manager_v1_interface.name, + /*add_fn*/ gwl_registry_xdg_output_manager_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_xdg_output_manager_remove, }, { - &wl_data_device_manager_interface.name, - gwl_registry_wl_data_device_manager_add, - nullptr, - gwl_registry_wl_data_device_manager_remove, + /*interface_p*/ &wl_data_device_manager_interface.name, + /*add_fn*/ gwl_registry_wl_data_device_manager_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_wl_data_device_manager_remove, }, { - &zwp_primary_selection_device_manager_v1_interface.name, - gwl_registry_wp_primary_selection_device_manager_add, - nullptr, - gwl_registry_wp_primary_selection_device_manager_remove, + /*interface_p*/ &zwp_primary_selection_device_manager_v1_interface.name, + /*add_fn*/ gwl_registry_wp_primary_selection_device_manager_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_wp_primary_selection_device_manager_remove, }, { - &zwp_tablet_manager_v2_interface.name, - gwl_registry_wp_tablet_manager_add, - nullptr, - gwl_registry_wp_tablet_manager_remove, + /*interface_p*/ &zwp_tablet_manager_v2_interface.name, + /*add_fn*/ gwl_registry_wp_tablet_manager_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_wp_tablet_manager_remove, }, { - &zwp_relative_pointer_manager_v1_interface.name, - gwl_registry_wp_relative_pointer_manager_add, - nullptr, - gwl_registry_wp_relative_pointer_manager_remove, + /*interface_p*/ &zwp_relative_pointer_manager_v1_interface.name, + /*add_fn*/ gwl_registry_wp_relative_pointer_manager_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_wp_relative_pointer_manager_remove, }, /* Higher level interfaces. */ { - &zwp_pointer_constraints_v1_interface.name, - gwl_registry_wp_pointer_constraints_add, - nullptr, - gwl_registry_wp_pointer_constraints_remove, + /*interface_p*/ &zwp_pointer_constraints_v1_interface.name, + /*add_fn*/ gwl_registry_wp_pointer_constraints_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_wp_pointer_constraints_remove, }, { - &zwp_pointer_gestures_v1_interface.name, - gwl_registry_wp_pointer_gestures_add, - nullptr, - gwl_registry_wp_pointer_gestures_remove, + /*interface_p*/ &zwp_pointer_gestures_v1_interface.name, + /*add_fn*/ gwl_registry_wp_pointer_gestures_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_wp_pointer_gestures_remove, }, { - &xdg_activation_v1_interface.name, - gwl_registry_xdg_activation_add, - nullptr, - gwl_registry_xdg_activation_remove, + /*interface_p*/ &xdg_activation_v1_interface.name, + /*add_fn*/ gwl_registry_xdg_activation_add, + /*update_fn*/ nullptr, + /*remove_fn*/ gwl_registry_xdg_activation_remove, }, /* Display outputs. */ { - &wl_output_interface.name, - gwl_registry_wl_output_add, - gwl_registry_wl_output_update, - gwl_registry_wl_output_remove, + /*interface_p*/ &wl_output_interface.name, + /*add_fn*/ gwl_registry_wl_output_add, + /*update_fn*/ gwl_registry_wl_output_update, + /*remove_fn*/ gwl_registry_wl_output_remove, }, /* Seats. * Keep the seat near the end to ensure other types are created first. * as the seat creates data based on other interfaces. */ { - &wl_seat_interface.name, - gwl_registry_wl_seat_add, - gwl_registry_wl_seat_update, - gwl_registry_wl_seat_remove, + /*interface_p*/ &wl_seat_interface.name, + /*add_fn*/ gwl_registry_wl_seat_add, + /*update_fn*/ gwl_registry_wl_seat_update, + /*remove_fn*/ gwl_registry_wl_seat_remove, }, - {nullptr, nullptr, nullptr}, + + {nullptr}, }; /**