summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2021-03-03 09:59:08 +0900
committerHermet Park <chuneon.park@samsung.com>2021-03-03 09:59:08 +0900
commitec2356e9fbbdda2806c380871a4e95118b23844a (patch)
tree63dd915677f19aaa6c7b2876cca59bc743125d1e /src/modules
parenta5f22e73d22b6535113a9e46c000f1b673651889 (diff)
parent91f07de8905584fed2d2cb7fd9eaf7ea04da9dd5 (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 5a815fdd90..1cec016ebc 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -987,45 +987,6 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
987 } 987 }
988} 988}
989 989
990static Eina_Bool
991_ecore_evas_wl_common_cb_www_drag(void *d EINA_UNUSED, int t EINA_UNUSED, void *event)
992{
993 Ecore_Wl2_Event_Window_WWW_Drag *ev = event;
994 Ecore_Evas_Engine_Wl_Data *wdata;
995 Ecore_Evas *ee;
996
997 ee = ecore_event_window_match((Ecore_Window)ev->window);
998 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
999 if ((Ecore_Window)ev->window != ee->prop.window)
1000 return ECORE_CALLBACK_PASS_ON;
1001
1002 wdata = ee->engine.data;
1003 wdata->dragging = !!ev->dragging;
1004 if (!ev->dragging)
1005 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
1006 return ECORE_CALLBACK_RENEW;
1007}
1008
1009static Eina_Bool
1010_ecore_evas_wl_common_cb_www(void *d EINA_UNUSED, int t EINA_UNUSED, void *event)
1011{
1012 Ecore_Wl2_Event_Window_WWW *ev = event;
1013 Ecore_Evas_Engine_Wl_Data *wdata;
1014 Ecore_Evas *ee;
1015
1016 ee = ecore_event_window_match((Ecore_Window)ev->window);
1017 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
1018 if ((Ecore_Window)ev->window != ee->prop.window)
1019 return ECORE_CALLBACK_PASS_ON;
1020
1021 wdata = ee->engine.data;
1022 wdata->x_rel += ev->x_rel;
1023 wdata->y_rel += ev->y_rel;
1024 wdata->timestamp = ev->timestamp;
1025 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
1026 return ECORE_CALLBACK_RENEW;
1027}
1028
1029static void 990static void
1030_ecore_evas_wl_common_cb_device_event_free(void *user_data, void *func_data) 991_ecore_evas_wl_common_cb_device_event_free(void *user_data, void *func_data)
1031{ 992{
@@ -1361,14 +1322,6 @@ _ecore_evas_wl_common_init(void)
1361 _ecore_evas_wl_common_cb_window_configure, NULL); 1322 _ecore_evas_wl_common_cb_window_configure, NULL);
1362 eina_array_push(_ecore_evas_wl_event_hdls, h); 1323 eina_array_push(_ecore_evas_wl_event_hdls, h);
1363 1324
1364 h = ecore_event_handler_add(_ecore_wl2_event_window_www,
1365 _ecore_evas_wl_common_cb_www, NULL);
1366 eina_array_push(_ecore_evas_wl_event_hdls, h);
1367
1368 h = ecore_event_handler_add(_ecore_wl2_event_window_www_drag,
1369 _ecore_evas_wl_common_cb_www_drag, NULL);
1370 eina_array_push(_ecore_evas_wl_event_hdls, h);
1371
1372 h = ecore_event_handler_add(ECORE_WL2_EVENT_DISCONNECT, 1325 h = ecore_event_handler_add(ECORE_WL2_EVENT_DISCONNECT,
1373 _ecore_evas_wl_common_cb_disconnect, NULL); 1326 _ecore_evas_wl_common_cb_disconnect, NULL);
1374 eina_array_push(_ecore_evas_wl_event_hdls, h); 1327 eina_array_push(_ecore_evas_wl_event_hdls, h);
@@ -2255,7 +2208,6 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
2255 einfo->info.destination_alpha = ee_needs_alpha(ee); 2208 einfo->info.destination_alpha = ee_needs_alpha(ee);
2256 einfo->info.wl2_win = wdata->win; 2209 einfo->info.wl2_win = wdata->win;
2257 einfo->info.hidden = wdata->win->pending.configure; //EINA_FALSE; 2210 einfo->info.hidden = wdata->win->pending.configure; //EINA_FALSE;
2258 einfo->www_avail = !!wdata->win->www_surface;
2259 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) 2211 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
2260 ERR("Failed to set Evas Engine Info for '%s'", ee->driver); 2212 ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
2261 if (ECORE_EVAS_PORTRAIT(ee)) 2213 if (ECORE_EVAS_PORTRAIT(ee))