dix: Remove -fn and -fc options to set default text/cursor fonts
I strongly suspect these never get used in the wild, and it's not an especially useful thing to do in any case.
This commit is contained in:
parent
4ebce1ed8b
commit
56ea4c769c
|
@ -494,6 +494,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
|
||||||
FontPtr cursorfont;
|
FontPtr cursorfont;
|
||||||
int err;
|
int err;
|
||||||
XID fontID;
|
XID fontID;
|
||||||
|
const char defaultCursorFont[] = "cursor";
|
||||||
|
|
||||||
fontID = FakeClientID(0);
|
fontID = FakeClientID(0);
|
||||||
err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
|
err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
|
||||||
|
|
|
@ -103,8 +103,6 @@ Bool screenSaverSuspended = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
|
const char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
|
||||||
const char *defaultTextFont = COMPILEDDEFAULTFONT;
|
|
||||||
const char *defaultCursorFont = COMPILEDCURSORFONT;
|
|
||||||
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
|
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
|
||||||
every compilation of dix code */
|
every compilation of dix code */
|
||||||
CursorPtr rootCursor;
|
CursorPtr rootCursor;
|
||||||
|
|
|
@ -224,13 +224,12 @@ dix_main(int argc, char *argv[], char *envp[])
|
||||||
ErrorF("[dix] failed to set default font path '%s'",
|
ErrorF("[dix] failed to set default font path '%s'",
|
||||||
defaultFontPath);
|
defaultFontPath);
|
||||||
}
|
}
|
||||||
if (!SetDefaultFont(defaultTextFont)) {
|
if (!SetDefaultFont("fixed")) {
|
||||||
FatalError("could not open default font '%s'", defaultTextFont);
|
FatalError("could not open default font");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(rootCursor = CreateRootCursor(NULL, 0))) {
|
if (!(rootCursor = CreateRootCursor(NULL, 0))) {
|
||||||
FatalError("could not open default cursor font '%s'",
|
FatalError("could not open default cursor font");
|
||||||
defaultCursorFont);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
|
|
|
@ -33,8 +33,6 @@ from The Open Group.
|
||||||
|
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
||||||
extern _X_EXPORT const char *defaultTextFont;
|
|
||||||
extern _X_EXPORT const char *defaultCursorFont;
|
|
||||||
extern _X_EXPORT int LimitClients;
|
extern _X_EXPORT int LimitClients;
|
||||||
extern _X_EXPORT volatile char isItTimeToYield;
|
extern _X_EXPORT volatile char isItTimeToYield;
|
||||||
extern _X_EXPORT volatile char dispatchException;
|
extern _X_EXPORT volatile char dispatchException;
|
||||||
|
|
|
@ -51,8 +51,6 @@ SOFTWARE.
|
||||||
* The following constants contain default values for all of the variables
|
* The following constants contain default values for all of the variables
|
||||||
* that can be initialized on the server command line or in the environment.
|
* that can be initialized on the server command line or in the environment.
|
||||||
*/
|
*/
|
||||||
#define COMPILEDDEFAULTFONT "fixed"
|
|
||||||
#define COMPILEDCURSORFONT "cursor"
|
|
||||||
#ifndef COMPILEDDISPLAYCLASS
|
#ifndef COMPILEDDISPLAYCLASS
|
||||||
#define COMPILEDDISPLAYCLASS "MIT-unspecified"
|
#define COMPILEDDISPLAYCLASS "MIT-unspecified"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -164,12 +164,6 @@ a list of accepted extension names is printed.
|
||||||
.B \-f \fIvolume\fP
|
.B \-f \fIvolume\fP
|
||||||
sets beep (bell) volume (allowable range: 0-100).
|
sets beep (bell) volume (allowable range: 0-100).
|
||||||
.TP 8
|
.TP 8
|
||||||
.B \-fc \fIcursorFont\fP
|
|
||||||
sets default cursor font.
|
|
||||||
.TP 8
|
|
||||||
.B \-fn \fIfont\fP
|
|
||||||
sets the default font.
|
|
||||||
.TP 8
|
|
||||||
.B \-fp \fIfontPath\fP
|
.B \-fp \fIfontPath\fP
|
||||||
sets the search path for fonts. This path is a comma separated list
|
sets the search path for fonts. This path is a comma separated list
|
||||||
of directories which the X server searches for font databases.
|
of directories which the X server searches for font databases.
|
||||||
|
|
14
os/utils.c
14
os/utils.c
|
@ -526,8 +526,6 @@ UseMsg(void)
|
||||||
ErrorF
|
ErrorF
|
||||||
("-deferglyphs [none|all|16] defer loading of [no|all|16-bit] glyphs\n");
|
("-deferglyphs [none|all|16] defer loading of [no|all|16-bit] glyphs\n");
|
||||||
ErrorF("-f # bell base (0-100)\n");
|
ErrorF("-f # bell base (0-100)\n");
|
||||||
ErrorF("-fc string cursor font\n");
|
|
||||||
ErrorF("-fn string default font name\n");
|
|
||||||
ErrorF("-fp string default font path\n");
|
ErrorF("-fp string default font path\n");
|
||||||
ErrorF("-help prints message with these options\n");
|
ErrorF("-help prints message with these options\n");
|
||||||
ErrorF("+iglx Allow creating indirect GLX contexts\n");
|
ErrorF("+iglx Allow creating indirect GLX contexts\n");
|
||||||
|
@ -775,18 +773,6 @@ ProcessCommandLine(int argc, char *argv[])
|
||||||
else
|
else
|
||||||
UseMsg();
|
UseMsg();
|
||||||
}
|
}
|
||||||
else if (strcmp(argv[i], "-fc") == 0) {
|
|
||||||
if (++i < argc)
|
|
||||||
defaultCursorFont = argv[i];
|
|
||||||
else
|
|
||||||
UseMsg();
|
|
||||||
}
|
|
||||||
else if (strcmp(argv[i], "-fn") == 0) {
|
|
||||||
if (++i < argc)
|
|
||||||
defaultTextFont = argv[i];
|
|
||||||
else
|
|
||||||
UseMsg();
|
|
||||||
}
|
|
||||||
else if (strcmp(argv[i], "-fp") == 0) {
|
else if (strcmp(argv[i], "-fp") == 0) {
|
||||||
if (++i < argc) {
|
if (++i < argc) {
|
||||||
defaultFontPath = argv[i];
|
defaultFontPath = argv[i];
|
||||||
|
|
Loading…
Reference in New Issue