X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwindow_manager.cpp;h=dec7752b8288787640830ff5c7b1abe963af7887;hb=845d2b5ed9f70d110fe731b8c5d17694523ce0e5;hp=5b7f5d817a6fc1405f98b7e9d1fea1c72ac9a3b9;hpb=1b5e2af2499199c8fa763fbe9769bd0bc2ed8c94;p=apps%2Fagl-service-windowmanager.git diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 5b7f5d8..dec7752 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -172,6 +172,9 @@ int WindowManager::init() lmcb.surfaceCreated = [&](unsigned pid, unsigned surface){ this->surface_created(surface); }; + lmcb.surfaceDestroyed = [&](unsigned surface){ + this->surface_removed(surface); + }; this->lc->init(lmcb); this->loadOldRoleDb(); @@ -201,7 +204,7 @@ int WindowManager::init() css_bg.w, css_bg.h, dp_bg.left(), dp_bg.top(), dp_bg.width(), dp_bg.height()); double scale = static_cast(dp_bg.height()) / css_bg.h; - this->lc->setupArea(scale); + this->lc->setupArea(dp_bg, scale); /* this->display->add_global_handler( "wl_output", [this](wl_registry *r, uint32_t name, uint32_t v) { @@ -741,7 +744,7 @@ void WindowManager::surface_created(uint32_t surface_id) { auto client = g_app_list.lookUpClient(appid); WMError ret = client->addSurface(surface_id); - HMI_INFO("Add surface %d to \"%s\"", appid.c_str()); + HMI_INFO("Add surface %d to \"%s\"", surface_id, appid.c_str()); if(ret != WMError::SUCCESS) { HMI_ERROR("Failed to add surface to client %s", client->appID().c_str()); @@ -1324,7 +1327,7 @@ WMError WindowManager::startTransition(unsigned req_num) //this->deactivate(client->surfaceID(x.role)); } */ } - this->lc->commitChange(); + this->lc->renderLayers(); ret = WMError::NO_LAYOUT_CHANGE; } return ret; @@ -1368,7 +1371,7 @@ WMError WindowManager::doEndDraw(unsigned req_num) //this->lc_enddraw(act.role.c_str()); } } - this->lc->commitChange(); + this->lc->renderLayers(); HMI_SEQ_INFO(req_num, "emit flushDraw");