griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix outdated pressure/tilt for tablet motions events under GHOST/Wayland

Browse Source 
Accumulate tablet data before generating an event using the 'frame'
callback.
This commit is contained in:
Campbell Barton
2022-06-24 08:19:08 +10:00
parent 41a0411d79
commit 4919403c29
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@@ -1447,21 +1447,11 @@ static void tablet_tool_handle_motion(void *data,
{
tablet_tool_input_t *tool_input = static_cast<tablet_tool_input_t *>(data);
input_t *input = tool_input->input;
GHOST_WindowWayland *win = window_from_surface(input->focus_tablet);
if (!win) {
return;
}
input->xy[0] = x;
input->xy[1] = y;
const wl_fixed_t scale = win->scale();
input->system->pushEvent(new GHOST_EventCursor(input->system->getMilliSeconds(),
GHOST_kEventCursorMove,
win,
wl_fixed_to_int(scale * input->xy[0]),
wl_fixed_to_int(scale * input->xy[1]),
tool_input->data));
/* NOTE: #tablet_tool_handle_frame generates the event (with updated pressure, tilt... etc). */
}
static void tablet_tool_handle_pressure(void *data,
@@ -1575,10 +1565,24 @@ static void tablet_tool_handle_button(void *data,
input->system->pushEvent(new GHOST_EventButton(
input->system->getMilliSeconds(), etype, win, ebutton, tool_input->data));
}
static void tablet_tool_handle_frame(void * /*data*/,
static void tablet_tool_handle_frame(void *data,
struct zwp_tablet_tool_v2 * /*zwp_tablet_tool_v2*/,
uint32_t /*time*/)
{
tablet_tool_input_t *tool_input = static_cast<tablet_tool_input_t *>(data);
input_t *input = tool_input->input;
GHOST_WindowWayland *win = window_from_surface(input->focus_tablet);
if (!win) {
return;
}
const wl_fixed_t scale = win->scale();
input->system->pushEvent(new GHOST_EventCursor(input->system->getMilliSeconds(),
GHOST_kEventCursorMove,
win,
wl_fixed_to_int(scale * input->xy[0]),
wl_fixed_to_int(scale * input->xy[1]),
tool_input->data));
}
static const struct zwp_tablet_tool_v2_listener tablet_tool_listner = {