diff options
author | Campbell Barton <campbell@blender.org> | 2022-06-10 11:57:39 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-06-10 11:58:37 +0300 |
commit | a24a28db7b00551effcce2fb7d6de9b3fcdd05c5 (patch) | |
tree | 275e0b4c48d70a931fa05d3303a917917f3b0dcb /intern | |
parent | d83a418c456cdfd8ce4629e4e2fc7c7a0ed253c3 (diff) |
Cleanup: inconsistent naming with recent locking checks in Wayland
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWayland.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp index c2240e34890..34311c103eb 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cpp +++ b/intern/ghost/intern/GHOST_SystemWayland.cpp @@ -137,7 +137,7 @@ struct input_t { struct wl_data_device *data_device = nullptr; /** Drag & Drop. */ struct data_offer_t *data_offer_dnd; - std::mutex data_offer_dnd_lock; + std::mutex data_offer_dnd_mutex; /** Copy & Paste. */ struct data_offer_t *data_offer_copy_paste; @@ -518,7 +518,7 @@ static const zwp_relative_pointer_v1_listener relative_pointer_listener = { static void dnd_events(const input_t *const input, const GHOST_TEventType event) { - /* NOTE: `input->data_offer_dnd_lock` must already be locked. */ + /* NOTE: `input->data_offer_dnd_mutex` must already be locked. */ const uint64_t time = input->system->getMilliSeconds(); GHOST_IWindow *const window = static_cast<GHOST_WindowWayland *>( wl_surface_get_user_data(input->focus_dnd)); @@ -700,7 +700,7 @@ static void data_device_enter(void *data, struct wl_data_offer *id) { input_t *input = static_cast<input_t *>(data); - std::lock_guard lock{input->data_offer_dnd_lock}; + std::lock_guard lock{input->data_offer_dnd_mutex}; input->data_offer_dnd = static_cast<data_offer_t *>(wl_data_offer_get_user_data(id)); data_offer_t *data_offer = input->data_offer_dnd; @@ -725,7 +725,7 @@ static void data_device_enter(void *data, static void data_device_leave(void *data, struct wl_data_device * /*wl_data_device*/) { input_t *input = static_cast<input_t *>(data); - std::lock_guard lock{input->data_offer_dnd_lock}; + std::lock_guard lock{input->data_offer_dnd_mutex}; dnd_events(input, GHOST_kEventDraggingExited); input->focus_dnd = nullptr; @@ -744,7 +744,7 @@ static void data_device_motion(void *data, wl_fixed_t y) { input_t *input = static_cast<input_t *>(data); - std::lock_guard lock{input->data_offer_dnd_lock}; + std::lock_guard lock{input->data_offer_dnd_mutex}; input->data_offer_dnd->dnd.x = wl_fixed_to_int(x); input->data_offer_dnd->dnd.y = wl_fixed_to_int(y); @@ -754,7 +754,7 @@ static void data_device_motion(void *data, static void data_device_drop(void *data, struct wl_data_device * /*wl_data_device*/) { input_t *input = static_cast<input_t *>(data); - std::lock_guard lock{input->data_offer_dnd_lock}; + std::lock_guard lock{input->data_offer_dnd_mutex}; data_offer_t *data_offer = input->data_offer_dnd; |