diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-06-30 16:49:50 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-06-30 22:35:17 +0200 |
| commit | 00e1caf45d1a5d40f428c3e43d2c79578c841e75 (patch) | |
| tree | 40f290cde64de9a93e600522aed525749e78e13e /spice.proto | |
| parent | 62d0c076eb2eb0f9954c3870f31b4dd685e5f95c (diff) | |
| download | spice-00e1caf45d1a5d40f428c3e43d2c79578c841e75.tar.gz spice-00e1caf45d1a5d40f428c3e43d2c79578c841e75.tar.xz spice-00e1caf45d1a5d40f428c3e43d2c79578c841e75.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 67acb67c..75282086 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 { |