pen: Offer the current window during promixity events on most platforms.

icculus · icculus · commit 433980a0bb8c · 2025-11-10T19:00:29.000-05:00
Fixes #12356.
diff --git a/include/SDL3/SDL_events.h b/include/SDL3/SDL_events.h
@@ -818,6 +818,9 @@ typedef struct SDL_PinchFingerEvent
  * is there." The pen touching and lifting off from the tablet while not
  * leaving the area are handled by SDL_EVENT_PEN_DOWN and SDL_EVENT_PEN_UP.
  *
+ * Not all platforms have a window associated with the pen during proximity
+ * events. Some wait until motion/button/etc events to offer this info.
+ *
  * \since This struct is available since SDL 3.2.0.
  */
 typedef struct SDL_PenProximityEvent
diff --git a/src/events/SDL_pen.c b/src/events/SDL_pen.c
@@ -218,7 +218,7 @@ SDL_PenCapabilityFlags SDL_GetPenCapabilityFromAxis(SDL_PenAxis axis)
     return 0;  // oh well.
 }
 
-SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char *name, const SDL_PenInfo *info, void *handle)
+SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char *name, SDL_Window *window, const SDL_PenInfo *info, void *handle)
 {
     SDL_assert(handle != NULL);  // just allocate a Uint8 so you have a unique pointer if not needed!
     SDL_assert(SDL_FindPenByHandle(handle) == 0);  // Backends shouldn't double-add pens!
@@ -262,13 +262,14 @@ SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char *name, const SDL_PenInfo
         event.pproximity.type = SDL_EVENT_PEN_PROXIMITY_IN;
         event.pproximity.timestamp = timestamp;
         event.pproximity.which = result;
+        event.pproximity.windowID = window ? window->id : 0;
         SDL_PushEvent(&event);
     }
 
     return result;
 }
 
-void SDL_RemovePenDevice(Uint64 timestamp, SDL_PenID instance_id)
+void SDL_RemovePenDevice(Uint64 timestamp, SDL_Window *window, SDL_PenID instance_id)
 {
     if (!instance_id) {
         return;
@@ -306,6 +307,7 @@ void SDL_RemovePenDevice(Uint64 timestamp, SDL_PenID instance_id)
         event.pproximity.type = SDL_EVENT_PEN_PROXIMITY_OUT;
         event.pproximity.timestamp = timestamp;
         event.pproximity.which = instance_id;
+        event.pproximity.windowID = window ? window->id : 0;
         SDL_PushEvent(&event);
     }
 }
diff --git a/src/events/SDL_pen_c.h b/src/events/SDL_pen_c.h
@@ -61,10 +61,10 @@ typedef struct SDL_PenInfo
 // Backend calls this when a new pen device is hotplugged, plus once for each pen already connected at startup.
 // Note that name and info are copied but currently unused; this is placeholder for a potentially more robust API later.
 // Both are allowed to be NULL.
-extern SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char *name, const SDL_PenInfo *info, void *handle);
+extern SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char *name, SDL_Window *window, const SDL_PenInfo *info, void *handle);
 
 // Backend calls this when an existing pen device is disconnected during runtime. They must free their own stuff separately.
-extern void SDL_RemovePenDevice(Uint64 timestamp, SDL_PenID instance_id);
+extern void SDL_RemovePenDevice(Uint64 timestamp, SDL_Window *window, SDL_PenID instance_id);
 
 // Backend can call this to remove all pens, probably during shutdown, with a callback to let them free their own handle.
 extern void SDL_RemoveAllPenDevices(void (*callback)(SDL_PenID instance_id, void *handle, void *userdata), void *userdata);
diff --git a/src/video/android/SDL_androidpen.c b/src/video/android/SDL_androidpen.c
@@ -51,7 +51,7 @@ void Android_OnPen(SDL_Window *window, int pen_id_in, SDL_PenDeviceType device_t
         peninfo.num_buttons = 2;
         peninfo.subtype = SDL_PEN_TYPE_PEN;
         peninfo.device_type = device_type;
-        pen = SDL_AddPenDevice(0, NULL, &peninfo, (void *) (size_t) pen_id_in);
+        pen = SDL_AddPenDevice(0, NULL, window, &peninfo, (void *) (size_t) pen_id_in);
         if (!pen) {
             SDL_Log("error: can't add a pen device %d", pen_id_in);
             return;
@@ -78,7 +78,7 @@ void Android_OnPen(SDL_Window *window, int pen_id_in, SDL_PenDeviceType device_t
     switch (action) {
     case ACTION_CANCEL:
     case ACTION_HOVER_EXIT:
-        SDL_RemovePenDevice(0, pen);
+        SDL_RemovePenDevice(0, window, pen);
         break;
 
     case ACTION_DOWN:
diff --git a/src/video/cocoa/SDL_cocoapen.m b/src/video/cocoa/SDL_cocoapen.m
@@ -105,14 +105,14 @@ static void Cocoa_HandlePenProximityEvent(SDL_CocoaWindowData *_data, NSEvent *e
         handle->deviceid = devid;
         handle->toolid = toolid;
         handle->is_eraser = is_eraser;
-        handle->pen = SDL_AddPenDevice(Cocoa_GetEventTimestamp([event timestamp]), NULL, &peninfo, handle);
+        handle->pen = SDL_AddPenDevice(Cocoa_GetEventTimestamp([event timestamp]), NULL, _data.window, &peninfo, handle);
         if (!handle->pen) {
             SDL_free(handle);  // oh well.
         }
     } else {  // old pen leaving!
         Cocoa_PenHandle *handle = Cocoa_FindPenByDeviceID(devid, toolid);
         if (handle) {
-            SDL_RemovePenDevice(Cocoa_GetEventTimestamp([event timestamp]), handle->pen);
+            SDL_RemovePenDevice(Cocoa_GetEventTimestamp([event timestamp]), _data.window, handle->pen);
             SDL_free(handle);
         }
     }
diff --git a/src/video/emscripten/SDL_emscriptenevents.c b/src/video/emscripten/SDL_emscriptenevents.c
@@ -855,7 +855,7 @@ static void Emscripten_HandlePenEnter(SDL_WindowData *window_data, const Emscrip
     peninfo.max_tilt = 90.0f;
     peninfo.num_buttons = 2;
     peninfo.subtype = SDL_PEN_TYPE_PEN;
-    SDL_AddPenDevice(0, NULL, &peninfo, (void *) (size_t) event->pointerid);
+    SDL_AddPenDevice(0, NULL, window_data->window, &peninfo, (void *) (size_t) event->pointerid);
     Emscripten_UpdatePenFromEvent(window_data, event);
 }
 
@@ -878,7 +878,7 @@ static void Emscripten_HandlePenLeave(SDL_WindowData *window_data, const Emscrip
     const SDL_PenID pen = SDL_FindPenByHandle((void *) (size_t) event->pointerid);
     if (pen) {
         Emscripten_UpdatePointerFromEvent(window_data, event);  // last data updates?
-        SDL_RemovePenDevice(0, pen);
+        SDL_RemovePenDevice(0, window_data->window, pen);
     }
 }
 
diff --git a/src/video/uikit/SDL_uikitpen.m b/src/video/uikit/SDL_uikitpen.m
@@ -63,7 +63,7 @@ bool UIKit_InitPen(SDL_VideoDevice *_this)
 // we only have one Apple Pencil at a time, and it must be paired to the iOS device.
 // We only know about its existence when it first sends an event, so add an single SDL pen
 // device here if we haven't already.
-static SDL_PenID UIKit_AddPenIfNecesary()
+static SDL_PenID UIKit_AddPenIfNecesary(SDL_Window *window)
 {
     if (!apple_pencil_id) {
         SDL_PenInfo info;
@@ -86,7 +86,7 @@ static SDL_PenID UIKit_AddPenIfNecesary()
         // so we can't use it for tangential pressure.
 
         // There's only ever one Apple Pencil at most, so we just pass a non-zero value for the handle.
-        apple_pencil_id = SDL_AddPenDevice(0, "Apple Pencil", &info, (void *) (size_t) 0x1);
+        apple_pencil_id = SDL_AddPenDevice(0, "Apple Pencil", window, &info, (void *) (size_t) 0x1);
     }
 
     return apple_pencil_id;
@@ -95,7 +95,7 @@ static SDL_PenID UIKit_AddPenIfNecesary()
 static void UIKit_HandlePenAxes(SDL_Window *window, NSTimeInterval nstimestamp, float zOffset, const CGPoint *point, float force,
                                 float maximumPossibleForce, float azimuthAngleInView, float altitudeAngle, float rollAngle)
 {
-    const SDL_PenID penId = UIKit_AddPenIfNecesary();
+    const SDL_PenID penId = UIKit_AddPenIfNecesary(window);
     if (penId) {
         const Uint64 timestamp = UIKit_GetEventTimestamp(nstimestamp);
         const float radians_to_degrees = 180.0f / SDL_PI_F;
@@ -188,26 +188,28 @@ void UIKit_HandlePenMotion(SDL_uikitview *view, UITouch *pencil)
 
 void UIKit_HandlePenPress(SDL_uikitview *view, UITouch *pencil)
 {
-    const SDL_PenID penId = UIKit_AddPenIfNecesary();
+    SDL_Window *window = [view getSDLWindow];
+    const SDL_PenID penId = UIKit_AddPenIfNecesary(window);
     if (penId) {
         UIKit_HandlePenAxesFromUITouch(view, pencil);
-        SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, [view getSDLWindow], false, true);
+        SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, window, false, true);
     }
 }
 
 void UIKit_HandlePenRelease(SDL_uikitview *view, UITouch *pencil)
 {
-    const SDL_PenID penId = UIKit_AddPenIfNecesary();
+    SDL_Window *window = [view getSDLWindow];
+    const SDL_PenID penId = UIKit_AddPenIfNecesary(window);
     if (penId) {
-        SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, [view getSDLWindow], false, false);
+        SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, window, false, false);
         UIKit_HandlePenAxesFromUITouch(view, pencil);
     }
 }
 
 void UIKit_QuitPen(SDL_VideoDevice *_this)
 {
     if (apple_pencil_id) {
-        SDL_RemovePenDevice(0, apple_pencil_id);
+        SDL_RemovePenDevice(0, NULL, apple_pencil_id);
         apple_pencil_id = 0;
     }
 }
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
@@ -3306,7 +3306,8 @@ static void tablet_tool_handle_removed(void *data, struct zwp_tablet_tool_v2 *to
 {
     SDL_WaylandPenTool *sdltool = (SDL_WaylandPenTool *) data;
     if (sdltool->instance_id) {
-        SDL_RemovePenDevice(0, sdltool->instance_id);
+        SDL_Window *window = sdltool->focus ? sdltool->focus->sdlwindow : NULL;
+        SDL_RemovePenDevice(0, window, sdltool->instance_id);
     }
 
     Wayland_CursorStateRelease(&sdltool->cursor_state);
@@ -3439,7 +3440,7 @@ static void tablet_tool_handle_frame(void *data, struct zwp_tablet_tool_v2 *tool
     if (sdltool->frame.have_proximity_in) {
         SDL_assert(sdltool->instance_id == 0);  // shouldn't be added at this point.
         if (sdltool->info.subtype != SDL_PEN_TYPE_UNKNOWN) {   // don't tell SDL about it if we don't know its role.
-            sdltool->instance_id = SDL_AddPenDevice(timestamp, NULL, &sdltool->info, sdltool);
+            sdltool->instance_id = SDL_AddPenDevice(timestamp, NULL, window, &sdltool->info, sdltool);
             Wayland_TabletToolUpdateCursor(sdltool);
         }
     }
@@ -3487,7 +3488,7 @@ static void tablet_tool_handle_frame(void *data, struct zwp_tablet_tool_v2 *tool
     if (sdltool->frame.have_proximity_out) {
         sdltool->focus = NULL;
         Wayland_TabletToolUpdateCursor(sdltool);
-        SDL_RemovePenDevice(timestamp, sdltool->instance_id);
+        SDL_RemovePenDevice(timestamp, window, sdltool->instance_id);
         sdltool->instance_id = 0;
     }
 
@@ -3656,7 +3657,7 @@ void Wayland_DisplayRemoveWindowReferencesFromSeats(SDL_VideoData *display, SDL_
                 tool->focus = NULL;
                 Wayland_TabletToolUpdateCursor(tool);
                 if (tool->instance_id) {
-                    SDL_RemovePenDevice(0, tool->instance_id);
+                    SDL_RemovePenDevice(0, window->sdlwindow, tool->instance_id);
                     tool->instance_id = 0;
                 }
             }
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
@@ -1277,7 +1277,7 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
         info.max_tilt = 90.0f;
         info.num_buttons = 1;
         info.subtype = SDL_PEN_TYPE_PENCIL;
-        SDL_AddPenDevice(0, NULL, &info, hpointer);
+        SDL_AddPenDevice(0, NULL, data->window, &info, hpointer);
         returnCode = 0;
     } break;
 
@@ -1293,7 +1293,7 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 
         // if this just left the _window_, we don't care. If this is no longer visible to the tablet, time to remove it!
         if ((msg == WM_POINTERCAPTURECHANGED) || !IS_POINTER_INCONTACT_WPARAM(wParam)) {
-            SDL_RemovePenDevice(WIN_GetEventTimestamp(), pen);
+            SDL_RemovePenDevice(WIN_GetEventTimestamp(), data->window, pen);
         }
         returnCode = 0;
     } break;
diff --git a/src/video/x11/SDL_x11pen.c b/src/video/x11/SDL_x11pen.c
@@ -272,7 +272,7 @@ static X11_PenHandle *X11_MaybeAddPen(SDL_VideoDevice *_this, const XIDeviceInfo
     handle->is_eraser = is_eraser;
     handle->x11_deviceid = dev->deviceid;
 
-    handle->pen = SDL_AddPenDevice(0, dev->name, &peninfo, handle);
+    handle->pen = SDL_AddPenDevice(0, dev->name, NULL, &peninfo, handle);
     if (!handle->pen) {
         SDL_free(handle);
         return NULL;
@@ -301,7 +301,7 @@ void X11_RemovePenByDeviceID(int deviceid)
 {
     X11_PenHandle *handle = X11_FindPenByDeviceID(deviceid);
     if (handle) {
-        SDL_RemovePenDevice(0, handle->pen);
+        SDL_RemovePenDevice(0, NULL, handle->pen);
         SDL_free(handle);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ SDL_PenCapabilityFlags SDL_GetPenCapabilityFromAxis(SDL_PenAxis axis)`
`218`	`218`	`return 0; // oh well.`
`219`	`219`	`}`
`220`	`220`
`221`		`-SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char name, const SDL_PenInfo info, void *handle)`
	`221`	`+SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char name, SDL_Window window, const SDL_PenInfo info, void handle)`
`222`	`222`	`{`
`223`	`223`	`SDL_assert(handle != NULL); // just allocate a Uint8 so you have a unique pointer if not needed!`
`224`	`224`	`SDL_assert(SDL_FindPenByHandle(handle) == 0); // Backends shouldn't double-add pens!`
`@@ -262,13 +262,14 @@ SDL_PenID SDL_AddPenDevice(Uint64 timestamp, const char *name, const SDL_PenInfo`
`262`	`262`	`event.pproximity.type = SDL_EVENT_PEN_PROXIMITY_IN;`
`263`	`263`	`event.pproximity.timestamp = timestamp;`
`264`	`264`	`event.pproximity.which = result;`
	`265`	`+ event.pproximity.windowID = window ? window->id : 0;`
`265`	`266`	`SDL_PushEvent(&event);`
`266`	`267`	`}`
`267`	`268`
`268`	`269`	`return result;`
`269`	`270`	`}`
`270`	`271`
`271`		`-void SDL_RemovePenDevice(Uint64 timestamp, SDL_PenID instance_id)`
	`272`	`+void SDL_RemovePenDevice(Uint64 timestamp, SDL_Window *window, SDL_PenID instance_id)`
`272`	`273`	`{`
`273`	`274`	`if (!instance_id) {`
`274`	`275`	`return;`
`@@ -306,6 +307,7 @@ void SDL_RemovePenDevice(Uint64 timestamp, SDL_PenID instance_id)`
`306`	`307`	`event.pproximity.type = SDL_EVENT_PEN_PROXIMITY_OUT;`
`307`	`308`	`event.pproximity.timestamp = timestamp;`
`308`	`309`	`event.pproximity.which = instance_id;`
	`310`	`+ event.pproximity.windowID = window ? window->id : 0;`
`309`	`311`	`SDL_PushEvent(&event);`
`310`	`312`	`}`
`311`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,14 +105,14 @@ static void Cocoa_HandlePenProximityEvent(SDL_CocoaWindowData _data, NSEvent e`
`105`	`105`	`handle->deviceid = devid;`
`106`	`106`	`handle->toolid = toolid;`
`107`	`107`	`handle->is_eraser = is_eraser;`
`108`		`- handle->pen = SDL_AddPenDevice(Cocoa_GetEventTimestamp([event timestamp]), NULL, &peninfo, handle);`
	`108`	`+ handle->pen = SDL_AddPenDevice(Cocoa_GetEventTimestamp([event timestamp]), NULL, _data.window, &peninfo, handle);`
`109`	`109`	`if (!handle->pen) {`
`110`	`110`	`SDL_free(handle); // oh well.`
`111`	`111`	`}`
`112`	`112`	`} else { // old pen leaving!`
`113`	`113`	`Cocoa_PenHandle *handle = Cocoa_FindPenByDeviceID(devid, toolid);`
`114`	`114`	`if (handle) {`
`115`		`- SDL_RemovePenDevice(Cocoa_GetEventTimestamp([event timestamp]), handle->pen);`
	`115`	`+ SDL_RemovePenDevice(Cocoa_GetEventTimestamp([event timestamp]), _data.window, handle->pen);`
`116`	`116`	`SDL_free(handle);`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ static void Emscripten_HandlePenEnter(SDL_WindowData *window_data, const Emscrip`
`855`	`855`	`peninfo.max_tilt = 90.0f;`
`856`	`856`	`peninfo.num_buttons = 2;`
`857`	`857`	`peninfo.subtype = SDL_PEN_TYPE_PEN;`
`858`		`- SDL_AddPenDevice(0, NULL, &peninfo, (void *) (size_t) event->pointerid);`
	`858`	`+ SDL_AddPenDevice(0, NULL, window_data->window, &peninfo, (void *) (size_t) event->pointerid);`
`859`	`859`	`Emscripten_UpdatePenFromEvent(window_data, event);`
`860`	`860`	`}`
`861`	`861`
`@@ -878,7 +878,7 @@ static void Emscripten_HandlePenLeave(SDL_WindowData *window_data, const Emscrip`
`878`	`878`	`const SDL_PenID pen = SDL_FindPenByHandle((void *) (size_t) event->pointerid);`
`879`	`879`	`if (pen) {`
`880`	`880`	`Emscripten_UpdatePointerFromEvent(window_data, event); // last data updates?`
`881`		`- SDL_RemovePenDevice(0, pen);`
	`881`	`+ SDL_RemovePenDevice(0, window_data->window, pen);`
`882`	`882`	`}`
`883`	`883`	`}`
`884`	`884`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ bool UIKit_InitPen(SDL_VideoDevice *_this)`
`63`	`63`	`// we only have one Apple Pencil at a time, and it must be paired to the iOS device.`
`64`	`64`	`// We only know about its existence when it first sends an event, so add an single SDL pen`
`65`	`65`	`// device here if we haven't already.`
`66`		`-static SDL_PenID UIKit_AddPenIfNecesary()`
	`66`	`+static SDL_PenID UIKit_AddPenIfNecesary(SDL_Window *window)`
`67`	`67`	`{`
`68`	`68`	`if (!apple_pencil_id) {`
`69`	`69`	`SDL_PenInfo info;`
`@@ -86,7 +86,7 @@ static SDL_PenID UIKit_AddPenIfNecesary()`
`86`	`86`	`// so we can't use it for tangential pressure.`
`87`	`87`
`88`	`88`	`// There's only ever one Apple Pencil at most, so we just pass a non-zero value for the handle.`
`89`		`- apple_pencil_id = SDL_AddPenDevice(0, "Apple Pencil", &info, (void *) (size_t) 0x1);`
	`89`	`+ apple_pencil_id = SDL_AddPenDevice(0, "Apple Pencil", window, &info, (void *) (size_t) 0x1);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`return apple_pencil_id;`
`@@ -95,7 +95,7 @@ static SDL_PenID UIKit_AddPenIfNecesary()`
`95`	`95`	`static void UIKit_HandlePenAxes(SDL_Window window, NSTimeInterval nstimestamp, float zOffset, const CGPoint point, float force,`
`96`	`96`	`float maximumPossibleForce, float azimuthAngleInView, float altitudeAngle, float rollAngle)`
`97`	`97`	`{`
`98`		`- const SDL_PenID penId = UIKit_AddPenIfNecesary();`
	`98`	`+ const SDL_PenID penId = UIKit_AddPenIfNecesary(window);`
`99`	`99`	`if (penId) {`
`100`	`100`	`const Uint64 timestamp = UIKit_GetEventTimestamp(nstimestamp);`
`101`	`101`	`const float radians_to_degrees = 180.0f / SDL_PI_F;`
`@@ -188,26 +188,28 @@ void UIKit_HandlePenMotion(SDL_uikitview view, UITouch pencil)`
`188`	`188`
`189`	`189`	`void UIKit_HandlePenPress(SDL_uikitview view, UITouch pencil)`
`190`	`190`	`{`
`191`		`- const SDL_PenID penId = UIKit_AddPenIfNecesary();`
	`191`	`+ SDL_Window *window = [view getSDLWindow];`
	`192`	`+ const SDL_PenID penId = UIKit_AddPenIfNecesary(window);`
`192`	`193`	`if (penId) {`
`193`	`194`	`UIKit_HandlePenAxesFromUITouch(view, pencil);`
`194`		`- SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, [view getSDLWindow], false, true);`
	`195`	`+ SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, window, false, true);`
`195`	`196`	`}`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`void UIKit_HandlePenRelease(SDL_uikitview view, UITouch pencil)`
`199`	`200`	`{`
`200`		`- const SDL_PenID penId = UIKit_AddPenIfNecesary();`
	`201`	`+ SDL_Window *window = [view getSDLWindow];`
	`202`	`+ const SDL_PenID penId = UIKit_AddPenIfNecesary(window);`
`201`	`203`	`if (penId) {`
`202`		`- SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, [view getSDLWindow], false, false);`
	`204`	`+ SDL_SendPenTouch(UIKit_GetEventTimestamp([pencil timestamp]), penId, window, false, false);`
`203`	`205`	`UIKit_HandlePenAxesFromUITouch(view, pencil);`
`204`	`206`	`}`
`205`	`207`	`}`
`206`	`208`
`207`	`209`	`void UIKit_QuitPen(SDL_VideoDevice *_this)`
`208`	`210`	`{`
`209`	`211`	`if (apple_pencil_id) {`
`210`		`- SDL_RemovePenDevice(0, apple_pencil_id);`
	`212`	`+ SDL_RemovePenDevice(0, NULL, apple_pencil_id);`
`211`	`213`	`apple_pencil_id = 0;`
`212`	`214`	`}`
`213`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3306,7 +3306,8 @@ static void tablet_tool_handle_removed(void data, struct zwp_tablet_tool_v2 to`
`3306`	`3306`	`{`
`3307`	`3307`	`SDL_WaylandPenTool sdltool = (SDL_WaylandPenTool ) data;`
`3308`	`3308`	`if (sdltool->instance_id) {`
`3309`		`- SDL_RemovePenDevice(0, sdltool->instance_id);`
	`3309`	`+ SDL_Window *window = sdltool->focus ? sdltool->focus->sdlwindow : NULL;`
	`3310`	`+ SDL_RemovePenDevice(0, window, sdltool->instance_id);`
`3310`	`3311`	`}`
`3311`	`3312`
`3312`	`3313`	`Wayland_CursorStateRelease(&sdltool->cursor_state);`
`@@ -3439,7 +3440,7 @@ static void tablet_tool_handle_frame(void data, struct zwp_tablet_tool_v2 tool`
`3439`	`3440`	`if (sdltool->frame.have_proximity_in) {`
`3440`	`3441`	`SDL_assert(sdltool->instance_id == 0); // shouldn't be added at this point.`
`3441`	`3442`	`if (sdltool->info.subtype != SDL_PEN_TYPE_UNKNOWN) { // don't tell SDL about it if we don't know its role.`
`3442`		`- sdltool->instance_id = SDL_AddPenDevice(timestamp, NULL, &sdltool->info, sdltool);`
	`3443`	`+ sdltool->instance_id = SDL_AddPenDevice(timestamp, NULL, window, &sdltool->info, sdltool);`
`3443`	`3444`	`Wayland_TabletToolUpdateCursor(sdltool);`
`3444`	`3445`	`}`
`3445`	`3446`	`}`
`@@ -3487,7 +3488,7 @@ static void tablet_tool_handle_frame(void data, struct zwp_tablet_tool_v2 tool`
`3487`	`3488`	`if (sdltool->frame.have_proximity_out) {`
`3488`	`3489`	`sdltool->focus = NULL;`
`3489`	`3490`	`Wayland_TabletToolUpdateCursor(sdltool);`
`3490`		`- SDL_RemovePenDevice(timestamp, sdltool->instance_id);`
	`3491`	`+ SDL_RemovePenDevice(timestamp, window, sdltool->instance_id);`
`3491`	`3492`	`sdltool->instance_id = 0;`
`3492`	`3493`	`}`
`3493`	`3494`
`@@ -3656,7 +3657,7 @@ void Wayland_DisplayRemoveWindowReferencesFromSeats(SDL_VideoData *display, SDL_`
`3656`	`3657`	`tool->focus = NULL;`
`3657`	`3658`	`Wayland_TabletToolUpdateCursor(tool);`
`3658`	`3659`	`if (tool->instance_id) {`
`3659`		`- SDL_RemovePenDevice(0, tool->instance_id);`
	`3660`	`+ SDL_RemovePenDevice(0, window->sdlwindow, tool->instance_id);`
`3660`	`3661`	`tool->instance_id = 0;`
`3661`	`3662`	`}`
`3662`	`3663`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ static X11_PenHandle X11_MaybeAddPen(SDL_VideoDevice _this, const XIDeviceInfo`
`272`	`272`	`handle->is_eraser = is_eraser;`
`273`	`273`	`handle->x11_deviceid = dev->deviceid;`
`274`	`274`
`275`		`- handle->pen = SDL_AddPenDevice(0, dev->name, &peninfo, handle);`
	`275`	`+ handle->pen = SDL_AddPenDevice(0, dev->name, NULL, &peninfo, handle);`
`276`	`276`	`if (!handle->pen) {`
`277`	`277`	`SDL_free(handle);`
`278`	`278`	`return NULL;`
`@@ -301,7 +301,7 @@ void X11_RemovePenByDeviceID(int deviceid)`
`301`	`301`	`{`
`302`	`302`	`X11_PenHandle *handle = X11_FindPenByDeviceID(deviceid);`
`303`	`303`	`if (handle) {`
`304`		`- SDL_RemovePenDevice(0, handle->pen);`
	`304`	`+ SDL_RemovePenDevice(0, NULL, handle->pen);`
`305`	`305`	`SDL_free(handle);`
`306`	`306`	`}`
`307`	`307`	`}`