aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2024-05-20 16:00:36 +0200
committerUlrich Sibiller <uli42@gmx.de>2024-05-21 21:57:51 +0200
commitc9ac944fcffef84672eae9d176fea39de369f856 (patch)
tree83ec65a7f0861a64e4244596654a277437f7069b
parent251fe32df4f29c156e3e5752dd4abeabff68ad1a (diff)
downloadnx-libs-c9ac944fcffef84672eae9d176fea39de369f856.tar.gz
nx-libs-c9ac944fcffef84672eae9d176fea39de369f856.tar.bz2
nx-libs-c9ac944fcffef84672eae9d176fea39de369f856.zip
Clipboard.c: make it compile cleanly without NXAGENT_CLIPBOARD
do not show warnings about unused functions
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 91fe5679f..2881a4031 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -329,9 +329,11 @@ static void resetSelectionOwnerOnXServer(void);
#endif
static void initSelectionOwnerData(int index);
static void clearSelectionOwnerData(int index);
-static void storeSelectionOwnerData(int index, Selection *sel);
static Bool matchSelectionOwner(int index, ClientPtr pClient, WindowPtr pWindow);
+#ifdef NXAGENT_CLIPBOARD
static void setSelectionOwnerOnXServer(Selection *pSelection);
+static void storeSelectionOwnerData(int index, Selection *sel);
+#endif
static int sendEventToClient(ClientPtr client, xEvent *pEvents);
static void sendSelectionNotifyEventToClient(ClientPtr client,
Time time,
@@ -709,6 +711,7 @@ static void clearSelectionOwnerData(int index)
lastSelectionOwner[index].lastTimeChanged = ClientTimeToServerTime(CurrentTime);
}
+#ifdef NXAGENT_CLIPBOARD
static void storeSelectionOwnerData(int index, Selection *sel)
{
lastSelectionOwner[index].client = sel->client;
@@ -716,6 +719,7 @@ static void storeSelectionOwnerData(int index, Selection *sel)
lastSelectionOwner[index].windowPtr = sel->pWin;
lastSelectionOwner[index].lastTimeChanged = ClientTimeToServerTime(CurrentTime);
}
+#endif
static Bool matchSelectionOwner(int index, ClientPtr pClient, WindowPtr pWindow)
{
@@ -2369,7 +2373,6 @@ void nxagentSetSelectionCallback(CallbackListPtr *callbacks, void *data,
}
}
}
-#endif
/*
* This is called from the nxagentSetSelectionCallback, so it is using
@@ -2468,6 +2471,7 @@ FIXME2: instead of XGetSelectionOwner we could check if the Xfixes
}
*/
}
+#endif
/*
* This is called from dix (ProcConvertSelection) if an nxagent client