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
f4adcbc5
Commit
f4adcbc5
authored
Dec 30, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
Jan 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nxagent: make nxagentUserDefinedFontPath a Boolean
parent
fbc4a915
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Args.c
nx-X11/programs/Xserver/hw/nxagent/Args.c
+2
-2
Args.h
nx-X11/programs/Xserver/hw/nxagent/Args.h
+1
-1
Init.c
nx-X11/programs/Xserver/hw/nxagent/Init.c
+1
-1
No files found.
nx-X11/programs/Xserver/hw/nxagent/Args.c
View file @
f4adcbc5
...
@@ -116,7 +116,7 @@ is" without express or implied warranty.
...
@@ -116,7 +116,7 @@ is" without express or implied warranty.
#undef DISABLE_SMART_SCHEDULE
#undef DISABLE_SMART_SCHEDULE
int
nxagentUserDefinedFontPath
=
0
;
Bool
nxagentUserDefinedFontPath
=
False
;
/*
/*
* From X11/ImUtil.c.
* From X11/ImUtil.c.
...
@@ -558,7 +558,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
...
@@ -558,7 +558,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
fprintf
(
stderr
,
"ddxProcessArgument: User defined font path [%s].
\n
"
,
argv
[
i
]);
fprintf
(
stderr
,
"ddxProcessArgument: User defined font path [%s].
\n
"
,
argv
[
i
]);
#endif
#endif
nxagentUserDefinedFontPath
=
1
;
nxagentUserDefinedFontPath
=
True
;
defaultFontPath
=
argv
[
i
];
defaultFontPath
=
argv
[
i
];
}
}
else
else
...
...
nx-X11/programs/Xserver/hw/nxagent/Args.h
View file @
f4adcbc5
...
@@ -97,7 +97,7 @@ void nxagentSetCoalescence(void);
...
@@ -97,7 +97,7 @@ void nxagentSetCoalescence(void);
void
nxagentShowVersionInfo
(
void
);
void
nxagentShowVersionInfo
(
void
);
extern
int
nxagentUserDefinedFontPath
;
extern
Bool
nxagentUserDefinedFontPath
;
extern
int
nxagentRemoteMajor
;
extern
int
nxagentRemoteMajor
;
...
...
nx-X11/programs/Xserver/hw/nxagent/Init.c
View file @
f4adcbc5
...
@@ -251,7 +251,7 @@ void InitOutput(ScreenInfo *scrInfo, int argc, char *argv[])
...
@@ -251,7 +251,7 @@ void InitOutput(ScreenInfo *scrInfo, int argc, char *argv[])
AddCallback
(
&
ServerGrabCallback
,
nxagentGrabServerCallback
,
NULL
);
AddCallback
(
&
ServerGrabCallback
,
nxagentGrabServerCallback
,
NULL
);
}
}
if
(
nxagentUserDefinedFontPath
==
0
)
if
(
!
nxagentUserDefinedFontPath
)
{
{
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"InitOutput: Calling nxagentVerifyDefaultFontPath.
\n
"
);
fprintf
(
stderr
,
"InitOutput: Calling nxagentVerifyDefaultFontPath.
\n
"
);
...
...
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