encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: A bunch of clipboard safety fixes. 

Also removed Wayland_get_data_device because it was a pointless getter function.
This commit is contained in:
Ethan Lee 2021-04-08 14:14:46 -04:00 committed by Sam Lantinga
parent 7510245af9
commit 875f839df4
3 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,8 @@ Wayland_SetClipboardText(_THIS, const char *text)
status = SDL_SetError("Video driver uninitialized"); status = SDL_SetError("Video driver uninitialized");
} else { } else {
video_data = _this->driverdata; video_data = _this->driverdata;
/* TODO: Support more than one seat */ if (video_data->input != NULL && video_data->input->data_device != NULL) {
data_device = Wayland_get_data_device(video_data->input); data_device = video_data->input->data_device;
if (text[0] != '\0') { if (text[0] != '\0') {
SDL_WaylandDataSource* source = Wayland_data_source_create(_this); SDL_WaylandDataSource* source = Wayland_data_source_create(_this);
Wayland_data_source_add_data(source, TEXT_MIME, text, Wayland_data_source_add_data(source, TEXT_MIME, text,
@ -52,6 +52,7 @@ Wayland_SetClipboardText(_THIS, const char *text)
status = Wayland_data_device_clear_selection(data_device); status = Wayland_data_device_clear_selection(data_device);
} }
} }
}
return status; return status;
} }
@ -71,8 +72,8 @@ Wayland_GetClipboardText(_THIS)
SDL_SetError("Video driver uninitialized"); SDL_SetError("Video driver uninitialized");
} else { } else {
video_data = _this->driverdata; video_data = _this->driverdata;
/* TODO: Support more than one seat */ if (video_data->input != NULL && video_data->input->data_device != NULL) {
data_device = Wayland_get_data_device(video_data->input); data_device = video_data->input->data_device;
if (data_device->selection_offer != NULL) { if (data_device->selection_offer != NULL) {
buffer = Wayland_data_offer_receive(data_device->selection_offer, buffer = Wayland_data_offer_receive(data_device->selection_offer,
&length, TEXT_MIME, SDL_TRUE); &length, TEXT_MIME, SDL_TRUE);
@ -87,6 +88,7 @@ Wayland_GetClipboardText(_THIS)
} }
} }
} }
}
if (text == NULL) { if (text == NULL) {
text = SDL_strdup(""); text = SDL_strdup("");
@ -106,15 +108,17 @@ Wayland_HasClipboardText(_THIS)
SDL_SetError("Video driver uninitialized"); SDL_SetError("Video driver uninitialized");
} else { } else {
video_data = _this->driverdata; video_data = _this->driverdata;
data_device = Wayland_get_data_device(video_data->input); if (video_data->input != NULL && video_data->input->data_device != NULL) {
if (data_device != NULL && Wayland_data_offer_has_mime( data_device = video_data->input->data_device;
if (Wayland_data_offer_has_mime(
data_device->selection_offer, TEXT_MIME)) { data_device->selection_offer, TEXT_MIME)) {
result = SDL_TRUE; result = SDL_TRUE;
} else if(data_device != NULL && Wayland_data_source_has_mime( } else if (Wayland_data_source_has_mime(
data_device->selection_source, TEXT_MIME)) { data_device->selection_source, TEXT_MIME)) {
result = SDL_TRUE; result = SDL_TRUE;
} }
} }
}
return result; return result;
} }

9
src/video/wayland/SDL_waylandevents.c
View File

@ -1192,15 +1192,6 @@ void Wayland_display_destroy_input(SDL_VideoData *d)
d->input = NULL; d->input = NULL;
} }
SDL_WaylandDataDevice* Wayland_get_data_device(struct SDL_WaylandInput *input)
{
if (input == NULL) {
return NULL;
}
return input->data_device;
}
/* !!! FIXME: just merge these into display_handle_global(). */ /* !!! FIXME: just merge these into display_handle_global(). */
void Wayland_display_add_relative_pointer_manager(SDL_VideoData *d, uint32_t id) void Wayland_display_add_relative_pointer_manager(SDL_VideoData *d, uint32_t id)
{ {

2
src/video/wayland/SDL_waylandevents_c.h
View File

@ -85,8 +85,6 @@ extern void Wayland_add_data_device_manager(SDL_VideoData *d, uint32_t id, uint3
extern void Wayland_display_add_input(SDL_VideoData *d, uint32_t id, uint32_t version); extern void Wayland_display_add_input(SDL_VideoData *d, uint32_t id, uint32_t version);
extern void Wayland_display_destroy_input(SDL_VideoData *d); extern void Wayland_display_destroy_input(SDL_VideoData *d);
extern SDL_WaylandDataDevice* Wayland_get_data_device(struct SDL_WaylandInput *input);
extern void Wayland_display_add_pointer_constraints(SDL_VideoData *d, uint32_t id); extern void Wayland_display_add_pointer_constraints(SDL_VideoData *d, uint32_t id);
extern void Wayland_display_destroy_pointer_constraints(SDL_VideoData *d); extern void Wayland_display_destroy_pointer_constraints(SDL_VideoData *d);