summaryrefslogtreecommitdiffstats
path: root/spice.proto
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-06-30 22:19:12 +0200
committerAlexander Larsson <alexl@redhat.com>2010-07-02 16:47:51 +0200
commit3764a3647224a5e9dde021828d3b17fe5fc9fdeb (patch)
tree7ed113c9743447bcd43d03bc2df388f4864ef996 /spice.proto
parent7e0099e18e98452d909d76997258ed0f44cf9a19 (diff)
downloadspice-3764a3647224a5e9dde021828d3b17fe5fc9fdeb.tar.gz
spice-3764a3647224a5e9dde021828d3b17fe5fc9fdeb.tar.xz
spice-3764a3647224a5e9dde021828d3b17fe5fc9fdeb.zip
Properly parse and marshall SpiceString
Diffstat (limited to 'spice.proto')
-rw-r--r--spice.proto10
1 files changed, 5 insertions, 5 deletions
diff --git a/spice.proto b/spice.proto
index 75282086..8df12387 100644
--- a/spice.proto
+++ b/spice.proto
@@ -564,12 +564,12 @@ struct String {
string_flags flags; /* Special: Only one of a1/a4/a8 set */
switch (flags) {
case RASTER_A1:
- RasterGlyphA1 glyphs[length] @ctype(SpiceRasterGlyph);
+ RasterGlyphA1 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
case RASTER_A4:
- RasterGlyphA4 glyphs[length] @ctype(SpiceRasterGlyph);
+ RasterGlyphA4 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
case RASTER_A8:
- RasterGlyphA8 glyphs[length] @ctype(SpiceRasterGlyph);
- } u @end @nomarshal;
+ RasterGlyphA8 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
+ } u @anon;
};
channel DisplayChannel : BaseChannel {
@@ -727,7 +727,7 @@ channel DisplayChannel : BaseChannel {
message {
DisplayBase base;
struct Text {
- String *str;
+ String *str @marshall @nonnull;
Rect back_area;
Brush fore_brush @outvar(fore_brush);
Brush back_brush @outvar(back_brush);