mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x11: Be a little less aggressive with Xinput2IsInitialized checks. 

Just in case this ever get deinitialized sooner, we'd still like to SDL_free()
things on shutdown, etc.

Reference PR #13148.
This commit is contained in:
Ryan C. Gordon 2025-06-01 10:14:01 -04:00
parent 57b6e6c7f9
commit 9e0d9f30a7
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/video/x11/SDL_x11pen.c
View File

@ -283,22 +283,22 @@ static X11_PenHandle *X11_MaybeAddPen(SDL_VideoDevice *_this, const XIDeviceInfo
X11_PenHandle *X11_MaybeAddPenByDeviceID(SDL_VideoDevice *_this, int deviceid) X11_PenHandle *X11_MaybeAddPenByDeviceID(SDL_VideoDevice *_this, int deviceid)
{ {
if (!X11_Xinput2IsInitialized()) return NULL; if (X11_Xinput2IsInitialized()) {
SDL_VideoData *data = _this->internal; SDL_VideoData *data = _this->internal;
int num_device_info = 0; int num_device_info = 0;
XIDeviceInfo *device_info = X11_XIQueryDevice(data->display, deviceid, &num_device_info); XIDeviceInfo *device_info = X11_XIQueryDevice(data->display, deviceid, &num_device_info);
if (device_info) { if (device_info) {
SDL_assert(num_device_info == 1); SDL_assert(num_device_info == 1);
X11_PenHandle *handle = X11_MaybeAddPen(_this, device_info); X11_PenHandle *handle = X11_MaybeAddPen(_this, device_info);
X11_XIFreeDeviceInfo(device_info); X11_XIFreeDeviceInfo(device_info);
return handle; return handle;
}
} }
return NULL; return NULL;
} }
void X11_RemovePenByDeviceID(int deviceid) void X11_RemovePenByDeviceID(int deviceid)
{ {
if (!X11_Xinput2IsInitialized()) return;
X11_PenHandle *handle = X11_FindPenByDeviceID(deviceid); X11_PenHandle *handle = X11_FindPenByDeviceID(deviceid);
if (handle) { if (handle) {
SDL_RemovePenDevice(0, handle->pen); SDL_RemovePenDevice(0, handle->pen);
@ -308,7 +308,10 @@ void X11_RemovePenByDeviceID(int deviceid)
void X11_InitPen(SDL_VideoDevice *_this) void X11_InitPen(SDL_VideoDevice *_this)
{ {
if (!X11_Xinput2IsInitialized()) return; if (!X11_Xinput2IsInitialized()) {
return; // we need XIQueryDevice() for this.
}
SDL_VideoData *data = _this->internal; SDL_VideoData *data = _this->internal;
#define LOOKUP_PEN_ATOM(X) X11_XInternAtom(data->display, X, False) #define LOOKUP_PEN_ATOM(X) X11_XInternAtom(data->display, X, False)
@ -338,7 +341,6 @@ static void X11_FreePenHandle(SDL_PenID instance_id, void *handle, void *userdat
void X11_QuitPen(SDL_VideoDevice *_this) void X11_QuitPen(SDL_VideoDevice *_this)
{ {
if (!X11_Xinput2IsInitialized()) return;
SDL_RemoveAllPenDevices(X11_FreePenHandle, NULL); SDL_RemoveAllPenDevices(X11_FreePenHandle, NULL);
} }