Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
a94fef86
Commit
a94fef86
authored
Feb 14, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
May 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clipboard.c: rename some exported functions
to make them all fit in the same naming scheme that better describes their purpose.
parent
649c1752
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
13 deletions
+15
-13
Clipboard.c
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+9
-7
Clipboard.h
nx-X11/programs/Xserver/hw/nxagent/Clipboard.h
+4
-4
Events.c
nx-X11/programs/Xserver/hw/nxagent/Events.c
+2
-2
No files found.
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
View file @
a94fef86
...
...
@@ -256,7 +256,9 @@ static int sendSelectionNotifyEventToClient(ClientPtr client,
Atom
target
,
Atom
property
);
static
Status
sendSelectionNotifyEventToServer
(
XSelectionEvent
*
event_to_send
);
#ifdef DEBUG
static
void
printSelectionStat
(
int
sel
);
#endif
static
void
replyRequestSelection
(
XEvent
*
X
,
Bool
success
);
void
nxagentPrintClipboardStat
(
char
*
);
...
...
@@ -647,13 +649,13 @@ int nxagentFindCurrentSelectionIndex(Atom sel)
* SelectionClear event. We receive this event if someone on the real
* X server claims the selection ownership.
*/
void
nxagent
ClearSelection
(
XEvent
*
X
)
void
nxagent
HandleSelectionClearFromXServer
(
XEvent
*
X
)
{
#ifdef DEBUG
fprintf
(
stderr
,
"%s: SelectionClear event for selection [%lu].
\n
"
,
__func__
,
X
->
xselectionclear
.
selection
);
#endif
nxagentPrintClipboardStat
(
"before nxagent
ClearSelection
"
);
nxagentPrintClipboardStat
(
"before nxagent
HandleSelectionClearFromXServer
"
);
if
(
!
agentClipboardInitialized
)
{
...
...
@@ -699,7 +701,7 @@ void nxagentClearSelection(XEvent *X)
lastClientWindowPtr
=
NULL
;
setClientSelectionStage
(
None
);
nxagentPrintClipboardStat
(
"after nxagent
ClearSelection
"
);
nxagentPrintClipboardStat
(
"after nxagent
HandleSelectionClearFromXServer
"
);
}
/*
...
...
@@ -735,7 +737,7 @@ static void replyRequestSelection(XEvent *X, Bool success)
* as selection owner. But in reality one of our windows is the owner,
* so we must pass the request on to the real owner.
*/
void
nxagent
RequestSelection
(
XEvent
*
X
)
void
nxagent
HandleSelectionRequestFromXServer
(
XEvent
*
X
)
{
#ifdef DEBUG
{
...
...
@@ -758,7 +760,7 @@ void nxagentRequestSelection(XEvent *X)
}
#endif
nxagentPrintClipboardStat
(
"before nxagent
RequestSelection
"
);
nxagentPrintClipboardStat
(
"before nxagent
HandleSelectionRequestFromXServer
"
);
if
(
!
agentClipboardInitialized
)
{
...
...
@@ -982,7 +984,7 @@ void nxagentRequestSelection(XEvent *X)
}
}
}
nxagentPrintClipboardStat
(
"after nxagent
RequestSelection
"
);
nxagentPrintClipboardStat
(
"after nxagent
HandleSelectionRequestFromXServer
"
);
}
/*
...
...
@@ -1820,7 +1822,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
* The selection request target is TARGETS. The requestor is asking
* for a list of supported data formats.
*
* The list is aligned with the one in nxagent
RequestSelection
.
* The list is aligned with the one in nxagent
HandleSelectionRequestFromXServer
.
*/
if
(
target
==
clientTARGETS
)
{
...
...
nx-X11/programs/Xserver/hw/nxagent/Clipboard.h
View file @
a94fef86
...
...
@@ -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
nxagent
ClearSelection
(
XEvent
*
X
);
extern
void
nxagent
RequestSelection
(
XEvent
*
X
);
extern
void
nxagent
HandleSelectionClearFromXServer
(
XEvent
*
X
);
extern
void
nxagent
HandleSelectionRequestFromXServer
(
XEvent
*
X
);
extern
void
nxagentHandleSelectionNotifyFromXServer
(
XEvent
*
X
);
#else
extern
void
nxagent
ClearSelection
();
extern
void
nxagent
RequestSelection
();
extern
void
nxagent
HandleSelectionClearFromXServer
();
extern
void
nxagent
HandleSelectionRequestFromXServer
();
extern
void
nxagentHandleSelectionNotifyFromXServer
();
#endif
...
...
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @
a94fef86
...
...
@@ -893,7 +893,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
fprintf
(
stderr
,
"%s: Going to handle new SelectionClear event.
\n
"
,
__func__
);
#endif
nxagent
ClearSelection
(
&
X
);
nxagent
HandleSelectionClearFromXServer
(
&
X
);
break
;
}
...
...
@@ -903,7 +903,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
fprintf
(
stderr
,
"%s: Going to handle new SelectionRequest event.
\n
"
,
__func__
);
#endif
nxagent
RequestSelection
(
&
X
);
nxagent
HandleSelectionRequestFromXServer
(
&
X
);
break
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment