e_comp: fix build errors for multi-seat sandbox/ohduna/devel
authorDuna Oh <duna.oh@samsung.com>
Wed, 30 Nov 2016 02:33:56 +0000 (11:33 +0900)
committerDuna Oh <duna.oh@samsung.com>
Wed, 30 Nov 2016 02:33:56 +0000 (11:33 +0900)
Change-Id: Id54a157cb573b2b8c3b7cb6cff375fa86c7642b6
Signed-off-by: Duna Oh <duna.oh@samsung.com>
src/bin/e_comp.c
src/bin/e_comp_wl_input.c

index f0708eba3d555c3d543dbc3a22b3e613af7ba2e6..213b1713e95f656be0f5174ead3d9b4e6c02c4e6 100644 (file)
@@ -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)
index 8e692bc5d1944bcd98d5519a3f47aeeeb45ae915..955d1d395d5f635c6e7f0b8a8cd18ea9e323054f 100644 (file)
@@ -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);