diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2008-02-13 10:26:54 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2008-02-13 10:26:54 -0800 |
| commit | 08bcb766cb10d8b6e2c1fa30e9d7738cc1da02e8 (patch) | |
| tree | 6ec521284814520b30222dd9e899e24dd690a99b | |
| parent | b03157d67b34e51465b788d38c1a9a0ce97a8637 (diff) | |
| -rw-r--r-- | XF86Config-parser/Scan.c | 12 | ||||
| -rw-r--r-- | make_usable.c | 3 | ||||
| -rw-r--r-- | nvidia-xconfig.c | 3 | ||||
| -rw-r--r-- | option_table.h | 2 |
4 files changed, 6 insertions, 14 deletions
diff --git a/XF86Config-parser/Scan.c b/XF86Config-parser/Scan.c index ab48af8..22b6557 100644 --- a/XF86Config-parser/Scan.c +++ b/XF86Config-parser/Scan.c @@ -584,7 +584,6 @@ static int pathIsSafe(const char *path) * %E config file environment ($XF86CONFIG) as an absolute path * %F config file environment ($XF86CONFIG) as a relative path * %G config file environment ($XF86CONFIG) as a safe path - * %D $HOME * %P projroot * %M major version number * %% % @@ -640,7 +639,7 @@ static char *DoSubstitution(const char *template, { char *result; int i, l; - static const char *env = NULL, *home = NULL; + static const char *env = NULL; static char *hostname = NULL; static char majorvers[3] = ""; @@ -731,14 +730,6 @@ static char *DoSubstitution(const char *template, } else BAIL_OUT; break; - case 'D': - if (!home) - home = getenv("HOME"); - if (home && pathIsAbsolute(home)) - APPEND_STR(home); - else - BAIL_OUT; - break; case 'P': if (projroot && pathIsAbsolute(projroot)) APPEND_STR(projroot); @@ -798,7 +789,6 @@ static const char __root_configpath[] = "%F," /* $XF86CONFIG (as relative path) */ "/etc/X11/%F," /* /etc/X11/$XF86CONFIG */ "%P/etc/X11/%F," /* /usr/X11R6/etc/X11/$XF86CONFIG */ -"%D/%X," /* $HOME/XF86Config */ "/etc/X11/%X-%M," /* /etc/X11/XF86Config-4 */ "/etc/X11/%X," /* /etc/X11/XF86Config */ "/etc/%X," /* /etc/XF86Config */ diff --git a/make_usable.c b/make_usable.c index 6afb8ed..731672b 100644 --- a/make_usable.c +++ b/make_usable.c @@ -274,7 +274,8 @@ static void update_depth(Options *op, XConfigScreenPtr screen) /* update the depth */ if ((op->depth == 8) || (op->depth == 15) || - (op->depth == 16) || (op->depth == 24)) { + (op->depth == 16) || (op->depth == 24) || + (op->depth == 30)) { screen->defaultdepth = op->depth; } else { /* read the default depth to SVC and set it as the default depth */ diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c index 4aa0deb..e3208ad 100644 --- a/nvidia-xconfig.c +++ b/nvidia-xconfig.c @@ -282,7 +282,8 @@ Options *parse_commandline(int argc, char *argv[]) if ((op->depth != 8) && (op->depth != 15) && (op->depth != 16) && - (op->depth != 24)) { + (op->depth != 24) && + (op->depth != 30)) { fprintf(stderr, "\n"); fprintf(stderr, "Invalid depth: %d.\n", op->depth); fprintf(stderr, "\n"); diff --git a/option_table.h b/option_table.h index 2b07848..6203f74 100644 --- a/option_table.h +++ b/option_table.h @@ -179,7 +179,7 @@ static const NVGetoptOption __options[] = { { "depth", 'd', NVGETOPT_INTEGER_ARGUMENT, NULL, "Set the default depth to [DEPTH]; valid values for [DEPTH] are " - "8, 15, 16 and 24." }, + "8, 15, 16, 24, and 30." }, { "disable-glx-root-clipping", XCONFIG_BOOL_VAL(DISABLE_GLX_ROOT_CLIPPING_BOOL_OPTION), |