Changeset 6973 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Feb 15, 2008 5:28:12 PM (17 years ago)

Author:

vboxsync

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

28154

Message:

Initial commit of VRDP text cache (disabled).

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• Makefile.kmk (modified) (1 diff)
• driver.h (modified) (2 diffs)
• vrdp.c (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

@@ -44 +44 @@
         vrdp.c \
         vrdpbmp.c \
+        vrdptext.c \
         vbox.c \
         VBoxDisp.def \

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -186 +186 @@
 } CLIPRECTS;
 
+typedef struct _VRDPCLIPRECTS
+{
+    RECTL rclDstOrig; /* Original bounding rectancle. */
+    RECTL rclDst;     /* Bounding rectangle of all rects. */
+    CLIPRECTS rects;  /* Rectangles to update. */
+} VRDPCLIPRECTS;
+
 
 BOOL vboxVbvaEnable (PPDEV ppdev);
@@ -244 +251 @@
 void vrdpReportDirtyRect (PPDEV ppdev, RECTL *prcl);
 void vbvaReportDirtyRect (PPDEV ppdev, RECTL *prcl);
+
+#define VRDP_TEXT_MAX_GLYPH_SIZE 0x100
+#define VRDP_TEXT_MAX_GLYPHS     0xfe
+ 
+BOOL vboxReportText (PPDEV ppdev,
+                     VRDPCLIPRECTS *pClipRects,
+                     STROBJ   *pstro,
+                     FONTOBJ  *pfo,
+                     RECTL    *prclOpaque,
+                     ULONG    ulForeRGB,
+                     ULONG    ulBackRGB
+                    );
+
+BOOL vrdpReportOrderGeneric (PPDEV ppdev,
+                             const VRDPCLIPRECTS *pClipRects,
+                             const void *pvOrder,
+                             unsigned cbOrder,
+                             unsigned code);
+
 
 #include <iprt/assert.h>

trunk/src/VBox/Additions/WINNT/Graphics/Display/vrdp.c

@@ -44 +44 @@
 } VRDPBRUSH;
 
-typedef struct _VRDPCLIPRECTS
-{
-    RECTL rclDstOrig; /* Original bounding rectancle. */
-    RECTL rclDst;     /* Bounding rectangle of all rects. */
-    CLIPRECTS rects;  /* Rectangles to update. */
-} VRDPCLIPRECTS;
-
 #define VRDP_CLIP_OK              0
 #define VRDP_CLIP_NO_INTERSECTION 1
@@ -633 +626 @@
 }
 
-static BOOL vrdpReportOrderGeneric (PPDEV ppdev,
-                                    const VRDPCLIPRECTS *pClipRects,
-                                    const void *pvOrder,
-                                    unsigned cbOrder,
-                                    unsigned code)
+BOOL vrdpReportOrderGeneric (PPDEV ppdev,
+                             const VRDPCLIPRECTS *pClipRects,
+                             const void *pvOrder,
+                             unsigned cbOrder,
+                             unsigned code)
 {
     BOOL bRc;
@@ -1178 +1171 @@
              || prclExtra != NULL
              || (pfo->flFontType & FO_TYPE_RASTER) == 0
-             || pstro->cGlyphs > 256
+             || pstro->cGlyphs > VRDP_TEXT_MAX_GLYPHS
              || (pboOpaque && pboOpaque->iSolidColor == 0xFFFFFFFF)
              || pfo->iUniq == 0
@@ -1191 +1184 @@
     {
 #if 0
+        /* Testing: report a red rectangle for the text area. */
         vrdpReportSolidRect (ppdev, &clipRects, 0x0000FF);
 #else
+        /* Try to report the text order. */
+#if 0
+        ULONG ulForeRGB = pboFore? vrdpColor2RGB (pso, pboFore->iSolidColor): 0;
+        ULONG ulBackRGB = pboOpaque? vrdpColor2RGB (pso, pboOpaque->iSolidColor): 0;
+        
+        DISPDBG((1, "VRDP::vrdpTextOut: calling vboxReportText fg %x bg %x\n",
+                    ulForeRGB, ulBackRGB));
+                    
+        if (!vboxReportText (ppdev, &clipRects, pstro, pfo, prclOpaque, ulForeRGB, ulBackRGB))
+        {
+            vrdpReportDirtyRects (ppdev, &clipRects);
+        }
+#else
         vrdpReportDirtyRects (ppdev, &clipRects);
+#endif
 #endif
     }