1*4882a593SmuzhiyunFrom 64eab87d10b2d23be88ae133c6ed6deb1042dedc Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Wed, 3 Nov 2021 17:52:51 +0800 4*4882a593SmuzhiyunSubject: [PATCH 55/79] compositor: Support placing subsurface above or below 5*4882a593Smuzhiyun all siblings 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunBy passing itself as sibling in ::place_above or ::place_below. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun libweston/compositor.c | 14 ++++++++++++-- 12*4882a593Smuzhiyun 1 file changed, 12 insertions(+), 2 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/libweston/compositor.c b/libweston/compositor.c 15*4882a593Smuzhiyunindex ff07e408..b76e1e97 100644 16*4882a593Smuzhiyun--- a/libweston/compositor.c 17*4882a593Smuzhiyun+++ b/libweston/compositor.c 18*4882a593Smuzhiyun@@ -5158,7 +5158,12 @@ subsurface_place_above(struct wl_client *client, 19*4882a593Smuzhiyun if (!sub) 20*4882a593Smuzhiyun return; 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun- sibling = subsurface_sibling_check(sub, surface, "place_above"); 23*4882a593Smuzhiyun+ if (surface == sub->surface) 24*4882a593Smuzhiyun+ sibling = container_of(sub->parent->subsurface_list.next, 25*4882a593Smuzhiyun+ struct weston_subsurface, parent_link); 26*4882a593Smuzhiyun+ else 27*4882a593Smuzhiyun+ sibling = subsurface_sibling_check(sub, surface, "place_above"); 28*4882a593Smuzhiyun+ 29*4882a593Smuzhiyun if (!sibling) 30*4882a593Smuzhiyun return; 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun@@ -5182,7 +5187,12 @@ subsurface_place_below(struct wl_client *client, 33*4882a593Smuzhiyun if (!sub) 34*4882a593Smuzhiyun return; 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun- sibling = subsurface_sibling_check(sub, surface, "place_below"); 37*4882a593Smuzhiyun+ if (surface == sub->surface) 38*4882a593Smuzhiyun+ sibling = container_of(sub->parent->subsurface_list.prev, 39*4882a593Smuzhiyun+ struct weston_subsurface, parent_link); 40*4882a593Smuzhiyun+ else 41*4882a593Smuzhiyun+ sibling = subsurface_sibling_check(sub, surface, "place_below"); 42*4882a593Smuzhiyun+ 43*4882a593Smuzhiyun if (!sibling) 44*4882a593Smuzhiyun return; 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun-- 47*4882a593Smuzhiyun2.20.1 48*4882a593Smuzhiyun 49