Changeset 93796 in vbox for trunk/src/VBox

Timestamp:

Feb 16, 2022 4:00:11 PM (3 years ago)

Author:

vboxsync

Message:

DevVGA: Implemented text mode underline.

File:

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

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

@@ -1698 +1698 @@
 /**
  * Text mode update
- * Missing:
- * - underline
  */
 static int vgaR3DrawText(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATER3 pThisCC, bool full_update,
@@ -1718 +1716 @@
     bool blink_on, chr_blink_flip, cur_blink_flip;
     bool blink_enabled, blink_do_redraw;
+    int uline_pos;
 
     full_update |= vgaR3UpdatePalette16(pThis, pThisCC);
@@ -1837 +1836 @@
     }
     blink_enabled = !!(pThis->ar[0x10] & 0x08); /* Attribute controller blink enable. */
+
+    /* Underline position */
+    uline_pos  = pThis->cr[0x14] & 0x1f;
 
     for(cy = 0; cy < (height - dscan); cy = cy + (1 << dscan)) {
@@ -1883 +1885 @@
                         vga_draw_glyph9(d1, linesize, font_ptr, cheight, fgcol, bgcol, dup9);
                 }
+
+                /* Underline. Typically turned off by setting it past cell height. */
+                if (((cattr & 0x03) == 1) && (uline_pos < cheight))
+                {
+                    int h;
+
+                    d = d1 + (linesize * uline_pos << dscan);
+                    h = 1;
+
+                    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);
+                    }
+                }
+
+                /* Cursor. */
                 if (src == cursor_ptr &&
                     !(pThis->cr[0x0a] & 0x20)) {