diff options
18 files changed, 41 insertions, 47 deletions
diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt index 3e604a5..d4fc24c 100644 --- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt +++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt @@ -39,6 +39,7 @@ include_directories( link_directories( ${WAYLAND_SERVER_LIBRARY_DIRS} ${PIXMAN_LIBRARY_DIRS} + ${LIBWESTON_DESKTOP_LIBRARY_DIRS} ) diff --git a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c index 8f0c199..0c8b532 100644 --- a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c +++ b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c @@ -28,7 +28,7 @@ #include <weston.h> #include <libweston-6/libweston-desktop.h> #include "config-parser.h" -#include <weston/ivi-layout-export.h> +#include <ivi-layout-export.h> #ifndef INVALID_ID #define INVALID_ID 0xFFFFFFFF @@ -365,8 +365,10 @@ ivi_failed: static int32_t deinit(struct ivi_id_agent *ida) { - struct db_elem *db_elem; - wl_list_for_each(db_elem, &ida->app_list, link) { + struct db_elem *db_elem, *dl_elem_next; + wl_list_for_each_safe(db_elem, dl_elem_next, &ida->app_list, link) { + wl_list_remove(&db_elem->link); + free(db_elem->cfg_app_id); free(db_elem->cfg_title); free(db_elem); diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c index b4d54d1..52fc6ab 100644 --- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c +++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c @@ -25,7 +25,7 @@ #include <string.h> #include <weston.h> -#include <weston/ivi-layout-export.h> +#include <ivi-layout-export.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h index 1fb10af..f281c3e 100644 --- a/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h +++ b/ivi-layermanagement-api/ilmClient/include/ilm_client_platform.h @@ -35,7 +35,7 @@ typedef struct _ILM_CLIENT_PLATFORM_FUNC ilmErrorTypes (*destroy)(); } ILM_CLIENT_PLATFORM_FUNC; -ILM_CLIENT_PLATFORM_FUNC gIlmClientPlatformFunc; +extern ILM_CLIENT_PLATFORM_FUNC gIlmClientPlatformFunc; void init_ilmClientPlatformTable(); diff --git a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c index 55b1621..12052f8 100644 --- a/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c +++ b/ivi-layermanagement-api/ilmClient/src/ilm_client_wayland_platform.c @@ -27,6 +27,8 @@ #include "wayland-util.h" #include "ivi-application-client-protocol.h" +ILM_CLIENT_PLATFORM_FUNC gIlmClientPlatformFunc; + static ilmErrorTypes wayland_surfaceCreate(t_ilm_nativehandle nativehandle, t_ilm_int width, t_ilm_int height, ilmPixelFormat pixelFormat, diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h b/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h index 4e7b55e..ec49467 100644 --- a/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h +++ b/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h @@ -32,7 +32,7 @@ typedef struct _ILM_COMMON_PLATFORM_FUNC ilmErrorTypes (*destroy)(); } ILM_COMMON_PLATFORM_FUNC; -ILM_COMMON_PLATFORM_FUNC gIlmCommonPlatformFunc; +extern ILM_COMMON_PLATFORM_FUNC gIlmCommonPlatformFunc; void init_ilmCommonPlatformTable(); diff --git a/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c b/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c index 7470d0d..eef842d 100644 --- a/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c +++ b/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c @@ -32,6 +32,8 @@ static t_ilm_nativedisplay wayland_getNativedisplay(void); static t_ilm_bool wayland_isInitialized(void); static ilmErrorTypes wayland_destroy(void); +ILM_COMMON_PLATFORM_FUNC gIlmCommonPlatformFunc; + void init_ilmCommonPlatformTable(void) { gIlmCommonPlatformFunc.init = wayland_init; diff --git a/ivi-layermanagement-api/ilmControl/CMakeLists.txt b/ivi-layermanagement-api/ilmControl/CMakeLists.txt index f6bc551..b0e6b22 100644 --- a/ivi-layermanagement-api/ilmControl/CMakeLists.txt +++ b/ivi-layermanagement-api/ilmControl/CMakeLists.txt @@ -65,7 +65,7 @@ add_custom_command( include_directories( include ${ILM_COMMON_INCLUDE_DIRS} - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_CLIENT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/ivi-layermanagement-api/ilmInput/CMakeLists.txt b/ivi-layermanagement-api/ilmInput/CMakeLists.txt index b4c794c..f2ed324 100644 --- a/ivi-layermanagement-api/ilmInput/CMakeLists.txt +++ b/ivi-layermanagement-api/ilmInput/CMakeLists.txt @@ -50,7 +50,7 @@ include_directories( include ${CMAKE_CURRENT_BINARY_DIR} ${ILM_CONTROL_INCLUDE_DIRS} - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_CLIENT_INCLUDE_DIRS} ) link_directories( diff --git a/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt b/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt index 76d8def..e8596e8 100644 --- a/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt +++ b/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt @@ -48,11 +48,11 @@ add_custom_command( ) include_directories( - ${GLESv2_INCLUDE_DIR} - ${EGL_INCLUDE_DIR} - ${WAYLAND_CLIENT_INCLUDE_DIR} - ${WAYLAND_CURSOR_INCLUDE_DIR} - ${FFI_INCLUDE_DIR} + ${GLESv2_INCLUDE_DIRS} + ${EGL_INCLUDE_DIRS} + ${WAYLAND_CLIENT_INCLUDE_DIRS} + ${WAYLAND_CURSOR_INCLUDE_DIRS} + ${FFI_INCLUDE_DIRS} "include" ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLContext.cpp b/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLContext.cpp index dedb5a8..edcbaff 100644 --- a/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLContext.cpp +++ b/ivi-layermanagement-examples/EGLWLInputEventExample/src/WLContext.cpp @@ -85,7 +85,6 @@ create_cursors(WLContext* wlContext) fprintf(stderr, "could not load default theme\n"); return; } - wlContext->SetWLCursor((wl_cursor*) malloc(sizeof(wl_cursor))); for (j = 0; !cursor && j < ARRAY_SIZE(left_ptrs); ++j) cursor = wl_cursor_theme_get_cursor(wlContext->GetWLCursorTheme(), @@ -171,11 +170,10 @@ WLContext::SeatHandleCapabilities(void* data, struct wl_seat* seat, uint32_t cap context->ctx->SetPointerSurface(NULL); } - if (context->ctx->GetWLCursorTheme()) + if (context->ctx->GetWLCursorTheme()){ wl_cursor_theme_destroy(context->ctx->GetWLCursorTheme()); - - if (context->ctx->GetWLCursor()) - free(context->ctx->GetWLCursor()); + context->ctx->SetWLCursor(NULL); + } } if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !context->wlKeyboard){ @@ -236,11 +234,11 @@ WLContext::DestroyWLContext() m_pointerSurface = NULL; } - if (m_wlCursorTheme) + if (m_wlCursorTheme){ wl_cursor_theme_destroy(m_wlCursorTheme); - - if (m_wlCursor) - free(m_wlCursor); + m_wlCursorTheme = NULL; + m_wlCursor = NULL; + } wl_registry_destroy(m_wlRegistry); wl_display_flush(m_wlDisplay); diff --git a/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt b/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt index aeb3269..5a01682 100644 --- a/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt +++ b/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories( "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include" "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmControl/include" "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmInput/include" - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_CLIENT_INCLUDE_DIRS} ) link_directories( diff --git a/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt b/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt index f846663..78db1af 100644 --- a/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt +++ b/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories( "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include" "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmClient/include" "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmControl/include" - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_CLIENT_INCLUDE_DIRS} ) link_directories( diff --git a/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt b/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt index b9036bf..2d0acac 100644 --- a/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt +++ b/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt @@ -56,7 +56,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${GLESv2_INCLUDE_DIRS} ${EGL_INCLUDE_DIRS} - ${WAYLAND_CLIENT_INCLUDE_DIR} + ${WAYLAND_CLIENT_INCLUDE_DIRS} ) link_directories( diff --git a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt index 0c4f5df..a324c84 100644 --- a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt +++ b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt @@ -80,10 +80,10 @@ if(${LIBWESTON_PROTOCOLS_FOUND}) endif(${LIBWESTON_PROTOCOLS_FOUND}) include_directories( - ${WAYLAND_CLIENT_INCLUDE_DIR} - ${WAYLAND_CURSOR_INCLUDE_DIR} + ${WAYLAND_CLIENT_INCLUDE_DIRS} + ${WAYLAND_CURSOR_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${DLT_INCLUDE_DIR} + ${DLT_INCLUDE_DIRS} ) link_directories( diff --git a/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c b/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c index a0632c7..1434c31 100644 --- a/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c +++ b/ivi-layermanagement-examples/simple-weston-client/src/simple-weston-client.c @@ -887,24 +887,8 @@ int main (int argc, const char * argv[]) Error: #ifdef LIBWESTON_DEBUG_PROTOCOL - weston_debug_v1_destroy(wlcontext->debug_iface); - - while (1) { - struct debug_stream *stream; - int empty = 1; - - wl_list_for_each(stream, &wlcontext->stream_list, link) - if (stream->obj) { - empty = 0; - break; - } - - if (empty) - break; - - if (wl_display_dispatch(wlcontext->wl_display) < 0) - break; - } + if(wlcontext->debug_iface) + weston_debug_v1_destroy(wlcontext->debug_iface); destroy_streams(wlcontext); wl_display_roundtrip(wlcontext->wl_display); diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt index 529f148..548c8ba 100644 --- a/protocol/CMakeLists.txt +++ b/protocol/CMakeLists.txt @@ -60,6 +60,11 @@ add_library(${PROJECT_NAME} SHARED ${CMAKE_CURRENT_BINARY_DIR}/ivi-application-protocol.c ) +target_link_libraries ( + ${PROJECT_NAME} + ${WAYLAND_CLIENT_LIBRARIES} +) + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC") diff --git a/weston-ivi-shell/src/ivi-controller.h b/weston-ivi-shell/src/ivi-controller.h index 00f5910..16dbe57 100644 --- a/weston-ivi-shell/src/ivi-controller.h +++ b/weston-ivi-shell/src/ivi-controller.h @@ -24,7 +24,7 @@ #define WESTON_IVI_SHELL_SRC_IVI_CONTROLLER_H_ #include "ivi-wm-server-protocol.h" -#include <weston/ivi-layout-export.h> +#include <ivi-layout-export.h> /* Convert timespec to milliseconds * |