encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-09 13:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added SDL_DROPTEXT event, for dragging and dropping string data.

Browse Source 
This patch is based on work in Unreal Engine 4's fork of SDL,
compliments of Epic Games.
This commit is contained in:
Ryan C. Gordon
2016-01-05 02:26:45 -05:00
parent c3114975db
commit f9b7379341
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/events/SDL_dropevents.c
View File

@@ -27,20 +27,33 @@
#include "SDL_dropevents_c.h"
int
SDL_SendDropFile(const char *file)
static int
SDL_SendDrop(const SDL_EventType evtype, const char *data)
{
int posted;
/* Post the event, if desired */
posted = 0;
if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) {
if (SDL_GetEventState(evtype) == SDL_ENABLE) {
SDL_Event event;
event.type = SDL_DROPFILE;
event.drop.file = SDL_strdup(file);
SDL_zero(event);
event.type = evtype;
event.drop.file = SDL_strdup(data);
posted = (SDL_PushEvent(&event) > 0);
}
return (posted);
return posted;
}
int
SDL_SendDropFile(const char *file)
{
return SDL_SendDrop(SDL_DROPFILE, file);
}
int
SDL_SendDropText(const char *text)
{
return SDL_SendDrop(SDL_DROPTEXT, text);
}
/* vi: set ts=4 sw=4 expandtab: */

1
src/events/SDL_dropevents_c.h
View File

@@ -24,6 +24,7 @@
#define _SDL_dropevents_c_h
extern int SDL_SendDropFile(const char *file);
extern int SDL_SendDropText(const char *text);
#endif /* _SDL_dropevents_c_h */

44
src/video/x11/SDL_x11events.c
View File

@@ -117,7 +117,9 @@ static Atom X11_PickTarget(Display *disp, Atom list[], int list_count)
int i;
for (i=0; i < list_count && request == None; i++) {
name = X11_XGetAtomName(disp, list[i]);
if (strcmp("text/uri-list", name)==0) request = list[i];
if ((SDL_strcmp("text/uri-list", name) == 0) || (SDL_strcmp("text/plain", name) == 0)) {
request = list[i];
}
X11_XFree(name);
}
return request;
@@ -1223,37 +1225,19 @@ X11_DispatchEvent(_THIS)
X11_ReadProperty(&p, display, data->xwindow, videodata->PRIMARY);
if (p.format == 8) {
SDL_bool expect_lf = SDL_FALSE;
char *start = NULL;
char *scan = (char*)p.data;
char *fn;
char *uri;
int length = 0;
while (p.count--) {
if (!expect_lf) {
if (*scan == 0x0D) {
expect_lf = SDL_TRUE;
/* !!! FIXME: don't use strtok here. It's not reentrant and not in SDL_stdinc. */
char* name = X11_XGetAtomName(display, target);
char *token = strtok((char *) p.data, "\r\n");
while (token != NULL) {
if (SDL_strcmp("text/plain", name)==0) {
SDL_SendDropText(token);
} else if (SDL_strcmp("text/uri-list", name)==0) {
char *fn = X11_URIToLocal(token);
if (fn) {
SDL_SendDropFile(fn);
}
if (start == NULL) {
start = scan;
length = 0;
}
length++;
} else {
if (*scan == 0x0A && length > 0) {
uri = SDL_malloc(length--);
SDL_memcpy(uri, start, length);
uri[length] = '\0';
fn = X11_URIToLocal(uri);
if (fn) {
SDL_SendDropFile(fn);
}
SDL_free(uri);
}
expect_lf = SDL_FALSE;
start = NULL;
}
scan++;
token = strtok(NULL, "\r\n");
}
}