- add 1366x768 and 1360x765 resolutions

- add big standard resolutions (4/3, 16/10, 16/9)
- re-organise the list of resolutions

2 files changed, 78 insertions, 31 deletions

diff --git a/NEWS b/NEWS
index 2256a14..aca220a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- add 1366x768 and 1360x765 resolutions
+- add big standard resolutions (4/3, 16/10, 16/9)
 - [bugfix] fix test message not translated (#30261)
 - remove all fglrx options, hopefully default is good enough
   (and at least MonitorLayout option is depreacated as reported on cooker)
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index 5d0d741..30c3086 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -653,74 +653,119 @@ our %ratio2resolutions = (
     # first all the CVT_ratios
 
     # 1.25
-    '5/4' => [ qw(640x512 720x576 1280x1024 1800x1440) ],
-		# SXGA=1280x1024 QSXGA=2560x2048, HSXGA=5120x4096
+    '5/4' => [ '640x512',
+	       '720x576',
+	       '1280x1024', # SXGA
+	       '1800x1440',
+	       #'2560x2048', # QSXGA
+	       #'5120x4096', # HSXGA
+	   ],
 
     # 1.33
-    '4/3' => [
-	qw(320x240 480x360 640x480 800x600 832x624 
-	   1024x768 1152x864 1280x960 1400x1050 
-	   1600x1200 1920x1440 2048x1536), # 768x576 1792x1344 1856x1392
-	    # DBLSCAN: 400x300 416x312 512x384 576x432 700x525 896x672 928x696 960x720
-    ],	    # VGA=640x480, SVGA=800x600, XGA=1024x768, SXGA+=1400x1050,
-            # UXGA=1600x1200, QXGA=2048x1536 QSXGA+=2800x2100, QUXGA=3200x2400,
-            # HUXGA=6400x4800
+    '4/3' => [ '320x240', # QVGA
+	       '480x360',
+	       '640x480', # VGA
+	       #'768x576', # PAL
+	       '800x600', # SVGA
+	       '832x624',
+	       '1024x768', # XGA
+	       '1152x864',
+	       '1280x960',
+	       '1400x1050', # SXGA+
+	       '1600x1200', # UXGA
+	       #'1792x1344',
+	       #'1800x1350',
+	       #'1856x1392',
+	       '1920x1440',
+	       '2048x1536', # QXGA
+	       '2800x2100', # QSXGA+
+	       '3200x2400', # QUXGA
+	       '4096x3072', # HXGA
+	       '6400x4800', # HUXGA
+	       # DBLSCAN: 400x300 416x312 512x384 576x432 700x525 896x672 928x696 960x720
+    ],
 
     # 1.5
-    '3/2' => [ qw(360x240 720x480 1152x768) ], # 576x384 (DBLSCAN of 1152x768)
+    '3/2' => [ '360x240',
+	       '720x480', # NTSC 
+	       '1152x768',
+	       #'1280x854',
+	       #'1440x960',
+	   ], # 576x384 (DBLSCAN of 1152x768)
 
     # 1.6
-    '16/10' => [ qw(1280x800 1440x900 1600x1000 1680x1050 1920x1200 2560x1600) ], # 320x200 640x400 960x600 3840x2400
-                # WSXGA+=1680x1050, WUXGA=1920x1200, WQXGA=2560x1600, WQUXGA=3840x2400, WHUXGA=7680x4800 
+    '16/10' => [ #'320x200', # CGA
+		 #'640x400',
+		 #'960x600',
+		 '1280x800', 
+		 '1440x900',
+		 '1600x1000',
+		 '1680x1050', # WSXGA+
+		 '1920x1200', # WUXGA
+		 '2560x1600', # WQXGA
+		 '3840x2400', # WQUXGA
+		 '5120x3200', # WHXGA
+		 '7680x4800', # WHUXGA
+	     ],
 
     # 1.67
-    '15/9' => [ qw(1280x768) ], # 800x480
-		# WXGA=1280x768 or ??? (should be 1366x768)
+    '15/9' => [ #'800x480',
+		'1280x768', # WXGA ?? should be 1366x768 ??
+	    ],
     
     # 1.78
-    '16/9' => [ qw(1280x720 1600x900 1920x1080) ], # 960x540 1024x576 1360x765
-                # UHDTV=7680x4320
-
+    '16/9' => [ #'854x480', # WVGA
+	        #'960x540',
+		#'1024x576',
+		'1280x720', # HD 720		
+		'1360x765', # one kind of WXGA (rounded down)
+		'1366x768', # HDTV
+		'1600x900', # WSXGA?
+		'1920x1080', # HD 1080
+		'7680x4320', # UHDTV
+	    ],
 
     # now more weird things
 
     # 1.32
-    # '192/145' => [ qw(1152x870) ],
+    # '192/145' => [ '1152x870' ],
 
     # 1.328
-    # '85/64' => [ qw(1360x1024) ],
+    # '85/64' => [ '1360x1024' ],
 
     # 1.42
-    # '17/12' => [ qw(544x384) ] ,
+    # '17/12' => [ '544x384' ] ,
 
     # 1.56
-    # '25/16' => [ qw(1600x1024 3200x2048 6400x4096) ], # (DBLSCAN 800x512)
-                   # WSXGA=1600x1024, WQSXGA=3200x2048, WHSXGA=6400x4096
+    #'25/16' => [ '1600x1024', # WSXGA
+    #		 '3200x2048', # WQSXGA
+    #		 '6400x4096', # WHSXGA
+    #	     ], # (DBLSCAN 800x512)
 
     # 1.707
-    # '128/75' => [ qw(1024x600) ],
+    # '128/75' => [ '1024x600' ],
 
     # 1.767
-    # '53/30' => [ qw(848x480) ],
+    # '53/30' => [ '848x480' ],
 
     # 1.771
-    # '85/48' => [ qw(1360x768) ],
+    # '85/48' => [ '1360x768' ],
 
     # 1.775
-    # '71/40' => [ qw(852x480) ],
+    # '71/40' => [ '852x480' ],
 
     # 1.783
-    # '107/60' => [ qw(856x480) ],
+    # '107/60' => [ '856x480' ],
 
     N_("_:weird aspect ratio\nother") => [
 	# 2.13 = 32/15
-	qw(1024x480 1280x600), # VAIO
+	'1024x480', '1280x600', # VAIO
 
 	# 2.67 = 8/3
-	qw(2048x768 2560x960 3200x1200),
+	'2048x768', '2560x960', '3200x1200',
 
 	# 4.0 = 4/1
-	qw(3072x768 3456x864 3840x960 4800x1200),
+	'3072x768', '3456x864', '3840x960', '4800x1200',
 
 	# ?? 352x288 640x350 (DBLSCAN 320x175) 720x400 (DBLSCAN 360x200)
     ],