[Dosemu-cvs] dosemu/src/env/video X.c,1.27,1.28 vgaemu.c,1.15,1.16

[Bart O. <bar...@us...>]

Update of /cvsroot/dosemu/dosemu/src/env/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2471

Modified Files:
	X.c vgaemu.c 
Log Message:
Removed line_compare==0 workaround, since the CRTC init now initializes it
correctly from the CRTC registers. Have to check at a few places in X.c
to compensate. This fixes some display problems with bananoid.


Index: vgaemu.c
===================================================================
RCS file: /cvsroot/dosemu/dosemu/src/env/video/vgaemu.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- vgaemu.c	22 May 2004 22:59:32 -0000	1.15
+++ vgaemu.c	29 May 2004 09:58:30 -0000	1.16
@@ -2598,7 +2598,6 @@
                 height, vertical_display_end+1, vga.char_height);
         vga.reconfig.display = 1;
       }
-      if (vga.line_compare == 0) vga.line_compare = vga.height;
       break;
     }
     case CFG_CRTC_WIDTH:
@@ -2653,7 +2652,6 @@
         vga.line_compare = vga.crtc.line_compare / vertical_multiplier;
         dirty_all_video_pages();
       }
-      if (vga.line_compare == 0) vga.line_compare = vga.height;
       break;
     }
     default:

Index: X.c
===================================================================
RCS file: /cvsroot/dosemu/dosemu/src/env/video/X.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- X.c	29 May 2004 00:39:23 -0000	1.27
+++ X.c	29 May 2004 09:58:30 -0000	1.28
@@ -2724,6 +2724,8 @@
     veut.max_len = 0;
     veut.display_start = 0;
     veut.display_end = vga.scan_len * vga.line_compare;
+    if (vga.line_compare > vga.height)
+      veut.display_end = vga.scan_len * vga.height;
     veut.update_gran = 0;
     veut.update_pos = veut.display_start;
 
@@ -2808,6 +2810,8 @@
 
   veut.display_start = vga.display_start;
   veut.display_end = veut.display_start + vga.scan_len * vga.line_compare;
+  if (vga.line_compare > vga.height)
+    veut.display_end = veut.display_start + vga.scan_len * vga.height;
 
   if(vga.reconfig.mem || vga.reconfig.display) {
     x_msg("X_modify_mode: failed to modify current graphics mode\n");
@@ -3272,6 +3276,8 @@
   if(vga.display_start != veut.display_start) {
     veut.display_start = vga.display_start;
     veut.display_end = veut.display_start + vga.scan_len * vga.line_compare;
+    if (vga.line_compare > vga.height)
+      veut.display_end = veut.display_start + vga.scan_len * vga.height;
     dirty_all_video_pages();
   }