From 72c022406f83d78425daae3037aebd2123f66293 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 9 Aug 2019 11:03:16 +0200 Subject: Clipboard.c: rename nxagentNotifySelection to nxagentHandleSelectionNotifyFromXServer Use a more descriptive name. --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 9 +++++---- nx-X11/programs/Xserver/hw/nxagent/Clipboard.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'nx-X11/programs/Xserver/hw') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index e17ecef2c..5f7bdab4e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1199,7 +1199,7 @@ void nxagentCollectPropertyEvent(int resource) * SelectionNotify event from the real X server. These events are * sent out by nxagent itself! */ -void nxagentNotifySelection(XEvent *X) +void nxagentHandleSelectionNotifyFromXServer(XEvent *X) { if (agentClipboardStatus != 1) { @@ -1859,9 +1859,10 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, /* * This is _only_ called from ProcSendEvent in NXevents.c. It is used * to send a SelectionNotify event to our server window which will - * trigger the dispatch loop in Events.c to run nxagentNotifySelection - * which in turn will take care of transferring the selection content - * from the owning client to to a property of the server window. + * trigger the dispatch loop in Events.c to run + * nxagentHandleSelectionNotifyFromXServer which in turn will take + * care of transferring the selection content from the owning client + * to to a property of the server window. * * Returning 1 here means the client request will not be further * handled by dix. Returning 0 means a SelectionNotify event being diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h index 2f43469ae..c2e783cb9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.h @@ -64,7 +64,7 @@ extern int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom select void nxagentClearSelection(); void nxagentRequestSelection(); -void nxagentNotifySelection(); +void nxagentHandleSelectionNotifyFromXServer(); int nxagentFindCurrentSelectionIndex(Atom sel); #endif /* __Clipboard_H__ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 4a13f15ad..cbdf17a22 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -944,7 +944,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) fprintf(stderr, "nxagentDispatchEvents: Going to handle new SelectionNotify event.\n"); #endif - nxagentNotifySelection(&X); + nxagentHandleSelectionNotifyFromXServer(&X); break; } -- cgit v1.2.3