Changeset 67795 in vbox

Timestamp:

Jul 5, 2017 1:14:41 PM (8 years ago)

Author:

vboxsync

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

116717

Message:

VGA: Now you see me, now you don't.

File:

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

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

@@ -105 +105 @@
 #endif
 
+/* VGA text mode blinking constants (cursor and blinking chars). */
+#define VGA_BLINK_PERIOD_FULL   (RT_NS_100MS * 4)   /* Blink cycle length. */
+#define VGA_BLINK_PERIOD_ON     (RT_NS_100MS * 2)   /* How long cursor/text is visible. */
 
 /*********************************************************************************************************************************
@@ -1908 +1911 @@
         for(cx = 0; cx < width; cx++) {
             ch_attr = *(uint16_t *)src;
-            if (full_update || ch_attr != (int)*ch_attr_ptr) {
+            if (full_update || ch_attr != (int)*ch_attr_ptr || src == cursor_ptr) {
                 if (cx < cx_min)
                     cx_min = cx;
@@ -1941 +1944 @@
                     !(pThis->cr[0x0a] & 0x20)) {
                     int line_start, line_last, h;
-                    /* draw the cursor */
-                    line_start = pThis->cr[0x0a] & 0x1f;
-                    line_last = pThis->cr[0x0b] & 0x1f;
-                    /* XXX: check that */
-                    if (line_last > cheight - 1)
-                        line_last = cheight - 1;
-                    if (line_last >= line_start && line_start < cheight) {
-                        h = line_last - line_start + 1;
-                        d = d1 + (linesize * line_start << dscan);
-                        if (cw != 9) {
-                            if (pThis->fRenderVRAM)
-                                vga_draw_glyph8(d, linesize,
-                                                cursor_glyph, h, fgcol, bgcol, dscan);
-                        } else {
-                            if (pThis->fRenderVRAM)
-                                vga_draw_glyph9(d, linesize,
-                                                cursor_glyph, h, fgcol, bgcol, 1);
+                    uint64_t time_ns;
+
+                    /* draw the cursor if within the visible period */
+                    time_ns = PDMDevHlpTMTimeVirtGetNano(VGASTATE2DEVINS(pThis));
+                    if (time_ns % VGA_BLINK_PERIOD_FULL < VGA_BLINK_PERIOD_ON) {
+                        line_start = pThis->cr[0x0a] & 0x1f;
+                        line_last = pThis->cr[0x0b] & 0x1f;
+                        /* XXX: check that */
+                        if (line_last > cheight - 1)
+                            line_last = cheight - 1;
+                        if (line_last >= line_start && line_start < cheight) {
+                            h = line_last - line_start + 1;
+                            d = d1 + (linesize * line_start << dscan);
+                            if (cw != 9) {
+                                if (pThis->fRenderVRAM)
+                                    vga_draw_glyph8(d, linesize,
+                                                    cursor_glyph, h, fgcol, bgcol, dscan);
+                            } else {
+                                if (pThis->fRenderVRAM)
+                                    vga_draw_glyph9(d, linesize,
+                                                    cursor_glyph, h, fgcol, bgcol, 1);
+                            }
                         }
                     }