From 0e7617e51fb8a04767fae4e669c1de66fba846e8 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Tue, 10 Nov 2015 14:41:18 -0600 Subject: worker: Move is_opaque_item() to tree.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Fabiano Fidêncio --- server/red_worker.c | 6 ------ server/tree.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/red_worker.c b/server/red_worker.c index face7133..0d04cc46 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -1480,12 +1480,6 @@ static void exclude_region(RedWorker *worker, Ring *ring, RingItem *ring_item, Q } } -static inline int is_opaque_item(TreeItem *item) -{ - return item->type == TREE_ITEM_TYPE_CONTAINER || - (IS_DRAW_ITEM(item) && ((DrawItem *)item)->effect == QXL_EFFECT_OPAQUE); -} - static inline void __current_add_drawable(RedWorker *worker, Drawable *drawable, RingItem *pos) { DisplayChannel *display = worker->display_channel; diff --git a/server/tree.h b/server/tree.h index 6e83f7a8..6249c286 100644 --- a/server/tree.h +++ b/server/tree.h @@ -73,6 +73,12 @@ struct DrawItem { #define IS_DRAW_ITEM(item) ((item)->type == TREE_ITEM_TYPE_DRAWABLE) #define DRAW_ITEM(item) ((DrawItem*)(item)) +static inline int is_opaque_item(TreeItem *item) +{ + return item->type == TREE_ITEM_TYPE_CONTAINER || + (IS_DRAW_ITEM(item) && ((DrawItem *)item)->effect == QXL_EFFECT_OPAQUE); +} + void tree_item_dump (TreeItem *item); Shadow* shadow_new (DrawItem *item, const SpicePoint *delta); Container* container_new (DrawItem *item); -- cgit