xserver: Branch 'master' - 13 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Oct 30 16:22:08 UTC 2019
dix/cursor.c | 1
dix/devices.c | 1
dix/dispatch.c | 9 ---
dix/globals.c | 14 +---
dix/main.c | 8 +-
dix/pixmap.c | 1
hw/dmx/dmx-config.h | 1
hw/dmx/dmxinit.c | 5 -
hw/xfree86/common/xf86Init.c | 1
hw/xfree86/sdksyms.sh | 1
hw/xquartz/darwin.c | 1
include/Makefile.am | 1
include/dix.h | 3 -
include/input.h | 22 +++++++
include/meson.build | 1
include/opaque.h | 3 -
include/site.h | 126 -------------------------------------------
man/Xserver.man | 9 ---
os/access.c | 5 -
os/connection.c | 6 +-
os/log.c | 9 ++-
os/utils.c | 21 -------
os/xdmcp.c | 3 -
23 files changed, 48 insertions(+), 204 deletions(-)
New commits:
commit 89a9927b1e5ac416441a33b44abddf8372edfe6a
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 14:44:49 2019 -0400
include: Remove now-empty site.h
diff --git a/dix/devices.c b/dix/devices.c
index 00c453980..7bf5ac072 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -59,7 +59,6 @@ SOFTWARE.
#include "cursorstr.h"
#include "dixstruct.h"
#include "ptrveloc.h"
-#include "site.h"
#include "xkbsrv.h"
#include "privates.h"
#include "xace.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index bc44215b4..90a49dbf2 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -127,7 +127,6 @@ int ProcInitialConnection();
#include "xace.h"
#include "inputstr.h"
#include "xkbsrv.h"
-#include "site.h"
#include "client.h"
#ifdef XSERVER_DTRACE
diff --git a/dix/globals.c b/dix/globals.c
index c0779dddc..4b8b52e29 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -55,7 +55,6 @@ SOFTWARE.
#include "scrnintstr.h"
#include "input.h"
#include "dixfont.h"
-#include "site.h"
#include "dixstruct.h"
#include "os.h"
diff --git a/dix/main.c b/dix/main.c
index afae71901..bfc8addbe 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -100,7 +100,6 @@ Equipment Corporation.
#include "opaque.h"
#include "servermd.h"
#include "hotplug.h"
-#include "site.h"
#include "dixfont.h"
#include "extnsionst.h"
#include "privates.h"
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 81ac5e2d8..ad3254cb4 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -39,7 +39,6 @@ from The Open Group.
#include "dixstruct.h"
#include "gcstruct.h"
#include "servermd.h"
-#include "site.h"
#include "X11/extensions/render.h"
#include "picturestr.h"
#include "randrstr.h"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2b1d7ed96..6cc2f0b01 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -51,7 +51,6 @@
#include "servermd.h"
#include "windowstr.h"
#include "scrnintstr.h"
-#include "site.h"
#include "mi.h"
#include "dbus-core.h"
#include "systemd-logind.h"
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index e41089297..4a13ca28d 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -278,7 +278,6 @@ cat > sdksyms.c << EOF
#include "scrnintstr.h"
#include "selection.h"
#include "servermd.h"
-#include "site.h"
#include "validate.h"
#include "window.h"
#include "windowstr.h"
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 2826fd6b0..7bfbb767e 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -41,7 +41,6 @@
#include "mipointer.h" // mi software cursor
#include "micmap.h" // mi colormap code
#include "fb.h" // fb framebuffer code
-#include "site.h"
#include "globals.h"
#include "dix.h"
#include "xkbsrv.h"
diff --git a/include/Makefile.am b/include/Makefile.am
index c52734cf0..bf066a61a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -52,7 +52,6 @@ sdk_HEADERS = \
scrnintstr.h \
selection.h \
servermd.h \
- site.h \
validate.h \
displaymode.h \
window.h \
diff --git a/include/meson.build b/include/meson.build
index 661624a01..9ecfd15a4 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -470,7 +470,6 @@ if build_xorg
'scrnintstr.h',
'selection.h',
'servermd.h',
- 'site.h',
'validate.h',
'displaymode.h',
'window.h',
diff --git a/include/site.h b/include/site.h
deleted file mode 100644
index 02e33418a..000000000
--- a/include/site.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/************************************************************
-
-Copyright 1987, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-#ifndef SITE_H
-#define SITE_H
-
-/*
- * The following constants contain default values for all of the variables
- * that can be initialized on the server command line or in the environment.
- */
-
-#endif /* SITE_H */
diff --git a/os/access.c b/os/access.c
index ee432ebd5..bffb3eb6b 100644
--- a/os/access.c
+++ b/os/access.c
@@ -94,7 +94,6 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
-#include "site.h"
#include <errno.h>
#include <sys/types.h>
#ifndef WIN32
diff --git a/os/log.c b/os/log.c
index 0e5c06b2d..456f05c32 100644
--- a/os/log.c
+++ b/os/log.c
@@ -88,7 +88,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <errno.h>
#include "input.h"
-#include "site.h"
#include "opaque.h"
#ifdef WIN32
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 38f81566c..093e30096 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -43,7 +43,6 @@
#include "input.h"
#include "dixstruct.h"
#include "opaque.h"
-#include "site.h"
#define XSERV_t
#define TRANS_SERVER
commit ff4e2c24ec599ecdbd24eb181afb50f896beb46d
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 14:43:36 2019 -0400
dix: Move default screensaver defaults into globals.c
diff --git a/dix/globals.c b/dix/globals.c
index 7f5dc7c51..c0779dddc 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -93,10 +93,11 @@ CARD32 ScreenSaverInterval;
int ScreenSaverBlanking;
int ScreenSaverAllowExposures;
-CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME;
-CARD32 defaultScreenSaverInterval = DEFAULT_SCREEN_SAVER_INTERVAL;
-int defaultScreenSaverBlanking = DEFAULT_SCREEN_SAVER_BLANKING;
-int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES;
+/* default time of 10 minutes */
+CARD32 defaultScreenSaverTime = (10 * (60 * 1000));
+CARD32 defaultScreenSaverInterval = (10 * (60 * 1000));
+int defaultScreenSaverBlanking = PreferBlanking;
+int defaultScreenSaverAllowExposures = AllowExposures;
#ifdef SCREENSAVER
Bool screenSaverSuspended = FALSE;
diff --git a/include/site.h b/include/site.h
index c9dc2d202..02e33418a 100644
--- a/include/site.h
+++ b/include/site.h
@@ -51,9 +51,5 @@ SOFTWARE.
* The following constants contain default values for all of the variables
* that can be initialized on the server command line or in the environment.
*/
-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
-#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
-#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
-#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
#endif /* SITE_H */
commit 43fc5307804edc9a09e7ad8794a02b5e18c4f9db
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 14:41:20 2019 -0400
include: Move some input-related default #defines to input.h
diff --git a/include/input.h b/include/input.h
index b658e9989..e57de626d 100644
--- a/include/input.h
+++ b/include/input.h
@@ -59,6 +59,28 @@ SOFTWARE.
#include "os.h"
#include <X11/extensions/XI2.h>
+#define DEFAULT_KEYBOARD_CLICK 0
+#define DEFAULT_BELL 50
+#define DEFAULT_BELL_PITCH 400
+#define DEFAULT_BELL_DURATION 100
+#define DEFAULT_AUTOREPEAT TRUE
+#define DEFAULT_AUTOREPEATS {\
+ 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
+ 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+
+#define DEFAULT_LEDS 0x0 /* all off */
+#define DEFAULT_LEDS_MASK 0xffffffff /* 32 */
+#define DEFAULT_INT_RESOLUTION 1000
+#define DEFAULT_INT_MIN_VALUE 0
+#define DEFAULT_INT_MAX_VALUE 100
+#define DEFAULT_INT_DISPLAYED 0
+
+#define DEFAULT_PTR_NUMERATOR 2
+#define DEFAULT_PTR_DENOMINATOR 1
+#define DEFAULT_PTR_THRESHOLD 4
+
#define DEVICE_INIT 0
#define DEVICE_ON 1
#define DEVICE_OFF 2
diff --git a/include/site.h b/include/site.h
index 524b8547d..c9dc2d202 100644
--- a/include/site.h
+++ b/include/site.h
@@ -51,28 +51,6 @@ SOFTWARE.
* The following constants contain default values for all of the variables
* that can be initialized on the server command line or in the environment.
*/
-#define DEFAULT_KEYBOARD_CLICK 0
-#define DEFAULT_BELL 50
-#define DEFAULT_BELL_PITCH 400
-#define DEFAULT_BELL_DURATION 100
-#define DEFAULT_AUTOREPEAT TRUE
-#define DEFAULT_AUTOREPEATS {\
- 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
- 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-
-#define DEFAULT_LEDS 0x0 /* all off */
-#define DEFAULT_LEDS_MASK 0xffffffff /* 32 */
-#define DEFAULT_INT_RESOLUTION 1000
-#define DEFAULT_INT_MIN_VALUE 0
-#define DEFAULT_INT_MAX_VALUE 100
-#define DEFAULT_INT_DISPLAYED 0
-
-#define DEFAULT_PTR_NUMERATOR 2
-#define DEFAULT_PTR_DENOMINATOR 1
-#define DEFAULT_PTR_THRESHOLD 4
-
#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
commit 2d1ed64d2aedb1af5476ba011bbd36ddcf00c311
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 14:33:43 2019 -0400
dix: Remove -to option to set the default connection timeout
One minute is admittedly arbitrary, but again, pretty sure this never
gets set on the command line in practice.
diff --git a/dix/globals.c b/dix/globals.c
index a5d9b7eef..7f5dc7c51 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -118,5 +118,3 @@ const char *display;
int displayfd = -1;
Bool explicit_display = FALSE;
char *ConnectionInfo;
-
-CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
diff --git a/include/opaque.h b/include/opaque.h
index 043f1013d..256261c2a 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -42,7 +42,6 @@ extern _X_EXPORT volatile char dispatchException;
#define DE_TERMINATE 2
#define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */
-extern _X_EXPORT CARD32 TimeOutValue;
extern _X_EXPORT int ScreenSaverBlanking;
extern _X_EXPORT int ScreenSaverAllowExposures;
extern _X_EXPORT int defaultScreenSaverBlanking;
diff --git a/include/site.h b/include/site.h
index 67a9094ae..524b8547d 100644
--- a/include/site.h
+++ b/include/site.h
@@ -51,7 +51,6 @@ SOFTWARE.
* The following constants contain default values for all of the variables
* that can be initialized on the server command line or in the environment.
*/
-#define DEFAULT_TIMEOUT 60 /* seconds */
#define DEFAULT_KEYBOARD_CLICK 0
#define DEFAULT_BELL 50
#define DEFAULT_BELL_PITCH 400
diff --git a/man/Xserver.man b/man/Xserver.man
index 2e3fbee06..27ce83279 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -269,9 +269,6 @@ This overrides a previous
.B \-noreset
command line option.
.TP 8
-.B \-to \fIseconds\fP
-sets default connection timeout in seconds.
-.TP 8
.B \-tst
disables all testing extensions (e.g., XTEST, XTrap, XTestExtension1, RECORD).
.TP 8
diff --git a/os/connection.c b/os/connection.c
index 5a05d7a1d..a1c42aede 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -647,10 +647,10 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time)
/*****************
* EstablishNewConnections
- * If anyone is waiting on listened sockets, accept them.
- * Updates AllClients and AllSockets.
+ * If anyone is waiting on listened sockets, accept them. Drop pending
+ * connections if they've stuck around for more than one minute.
*****************/
-
+#define TimeOutValue 60 * MILLI_PER_SECOND
static void
EstablishNewConnections(int curconn, int ready, void *data)
{
diff --git a/os/utils.c b/os/utils.c
index 7c3176344..c594acc2b 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -560,7 +560,6 @@ UseMsg(void)
ErrorF("-seat string seat to run on\n");
ErrorF("-t # default pointer threshold (pixels/t)\n");
ErrorF("-terminate terminate at server reset\n");
- ErrorF("-to # connection time out\n");
ErrorF("-tst disable testing extensions\n");
ErrorF("ttyxx server started from init on /dev/ttyxx\n");
ErrorF("v video blanking for screen-saver\n");
@@ -916,12 +915,6 @@ ProcessCommandLine(int argc, char *argv[])
else if (strcmp(argv[i], "-terminate") == 0) {
dispatchExceptionAtReset = DE_TERMINATE;
}
- else if (strcmp(argv[i], "-to") == 0) {
- if (++i < argc)
- TimeOutValue = ((CARD32) atoi(argv[i])) * MILLI_PER_SECOND;
- else
- UseMsg();
- }
else if (strcmp(argv[i], "-tst") == 0) {
noTestExtensions = TRUE;
}
commit 46a275522f8692b8fc20043ec7a5e74d43448f0b
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 14:30:18 2019 -0400
xdmcp: Remove unconfigurable COMPILEDDISPLAYCLASS
diff --git a/include/site.h b/include/site.h
index 06e2c7e00..67a9094ae 100644
--- a/include/site.h
+++ b/include/site.h
@@ -51,9 +51,6 @@ SOFTWARE.
* The following constants contain default values for all of the variables
* that can be initialized on the server command line or in the environment.
*/
-#ifndef COMPILEDDISPLAYCLASS
-#define COMPILEDDISPLAYCLASS "MIT-unspecified"
-#endif
#define DEFAULT_TIMEOUT 60 /* seconds */
#define DEFAULT_KEYBOARD_CLICK 0
#define DEFAULT_BELL 50
diff --git a/os/xdmcp.c b/os/xdmcp.c
index df3312df6..38f81566c 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -62,7 +62,7 @@
#define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h>
-static const char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
+static const char *defaultDisplayClass = "MIT-unspecified";
static int xdmcpSocket, sessionSocket;
static xdmcp_states state;
commit 66eb933ec91724a351b7368cf7171adb108299fb
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 14:28:33 2019 -0400
os: Remove unconfigurable DEFAULT_ACCESS_CONTROL macro
diff --git a/include/site.h b/include/site.h
index fd8c8ceff..06e2c7e00 100644
--- a/include/site.h
+++ b/include/site.h
@@ -81,8 +81,5 @@ SOFTWARE.
#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
-#ifndef DEFAULT_ACCESS_CONTROL
-#define DEFAULT_ACCESS_CONTROL TRUE
-#endif
#endif /* SITE_H */
diff --git a/os/access.c b/os/access.c
index 97246160c..ee432ebd5 100644
--- a/os/access.c
+++ b/os/access.c
@@ -228,7 +228,7 @@ typedef struct _host {
#define FreeHost(h) free(h)
static HOST *selfhosts = NULL;
static HOST *validhosts = NULL;
-static int AccessEnabled = DEFAULT_ACCESS_CONTROL;
+static int AccessEnabled = TRUE;
static int LocalHostEnabled = FALSE;
static int LocalHostRequested = FALSE;
static int UsingXdmcp = FALSE;
@@ -951,7 +951,7 @@ ResetHosts(const char *display)
int len;
siTypesInitialize();
- AccessEnabled = defeatAccessControl ? FALSE : DEFAULT_ACCESS_CONTROL;
+ AccessEnabled = !defeatAccessControl;
LocalHostEnabled = FALSE;
while ((host = validhosts) != 0) {
validhosts = host->next;
commit 56ea4c769c2d65df2de86009e8e499f39a8a3d4d
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 14:21:06 2019 -0400
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.
diff --git a/dix/cursor.c b/dix/cursor.c
index 25d676779..a9ad34467 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -494,6 +494,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
FontPtr cursorfont;
int err;
XID fontID;
+ const char defaultCursorFont[] = "cursor";
fontID = FakeClientID(0);
err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
diff --git a/dix/globals.c b/dix/globals.c
index acd5c4412..a5d9b7eef 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -103,8 +103,6 @@ Bool screenSaverSuspended = FALSE;
#endif
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
every compilation of dix code */
CursorPtr rootCursor;
diff --git a/dix/main.c b/dix/main.c
index 16a7d6d39..afae71901 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -224,13 +224,12 @@ dix_main(int argc, char *argv[], char *envp[])
ErrorF("[dix] failed to set default font path '%s'",
defaultFontPath);
}
- if (!SetDefaultFont(defaultTextFont)) {
- FatalError("could not open default font '%s'", defaultTextFont);
+ if (!SetDefaultFont("fixed")) {
+ FatalError("could not open default font");
}
if (!(rootCursor = CreateRootCursor(NULL, 0))) {
- FatalError("could not open default cursor font '%s'",
- defaultCursorFont);
+ FatalError("could not open default cursor font");
}
#ifdef PANORAMIX
diff --git a/include/opaque.h b/include/opaque.h
index cfe0a6547..043f1013d 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -33,8 +33,6 @@ from The Open Group.
#include "globals.h"
-extern _X_EXPORT const char *defaultTextFont;
-extern _X_EXPORT const char *defaultCursorFont;
extern _X_EXPORT int LimitClients;
extern _X_EXPORT volatile char isItTimeToYield;
extern _X_EXPORT volatile char dispatchException;
diff --git a/include/site.h b/include/site.h
index 21bc0e2a2..fd8c8ceff 100644
--- a/include/site.h
+++ b/include/site.h
@@ -51,8 +51,6 @@ SOFTWARE.
* The following constants contain default values for all of the variables
* that can be initialized on the server command line or in the environment.
*/
-#define COMPILEDDEFAULTFONT "fixed"
-#define COMPILEDCURSORFONT "cursor"
#ifndef COMPILEDDISPLAYCLASS
#define COMPILEDDISPLAYCLASS "MIT-unspecified"
#endif
diff --git a/man/Xserver.man b/man/Xserver.man
index 192ae4eb4..2e3fbee06 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -164,12 +164,6 @@ a list of accepted extension names is printed.
.B \-f \fIvolume\fP
sets beep (bell) volume (allowable range: 0-100).
.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
sets the search path for fonts. This path is a comma separated list
of directories which the X server searches for font databases.
diff --git a/os/utils.c b/os/utils.c
index d1cd07ccc..7c3176344 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -526,8 +526,6 @@ UseMsg(void)
ErrorF
("-deferglyphs [none|all|16] defer loading of [no|all|16-bit] glyphs\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("-help prints message with these options\n");
ErrorF("+iglx Allow creating indirect GLX contexts\n");
@@ -775,18 +773,6 @@ ProcessCommandLine(int argc, char *argv[])
else
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) {
if (++i < argc) {
defaultFontPath = argv[i];
commit 4ebce1ed8b63decb0919146a034f0c80ac47c3cd
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 13:56:34 2019 -0400
os: Move log verbosity defaults into os/log.c
There's not any configuration knobs for this so there's no real reason
to leave them in a configgy header.
diff --git a/include/site.h b/include/site.h
index 2d997cb1b..21bc0e2a2 100644
--- a/include/site.h
+++ b/include/site.h
@@ -87,12 +87,4 @@ SOFTWARE.
#define DEFAULT_ACCESS_CONTROL TRUE
#endif
-/* Default logging parameters. */
-#ifndef DEFAULT_LOG_VERBOSITY
-#define DEFAULT_LOG_VERBOSITY 0
-#endif
-#ifndef DEFAULT_LOG_FILE_VERBOSITY
-#define DEFAULT_LOG_FILE_VERBOSITY 3
-#endif
-
#endif /* SITE_H */
diff --git a/os/log.c b/os/log.c
index fd433e62f..0e5c06b2d 100644
--- a/os/log.c
+++ b/os/log.c
@@ -108,6 +108,14 @@ OR PERFORMANCE OF THIS SOFTWARE.
void (*OsVendorVErrorFProc) (const char *, va_list args) = NULL;
#endif
+/* Default logging parameters. */
+#ifndef DEFAULT_LOG_VERBOSITY
+#define DEFAULT_LOG_VERBOSITY 0
+#endif
+#ifndef DEFAULT_LOG_FILE_VERBOSITY
+#define DEFAULT_LOG_FILE_VERBOSITY 3
+#endif
+
static FILE *logFile = NULL;
static int logFileFd = -1;
static Bool logFlush = FALSE;
commit e21371984def00b0e0b5cfc976bfd1756a2905d4
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 13:52:54 2019 -0400
include: Remove unused default value for COMPILEDDEFAULTFONTPATH
Again, we're setting this at configure time now.
diff --git a/include/site.h b/include/site.h
index bd88da934..2d997cb1b 100644
--- a/include/site.h
+++ b/include/site.h
@@ -48,18 +48,6 @@ SOFTWARE.
#define SITE_H
/*
- * The following constants are provided solely as a last line of defense. The
- * normal build ALWAYS overrides them using a special rule given in
- * server/dix/Imakefile. If you want to change either of these constants,
- * you should set the DefaultFontPath or DefaultRGBDatabase configuration
- * parameters.
- * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE!
- */
-#ifndef COMPILEDDEFAULTFONTPATH
-#define COMPILEDDEFAULTFONTPATH "/usr/share/fonts/X11/misc/"
-#endif
-
-/*
* The following constants contain default values for all of the variables
* that can be initialized on the server command line or in the environment.
*/
commit f58fee67b1730798a57629da2f496c9fa594d143
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 13:51:41 2019 -0400
include: Remove unused default value for VENDOR_RELEASE
We're always setting this in the appropriate blah-config.h now.
diff --git a/include/site.h b/include/site.h
index 9872dc983..bd88da934 100644
--- a/include/site.h
+++ b/include/site.h
@@ -48,15 +48,6 @@ SOFTWARE.
#define SITE_H
/*
- * The vendor release number identifies, for the purpose of submitting
- * traceable bug reports, the release number of software produced
- * by the vendor.
- */
-#ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE 6600
-#endif
-
-/*
* The following constants are provided solely as a last line of defense. The
* normal build ALWAYS overrides them using a special rule given in
* server/dix/Imakefile. If you want to change either of these constants,
commit 4b936ebcaaa80cc1dc1a51f110c7ecd77b06950e
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 13:51:11 2019 -0400
include: Remove unused VENDOR_STRING
diff --git a/include/site.h b/include/site.h
index 9bd8e2f12..9872dc983 100644
--- a/include/site.h
+++ b/include/site.h
@@ -46,13 +46,6 @@ SOFTWARE.
#ifndef SITE_H
#define SITE_H
-/*
- * The vendor string identifies the vendor responsible for the
- * server executable.
- */
-#ifndef VENDOR_STRING
-#define VENDOR_STRING "The X.Org Foundation"
-#endif
/*
* The vendor release number identifies, for the purpose of submitting
commit ec659f021e62338018ac09ea61c3f4baa4fdf6e2
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 13:49:13 2019 -0400
dix: Remove now-unused SetVendorString
diff --git a/dix/dispatch.c b/dix/dispatch.c
index ce84e6c8c..bc44215b4 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -536,7 +536,6 @@ Dispatch(void)
}
static int VendorRelease = VENDOR_RELEASE;
-static const char *VendorString = VENDOR_NAME;
void
SetVendorRelease(int release)
@@ -544,12 +543,6 @@ SetVendorRelease(int release)
VendorRelease = release;
}
-void
-SetVendorString(const char *vendor)
-{
- VendorString = vendor;
-}
-
Bool
CreateConnectionBlock(void)
{
@@ -561,6 +554,7 @@ CreateConnectionBlock(void)
unsigned long vid;
int i, j, k, lenofblock, sizesofar = 0;
char *pBuf;
+ const char VendorString[] = VENDOR_NAME;
memset(&setup, 0, sizeof(xConnSetup));
/* Leave off the ridBase and ridMask, these must be sent with
diff --git a/include/dix.h b/include/dix.h
index 146679b58..017be8a49 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -304,9 +304,6 @@ InitAtoms(void);
extern _X_EXPORT void
SetVendorRelease(int release);
-extern _X_EXPORT void
-SetVendorString(const char *string);
-
int
dix_main(int argc, char *argv[], char *envp[]);
commit fc671085ee52c6599005e2359930bebe6195ca83
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 16 13:42:15 2019 -0400
dmx: Stop overriding the vendor string
diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h
index c435ece2e..83a2cfbd7 100644
--- a/hw/dmx/dmx-config.h
+++ b/hw/dmx/dmx-config.h
@@ -67,7 +67,6 @@
((month) * 100) + \
((day) * 1)
#define VENDOR_RELEASE DMX_VENDOR_RELEASE(1,2,2007,4,24)
-#define VENDOR_STRING "DMX Project"
/* Enable the DMX extension */
#define DMXEXT
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index f80e58666..07f147ceb 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -569,11 +569,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
year += 2000;
dmxLog(dmxInfo, "Generation: %lu\n", dmxGeneration);
- dmxLog(dmxInfo, "DMX version: %d.%d.%02d%02d%02d (%s)\n",
- major, minor, year, month, day, VENDOR_STRING);
+ dmxLog(dmxInfo, "DMX version: %d.%d.%02d%02d%02d\n",
+ major, minor, year, month, day);
SetVendorRelease(VENDOR_RELEASE);
- SetVendorString(VENDOR_STRING);
dmxLog(dmxInfo, "MAXSCREENS: %d\n", MAXSCREENS);
More information about the xorg-commit
mailing list