summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-10-01 10:25:23 -0400
committerChris Michael <cp.michael@samsung.com>2015-12-03 10:22:37 -0500
commit533997adba50247ea2279c31badc63f079247ae9 (patch)
treedfe258d5256eb37ff5bf6242fd023db9a1353a14
parent4e35e34b164b5eb309493e4b0751dc0b870b03bf (diff)
elementary: Port elementary window code to use Ecore_Wl2
Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elm_win.c125
-rw-r--r--src/lib/elm_win.eo4
-rw-r--r--src/lib/elm_win_legacy.h2
3 files changed, 68 insertions, 63 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index b9f78dad6..6de610ca9 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -111,10 +111,10 @@ struct _Elm_Win_Data
111 Ecore_Event_Handler *property_handler; 111 Ecore_Event_Handler *property_handler;
112 } x; 112 } x;
113#endif 113#endif
114#ifdef HAVE_ELEMENTARY_WAYLAND 114#ifdef HAVE_ELEMENTARY_WL2
115 struct 115 struct
116 { 116 {
117 Ecore_Wl_Window *win; 117 Ecore_Wl2_Window *win;
118 Eina_Bool opaque_dirty : 1; 118 Eina_Bool opaque_dirty : 1;
119 } wl; 119 } wl;
120#endif 120#endif
@@ -349,7 +349,7 @@ _win_noblank_eval(void)
349 if (noblanks > 0) ecore_x_screensaver_suspend(); 349 if (noblanks > 0) ecore_x_screensaver_suspend();
350 else ecore_x_screensaver_resume(); 350 else ecore_x_screensaver_resume();
351#endif 351#endif
352#ifdef HAVE_ELEMENTARY_WAYLAND 352#ifdef HAVE_ELEMENTARY_WL2
353 // XXX: no wl implementation of this yet - maybe higher up at prop level 353 // XXX: no wl implementation of this yet - maybe higher up at prop level
354#endif 354#endif
355} 355}
@@ -1246,7 +1246,7 @@ _elm_win_profile_update(Elm_Win_Data *sd)
1246 eo_do(sd->obj, eo_event_callback_call(ELM_WIN_EVENT_PROFILE_CHANGED, NULL)); 1246 eo_do(sd->obj, eo_event_callback_call(ELM_WIN_EVENT_PROFILE_CHANGED, NULL));
1247} 1247}
1248 1248
1249#ifdef HAVE_ELEMENTARY_WAYLAND 1249#ifdef HAVE_ELEMENTARY_WL2
1250static void 1250static void
1251_elm_win_opaque_update(Elm_Win_Data *sd) 1251_elm_win_opaque_update(Elm_Win_Data *sd)
1252{ 1252{
@@ -1255,15 +1255,17 @@ _elm_win_opaque_update(Elm_Win_Data *sd)
1255 if (sd->fullscreen) 1255 if (sd->fullscreen)
1256 { 1256 {
1257 ecore_evas_geometry_get(sd->ee, NULL, NULL, &ow, &oh); 1257 ecore_evas_geometry_get(sd->ee, NULL, NULL, &ow, &oh);
1258 ecore_wl_window_opaque_region_set(sd->wl.win, 0, 0, ow, oh); 1258 ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, ow, oh);
1259 ecore_wl_window_update_location(sd->wl.win, 0, 0); 1259 /* TODO */
1260 /* ecore_wl_window_update_location(sd->wl.win, 0, 0); */
1260 return; 1261 return;
1261 } 1262 }
1262 1263
1263 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque", 1264 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque",
1264 &ox, &oy, &ow, &oh); 1265 &ox, &oy, &ow, &oh);
1265 ecore_wl_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh); 1266 ecore_wl2_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh);
1266 ecore_wl_window_update_location(sd->wl.win, ox, oy); 1267 /* TODO */
1268 /* ecore_wl_window_update_location(sd->wl.win, ox, oy); */
1267} 1269}
1268#endif 1270#endif
1269 1271
@@ -1273,7 +1275,7 @@ _elm_win_frame_obj_update(Elm_Win_Data *sd)
1273 int fx, fy, fw, fh; 1275 int fx, fy, fw, fh;
1274 int ox, oy, ow, oh; 1276 int ox, oy, ow, oh;
1275 1277
1276#ifdef HAVE_ELEMENTARY_WAYLAND 1278#ifdef HAVE_ELEMENTARY_WL2
1277 sd->wl.opaque_dirty = 1; 1279 sd->wl.opaque_dirty = 1;
1278#endif 1280#endif
1279 if (sd->fullscreen) 1281 if (sd->fullscreen)
@@ -2052,8 +2054,9 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
2052 } 2054 }
2053 if (sd->frame_obj) 2055 if (sd->frame_obj)
2054 { 2056 {
2055#ifdef HAVE_ELEMENTARY_WAYLAND 2057#ifdef HAVE_ELEMENTARY_WL2
2056 ecore_wl_window_update_location(sd->wl.win, x, y); 2058 /* TODO */
2059 /* ecore_wl_window_update_location(sd->wl.win, x, y); */
2057#endif 2060#endif
2058 sd->screen.x = x; 2061 sd->screen.x = x;
2059 sd->screen.y = y; 2062 sd->screen.y = y;
@@ -2145,10 +2148,10 @@ _internal_elm_win_xwindow_get(Elm_Win_Data *sd)
2145} 2148}
2146#endif 2149#endif
2147 2150
2148Ecore_Wl_Window * 2151Ecore_Wl2_Window *
2149_elm_ee_wlwin_get(const Ecore_Evas *ee) 2152_elm_ee_wlwin_get(const Ecore_Evas *ee)
2150{ 2153{
2151#ifdef HAVE_ELEMENTARY_WAYLAND 2154#ifdef HAVE_ELEMENTARY_WL2
2152 const char *engine_name; 2155 const char *engine_name;
2153 2156
2154 if (!ee) return NULL; 2157 if (!ee) return NULL;
@@ -2159,7 +2162,7 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee)
2159 if ((!strcmp(engine_name, ELM_WAYLAND_SHM)) || 2162 if ((!strcmp(engine_name, ELM_WAYLAND_SHM)) ||
2160 (!strcmp(engine_name, ELM_WAYLAND_EGL))) 2163 (!strcmp(engine_name, ELM_WAYLAND_EGL)))
2161 { 2164 {
2162 return ecore_evas_wayland_window_get(ee); 2165 return ecore_evas_wayland_window_get2(ee);
2163 } 2166 }
2164#else 2167#else
2165 (void)ee; 2168 (void)ee;
@@ -2167,7 +2170,7 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee)
2167 return NULL; 2170 return NULL;
2168} 2171}
2169 2172
2170#ifdef HAVE_ELEMENTARY_WAYLAND 2173#ifdef HAVE_ELEMENTARY_WL2
2171static void 2174static void
2172_elm_win_wlwindow_get(Elm_Win_Data *sd) 2175_elm_win_wlwindow_get(Elm_Win_Data *sd)
2173{ 2176{
@@ -2657,11 +2660,11 @@ _elm_win_frame_cb_move_start(void *data,
2657 2660
2658 if (!sd) return; 2661 if (!sd) return;
2659 2662
2660#ifdef HAVE_ELEMENTARY_WAYLAND 2663#ifdef HAVE_ELEMENTARY_WL2
2661 if (!strcmp(source, "elm")) 2664 if (!strcmp(source, "elm"))
2662 ecore_wl_window_cursor_from_name_set(sd->wl.win, ELM_CURSOR_HAND1); 2665 ecore_wl2_window_cursor_from_name_set(sd->wl.win, ELM_CURSOR_HAND1);
2663 else 2666 else
2664 ecore_wl_window_cursor_default_restore(sd->wl.win); 2667 ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
2665#else 2668#else
2666 (void)source; 2669 (void)source;
2667#endif 2670#endif
@@ -2687,12 +2690,12 @@ _elm_win_frame_cb_move_stop(void *data,
2687 2690
2688 if (!sd) return; 2691 if (!sd) return;
2689 2692
2690#ifdef HAVE_ELEMENTARY_WAYLAND 2693#ifdef HAVE_ELEMENTARY_WL2
2691 ecore_wl_window_cursor_default_restore(sd->wl.win); 2694 ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
2692#endif 2695#endif
2693} 2696}
2694 2697
2695#ifdef HAVE_ELEMENTARY_WAYLAND 2698#ifdef HAVE_ELEMENTARY_WL2
2696struct _resize_info 2699struct _resize_info
2697{ 2700{
2698 const char *name; 2701 const char *name;
@@ -2755,35 +2758,35 @@ _elm_win_frame_cb_resize_show(void *data,
2755 if (!sd) return; 2758 if (!sd) return;
2756 if (sd->resizing) return; 2759 if (sd->resizing) return;
2757 2760
2758#ifdef HAVE_ELEMENTARY_WAYLAND 2761#ifdef HAVE_ELEMENTARY_WL2
2759 int i; 2762 int i;
2760 i = sd->rot / 90; 2763 i = sd->rot / 90;
2761 if (!strcmp(source, "elm.event.resize.t")) 2764 if (!strcmp(source, "elm.event.resize.t"))
2762 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2765 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2763 _border_side[(0 + i) % 4].name); 2766 _border_side[(0 + i) % 4].name);
2764 else if (!strcmp(source, "elm.event.resize.b")) 2767 else if (!strcmp(source, "elm.event.resize.b"))
2765 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2768 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2766 _border_side[(2 + i) % 4].name); 2769 _border_side[(2 + i) % 4].name);
2767 else if (!strcmp(source, "elm.event.resize.l")) 2770 else if (!strcmp(source, "elm.event.resize.l"))
2768 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2771 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2769 _border_side[(1 + i) % 4].name); 2772 _border_side[(1 + i) % 4].name);
2770 else if (!strcmp(source, "elm.event.resize.r")) 2773 else if (!strcmp(source, "elm.event.resize.r"))
2771 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2774 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2772 _border_side[(3 + i) % 4].name); 2775 _border_side[(3 + i) % 4].name);
2773 else if (!strcmp(source, "elm.event.resize.tl")) 2776 else if (!strcmp(source, "elm.event.resize.tl"))
2774 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2777 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2775 _border_corner[(0 + i) % 4].name); 2778 _border_corner[(0 + i) % 4].name);
2776 else if (!strcmp(source, "elm.event.resize.tr")) 2779 else if (!strcmp(source, "elm.event.resize.tr"))
2777 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2780 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2778 _border_corner[(3 + i) % 4].name); 2781 _border_corner[(3 + i) % 4].name);
2779 else if (!strcmp(source, "elm.event.resize.bl")) 2782 else if (!strcmp(source, "elm.event.resize.bl"))
2780 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2783 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2781 _border_corner[(1 + i) % 4].name); 2784 _border_corner[(1 + i) % 4].name);
2782 else if (!strcmp(source, "elm.event.resize.br")) 2785 else if (!strcmp(source, "elm.event.resize.br"))
2783 ecore_wl_window_cursor_from_name_set(sd->wl.win, 2786 ecore_wl2_window_cursor_from_name_set(sd->wl.win,
2784 _border_corner[(2 + i) % 4].name); 2787 _border_corner[(2 + i) % 4].name);
2785 else 2788 else
2786 ecore_wl_window_cursor_default_restore(sd->wl.win); 2789 ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
2787#else 2790#else
2788 (void)source; 2791 (void)source;
2789#endif 2792#endif
@@ -2800,8 +2803,8 @@ _elm_win_frame_cb_resize_hide(void *data,
2800 if (!sd) return; 2803 if (!sd) return;
2801 if (sd->resizing) return; 2804 if (sd->resizing) return;
2802 2805
2803#ifdef HAVE_ELEMENTARY_WAYLAND 2806#ifdef HAVE_ELEMENTARY_WL2
2804 ecore_wl_window_cursor_default_restore(sd->wl.win); 2807 ecore_wl2_window_cursor_from_name_set(sd->wl.win, NULL);
2805#endif 2808#endif
2806} 2809}
2807 2810
@@ -2811,7 +2814,7 @@ _elm_win_frame_cb_resize_start(void *data,
2811 const char *sig EINA_UNUSED, 2814 const char *sig EINA_UNUSED,
2812 const char *source) 2815 const char *source)
2813{ 2816{
2814#ifdef HAVE_ELEMENTARY_WAYLAND 2817#ifdef HAVE_ELEMENTARY_WL2
2815 ELM_WIN_DATA_GET(data, sd); 2818 ELM_WIN_DATA_GET(data, sd);
2816 int i; 2819 int i;
2817 2820
@@ -2914,7 +2917,7 @@ _elm_win_frame_cb_close(void *data,
2914 evas_object_unref(win); 2917 evas_object_unref(win);
2915} 2918}
2916 2919
2917#ifdef HAVE_ELEMENTARY_WAYLAND 2920#ifdef HAVE_ELEMENTARY_WL2
2918static void 2921static void
2919_elm_win_frame_pre_render(void *data, Evas *e EINA_UNUSED, void *ev EINA_UNUSED) 2922_elm_win_frame_pre_render(void *data, Evas *e EINA_UNUSED, void *ev EINA_UNUSED)
2920{ 2923{
@@ -2974,7 +2977,7 @@ _elm_win_frame_add(Elm_Win_Data *sd,
2974 (sd->frame_obj, EVAS_CALLBACK_MOVE, _elm_win_frame_obj_move, sd); 2977 (sd->frame_obj, EVAS_CALLBACK_MOVE, _elm_win_frame_obj_move, sd);
2975 evas_object_event_callback_add 2978 evas_object_event_callback_add
2976 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd); 2979 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd);
2977#ifdef HAVE_ELEMENTARY_WAYLAND 2980#ifdef HAVE_ELEMENTARY_WL2
2978 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE, _elm_win_frame_pre_render, sd); 2981 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE, _elm_win_frame_pre_render, sd);
2979#endif 2982#endif
2980 2983
@@ -3032,7 +3035,7 @@ _elm_win_frame_del(Elm_Win_Data *sd)
3032 (sd->frame_obj, EVAS_CALLBACK_MOVE, _elm_win_frame_obj_move, sd); 3035 (sd->frame_obj, EVAS_CALLBACK_MOVE, _elm_win_frame_obj_move, sd);
3033 evas_object_event_callback_del_full 3036 evas_object_event_callback_del_full
3034 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd); 3037 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd);
3035#ifdef HAVE_ELEMENTARY_WAYLAND 3038#ifdef HAVE_ELEMENTARY_WL2
3036 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_PRE, _elm_win_frame_pre_render, sd); 3039 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_PRE, _elm_win_frame_pre_render, sd);
3037#endif 3040#endif
3038 3041
@@ -3392,7 +3395,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3392 } 3395 }
3393#endif 3396#endif
3394 3397
3395#ifdef HAVE_ELEMENTARY_WAYLAND 3398#ifdef HAVE_ELEMENTARY_WL2
3396 else if ((disp) && (!strcmp(disp, "wl"))) 3399 else if ((disp) && (!strcmp(disp, "wl")))
3397 { 3400 {
3398 if (_accel_is_gl()) 3401 if (_accel_is_gl())
@@ -3473,7 +3476,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3473 } 3476 }
3474 } 3477 }
3475#endif 3478#endif
3476#ifdef HAVE_ELEMENTARY_WAYLAND 3479#ifdef HAVE_ELEMENTARY_WL2
3477 else if (!_elm_preferred_engine && 3480 else if (!_elm_preferred_engine &&
3478 getenv("WAYLAND_DISPLAY") && !getenv("ELM_ENGINE")) 3481 getenv("WAYLAND_DISPLAY") && !getenv("ELM_ENGINE"))
3479 { 3482 {
@@ -3500,7 +3503,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3500#ifdef HAVE_ELEMENTARY_X 3503#ifdef HAVE_ELEMENTARY_X
3501 enginelist[p++] = ELM_OPENGL_X11; 3504 enginelist[p++] = ELM_OPENGL_X11;
3502#endif 3505#endif
3503#ifdef HAVE_ELEMENTARY_WAYLAND 3506#ifdef HAVE_ELEMENTARY_WL2
3504 enginelist[p++] = ELM_WAYLAND_EGL; 3507 enginelist[p++] = ELM_WAYLAND_EGL;
3505#endif 3508#endif
3506#ifdef HAVE_ELEMENTARY_DRM 3509#ifdef HAVE_ELEMENTARY_DRM
@@ -3518,7 +3521,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3518#ifdef HAVE_ELEMENTARY_X 3521#ifdef HAVE_ELEMENTARY_X
3519 enginelist[p++] = ELM_SOFTWARE_X11; 3522 enginelist[p++] = ELM_SOFTWARE_X11;
3520#endif 3523#endif
3521#ifdef HAVE_ELEMENTARY_WAYLAND 3524#ifdef HAVE_ELEMENTARY_WL2
3522 enginelist[p++] = ELM_WAYLAND_SHM; 3525 enginelist[p++] = ELM_WAYLAND_SHM;
3523#endif 3526#endif
3524#ifdef HAVE_ELEMENTARY_WIN32 3527#ifdef HAVE_ELEMENTARY_WIN32
@@ -3545,7 +3548,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3545#ifdef HAVE_ELEMENTARY_X 3548#ifdef HAVE_ELEMENTARY_X
3546 enginelist[p++] = ELM_SOFTWARE_X11; 3549 enginelist[p++] = ELM_SOFTWARE_X11;
3547#endif 3550#endif
3548#ifdef HAVE_ELEMENTARY_WAYLAND 3551#ifdef HAVE_ELEMENTARY_WL2
3549 enginelist[p++] = ELM_WAYLAND_SHM; 3552 enginelist[p++] = ELM_WAYLAND_SHM;
3550#endif 3553#endif
3551#ifdef HAVE_ELEMENTARY_DRM 3554#ifdef HAVE_ELEMENTARY_DRM
@@ -3567,7 +3570,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3567#ifdef HAVE_ELEMENTARY_X 3570#ifdef HAVE_ELEMENTARY_X
3568 enginelist[p++] = ELM_OPENGL_X11; 3571 enginelist[p++] = ELM_OPENGL_X11;
3569#endif 3572#endif
3570#ifdef HAVE_ELEMENTARY_WAYLAND 3573#ifdef HAVE_ELEMENTARY_WL2
3571 enginelist[p++] = ELM_WAYLAND_EGL; 3574 enginelist[p++] = ELM_WAYLAND_EGL;
3572#endif 3575#endif
3573#ifdef HAVE_ELEMENTARY_DRM 3576#ifdef HAVE_ELEMENTARY_DRM
@@ -3714,7 +3717,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3714 } 3717 }
3715#endif 3718#endif
3716 3719
3717#ifdef HAVE_ELEMENTARY_WAYLAND 3720#ifdef HAVE_ELEMENTARY_WL2
3718 _elm_win_wlwindow_get(sd); 3721 _elm_win_wlwindow_get(sd);
3719#endif 3722#endif
3720 3723
@@ -5384,7 +5387,7 @@ _elm_win_xwindow_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
5384 return 0; 5387 return 0;
5385} 5388}
5386 5389
5387EAPI Ecore_Wl_Window * 5390EAPI Ecore_Wl2_Window *
5388elm_win_wl_window_get(const Evas_Object *obj) 5391elm_win_wl_window_get(const Evas_Object *obj)
5389{ 5392{
5390 ELM_WIN_CHECK(obj) NULL; 5393 ELM_WIN_CHECK(obj) NULL;
@@ -5402,15 +5405,15 @@ elm_win_wl_window_get(const Evas_Object *obj)
5402 return _elm_ee_wlwin_get(ee); 5405 return _elm_ee_wlwin_get(ee);
5403 } 5406 }
5404 5407
5405 Ecore_Wl_Window *ret = NULL; 5408 Ecore_Wl2_Window *ret = NULL;
5406 eo_do((Eo *) obj, ret = elm_obj_win_wl_window_get()); 5409 eo_do((Eo *) obj, ret = elm_obj_win_wl_window_get());
5407 return ret; 5410 return ret;
5408} 5411}
5409 5412
5410EOLIAN static Ecore_Wl_Window* 5413EOLIAN static Ecore_Wl2_Window*
5411_elm_win_wl_window_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd) 5414_elm_win_wl_window_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
5412{ 5415{
5413#if HAVE_ELEMENTARY_WAYLAND 5416#if HAVE_ELEMENTARY_WL2
5414 if (sd->wl.win) return sd->wl.win; 5417 if (sd->wl.win) return sd->wl.win;
5415 if (sd->parent) return elm_win_wl_window_get(sd->parent); 5418 if (sd->parent) return elm_win_wl_window_get(sd->parent);
5416#else 5419#else
@@ -5476,14 +5479,16 @@ _elm_win_window_id_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
5476 ((!strcmp(engine_name, ELM_WAYLAND_SHM)) || 5479 ((!strcmp(engine_name, ELM_WAYLAND_SHM)) ||
5477 (!strcmp(engine_name, ELM_WAYLAND_EGL))))) 5480 (!strcmp(engine_name, ELM_WAYLAND_EGL)))))
5478 { 5481 {
5479#if HAVE_ELEMENTARY_WAYLAND 5482#if HAVE_ELEMENTARY_WL2
5480 if (sd->wl.win) return (Ecore_Window)ecore_wl_window_surface_id_get(sd->wl.win); 5483 if (sd->wl.win)
5484 return (Ecore_Window)ecore_wl2_window_surface_id_get(sd->wl.win);
5481 if (sd->parent) 5485 if (sd->parent)
5482 { 5486 {
5483 Ecore_Wl_Window *parent; 5487 Ecore_Wl2_Window *parent;
5484 5488
5485 parent = elm_win_wl_window_get(sd->parent); 5489 parent = elm_win_wl_window_get(sd->parent);
5486 if (parent) return (Ecore_Window)ecore_wl_window_surface_id_get(parent); 5490 if (parent)
5491 return (Ecore_Window)ecore_wl2_window_surface_id_get(parent);
5487 return 0; 5492 return 0;
5488 } 5493 }
5489#endif 5494#endif
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index 45410bb1a..c48ff3822 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -956,8 +956,8 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
956 } 956 }
957 @property wl_window { 957 @property wl_window {
958 get { 958 get {
959 [[Get the Ecore_Wl_Window of an Evas_Object.]] 959 [[Get the Ecore_Wl2_Window of an Evas_Object.]]
960 return: Ecore_Wl_Window *; [[The Ecore_Wl_Window of $obj.]] 960 return: Ecore_Wl2_Window *; [[The Ecore_Wl2_Window of $obj.]]
961 legacy: null; 961 legacy: null;
962 } 962 }
963 } 963 }
diff --git a/src/lib/elm_win_legacy.h b/src/lib/elm_win_legacy.h
index 883b3756d..22b0fec11 100644
--- a/src/lib/elm_win_legacy.h
+++ b/src/lib/elm_win_legacy.h
@@ -195,7 +195,7 @@ EAPI void elm_win_render(Evas_Object *obj);
195 * 195 *
196 * @ingroup Win 196 * @ingroup Win
197 */ 197 */
198EAPI Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj); 198EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const Evas_Object *obj);
199 199
200/** 200/**
201 * Set the preferred rotation value. 201 * Set the preferred rotation value.