X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=libhomescreen%2Fsrc%2Flibhomescreen.cpp;h=03c4baf0427e0a38843965e424f1375312600588;hb=337319e30026b0bae453dc7363f27469fa2ab526;hp=03e95d65052331820e2c1e667764d5ae52472b13;hpb=dd8c90f87463d370c3076e13b7c6cc0e27c0d2f5;p=staging%2FHomeScreen.git diff --git a/libhomescreen/src/libhomescreen.cpp b/libhomescreen/src/libhomescreen.cpp index 03e95d6..03c4baf 100644 --- a/libhomescreen/src/libhomescreen.cpp +++ b/libhomescreen/src/libhomescreen.cpp @@ -67,83 +67,71 @@ std::list LibHomeScreen::getAllSurfacesOfProcess(int pid) return result; } -sRectangle LibHomeScreen::getLayoutRenderAreaForSurfaceId(int surfaceId) +int LibHomeScreen::getSurfaceStatus(int surfaceId) { - sRectangle result; + int result; GError *err = NULL; GVariant *out_renderArea; - lib_home_screen_homescreen_call_get_layout_render_area_for_surface_id_sync( + lib_home_screen_homescreen_call_get_surface_status_sync( mp_libHomeScreenHomescreen_Proxy, surfaceId, - &out_renderArea, + &result, NULL, &err); if (NULL != err) { - fprintf(stderr, "Unable to call getLayoutRenderAreaForSurfaceId: %s\n", err->message); + fprintf(stderr, "Unable to call getSurfaceStatus: %s\n", err->message); } - g_variant_get(out_renderArea, "(iiii)", result.x, result.y, result.width, result.height); - return result; } -int LibHomeScreen::getSurfaceStatus(int surfaceId) +void LibHomeScreen::hardKeyPressed(int key) { - int result; GError *err = NULL; - GVariant *out_renderArea; - - lib_home_screen_homescreen_call_get_surface_status_sync( + lib_home_screen_homescreen_call_hard_key_pressed_sync( mp_libHomeScreenHomescreen_Proxy, - surfaceId, - &result, + key, NULL, &err); if (NULL != err) { - fprintf(stderr, "Unable to call getSurfaceStatus: %s\n", err->message); + fprintf(stderr, "Unable to call hardKeyPressed: %s\n", err->message); } - - return result; } -void LibHomeScreen::hardKeyPressed(int key) +void LibHomeScreen::renderSurfaceToArea(int surfaceId, int layoutArea) { GError *err = NULL; - lib_home_screen_homescreen_call_hard_key_pressed_sync( + lib_home_screen_homescreen_call_render_surface_to_area_sync( mp_libHomeScreenHomescreen_Proxy, - key, + surfaceId, + layoutArea, NULL, &err); if (NULL != err) { - fprintf(stderr, "Unable to call hardKeyPressed: %s\n", err->message); + fprintf(stderr, "Unable to call renderSurfaceToArea: %s\n", err->message); } } -void LibHomeScreen::renderSurfaceToArea(int surfaceId, const sRectangle &renderArea) +bool LibHomeScreen::renderSurfaceToAreaAllowed(int surfaceId, int layoutArea) { + gboolean result = true; GError *err = NULL; - GVariant *variant; - GVariantBuilder *builder; - builder = g_variant_builder_new(G_VARIANT_TYPE("(iiii)")); - g_variant_builder_add(builder, "(iiii)", renderArea.x, renderArea.y, renderArea.width, renderArea.height); - variant = g_variant_new("(iiii)", builder); - g_variant_builder_unref(builder); - - lib_home_screen_homescreen_call_render_surface_to_area_sync( + lib_home_screen_homescreen_call_render_surface_to_area_allowed_sync( mp_libHomeScreenHomescreen_Proxy, surfaceId, - variant, + layoutArea, + &result, NULL, &err); @@ -151,6 +139,8 @@ void LibHomeScreen::renderSurfaceToArea(int surfaceId, const sRectangle &renderA { fprintf(stderr, "Unable to call renderSurfaceToArea: %s\n", err->message); } + + return result; } void LibHomeScreen::requestSurfaceIdToFullScreen(int surfaceId)