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.c | 22 ++++++++++------------ nx-X11/programs/Xserver/hw/nxagent/Clipboard.h | 11 ++++++++++- nx-X11/programs/Xserver/hw/nxagent/Events.h | 7 ------- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 6 +----- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 5 +---- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 302181b5e..b456b7113 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -232,19 +232,17 @@ XFixesAgentInfoRec nxagentXFixesInfo = { -1, -1, -1, 0 }; extern Display *nxagentDisplay; -Bool nxagentValidServerTargets(XlibAtom target); +static Bool nxagentValidServerTargets(XlibAtom target); static void endTransfer(Bool success); #define SELECTION_SUCCESS True #define SELECTION_FAULT False -void nxagentTransferSelection(int resource); -void nxagentCollectPropertyEvent(int resource); +static void nxagentTransferSelection(int resource); #if 0 void nxagentResetSelectionOwner(void); #endif -WindowPtr nxagentGetClipboardWindow(Atom property); -void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, - Atom selection, Atom target, Time time); -int nxagentSendNotify(xEvent *event); +static void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, + Atom selection, Atom target, Time time); +static void nxagentSetSelectionOwner(Selection *pSelection); void nxagentPrintClipboardStat(char *); @@ -475,7 +473,7 @@ int SendSelectionNotifyEventToClient(ClientPtr client, * server, like .e.g XA_STRING or UTF8_STRING. Other, non content type * targets like "TARGETS" or "TIMESTAMP" will return false. */ -Bool nxagentValidServerTargets(XlibAtom target) +static Bool nxagentValidServerTargets(XlibAtom target) { if (target == XA_STRING) { @@ -1012,7 +1010,7 @@ static void endTransfer(Bool success) SetClientSelectionStage(None); } -void nxagentTransferSelection(int resource) +static void nxagentTransferSelection(int resource) { if (lastClientClientPtr -> index != resource) { @@ -1603,7 +1601,7 @@ void nxagentSetSelectionCallback(CallbackListPtr *callbacks, void *data, * This is called from the nxagentSetSelectionCallback, so it is using * internal Atoms */ -void nxagentSetSelectionOwner(Selection *pSelection) +static void nxagentSetSelectionOwner(Selection *pSelection) { if (!agentClipboardInitialized) { @@ -1687,8 +1685,8 @@ FIXME */ } -void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, - Atom selection, Atom target, Time time) +static void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, + Atom selection, Atom target, Time time) { /* * Check if the client is still valid. 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__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h index 6df5725d4..1f64279d9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h @@ -149,13 +149,6 @@ extern void nxagentUngrabPointerAndKeyboard(XEvent *X); extern void nxagentDeactivatePointerGrab(void); -/* - * Handle the selection property received - * in the event loop. - */ - -void nxagentCollectPropertyEvent(int resource); - /* * Synchronize expose events between agent and * the real X server. diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index ed444e7a4..4b4232c4b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -143,6 +143,7 @@ of the copyright holder. #include "Events.h" #include "Windows.h" #include "Args.h" +#include "Clipboard.h" extern Display *nxagentDisplay; @@ -153,11 +154,6 @@ extern void nxagentInitViewportFrame(ScreenPtr, WindowPtr); #endif extern int nxagentShadowInit(ScreenPtr, WindowPtr); -#ifdef NXAGENT_CLIPBOARD -extern int nxagentSendNotify(xEvent*); -#endif - - void ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, TimeStamp time, Bool autoGrab) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index b55392690..11e66720f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -76,6 +76,7 @@ SOFTWARE. #include "Rootless.h" #include "Client.h" #include "Windows.h" +#include "Clipboard.h" extern Atom clientCutProperty; @@ -93,10 +94,6 @@ nxagentWMStateRec; #undef TEST #undef DEBUG -#ifdef NXAGENT_CLIPBOARD -extern WindowPtr nxagentGetClipboardWindow(Atom); -#endif - #ifdef NXAGENT_ARTSD extern Atom mcop_local_atom; #endif -- cgit v1.2.3