Changeset 33519 in vbox for trunk/src

Timestamp:

Oct 27, 2010 3:07:55 PM (14 years ago)

Author:

vboxsync

Message:

VGA: Fixed repaint problems caused by taking screenshots.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1596 +1596 @@
  * - flashing
  */
-static int vga_draw_text(VGAState *s, int full_update, bool fFailOnResize)
+static int vga_draw_text(VGAState *s, int full_update, bool fFailOnResize, bool reset_dirty)
 {
     int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr;
@@ -1723 +1723 @@
                 if (cx > cx_max)
                     cx_max = cx;
-                *ch_attr_ptr = ch_attr;
+                if (reset_dirty)
+                    *ch_attr_ptr = ch_attr;
 #ifdef WORDS_BIGENDIAN
                 ch = ch_attr >> 8;
@@ -1962 +1963 @@
  * graphic modes
  */
-static int vga_draw_graphic(VGAState *s, int full_update, bool fFailOnResize)
+static int vga_draw_graphic(VGAState *s, int full_update, bool fFailOnResize, bool reset_dirty)
 {
     int y1, y2, y, update, page_min, page_max, linesize, y_start, double_scan;
@@ -2134 +2135 @@
     }
     /* reset modified pages */
-    if (page_max != -1) {
+    if (page_max != -1 && reset_dirty) {
         vga_reset_dirty(s, page_min, page_max + TARGET_PAGE_SIZE);
     }
@@ -2175 +2176 @@
 #define GMODE_BLANK 2
 
-static int vga_update_display(PVGASTATE s, bool fUpdateAll, bool fFailOnResize)
+static int vga_update_display(PVGASTATE s, bool fUpdateAll, bool fFailOnResize, bool reset_dirty)
 {
     int rc = VINF_SUCCESS;
@@ -2229 +2230 @@
             if (s->gr[6] & 1) {
                 s->graphic_mode = GMODE_GRAPH;
-                rc = vga_draw_graphic(s, 1, false);
+                rc = vga_draw_graphic(s, 1, false, reset_dirty);
             } else {
                 s->graphic_mode = GMODE_TEXT;
-                rc = vga_draw_text(s, 1, false);
+                rc = vga_draw_text(s, 1, false, reset_dirty);
             }
 
@@ -2257 +2258 @@
         switch(graphic_mode) {
         case GMODE_TEXT:
-            rc = vga_draw_text(s, full_update, fFailOnResize);
+            rc = vga_draw_text(s, full_update, fFailOnResize, reset_dirty);
             break;
         case GMODE_GRAPH:
-            rc = vga_draw_graphic(s, full_update, fFailOnResize);
+            rc = vga_draw_graphic(s, full_update, fFailOnResize, reset_dirty);
             break;
         case GMODE_BLANK:
@@ -4339 +4340 @@
     }
 
-    rc = vga_update_display(pThis, false, false);
+    rc = vga_update_display(pThis, false, false, true);
     if (rc != VINF_SUCCESS)
     {
@@ -4367 +4368 @@
     pThis->graphic_mode = -1; /* force full update */
 
-    return vga_update_display(pThis, true, false);
+    return vga_update_display(pThis, true, false, true);
 }
 
@@ -4511 +4512 @@
              * If there is a pending resize, the function will fail.
              */
-            rc = vga_update_display(pThis, false, true);
+            rc = vga_update_display(pThis, false, true, false);
 
             /* Restore. */