From e9b09f07f64cc25f7c60578c301e09ec959bb3ce Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Fri, 21 Aug 2020 10:23:42 +0900 Subject: [PATCH 01/16] DSWaylandTizenVisibility: add skeleton code Change-Id: I4d51f0f34118177d83f9a296caf1b5cc4e821dbd --- src/DSWaylandServer/DSWaylandTizenPolicy.cpp | 6 ++ src/DSWaylandServer/DSWaylandTizenPolicyPrivate.h | 2 + src/DSWaylandServer/DSWaylandTizenVisibility.cpp | 81 ++++++++++++++++++++++ src/DSWaylandServer/DSWaylandTizenVisibility.h | 50 +++++++++++++ .../DSWaylandTizenVisibilityPrivate.h | 58 ++++++++++++++++ src/meson.build | 1 + 6 files changed, 198 insertions(+) create mode 100644 src/DSWaylandServer/DSWaylandTizenVisibility.cpp create mode 100644 src/DSWaylandServer/DSWaylandTizenVisibility.h create mode 100644 src/DSWaylandServer/DSWaylandTizenVisibilityPrivate.h diff --git a/src/DSWaylandServer/DSWaylandTizenPolicy.cpp b/src/DSWaylandServer/DSWaylandTizenPolicy.cpp index 33e47b0..2a28cb5 100644 --- a/src/DSWaylandServer/DSWaylandTizenPolicy.cpp +++ b/src/DSWaylandServer/DSWaylandTizenPolicy.cpp @@ -24,6 +24,7 @@ #include "DSWaylandTizenPolicy.h" #include "DSWaylandTizenPolicyPrivate.h" +#include "DSWaylandTizenVisibility.h" #include "DSWaylandTizenPosition.h" const int TIZEN_POLICY_VERSION = 7; @@ -75,6 +76,11 @@ void DSWaylandTizenPolicyPrivate::tizen_policy_destroy_resource(Resource *resour void DSWaylandTizenPolicyPrivate::tizen_policy_get_visibility(Resource *resource, uint32_t id, struct ::wl_resource *surface) { DSLOG_DBG("TizenPolicyPriv", "get_visibility... resource:%p, id:%d", resource, id); + + std::shared_ptr tzVis = std::make_shared(resource->client(), id, TIZEN_POLICY_VERSION, surface); + __tzVisList.push_front(tzVis); + + // TODO: we have to remove tzVis when it's resource is destroyed } void DSWaylandTizenPolicyPrivate::tizen_policy_get_position(Resource *resource, uint32_t id, struct ::wl_resource *surface) diff --git a/src/DSWaylandServer/DSWaylandTizenPolicyPrivate.h b/src/DSWaylandServer/DSWaylandTizenPolicyPrivate.h index af39461..ac08165 100644 --- a/src/DSWaylandServer/DSWaylandTizenPolicyPrivate.h +++ b/src/DSWaylandServer/DSWaylandTizenPolicyPrivate.h @@ -31,6 +31,7 @@ namespace display_server { +class DSWaylandTizenVisibility; class DSWaylandTizenPosition; class DSWaylandTizenPolicyPrivate : public DSObjectPrivate, public DSWaylandServer::tizen_policy @@ -93,6 +94,7 @@ protected: private: DSWindowManager *__wm; std::list> __tzPosList; + std::list> __tzVisList; }; } diff --git a/src/DSWaylandServer/DSWaylandTizenVisibility.cpp b/src/DSWaylandServer/DSWaylandTizenVisibility.cpp new file mode 100644 index 0000000..3bc43ff --- /dev/null +++ b/src/DSWaylandServer/DSWaylandTizenVisibility.cpp @@ -0,0 +1,81 @@ +/* +* Copyright © 2020 Samsung Electronics co., Ltd. All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +*/ + +#include "DSWaylandTizenVisibility.h" +#include "DSWaylandTizenVisibilityPrivate.h" +#include "DSWindowManager.h" + +namespace display_server +{ + +DSWaylandTizenVisibilityPrivate::DSWaylandTizenVisibilityPrivate(DSWaylandTizenVisibility *p_ptr) + : DSObjectPrivate(p_ptr), + __p_ptr(p_ptr), + __wlSurface(nullptr), + __dswlSurface(nullptr) +{ +} + +DSWaylandTizenVisibilityPrivate::~DSWaylandTizenVisibilityPrivate() +{ +} + +void DSWaylandTizenVisibilityPrivate::init(struct ::wl_client *client, uint32_t id, int version, struct ::wl_resource *surface) +{ + tizen_visibility::init(client, id, version); + __wlSurface = surface; + __dswlSurface = DSWaylandSurface::fromWlResource(surface); +} + +void DSWaylandTizenVisibilityPrivate::tizen_visibility_bind_resource(Resource *resource) +{ +} + +void DSWaylandTizenVisibilityPrivate::tizen_visibility_destroy_resource(Resource *resource) +{ +} + +void DSWaylandTizenVisibilityPrivate::tizen_visibility_destroy(Resource *resource) +{ +} + + + +DSWaylandTizenVisibility::DSWaylandTizenVisibility(struct ::wl_client *client, uint32_t id, int version, struct ::wl_resource *surface) + : DSObject(), DS_INIT_PRIVATE_PTR(DSWaylandTizenVisibility) +{ + init(client, id, version, surface); +} + +DSWaylandTizenVisibility::~DSWaylandTizenVisibility() +{ +} + +void DSWaylandTizenVisibility::init(struct ::wl_client *client, uint32_t id, int version, struct ::wl_resource *surface) +{ + DS_GET_PRIV(DSWaylandTizenVisibility); + priv->init(client, id, version, surface); +} + + +} // namespace display_server diff --git a/src/DSWaylandServer/DSWaylandTizenVisibility.h b/src/DSWaylandServer/DSWaylandTizenVisibility.h new file mode 100644 index 0000000..a0fe5d3 --- /dev/null +++ b/src/DSWaylandServer/DSWaylandTizenVisibility.h @@ -0,0 +1,50 @@ +/* +* Copyright © 2020 Samsung Electronics co., Ltd. All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __DS_WAYLAND_TIZEN_VISIBILITY_H__ +#define __DS_WAYLAND_TIZEN_VISIBILITY_H__ + +#include "DSCore.h" +#include "DSObject.h" +#include "DSWaylandSurface.h" +#include + +namespace display_server +{ + +class DSWaylandTizenVisibilityPrivate; + +class DSWaylandTizenVisibility : public DSObject +{ +DS_PIMPL_USE_PRIVATE(DSWaylandTizenVisibility); + +public: + DSWaylandTizenVisibility(struct ::wl_client *client, uint32_t id, int version, struct ::wl_resource *surface); + ~DSWaylandTizenVisibility() override; + + void init(struct ::wl_client *client, uint32_t id, int version, struct ::wl_resource *surface); +}; + +} // namespace display_server + +#endif //__DS_WAYLAND_TIZEN_VISIBILITY_H__ diff --git a/src/DSWaylandServer/DSWaylandTizenVisibilityPrivate.h b/src/DSWaylandServer/DSWaylandTizenVisibilityPrivate.h new file mode 100644 index 0000000..9dfafab --- /dev/null +++ b/src/DSWaylandServer/DSWaylandTizenVisibilityPrivate.h @@ -0,0 +1,58 @@ +/* +* Copyright © 2020 Samsung Electronics co., Ltd. All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __DS_WAYLAND_TIZEN_VISIBILITY_PRIVATE__ +#define __DS_WAYLAND_TIZEN_VISIBILITY_PRIVATE__ + +#include "dswayland-server-tizen-extension.h" +#include "DSWaylandTizenVisibility.h" + +namespace display_server +{ + +class DSWaylandTizenVisibilityPrivate : public DSObjectPrivate, public DSWaylandServer::tizen_visibility +{ +DS_PIMPL_USE_PUBLIC(DSWaylandTizenVisibility); + +public: + DSWaylandTizenVisibilityPrivate() = delete; + DSWaylandTizenVisibilityPrivate(DSWaylandTizenVisibility *p_ptr); + ~DSWaylandTizenVisibilityPrivate() override; + + void init(struct ::wl_client *client, uint32_t id, int version, struct ::wl_resource *surface); + +protected: + void tizen_visibility_bind_resource(Resource *resource) override; + void tizen_visibility_destroy_resource(Resource *resource) override; + + void tizen_visibility_destroy(Resource *resource) override; + +private: + struct ::wl_resource *__wlSurface; + DSWaylandSurface *__dswlSurface; + +}; + +} + +#endif //__DS_WAYLAND_TIZEN_VISIBILITY_PRIVATE__ diff --git a/src/meson.build b/src/meson.build index 61eaa73..d1731f2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -114,6 +114,7 @@ libds_wayland_srcs = [ 'DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h', 'DSWaylandServer/DSWaylandTizenPolicy.cpp', 'DSWaylandServer/DSWaylandTizenPosition.cpp', + 'DSWaylandServer/DSWaylandTizenVisibility.cpp', 'DSWaylandServer/DSWaylandTizenSurface.cpp', 'DSWaylandServer/DSWaylandTizenSurface.h', 'DSWaylandServer/DSWaylandTizenSurfacePrivate.h', -- 2.7.4 From f098e7d30a54ab397c6e3ba6f33d6e00fdbad22c Mon Sep 17 00:00:00 2001 From: "Junseok, Kim" Date: Fri, 21 Aug 2020 15:20:49 +0900 Subject: [PATCH 02/16] DSWindowManager/DSZone/DSWindowShell/DSWindow: add codes to handle window's vkbd floating Change-Id: Id6c386e3505585c97feaee491798546f5de57ae3 Signed-off-by: Junseok, Kim --- src/DSWindow/DSWindow.cpp | 29 +++++++++++++++++++++- src/DSWindow/DSWindow.h | 3 +++ src/DSWindow/DSWindowPrivate.h | 5 ++++ src/DSWindowManager/DSWindowManager.cpp | 36 ++++++++++++++++++++++++++++ src/DSWindowManager/DSWindowManager.h | 3 +++ src/DSWindowManager/DSWindowManagerPrivate.h | 3 +++ src/DSWindowShell/DSWindowShell.cpp | 14 +++++++++++ src/DSWindowShell/DSWindowShell.h | 3 +++ src/DSWindowShell/DSWindowShellPrivate.cpp | 21 ++++++++++++++++ src/DSWindowShell/DSWindowShellPrivate.h | 3 +++ src/DSZone/DSZone.cpp | 15 ++++++++++++ src/DSZone/DSZone.h | 3 +++ 12 files changed, 137 insertions(+), 1 deletion(-) diff --git a/src/DSWindow/DSWindow.cpp b/src/DSWindow/DSWindow.cpp index 2b31ec1..ede2584 100644 --- a/src/DSWindow/DSWindow.cpp +++ b/src/DSWindow/DSWindow.cpp @@ -45,7 +45,8 @@ DSWindowPrivate::DSWindowPrivate(DSWindow *p_ptr) __firstCommit(true), __changedGeometry(false), __acceptsFocus(true), - __title("") + __title(""), + __vkbd_floating(false) { } @@ -157,6 +158,17 @@ void DSWindowPrivate::sendConfigure(void) } } +bool DSWindowPrivate::setVkbdFloating(bool set) +{ + __vkbd_floating = set; + return true; +} + +bool DSWindowPrivate::getVkbdFloating() +{ + return __vkbd_floating; +} + void DSWindowPrivate::__onSurfaceCommitted(std::shared_ptr waylandSurfaceCommitInfo) { DS_GET_PUB(DSWindow); @@ -367,6 +379,21 @@ void DSWindow::setSize(stSize size) priv->__changedGeometry = true; } + +bool DSWindow::setVkbdFloating(bool set) +{ + DS_GET_PRIV(DSWindow); + + return priv->setVkbdFloating(set); +} + +bool DSWindow::getVkbdFloating() +{ + DS_GET_PRIV(DSWindow); + + return priv->getVkbdFloating(); +} + DSWaylandSurface *DSWindow::surface() { DS_GET_PRIV(DSWindow); diff --git a/src/DSWindow/DSWindow.h b/src/DSWindow/DSWindow.h index eeb4a04..710f784 100644 --- a/src/DSWindow/DSWindow.h +++ b/src/DSWindow/DSWindow.h @@ -73,6 +73,9 @@ public: void setSize(unsigned int w, unsigned int h); void setSize(stSize size); + bool setVkbdFloating(bool set); + bool getVkbdFloating(); + DSWaylandSurface *surface(); bool setWindowShell(DSWindowShell *winShell); diff --git a/src/DSWindow/DSWindowPrivate.h b/src/DSWindow/DSWindowPrivate.h index b5a36f4..a6a8c7d 100644 --- a/src/DSWindow/DSWindowPrivate.h +++ b/src/DSWindow/DSWindowPrivate.h @@ -68,6 +68,9 @@ public: void sendConfigure(void); + bool setVkbdFloating(bool set); + bool getVkbdFloating(); + private: void __onSurfaceCommitted(std::shared_ptr waylandSurfaceCommitInfo); @@ -83,6 +86,8 @@ private: bool __changedGeometry; bool __acceptsFocus; std::string __title; + + bool __vkbd_floating; }; } diff --git a/src/DSWindowManager/DSWindowManager.cpp b/src/DSWindowManager/DSWindowManager.cpp index 818fd33..ecb0420 100644 --- a/src/DSWindowManager/DSWindowManager.cpp +++ b/src/DSWindowManager/DSWindowManager.cpp @@ -298,6 +298,30 @@ void DSWindowManagerPrivate::setWindowSkipFocus(DSWaylandSurface *dswlSurface, b } } +bool DSWindowManagerPrivate::setWindowVkbdFloating(DSWaylandSurface *dswlSurface, bool set) +{ + // find dswlSurface's window + DSZone *zone = __getZone(dswlSurface); + if (zone) + { + return zone->setWindowVkbdFloating(dswlSurface, set); + } + else + return false; +} + +bool DSWindowManagerPrivate::getWindowVkbdFloating(DSWaylandSurface *dswlSurface) +{ + // find dswlSurface's window + DSZone *zone = __getZone(dswlSurface); + if (zone) + { + return zone->getWindowVkbdFloating(dswlSurface); + } + else + return false; +} + DSWindowManager::DSWindowManager(DSObject *parent) : DS_INIT_PRIVATE_PTR(DSWindowManager) @@ -445,5 +469,17 @@ void DSWindowManager::setWindowSkipFocus(DSWaylandSurface *dswlSurface, bool set priv->setWindowSkipFocus(dswlSurface, set); } +bool DSWindowManager::setWindowVkbdFloating(DSWaylandSurface *dswlSurface, bool set) +{ + DS_GET_PRIV(DSWindowManager); + return priv->setWindowVkbdFloating(dswlSurface, set); +} + +bool DSWindowManager::getWindowVkbdFloating(DSWaylandSurface *dswlSurface) +{ + DS_GET_PRIV(DSWindowManager); + return priv->getWindowVkbdFloating(dswlSurface); +} + } // namespace display_server diff --git a/src/DSWindowManager/DSWindowManager.h b/src/DSWindowManager/DSWindowManager.h index ed69080..e7a135b 100644 --- a/src/DSWindowManager/DSWindowManager.h +++ b/src/DSWindowManager/DSWindowManager.h @@ -66,6 +66,9 @@ public: void setWindowSkipFocus(DSWaylandSurface *dswlSurface, bool set); + bool setWindowVkbdFloating(DSWaylandSurface *dswlSurface, bool set); + bool getWindowVkbdFloating(DSWaylandSurface *dswlSurface); + protected: private: diff --git a/src/DSWindowManager/DSWindowManagerPrivate.h b/src/DSWindowManager/DSWindowManagerPrivate.h index f1066a0..be3610c 100644 --- a/src/DSWindowManager/DSWindowManagerPrivate.h +++ b/src/DSWindowManager/DSWindowManagerPrivate.h @@ -61,6 +61,9 @@ public: void setWindowSkipFocus(DSWaylandSurface *dswlSurface, bool set); + bool setWindowVkbdFloating(DSWaylandSurface *dswlSurface, bool set); + bool getWindowVkbdFloating(DSWaylandSurface *dswlSurface); + private: DSZone *__getZone(DSWindow *window); DSZone *__getZone(DSWaylandSurface *surface); diff --git a/src/DSWindowShell/DSWindowShell.cpp b/src/DSWindowShell/DSWindowShell.cpp index 94029b0..a7c1550 100644 --- a/src/DSWindowShell/DSWindowShell.cpp +++ b/src/DSWindowShell/DSWindowShell.cpp @@ -288,6 +288,20 @@ const char* DSWindowShell::getRole(void) return priv->getRole(); } +bool DSWindowShell::setVkbdFloating(bool set) +{ + DS_GET_PRIV(DSWindowShell); + + return priv->setVkbdFloating(set); +} + +bool DSWindowShell::getVkbdFloating() +{ + DS_GET_PRIV(DSWindowShell); + + return priv->getVkbdFloating(); +} + void DSWindowShell::sendConfigure(void) { DS_GET_PRIV(DSWindowShell); diff --git a/src/DSWindowShell/DSWindowShell.h b/src/DSWindowShell/DSWindowShell.h index 53d2bcb..435d0ce 100644 --- a/src/DSWindowShell/DSWindowShell.h +++ b/src/DSWindowShell/DSWindowShell.h @@ -96,6 +96,9 @@ public: bool setRole(const char *role); const char* getRole(void); + bool setVkbdFloating(bool set); + bool getVkbdFloating(); + void sendConfigure(void); protected: diff --git a/src/DSWindowShell/DSWindowShellPrivate.cpp b/src/DSWindowShell/DSWindowShellPrivate.cpp index 56eee9b..dab6105 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.cpp +++ b/src/DSWindowShell/DSWindowShellPrivate.cpp @@ -295,6 +295,27 @@ const char* DSWindowShellPrivate::getRole(void) return nullptr; } +bool DSWindowShellPrivate::setVkbdFloating(bool set) +{ + if (__window) + { + __window->setVkbdFloating(set); + return true; + } + else + return false; +} + +bool DSWindowShellPrivate::getVkbdFloating() +{ + if (__window) + { + return __window->getVkbdFloating(); + } + else + return false; +} + void DSWindowShellPrivate::sendConfigure(void) { if (__shellSurface) diff --git a/src/DSWindowShell/DSWindowShellPrivate.h b/src/DSWindowShell/DSWindowShellPrivate.h index 8cebc66..d2c6273 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.h +++ b/src/DSWindowShell/DSWindowShellPrivate.h @@ -92,6 +92,9 @@ public: bool setRole(const char *role); const char* getRole(void); + bool setVkbdFloating(bool set); + bool getVkbdFloating(); + void sendConfigure(void); private: diff --git a/src/DSZone/DSZone.cpp b/src/DSZone/DSZone.cpp index 7ce4399..52c55f9 100644 --- a/src/DSZone/DSZone.cpp +++ b/src/DSZone/DSZone.cpp @@ -420,4 +420,19 @@ void DSZone::setWindowSkipFocus(DSWaylandSurface *dswlSurface, bool set) wShell->setSkipFocus(set); } +bool DSZone::setWindowVkbdFloating(DSWaylandSurface *dswlsurface, bool set) +{ + DSWindowShell *wShell = __findWindowShell(dswlsurface); + if (!wShell) return false; + + return wShell->setVkbdFloating(set); +} + +bool DSZone::getWindowVkbdFloating(DSWaylandSurface *dswlsurface) +{ + DSWindowShell *wShell = __findWindowShell(dswlsurface); + if (!wShell) return false; + + return wShell->getVkbdFloating(); +} } // namespace display_server diff --git a/src/DSZone/DSZone.h b/src/DSZone/DSZone.h index 01a8c9b..9d5083b 100644 --- a/src/DSZone/DSZone.h +++ b/src/DSZone/DSZone.h @@ -74,6 +74,9 @@ public: void setWindowSkipFocus(DSWaylandSurface *dswlSurface, bool set); + bool setWindowVkbdFloating(DSWaylandSurface *dswlSurface, bool set); + bool getWindowVkbdFloating(DSWaylandSurface *dswlSurface); + std::list> getWindowList(); std::list> getWindowShellList(); -- 2.7.4 From 88011ea2078e2f8edb6c3810112db264b2915d17 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Fri, 21 Aug 2020 17:15:14 +0900 Subject: [PATCH 03/16] DSWindow: add unsetFocus() Change-Id: I35e738c2d7d381d3ac7234663db74999956e8aa3 Signed-off-by: Sung-Jin Park --- src/DSWindow/DSWindow.cpp | 14 ++++++++++++++ src/DSWindow/DSWindow.h | 1 + src/DSWindow/DSWindowPrivate.h | 1 + tests/DSWindow-test.cpp | 3 +++ 4 files changed, 19 insertions(+) diff --git a/src/DSWindow/DSWindow.cpp b/src/DSWindow/DSWindow.cpp index ede2584..4f063fc 100644 --- a/src/DSWindow/DSWindow.cpp +++ b/src/DSWindow/DSWindow.cpp @@ -123,8 +123,15 @@ bool DSWindowPrivate::lower(void) return true; } +bool DSWindowPrivate::unsetFocus(void) +{ + __hasFocus = false; + return true; +} + bool DSWindowPrivate::setFocus(void) { + __hasFocus = true; return true; } @@ -313,6 +320,13 @@ bool DSWindow::lower(void) return priv->lower(); } +bool DSWindow::unsetFocus(void) +{ + DS_GET_PRIV(DSWindow); + + return priv->unsetFocus(); +} + bool DSWindow::setFocus(void) { DS_GET_PRIV(DSWindow); diff --git a/src/DSWindow/DSWindow.h b/src/DSWindow/DSWindow.h index 710f784..9024dbc 100644 --- a/src/DSWindow/DSWindow.h +++ b/src/DSWindow/DSWindow.h @@ -63,6 +63,7 @@ public: bool raise(void); bool lower(void); + bool unsetFocus(void); bool setFocus(void); bool hasFocus(void); diff --git a/src/DSWindow/DSWindowPrivate.h b/src/DSWindow/DSWindowPrivate.h index a6a8c7d..8b429e6 100644 --- a/src/DSWindow/DSWindowPrivate.h +++ b/src/DSWindow/DSWindowPrivate.h @@ -60,6 +60,7 @@ public: bool raise(void); bool lower(void); + bool unsetFocus(void); bool setFocus(void); bool isCreated(); diff --git a/tests/DSWindow-test.cpp b/tests/DSWindow-test.cpp index 8ee7f19..c037f6d 100644 --- a/tests/DSWindow-test.cpp +++ b/tests/DSWindow-test.cpp @@ -68,6 +68,9 @@ TEST_F(DSWindowTest, BasicMethods) EXPECT_TRUE(win->hasFocus() == false); EXPECT_TRUE(win->setFocus() == true); + EXPECT_TRUE(win->hasFocus() == true); + EXPECT_TRUE(win->unsetFocus() == true); + EXPECT_TRUE(win->hasFocus() != true); } TEST_F(DSWindowTest, SizeTest) -- 2.7.4 From 6ca9eeffc0af82caabbee09918538d5c311714c2 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Fri, 21 Aug 2020 17:16:26 +0900 Subject: [PATCH 04/16] DSWindowShell: add unsetFocus() Change-Id: I8e9221fdd893e2ec0372621ef77be0f51522ddf6 Signed-off-by: Sung-Jin Park --- src/DSWindowShell/DSWindowShell.cpp | 6 ++++++ src/DSWindowShell/DSWindowShell.h | 1 + src/DSWindowShell/DSWindowShellPrivate.cpp | 14 ++++++++++++-- src/DSWindowShell/DSWindowShellPrivate.h | 1 + tests/DSWindowShell-test.cpp | 13 +++++++++++++ 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/DSWindowShell/DSWindowShell.cpp b/src/DSWindowShell/DSWindowShell.cpp index a7c1550..357f5d1 100644 --- a/src/DSWindowShell/DSWindowShell.cpp +++ b/src/DSWindowShell/DSWindowShell.cpp @@ -162,6 +162,12 @@ bool DSWindowShell::lower(void) return priv->lower(); } +bool DSWindowShell::unsetFocus(void) +{ + DS_GET_PRIV(DSWindowShell); + + return priv->unsetFocus(); +} bool DSWindowShell::setFocus(void) { diff --git a/src/DSWindowShell/DSWindowShell.h b/src/DSWindowShell/DSWindowShell.h index 435d0ce..c0aa944 100644 --- a/src/DSWindowShell/DSWindowShell.h +++ b/src/DSWindowShell/DSWindowShell.h @@ -72,6 +72,7 @@ public: bool raise(void); bool lower(void); + bool unsetFocus(void); bool setFocus(void); bool isFocused(void); diff --git a/src/DSWindowShell/DSWindowShellPrivate.cpp b/src/DSWindowShell/DSWindowShellPrivate.cpp index dab6105..62dcd98 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.cpp +++ b/src/DSWindowShell/DSWindowShellPrivate.cpp @@ -203,15 +203,25 @@ bool DSWindowShellPrivate::lower(void) return true; } +bool DSWindowShellPrivate::unsetFocus(void) +{ + if (__window) + return __window->unsetFocus(); + return false; +} bool DSWindowShellPrivate::setFocus(void) { - return true; + if (__window) + return __window->setFocus(); + return false; } bool DSWindowShellPrivate::isFocused(void) { - return true; + if (__window) + return __window->hasFocus(); + return false; } diff --git a/src/DSWindowShell/DSWindowShellPrivate.h b/src/DSWindowShell/DSWindowShellPrivate.h index d2c6273..77582d1 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.h +++ b/src/DSWindowShell/DSWindowShellPrivate.h @@ -68,6 +68,7 @@ public: bool raise(void); bool lower(void); + bool unsetFocus(void); bool setFocus(void); bool isFocused(void); diff --git a/tests/DSWindowShell-test.cpp b/tests/DSWindowShell-test.cpp index dcd84ce..73af28c 100644 --- a/tests/DSWindowShell-test.cpp +++ b/tests/DSWindowShell-test.cpp @@ -213,6 +213,19 @@ TEST_F(DSWindowShellTest, isFocused_P1) EXPECT_TRUE(shell->isFocused() == true); } +TEST_F(DSWindowShellTest, unsetFocus) +{ + auto window = std::make_shared(); + std::unique_ptr shell = std::make_unique(window.get()); + EXPECT_TRUE(shell != nullptr); + + EXPECT_TRUE(shell->create(0, 0, 720, 1280, nullptr) == true); + EXPECT_TRUE(shell->setFocus() == true); + EXPECT_TRUE(shell->isFocused() == true); + EXPECT_TRUE(shell->unsetFocus() == true); + EXPECT_TRUE(shell->isFocused() != true); +} + TEST_F(DSWindowShellTest, activate_P1) { auto window = std::make_shared(); -- 2.7.4 From c40828be8ee63e8d55005ae67f6d1ea4346802ca Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Fri, 21 Aug 2020 17:17:10 +0900 Subject: [PATCH 05/16] DSSeat: renew focus on Window created/destroy handlers Change-Id: Ide2333d094cff0fd303fd4bedc5485070b07779e Signed-off-by: Sung-Jin Park --- src/DSSeat/DSSeat.cpp | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/src/DSSeat/DSSeat.cpp b/src/DSSeat/DSSeat.cpp index 86d3cc7..8199ea2 100644 --- a/src/DSSeat/DSSeat.cpp +++ b/src/DSSeat/DSSeat.cpp @@ -467,11 +467,24 @@ void DSSeat::__onWindowCreated(std::shared_ptr window) /* FIXME : get focus window for keyboard from DSWindowManager/DSWindowPolicy later */ if (__keyboard) { - std::shared_ptr focusWin = getTopWindow(__focusWin); - DSLOG_INF("DSSeat", "keyboard focus : %p -> %p", __focusWin ? __focusWin.get() : nullptr, focusWin ? focusWin.get() : nullptr); + std::shared_ptr focusWin = getTopWindow(nullptr); + DSWindow *currentWin = __focusWin ? __focusWin.get() : nullptr; + DSWindow *newWin = focusWin ? focusWin.get() : nullptr; - if (focusWin) - __keyboard->setFocus(focusWin); + if (currentWin != newWin) + { + DSLOG_INF("DSSeat", "keyboard focus : %p -> %p", currentWin, newWin); + + if (focusWin) + { + if (__focusWin && __focusWin->hasFocus()) + __focusWin->unsetFocus(); + + __focusWin = focusWin; + __keyboard->setFocus(focusWin); + focusWin->setFocus(); + } + } } } @@ -492,10 +505,23 @@ void DSSeat::__onWindowDestroy(std::shared_ptr window) if (__keyboard) { std::shared_ptr focusWin = getTopWindow(window); - DSLOG_INF("DSSeat", "keyboard focus : %p -> %p", __focusWin ? __focusWin.get() : nullptr, focusWin ? focusWin.get() : nullptr); + DSWindow *currentWin = __focusWin ? __focusWin.get() : nullptr; + DSWindow *newWin = focusWin ? focusWin.get() : nullptr; - if (focusWin) - __keyboard->setFocus(focusWin); + if (currentWin != newWin) + { + DSLOG_INF("DSSeat", "keyboard focus : %p -> %p", currentWin, newWin); + + if (focusWin) + { + if (__focusWin && __focusWin->hasFocus()) + __focusWin->unsetFocus(); + + __focusWin = focusWin; + __keyboard->setFocus(focusWin); + focusWin->setFocus(); + } + } } } @@ -527,7 +553,11 @@ std::shared_ptr DSSeat::getTopWindow(std::shared_ptr winExcl { for (std::shared_ptr w : __zone->getWindowList()) { - if (w && w.get() == winExcl.get()) + /* skip if w is not valid or has skip focus */ + if (!w || w->getSkipFocus()) + continue; + /* skip if w equals to winExcl */ + if (winExcl && winExcl.get() == w.get()) continue; /* We suppose that the window located at the top of the window stack is at the front of the list. */ -- 2.7.4 From 0384f2b4a2923188975330724d963616e81794e9 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 21 Aug 2020 19:05:27 +0900 Subject: [PATCH 06/16] DSRenderEngineDaliImpl: call Adaptor::Get().RenderOnce() twice Need to check dali engine later. why should libds calls RenderOnce() twice Change-Id: I4b0348318678e244b5dc0b2d4e3c03519d546e78 --- src/DSRender/DSRenderEngineDaliImpl.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/DSRender/DSRenderEngineDaliImpl.cpp b/src/DSRender/DSRenderEngineDaliImpl.cpp index 082e815..a76fc95 100644 --- a/src/DSRender/DSRenderEngineDaliImpl.cpp +++ b/src/DSRender/DSRenderEngineDaliImpl.cpp @@ -70,6 +70,9 @@ std::shared_ptr DSRenderEngineDaliImpl::makeRenderView(std::shared bool DSRenderEngineDaliImpl::renderFrame() { if (__needToRender) { + // TODO: do not get the acquired buffer with only one call of Adaptor::Get().RenderOnce(); + // NEED do check it. + Adaptor::Get().RenderOnce(); Adaptor::Get().RenderOnce(); DSLOG_DBG("DSRenderEngineDaliImpl", "RENDER RENDER RENDER~!!!!"); } -- 2.7.4 From c1c44ed3920723fef60574d96ccec3ad7276827e Mon Sep 17 00:00:00 2001 From: jeon Date: Fri, 21 Aug 2020 17:10:09 +0900 Subject: [PATCH 07/16] DSTextInput: change argument DSWindow to DSWaylandSurface Change-Id: I20ba8de29a83fe39d130dcbc005126e053a496fe --- src/DSTextInput/DSTextInput.cpp | 2 +- src/DSTextInput/DSTextInputPrivate.h | 3 +- src/DSWaylandServer/DSWaylandInputPanel.cpp | 90 +++++++++++----------- src/DSWaylandServer/DSWaylandInputPanel.h | 6 +- src/DSWaylandServer/DSWaylandInputPanelSurface.h | 8 +- .../DSWaylandInputPanelSurfacePrivate.h | 2 +- 6 files changed, 54 insertions(+), 57 deletions(-) diff --git a/src/DSTextInput/DSTextInput.cpp b/src/DSTextInput/DSTextInput.cpp index b418406..59d5c73 100644 --- a/src/DSTextInput/DSTextInput.cpp +++ b/src/DSTextInput/DSTextInput.cpp @@ -280,7 +280,7 @@ void DSTextInputPrivate::updateInputPanelState(bool waitUpdate) __wlInputPanel->updateInputPanelState(waitUpdate); } -void DSTextInputPrivate::setInputPanelTransientFor(DSWindow *window) +void DSTextInputPrivate::setInputPanelTransientFor(DSWaylandSurface *window) { __wlInputPanel->setTransientFor(window); } diff --git a/src/DSTextInput/DSTextInputPrivate.h b/src/DSTextInput/DSTextInputPrivate.h index 969bf14..c187846 100644 --- a/src/DSTextInput/DSTextInputPrivate.h +++ b/src/DSTextInput/DSTextInputPrivate.h @@ -37,6 +37,7 @@ class DSWaylandInputMethod; class DSWaylandInputMethodContext; class DSWaylandInputPanel; class DSWaylandInputPanelSurface; +class DSWaylandSurface; class DSTextInputPrivate : public DSObjectPrivate { @@ -106,7 +107,7 @@ public: /* DSWaylandInputPanel */ void updateInputPanelState(bool waitUpdate); - void setInputPanelTransientFor(DSWindow *window); + void setInputPanelTransientFor(DSWaylandSurface *window); void changeInputPanelVisibility(bool visible); private: diff --git a/src/DSWaylandServer/DSWaylandInputPanel.cpp b/src/DSWaylandServer/DSWaylandInputPanel.cpp index dc35b73..82e2570 100644 --- a/src/DSWaylandServer/DSWaylandInputPanel.cpp +++ b/src/DSWaylandServer/DSWaylandInputPanel.cpp @@ -25,7 +25,9 @@ #include "DSWaylandInputPanelPrivate.h" #include "DSWaylandInputPanelSurface.h" #include "DSWaylandInputPanelSurfacePrivate.h" +#include "DSWaylandSurface.h" #include "DSStruct.h" +#include "DSWindowManager.h" namespace display_server { @@ -55,13 +57,18 @@ private: class DSWaylandInputPanelSurfaceData { public: + DSWaylandInputPanelSurfaceData(DSWaylandServer::wl_input_panel_surface::Resource *resource, void *inputPanelResource) + : panel(false), showing(false), needShow(false), resizing(false), + __resource(resource), + __inputPanelResource(inputPanelResource), __wlSurface(nullptr) {} DSWaylandInputPanelSurfaceData(DSWaylandServer::wl_input_panel_surface::Resource *resource, void *inputPanelResource, void *surfaceResource) : panel(false), showing(false), needShow(false), resizing(false), - __resource(resource), __inputPanelResource(inputPanelResource), __surfaceResource(surfaceResource) {} + __resource(resource), + __inputPanelResource(inputPanelResource) { __wlSurface = DSWaylandSurface::fromWlResource((struct ::wl_resource *)surfaceResource); } ~DSWaylandInputPanelSurfaceData() {} void *getInputPanelResource() {return __inputPanelResource;} - void *getSurfaceResource() {return __surfaceResource;} + DSWaylandSurface* getWlSurface() {return __wlSurface;} bool panel; bool showing; @@ -71,32 +78,9 @@ public: private: DSWaylandServer::wl_input_panel_surface::Resource *__resource; void *__inputPanelResource; - void *__surfaceResource; + DSWaylandSurface *__wlSurface; }; -#if 0 -DSWaylandInputPanelSurfaceData::DSWaylandInputPanelSurfaceData(DSWaylandServer::wl_input_panel_surface::Resource *resource, void *inputPanelResource, void *surfaceResource) - : __resource(resource), - __inputPanelResource(inputPanelResource), - __surfaceResource(surfaceResource) -{ -} - -DSWaylandInputPanelSurfaceData::~DSWaylandInputPanelSurfaceData() -{ -} - -void *DSWaylandInputPanelSurfaceData::getInputPanelResource() -{ - return __inputPanelResource; -} - -void *DSWaylandInputPanelSurfaceData::getSurfaceResource() -{ - return __surfaceResource; -} -#endif - DSWaylandInputPanelPrivate::DSWaylandInputPanelPrivate(DSWaylandInputPanel *p_ptr, DSWaylandCompositor *compositor) : DSObjectPrivate(p_ptr), __p_ptr(p_ptr), __compositor(compositor) @@ -219,9 +203,9 @@ void DSWaylandInputPanel::setFloatingMovingRequest(bool enabled) __inputPanelFloating->movingRequest = enabled; } -void DSWaylandInputPanel::setTransientFor(DSWindow *parent) +void DSWaylandInputPanel::setTransientFor(DSWaylandSurface *parent) { - DSWindow *curParent = parent; + DSWaylandSurface *curParent = parent; if (curParent) { /* TODO: @@ -241,7 +225,7 @@ void DSWaylandInputPanel::changeVisibility(bool visible) /* TODO: delete waitTimer */ } -bool DSWaylandInputPanel::isEffectRunning(DSWindow *window) +bool DSWaylandInputPanel::isEffectRunning(DSWaylandSurface *window) { /* TODO: * if window is animating @@ -301,7 +285,7 @@ void DSWaylandInputPanelSurfacePrivate::flushFrame() for (auto it = __dataMap.begin(); it != __dataMap.end(); it++) { DSWaylandInputPanelSurfaceData *_surfaceData = (*it).second; - if (_surfaceData->getSurfaceResource()) + if (_surfaceData->getWlSurface()) { /* TODO: clear pixmap image */ } @@ -312,29 +296,37 @@ void DSWaylandInputPanelSurfacePrivate::show(DSWaylandInputPanelSurfaceData *sur { DS_GET_PUB(DSWaylandInputPanelSurface); +#if false if (!surfaceData) { for (auto it = __dataMap.begin(); it != __dataMap.end(); it++) { - //DSWaylandInputPanelSurfaceData *_surfaceData = (*it).second; - /* TODO: - * surfaceData = _surfaceData->getSurfaceResource(); - * if surfaceData is focused - * surfaceData = _surfaceData; - * break; - */ + DSWaylandInputPanelSurfaceData *data = (*it).second; + if (!data) continue; + + DSWaylandSurface *wlSurface = data->getWlSurface(); + if (wlSurface->parent == DSKeyboard::getFocus()) + { + surfaceData = data; + break; + } } } +#endif if (!surfaceData) return; if (pub->__inputPanel->getWaitUpdate()) { + pub->__inputPanel->setWaitUpdate(false); + pub->__inputPanel->changeVisibility(true); + pub->__inputPanel->updateInputPanelState(true); // temporary code /* TODO: - * if (getfocus(surfaceData->getSurfaceResource())->parent) + * if (getfocus(surfaceData->getWlSurface())->parent) * { - * if (getfocus(surfaceData->getSurfaceResource())->parent == focused) + * if (getfocus(surfaceData->getWlSurface())->parent == focused) * { + * pub->__inputPanel->visibilityChange(true); * pub->__inputPanel->updateInputPanelState(true); * } * else @@ -351,17 +343,21 @@ void DSWaylandInputPanelSurfacePrivate::directShow(DSWaylandInputPanelSurfaceDat DS_GET_PUB(DSWaylandInputPanelSurface); pub->setPosition(nullptr, 0, 0); /* FIXME: set correct value */ + DSWindowManager *windowManager = DSWindowManager::getInstance(); + windowManager->activateWindow(surfaceData->getWlSurface()); + + windowManager->releaseInstance(); /* TODO: change window geometry */ } -void DSWaylandInputPanelSurfacePrivate::setTransientForSurface(DSWindow *parent) +void DSWaylandInputPanelSurfacePrivate::setTransientForSurface(DSWaylandSurface *parent) { for (auto it = __dataMap.begin(); it != __dataMap.end(); it++) { //DSWaylandInputPanelSurfaceData *surfaceData = (*it).second; /* TODO: - * child = surfaceData->getSurfaceResource(); + * child = surfaceData->getWlSurface(); * if child->parent * { * if child->parent != parent @@ -497,7 +493,7 @@ void DSWaylandInputPanelSurfacePrivate::input_panel_surface_set_ready(Resource * if (it != __dataMap.end()) { DSWaylandInputPanelSurfaceData *surfaceData = (*it).second; - /* TODO: find DSWindow and update base_output resolution */ + /* TODO: find DSWaylandSurface and update base_output resolution */ show(surfaceData); } } @@ -505,7 +501,7 @@ void DSWaylandInputPanelSurfacePrivate::input_panel_surface_set_ready(Resource * void DSWaylandInputPanelSurfacePrivate::input_panel_surface_set_floating_panel(Resource *resource, uint32_t state) { /* TODO: - * set DSWindow's vkbd.floating = !!state + * set DSWaylandSurface's vkbd.floating = !!state * if true * policy_conformant_part_del * else @@ -528,7 +524,7 @@ void DSWaylandInputPanelSurfacePrivate::__updateSurfaceVisibility(DSWaylandInput { if (pub->__inputPanel->getRerunPanelShow()) pub->__inputPanel->setRerunPanelShow(false); - if (pub->isEffectRunning(nullptr)) // FIXME: change this to get window surfaceData->getDSWindow() + if (pub->isEffectRunning(nullptr)) // FIXME: change this to get window surfaceData->getDSWaylandSurface() surfaceData->needShow = true; else if (surfaceData->resizing) surfaceData->needShow = true; @@ -584,7 +580,7 @@ void DSWaylandInputPanelSurface::flushFrame() priv->flushFrame(); } -void DSWaylandInputPanelSurface::setTransientForSurface(DSWindow *parent) +void DSWaylandInputPanelSurface::setTransientForSurface(DSWaylandSurface *parent) { DS_GET_PRIV(DSWaylandInputPanelSurface); @@ -598,12 +594,12 @@ void DSWaylandInputPanelSurface::updateSurfaceVisibility(bool visible) priv->updateSurfaceVisibility(visible); } -bool DSWaylandInputPanelSurface::isEffectRunning(DSWindow *window) +bool DSWaylandInputPanelSurface::isEffectRunning(DSWaylandSurface *window) { return __inputPanel->isEffectRunning(window); } -void DSWaylandInputPanelSurface::setPosition(DSWindow *window, int width, int height) +void DSWaylandInputPanelSurface::setPosition(DSWaylandSurface *window, int width, int height) { } diff --git a/src/DSWaylandServer/DSWaylandInputPanel.h b/src/DSWaylandServer/DSWaylandInputPanel.h index a8d0378..ab2f8bb 100644 --- a/src/DSWaylandServer/DSWaylandInputPanel.h +++ b/src/DSWaylandServer/DSWaylandInputPanel.h @@ -29,7 +29,6 @@ #include "DSWaylandCompositor.h" #include "DSEventLoop.h" #include "DSTextInputPrivate.h" -#include "DSWindow.h" namespace display_server { @@ -37,6 +36,7 @@ namespace display_server class DSWaylandInputPanelPrivate; class DSWaylandInputPanelSurface; class DSWaylandInputPanelFloating; +class DSWaylandSurface; class DS_DECL_EXPORT DSWaylandInputPanel : public DSObject { @@ -55,9 +55,9 @@ public: void setRerunPanelShow(bool needShow); void setFloatingMovingRequest(bool enabled); - void setTransientFor(DSWindow *parent); + void setTransientFor(DSWaylandSurface *parent); void changeVisibility(bool visible); - bool isEffectRunning(DSWindow *window); + bool isEffectRunning(DSWaylandSurface *window); void setFloatingPosition(int x, int y); DSWaylandInputPanelFloating *getFloatingData(); diff --git a/src/DSWaylandServer/DSWaylandInputPanelSurface.h b/src/DSWaylandServer/DSWaylandInputPanelSurface.h index 2f036ac..becea30 100644 --- a/src/DSWaylandServer/DSWaylandInputPanelSurface.h +++ b/src/DSWaylandServer/DSWaylandInputPanelSurface.h @@ -27,12 +27,12 @@ #include "DSCore.h" #include "DSObject.h" #include "DSWaylandInputPanel.h" -#include "DSWindow.h" namespace display_server { class DSWaylandInputPanelSurfacePrivate; +class DSWaylandSurface; class DS_DECL_EXPORT DSWaylandInputPanelSurface : public DSObject { @@ -44,10 +44,10 @@ public: void createGlobal(void *client, void *inputPanelResource, unsigned int id, void *surface); void clearGlobals(void *inputPanelResource); void flushFrame(); - void setTransientForSurface(DSWindow *parent); + void setTransientForSurface(DSWaylandSurface *parent); void updateSurfaceVisibility(bool visible); - bool isEffectRunning(DSWindow *window); - void setPosition(DSWindow *window, int width, int height); + bool isEffectRunning(DSWaylandSurface *window); + void setPosition(DSWaylandSurface *window, int width, int height); void setFloatingPosition(int x, int y); protected: diff --git a/src/DSWaylandServer/DSWaylandInputPanelSurfacePrivate.h b/src/DSWaylandServer/DSWaylandInputPanelSurfacePrivate.h index 5989bed..03300df 100644 --- a/src/DSWaylandServer/DSWaylandInputPanelSurfacePrivate.h +++ b/src/DSWaylandServer/DSWaylandInputPanelSurfacePrivate.h @@ -48,7 +48,7 @@ public: void show(DSWaylandInputPanelSurfaceData *surfaceData); void directShow(DSWaylandInputPanelSurfaceData *surfaceData); void flushFrame(); - void setTransientForSurface(DSWindow *parent); + void setTransientForSurface(DSWaylandSurface *parent); void updateSurfaceVisibility(bool visible); void setFloatingPosition(int x, int y); -- 2.7.4 From 523cd8f827f86c10d7232012d6641754b983ccd1 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Fri, 21 Aug 2020 21:10:33 +0900 Subject: [PATCH 08/16] DSSeat: release shared_ptr of the last focus window Change-Id: I40b942456fbabbe2298eebe460fc6a8a94e3c856 Signed-off-by: Sung-Jin Park --- src/DSSeat/DSSeat.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/DSSeat/DSSeat.cpp b/src/DSSeat/DSSeat.cpp index 8199ea2..645b45f 100644 --- a/src/DSSeat/DSSeat.cpp +++ b/src/DSSeat/DSSeat.cpp @@ -521,6 +521,10 @@ void DSSeat::__onWindowDestroy(std::shared_ptr window) __keyboard->setFocus(focusWin); focusWin->setFocus(); } + else + { + __focusWin = nullptr; + } } } } -- 2.7.4 From 169b288b451de9046e8202e559111bf27c89477a Mon Sep 17 00:00:00 2001 From: jeon Date: Fri, 21 Aug 2020 17:39:06 +0900 Subject: [PATCH 09/16] DSUtilSocket: add skeleton codes to control socket Change-Id: I1dab0ff9c770782171b54f013bd7cfeac55299ef --- src/DSUtil/DSUtilSocket.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++++ src/DSUtil/DSUtilSocket.h | 50 +++++++++++++++++++++++++++ src/meson.build | 3 ++ 3 files changed, 137 insertions(+) create mode 100644 src/DSUtil/DSUtilSocket.cpp create mode 100644 src/DSUtil/DSUtilSocket.h diff --git a/src/DSUtil/DSUtilSocket.cpp b/src/DSUtil/DSUtilSocket.cpp new file mode 100644 index 0000000..4307a75 --- /dev/null +++ b/src/DSUtil/DSUtilSocket.cpp @@ -0,0 +1,84 @@ +/* +* Copyright © 2020 Samsung Electronics co., Ltd. All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +*/ + +#include "DSUtilSocket.h" + +namespace display_server +{ + +/* reference count, mutex and compositor pointer for DSUtilSocket singleton */ +int DSUtilSocket::__refCount { 0 }; +std::mutex DSUtilSocket::__mutex; +DSUtilSocket* DSUtilSocket::__utilSocket { nullptr }; + +DSUtilSocket::DSUtilSocket() +{ +} + +DSUtilSocket::~DSUtilSocket() +{ +} + +/* getInstance for DSUtilSocket singleton */ +//static +DSUtilSocket *DSUtilSocket::getInstance() +{ + std::lock_guard tLock(__mutex); + + DSLOG_INF("DSUtilSocket", + "[Get] instance __refCount=%d !", __refCount); + + if (!__utilSocket && (__refCount == 0)) + { + __utilSocket = new DSUtilSocket(); + DSLOG_INF("DSUtilSocket", + "DSUtilSocket instance has been created !"); + } + + ++__refCount; + return __utilSocket; +} + +/* releaseInstance for DSUtilSocket singleton */ +// static +void DSUtilSocket::releaseInstance() +{ + std::lock_guard tLock(__mutex); + + --__refCount; + if (__refCount < 0) + __refCount = 0; + DSLOG_INF("DSUtilSocket", + "[Release] instance __refCount=%d !", __refCount); + + if ((0 == __refCount) && __utilSocket) + { + delete __utilSocket; + __utilSocket = nullptr; + DSLOG_INF("DSUtilSocket", + "DSUtilSocket instance has been removed !"); + } +} + + +} diff --git a/src/DSUtil/DSUtilSocket.h b/src/DSUtil/DSUtilSocket.h new file mode 100644 index 0000000..309f1ef --- /dev/null +++ b/src/DSUtil/DSUtilSocket.h @@ -0,0 +1,50 @@ +/* +* Copyright © 2020 Samsung Electronics co., Ltd. All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __DS_UTIL_SOCKET_H_ +#define __DS_UTIL_SOCKET_H_ + +#include + +namespace display_server +{ + +class DSUtilSocket +{ +public: + static DSUtilSocket *getInstance(); + static void releaseInstance(); + +private: + DSUtilSocket(); + ~DSUtilSocket(); + DSUtilSocket& operator=(const DSUtilSocket&) = delete; + + static std::mutex __mutex; + static DSUtilSocket *__utilSocket; + static int __refCount; +}; + +} + +#endif diff --git a/src/meson.build b/src/meson.build index d1731f2..6b988da 100644 --- a/src/meson.build +++ b/src/meson.build @@ -76,6 +76,8 @@ libds_srcs = [ 'DSTextInput/DSTextInputPrivate.h', 'DSTextInput/DSTextInput.h', 'DSTextInput/DSTextInput.cpp', + 'DSUtil/DSUtilSocket.h', + 'DSUtil/DSUtilSocket.cpp', ] libds_wayland_srcs = [ @@ -235,6 +237,7 @@ libds_include_dirs = include_directories( './DSXkb', './DSTextInput', './DSTizenAppinfo', + './DSUtil', ) libds_lib = shared_library( -- 2.7.4 From b6845a03812b952911b3f8f1c6ebbb6cf05bb623 Mon Sep 17 00:00:00 2001 From: jeon Date: Fri, 21 Aug 2020 20:49:05 +0900 Subject: [PATCH 10/16] DSUtilSocket: set permission to sockets Change-Id: I3328fa30d8a55b2f11accc01a28821b3e2d2ecc9 --- src/DSBuffer/DSBufferManager.cpp | 5 + src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp | 5 + src/DSUtil/DSUtilSocket.cpp | 150 +++++++++++++++++++++++++ src/DSUtil/DSUtilSocket.h | 4 + src/DSWaylandServer/DSWaylandCompositor.cpp | 5 + 5 files changed, 169 insertions(+) diff --git a/src/DSBuffer/DSBufferManager.cpp b/src/DSBuffer/DSBufferManager.cpp index 3c3cc14..3e2b7ae 100644 --- a/src/DSBuffer/DSBufferManager.cpp +++ b/src/DSBuffer/DSBufferManager.cpp @@ -25,6 +25,7 @@ #include "DSBufferManagerPrivate.h" #include "DSDebugLog.h" #include "DSBufferTBMImpl.h" +#include "DSUtilSocket.h" namespace display_server { @@ -137,6 +138,10 @@ DSBufferManagerPrivate::DSBufferManagerPrivate(DSBufferManager *p_ptr) if (__waylandCompositor && bufmgr) tbm_bufmgr_bind_native_display(bufmgr, __waylandCompositor->display()); + DSUtilSocket *utilSocket = DSUtilSocket::getInstance(); + utilSocket->initSocket("tbm-drm-auth"); + utilSocket->releaseInstance(); + } std::shared_ptr DSBufferManagerPrivate::getDSBuffer(struct ::wl_resource *bufferResource) diff --git a/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp index ecf0415..b2c4339 100644 --- a/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp +++ b/src/DSDisplayDevice/DSDisplayDeviceTDMImpl.cpp @@ -25,6 +25,7 @@ #include "DSDisplayDeviceOutputTDMImpl.h" #include "DSDisplayDeviceHWCTDMImpl.h" #include "DSDebugLog.h" +#include "DSUtilSocket.h" namespace display_server { @@ -55,6 +56,10 @@ DSDisplayDeviceTDMImpl::DSDisplayDeviceTDMImpl() __outputList.emplace_back(std::make_shared(toutput)); } + + DSUtilSocket *utilSocket = DSUtilSocket::getInstance(); + utilSocket->initSocket("tdm-socket"); + utilSocket->releaseInstance(); } DSDisplayDeviceTDMImpl::~DSDisplayDeviceTDMImpl() diff --git a/src/DSUtil/DSUtilSocket.cpp b/src/DSUtil/DSUtilSocket.cpp index 4307a75..9c0e0ff 100644 --- a/src/DSUtil/DSUtilSocket.cpp +++ b/src/DSUtil/DSUtilSocket.cpp @@ -22,6 +22,15 @@ */ #include "DSUtilSocket.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace display_server { @@ -80,5 +89,146 @@ void DSUtilSocket::releaseInstance() } } +void DSUtilSocket::initSocket(std::string socketName) +{ + char *dir = nullptr; + int res; +#undef STRERR_BUFSIZE +#define STRERR_BUFSIZE 1024 + char buf[STRERR_BUFSIZE]; + + if (socketName.empty()) return; + + dir = getenv("XDG_RUNTIME_DIR"); + if (!dir) return; + + std::string xdgDir(dir); + + /* check whether buffer size is less than concatenated string which + * is made of XDG_RUNTIME_DIR, '/', socket name and NULL. + */ + + int dirLength = xdgDir.length(); + int nameLength = socketName.length(); + if ((dirLength + nameLength + 2) > STRERR_BUFSIZE) + { + DSLOG_WRN("DSUtilSocket", "Size of buffer is not enough. dir:%s name:%s", xdgDir, socketName); + return; + } + + //snprintf(socket_path, sizeof(socket_path), "%s/%s", dir, name); + std::string socketPath = xdgDir + "/" + socketName; + + uid_t uid = __getpwnam("root"); + gid_t gid = __getgrnam("display"); + + res = chmod(socketPath.c_str(), 509); + if (res < 0) + { + DSLOG_WRN("DSUtilSocket", "Could not change modes of socket file:%s (%s)", socketPath.c_str(), strerror_r(errno, buf, STRERR_BUFSIZE)); + //PRCTL("[Winsys] Could not chane modes of socket file: %s", socketPath.c_str()); + return; + } + + res = chown(socketPath.c_str(), uid, gid); + if (res < 0) + { + DSLOG_WRN("DSUtilSocket", "Could not change owner of socket file:%s (%s)", socketPath.c_str(), strerror_r(errno, buf, STRERR_BUFSIZE)); + //PRCTL("[Winsys] Could not change owner of socket file: %s", socketPath.c_str()); + return; + } +} + +int DSUtilSocket::__getpwnam(std::string name) +{ + struct ::passwd *u; + struct ::passwd *uRes; + char* buf; + size_t bufLen; + int ret; +#undef BUFLEN +#define BUFLEN 2048 + bufLen = sysconf(_SC_GETPW_R_SIZE_MAX); + if ((int)bufLen == -1) /* Value was indeterminate */ + bufLen = BUFLEN; /* Should be more than enough */ +#undef BUFLEN + + buf = (char *)malloc(bufLen); + if (buf == NULL) + { + DSLOG_WRN("DSUtilSocket", "failed to create buffer"); + return 0; + } + + u = (struct ::passwd *)malloc(sizeof(struct passwd)); + if (!u) + { + DSLOG_WRN("DSUtilSocket", "failed to create password struct"); + free(buf); + return 0; + } + + ret = getpwnam_r(name.c_str(), u, buf, bufLen, &uRes); + if (uRes == nullptr) + { + if (ret == 0) DSLOG_WRN("DSUtilSocket", "password not found"); + else DSLOG_WRN("DSUtilSocket", "errno returned by getpwnam_r is %d", ret); + free(buf); + free(u); + return 0; + } + ret = u->pw_uid; + free(buf); + free(u); + + return ret; +} + +int DSUtilSocket::__getgrnam(std::string name) +{ + struct ::group *g; + struct ::group *grpRes; + char* buf; + size_t bufLen; + int ret; +#undef BUFLEN +#define BUFLEN 2048 + bufLen = sysconf(_SC_GETGR_R_SIZE_MAX); + if ((int)bufLen == -1) /* Value was indeterminate */ + bufLen = BUFLEN; /* Should be more than enough */ +#undef BUFLEN + + buf = (char *)malloc(bufLen); + if (buf == nullptr) + { + DSLOG_WRN("DSUtilSocket", "failed to create buffer"); + return 0; + } + + g = (struct ::group *)malloc(sizeof(struct group)); + if (!g) + { + DSLOG_WRN("DSUtilSocket", "failed to create group struct"); + free(buf); + return 0; + } + + ret = getgrnam_r(name.c_str(), g, buf, bufLen, &grpRes); + if (grpRes == NULL) + { + if (ret == 0) DSLOG_WRN("DSUtilSocket", "Group not found"); + else DSLOG_WRN("DSUtilSocket", "errno returned by getpwnam_r is %d", ret); + free(buf); + free(g); + return 0; + } + + ret = g->gr_gid; + free(buf); + free(g); + return ret; +} + + } diff --git a/src/DSUtil/DSUtilSocket.h b/src/DSUtil/DSUtilSocket.h index 309f1ef..dffdee4 100644 --- a/src/DSUtil/DSUtilSocket.h +++ b/src/DSUtil/DSUtilSocket.h @@ -35,10 +35,14 @@ public: static DSUtilSocket *getInstance(); static void releaseInstance(); + void initSocket(std::string socketName); + private: DSUtilSocket(); ~DSUtilSocket(); DSUtilSocket& operator=(const DSUtilSocket&) = delete; + int __getpwnam(std::string name); + int __getgrnam(std::string name); static std::mutex __mutex; static DSUtilSocket *__utilSocket; diff --git a/src/DSWaylandServer/DSWaylandCompositor.cpp b/src/DSWaylandServer/DSWaylandCompositor.cpp index 9f823ee..1570727 100644 --- a/src/DSWaylandServer/DSWaylandCompositor.cpp +++ b/src/DSWaylandServer/DSWaylandCompositor.cpp @@ -29,6 +29,7 @@ #include "DSWaylandSurface.h" #include "DSWaylandRegion.h" #include "DSDebugLog.h" +#include "DSUtilSocket.h" namespace display_server { @@ -126,6 +127,10 @@ void DSWaylandCompositorPrivate::initSocket(std::string sName, std::string sDir) (void) socketPath; + DSUtilSocket *utilSocket = DSUtilSocket::getInstance(); + utilSocket->initSocket(sName); + utilSocket->releaseInstance(); + //TODO : set permissions for Owner, Group and Other //TODO : set Smack attributes for socket //TODO : set symbolic link for socket -- 2.7.4 From 01b698ec8aa794bc8c33f75a3d416bce45040f4a Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Sat, 22 Aug 2020 16:44:55 +0900 Subject: [PATCH 11/16] DSWaylandCompositor/DSWaylandSurface: add API to get surface by resource ID Change-Id: I1946ac7b360cce6b22693c547cbf97aec3cab29a --- src/DSWaylandServer/DSWaylandCompositor.cpp | 13 +++++++++++++ src/DSWaylandServer/DSWaylandCompositor.h | 2 ++ src/DSWaylandServer/DSWaylandSurface.cpp | 19 +++++++++++++++++-- src/DSWaylandServer/DSWaylandSurface.h | 2 ++ src/DSWaylandServer/DSWaylandSurfacePrivate.h | 3 +++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/DSWaylandServer/DSWaylandCompositor.cpp b/src/DSWaylandServer/DSWaylandCompositor.cpp index 1570727..f09ef05 100644 --- a/src/DSWaylandServer/DSWaylandCompositor.cpp +++ b/src/DSWaylandServer/DSWaylandCompositor.cpp @@ -506,6 +506,19 @@ IDSWaylandShell *DSWaylandCompositor::getShell(void) return priv->getShell(); } +DSWaylandSurface *DSWaylandCompositor::getSurface(uint32_t id) +{ + for (auto s : __surfaceList) + { + if (s->getResourceId() == id) + { + return s.get(); + } + } + + return nullptr; +} + void DSWaylandCompositor::sendSurfaceDestroy(DSWaylandSurface *dswSurface) { for (auto s : __surfaceList) diff --git a/src/DSWaylandServer/DSWaylandCompositor.h b/src/DSWaylandServer/DSWaylandCompositor.h index c8ae82f..b350f48 100644 --- a/src/DSWaylandServer/DSWaylandCompositor.h +++ b/src/DSWaylandServer/DSWaylandCompositor.h @@ -67,6 +67,8 @@ public: bool setShell(IDSWaylandShell *shell); IDSWaylandShell *getShell(void); + DSWaylandSurface *getSurface(uint32_t id); + void sendSurfaceDestroy(DSWaylandSurface *dswSurface); void regionDestroy(DSWaylandRegion *dswRegion); diff --git a/src/DSWaylandServer/DSWaylandSurface.cpp b/src/DSWaylandServer/DSWaylandSurface.cpp index 54996ba..473e3a0 100644 --- a/src/DSWaylandServer/DSWaylandSurface.cpp +++ b/src/DSWaylandServer/DSWaylandSurface.cpp @@ -69,7 +69,8 @@ DSWaylandSurfacePrivate::DSWaylandSurfacePrivate(DSWaylandSurface *p_ptr) __p_ptr(p_ptr), __commitInfoPending{std::make_unique()}, __commitInfo{std::make_shared()}, - __bufferManager{DSBufferManager::getInstance()} + __bufferManager{DSBufferManager::getInstance()}, + __resId(0) {} DSWaylandSurfacePrivate::DSWaylandSurfacePrivate(DSWaylandSurface *p_ptr, DSWaylandClient *waylandClient, uint32_t id) @@ -77,10 +78,12 @@ DSWaylandSurfacePrivate::DSWaylandSurfacePrivate(DSWaylandSurface *p_ptr, DSWayl __p_ptr(p_ptr), __commitInfoPending{std::make_unique()}, __commitInfo{std::make_shared()}, - __bufferManager{DSBufferManager::getInstance()} + __bufferManager{DSBufferManager::getInstance()}, + __resId(0) { if (id > 0) { wl_surface::init(waylandClient->wlClient(), (int)id, 4); + __resId = id; } } @@ -90,6 +93,11 @@ DSWaylandSurfacePrivate::~DSWaylandSurfacePrivate() DSBufferManager::releaseInstance(); } +uint32_t DSWaylandSurfacePrivate::getResourceId() +{ + return __resId; +} + void DSWaylandSurfacePrivate::surface_bind_resource(Resource *resource) { } @@ -230,4 +238,11 @@ bool DSWaylandSurface::hasResource() return false; } +uint32_t DSWaylandSurface::getResourceId() +{ + DS_GET_PRIV(DSWaylandSurface); + + return priv->getResourceId(); +} + } /* namespace display_server */ diff --git a/src/DSWaylandServer/DSWaylandSurface.h b/src/DSWaylandServer/DSWaylandSurface.h index 7cc360b..41d1ccb 100644 --- a/src/DSWaylandServer/DSWaylandSurface.h +++ b/src/DSWaylandServer/DSWaylandSurface.h @@ -65,6 +65,8 @@ public: struct ::wl_resource *getWlResource(); bool hasResource(); + uint32_t getResourceId(); + private: // signals DSSignal> __surfaceCommittedSignal; diff --git a/src/DSWaylandServer/DSWaylandSurfacePrivate.h b/src/DSWaylandServer/DSWaylandSurfacePrivate.h index 121f034..abff9c2 100644 --- a/src/DSWaylandServer/DSWaylandSurfacePrivate.h +++ b/src/DSWaylandServer/DSWaylandSurfacePrivate.h @@ -90,6 +90,8 @@ public: DSWaylandSurfacePrivate(DSWaylandSurface *p_ptr, DSWaylandClient *waylandClient, uint32_t id); ~DSWaylandSurfacePrivate() override; + uint32_t getResourceId(); + protected: void surface_bind_resource(Resource *resource) override; void surface_destroy_resource(Resource *resource) override; @@ -109,6 +111,7 @@ private: std::unique_ptr __commitInfoPending; std::shared_ptr __commitInfo; DSBufferManager *__bufferManager; + uint32_t __resId; }; } /*namespace display_server */ -- 2.7.4 From 7a8caf602617d92bc5f4c08bee10a5fa50ebc763 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Sat, 22 Aug 2020 16:49:29 +0900 Subject: [PATCH 12/16] DSWindowShell/DSWindow : handle set/get Parent Change-Id: I99f21cf923b640213e48fc8c9c186f9fa213ddc6 --- src/DSWindow/DSWindow.cpp | 25 +++++++++ src/DSWindow/DSWindow.h | 3 ++ src/DSWindow/DSWindowPrivate.h | 5 ++ src/DSWindowShell/DSWindowShell.cpp | 36 ++++++++++++- src/DSWindowShell/DSWindowShell.h | 8 +++ src/DSWindowShell/DSWindowShellPrivate.cpp | 82 +++++++++++++++++++++++++++++- src/DSWindowShell/DSWindowShellPrivate.h | 13 +++++ tests/DSWindow-test.cpp | 20 ++++++++ tests/DSWindowShell-test.cpp | 25 +++++++++ 9 files changed, 214 insertions(+), 3 deletions(-) diff --git a/src/DSWindow/DSWindow.cpp b/src/DSWindow/DSWindow.cpp index 4f063fc..1657a07 100644 --- a/src/DSWindow/DSWindow.cpp +++ b/src/DSWindow/DSWindow.cpp @@ -32,6 +32,7 @@ namespace display_server DSWindowPrivate::DSWindowPrivate(DSWindow *p_ptr) : DSObjectPrivate(p_ptr), __p_ptr(p_ptr), + __parent(nullptr), __x(0), __y(0), __w(0), @@ -68,6 +69,16 @@ void DSWindowPrivate::destroy(void) { } +void DSWindowPrivate::setParent(DSWindow *parent) +{ + __parent = parent; +} + +DSWindow *DSWindowPrivate::getParent(void) +{ + return __parent; +} + bool DSWindowPrivate::show(void) { return true; @@ -252,6 +263,20 @@ void DSWindow::destroy(void) priv->destroy(); } +void DSWindow::setParent(DSWindow *parent) +{ + if (parent == this) return; + + DS_GET_PRIV(DSWindow); + priv->setParent(parent); +} + +DSWindow *DSWindow::getParent(void) +{ + DS_GET_PRIV(DSWindow); + return priv->getParent(); +} + bool DSWindow::show(void) { DS_GET_PRIV(DSWindow); diff --git a/src/DSWindow/DSWindow.h b/src/DSWindow/DSWindow.h index 9024dbc..2907456 100644 --- a/src/DSWindow/DSWindow.h +++ b/src/DSWindow/DSWindow.h @@ -49,6 +49,9 @@ public: bool create(std::shared_ptr waylandSurface); void destroy(void); + void setParent(DSWindow *parent); + DSWindow *getParent(void); + bool show(void); bool hide(bool autoFocus = true); int showState(void); diff --git a/src/DSWindow/DSWindowPrivate.h b/src/DSWindow/DSWindowPrivate.h index 8b429e6..b8be9ee 100644 --- a/src/DSWindow/DSWindowPrivate.h +++ b/src/DSWindow/DSWindowPrivate.h @@ -46,6 +46,9 @@ public: bool create(std::shared_ptr waylandSurface); void destroy(void); + void setParent(DSWindow *parent); + DSWindow *getParent(void); + bool show(void); bool hide(bool autoFocus); int showState(void); @@ -75,6 +78,8 @@ public: private: void __onSurfaceCommitted(std::shared_ptr waylandSurfaceCommitInfo); + DSWindow *__parent; + std::list __childList; int __x, __y; unsigned int __w; unsigned int __h; diff --git a/src/DSWindowShell/DSWindowShell.cpp b/src/DSWindowShell/DSWindowShell.cpp index 357f5d1..c6a0e7c 100644 --- a/src/DSWindowShell/DSWindowShell.cpp +++ b/src/DSWindowShell/DSWindowShell.cpp @@ -67,6 +67,39 @@ IDSWaylandShellSurface *DSWindowShell::getShellSurface(void) return priv->getShellSurface(); } +DSWindow *DSWindowShell::getWindow(void) +{ + DS_GET_PRIV(DSWindowShell); + return priv->getWindow(); +} + +bool DSWindowShell::setParent(DSWindowShell *parentWinShell) +{ + if (parentWinShell == this) + return false; + + DS_GET_PRIV(DSWindowShell); + return priv->setParent(parentWinShell); +} + +DSWindowShell *DSWindowShell::getParent(void) +{ + DS_GET_PRIV(DSWindowShell); + return priv->getParent(); +} + +bool DSWindowShell::addChild(DSWindowShell *childWinShell) +{ + DS_GET_PRIV(DSWindowShell); + return priv->addChild(childWinShell); +} + +void DSWindowShell::removeChild(DSWindowShell *childWinShell) +{ + DS_GET_PRIV(DSWindowShell); + priv->removeChild(childWinShell); +} + bool DSWindowShell::setTitle(const std::string &title) { DS_GET_PRIV(DSWindowShell); @@ -137,7 +170,8 @@ int DSWindowShell::showState(void) bool DSWindowShell::setLayer(int layer) { - return true; + DS_GET_PRIV(DSWindowShell); + return priv->setLayer(layer); } int DSWindowShell::getLayer(void) diff --git a/src/DSWindowShell/DSWindowShell.h b/src/DSWindowShell/DSWindowShell.h index c0aa944..0fe1f6d 100644 --- a/src/DSWindowShell/DSWindowShell.h +++ b/src/DSWindowShell/DSWindowShell.h @@ -50,6 +50,14 @@ public: void setShellSurface(IDSWaylandShellSurface *zxdgSurface); IDSWaylandShellSurface *getShellSurface(void); + DSWindow *getWindow(void); + + bool setParent(DSWindowShell *parentWinShell); + DSWindowShell *getParent(void); + + bool addChild(DSWindowShell *childWinShell); + void removeChild(DSWindowShell *childWinShell); + bool setTitle(const std::string &title); bool setSkipFocus(bool set); diff --git a/src/DSWindowShell/DSWindowShellPrivate.cpp b/src/DSWindowShell/DSWindowShellPrivate.cpp index 62dcd98..1b766c9 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.cpp +++ b/src/DSWindowShell/DSWindowShellPrivate.cpp @@ -38,7 +38,8 @@ DSWindowShellPrivate::DSWindowShellPrivate(DSWindowShell *p_ptr, DSWindow *windo __x(0), __y(0), __w(0), __h(0), __reqX(0), __reqY(0), - __reqW(0), __reqH(0) + __reqW(0), __reqH(0), + __parent(nullptr) { } @@ -47,6 +48,56 @@ DSWindowShellPrivate::~DSWindowShellPrivate() } +bool DSWindowShellPrivate::__findInChildList(DSWindowShell *parentWinShell) +{ + for (auto ws : __childList) + { + if (ws == parentWinShell) + return true; + } + + return false; +} + +bool DSWindowShellPrivate::__setParent(DSWindowShell *parentWinShell) +{ + DS_GET_PUB(DSWindowShell); + + if (__parent == parentWinShell) + return true; + + if (__findInChildList(parentWinShell)) + { + DSLOG_ERR("DSWindowShell", "Fatal error. Set parent each other. winShell:%p, parentWinShell:%p", pub, parentWinShell); + return false; + } + + if (__parent) + { + // remove this from old parent's child list + __parent->removeChild(pub); + } + + __parent = parentWinShell; + if (__parent) + { + __parent->addChild(pub); + } + + if (__window) + { + if (__parent) + { + DSWindow *parentWin = __parent->getWindow(); + __window->setParent(parentWin); + } + else + __window->setParent(nullptr); + } + + return true; +} + bool DSWindowShellPrivate::create(DSWindowShell *pParent) { @@ -86,6 +137,32 @@ IDSWaylandShellSurface *DSWindowShellPrivate::getShellSurface(void) return __shellSurface; } +DSWindow *DSWindowShellPrivate::getWindow(void) +{ + return __window; +} + +bool DSWindowShellPrivate::setParent(DSWindowShell *parentWinShell) +{ + return __setParent(parentWinShell); +} + +DSWindowShell *DSWindowShellPrivate::getParent(void) +{ + return __parent; +} + +bool DSWindowShellPrivate::addChild(DSWindowShell *childWinShell) +{ + __childList.push_back(childWinShell); + return true; +} + +void DSWindowShellPrivate::removeChild(DSWindowShell *childWinShell) +{ + __childList.remove(childWinShell); +} + bool DSWindowShellPrivate::setTitle(const std::string &title) { if (__window) @@ -184,12 +261,13 @@ int DSWindowShellPrivate::showState(void) bool DSWindowShellPrivate::setLayer(int layer) { + __layer = layer; return true; } int DSWindowShellPrivate::getLayer(void) { - return 0; + return __layer; } diff --git a/src/DSWindowShell/DSWindowShellPrivate.h b/src/DSWindowShell/DSWindowShellPrivate.h index 77582d1..3340a31 100644 --- a/src/DSWindowShell/DSWindowShellPrivate.h +++ b/src/DSWindowShell/DSWindowShellPrivate.h @@ -46,6 +46,14 @@ public: void setShellSurface(IDSWaylandShellSurface *shellSurface); IDSWaylandShellSurface *getShellSurface(void); + DSWindow *getWindow(void); + + bool setParent(DSWindowShell *parentWinShell); + DSWindowShell *getParent(void); + + bool addChild(DSWindowShell *childWinShell); + void removeChild(DSWindowShell *childWinShell); + bool setTitle(const std::string &title); bool setSkipFocus(bool set); @@ -100,14 +108,19 @@ public: private: bool __create(int x, int y, unsigned int w, unsigned int h, DSWindowShell *pWin, DSWindowShell *pParent); + bool __findInChildList(DSWindowShell *parentWinShell); + bool __setParent(DSWindowShell *parentWinShell); private: DSWindow *__window; IDSWaylandShellSurface *__shellSurface; int __x, __y; unsigned int __w, __h; + int __layer; int __reqX, __reqY; unsigned int __reqW, __reqH; + DSWindowShell *__parent; + std::list __childList; }; } diff --git a/tests/DSWindow-test.cpp b/tests/DSWindow-test.cpp index c037f6d..d591563 100644 --- a/tests/DSWindow-test.cpp +++ b/tests/DSWindow-test.cpp @@ -164,3 +164,23 @@ TEST_F(DSWindowTest, SkipFocusTest) EXPECT_TRUE(skip == false); } +TEST_F(DSWindowTest, ParentTest) +{ + auto parent = std::make_shared(); + EXPECT_TRUE(parent != nullptr); + EXPECT_TRUE(parent->getParent() == nullptr); + + auto child = std::make_shared(); + EXPECT_TRUE(child != nullptr); + EXPECT_TRUE(child->getParent() == nullptr); + + child->setParent(parent.get()); + EXPECT_TRUE(child->getParent() == parent.get()); + + child->setParent(nullptr); + EXPECT_TRUE(child->getParent() == nullptr); + + child->setParent(child.get()); + EXPECT_TRUE(child->getParent() == nullptr); +} + diff --git a/tests/DSWindowShell-test.cpp b/tests/DSWindowShell-test.cpp index 73af28c..01fba49 100644 --- a/tests/DSWindowShell-test.cpp +++ b/tests/DSWindowShell-test.cpp @@ -62,6 +62,31 @@ TEST_F(DSWindowShellTest, create_P2) EXPECT_TRUE(shell->create(0, 0, 720, 1280, nullptr) == true); } +TEST_F(DSWindowShellTest, parent_P1) +{ + auto window = std::make_shared(); + std::unique_ptr shell = std::make_unique(window.get()); + EXPECT_TRUE(shell != nullptr); + + EXPECT_TRUE(shell->getParent() == nullptr); + + auto childWindow = std::make_shared(); + std::unique_ptr childShell = std::make_unique(childWindow.get()); + EXPECT_TRUE(childShell != nullptr); + + EXPECT_TRUE(childShell->setParent(shell.get()) == true); + EXPECT_TRUE(childShell->getParent() == shell.get()); + + // test for set parent each other + EXPECT_TRUE(shell->setParent(childShell.get()) == false); + + // test for set parent itself + EXPECT_TRUE(childShell->setParent(childShell.get()) == false); + + EXPECT_TRUE(childShell->setParent(nullptr) == true); + EXPECT_TRUE(childShell->getParent() == nullptr); +} + TEST_F(DSWindowShellTest, setPosition_P1) { auto window = std::make_shared(); -- 2.7.4 From d2c200d15b4d69a45b453ed21583a76c6e668ebe Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Sat, 22 Aug 2020 17:10:25 +0900 Subject: [PATCH 13/16] DSZone: add setWindowParent API Change-Id: I595e7cc1c33f8f0a6a5055caa58360e03b3038ca --- src/DSZone/DSZone.cpp | 10 ++++++++++ src/DSZone/DSZone.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/DSZone/DSZone.cpp b/src/DSZone/DSZone.cpp index 52c55f9..4823aac 100644 --- a/src/DSZone/DSZone.cpp +++ b/src/DSZone/DSZone.cpp @@ -313,6 +313,16 @@ void DSZone::__destroyWindowShell(DSWindowShell* windowShell, DSWaylandSurface * } } +bool DSZone::setWindowParent(DSWaylandSurface *dswlSurface, DSWaylandSurface *dswlParentSurface) +{ + DSWindowShell *wShell = __findWindowShell(dswlSurface); + if (!wShell) return false; + + DSWindowShell *pwShell = __findWindowShell(dswlParentSurface); + + return wShell->setParent(pwShell); +} + bool DSZone::setWindowTitle(DSWaylandSurface *dswSurface, const std::string &title) { DSWindowShell *wShell = __findWindowShell(dswSurface); diff --git a/src/DSZone/DSZone.h b/src/DSZone/DSZone.h index 9d5083b..f7266fc 100644 --- a/src/DSZone/DSZone.h +++ b/src/DSZone/DSZone.h @@ -63,6 +63,7 @@ public: bool testCreateWindow(std::shared_ptr waylandSurface); // for window property + bool setWindowParent(DSWaylandSurface *dswlSurface, DSWaylandSurface *dswlParentSurface); bool setWindowTitle(DSWaylandSurface *dswSurface, const std::string &title); bool setWindowType(DSWaylandSurface *dswSurface, int type); bool setWindowGeometry(DSWaylandSurface *dswSurface, int x, int y, unsigned int w, unsigned h); -- 2.7.4 From 3486ed8d722fd40838c74607b222f698ae82f787 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Sat, 22 Aug 2020 17:11:24 +0900 Subject: [PATCH 14/16] DSWindowManager: add API for setting parent window Change-Id: I87e6d1550ce89eede32ec2b2a421332126469e9d --- src/DSWindowManager/DSWindowManager.cpp | 17 +++++++++++++++++ src/DSWindowManager/DSWindowManager.h | 1 + src/DSWindowManager/DSWindowManagerPrivate.h | 1 + 3 files changed, 19 insertions(+) diff --git a/src/DSWindowManager/DSWindowManager.cpp b/src/DSWindowManager/DSWindowManager.cpp index ecb0420..3fc3e44 100644 --- a/src/DSWindowManager/DSWindowManager.cpp +++ b/src/DSWindowManager/DSWindowManager.cpp @@ -201,6 +201,17 @@ DSZone *DSWindowManagerPrivate::getZone(DSWaylandSurface *surface) return __getZone(surface); } +bool DSWindowManagerPrivate::setWindowParent(DSWaylandSurface *dswlSurface, DSWaylandSurface *dswlParentSurface) +{ + // find dsSurface's window + DSZone *zone = __getZone(dswlSurface); + if (!zone) return false; + + DSZone *pZone = __getZone(dswlParentSurface); + if (zone != pZone) return false; + + return zone->setWindowParent(dswlSurface, dswlParentSurface); +} void DSWindowManagerPrivate::setWindowTitle(DSWaylandSurface *dsSurface, const std::string &title) { @@ -421,6 +432,12 @@ DSZone *DSWindowManager::getZone(DSWaylandSurface *surface) return priv->getZone(surface); } +bool DSWindowManager::setWindowParent(DSWaylandSurface *dswlSurface, DSWaylandSurface *dswlParentSurface) +{ + DS_GET_PRIV(DSWindowManager); + return priv->setWindowParent(dswlSurface, dswlParentSurface); +} + void DSWindowManager::setWindowTitle(DSWaylandSurface *dsSurface, const std::string &title) { DS_GET_PRIV(DSWindowManager); diff --git a/src/DSWindowManager/DSWindowManager.h b/src/DSWindowManager/DSWindowManager.h index e7a135b..c11a495 100644 --- a/src/DSWindowManager/DSWindowManager.h +++ b/src/DSWindowManager/DSWindowManager.h @@ -55,6 +55,7 @@ public: void unregisterSurface(DSZone *zone, DSWaylandSurface *surface); DSZone *getZone(DSWaylandSurface *surface); + bool setWindowParent(DSWaylandSurface *dswlSurface, DSWaylandSurface *dswlParentSurface); void setWindowTitle(DSWaylandSurface *dsSurface, const std::string &title); void setWindowType(DSWaylandSurface *dsSurface, int type); void setWindowGeometry(DSWaylandSurface *dsSurface, int x, int y, unsigned int w, unsigned h); diff --git a/src/DSWindowManager/DSWindowManagerPrivate.h b/src/DSWindowManager/DSWindowManagerPrivate.h index be3610c..28f6ec2 100644 --- a/src/DSWindowManager/DSWindowManagerPrivate.h +++ b/src/DSWindowManager/DSWindowManagerPrivate.h @@ -50,6 +50,7 @@ public: void unregisterSurface(DSZone *zone, DSWaylandSurface *surface); DSZone *getZone(DSWaylandSurface *surface); + bool setWindowParent(DSWaylandSurface *dswlSurface, DSWaylandSurface *dswlParentSurface); void setWindowTitle(DSWaylandSurface *dsSurface, const std::string &title); void setWindowType(DSWaylandSurface *dsSurface, int type); void setWindowGeometry(DSWaylandSurface *dsSurface, int x, int y, unsigned int w, unsigned h); -- 2.7.4 From d12c320aba12635b0c7854c15626f8bee4161811 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Sat, 22 Aug 2020 17:12:09 +0900 Subject: [PATCH 15/16] implement tizen_policy_set_transient_for Change-Id: I072c7aad76e60f95da68680c4ec40fd871af38d8 --- src/DSWaylandServer/DSWaylandTizenPolicy.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/DSWaylandServer/DSWaylandTizenPolicy.cpp b/src/DSWaylandServer/DSWaylandTizenPolicy.cpp index 2a28cb5..2ccef52 100644 --- a/src/DSWaylandServer/DSWaylandTizenPolicy.cpp +++ b/src/DSWaylandServer/DSWaylandTizenPolicy.cpp @@ -185,7 +185,16 @@ void DSWaylandTizenPolicyPrivate::tizen_policy_set_notification_level(Resource * void DSWaylandTizenPolicyPrivate::tizen_policy_set_transient_for(Resource *resource, uint32_t child_id, uint32_t parent_id) { - DSLOG_DBG("TizenPolicyPriv", ""); + DSLOG_DBG("TizenPolicyPriv", "Set Transient_for (parent_id:%d, child_id:%d)", parent_id, child_id); + DS_GET_PUB(DSWaylandTizenPolicy); + DSWaylandCompositor *wlComp = pub->getWlCompositor(); + if (!wlComp) return; + if (!__wm) return; + + DSWaylandSurface *childSurface = wlComp->getSurface(child_id); + DSWaylandSurface *parentSurface = wlComp->getSurface(parent_id); + + __wm->setWindowParent(childSurface, parentSurface); } void DSWaylandTizenPolicyPrivate::tizen_policy_unset_transient_for(Resource *resource, uint32_t child_id) -- 2.7.4 From 5030f47e19168d1e03f8c33a95aa02b1f9f55741 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Mon, 24 Aug 2020 08:46:56 +0900 Subject: [PATCH 16/16] DSWaylandZxdgToplevel: implement set_parent Change-Id: If4e310ceea19cae12bad463d09913d87b85a7086 --- src/DSWaylandServer/DSWaylandZxdgShellV6.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/DSWaylandServer/DSWaylandZxdgShellV6.cpp b/src/DSWaylandServer/DSWaylandZxdgShellV6.cpp index 1e38eae..f72a1e7 100644 --- a/src/DSWaylandServer/DSWaylandZxdgShellV6.cpp +++ b/src/DSWaylandServer/DSWaylandZxdgShellV6.cpp @@ -544,9 +544,24 @@ void DSWaylandZxdgToplevelV6Private::zxdg_toplevel_v6_destroy_resource(zxdg_topl void DSWaylandZxdgToplevelV6Private::zxdg_toplevel_v6_destroy(zxdg_toplevel_v6::Resource *resource) { } + void DSWaylandZxdgToplevelV6Private::zxdg_toplevel_v6_set_parent(zxdg_toplevel_v6::Resource *resource, struct ::wl_resource *parent) { + DSLOG_DBG("XDG_TopLevel", "Set Parent (parent:%p)", parent); + + DSWaylandSurface *surface = __zxdgSurface->getSurface(); + if (!surface) return; + + DSWaylandSurface *parentSurface = DSWaylandSurface::fromWlResource(parent); + + DSWindowManager *wm = DSWindowManager::getInstance(); + if (wm) + { + wm->setWindowParent(surface, parentSurface); + DSWindowManager::releaseInstance(); + } } + void DSWaylandZxdgToplevelV6Private::zxdg_toplevel_v6_set_title(zxdg_toplevel_v6::Resource *resource, const std::string &title) { __zxdgSurface->setWindowTitle(title); -- 2.7.4