Skip to content

Pr/improve option handling #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: 3.6.x
Choose a base branch
from
Open

Pr/improve option handling #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
32c8bd8
Args.c: Fix warnings containing function name
uli42 Nov 19, 2017
e4b1348
Args.c: re-use name variable for warnings
uli42 Nov 19, 2017
19142bd
Args.c: remove variable validation
uli42 Nov 19, 2017
e6f7dce
Args.c: do not use [] for warnings
uli42 Nov 19, 2017
1011895
Args.c: shorten string allocations and abort on failure
uli42 Nov 19, 2017
2ee5b55
Args.c: formatting and whitespace improvements
uli42 Nov 19, 2017
5c0345f
Args.c: swap comparison order
uli42 Nov 19, 2017
426cd2f
Args.c, Binder.c: replace deprecated (r)index() by str(r)chr()
uli42 Nov 19, 2017
19ef57d
Args.c: use char '\0' instead of 0 where appropriate
uli42 Nov 20, 2017
dda7d42
hw/nxagent: make nxagentVerbose a Boolean
uli42 Nov 20, 2017
ea9a206
Args.c: add some comments and FIXMEs
uli42 Nov 20, 2017
e187f54
Args.c: do not handle -options twice
uli42 Nov 20, 2017
1e89e2b
nxagent manpage: add copysize option
uli42 Nov 21, 2017
19126af
Args.c: drop 255 byte limit for -keyboard option
uli42 Nov 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
471 changes: 161 additions & 310 deletions nx-X11/programs/Xserver/hw/nxagent/Args.c
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions nx-X11/programs/Xserver/hw/nxagent/Binder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int nxagentCheckBinder(int argc, char *argv[], int i)
* the -B switch.
*/

found = rindex(display, ':');
found = strrchr(display, ':');

if (found == NULL || *(found + 1) == '\0' ||
isdigit(*(found + 1)) == 0)
Expand Down Expand Up @@ -91,7 +91,7 @@ int nxagentCheckBinder(int argc, char *argv[], int i)
return 0;
}

found = rindex(display, ':');
found = strrchr(display, ':');

if (found == NULL || *(found + 1) == '\0' ||
isdigit(*(found + 1)) == 0 || atoi(found + 1) != port)
Expand Down
2 changes: 1 addition & 1 deletion nx-X11/programs/Xserver/hw/nxagent/Error.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp);

int nxagentErrorHandler(Display *dpy, XErrorEvent *event)
{
if (nxagentVerbose == 1)
if (nxagentVerbose == True)
{
nxagentPrintError(dpy, event, stderr);
}
Expand Down
2 changes: 1 addition & 1 deletion nx-X11/programs/Xserver/hw/nxagent/Error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#define NXAGENTCLIENTSLOGNAMELENGTH 256
extern char nxagentClientsLogName[NXAGENTCLIENTSLOGNAMELENGTH];

extern char nxagentVerbose;
extern Bool nxagentVerbose;

int nxagentErrorHandler(Display *dpy, XErrorEvent *event);

Expand Down
2 changes: 1 addition & 1 deletion nx-X11/programs/Xserver/hw/nxagent/Events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1923,7 +1923,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was
if (nxagentExposeQueue.exposures[nxagentExposeQueue.start].serial != X.xconfigure.x)
{
#ifdef WARNING
if (nxagentVerbose == 1)
if (nxagentVerbose == True)
{
fprintf(stderr, "nxagentDispatchEvents: Requested ConfigureNotify changes didn't take place.\n");
}
Expand Down
4 changes: 2 additions & 2 deletions nx-X11/programs/Xserver/hw/nxagent/Font.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
if (numFontFields <= FIELDS)
{
#ifdef WARNING
if (nxagentVerbose == 1)
if (nxagentVerbose == True)
{
fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Font name in non standard format. \n");
}
Expand Down Expand Up @@ -844,7 +844,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
}

#ifdef WARNING
if (nxagentVerbose == 1)
if (nxagentVerbose == True)
{
fprintf(stderr, "nxagentLoadBestQueryFont: WARNING! Failed to load font '%s'. Replacing with '%s'.\n",
fontName, substFontBuf);
Expand Down
4 changes: 2 additions & 2 deletions nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ Bool nxagentReconnectSession(void)
if (nxagentResetKeyboard() == 0)
{
#ifdef WARNING
if (nxagentVerbose == 1)
if (nxagentVerbose == True)
{
fprintf(stderr, "nxagentReconnectSession: Failed to reset keyboard device.\n");
}
Expand Down Expand Up @@ -693,7 +693,7 @@ Bool nxagentReconnectSession(void)
if (*nxagentGetReconnectError() == '\0')
{
#ifdef WARNING
if (nxagentVerbose == 1)
if (nxagentVerbose == True)
{
fprintf(stderr, "nxagentReconnectSession: WARNING! The reconnect error message is not set. Failed step is [%d].\n",
failedStep);
Expand Down
4 changes: 4 additions & 0 deletions nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,10 @@ enable using shared memory
.B shpix=<bool>
enable shared pixmaps support
.TP 8
.B copysize=<int>
limit to the amount of data that can be pasted from an NX session into
an external application. Default is unlimited.
.TP 8
.B client=<string>
type of connecting operating system (supported: \fIlinux\fR,
\fIwindows\fR, \fIsolaris\fR and \fImacosx\fR)
Expand Down