Changeset 32950 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Oct 6, 2010 2:45:30 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66447

Message:

VGA: Merge pfnUpdateRect calls for text modes, too.

File:

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

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

@@ -1794 +1794 @@
     int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr;
     int cx_min, cx_max, linesize, x_incr;
+    int cx_min_upd, cx_max_upd, cy_start;
     uint32_t offset, fgcol, bgcol, v, cursor_offset;
     uint8_t *d1, *d, *src, *s1, *dest, *cursor_ptr;
@@ -1942 +1943 @@
 #endif /* VBOX */
     ch_attr_ptr = s->last_ch_attr;
+    cy_start = -1;
+    cx_max_upd = -1;
+    cx_min_upd = width;
 
     for(cy = 0; cy < height; cy++) {
@@ -2014 +2018 @@
         }
 #else
-        if (cx_max != -1)
-            s->pDrv->pfnUpdateRect(s->pDrv, cx_min * cw, cy * cheight, (cx_max - cx_min + 1) * cw, cheight);
+        if (cx_max != -1) {
+            /* Keep track of the bounding rectangle for updates. */
+            if (cy_start == -1)
+                cy_start = cy;
+            if (cx_min_upd > cx_min)
+                cx_min_upd = cx_min;
+            if (cx_max_upd < cx_max)
+                cx_max_upd = cx_max;
+        } else if (cy_start >= 0)
+            /* Flush updates to display. */
+            s->pDrv->pfnUpdateRect(s->pDrv, cx_min_upd * cw, cy_start * cheight,
+                                   (cx_max_upd - cx_min_upd + 1) * cw, (cy - cy_start) * cheight);
 #endif
         dest += linesize * cheight;
@@ -2021 +2035 @@
     }
 #ifdef VBOX
+    if (cy_start >= 0)
+        /* Flush any remaining changes to display. */
+        s->pDrv->pfnUpdateRect(s->pDrv, cx_min_upd * cw, cy_start * cheight,
+                               (cx_max_upd - cx_min_upd + 1) * cw, (cy - cy_start) * cheight);
         return VINF_SUCCESS;
 #endif /* VBOX */