aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-09 11:03:16 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-09-29 17:44:08 +0200
commit72c022406f83d78425daae3037aebd2123f66293 (patch)
tree96a4ed65f1a16eadf46816d6b55d96fd976be421
parent6663cbe68e7211337488d534bac82592b996bec6 (diff)
downloadnx-libs-72c022406f83d78425daae3037aebd2123f66293.tar.gz
nx-libs-72c022406f83d78425daae3037aebd2123f66293.tar.bz2
nx-libs-72c022406f83d78425daae3037aebd2123f66293.zip
Clipboard.c: rename nxagentNotifySelection to nxagentHandleSelectionNotifyFromXServer
Use a more descriptive name.
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c9
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c2
3 files changed, 7 insertions, 6 deletions
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;
}