summaryrefslogtreecommitdiffstats
path: root/spice.proto
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-06-30 22:19:12 +0200
committerMarc-André Lureau <marcandre.lureau@gmail.com>2012-03-20 15:25:46 +0100
commitc5d06102b77d20600303ff636b095c82be29f0dc (patch)
tree082d49656318eb2a331ad5851ae57e0b93d86db7 /spice.proto
parentdabdea4fac8de901b4af2c61178097c2d3f5f78d (diff)
downloadspice-common-c5d06102b77d20600303ff636b095c82be29f0dc.tar.gz
spice-common-c5d06102b77d20600303ff636b095c82be29f0dc.tar.xz
spice-common-c5d06102b77d20600303ff636b095c82be29f0dc.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 7528208..8df1238 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);