Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions nx-X11/programs/Xserver/hw/nxagent/Args.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ char nxagentDialogName[256];
char nxagentSessionId[256] = {0};
char *nxagentOptionFile;

Bool nxagentFullGeneration = False;
int nxagentDefaultClass = TrueColor;
Bool nxagentUserDefaultClass = False;
int nxagentDefaultDepth;
Expand Down Expand Up @@ -410,11 +409,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 1;
}

if (!strcmp(argv[i], "-full")) {
nxagentFullGeneration = True;
return 1;
}

if (!strcmp(argv[i], "-class")) {
if (++i < argc) {
if (!strcmp(argv[i], "StaticGray")) {
Expand Down Expand Up @@ -2081,7 +2075,6 @@ void ddxUseMsg()
{
ErrorF("-display string display name of the real server\n");
ErrorF("-sync synchronize with the real server\n");
ErrorF("-full utilize full regeneration\n");
ErrorF("-class string default visual class\n");
ErrorF("-depth int default depth\n");
ErrorF("-geometry WxH+X+Y window size and position\n");
Expand Down
1 change: 0 additions & 1 deletion nx-X11/programs/Xserver/hw/nxagent/Args.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ extern char nxagentDialogName[];

extern Bool nxagentSynchronize;
extern Bool nxagentRealWindowProp;
extern Bool nxagentFullGeneration;
extern int nxagentDefaultClass;
extern Bool nxagentUserDefaultClass;
extern int nxagentDefaultDepth;
Expand Down
14 changes: 4 additions & 10 deletions nx-X11/programs/Xserver/hw/nxagent/Display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1126,8 +1126,6 @@ void nxagentOpenDisplay(int argc, char *argv[])
{
int i;

if (!nxagentDoFullGeneration) return;

#ifdef NXAGENT_TIMESTAMP

startTime = GetTimeInMillis();
Expand Down Expand Up @@ -1744,21 +1742,17 @@ void nxagentSetDefaultDrawables()
void nxagentCloseDisplay()
{
#ifdef TEST
fprintf(stderr, "nxagentCloseDisplay: Called with full generation [%d] and display [%p].\n",
nxagentDoFullGeneration, (void *) nxagentDisplay);
fprintf(stderr, "nxagentCloseDisplay: Called with display [%p].\n", (void *) nxagentDisplay);
#endif

if (nxagentDoFullGeneration == 0 ||
nxagentDisplay == NULL)
if (nxagentDisplay == NULL)
{
return;
}

/*
* If nxagentDoFullGeneration is true, all
* the X resources will be destroyed upon
* closing the display connection, so there
* is no real need to generate additional
* All the X resources will be destroyed upon closing the display
* connection, so there is no real need to generate additional
* traffic
*/

Expand Down
3 changes: 1 addition & 2 deletions nx-X11/programs/Xserver/hw/nxagent/Font.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ static struct _nxagentFailedToReconnectFonts
} nxagentFailedToReconnectFonts = {NULL, NULL, 0, 0};

/*
* This is used if nxagentFullGeneration is true
* in CloseDisplay().
* This is used in CloseDisplay().
*/

void nxagentFreeFontCache(void)
Expand Down
20 changes: 0 additions & 20 deletions nx-X11/programs/Xserver/hw/nxagent/Init.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,22 +169,6 @@ FIXME: These, if not removed, should at least
int nxagentBackingStore;
int nxagentSaveUnder;

/*
* This is true at startup and set to the value of
* nxagentFullGeneration at the end of InitInput.
*
* InitOutput
* nxagentOpenDisplay (if nxagentDoFullGeneration)
* nxagentCloseDisplay (if (nxagentDoFullGeneration && nxagentDisplay))
* nxagentFree*
* nxagentListRemoteFonts
* AddScreen
* nxagentOpenScreen
* InitInput
*/

int nxagentDoFullGeneration = 1;

/*
* 1 if agent running as X2goAgent
* 0 if NX Agent
Expand Down Expand Up @@ -404,8 +388,6 @@ FIXME: These variables, if not removed at all because have probably

nxagentAllocateGraphicContexts();

nxagentDoFullGeneration = nxagentFullGeneration;

/*
* Use a solid black root window
* background.
Expand Down Expand Up @@ -475,8 +457,6 @@ void InitInput(argc, argv)

void AbortDDX()
{
nxagentDoFullGeneration = True;

nxagentCloseDisplay();

/*
Expand Down
2 changes: 0 additions & 2 deletions nx-X11/programs/Xserver/hw/nxagent/Init.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ is" without express or implied warranty.
#ifndef __Init_H__
#define __Init_H__

extern int nxagentDoFullGeneration;

extern int nxagentBackingStore;
extern int nxagentSaveUnder;

Expand Down
3 changes: 1 addition & 2 deletions nx-X11/programs/Xserver/hw/nxagent/Screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -1660,8 +1660,7 @@ N/A
nxagentPrintAgentGeometry(NULL, "nxagentOpenScreen:");
#endif

if (nxagentDoFullGeneration == 1 ||
nxagentReconnectTrap == 1)
if (nxagentReconnectTrap == 1)
{
valuemask = CWBackPixel | CWEventMask | CWColormap |
(nxagentOption(AllScreens) == 1 ? CWOverrideRedirect : 0);
Expand Down