[Bf-blender-cvs] [e54ea0f90ee] master: Cleanup: use wl_/wp_ prefix to match native Wayland types
Campbell Barton
noreply at git.blender.org
Sat Oct 22 09:02:26 CEST 2022
Commit: e54ea0f90ee22396147ad6d17d0263bf6b965fd7
Author: Campbell Barton
Date: Sat Oct 22 16:49:07 2022 +1100
Branches: master
https://developer.blender.org/rBe54ea0f90ee22396147ad6d17d0263bf6b965fd7
Cleanup: use wl_/wp_ prefix to match native Wayland types
===================================================================
M intern/ghost/intern/GHOST_SystemWayland.cpp
M intern/ghost/intern/GHOST_SystemWayland.h
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 6eef9a48e07..39f392e62b9 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -522,7 +522,7 @@ struct GWL_PrimarySelection_DataOffer {
};
struct GWL_PrimarySelection_DataSource {
- struct zwp_primary_selection_source_v1 *wl_source = nullptr;
+ struct zwp_primary_selection_source_v1 *wp_source = nullptr;
GWL_SimpleBuffer buffer_out;
};
@@ -553,8 +553,8 @@ static void gwl_primary_selection_discard_source(GWL_PrimarySelection *primary)
return;
}
gwl_simple_buffer_free_data(&data_source->buffer_out);
- if (data_source->wl_source) {
- zwp_primary_selection_source_v1_destroy(data_source->wl_source);
+ if (data_source->wp_source) {
+ zwp_primary_selection_source_v1_destroy(data_source->wp_source);
}
delete primary->data_source;
primary->data_source = nullptr;
@@ -568,7 +568,7 @@ struct GWL_Seat {
struct wl_pointer *wl_pointer = nullptr;
struct wl_touch *wl_touch = nullptr;
struct wl_keyboard *wl_keyboard = nullptr;
- struct zwp_tablet_seat_v2 *tablet_seat = nullptr;
+ struct zwp_tablet_seat_v2 *wp_tablet_seat = nullptr;
/** All currently active tablet tools (needed for changing the cursor). */
std::unordered_set<zwp_tablet_tool_v2 *> tablet_tools;
@@ -592,9 +592,9 @@ struct GWL_Seat {
struct GWL_Cursor cursor;
- struct zwp_relative_pointer_v1 *relative_pointer = nullptr;
- struct zwp_locked_pointer_v1 *locked_pointer = nullptr;
- struct zwp_confined_pointer_v1 *confined_pointer = nullptr;
+ struct zwp_relative_pointer_v1 *wp_relative_pointer = nullptr;
+ struct zwp_locked_pointer_v1 *wp_locked_pointer = nullptr;
+ struct zwp_confined_pointer_v1 *wp_confined_pointer = nullptr;
struct xkb_context *xkb_context = nullptr;
@@ -637,7 +637,7 @@ struct GWL_Seat {
struct wl_surface *wl_surface_focus_dnd = nullptr;
- struct wl_data_device *data_device = nullptr;
+ struct wl_data_device *wl_data_device = nullptr;
/** Drag & Drop. */
struct GWL_DataOffer *data_offer_dnd = nullptr;
std::mutex data_offer_dnd_mutex;
@@ -649,7 +649,7 @@ struct GWL_Seat {
struct GWL_DataSource *data_source = nullptr;
std::mutex data_source_mutex;
- struct zwp_primary_selection_device_v1 *primary_selection_device = nullptr;
+ struct zwp_primary_selection_device_v1 *wp_primary_selection_device = nullptr;
struct GWL_PrimarySelection primary_selection;
/** Last device that was active. */
@@ -679,12 +679,12 @@ struct GWL_Display {
std::vector<GWL_Output *> outputs;
std::vector<GWL_Seat *> seats;
- struct wl_data_device_manager *data_device_manager = nullptr;
- struct zwp_tablet_manager_v2 *tablet_manager = nullptr;
- struct zwp_relative_pointer_manager_v1 *relative_pointer_manager = nullptr;
- struct zwp_pointer_constraints_v1 *pointer_constraints = nullptr;
+ struct wl_data_device_manager *wl_data_device_manager = nullptr;
+ struct zwp_tablet_manager_v2 *wp_tablet_manager = nullptr;
+ struct zwp_relative_pointer_manager_v1 *wp_relative_pointer_manager = nullptr;
+ struct zwp_pointer_constraints_v1 *wp_pointer_constraints = nullptr;
- struct zwp_primary_selection_device_manager_v1 *primary_selection_device_manager = nullptr;
+ struct zwp_primary_selection_device_manager_v1 *wp_primary_selection_device_manager = nullptr;
GWL_SimpleBuffer clipboard;
GWL_SimpleBuffer clipboard_primary;
@@ -744,12 +744,12 @@ static GWL_SeatStatePointer *seat_state_pointer_from_cursor_surface(GWL_Seat *se
static void display_destroy(GWL_Display *display)
{
- if (display->data_device_manager) {
- wl_data_device_manager_destroy(display->data_device_manager);
+ if (display->wl_data_device_manager) {
+ wl_data_device_manager_destroy(display->wl_data_device_manager);
}
- if (display->tablet_manager) {
- zwp_tablet_manager_v2_destroy(display->tablet_manager);
+ if (display->wp_tablet_manager) {
+ zwp_tablet_manager_v2_destroy(display->wp_tablet_manager);
}
for (GWL_Output *output : display->outputs) {
@@ -800,12 +800,12 @@ static void display_destroy(GWL_Display *display)
gwl_primary_selection_discard_source(primary);
}
- if (seat->primary_selection_device) {
- zwp_primary_selection_device_v1_destroy(seat->primary_selection_device);
+ if (seat->wp_primary_selection_device) {
+ zwp_primary_selection_device_v1_destroy(seat->wp_primary_selection_device);
}
- if (seat->data_device) {
- wl_data_device_release(seat->data_device);
+ if (seat->wl_data_device) {
+ wl_data_device_release(seat->wl_data_device);
}
if (seat->cursor.custom_data) {
@@ -836,16 +836,16 @@ static void display_destroy(GWL_Display *display)
wl_shm_destroy(display->wl_shm);
}
- if (display->relative_pointer_manager) {
- zwp_relative_pointer_manager_v1_destroy(display->relative_pointer_manager);
+ if (display->wp_relative_pointer_manager) {
+ zwp_relative_pointer_manager_v1_destroy(display->wp_relative_pointer_manager);
}
- if (display->pointer_constraints) {
- zwp_pointer_constraints_v1_destroy(display->pointer_constraints);
+ if (display->wp_pointer_constraints) {
+ zwp_pointer_constraints_v1_destroy(display->wp_pointer_constraints);
}
- if (display->primary_selection_device_manager) {
- zwp_primary_selection_device_manager_v1_destroy(display->primary_selection_device_manager);
+ if (display->wp_primary_selection_device_manager) {
+ zwp_primary_selection_device_manager_v1_destroy(display->wp_primary_selection_device_manager);
}
if (display->wl_compositor) {
@@ -1033,9 +1033,9 @@ static int pointer_axis_as_index(const uint32_t axis)
}
}
-static GHOST_TTabletMode tablet_tool_map_type(enum zwp_tablet_tool_v2_type wl_tablet_tool_type)
+static GHOST_TTabletMode tablet_tool_map_type(enum zwp_tablet_tool_v2_type wp_tablet_tool_type)
{
- switch (wl_tablet_tool_type) {
+ switch (wp_tablet_tool_type) {
case ZWP_TABLET_TOOL_V2_TYPE_ERASER: {
return GHOST_kTabletModeEraser;
}
@@ -3273,7 +3273,7 @@ static void primary_selection_source_cancelled(void *data,
GWL_PrimarySelection *primary = static_cast<GWL_PrimarySelection *>(data);
- if (source == primary->data_source->wl_source) {
+ if (source == primary->data_source->wp_source) {
gwl_primary_selection_discard_source(primary);
}
}
@@ -3409,13 +3409,13 @@ static void seat_handle_capabilities(void *data,
/* TODO(@campbellbarton): this could be moved out elsewhere. */
if (seat->system) {
zwp_primary_selection_device_manager_v1 *primary_selection_device_manager =
- seat->system->wl_primary_selection_manager();
+ seat->system->wp_primary_selection_manager();
if (primary_selection_device_manager) {
- if (seat->primary_selection_device == nullptr) {
- seat->primary_selection_device = zwp_primary_selection_device_manager_v1_get_device(
+ if (seat->wp_primary_selection_device == nullptr) {
+ seat->wp_primary_selection_device = zwp_primary_selection_device_manager_v1_get_device(
primary_selection_device_manager, seat->wl_seat);
- zwp_primary_selection_device_v1_add_listener(seat->primary_selection_device,
+ zwp_primary_selection_device_v1_add_listener(seat->wp_primary_selection_device,
&primary_selection_device_listener,
&seat->primary_selection);
}
@@ -3776,23 +3776,23 @@ static void global_handle_add(void *data,
wl_registry_bind(wl_registry, name, &wl_shm_interface, 1));
}
else if (STREQ(interface, wl_data_device_manager_interface.name)) {
- display->data_device_manager = static_cast<wl_data_device_manager *>(
+ display->wl_data_device_manager = static_cast<wl_data_device_manager *>(
wl_registry_bind(wl_registry, name, &wl_data_device_manager_interface, 3));
}
else if (STREQ(interface, zwp_tablet_manager_v2_interface.name)) {
- display->tablet_manager = static_cast<zwp_tablet_manager_v2 *>(
+ display->wp_tablet_manager = static_cast<zwp_tablet_manager_v2 *>(
wl_registry_bind(wl_registry, name, &zwp_tablet_manager_v2_interface, 1));
}
else if (STREQ(interface, zwp_relative_pointer_manager_v1_interface.name)) {
- display->relative_pointer_manager = static_cast<zwp_relative_pointer_manager_v1 *>(
+ display->wp_relative_pointer_manager = static_cast<zwp_relative_pointer_manager_v1 *>(
wl_registry_bind(wl_registry, name, &zwp_relative_pointer_manager_v1_interface, 1));
}
else if (STREQ(interface, zwp_pointer_constraints_v1_interface.name)) {
- display->pointer_constraints = static_cast<zwp_pointer_constraints_v1 *>(
+ display->wp_pointer_constraints = static_cast<zwp_pointer_constraints_v1 *>(
wl_registry_bind(wl_registry, name, &zwp_pointer_constraints_v1_interface, 1));
}
else if (!strcmp(interface, zwp_primary_selection_device_manager_v1_interface.name)) {
- display->primary_selection_device_manager =
+ display->wp_primary_selection_device_manager =
static_cast<zwp_primary_selection_device_manager_v1 *>(wl_registry_bind(
wl_registry, name, &zwp_primary_selection_device_manager_v1_interface, 1));
}
@@ -3915,19 +3915,19 @@ GHOST_SystemWayland::GHOST_SystemWayland() : GHOST_System(), display_(new GWL_Di
}
/* Register data device per seat for IPC between Wayland clients. */
- if (display_->data_device_manager) {
+ if (display_->wl_data_device_manager) {
for (GWL_Seat *seat : display_->seats) {
- seat->data_device = wl_data_device_manager_get_data_device(display_->data_device_manager,
- seat->wl_seat);
- wl_data_device_add_listener(seat->data_device, &data_device_listener, seat);
+ seat->wl_data_device = wl_data_device_manager_get_data_device(
+ display_->wl_data_device_manager, seat->wl_seat);
+ wl_data_device_add_listener(seat->wl_data_device, &data_device_listener, seat);
}
}
- if (display_->table
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list