diff src/video/fbcon/SDL_fbvideo.c @ 1217:ae9981987c2f

Oops, actually use the timings in the modes db. :) FIXME: Add some way of specifying the refresh rate we want to select!
author Sam Lantinga <slouken@libsdl.org>
date Mon, 02 Jan 2006 09:32:54 +0000
parents d082d2d66ec8
children c9b51268668f
line wrap: on
line diff
--- a/src/video/fbcon/SDL_fbvideo.c	Mon Jan 02 09:13:16 2006 +0000
+++ b/src/video/fbcon/SDL_fbvideo.c	Mon Jan 02 09:32:54 2006 +0000
@@ -770,10 +770,19 @@
 	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);