From deeca53e3348d4764d1daf2636b6bd8e25bd4a21 Mon Sep 17 00:00:00 2001 From: emersion Date: Sun, 8 Jul 2018 19:21:31 +0100 Subject: Rename wl_resources to resource, wl_global to global --- include/wlr/types/wlr_compositor.h | 8 ++++---- include/wlr/types/wlr_data_device.h | 2 +- include/wlr/types/wlr_gamma_control.h | 2 +- include/wlr/types/wlr_idle.h | 2 +- include/wlr/types/wlr_idle_inhibit_v1.h | 2 +- include/wlr/types/wlr_input_inhibitor.h | 2 +- include/wlr/types/wlr_layer_shell.h | 2 +- include/wlr/types/wlr_linux_dmabuf.h | 4 ++-- include/wlr/types/wlr_output.h | 4 ++-- include/wlr/types/wlr_screenshooter.h | 2 +- include/wlr/types/wlr_seat.h | 4 ++-- include/wlr/types/wlr_server_decoration.h | 4 ++-- include/wlr/types/wlr_wl_shell.h | 4 ++-- include/wlr/types/wlr_xdg_shell.h | 2 +- include/wlr/types/wlr_xdg_shell_v6.h | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) (limited to 'include') diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h index 51702884..0d79b0bb 100644 --- a/include/wlr/types/wlr_compositor.h +++ b/include/wlr/types/wlr_compositor.h @@ -7,14 +7,14 @@ struct wlr_surface; struct wlr_subcompositor { - struct wl_global *wl_global; - struct wl_list wl_resources; + struct wl_global *global; + struct wl_list resources; struct wl_list subsurface_resources; }; struct wlr_compositor { - struct wl_global *wl_global; - struct wl_list wl_resources; + struct wl_global *global; + struct wl_list resources; struct wlr_renderer *renderer; struct wl_list surface_resources; struct wl_list region_resources; diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h index 4de4d610..8b7b374c 100644 --- a/include/wlr/types/wlr_data_device.h +++ b/include/wlr/types/wlr_data_device.h @@ -15,7 +15,7 @@ wlr_touch_grab_interface wlr_data_device_touch_drag_interface; struct wlr_data_device_manager { struct wl_global *global; - struct wl_list wl_resources; + struct wl_list resources; struct wl_list data_sources; struct wl_listener display_destroy; diff --git a/include/wlr/types/wlr_gamma_control.h b/include/wlr/types/wlr_gamma_control.h index d3f4b8e5..f195c8ef 100644 --- a/include/wlr/types/wlr_gamma_control.h +++ b/include/wlr/types/wlr_gamma_control.h @@ -4,7 +4,7 @@ #include struct wlr_gamma_control_manager { - struct wl_global *wl_global; + struct wl_global *global; struct wl_list controls; // wlr_gamma_control::link struct wl_listener display_destroy; diff --git a/include/wlr/types/wlr_idle.h b/include/wlr/types/wlr_idle.h index aca9146c..53fc6b98 100644 --- a/include/wlr/types/wlr_idle.h +++ b/include/wlr/types/wlr_idle.h @@ -14,7 +14,7 @@ struct wlr_idle { - struct wl_global *wl_global; + struct wl_global *global; struct wl_list idle_timers; // wlr_idle_timeout::link struct wl_event_loop *event_loop; bool enabled; diff --git a/include/wlr/types/wlr_idle_inhibit_v1.h b/include/wlr/types/wlr_idle_inhibit_v1.h index 8c20d2c8..011abbe5 100644 --- a/include/wlr/types/wlr_idle_inhibit_v1.h +++ b/include/wlr/types/wlr_idle_inhibit_v1.h @@ -16,7 +16,7 @@ */ struct wlr_idle_inhibit_manager_v1 { - struct wl_list wl_resources; // wl_resource_get_link + struct wl_list resources; // wl_resource_get_link struct wl_list inhibitors; // wlr_idle_inhibit_inhibitor_v1::link struct wl_global *global; diff --git a/include/wlr/types/wlr_input_inhibitor.h b/include/wlr/types/wlr_input_inhibitor.h index 4416c18f..2f333f3b 100644 --- a/include/wlr/types/wlr_input_inhibitor.h +++ b/include/wlr/types/wlr_input_inhibitor.h @@ -3,7 +3,7 @@ #include struct wlr_input_inhibit_manager { - struct wl_global *wl_global; + struct wl_global *global; struct wl_client *active_client; struct wl_resource *active_inhibitor; diff --git a/include/wlr/types/wlr_layer_shell.h b/include/wlr/types/wlr_layer_shell.h index 1477989d..7cc6a5b8 100644 --- a/include/wlr/types/wlr_layer_shell.h +++ b/include/wlr/types/wlr_layer_shell.h @@ -20,7 +20,7 @@ * the compositor should begin rendering the surface. */ struct wlr_layer_shell { - struct wl_global *wl_global; + struct wl_global *global; struct wl_list client_resources; // wl_resource struct wl_list surfaces; // wl_layer_surface diff --git a/include/wlr/types/wlr_linux_dmabuf.h b/include/wlr/types/wlr_linux_dmabuf.h index ea219020..4a03170c 100644 --- a/include/wlr/types/wlr_linux_dmabuf.h +++ b/include/wlr/types/wlr_linux_dmabuf.h @@ -35,9 +35,9 @@ struct wlr_dmabuf_buffer *wlr_dmabuf_buffer_from_params_resource( /* the protocol interface */ struct wlr_linux_dmabuf { - struct wl_global *wl_global; + struct wl_global *global; struct wlr_renderer *renderer; - struct wl_list wl_resources; + struct wl_list resources; struct { struct wl_signal destroy; diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 158d174e..5084eb5a 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -53,8 +53,8 @@ struct wlr_output { struct wlr_backend *backend; struct wl_display *display; - struct wl_global *wl_global; - struct wl_list wl_resources; + struct wl_global *global; + struct wl_list resources; char name[24]; char make[48]; diff --git a/include/wlr/types/wlr_screenshooter.h b/include/wlr/types/wlr_screenshooter.h index 680d86f0..916c8942 100644 --- a/include/wlr/types/wlr_screenshooter.h +++ b/include/wlr/types/wlr_screenshooter.h @@ -4,7 +4,7 @@ #include struct wlr_screenshooter { - struct wl_global *wl_global; + struct wl_global *global; struct wl_list screenshots; // wlr_screenshot::link struct wl_listener display_destroy; diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 5e04003d..92d0a233 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -17,7 +17,7 @@ struct wlr_seat_client { struct wlr_seat *seat; // lists of wl_resource - struct wl_list wl_resources; + struct wl_list resources; struct wl_list pointers; struct wl_list keyboards; struct wl_list touches; @@ -170,7 +170,7 @@ struct wlr_seat_touch_state { }; struct wlr_seat { - struct wl_global *wl_global; + struct wl_global *global; struct wl_display *display; struct wl_list clients; struct wl_list drag_icons; // wlr_drag_icon::link diff --git a/include/wlr/types/wlr_server_decoration.h b/include/wlr/types/wlr_server_decoration.h index e457a0aa..23387968 100644 --- a/include/wlr/types/wlr_server_decoration.h +++ b/include/wlr/types/wlr_server_decoration.h @@ -27,8 +27,8 @@ enum wlr_server_decoration_manager_mode { }; struct wlr_server_decoration_manager { - struct wl_global *wl_global; - struct wl_list wl_resources; + struct wl_global *global; + struct wl_list resources; struct wl_list decorations; // wlr_server_decoration::link uint32_t default_mode; // enum wlr_server_decoration_manager_mode diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index b60a0ddd..e2d4b5bb 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -6,8 +6,8 @@ #include struct wlr_wl_shell { - struct wl_global *wl_global; - struct wl_list wl_resources; + struct wl_global *global; + struct wl_list resources; struct wl_list surfaces; struct wl_list popup_grabs; uint32_t ping_timeout; diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index d2dfaacb..79e029d4 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -6,7 +6,7 @@ #include "xdg-shell-protocol.h" struct wlr_xdg_shell { - struct wl_global *wl_global; + struct wl_global *global; struct wl_list clients; struct wl_list popup_grabs; uint32_t ping_timeout; diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 38f85635..fdfb23c5 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -7,7 +7,7 @@ #include "xdg-shell-unstable-v6-protocol.h" struct wlr_xdg_shell_v6 { - struct wl_global *wl_global; + struct wl_global *global; struct wl_list clients; struct wl_list popup_grabs; uint32_t ping_timeout; -- cgit v1.2.3