From a92467f3c69d5d68190308fc6ce87a4c38ce8e76 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 13 Feb 2020 22:10:47 +0100 Subject: Clipboard.h: add missing externs --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.h') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h index a7d22ab97..96821b482 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h @@ -61,9 +61,15 @@ extern void nxagentSetSelectionOwner(Selection *pSelection); extern int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, Window requestor, Atom property, Atom target, Time time); -void nxagentClearSelection(); -void nxagentRequestSelection(); -void nxagentHandleSelectionNotifyFromXServer(); +#ifdef XEvent +extern void nxagentClearSelection(XEvent *X); +extern void nxagentRequestSelection(XEvent *X); +extern void nxagentHandleSelectionNotifyFromXServer(XEvent *X); +#else +extern void nxagentClearSelection(); +extern void nxagentRequestSelection(); +extern void nxagentHandleSelectionNotifyFromXServer(); +#endif -int nxagentFindCurrentSelectionIndex(Atom sel); +extern int nxagentFindCurrentSelectionIndex(Atom sel); #endif /* __Clipboard_H__ */ -- cgit v1.2.3 From 96bd8748a0745e864fc96cfdc4a0f406f0d44032 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 13 Feb 2020 22:11:40 +0100 Subject: Clipboard.h: reformat comments --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.h') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h index 96821b482..e802a9929 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h @@ -41,18 +41,15 @@ typedef struct _XFixesAgentInfo extern XFixesAgentInfoRec nxagentXFixesInfo; /* - * Create the NX_SELTRANS_FROM_AGENT atom and - * initialize the required property to exchange - * data with the X server. + * Create the NX_SELTRANS_FROM_AGENT atom and initialize the required + * property to exchange data with the X server. */ extern Bool nxagentInitClipboard(WindowPtr pWindow); /* - * Called whenever a client or a window is - * destroyed to let the clipboard code to - * release any pointer to the referenced - * structures. + * Called whenever a client or a window is destroyed to let the + * clipboard code to release any pointer to the referenced structures. */ extern void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow); -- cgit v1.2.3 From fad1b5f0c9a819b500b1c7a82dc0a87c6a296e2f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 14 Feb 2020 00:13:08 +0100 Subject: Clipboard.{c,h}: cleanup prototypes --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.h') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h index e802a9929..e34150986 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h @@ -54,7 +54,6 @@ extern Bool nxagentInitClipboard(WindowPtr pWindow); extern void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow); -extern void nxagentSetSelectionOwner(Selection *pSelection); extern int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, Window requestor, Atom property, Atom target, Time time); @@ -69,4 +68,14 @@ extern void nxagentHandleSelectionNotifyFromXServer(); #endif extern int nxagentFindCurrentSelectionIndex(Atom sel); +/* + * Handle the selection property received in the event loop in + * Events.c. + */ +extern void nxagentCollectPropertyEvent(int resource); + +extern WindowPtr nxagentGetClipboardWindow(Atom property); + +extern int nxagentSendNotify(xEvent *event); + #endif /* __Clipboard_H__ */ -- cgit v1.2.3 From a94fef86c9ee72d646813f58bf947f7f245ebbca Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 14 Feb 2020 23:59:45 +0100 Subject: Clipboard.c: rename some exported functions to make them all fit in the same naming scheme that better describes their purpose. --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.h') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h index e34150986..b741ef286 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h @@ -58,12 +58,12 @@ extern int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom select Window requestor, Atom property, Atom target, Time time); #ifdef XEvent -extern void nxagentClearSelection(XEvent *X); -extern void nxagentRequestSelection(XEvent *X); +extern void nxagentHandleSelectionClearFromXServer(XEvent *X); +extern void nxagentHandleSelectionRequestFromXServer(XEvent *X); extern void nxagentHandleSelectionNotifyFromXServer(XEvent *X); #else -extern void nxagentClearSelection(); -extern void nxagentRequestSelection(); +extern void nxagentHandleSelectionClearFromXServer(); +extern void nxagentHandleSelectionRequestFromXServer(); extern void nxagentHandleSelectionNotifyFromXServer(); #endif -- cgit v1.2.3