openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2025-01-10 00:41:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!86 revert修复MMI时间消耗问题

Browse Source 
Merge pull request !86 from Karl/revert_fix_mmi_timing
This commit is contained in:
openharmony_ci 2021-11-10 09:28:41 +00:00 committed by Gitee
commit a76843246d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frameworks/wmserver/src/wmserver.c
View File

@ -62,6 +62,7 @@ struct WindowSurface {
struct ivi_layout_surface *layoutSurface;
struct weston_surface *surface;
struct wl_listener surfaceDestroyListener;
struct wl_listener propertyChangedListener;
uint32_t surfaceId;
uint32_t screenId;
@ -553,8 +554,6 @@ static void ControllerCommitChanges(struct wl_client *client,
ctx->pLayoutInterface->commit_changes();
ScreenInfoChangerNotify();
LOGD("end.");
}
@ -1046,6 +1045,7 @@ static bool SetWindowFocus(const struct WindowSurface *surface)
#ifndef USE_IVI_INPUT_FOCUS
PointerSetFocus(pSeat);
#endif
SeatInfoChangerNotify();
LOGD("end.");
return true;
@ -1160,13 +1160,11 @@ static void ControllerSetWindowTop(struct wl_client *client,
LOGE("SetWindowFocus failed.");
wms_send_reply_error(resource, WMS_ERROR_INNER_ERROR);
wl_client_flush(wl_resource_get_client(resource));
SeatInfoChangerNotify();
return;
}
wms_send_reply_error(resource, WMS_ERROR_OK);
wl_client_flush(wl_resource_get_client(resource));
SeatInfoChangerNotify();
LOGD("end.");
}
@ -1176,6 +1174,7 @@ static void SurfaceDestroy(const struct WindowSurface *surface)
LOGD("surfaceId:%{public}d start.", surface->surfaceId);
wl_list_remove(&surface->surfaceDestroyListener.link);
wl_list_remove(&surface->propertyChangedListener.link);
if (surface->layoutSurface != NULL) {
surface->controller->pWmsCtx->pLayoutInterface->surface_destroy(
@ -1200,7 +1199,6 @@ static void SurfaceDestroy(const struct WindowSurface *surface)
SendGlobalWindowStatus(surface->controller, surface->surfaceId, WMS_WINDOW_STATUS_DESTROYED);
SeatInfoChangerNotify();
ScreenInfoChangerNotify();
free(surface);
@ -1236,6 +1234,13 @@ static void ControllerDestroyWindow(struct wl_client *client,
LOGD("end.");
}
static void WindowPropertyChanged(struct wl_listener *listener, void *data)
{
LOGD("start.");
ScreenInfoChangerNotify();
LOGD("end.");
}
static void WindowSurfaceDestroy(const struct wl_listener *listener,
const struct weston_compositor *data)
{
@ -1307,6 +1312,9 @@ static void CreateWindow(struct WmsController *pWmsController,
pWindow->surfaceDestroyListener.notify = WindowSurfaceDestroy;
wl_signal_add(&pWestonSurface->destroy_signal, &pWindow->surfaceDestroyListener);
pWindow->propertyChangedListener.notify = WindowPropertyChanged;
wl_signal_add(&pWindow->layoutSurface->property_changed, &pWindow->propertyChangedListener);
wms_send_window_status(pWlResource, WMS_WINDOW_STATUS_CREATED, windowId,
pWindow->x, pWindow->y, pWindow->width, pWindow->height);
wl_client_flush(wl_resource_get_client(pWlResource));