godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Merge pull request #94022 from Riteo/a-fraction-of-the-work

Browse Source 
Wayland: Switch pointer position handling to doubles
This commit is contained in:
Rémi Verschelde
2024-08-22 00:10:31 +02:00
parent 091212b4f1 2ff50119dc
commit 78f47abe2b
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@@ -1416,10 +1416,10 @@ void WaylandThread::_wl_pointer_on_motion(void *data, struct wl_pointer *wl_poin
PointerData &pd = ss->pointer_data_buffer; PointerData &pd = ss->pointer_data_buffer;
// TODO: Scale only when sending the Wayland message. // TODO: Scale only when sending the Wayland message.
pd.position.x = wl_fixed_to_int(surface_x); pd.position.x = wl_fixed_to_double(surface_x);
pd.position.y = wl_fixed_to_int(surface_y); pd.position.y = wl_fixed_to_double(surface_y);
pd.position = scale_vector2i(pd.position, window_state_get_scale_factor(ws)); pd.position *= window_state_get_scale_factor(ws);
pd.motion_time = time; pd.motion_time = time;
} }
@@ -1532,7 +1532,7 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
mm->set_position(pd.position); mm->set_position(pd.position);
mm->set_global_position(pd.position); mm->set_global_position(pd.position);
Vector2i pos_delta = pd.position - old_pd.position; Vector2 pos_delta = pd.position - old_pd.position;
if (old_pd.relative_motion_time != pd.relative_motion_time) { if (old_pd.relative_motion_time != pd.relative_motion_time) {
uint32_t time_delta = pd.relative_motion_time - old_pd.relative_motion_time; uint32_t time_delta = pd.relative_motion_time - old_pd.relative_motion_time;
@@ -1649,7 +1649,7 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
// We have to set the last position pressed here as we can't take for // We have to set the last position pressed here as we can't take for
// granted what the individual events might have seen due to them not having // granted what the individual events might have seen due to them not having
// a garaunteed order. // a guaranteed order.
if (mb->is_pressed()) { if (mb->is_pressed()) {
pd.last_pressed_position = pd.position; pd.last_pressed_position = pd.position;
} }
@@ -2388,9 +2388,9 @@ void WaylandThread::_wp_tablet_tool_on_motion(void *data, struct zwp_tablet_tool
double scale_factor = window_state_get_scale_factor(ws); double scale_factor = window_state_get_scale_factor(ws);
td.position.x = wl_fixed_to_int(x); td.position.x = wl_fixed_to_double(x);
td.position.y = wl_fixed_to_int(y); td.position.y = wl_fixed_to_double(y);
td.position = scale_vector2i(td.position, scale_factor); td.position *= scale_factor;
td.motion_time = OS::get_singleton()->get_ticks_msec(); td.motion_time = OS::get_singleton()->get_ticks_msec();
} }
@@ -2520,7 +2520,7 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
mm->set_relative(td.position - old_td.position); mm->set_relative(td.position - old_td.position);
mm->set_relative_screen_position(mm->get_relative()); mm->set_relative_screen_position(mm->get_relative());
Vector2i pos_delta = td.position - old_td.position; Vector2 pos_delta = td.position - old_td.position;
uint32_t time_delta = td.motion_time - old_td.motion_time; uint32_t time_delta = td.motion_time - old_td.motion_time;
mm->set_velocity((Vector2)pos_delta / time_delta); mm->set_velocity((Vector2)pos_delta / time_delta);

8
platform/linuxbsd/wayland/wayland_thread.h
View File

@@ -295,7 +295,7 @@ public:
}; };
struct PointerData { struct PointerData {
Point2i position; Point2 position;
uint32_t motion_time = 0; uint32_t motion_time = 0;
// Relative motion has its own optional event and so needs its own time. // Relative motion has its own optional event and so needs its own time.
@@ -305,7 +305,7 @@ public:
BitField<MouseButtonMask> pressed_button_mask; BitField<MouseButtonMask> pressed_button_mask;
MouseButton last_button_pressed = MouseButton::NONE; MouseButton last_button_pressed = MouseButton::NONE;
Point2i last_pressed_position; Point2 last_pressed_position;
// This is needed to check for a new double click every time. // This is needed to check for a new double click every time.
bool double_click_begun = false; bool double_click_begun = false;
@@ -325,14 +325,14 @@ public:
}; };
struct TabletToolData { struct TabletToolData {
Point2i position; Point2 position;
Vector2 tilt; Vector2 tilt;
uint32_t pressure = 0; uint32_t pressure = 0;
BitField<MouseButtonMask> pressed_button_mask; BitField<MouseButtonMask> pressed_button_mask;
MouseButton last_button_pressed = MouseButton::NONE; MouseButton last_button_pressed = MouseButton::NONE;
Point2i last_pressed_position; Point2 last_pressed_position;
bool double_click_begun = false; bool double_click_begun = false;