eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-25 22:19:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SDL_GetTouchDevices() follows the SDL_GetStringRule

Browse source
This commit is contained in:
Sam Lantinga 2024-07-18 22:15:11 -07:00
parent 856d598d6e
commit eb22fcce35
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/SDL3/SDL_touch.h
View file

@ -83,15 +83,16 @@ typedef struct SDL_Finger
* Therefore the returned list might be empty, although devices are available. * Therefore the returned list might be empty, although devices are available.
* After using all devices at least once the number will be correct. * After using all devices at least once the number will be correct.
* *
* \param count a pointer filled in with the number of devices returned, can * The returned array follows the SDL_GetStringRule, and will be automatically freed later.
*
* \param count a pointer filled in with the number of devices returned, may
* be NULL. * be NULL.
* \returns a 0 terminated array of touch device IDs which should be freed * \returns a 0 terminated array of touch device IDs or NULL on failure; call SDL_GetError() for more
* with SDL_free(), or NULL on failure; call SDL_GetError() for more
* information. * information.
* *
* \since This function is available since SDL 3.0.0. * \since This function is available since SDL 3.0.0.
*/ */
extern SDL_DECLSPEC SDL_TouchID * SDLCALL SDL_GetTouchDevices(int *count); extern SDL_DECLSPEC const SDL_TouchID * SDLCALL SDL_GetTouchDevices(int *count);
/** /**
* Get the touch device name as reported from the driver. * Get the touch device name as reported from the driver.

2
src/dynapi/SDL_dynapi_procs.h
View file

@ -502,7 +502,7 @@ SDL_DYNAPI_PROC(Uint64,SDL_GetTicks,(void),(),return)
SDL_DYNAPI_PROC(Uint64,SDL_GetTicksNS,(void),(),return) SDL_DYNAPI_PROC(Uint64,SDL_GetTicksNS,(void),(),return)
SDL_DYNAPI_PROC(const char*,SDL_GetTouchDeviceName,(SDL_TouchID a),(a),return) SDL_DYNAPI_PROC(const char*,SDL_GetTouchDeviceName,(SDL_TouchID a),(a),return)
SDL_DYNAPI_PROC(SDL_TouchDeviceType,SDL_GetTouchDeviceType,(SDL_TouchID a),(a),return) SDL_DYNAPI_PROC(SDL_TouchDeviceType,SDL_GetTouchDeviceType,(SDL_TouchID a),(a),return)
SDL_DYNAPI_PROC(SDL_TouchID*,SDL_GetTouchDevices,(int *a),(a),return) SDL_DYNAPI_PROC(const SDL_TouchID*,SDL_GetTouchDevices,(int *a),(a),return)
SDL_DYNAPI_PROC(SDL_Finger**,SDL_GetTouchFingers,(SDL_TouchID a, int *b),(a,b),return) SDL_DYNAPI_PROC(SDL_Finger**,SDL_GetTouchFingers,(SDL_TouchID a, int *b),(a,b),return)
SDL_DYNAPI_PROC(const char*,SDL_GetUserFolder,(SDL_Folder a),(a),return) SDL_DYNAPI_PROC(const char*,SDL_GetUserFolder,(SDL_Folder a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetVersion,(void),(),return) SDL_DYNAPI_PROC(int,SDL_GetVersion,(void),(),return)

4
src/events/SDL_touch.c
View file

@ -49,7 +49,7 @@ SDL_bool SDL_TouchDevicesAvailable(void)
return SDL_num_touch > 0; return SDL_num_touch > 0;
} }
SDL_TouchID *SDL_GetTouchDevices(int *count) const SDL_TouchID *SDL_GetTouchDevices(int *count)
{ {
if (count) { if (count) {
*count = 0; *count = 0;
@ -67,7 +67,7 @@ SDL_TouchID *SDL_GetTouchDevices(int *count)
} }
} }
return retval; return SDL_FreeLater(retval);
} }
static int SDL_GetTouchIndex(SDL_TouchID id) static int SDL_GetTouchIndex(SDL_TouchID id)

3
src/video/x11/SDL_x11xinput2.c
View file

@ -742,7 +742,7 @@ void X11_Xinput2UpdateDevices(SDL_VideoDevice *_this, SDL_bool initial_check)
int new_mouse_count = 0; int new_mouse_count = 0;
SDL_MouseID *new_mice = NULL; SDL_MouseID *new_mice = NULL;
int old_touch_count = 0; int old_touch_count = 0;
SDL_TouchID *old_touch_devices64 = NULL; const SDL_TouchID *old_touch_devices64 = NULL;
Uint32 *old_touch_devices = NULL; Uint32 *old_touch_devices = NULL;
int new_touch_count = 0; int new_touch_count = 0;
Uint32 *new_touch_devices = NULL; Uint32 *new_touch_devices = NULL;
@ -765,7 +765,6 @@ void X11_Xinput2UpdateDevices(SDL_VideoDevice *_this, SDL_bool initial_check)
} }
} }
} }
SDL_free(old_touch_devices64);
for (int i = 0; i < ndevices; i++) { for (int i = 0; i < ndevices; i++) {
XIDeviceInfo *dev = &info[i]; XIDeviceInfo *dev = &info[i];