gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added SDL_AllocateEventString()

Browse Source
This commit is contained in:
Sam Lantinga
2024-06-18 13:50:18 -07:00
parent fa5367d379
commit 306c4164bc
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/events/SDL_dropevents.c
View File

@@ -59,16 +59,16 @@ static int SDL_SendDrop(SDL_Window *window, const SDL_EventType evtype, const ch
event.type = evtype;
event.common.timestamp = 0;
if (source) {
event.drop.source = SDL_strdup(source);
}
if (data) {
size_t size = SDL_strlen(data) + 1;
event.drop.data = (char *)SDL_AllocateEventMemory(size);
if (!event.drop.data) {
SDL_free(event.drop.source);
event.drop.source = SDL_AllocateEventString(source);
if (!event.drop.source) {
return 0;
}
}
if (data) {
event.drop.data = SDL_AllocateEventString(data);
if (!event.drop.data) {
return 0;
}
SDL_memcpy(event.drop.data, data, size);
}
event.drop.windowID = window ? window->id : 0;

8
src/events/SDL_events.c
View File

@@ -135,6 +135,14 @@ void *SDL_AllocateEventMemory(size_t size)
return SDL_FreeLater(SDL_malloc(size));
}
const char *SDL_AllocateEventString(const char *string)
{
if (string) {
return SDL_FreeLater(SDL_strdup(string));
}
return NULL;
}
static void SDL_FlushEventMemory(Uint32 eventID)
{
SDL_LockMutex(SDL_event_memory_lock);

2
src/events/SDL_events_c.h
View File

@@ -40,6 +40,8 @@ extern int SDL_StartEventLoop(void);
extern void SDL_StopEventLoop(void);
extern void SDL_QuitInterrupt(void);
extern const char *SDL_AllocateEventString(const char *string);
extern int SDL_SendAppEvent(SDL_EventType eventType);
extern int SDL_SendKeymapChangedEvent(void);
extern int SDL_SendLocaleChangedEvent(void);

12
src/events/SDL_keyboard.c
View File

@@ -1205,14 +1205,10 @@ int SDL_SendKeyboardText(const char *text)
event.type = SDL_EVENT_TEXT_INPUT;
event.common.timestamp = 0;
event.text.windowID = keyboard->focus ? keyboard->focus->id : 0;
size_t size = SDL_strlen(text) + 1;
event.text.text = (char *)SDL_AllocateEventMemory(size);
event.text.text = SDL_AllocateEventString(text);
if (!event.text.text) {
return 0;
}
SDL_memcpy(event.text.text, text, size);
posted = (SDL_PushEvent(&event) > 0);
}
return posted;
@@ -1241,14 +1237,10 @@ int SDL_SendEditingText(const char *text, int start, int length)
event.edit.windowID = keyboard->focus ? keyboard->focus->id : 0;
event.edit.start = start;
event.edit.length = length;
size_t size = SDL_strlen(text) + 1;
event.edit.text = (char *)SDL_AllocateEventMemory(size);
event.edit.text = SDL_AllocateEventString(text);
if (!event.edit.text) {
return 0;
}
SDL_memcpy(event.edit.text, text, size);
posted = (SDL_PushEvent(&event) > 0);
}
return posted;