diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-10-01 17:14:44 +0200 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:41 +0100 |
| commit | 0841e139841e60183d22b51afa886895b757b9ec (patch) | |
| tree | f65b65e5aaf269698f2d2120b55674041d0f6a35 | |
| parent | de7bcca7c5ce0f56b8d554d0957db17ff6233a2a (diff) | |
| download | spice-0841e139841e60183d22b51afa886895b757b9ec.tar.gz spice-0841e139841e60183d22b51afa886895b757b9ec.tar.xz spice-0841e139841e60183d22b51afa886895b757b9ec.zip | |
display: rename detach_streams_behind
| -rw-r--r-- | server/display-channel.c | 12 | ||||
| -rw-r--r-- | server/display-channel.h | 1 | ||||
| -rw-r--r-- | server/stream.c | 2 | ||||
| -rw-r--r-- | server/stream.h | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/server/display-channel.c b/server/display-channel.c index 38116f74..31a88c14 100644 --- a/server/display-channel.c +++ b/server/display-channel.c @@ -721,7 +721,7 @@ static int current_add_with_shadow(DisplayChannel *display, Ring *ring, Drawable // only primary surface streams are supported if (is_primary_surface(display, item->surface_id)) { - detach_streams_behind(display, &shadow->base.rgn, NULL); + stream_detach_behind(display, &shadow->base.rgn, NULL); } ring_add(ring, &shadow->base.siblings_link); @@ -734,7 +734,7 @@ static int current_add_with_shadow(DisplayChannel *display, Ring *ring, Drawable streams_update_visible_region(display, item); } else { if (is_primary_surface(display, item->surface_id)) { - detach_streams_behind(display, &item->tree_item.base.rgn, item); + stream_detach_behind(display, &item->tree_item.base.rgn, item); } } stat_add(&display->add_stat, start_time); @@ -844,14 +844,14 @@ static int current_add(DisplayChannel *display, Ring *ring, Drawable *drawable) current_add_drawable(display, drawable, ring); } else { /* - * red_detach_streams_behind can affect the current tree since + * stream_detach_behind can affect the current tree since * it may trigger calls to display_channel_draw. Thus, the * drawable should be added to the tree before calling - * red_detach_streams_behind + * stream_detach_behind */ current_add_drawable(display, drawable, ring); if (is_primary_surface(display, drawable->surface_id)) { - detach_streams_behind(display, &drawable->tree_item.base.rgn, drawable); + stream_detach_behind(display, &drawable->tree_item.base.rgn, drawable); } } region_destroy(&exclude_rgn); @@ -1029,7 +1029,7 @@ static int handle_surface_deps(DisplayChannel *display, Drawable *drawable) QRegion depend_region; region_init(&depend_region); region_add(&depend_region, &drawable->red_drawable->surfaces_rects[x]); - detach_streams_behind(display, &depend_region, NULL); + stream_detach_behind(display, &depend_region, NULL); } } } diff --git a/server/display-channel.h b/server/display-channel.h index 26020b2f..5be63b0a 100644 --- a/server/display-channel.h +++ b/server/display-channel.h @@ -420,7 +420,6 @@ static inline void region_add_clip_rects(QRegion *rgn, SpiceClipRects *data) } } -void detach_streams_behind(DisplayChannel *display, QRegion *region, Drawable *drawable); void drawable_draw(DisplayChannel *display, Drawable *item); void drawables_init(DisplayChannel *display); diff --git a/server/stream.c b/server/stream.c index 996360da..4796e830 100644 --- a/server/stream.c +++ b/server/stream.c @@ -842,7 +842,7 @@ static void detach_stream_gracefully(DisplayChannel *display, Stream *stream, * involves sending an upgrade image to the client, this drawable won't be rendered * (see red_display_detach_stream_gracefully). */ -void detach_streams_behind(DisplayChannel *display, QRegion *region, Drawable *drawable) +void stream_detach_behind(DisplayChannel *display, QRegion *region, Drawable *drawable) { Ring *ring = &display->streams; RingItem *item = ring_get_head(ring); diff --git a/server/stream.h b/server/stream.h index 24a0c501..1ca7f9fa 100644 --- a/server/stream.h +++ b/server/stream.h @@ -144,6 +144,9 @@ void stream_timeout (DisplayChan void stream_detach_and_stop (DisplayChannel *display); void stream_trace_add_drawable (DisplayChannel *display, Drawable *item); +void stream_detach_behind (DisplayChannel *display, + QRegion *region, + Drawable *drawable); void stream_agent_unref (DisplayChannel *display, StreamAgent *agent); |