[Spice-commits] spice/draw.h spice/qxl_dev.h
Alexander Larsson
alexl at kemper.freedesktop.org
Fri Jul 2 07:54:11 PDT 2010
spice/draw.h | 10 ++--------
spice/qxl_dev.h | 8 ++++++++
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 92c678220936c88b3f66b6687aa2d969736aa896
Author: Gerd Hoffmann <kraxel at redhat.com>
Date: Wed Jun 30 22:18:36 2010 +0200
Update SpiceString to use an array of pointers for glyphs
diff --git a/spice/draw.h b/spice/draw.h
index d617b30..0eeca0f 100644
--- a/spice/draw.h
+++ b/spice/draw.h
@@ -271,20 +271,14 @@ typedef struct SPICE_ATTR_PACKED SpiceRasterGlyph {
uint8_t data[0];
} SpiceRasterGlyph;
-typedef struct SPICE_ATTR_PACKED SpiceVectorGlyph {
- SpicePoint render_pos;
- uint32_t data_size;
- uint8_t data[0]; //SpicePathSeg[]
-} SpiceVectorGlyph;
-
typedef struct SPICE_ATTR_PACKED SpiceString {
uint16_t length;
uint16_t flags;
- uint8_t data[0];
+ SpiceRasterGlyph *glyphs[0];
} SpiceString;
typedef struct SPICE_ATTR_PACKED SpiceText {
- SPICE_ADDRESS str;
+ SpiceString *str;
SpiceRect back_area;
SpiceBrush fore_brush;
SpiceBrush back_brush;
diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index 47f0ce7..353f2bb 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -305,6 +305,14 @@ enum {
QXL_DRAW_ALPHA_BLEND,
};
+typedef struct SPICE_ATTR_PACKED QXLRasterGlyph {
+ QXLPoint render_pos;
+ QXLPoint glyph_origin;
+ uint16_t width;
+ uint16_t height;
+ uint8_t data[0];
+} QXLRasterGlyph;
+
typedef struct SPICE_ATTR_PACKED QXLString {
uint32_t data_size;
uint16_t length;
More information about the Spice-commits
mailing list