From: Wonsik Jung Date: Wed, 14 Dec 2022 03:32:06 +0000 (+0900) Subject: [Tizen] Check window resize issue X-Git-Tag: accepted/tizen/unified/20221226.020934~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F285521%2F1;p=platform%2Fupstream%2Fefl.git [Tizen] Check window resize issue Check window resize issue at multiview issue Change-Id: I59723cefd2f7d9f7de2c73734d522456ba87d9d9 --- diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index 49a0213..aa30d64 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -1159,6 +1159,8 @@ _ecore_wl2_window_surface_create(Ecore_Wl2_Window *window) wl_display_roundtrip(window->display->wl.display); } } + + ERR("_ecore_wl2_window_surface_create, win %p, surface: %p\n", window, window->surface); } static void @@ -1224,6 +1226,8 @@ ecore_wl2_window_new(Ecore_Wl2_Display *display, Ecore_Wl2_Window *parent, int x if (!win) return NULL; display->refs++; + ERR("ecore_wl2_window_new, %d, %d, %d, %d\n", x, y, w, h); + win->display = display; win->parent = parent; win->id = _win_id++; @@ -2847,6 +2851,8 @@ ecore_wl2_window_rotation_geometry_set(Ecore_Wl2_Window *win, int rot, int x, in if ((rot % 90 != 0) || (rot / 90 > 3) || (rot < 0)) return; + ERR("[WINDOW] ecore_wl2_window_rotation_geometry_set, win-%p, rot, %d, %d, %d, %d\n", win, rot, x, y, w, h); + i = rot / 90; win->wm_rot.geometry_hints[i].x = x; win->wm_rot.geometry_hints[i].y = y; @@ -4415,6 +4421,9 @@ ecore_wl2_window_sync_geometry_set(Ecore_Wl2_Window *window, uint32_t serial, in window->set_config.geometry.y = y; window->set_config.geometry.w = w; window->set_config.geometry.h = h; + // TV_ONLY(20200912): Debug Logs + ERR("[WINDOW] ecore_wl2_window_sync_geometry_set, wl2_win-%p moveresize-%p (%d %d %d %d)", window, window->display->wl.tz_moveresize, x, y, w, h); + // if (window->display->wl.tz_moveresize) tizen_move_resize_set_geometry(window->display->wl.tz_moveresize, window->surface, serial, x, y, w, h); @@ -4447,6 +4456,7 @@ ecore_wl2_egl_window_create(Ecore_Wl2_Window *window, int w, int h) EINA_SAFETY_ON_FALSE_RETURN_VAL((h >= 0), NULL); native_win = wl_egl_window_create(window->surface, w, h); + ERR("[WINDOW], wl_egl_window_create, wl_surface: %p, native_win: %p, w: %d, h: %d\n", window->surface, native_win, w, h); EINA_SAFETY_ON_NULL_RETURN_VAL(native_win, NULL); egl_win = calloc(1, sizeof(Ecore_Wl2_Egl_Window)); @@ -4505,6 +4515,9 @@ ecore_wl2_egl_window_resize_with_rotation(Ecore_Wl2_Egl_Window *egl_win, int dx, egl_win->dy = dy; egl_win->w = w; egl_win->h = h; + // TV_ONLY(20200912): Debug Logs + ERR("[WINDOW] wl2_win-%p rot-%d (%d %d %d %d)", egl_win->native_win, rotation, dx, dy, w, h); + // if (egl_win->support_pre_rotation) wl_egl_window_tizen_set_rotation(egl_win->native_win, egl_win->rot.win); @@ -4521,9 +4534,15 @@ ecore_wl2_egl_window_resize_with_rotation(Ecore_Wl2_Egl_Window *egl_win, int dx, // if ((egl_win->rot.buffer == 90) || (egl_win->rot.buffer == 270)) + { + ERR("[WINDOW] wl_egl_window_resize, win: %p, buffer_rot: %d, win_rot: %d, (%d %d %d %d)", egl_win->win, egl_win->rot.buffer, egl_win->rot.win, dx, dy, h, w); wl_egl_window_resize(egl_win->native_win, h, w, dx, dy); + } else + { + ERR("[WINDOW] wl_egl_window_resize, win: %p, buffer_rot: %d, win_rot: %d, (%d %d %d %d)", egl_win->win, egl_win->rot.buffer, egl_win->rot.win, dx, dy, w, h); wl_egl_window_resize(egl_win->native_win, w, h, dx, dy); + } } // 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 96e957b..932e422 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 @@ -1023,6 +1023,8 @@ _ecore_evas_wl_common_cb_window_rotate(void *data EINA_UNUSED, int type EINA_UNU } } + ERR("ECORE_WL2_EVENT_WINDOW_ROTATE, event angle:%d, event_w:%d, event_h:%d, w:%d, h:%d\n", ev->angle, ev->w, ev->h, nw, nh); + /* TIZEN_ONLY: if the width or height are zero, it means the client should decide its own window dimension. */ if (nw > 0 && nh > 0) diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index 09081d9..4b8828d 100755 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -450,6 +450,8 @@ evgl_eng_native_window_create(void *data) return NULL; } + ERR("[WINDOW], wl_egl_window_create, wl_surface: %p, native_win: %p, w: 1, h: 1\n", wls, win); + return (void *)win; } diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c index a11c9d5..0b7d2ec 100755 --- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c +++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c @@ -249,9 +249,17 @@ try_again: if (gw->h < 1) gw->h = 1; if ((gw->rot == 0) || (gw->rot == 180)) + { + ERR("[WINDOW], wl_egl_window_create, wl_surface: %p, native_win: %p, w: %d, h: %d, rotate: %d\n", wl_surface, gw->win, gw->w, gw->h, gw->rot); gw->win = wl_egl_window_create(wl_surface, gw->w, gw->h); + } else if ((gw->rot == 90) || (gw->rot == 270)) + { + ERR("[WINDOW], wl_egl_window_create, wl_surface: %p, native_win: %p, w: %d, h: %d, rotate: %d\n", wl_surface, gw->win, gw->h, gw->w, gw->rot); gw->win = wl_egl_window_create(wl_surface, gw->h, gw->w); + } + + if (gw->win == NULL) { @@ -518,9 +526,15 @@ eng_window_resurf(Outbuf *gw) { wls = ecore_wl2_window_surface_get(gw->wl2_win); if ((gw->rot == 0) || (gw->rot == 180)) + { + ERR("[WINDOW], wl_egl_window_create, wl_surface: %p, native_win: %p, w: %d, h: %d, rotate: %d\n", wls, gw->win, gw->w, gw->h, gw->rot); gw->win = wl_egl_window_create(wls, gw->w, gw->h); + } else if ((gw->rot == 90) || (gw->rot == 270)) + { + ERR("[WINDOW], wl_egl_window_create, wl_surface: %p, native_win: %p, w: %d, h: %d, rotate: %d\n", wls, gw->win, gw->h, gw->w, gw->rot); gw->win = wl_egl_window_create(wls, gw->h, gw->w); + } // TIZEN_ONLY(20171123) : temporary patch */ if (gw->win == NULL) { @@ -586,9 +600,15 @@ eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EIN // if ((ob->rot == 90) || (ob->rot == 270)) + { + ERR("[WINDOW] wl_egl_window_resize is called, win: %p rotation: %d, (%d %d %d %d)", ob->win, ob->rot, dx, dy, h, w); wl_egl_window_resize(ob->win, h, w, dx, dy); + } else + { + ERR("[WINDOW] wl_egl_window_resize is called, win: %p rotation: %d, (%d %d %d %d)", ob->win, ob->rot, dx, dy, w, h); wl_egl_window_resize(ob->win, w, h, dx, dy); + } } }