diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-22 13:29:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-22 13:29:08 +0000 |
| commit | 8b1228fdd95f63ae5ed6f80597eafc973fc5bf57 (patch) | |
| tree | acc77d1da984ddb537e44e57d1741560cf0b058b /xorg-server/hw/xfree86/modes | |
| parent | f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (diff) | |
| parent | 1a038249967b51878bc492df42e24b2af797bb85 (diff) | |
| download | vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.tar.gz vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.tar.bz2 vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/modes')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Crtc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 9dbeea8a5..417a75ff6 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -439,6 +439,7 @@ typedef enum { OPTION_ROTATE,
OPTION_PANNING,
OPTION_PRIMARY,
+ OPTION_DEFAULT_MODES,
} OutputOpts;
static OptionInfoRec xf86OutputOptions[] = {
@@ -456,6 +457,7 @@ static OptionInfoRec xf86OutputOptions[] = { {OPTION_ROTATE, "Rotate", OPTV_STRING, {0}, FALSE },
{OPTION_PANNING, "Panning", OPTV_STRING, {0}, FALSE },
{OPTION_PRIMARY, "Primary", OPTV_BOOLEAN, {0}, FALSE },
+ {OPTION_DEFAULT_MODES, "DefaultModes", OPTV_BOOLEAN, {0}, FALSE },
{-1, NULL, OPTV_NONE, {0}, FALSE },
};
@@ -1560,7 +1562,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) int min_clock = 0;
int max_clock = 0;
double clock;
- Bool add_default_modes = TRUE;
+ Bool add_default_modes = xf86ReturnOptValBool(output->options, OPTION_DEFAULT_MODES, TRUE);
Bool debug_modes = config->debug_modes ||
xf86Initialising;
enum det_monrec_source sync_source = sync_default;
|