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
848dee5c
Commit
848dee5c
authored
Jun 10, 2019
by
Ulrich Sibiller
Committed by
Mike Gabriel
Jun 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NXdispatch.c: use upstream version of ProcSetSelectionOwner
parent
09ba97b2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
99 deletions
+0
-99
dispatch.c
nx-X11/programs/Xserver/dix/dispatch.c
+0
-2
NXdispatch.c
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+0
-97
No files found.
nx-X11/programs/Xserver/dix/dispatch.c
View file @
848dee5c
...
...
@@ -919,7 +919,6 @@ ProcGetAtomName(register ClientPtr client)
}
}
#ifndef NXAGENT_SERVER
int
ProcSetSelectionOwner
(
register
ClientPtr
client
)
{
...
...
@@ -1014,7 +1013,6 @@ ProcSetSelectionOwner(register ClientPtr client)
return
(
BadAtom
);
}
}
#endif
/* NXAGENT_SERVER */
int
ProcGetSelectionOwner
(
register
ClientPtr
client
)
...
...
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
View file @
848dee5c
...
...
@@ -678,103 +678,6 @@ ProcQueryTree(register ClientPtr client)
int
ProcSetSelectionOwner
(
register
ClientPtr
client
)
{
WindowPtr
pWin
;
TimeStamp
time
;
REQUEST
(
xSetSelectionOwnerReq
);
REQUEST_SIZE_MATCH
(
xSetSelectionOwnerReq
);
UpdateCurrentTime
();
time
=
ClientTimeToServerTime
(
stuff
->
time
);
/* If the client's time stamp is in the future relative to the server's
time stamp, do not set the selection, just return success. */
if
(
CompareTimeStamps
(
time
,
currentTime
)
==
LATER
)
return
Success
;
if
(
stuff
->
window
!=
None
)
{
pWin
=
(
WindowPtr
)
SecurityLookupWindow
(
stuff
->
window
,
client
,
DixReadAccess
);
if
(
!
pWin
)
return
(
BadWindow
);
}
else
pWin
=
(
WindowPtr
)
None
;
if
(
ValidAtom
(
stuff
->
selection
))
{
int
i
=
0
;
/*
* First, see if the selection is already set...
*/
while
((
i
<
NumCurrentSelections
)
&&
CurrentSelections
[
i
].
selection
!=
stuff
->
selection
)
i
++
;
if
(
i
<
NumCurrentSelections
)
{
/* If the timestamp in client's request is in the past relative
to the time stamp indicating the last time the owner of the
selection was set, do not set the selection, just return
success. */
if
(
CompareTimeStamps
(
time
,
CurrentSelections
[
i
].
lastTimeChanged
)
==
EARLIER
)
return
Success
;
if
(
CurrentSelections
[
i
].
client
&&
(
!
pWin
||
(
CurrentSelections
[
i
].
client
!=
client
)))
{
xEvent
event
=
{
0
};
event
.
u
.
u
.
type
=
SelectionClear
;
event
.
u
.
selectionClear
.
time
=
time
.
milliseconds
;
event
.
u
.
selectionClear
.
window
=
CurrentSelections
[
i
].
window
;
event
.
u
.
selectionClear
.
atom
=
CurrentSelections
[
i
].
selection
;
(
void
)
TryClientEvents
(
CurrentSelections
[
i
].
client
,
&
event
,
1
,
NoEventMask
,
NoEventMask
/* CantBeFiltered */
,
NullGrab
);
}
}
else
{
/*
* It doesn't exist, so add it...
*/
Selection
*
newsels
;
if
(
i
==
0
)
newsels
=
(
Selection
*
)
malloc
(
sizeof
(
Selection
));
else
newsels
=
(
Selection
*
)
realloc
(
CurrentSelections
,
(
NumCurrentSelections
+
1
)
*
sizeof
(
Selection
));
if
(
!
newsels
)
return
BadAlloc
;
NumCurrentSelections
++
;
CurrentSelections
=
newsels
;
CurrentSelections
[
i
].
selection
=
stuff
->
selection
;
}
CurrentSelections
[
i
].
lastTimeChanged
=
time
;
CurrentSelections
[
i
].
window
=
stuff
->
window
;
CurrentSelections
[
i
].
pWin
=
pWin
;
CurrentSelections
[
i
].
client
=
(
pWin
?
client
:
NullClient
);
if
(
SelectionCallback
)
{
SelectionInfoRec
info
=
{
0
};
info
.
selection
=
&
CurrentSelections
[
i
];
info
.
kind
=
SelectionSetOwner
;
CallCallbacks
(
&
SelectionCallback
,
&
info
);
}
return
(
client
->
noClientException
);
}
else
{
client
->
errorValue
=
stuff
->
selection
;
return
(
BadAtom
);
}
}
int
ProcConvertSelection
(
register
ClientPtr
client
)
{
Bool
paramsOkay
;
...
...
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