X Strike Force XFree86 SVN commit: r1780 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-08-31 17:26:23 -0500 (Tue, 31 Aug 2004)
New Revision: 1780
Modified:
branches/debconf-overhaul/debian/CHANGESETS
branches/debconf-overhaul/debian/changelog
branches/debconf-overhaul/debian/xserver-xfree86.config.in
branches/debconf-overhaul/debian/xserver-xfree86.templates
Log:
+ Add several video modes supported by XFree86 4.3.0 to the available
options in xserver-xfree86/config/monitor/mode-list:
- 832x624 @ 75Hz
- 1152x864 @ 75Hz (Closes: #130274)
- 1400x1050 @ 60Hz
- 1400x1050 @ 75Hz (Closes: #144040)
- 1600x1024 @ 60Hz
- 1920x1440 @ 85Hz
- 2048x1536 @ 60Hz
- 2048x1536 @ 75Hz
- 2048x1536 @ 85Hz
Make the new template default for this question "1152x864 @ 75Hz".
Modified: branches/debconf-overhaul/debian/CHANGESETS
===================================================================
--- branches/debconf-overhaul/debian/CHANGESETS 2004-08-31 21:39:08 UTC (rev 1779)
+++ branches/debconf-overhaul/debian/CHANGESETS 2004-08-31 22:26:23 UTC (rev 1780)
@@ -549,6 +549,18 @@
flat panel displays are so much more common relative to four years ago.
Also ask this question at medium debconf priority. Thanks to Joey Hess
for the suggestions. (Closes: #226365, #242216)
++ Add several video modes supported by XFree86 4.3.0 to the available
+ options in xserver-xfree86/config/monitor/mode-list:
+ - 832x624 @ 75Hz
+ - 1152x864 @ 75Hz (Closes: #130274)
+ - 1400x1050 @ 60Hz
+ - 1400x1050 @ 75Hz (Closes: #144040)
+ - 1600x1024 @ 60Hz
+ - 1920x1440 @ 85Hz
+ - 2048x1536 @ 60Hz
+ - 2048x1536 @ 75Hz
+ - 2048x1536 @ 85Hz
+ Make the new template default for this question "1152x864 @ 75Hz".
+ Add "1152x864" and "1024x768" to the final fallback list of default
modes, if we don't already know what the user wants.
+ Remove kludge that omitted the "dri" XFree86 server module from the
Modified: branches/debconf-overhaul/debian/changelog
===================================================================
--- branches/debconf-overhaul/debian/changelog 2004-08-31 21:39:08 UTC (rev 1779)
+++ branches/debconf-overhaul/debian/changelog 2004-08-31 22:26:23 UTC (rev 1780)
@@ -386,6 +386,18 @@
flat panel displays are so much more common relative to four years ago.
Also ask this question at medium debconf priority. Thanks to Joey Hess
for the suggestions. (Closes: #226365, #242216)
+ + Add several video modes supported by XFree86 4.3.0 to the available
+ options in xserver-xfree86/config/monitor/mode-list:
+ - 832x624 @ 75Hz
+ - 1152x864 @ 75Hz (Closes: #130274)
+ - 1400x1050 @ 60Hz
+ - 1400x1050 @ 75Hz (Closes: #144040)
+ - 1600x1024 @ 60Hz
+ - 1920x1440 @ 85Hz
+ - 2048x1536 @ 60Hz
+ - 2048x1536 @ 75Hz
+ - 2048x1536 @ 85Hz
+ Make the new template default for this question "1152x864 @ 75Hz".
+ Add "1152x864" and "1024x768" to the final fallback list of default
modes, if we don't already know what the user wants.
+ Remove kludge that omitted the "dri" XFree86 server module from the
@@ -515,7 +527,7 @@
missing to enable this feature. No keymaps currently use this feature,
but users may find it useful with broken keymaps.
- -- Branden Robinson <branden@debian.org> Tue, 31 Aug 2004 01:25:05 -0500
+ -- Branden Robinson <branden@debian.org> Tue, 31 Aug 2004 17:21:40 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-08-31 21:39:08 UTC (rev 1779)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-08-31 22:26:23 UTC (rev 1780)
@@ -1176,6 +1176,15 @@
xserver-xfree86/config/monitor/mode-list
db_go
db_get xserver-xfree86/config/monitor/mode-list
+ # The mode and range information below is adapted from the built-in
+ # modeline definitions in the XFree86 source tree; specifically
+ # xc/programs/Xserver/hw/xfree86/etc/vesamodes and
+ # xc/programs/Xserver/hw/xfree86/etc/extramodes. The rule of thumb is to
+ # set the sync ranges based on the hsync and vrefresh values used by the
+ # selected mode, plus a little bit of "headroom" to allow other modes to
+ # be used (as long as they don't push the hardware much harder than the
+ # selected one) and a margin of error (e.g., if the video driver or video
+ # card overdrives the monitor just a little bit).
case "$RET" in
"640x480 @ 60Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "28-33"
@@ -1202,6 +1211,12 @@
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
DEFAULT_MODES="800x600"
;;
+ "832x624 @ 75Hz")
+ # This is a Macintosh (m68k and OldWorld PowerPC) mode.
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-50"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ DEFAULT_MODES="832x624"
+ ;;
"1024x768 @ 60Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "28-49"
db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
@@ -1217,6 +1232,16 @@
db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
DEFAULT_MODES="1024x768"
;;
+ "1152x768 @ 54.8Hz")
+ # This is a 15" PowerBook G4 mode; its video hardware (LCD) was also
+ # capable of 896x600 and 720x480 pixels at a 3:2 aspect ratio and
+ # 1024x768, 800x600, and 640x480 pixels at a 4:3 aspect ratio, so give
+ # its horizontal and vertical ranges a little more "headroom" than
+ # that required by this specific mode to accomodate the others.
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-50"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-72"
+ DEFAULT_MODES="1152x768"
+ ;;
"1152x864 @ 75Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-68"
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
@@ -1237,6 +1262,22 @@
db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
DEFAULT_MODES="1280x1024"
;;
+ "1400x1050 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-67"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ DEFAULT_MODES="1400x1050"
+ ;;
+ "1400x1050 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-85"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-80"
+ DEFAULT_MODES="1400x1050"
+ ;;
+ "1600x1024 @ 85Hz")
+ # This is an SGI 1600SW mode.
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-70"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-90"
+ DEFAULT_MODES="1600x1024"
+ ;;
"1600x1200 @ 60Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-75"
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
@@ -1282,6 +1323,30 @@
db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
DEFAULT_MODES="1920x1440"
;;
+ "1920x1440 @ 85Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-130"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
+ DEFAULT_MODES="1920x1440"
+ ;;
+ "2048x1536 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-100"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-85"
+ DEFAULT_MODES="2048x1536"
+ ;;
+ "2048x1536 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-125"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-100"
+ DEFAULT_MODES="2048x1536"
+ ;;
+ "2048x1536 @ 85Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-140"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
+ DEFAULT_MODES="2048x1536"
+ ;;
+ *)
+ internal_error "configure_monitor(): no handler for" \
+ "xserver-xfree86/config/monitor/mode-list value \"$RET\""
+ ;;
esac
;;
Advanced)
Modified: branches/debconf-overhaul/debian/xserver-xfree86.templates
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.templates 2004-08-31 21:39:08 UTC (rev 1779)
+++ branches/debconf-overhaul/debian/xserver-xfree86.templates 2004-08-31 22:26:23 UTC (rev 1780)
@@ -445,8 +445,8 @@
Template: xserver-xfree86/config/monitor/mode-list
Type: select
-Choices: 640x480 @ 60Hz, 640x480 @ 72Hz, 800x600 @ 60Hz, 800x600 @ 72Hz, 800x600 @ 85Hz, 1024x768 @ 60Hz, 1024x768 @ 70Hz, 1024x768 @ 75Hz, 1152x864 @ 75Hz, 1280x960 @ 60Hz, 1280x960 @ 85Hz, 1280x1024 @ 60Hz, 1600x1200 @ 60Hz, 1600x1200 @ 75Hz, 1600x1200 @ 85Hz, 1792x1344 @ 60Hz, 1792x1344 @ 75Hz, 1856x1392 @ 60Hz, 1856x1392 @ 75Hz, 1920x1440 @ 60Hz, 1920x1440 @ 75Hz
-Default: 1280x960 @ 60Hz
+Choices: 640x480 @ 60Hz, 640x480 @ 72Hz, 800x600 @ 60Hz, 800x600 @ 72Hz, 800x600 @ 85Hz, 832x624 @ 75Hz, 1024x768 @ 60Hz, 1024x768 @ 70Hz, 1024x768 @ 75Hz, 1152x768 @ 54.8Hz, 1152x864 @ 75Hz, 1280x960 @ 60Hz, 1280x960 @ 85Hz, 1280x1024 @ 60Hz, 1400x1050 @ 60Hz, 1400x1050 @ 75Hz, 1600x1024 @ 60Hz, 1600x1200 @ 60Hz, 1600x1200 @ 75Hz, 1600x1200 @ 85Hz, 1792x1344 @ 60Hz, 1792x1344 @ 75Hz, 1856x1392 @ 60Hz, 1856x1392 @ 75Hz, 1920x1440 @ 60Hz, 1920x1440 @ 75Hz, 1920x1440 @ 85Hz, 2048x1536 @ 60Hz, 2048x1536 @ 75Hz, 2048x1536 @ 85Hz
+Default: 1152x864 @ 75Hz
_Description: Please select your monitor's best video mode.
Choose the "best" resolution and refresh rate you believe your monitor
capable of. Larger resolutions and refresh rates are better. If you use a
Reply to: