GHOST: bundle tablet data with GHOST event

Previously the window manager would receive the GHOST event and then query the
latest tablet data from the window to go along with it. If multiple events were
queued, it would then use too new tablet data for handling older events.

Fixes T62565: tablet pressure not working on macOS with some devices

3 files changed, 15 insertions, 16 deletions

diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 531459298c5..5870802d02b 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -560,7 +560,7 @@ typedef struct wmEvent {
   char check_click;
   char check_drag;
 
-  /** Tablet info, only use when the tablet is active. */
+  /** Tablet info, available for mouse move and button events. */
   wmTabletData tablet;
 
   /* custom data */
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 9f2dfd27250..ba1f34478ed 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -101,7 +101,6 @@
 #define USE_GIZMO_MOUSE_PRIORITY_HACK
 
 static void wm_notifier_clear(wmNotifier *note);
-static void update_tablet_data(wmWindow *win, wmEvent *event);
 
 static int wm_operator_call_internal(bContext *C,
                                      wmOperatorType *ot,
@@ -125,8 +124,6 @@ wmEvent *wm_event_add_ex(wmWindow *win,
 
   *event = *event_to_add;
 
-  update_tablet_data(win, event);
-
   if (event_to_add_after == NULL) {
     BLI_addtail(&win->queue, event);
   }
@@ -4087,20 +4084,15 @@ static void wm_eventemulation(wmEvent *event, bool test_only)
   }
 }
 
-/* adds customdata to event */
-static void update_tablet_data(wmWindow *win, wmEvent *event)
+void wm_tablet_data_from_ghost(const GHOST_TabletData *tablet_data, wmTabletData *wmtab)
 {
-  const GHOST_TabletData *td = GHOST_GetTabletData(win->ghostwin);
-  wmTabletData *wmtab = &event->tablet;
-
-  /* if there's tablet data from an active tablet device then add it */
-  if ((td != NULL) && td->Active != GHOST_kTabletModeNone) {
-    wmtab->active = (int)td->Active;
-    wmtab->pressure = wm_pressure_curve(td->Pressure);
-    wmtab->x_tilt = td->Xtilt;
-    wmtab->y_tilt = td->Ytilt;
+  if ((tablet_data != NULL) && tablet_data->Active != GHOST_kTabletModeNone) {
+    wmtab->active = (int)tablet_data->Active;
+    wmtab->pressure = wm_pressure_curve(tablet_data->Pressure);
+    wmtab->x_tilt = tablet_data->Xtilt;
+    wmtab->y_tilt = tablet_data->Ytilt;
     /* We could have a preference to support relative tablet motion (we can't detect that). */
-    wmtab->is_motion_absolute = ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE);
+    wmtab->is_motion_absolute = true;
     // printf("%s: using tablet %.5f\n", __func__, wmtab->pressure);
   }
   else {
@@ -4260,6 +4252,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void
 
       copy_v2_v2_int(&event.x, &cd->x);
       wm_stereo3d_mouse_offset_apply(win, &event.x);
+      wm_tablet_data_from_ghost(&cd->tablet, &event.tablet);
 
       event.prevtype = event.type;
       event.prevval = event.val;
@@ -4349,6 +4342,9 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void
         event.type = MIDDLEMOUSE;
       }
 
+      /* Get tablet data. */
+      wm_tablet_data_from_ghost(&bd->tablet, &event.tablet);
+
       wm_eventemulation(&event, false);
 
       /* copy previous state to prev event state (two old!) */
@@ -4379,6 +4375,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, void
         oevent.y = event.y;
         oevent.type = event.type;
         oevent.val = event.val;
+        oevent.tablet = event.tablet;
 
         wm_event_add(owin, &oevent);
       }
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index 31aa61facb5..97c5980e3e7 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -31,6 +31,7 @@
 #define WM_HANDLER_MODAL 4 /* MODAL|BREAK means unhandled */
 
 struct ARegion;
+struct GHOST_TabletData;
 struct ScrArea;
 
 /* wmKeyMap is in DNA_windowmanager.h, it's saveable */
@@ -150,6 +151,7 @@ void wm_event_do_notifiers(bContext *C);
 
 /* wm_event_query.c */
 float wm_pressure_curve(float raw_pressure);
+void wm_tablet_data_from_ghost(const struct GHOST_TabletData *tablet_data, wmTabletData *wmtab);
 
 /* wm_keymap.c */