X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fxdg-launcher.git;a=blobdiff_plain;f=src%2Frunxdg.cpp;h=33d5324d7c143305313df4af3d45654e0368ad43;hp=5553ff5ddc0f12bf3726a37a4ed0d5176bb87f03;hb=415e5cbb5787aa0429558b5256bf912231297431;hpb=bb595dc5286a2a41e81cac530d0b4550ffa35441 diff --git a/src/runxdg.cpp b/src/runxdg.cpp index 5553ff5..33d5324 100644 --- a/src/runxdg.cpp +++ b/src/runxdg.cpp @@ -35,6 +35,7 @@ #include "runxdg.hpp" #define RUNXDG_CONFIG "runxdg.toml" +#define AREA_NORMAL_FULL "normal.full" void fatal(const char* format, ...) { @@ -83,7 +84,8 @@ void RunXDG::notify_ivi_control_cb (ilmObjectType object, t_ilm_uint id, m_launcher->register_surfpid(surf_pid); if (m_launcher->m_rid && surf_pid == m_launcher->find_surfpid_by_rid(m_launcher->m_rid)) { - setup_surface(id); + m_ivi_id = id; + setup_surface(); } m_surfaces[surf_pid] = id; } else if (object == ILM_LAYER) { @@ -279,12 +281,16 @@ int RunXDG::init_wm (void) return -1; } - std::function< void(json_object*) > h_active = [](json_object* object) { + std::function< void(json_object*) > h_active = [this](json_object* object) { AGL_DEBUG("Got Event_Active"); + t_ilm_surface s_ids[1] = { this->m_ivi_id }; + ilm_setInputFocus(s_ids, 1, ILM_INPUT_DEVICE_KEYBOARD, ILM_TRUE); }; - std::function< void(json_object*) > h_inactive = [](json_object* object) { + std::function< void(json_object*) > h_inactive = [this](json_object* object) { AGL_DEBUG("Got Event_Inactive"); + t_ilm_surface s_ids[1] = { this->m_ivi_id }; + ilm_setInputFocus(s_ids, 1, ILM_INPUT_DEVICE_KEYBOARD, ILM_FALSE); }; std::function< void(json_object*) > h_visible = [](json_object* object) { @@ -298,10 +304,7 @@ int RunXDG::init_wm (void) std::function< void(json_object*) > h_syncdraw = [this](json_object* object) { AGL_DEBUG("Got Event_SyncDraw"); - json_object* obj = json_object_new_object(); - json_object_object_add(obj, this->m_wm->kKeyDrawingName, - json_object_new_string(this->m_role.c_str())); - this->m_wm->endDraw(obj); + this->m_wm->endDraw(this->m_role.c_str()); }; std::function< void(json_object*) > h_flushdraw= [](json_object* object) { @@ -327,26 +330,8 @@ int RunXDG::init_hs (void) } std::function< void(json_object*) > handler = [this] (json_object* object) { - json_object *val; - - if (json_object_object_get_ex(object, "application_name", &val)) { - const char *name = json_object_get_string(val); - - AGL_DEBUG("Event_TapShortcut <%s>", name); - - if (strcmp(name, this->m_role.c_str()) == 0) { - // check app exist and re-launch if needed - AGL_DEBUG("Activesurface %s ", this->m_role.c_str()); - - json_object *obj = json_object_new_object(); - json_object_object_add(obj, this->m_wm->kKeyDrawingName, - json_object_new_string(this->m_role.c_str())); - json_object_object_add(obj, this->m_wm->kKeyDrawingArea, - json_object_new_string("normal.full")); - - this->m_wm->activateSurface(obj); - } - } + AGL_DEBUG("Activesurface %s ", this->m_role.c_str()); + this->m_wm->activateWindow(this->m_role.c_str(), AREA_NORMAL_FULL); }; m_hs->set_event_handler(LibHomeScreen::Event_TapShortcut, handler); @@ -410,7 +395,29 @@ int RunXDG::parse_config (const char *path_to_config) auto params = app->get_array_of("params"); for (const auto& param : *params) { + // replace special string "@port@" and "@token@" + size_t found = param.find("@port@"); + if (found != std::string::npos) { + std::string sub1 = param.substr(0, found); + std::string sub2 = param.substr(found + 6, param.size() - found); + std::string str = sub1 + std::to_string(m_port) + sub2; + pl->m_args_v.push_back(str); + AGL_DEBUG("params[%s] (match @port@)", str.c_str()); + continue; + } + + found = param.find("@token@"); + if (found != std::string::npos) { + std::string sub1 = param.substr(0, found); + std::string sub2 = param.substr(found + 7, param.size() - found); + std::string str = sub1 + m_token + sub2; + pl->m_args_v.push_back(str); + AGL_DEBUG("params[%s] (match @token@)", str.c_str()); + continue; + } + pl->m_args_v.push_back(param); + AGL_DEBUG("params[%s]", param.c_str()); } @@ -449,31 +456,19 @@ RunXDG::RunXDG (int port, const char* token, const char* id) AGL_DEBUG("RunXDG created."); } -void RunXDG::setup_surface (int id) +void RunXDG::setup_surface (void) { - std::string sid = std::to_string(id); + std::string sid = std::to_string(m_ivi_id); // This surface is mine, register pair app_name and ivi id. - json_object *obj = json_object_new_object(); - json_object_object_add(obj, m_wm->kKeyDrawingName, - json_object_new_string(m_role.c_str())); - json_object_object_add(obj, m_wm->kKeyIviId, - json_object_new_string(sid.c_str())); - - AGL_DEBUG("requestSurfaceXDG(%s,%s)", m_role.c_str(), sid.c_str()); - m_wm->requestSurfaceXDG(obj); + AGL_DEBUG("requestSurfaceXDG(%s,%d)", m_role.c_str(), m_ivi_id); + m_wm->requestSurfaceXDG(this->m_role.c_str(), (unsigned int)m_ivi_id); if (m_pending_create) { // Recovering 1st time tap_shortcut is dropped because // the application has not been run yet (1st time launch) m_pending_create = false; - - json_object *obj = json_object_new_object(); - json_object_object_add(obj, m_wm->kKeyDrawingName, - json_object_new_string(m_role.c_str())); - json_object_object_add(obj, m_wm->kKeyDrawingArea, - json_object_new_string("normal.full")); - m_wm->activateSurface(obj); + m_wm->activateWindow(this->m_role.c_str(), AREA_NORMAL_FULL); } } @@ -566,6 +561,8 @@ void RunXDG::start (void) AGL_DEBUG("waiting for notification: surafce created"); m_pending_create = true; + ilm_commitChanges(); + // in case, target app has already run if (m_launcher->m_rid) { pid_t surf_pid = m_launcher->find_surfpid_by_rid(m_launcher->m_rid); @@ -577,10 +574,13 @@ void RunXDG::start (void) int id = itr->second; AGL_DEBUG("surface %d for <%s> already exists", id, m_role.c_str()); - setup_surface(id); + m_ivi_id = id; + setup_surface(); } } } + + ilm_commitChanges(); m_launcher->loop(e_flag); }