From 4a656fc5877758632f206d34eb27517cdcbcfce9 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Tue, 8 Sep 2020 11:49:05 +0900 Subject: [PATCH] DSWaylandServer: define LCOV_EXCL blocks for event handling logics from client Change-Id: I9de1b0722e2acdfe3660a7adb68567e5243f5b9b Signed-off-by: Sung-Jin Park --- src/DSWaylandServer/DSWaylandCallback.cpp | 2 ++ src/DSWaylandServer/DSWaylandPointer.cpp | 14 ++------------ src/DSWaylandServer/DSWaylandTextInput.cpp | 2 ++ src/DSWaylandServer/DSWaylandTextInputManagerPrivate.h | 2 ++ src/DSWaylandServer/DSWaylandTizenAppinfo.cpp | 4 ++-- .../DSWaylandTizenInputDeviceManagerPrivate.h | 2 ++ 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/DSWaylandServer/DSWaylandCallback.cpp b/src/DSWaylandServer/DSWaylandCallback.cpp index 3e4ae9a..04a6047 100644 --- a/src/DSWaylandServer/DSWaylandCallback.cpp +++ b/src/DSWaylandServer/DSWaylandCallback.cpp @@ -27,6 +27,7 @@ namespace display_server { +/*LCOV_EXCL_START*/ DSWaylandCallbackPrivate::DSWaylandCallbackPrivate(DSWaylandCallback *p_ptr) : DSObjectPrivate(p_ptr) { @@ -52,5 +53,6 @@ DSWaylandCallback::DSWaylandCallback() DSWaylandCallback::~DSWaylandCallback() { } +/*LCOV_EXCL_STOP*/ } /* namespace display_server */ diff --git a/src/DSWaylandServer/DSWaylandPointer.cpp b/src/DSWaylandServer/DSWaylandPointer.cpp index 3ed7813..e856c64 100644 --- a/src/DSWaylandServer/DSWaylandPointer.cpp +++ b/src/DSWaylandServer/DSWaylandPointer.cpp @@ -51,14 +51,6 @@ void DSWaylandPointerPrivate::setFocus(DSWaylandSurface *waylandSurface) { DSLOG_INF("DSWaylandPointerPrivate", "pointer focus changed (%p -> %p)", __waylandSurface, waylandSurface); -#if 0 - if (__waylandSurface) - { - DSLOG_INF("DSWaylandPointerPrivate", "send leave to %p", __waylandSurface); - send_leave(__wlPointerResource, __waylandSurface->getWlResource()); - } -#endif - __waylandSurface = waylandSurface; if (!waylandSurface || !waylandSurface->hasResource()) @@ -68,6 +60,7 @@ void DSWaylandPointerPrivate::setFocus(DSWaylandSurface *waylandSurface) return; } + /*LCOV_EXCL_START*/ struct ::wl_resource *surface = waylandSurface->getWlResource(); auto client = wl_resource_get_client(surface); @@ -90,10 +83,7 @@ void DSWaylandPointerPrivate::setFocus(DSWaylandSurface *waylandSurface) DSLOG_INF("DSWaylandPointerPrivate", "no wlPointerResource available"); return; } -#if 0 - DSLOG_INF("DSWaylandPointerPrivate", "send enter to %p", __waylandSurface); - sendEnter(__wlPointerResource, __waylandSurface->getWlResource(), surface_x, surface_y); -#endif + /*LCOV_EXCL_STOP*/ } DSWaylandSurface *DSWaylandPointerPrivate::getFocus() diff --git a/src/DSWaylandServer/DSWaylandTextInput.cpp b/src/DSWaylandServer/DSWaylandTextInput.cpp index 820e8ba..d365121 100644 --- a/src/DSWaylandServer/DSWaylandTextInput.cpp +++ b/src/DSWaylandServer/DSWaylandTextInput.cpp @@ -29,6 +29,7 @@ namespace display_server { +/*LCOV_EXCL_START*/ DSWaylandTextInputManagerPrivate::DSWaylandTextInputManagerPrivate(DSWaylandTextInputManager *p_ptr, DSWaylandCompositor *compositor) : DSObjectPrivate(p_ptr), __p_ptr(p_ptr), @@ -1120,5 +1121,6 @@ DSWaylandSurface* DSWaylandTextInput::getClientSurface() return priv->__clientSurface; } +/*LCOV_EXCL_STOP*/ } diff --git a/src/DSWaylandServer/DSWaylandTextInputManagerPrivate.h b/src/DSWaylandServer/DSWaylandTextInputManagerPrivate.h index dfa815c..fa5d557 100644 --- a/src/DSWaylandServer/DSWaylandTextInputManagerPrivate.h +++ b/src/DSWaylandServer/DSWaylandTextInputManagerPrivate.h @@ -33,6 +33,7 @@ namespace display_server { +/*LCOV_EXCL_START*/ class DS_DECL_EXPORT DSWaylandTextInputManagerPrivate : public DSObjectPrivate, public DSWaylandServer::wl_text_input_manager { DS_PIMPL_USE_PUBLIC(DSWaylandTextInputManager); @@ -46,6 +47,7 @@ protected: private: DSWaylandCompositor *__compositor; }; +/*LCOV_EXCL_STOP*/ } diff --git a/src/DSWaylandServer/DSWaylandTizenAppinfo.cpp b/src/DSWaylandServer/DSWaylandTizenAppinfo.cpp index 852db56..8bfbd02 100644 --- a/src/DSWaylandServer/DSWaylandTizenAppinfo.cpp +++ b/src/DSWaylandServer/DSWaylandTizenAppinfo.cpp @@ -59,11 +59,11 @@ void DSWaylandTizenAppinfoPrivate::tizen_launch_appinfo_destroy_resource(Resourc { DSLOG_DBG("TizenAppinfoPriv", ""); } +/*LCOV_EXCL_START*/ void DSWaylandTizenAppinfoPrivate::tizen_launch_appinfo_destroy(Resource *resource) { DSLOG_DBG("TizenAppinfoPriv", ""); } -/*LCOV_EXCL_START*/ void DSWaylandTizenAppinfoPrivate::tizen_launch_appinfo_register_pid(Resource *resource, uint32_t pid) { DSLOG_DBG("TizenAppinfoPriv", ""); @@ -76,7 +76,6 @@ void DSWaylandTizenAppinfoPrivate::tizen_launch_appinfo_set_appid(Resource *reso { DSLOG_DBG("TizenAppinfoPriv", ""); } -/*LCOV_EXCL_STOP*/ void DSWaylandTizenAppinfoPrivate::tizen_launch_appinfo_get_base_output_resolution(Resource *resource, uint32_t pid) { @@ -122,6 +121,7 @@ void DSWaylandTizenAppinfoPrivate::tizen_launch_appinfo_ready_metadata(Resource { DSLOG_DBG("TizenAppinfoPriv", ""); } +/*LCOV_EXCL_STOP*/ DSWaylandTizenAppinfo::DSWaylandTizenAppinfo(DSWaylandCompositor *wlCompositor) : DS_INIT_PRIVATE_PTR(DSWaylandTizenAppinfo), diff --git a/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h b/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h index 3850af7..7c5eeb8 100644 --- a/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h +++ b/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h @@ -31,6 +31,7 @@ namespace display_server { +/*LCOV_EXCL_START*/ class DSWaylandTizenInputDeviceManagerPrivate : public DSObjectPrivate, public DSWaylandServer::tizen_input_device_manager { DS_PIMPL_USE_PUBLIC(DSWaylandTizenInputDeviceManager); @@ -61,6 +62,7 @@ protected: private: struct ::wl_display *__display; }; +/*LCOV_EXCL_STOP*/ } -- 2.7.4