diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-06-30 16:49:50 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-20 15:25:46 +0100 |
| commit | bef8a0cf19da59d1bd370487d58f81db2ee7a7d6 (patch) | |
| tree | f6174c031409651090f59cc2dedef7c6f5a7621a /spice.proto | |
| parent | fcb5eb4629455403de723e2a254e07c8ee46c5d0 (diff) | |
| download | spice-common-bef8a0cf19da59d1bd370487d58f81db2ee7a7d6.tar.gz spice-common-bef8a0cf19da59d1bd370487d58f81db2ee7a7d6.tar.xz spice-common-bef8a0cf19da59d1bd370487d58f81db2ee7a7d6.zip | |
Simplify SpiceLineAttr by removing unsed stuff
Also in new protocol don't send style data if not needed.
Diffstat (limited to 'spice.proto')
| -rw-r--r-- | spice.proto | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/spice.proto b/spice.proto index 67acb67..7528208 100644 --- a/spice.proto +++ b/spice.proto @@ -131,7 +131,7 @@ channel BaseChannel { uint32 what; /* error_code/warn_code/info_code */ uint32 message_len; uint8 message[message_len] @end @nomarshal; - uint8 zero @end @ctype(uint8_t) @zero @nomarshal; + uint8 zero @end @ctype(uint8_t) @nomarshal; } notify; client: @@ -349,18 +349,6 @@ flags8 line_flags { START_WITH_GAP = 2, }; -enum8 line_cap { - ROUND, - SQUARE, - BUTT, -}; - -enum8 line_join { - ROUND, - BEVEL, - MITER, -}; - flags8 string_flags { RASTER_A1, RASTER_A4, @@ -537,12 +525,14 @@ struct QMask { struct LineAttr { line_flags flags; - line_join join_style; - line_cap end_style; - uint8 style_nseg; - fixed28_4 width; - fixed28_4 miter_limit; - fixed28_4 *style[style_nseg]; + switch (flags) { + case STYLED: + uint8 style_nseg; + } u1 @anon; + switch (flags) { + case STYLED: + fixed28_4 *style[style_nseg]; + } u2 @anon; }; struct RasterGlyphA1 { |