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
b6669955
Unverified
Commit
b6669955
authored
Jan 16, 2021
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'uli42-pr/various6' into 3.6.x
Attributes GH PR #979:
https://github.com/ArcticaProject/nx-libs/pull/979
parents
3523d15e
97a69b95
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
51 additions
and
42 deletions
+51
-42
Args.c
nx-X11/programs/Xserver/hw/nxagent/Args.c
+1
-1
Atoms.h
nx-X11/programs/Xserver/hw/nxagent/Atoms.h
+1
-1
Client.h
nx-X11/programs/Xserver/hw/nxagent/Client.h
+5
-2
Display.c
nx-X11/programs/Xserver/hw/nxagent/Display.c
+11
-12
Events.c
nx-X11/programs/Xserver/hw/nxagent/Events.c
+0
-2
GC.c
nx-X11/programs/Xserver/hw/nxagent/GC.c
+1
-1
Handlers.c
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+5
-2
NXdispatch.c
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+0
-1
NXpicture.c
nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+6
-7
Rootless.c
nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+1
-1
Screen.c
nx-X11/programs/Xserver/hw/nxagent/Screen.c
+2
-2
Split.c
nx-X11/programs/Xserver/hw/nxagent/Split.c
+1
-1
Window.c
nx-X11/programs/Xserver/hw/nxagent/Window.c
+2
-4
nxagent.1
nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+11
-1
NX.h
nxcomp/include/NX.h
+1
-1
Control.h
nxcomp/src/Control.h
+1
-1
Message.h
nxcomp/src/Message.h
+1
-1
nxproxy.1
nxproxy/man/nxproxy.1
+1
-1
No files found.
nx-X11/programs/Xserver/hw/nxagent/Args.c
View file @
b6669955
...
...
@@ -2319,7 +2319,7 @@ void nxagentSetDeferLevel(void)
nxagentChangeOption
(
Streaming
,
False
);
}
switch
(
nxagentOption
(
LinkType
))
switch
(
nxagentOption
(
LinkType
))
{
case
LINK_TYPE_MODEM
:
case
LINK_TYPE_ISDN
:
{
deferLevel
=
2
;
tileWidth
=
64
;
tileHeight
=
64
;
break
;
}
...
...
nx-X11/programs/Xserver/hw/nxagent/Atoms.h
View file @
b6669955
...
...
@@ -58,7 +58,7 @@ void nxagentWMDetect(void);
#ifdef XlibAtom
/*
* only provide these protoypes if the including file knows about Xlib
* only provide these proto
t
ypes if the including file knows about Xlib
* types. This allows us including Atoms.h without having to use the
* Xlib type magic of Agent.h
*/
...
...
nx-X11/programs/Xserver/hw/nxagent/Client.h
View file @
b6669955
...
...
@@ -44,10 +44,15 @@ enum ClientHint
JAVA_WINDOW
};
/* client byte counting is currently unused */
#undef COUNT_CLIENT_BYTES
typedef
struct
_PrivClientRec
{
int
clientState
;
#ifdef COUNT_CLIENT_BYTES
long
clientBytes
;
#endif
enum
ClientHint
clientHint
;
char
*
clientInfoString
;
}
PrivClientRec
;
...
...
@@ -59,8 +64,6 @@ extern int nxagentClientPrivateIndex;
extern
void
nxagentClientStateCallback
(
CallbackListPtr
*
callbacks
,
void
*
data
,
void
*
args
);
#undef COUNT_CLIENT_BYTES
#ifdef COUNT_CLIENT_BYTES
#define nxagentClientAddBytes(pClient, size) \
(nxagentClientPriv(pClient) -> clientBytes += (size))
...
...
nx-X11/programs/Xserver/hw/nxagent/Display.c
View file @
b6669955
...
...
@@ -758,18 +758,17 @@ static void nxagentDisplayFlushHandler(Display *disp, int length)
}
/*
* From the changelog for nx-X11-3.0.0-4:
* "Added the _NXDisplayErrorPredicate function in XlibInt.c. It is
* actually a pointer to a function called whenever Xlib is going to
* perform a network operation. If the function returns true, the
* call will be aborted and Xlib will return the control to the ap-
* plication. It is up to the application to set the XlibDisplayIO-
* Error flag after the _NXDisplayErrorPredicate returns true. The
* function can be used to activate additional checks, besides the
* normal failures detected by Xlib on the display socket. For exam-
* ple, the application can set the funciton to verify if an inter-
* rupt was received or if any other event occurred mandating the
+ end of the session."
* From the changelog for nx-X11-3.0.0-4: "Added the
* _NXDisplayErrorPredicate function in XlibInt.c. It is actually a
* pointer to a function called whenever Xlib is going to perform a
* network operation. If the function returns true, the call will be
* aborted and Xlib will return the control to the application. It is
* up to the application to set the XlibDisplayIO- Error flag after
* the _NXDisplayErrorPredicate returns true. The function can be used
* to activate additional checks, besides the normal failures detected
* by Xlib on the display socket. For example, the application can set
* the function to verify if an interrupt was received or if any other
* event occurred mandating the end of the session."
*/
static
int
nxagentDisplayErrorPredicate
(
Display
*
disp
,
int
error
)
{
...
...
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @
b6669955
...
...
@@ -131,8 +131,6 @@
extern
Bool
nxagentOnce
;
extern
WindowPtr
nxagentRootTileWindow
;
extern
int
nxagentLastClipboardClient
;
#ifdef NX_DEBUG_INPUT
...
...
nx-X11/programs/Xserver/hw/nxagent/GC.c
View file @
b6669955
...
...
@@ -1127,7 +1127,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects)
/*
* Originally, the clip origin area were 0,0 but it didn't
* work with kedit and family, because it got the clip mask of
* the pixmap all traslated.
* the pixmap all tra
n
slated.
*/
XSetClipRectangles
(
nxagentDisplay
,
nxagentGC
(
pGC
),
pGC
->
clipOrg
.
x
,
pGC
->
clipOrg
.
y
,
...
...
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
View file @
b6669955
...
...
@@ -123,6 +123,9 @@ Bool nxagentXdmcpAlertUp = False;
int
nxagentBuffer
;
Bool
nxagentBlocking
;
/* FIXME: nxagentCongestion is checked as a Boolean and as an Integer
(>= 4) at the same time which is weird at least */
int
nxagentCongestion
;
double
nxagentBytesIn
;
...
...
@@ -1017,7 +1020,7 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
nxagentDispatch
.
in
=
nxagentBytesIn
;
nxagentDispatch
.
out
=
nxagentBytesOut
;
isItTimeToYield
=
1
;
isItTimeToYield
=
TRUE
;
}
#ifdef DEBUG
else
...
...
@@ -1126,7 +1129,7 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
nxagentDispatch
.
in
=
nxagentBytesIn
;
nxagentDispatch
.
out
=
nxagentBytesOut
;
isItTimeToYield
=
1
;
isItTimeToYield
=
TRUE
;
}
#ifdef DEBUG
else
...
...
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
View file @
b6669955
...
...
@@ -581,7 +581,6 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
}
saveAgentState
(
"TERMINATED"
);
nxagentFreeAtomMap
();
nxagentFreeFontData
();
#endif
/* NXAGENT_SERVER */
...
...
nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
View file @
b6669955
...
...
@@ -531,13 +531,12 @@ void nxagentReconnectPictFormat(void *p0, XID x1, void *p2)
}
/*
* The set of picture formats may change considerably
* between different X servers. This poses a problem
* while migrating NX sessions, because a requisite to
* successfully reconnect the session is that all pic-
* ture formats have to be available on the new X server.
* To reduce such problems, we use a limited set of
* pictures available on the most X servers.
* The set of picture formats may change considerably between
* different X servers. This poses a problem while migrating NX
* sessions, because a requisite to successfully reconnect the session
* is that all picture formats have to be available on the new X
* server. To reduce such problems, we use a limited set of pictures
* available on the most X servers.
*/
void
nxagentPictureCreateDefaultFormats
(
ScreenPtr
pScreen
,
FormatInitRec
*
formats
,
int
*
nformats
)
...
...
nx-X11/programs/Xserver/hw/nxagent/Rootless.c
View file @
b6669955
...
...
@@ -1244,7 +1244,7 @@ void nxagentFreePropertyList(void)
/*
* We are trying to distinguish notifications generated by an external
* client from those gen
a
rated by our own requests.
* client from those gen
e
rated by our own requests.
*/
Bool
nxagentNotifyMatchChangeProperty
(
void
*
p
)
...
...
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @
b6669955
...
...
@@ -2514,9 +2514,9 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
if
(
nxagentKeyboard
!=
NULL
)
{
int
i
;
for
(
i
=
0
;
nxagentKeyboard
[
i
]
!=
'/'
&&
nxagentKeyboard
[
i
]
!=
0
;
i
++
);
for
(
i
=
0
;
nxagentKeyboard
[
i
]
!=
'/'
&&
nxagentKeyboard
[
i
]
!=
'\0'
;
i
++
);
if
(
nxagentKeyboard
[
i
]
==
0
||
nxagentKeyboard
[
i
+
1
]
==
0
||
i
==
0
)
if
(
nxagentKeyboard
[
i
]
==
'\0'
||
nxagentKeyboard
[
i
+
1
]
==
'\0'
||
i
==
0
)
{
#ifdef WARNING
fprintf
(
stderr
,
"WARNING! Wrong keyboard type: %s.
\n
"
,
nxagentKeyboard
);
...
...
nx-X11/programs/Xserver/hw/nxagent/Split.c
View file @
b6669955
...
...
@@ -112,7 +112,7 @@ SplitResourcePtr nxagentAllocSplitResource(void)
fprintf
(
stderr
,
"nxagentAllocSplitResource: PANIC! No more resources for the next split.
\n
"
);
#endif
/*
FIXME: Must deal with the case all resources are exausted.
FIXME: Must deal with the case all resources are ex
h
austed.
*/
FatalError
(
"nxagentAllocSplitResource: PANIC! No more resources for the next split.
\n
"
);
}
...
...
nx-X11/programs/Xserver/hw/nxagent/Window.c
View file @
b6669955
...
...
@@ -110,8 +110,6 @@ extern WindowPtr nxagentViewportFrameRight;
extern
WindowPtr
nxagentViewportFrameAbove
;
extern
WindowPtr
nxagentViewportFrameBelow
;
extern
WindowPtr
nxagentRootTileWindow
;
extern
Bool
nxagentReportPrivateWindowIds
;
#define RECTLIMIT 25
...
...
@@ -1532,7 +1530,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
* position in the window tree, and pPriorParent is its previous
* parent. This function can be NULL.
*
* We simply pass this
p
ver to the real X server.
* We simply pass this
o
ver to the real X server.
*/
void
nxagentReparentWindow
(
WindowPtr
pWin
,
WindowPtr
pOldParent
)
{
...
...
@@ -3907,7 +3905,7 @@ StoringPixmapPtr nxagentFindItemBSPixmapList(unsigned long pixmapId)
}
}
#ifdef
WARNING
#ifdef
TEST
fprintf
(
stderr
,
"%s: WARNING! Item not found.
\n
"
,
__func__
);
#endif
...
...
nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
View file @
b6669955
...
...
@@ -539,7 +539,9 @@ allowed to change the keyboard settings through XKEYBOARD.
.TP 8
.B \-tile WxH
maximum size of the tile used when sending an image to the remote
display (minimum allowed: 32x32; no default)
display (minimum allowed: 32x32). The default depends on the link
type: 64x64 for \fImodem\fR and \fIisdn\fR, 4096x4096 for all other
link types)
.TP 8
.B \-irlimit
maximum image data rate to the encoder input in kB/s. The default is no limit.
...
...
@@ -755,21 +757,29 @@ The default value can be set via the command line (\-defer). The value
provided as nx/nx option is set when resuming a session, thus it
overrides the command line default.
The default depends on the link type (see man nxproxy).
Each defer level adds the following rules to the previous ones:
.RS 8
.TP 8
.I 0
Eager encoding.
Default for link speed \fIlan\fR and \fIlocal\fR.
.TP 8
.I 1
No data is put or copied on pixmaps, marking them always as corrupted
and synchronizing them on demand, i.e. when a copy area to a window is
requested, the source is synchronized before copying it.
Default for link speed \fIwan\fR.
.TP 8
.I 2
The put images over the windows are skipped marking the destination as
corrupted. The same happens for copy area and composite operations,
spreading the corrupted regions of involved drawables.
Default for link speed \fIadsl\fR, \fIisdn\fR and \fImodem\fR.
.RE
.TP 8
...
...
nxcomp/include/NX.h
View file @
b6669955
...
...
@@ -342,7 +342,7 @@ extern int NXTransFlush(int fd);
* connection.
*
* NX_CHANNEL_SLAVE: The channel will forward data to a remote slave
* command (see NX_SLAVE_CMD env
ri
onment variable)
* command (see NX_SLAVE_CMD env
ir
onment variable)
*
* Only a proxy running at the NX server/X client side will be able
* to create a X, CUPS, SMB, MEDIA and HTTP channel. A proxy running
...
...
nxcomp/src/Control.h
View file @
b6669955
...
...
@@ -144,7 +144,7 @@ class Control
T_session_mode
SessionMode
;
//
// Either immediate or def
f
erred flushes.
// Either immediate or deferred flushes.
//
T_flush_policy
FlushPolicy
;
...
...
nxcomp/src/Message.h
View file @
b6669955
...
...
@@ -566,7 +566,7 @@ class MessageStore
// it can contain valid data that must be
// explicitly deallocated if not needed.
// Note also that you cannot count on the
// initialization made in costructor.
// initialization made in co
n
structor.
//
temporary_
=
message
;
...
...
nxproxy/man/nxproxy.1
View file @
b6669955
...
...
@@ -109,7 +109,7 @@ Remote port used for the connection.
.TP 8
.B retry=<int>
Number of connection atempts.
Number of connection at
t
empts.
.TP 8
.B root=<string>
...
...
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