geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clipboard: Fixes testautomation fails introduced by clipboard changes

main
Linus Probert 2023-06-12 13:06:16 +02:00 committed by Sam Lantinga
parent 4e0f94ea7d
commit a2ba5e9052
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/video/wayland/SDL_waylandclipboard.c
View File

@ -245,14 +245,16 @@ static SDL_bool HasClipboardData(SDL_VideoDevice *_this, const char *mime_type)
SDL_WaylandDataDevice *data_device = NULL;
SDL_bool result = SDL_FALSE;
if (_this == NULL || _this->driverdata == NULL) {
SDL_SetError("Video driver uninitialized");
} else {
video_data = _this->driverdata;
if (video_data->input != NULL && video_data->input->data_device != NULL) {
data_device = video_data->input->data_device;
result = result ||
Wayland_data_offer_has_mime(data_device->selection_offer, mime_type);
video_data = _this->driverdata;
if (video_data->input != NULL && video_data->input->data_device != NULL) {
data_device = video_data->input->data_device;
if (data_device->selection_source != NULL) {
size_t length = 0;
char *buffer = Wayland_data_source_get_data(data_device->selection_source, &length, mime_type, SDL_TRUE);
result = buffer != NULL;
SDL_free(buffer);
} else {
result = Wayland_data_offer_has_mime(data_device->selection_offer, mime_type);
}
}
return result;
@ -280,9 +282,16 @@ SDL_bool Wayland_HasPrimarySelectionText(SDL_VideoDevice *_this)
video_data = _this->driverdata;
if (video_data->input != NULL && video_data->input->primary_selection_device != NULL) {
primary_selection_device = video_data->input->primary_selection_device;
result = result ||
Wayland_primary_selection_offer_has_mime(
primary_selection_device->selection_offer, TEXT_MIME);
if (primary_selection_device->selection_source != NULL) {
size_t length = 0;
char *buffer = Wayland_primary_selection_source_get_data(primary_selection_device->selection_source,
&length, TEXT_MIME, SDL_TRUE);
result = buffer != NULL;
SDL_free(buffer);
} else {
result = Wayland_primary_selection_offer_has_mime(
primary_selection_device->selection_offer, TEXT_MIME);
}
}
}
return result;

6
src/video/x11/SDL_x11clipboard.c
View File

@ -181,7 +181,7 @@ static void *GetSelectionData(SDL_VideoDevice *_this, Atom selection_type, size_
owner = X11_XGetSelectionOwner(display, selection_type);
if (owner == None) {
/* This requires a fallback to ancient X10 cut-buffers. We will just skip those for now */
return NULL;
data = NULL;
} else if (owner == window) {
owner = DefaultRootWindow(display);
if (selection_type == XA_PRIMARY) {
@ -229,6 +229,10 @@ static void *GetSelectionData(SDL_VideoDevice *_this, Atom selection_type, size_
}
}
if (nullterminate && data == NULL) {
data = strdup("");
}
return data;
}