Change-Id: Ib582d4d40ccaebf24c2990a4a0d04bcc1a266f72
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
*/
void App::surface_created(uint32_t surface_id)
{
*/
void App::surface_created(uint32_t surface_id)
{
+ // For set role function
+ HMI_DEBUG("wm", "Get surface pid");
+ this->controller->get_surface_properties(surface_id);
+
auto layer_id = this->layers.get_layer_id(surface_id);
if (!layer_id)
{
auto layer_id = this->layers.get_layer_id(surface_id);
if (!layer_id)
{
app_list->removeSurface(surface_id);
}
app_list->removeSurface(surface_id);
}
+void App::surface_properties(unsigned surface_id, unsigned pid)
+{
+ HMI_DEBUG("wm", "get surface properties");
+ this->app_list->addFloatingSurface(surface_id, pid);
+}
+
void App::emit_activated(char const *label)
{
this->send_event(kListEventName[Event_Active], label);
void App::emit_activated(char const *label)
{
this->send_event(kListEventName[Event_Active], label);
if(0 != pid){
// search floating surfaceID from pid if pid is designated.
// It is not good that application request with its pid
if(0 != pid){
// search floating surfaceID from pid if pid is designated.
// It is not good that application request with its pid
- wm_err = app_list->lookUpFloatingSurface(pid, &surface);
+ wm_err = app_list->popFloatingSurface(pid, &surface);
}
else{
// get floating surface with appid. If WM queries appid from pid,
// WM can bind surface and role with appid(not implemented yet)
}
else{
// get floating surface with appid. If WM queries appid from pid,
// WM can bind surface and role with appid(not implemented yet)
- //wm_err = app_list->lookUpFloatingSurface(id);
+ //wm_err = app_list->popFloatingSurface(id);
}
if(wm_err != WMError::SUCCESS){
HMI_ERROR("wm", "No floating surface for app: %s", id.c_str());
}
if(wm_err != WMError::SUCCESS){
HMI_ERROR("wm", "No floating surface for app: %s", id.c_str());
this->app->surface_removed(surface_id);
}
this->app->surface_removed(surface_id);
}
+void controller_hooks::surface_properties(uint32_t surface_id, uint32_t pid)
+{
+ this->app->surface_properties(surface_id, pid);
+}
+
void controller_hooks::surface_visibility(uint32_t /*surface_id*/,
uint32_t /*v*/) {}
void controller_hooks::surface_visibility(uint32_t /*surface_id*/,
uint32_t /*v*/) {}
// Events from the compositor we are interested in
void surface_created(uint32_t surface_id);
void surface_removed(uint32_t surface_id);
// Events from the compositor we are interested in
void surface_created(uint32_t surface_id);
void surface_removed(uint32_t surface_id);
+ void surface_properties(uint32_t surface_id, uint32_t pid);
// Do not use this function
//static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);
// Do not use this function
//static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);
return this->current_req;
}
return this->current_req;
}
-WMError AppList::lookUpFloatingSurface(unsigned pid, unsigned *surface)
+WMError AppList::popFloatingSurface(unsigned pid, unsigned *surface)
{
WMError ret = WMError::NO_ENTRY;
{
WMError ret = WMError::NO_ENTRY;
-WMError AppList::lookUpFloatingSurface(const std::string &appid, unsigned *surface)
+WMError AppList::popFloatingSurface(const std::string &appid, unsigned *surface)
{
HMI_ERROR("wm", "This function is not implemented");
return WMError::SUCCESS;
{
HMI_ERROR("wm", "This function is not implemented");
return WMError::SUCCESS;
int countClient() const;
std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
void removeSurface(unsigned surface);
int countClient() const;
std::shared_ptr<WMClient> lookUpClient(const std::string &appid);
void removeSurface(unsigned surface);
- WMError lookUpFloatingSurface(unsigned pid, unsigned *surface);
- WMError lookUpFloatingSurface(const std::string &appid, unsigned *surface);
+ WMError popFloatingSurface(unsigned pid, unsigned *surface);
+ WMError popFloatingSurface(const std::string &appid, unsigned *surface);
WMError appendRole(const std::string &appid, const std::string &role, unsigned surface);
void addFloatingClient(const std::string &appid, unsigned layer, const std::string &role);
void addFloatingSurface(unsigned surface, unsigned pid);
WMError appendRole(const std::string &appid, const std::string &role, unsigned surface);
void addFloatingClient(const std::string &appid, unsigned layer, const std::string &role);
void addFloatingSurface(unsigned surface, unsigned pid);
void surface_removed(uint32_t surface_id);
void surface_visibility(uint32_t surface_id, uint32_t v);
void surface_destination_rectangle(uint32_t surface_id, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
void surface_removed(uint32_t surface_id);
void surface_visibility(uint32_t surface_id, uint32_t v);
void surface_destination_rectangle(uint32_t surface_id, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
+ void surface_properties(uint32_t surface_id, uint32_t pid);
HMI_DEBUG("wm", "compositor::surface %s @ %d f %u pid %u",
__func__, surface_id, frame_count, pid);
this->sprops[s->id].id = pid;
HMI_DEBUG("wm", "compositor::surface %s @ %d f %u pid %u",
__func__, surface_id, frame_count, pid);
this->sprops[s->id].id = pid;
+ this->chooks->surface_properties(surface_id, pid);
}
void controller::surface_created(uint32_t id)
}
void controller::surface_created(uint32_t id)