xserver: Branch 'master' - 4 commits

Alan Coopersmith alanc at kemper.freedesktop.org
Tue Dec 2 14:36:22 PST 2008 

 hw/dmx/input/Makefile.am       |    1 +
 hw/xfree86/Makefile.am         |    1 +
 hw/xfree86/common/xf86Config.c |    7 -------
 hw/xfree86/common/xf86Init.c   |   10 +++++-----
 hw/xfree86/xorgconf.cpp        |   31 +++++++++++--------------------
 5 files changed, 18 insertions(+), 32 deletions(-)

New commits:
commit 4a61ad427c634bcc38a31ce0f14ff5c2d3f706c7
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 2 14:35:45 2008 -0800

    Update sample xorg.conf file

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 98d7ec8..09ee350 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -95,6 +95,7 @@ optionsdir = $(libdir)/X11
 dist_options_DATA = Options
 
 CPP_FILES_FLAGS = \
+	$(MANDEFS) \
 	-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
 	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
 	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
index acf90f1..d880180 100644
--- a/hw/xfree86/xorgconf.cpp
+++ b/hw/xfree86/xorgconf.cpp
@@ -1,4 +1,3 @@
-XCOMM $XdotOrg$
 XCOMM
 XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc.
 XCOMM
@@ -29,15 +28,15 @@ XCOMM $XConsortium: XF86Conf.cpp /main/22 1996/10/23 11:43:51 kaleb $
 
 XCOMM **********************************************************************
 XCOMM This is a sample configuration file only, intended to illustrate
-XCOMM what a config file might look like.  Refer to the XF86Config(4/5)
-XCOMM man page for details about the format of this file. This man page
-XCOMM is installed as MANPAGE 
+XCOMM what a config file might look like.  Refer to the __xconfigfile__(__filemansuffix__)
+XCOMM man page for details about the format of this file. 
 XCOMM **********************************************************************
 
-XCOMM The ordering of sections is not important in version 4.0 and later.
+XCOMM The ordering of sections is not important in XFree86 4.0 and later,
+XCOMM nor in any Xorg release.
 
 XCOMM **********************************************************************
-XCOMM Files section.  This allows default font and rgb paths to be set
+XCOMM Files section.  This allows default font and module paths to be set
 XCOMM **********************************************************************
 
 Section "Files"
@@ -98,18 +97,18 @@ XCOMM provide a better stack trace in the core dump to aid in debugging
 
 XCOMM    Option	"NoTrapSignals"
 
-XCOMM Uncomment this to disable the <Crtl><Alt><Fn> VT switch sequence
+XCOMM Uncomment this to disable the <Ctrl><Alt><Fn> VT switch sequence
 XCOMM (where n is 1 through 12).  This allows clients to receive these key
 XCOMM events.
 
 XCOMM    Option	"DontVTSwitch"
 
-XCOMM Uncomment this to disable the <Crtl><Alt><BS> server abort sequence
-XCOMM This allows clients to receive this key event.
+XCOMM Uncomment this to enable the <Ctrl><Alt><BS> server abort sequence
+XCOMM The default allows clients to receive this key event.
 
-XCOMM    Option	"DontZap"
+XCOMM    Option	"DontZap"	"false"
 
-XCOMM Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching
+XCOMM Uncomment this to disable the <Ctrl><Alt><KP_+>/<KP_-> mode switching
 XCOMM sequences.  This allows clients to receive these key events.
 
 XCOMM    Option	"DontZoom"
@@ -148,14 +147,6 @@ XCOMM the driver supports it.
     Option	"suspend time"	"30"
     Option	"off time"	"60"
 
-XCOMM On some platform the server needs to estimate the sizes of PCI
-XCOMM memory and pio ranges. This is done by assuming that PCI ranges
-XCOMM don't overlap. Some broken BIOSes tend to set ranges of inactive
-XCOMM devices wrong. Here one can adjust how aggressive the assumptions
-XCOMM should be. Default is 0.
-
-XCOMM Option   "EstimateSizesAggresively" "0"
-
 EndSection
 
 XCOMM **********************************************************************
@@ -218,7 +209,7 @@ XCOMM    Option	"XkbOptions"	"ctrl:swapcaps"
 XCOMM These are the default XKB settings for xorg
 XCOMM
 XCOMM    Option	"XkbRules"	"xorg"
-XCOMM    Option	"XkbModel"	"pc101"
+XCOMM    Option	"XkbModel"	"pc105"
 XCOMM    Option	"XkbLayout"	"us"
 XCOMM    Option	"XkbVariant"	""
 XCOMM    Option	"XkbOptions"	""
commit c1db925d10fd37077bed90612ed95c3fd20cd2e2
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 2 14:32:48 2008 -0800

    Add atKeynames.h to libdmxinput_a_SOURCES so it's included in tarballs
    
    Reported by geearu in #xorg-devel

diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
index 44b09af..8ea5003 100644
--- a/hw/dmx/input/Makefile.am
+++ b/hw/dmx/input/Makefile.am
@@ -49,6 +49,7 @@ DMXSRCS = dmxinputinit.c \
 
 libdmxinput_a_SOURCES = ChkNotMaskEv.c \
                         ChkNotMaskEv.h \
+                        atKeynames.h \
                         $(RAWSRCS) \
                         $(USBSRCS) \
                         $(DRVSRCS) \
commit 8561514574b3540c729bcc3acca9c943adcdc778
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 2 13:32:34 2008 -0800

    Don't need to check uid/euid for every commandline argument
    
    Check uid/euid only when handling the arguments that are restricted
    to root/non-setuid users

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 01acb8e..e8095e5 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1535,9 +1535,11 @@ ddxProcessArgument(int argc, char **argv, int i)
     }
 
   /* First the options that are only allowed for root */
-  if (getuid() == 0 || geteuid() != 0)
-  {
-    if (!strcmp(argv[i], "-modulepath"))
+  if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {
+    if ( (geteuid() == 0) && (getuid() != 0) ) {
+      FatalError("The '%s' option can only be used by root.\n", argv[i]);
+    }
+    else if (!strcmp(argv[i], "-modulepath"))
     {
       char *mp;
       CHECK_FOR_REQUIRED_ARGUMENT();
@@ -1561,8 +1563,6 @@ ddxProcessArgument(int argc, char **argv, int i)
       xf86LogFileFrom = X_CMDLINE;
       return 2;
     }
-  } else if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {
-    FatalError("The '%s' option can only be used by root.\n", argv[i]);
   }
   if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
   {
commit 6de6ffff35ac03d49fa61de195d4a0605e0ef8bf
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Dec 2 13:19:08 2008 -0800

    Remove unused config flags from FlagValues & FlagOptions
    
    FLAG_DISABLEMODINDEV, FLAG_MODINDEVALLOWNONLOCAL, & FLAG_HANDLE_SPECIAL_KEYS

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 5abfb4d..1210a8f 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -733,8 +733,6 @@ typedef enum {
     FLAG_DONTZOOM,
     FLAG_DISABLEVIDMODE,
     FLAG_ALLOWNONLOCAL,
-    FLAG_DISABLEMODINDEV,
-    FLAG_MODINDEVALLOWNONLOCAL,
     FLAG_ALLOWMOUSEOPENFAIL,
     FLAG_VTSYSREQ,
     FLAG_XKBDISABLE,
@@ -748,7 +746,6 @@ typedef enum {
     FLAG_XINERAMA,
     FLAG_LOG,
     FLAG_RENDER_COLORMAP_MODE,
-    FLAG_HANDLE_SPECIAL_KEYS,
     FLAG_RANDR,
     FLAG_AIGLX,
     FLAG_IGNORE_ABI,
@@ -773,10 +770,6 @@ static OptionInfoRec FlagOptions[] = {
 	{0}, FALSE },
   { FLAG_ALLOWNONLOCAL,		"AllowNonLocalXvidtune",	OPTV_BOOLEAN,
 	{0}, FALSE },
-  { FLAG_DISABLEMODINDEV,	"DisableModInDev",		OPTV_BOOLEAN,
-	{0}, FALSE },
-  { FLAG_MODINDEVALLOWNONLOCAL,	"AllowNonLocalModInDev",	OPTV_BOOLEAN,
-	{0}, FALSE },
   { FLAG_ALLOWMOUSEOPENFAIL,	"AllowMouseOpenFail",		OPTV_BOOLEAN,
 	{0}, FALSE },
   { FLAG_VTSYSREQ,		"VTSysReq",			OPTV_BOOLEAN,

More information about the xorg-commit mailing list