DSKeyboard: add resetFocus(), fix setFocus() and log

Change-Id: I5c76e29b4188a88ca88d89afd670322973de59da
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/src/DSSeat/DSKeyboard.cpp b/src/DSSeat/DSKeyboard.cpp
index e9a8345..c97f7e7 100644 (file)
--- a/src/DSSeat/DSKeyboard.cpp
+++ b/src/DSSeat/DSKeyboard.cpp
@@ -117,6 +117,9 @@ void DSKeyboard::setFocus(std::shared_ptr<DSWindow> window)
        if (!window)
        {
                DSLOG_ERR("DSKeyboard", "Given window is INVALID. (window : %p)", window);
+               __kbdFocus = window;
+               if (__dswlKeyboard)
+                       __dswlKeyboard->setFocus(nullptr);
                return;
        }
 
@@ -124,11 +127,11 @@ void DSKeyboard::setFocus(std::shared_ptr<DSWindow> window)
 
        if (!waylandSurface)
        {
-               DSLOG_ERR("DSKeyboard", "Wayland surface of the given window is INVALID. (window : %p, surface : %p)", window, waylandSurface);
+               DSLOG_ERR("DSKeyboard", "Wayland surface of the given window is INVALID. (window : %p (%p), surface : %p)", window, window.get(), waylandSurface);
                return;
        }
 
-       DSLOG_INF("DSKeyboard", "focus window has been changed. (%p -> %p)", __kbdFocus, window);
+       DSLOG_INF("DSKeyboard", "focus window has been changed. (%p -> %p)", __kbdFocus ? __kbdFocus.get() : nullptr, window ? window.get() : nullptr);
        __kbdFocus = window;
 
        if (!__dswlKeyboard)
@@ -141,6 +144,18 @@ void DSKeyboard::setFocus(std::shared_ptr<DSWindow> window)
 
 }
 
+void DSKeyboard::resetFocus()
+{
+       if (__kbdFocus)
+       {
+               __kbdFocus = nullptr;
+               DSLOG_INF("DSKeyboard", "kbdFocus has been reset.");
+       }
+
+       if (__dswlKeyboard)
+               __dswlKeyboard->resetFocus();
+}
+
 std::shared_ptr<DSWindow> DSKeyboard::getFocus()
 {
        return __kbdFocus;

diff --git a/src/DSSeat/DSKeyboard.h b/src/DSSeat/DSKeyboard.h
index 45c844f..2e6e4dd 100644 (file)
--- a/src/DSSeat/DSKeyboard.h
+++ b/src/DSSeat/DSKeyboard.h
@@ -53,6 +53,7 @@ public:
        void setRepeatDelay(uint32_t delay);
 
        void setFocus(std::shared_ptr<DSWindow> window);
+       void resetFocus();
        std::shared_ptr<DSWindow> getFocus();
 
 private: