The-Homebrew-Cloud/Ryujinx-SDL
2
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-09-21 22:48:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

X11: Use XFixes to detect clipboard updates

Browse Source 
Currently, SDL_CLIPBOARDUPDATE events are only sent when an SDL window
has its selection cleared.  This change sends the event anytime the
XFixesSelectionNotify event is raised, and when the selection is either
the clipboard or the primary selection.
This commit is contained in:
Alex Maese 2023-07-08 12:52:41 -05:00 committed by Sam Lantinga
parent f8a0135edf
commit acdde129bb
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -869,6 +869,27 @@ static void X11_DispatchEvent(_THIS, XEvent *xevent)
xevent->type, xevent->xany.display, xevent->xany.window);
#endif
#ifdef SDL_VIDEO_DRIVER_X11_XFIXES
if (SDL_X11_HAVE_XFIXES &&
xevent->type == X11_GetXFixesSelectionNotifyEvent()) {
XFixesSelectionNotifyEvent *ev = (XFixesSelectionNotifyEvent *) xevent;
/* !!! FIXME: cache atoms */
Atom XA_CLIPBOARD = X11_XInternAtom(display, "CLIPBOARD", 0);
#ifdef DEBUG_XEVENTS
printf("window CLIPBOARD: XFixesSelectionNotify (selection = %s)\n",
X11_XGetAtomName(display, ev->selection));
#endif
if (ev->selection == XA_PRIMARY ||
(XA_CLIPBOARD != None && ev->selection == XA_CLIPBOARD)) {
SDL_SendClipboardUpdate();
return;
}
}
#endif /* SDL_VIDEO_DRIVER_X11_XFIXES */
if ((videodata->clipboard_window != None) &&
(videodata->clipboard_window == xevent->xany.window)) {
X11_HandleClipboardEvent(_this, xevent);

1
src/video/x11/SDL_x11sym.h
View File

@ -162,6 +162,7 @@ SDL_X11_SYM(PointerBarrier, XFixesCreatePointerBarrier, (Display* a, Window b, i
SDL_X11_SYM(void, XFixesDestroyPointerBarrier, (Display* a, PointerBarrier b), (a,b),)
SDL_X11_SYM(int, XIBarrierReleasePointer,(Display* a, int b, PointerBarrier c, BarrierEventID d), (a,b,c,d), return) /* this is actually Xinput2 */
SDL_X11_SYM(Status, XFixesQueryVersion,(Display* a, int* b, int* c), (a,b,c), return)
SDL_X11_SYM(Status, XFixesSelectSelectionInput, (Display* a, Window b, Atom c, unsigned long d), (a,b,c,d), return)
#endif
#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS

15
src/video/x11/SDL_x11xfixes.c
View File

@ -29,6 +29,7 @@
#include "../../events/SDL_touch_c.h"
static int xfixes_initialized = 0;
static int xfixes_selection_notify_event = 0;
static int query_xfixes_version(Display *display, int major, int minor)
{
@ -50,11 +51,20 @@ void X11_InitXfixes(_THIS)
int event, error;
int fixes_opcode;
Atom XA_CLIPBOARD = X11_XInternAtom(data->display, "CLIPBOARD", 0);
if (!SDL_X11_HAVE_XFIXES ||
!X11_XQueryExtension(data->display, "XFIXES", &fixes_opcode, &event, &error)) {
return;
}
/* Selection tracking is available in all versions of XFixes */
xfixes_selection_notify_event = event + XFixesSelectionNotify;
X11_XFixesSelectSelectionInput(data->display, DefaultRootWindow(data->display),
XA_CLIPBOARD, XFixesSetSelectionOwnerNotifyMask);
X11_XFixesSelectSelectionInput(data->display, DefaultRootWindow(data->display),
XA_PRIMARY, XFixesSetSelectionOwnerNotifyMask);
/* We need at least 5.0 for barriers. */
version = query_xfixes_version(data->display, 5, 0);
if (!xfixes_version_atleast(version, 5, 0)) {
@ -69,6 +79,11 @@ int X11_XfixesIsInitialized()
return xfixes_initialized;
}
int X11_GetXFixesSelectionNotifyEvent()
{
return xfixes_selection_notify_event;
}
void X11_SetWindowMouseRect(_THIS, SDL_Window *window)
{
if (SDL_RectEmpty(&window->mouse_rect)) {

2
src/video/x11/SDL_x11xfixes.h
View File

@ -33,7 +33,7 @@ extern int X11_XfixesIsInitialized(void);
extern void X11_SetWindowMouseRect(_THIS, SDL_Window *window);
extern int X11_ConfineCursorWithFlags(_THIS, SDL_Window *window, const SDL_Rect *rect, int flags);
extern void X11_DestroyPointerBarrier(_THIS, SDL_Window *window);
extern int X11_GetXFixesSelectionNotifyEvent(void);
#endif /* SDL_VIDEO_DRIVER_X11_XFIXES */
#endif /* SDL_x11xfixes_h_ */