Oops, actually use the timings in the modes db. :)

FIXME: Add some way of specifying the refresh rate we want to select!
libsdl-org · Jan 2, 2006 · 7b527de · 7b527de
1 parent 23eb6a3
commit 7b527de
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/video/fbcon/SDL_fbvideo.c b/src/video/fbcon/SDL_fbvideo.c
@@ -770,10 +770,19 @@ static int choose_fbmodes_mode(struct fb_var_screeninfo *vinfo)
 	if ( modesdb ) {
 		/* Parse the mode definition file */
 		while ( read_fbmodes_mode(modesdb, &cinfo) ) {
-			if ( vinfo->xres == cinfo.xres &&
-			     vinfo->yres == cinfo.yres ) {
+			if ( (vinfo->xres == cinfo.xres && vinfo->yres == cinfo.yres) &&
+			     (!matched || (vinfo->bits_per_pixel == cinfo.bits_per_pixel)) ) {
+				vinfo->pixclock = cinfo.pixclock;
+				vinfo->left_margin = cinfo.left_margin;
+				vinfo->right_margin = cinfo.right_margin;
+				vinfo->upper_margin = cinfo.upper_margin;
+				vinfo->lower_margin = cinfo.lower_margin;
+				vinfo->hsync_len = cinfo.hsync_len;
+				vinfo->vsync_len = cinfo.vsync_len;
+				if ( matched ) {
+					break;
+				}
 				matched = 1;
-				break;
 			}
 		}
 		fclose(modesdb);