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
64c95c0a
Commit
64c95c0a
authored
May 06, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
May 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reconnect.c: reformat comments
parent
cf2bd1cf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
20 deletions
+14
-20
Reconnect.c
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+14
-20
No files found.
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
View file @
64c95c0a
...
...
@@ -236,8 +236,7 @@ int nxagentHandleConnectionStates(void)
fprintf
(
stderr
,
"nxagentHandleConnectionStates: Got I/O error in the exception flags.
\n
"
);
#endif
/*
TODO: This should be reset only when
the state became SESSION_DOWN.
TODO: This should be reset only when the state became SESSION_DOWN.
*/
nxagentException
.
ioError
=
0
;
...
...
@@ -364,8 +363,7 @@ void nxagentDisconnectSession(void)
nxagentFreeTimeoutTimer
();
/*
* Force an I/O error on the display
* and wait until the NX transport
* Force an I/O error on the display and wait until the NX transport
* is gone.
*/
...
...
@@ -426,16 +424,15 @@ Bool nxagentReconnectSession(void)
nxagentChangeOption
(
DeviceControl
,
nxagentOption
(
DeviceControlUserDefined
));
/*
* We need to zero out every new XID
*
created by the disconnected
display.
* We need to zero out every new XID
created by the disconnected
* display.
*/
nxagentDisconnectSession
();
/*
* Set this in order to let the screen
* function to behave differently at
* reconnection time.
* Set this in order to let the screen function to behave
* differently at reconnection time.
*/
nxagentReconnectTrap
=
True
;
...
...
@@ -503,16 +500,15 @@ Bool nxagentReconnectSession(void)
}
/*
* Map the main window and send a
* SetSelectionOwner request to
* Map the main window and send a SetSelectionOwner request to
* notify of the agent start.
*/
nxagentMapDefaultWindows
();
/*
* Ensure that the SetSelectionOwner
*
request is sent through the
link.
* Ensure that the SetSelectionOwner
request is sent through the
* link.
*/
XFlush
(
nxagentDisplay
);
...
...
@@ -682,10 +678,9 @@ Bool nxagentReconnectSession(void)
nxagentRemoveSplashWindow
();
/*
* We let the proxy flush the link on our behalf
* after having opened the display. We are now
* entering again the dispatcher so can flush
* the link explicitly.
* We let the proxy flush the link on our behalf after having opened
* the display. We are now entering again the dispatcher so can
* flush the link explicitly.
*/
#ifdef TEST
...
...
@@ -798,9 +793,8 @@ void nxagentSetReconnectError(int id, char *format, ...)
else
{
/*
* The vsnprintf() in glibc 2.0.6 would return
* -1 when the output was truncated. See section
* NOTES on printf(3).
* The vsnprintf() in glibc 2.0.6 would return -1 when the
* output was truncated. See section NOTES on printf(3).
*/
size
=
(
size
?
size
*
2
:
NXAGENT_RECONNECT_DEFAULT_MESSAGE_SIZE
);
...
...
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