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 /server | |
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 'server')
-rw-r--r-- | server/red_parse_qxl.c | 13 | ||||
-rw-r--r-- | server/red_worker.c | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c index 6fb439e5..7e877768 100644 --- a/server/red_parse_qxl.c +++ b/server/red_parse_qxl.c @@ -358,12 +358,13 @@ static void red_get_stroke_ptr(RedMemSlotInfo *slots, int group_id, { red->path = red_get_path(slots, group_id, qxl->path); red->attr.flags = qxl->attr.flags; - red->attr.join_style = qxl->attr.join_style; - red->attr.end_style = qxl->attr.end_style; - red->attr.style_nseg = qxl->attr.style_nseg; - red->attr.width = qxl->attr.width; - red->attr.miter_limit = qxl->attr.miter_limit; - red->attr.style = qxl->attr.style; + if (red->attr.flags & SPICE_LINE_FLAGS_STYLED) { + red->attr.style_nseg = qxl->attr.style_nseg; + red->attr.style = qxl->attr.style; + } else { + red->attr.style_nseg = 0; + red->attr.style = 0; + } red_get_brush_ptr(slots, group_id, &red->brush, &qxl->brush); red->fore_mode = qxl->fore_mode; red->back_mode = qxl->back_mode; diff --git a/server/red_worker.c b/server/red_worker.c index 712ede88..fa1ca442 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -2324,9 +2324,8 @@ static int is_equal_brush(SpiceBrush *b1, SpiceBrush *b2) // partial imp static int is_equal_line_attr(SpiceLineAttr *a1, SpiceLineAttr *a2) { - return a1->flags == a2->flags && a1->join_style == a2->join_style && - a1->end_style == a2->end_style && a1->style_nseg == a2->style_nseg && - a1->width == a2->width && a1->miter_limit == a2->miter_limit && + return a1->flags == a2->flags && + a1->style_nseg == a2->style_nseg && a1->style_nseg == 0; } |