From 318ab67b804c544203a886f44677bad753628163 Mon Sep 17 00:00:00 2001 From: Duna Oh Date: Wed, 30 Nov 2016 11:33:56 +0900 Subject: [PATCH] e_comp: fix build errors for multi-seat Change-Id: Id54a157cb573b2b8c3b7cb6cff375fa86c7642b6 Signed-off-by: Duna Oh --- src/bin/e_comp.c | 7 ++----- src/bin/e_comp_wl_input.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index f0708eb..213b171 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -771,10 +771,6 @@ _e_comp_hwc_usable(void) if (!e_comp->hwc) return EINA_FALSE; - // will be removed once hwc cursor is supported - EINA_LIST_FOREACH(e_comp_wl->seats, l, seat) - if (!e_pointer_is_hidden(seat->pointer)) return EINA_FALSE; - // check whether to use hwc // core assignment policy ret = _e_comp_hwc_prepare(); @@ -798,7 +794,8 @@ _e_comp_hwc_usable(void) (eout->cursor_available.max_h == -1)) { // hw cursor is not supported by libtdm, than let's composite - if (!e_pointer_is_hidden(e_comp->pointer)) return EINA_FALSE; + EINA_LIST_FOREACH(e_comp_wl->seats, l, seat) + if (!e_pointer_is_hidden(seat->pointer)) return EINA_FALSE; } EINA_LIST_FOREACH(ep_l, p_l, ep) diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c index 8e692bc..955d1d3 100644 --- a/src/bin/e_comp_wl_input.c +++ b/src/bin/e_comp_wl_input.c @@ -41,9 +41,9 @@ _e_comp_wl_input_pointer_map(struct wl_resource *resource) if (!ec->seat) return; if (!ec->seat->ptr.enabled) return; - if (!e_comp_wl->ptr.ec || !e_comp_wl->ptr.ec->comp_data || !e_comp_wl->ptr.ec->comp_data->surface) return; + if (!ec->seat->ptr.ec || !ec->seat->ptr.ec->comp_data || !ec->seat->ptr.ec->comp_data->surface) return; wc = wl_resource_get_client(resource); - if (wc != wl_resource_get_client(e_comp_wl->ptr.ec->comp_data->surface)) return; + if (wc != wl_resource_get_client(ec->seat->ptr.ec->comp_data->surface)) return; if ((ptr = ec->seat->pointer)) e_pointer_object_set(ptr, ec->frame, ptr->hot.x, ptr->hot.y); -- 2.7.4