From a3895c82fb2c09e5991a3ca7de362514f926da28 Mon Sep 17 00:00:00 2001 From: jeon Date: Fri, 28 Aug 2020 11:14:42 +0900 Subject: [PATCH] DSWaylandServer: build a tizen_policy_ext class Change-Id: I66d18becc6b51fd1f2a3b8c6de05e53fa8317fe3 --- src/DSWaylandServer/dswayland-server-tizen_policy_ext.cpp | 12 +++++++----- src/DSWaylandServer/dswayland-server-tizen_policy_ext.h | 3 ++- src/meson.build | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/DSWaylandServer/dswayland-server-tizen_policy_ext.cpp b/src/DSWaylandServer/dswayland-server-tizen_policy_ext.cpp index 6a035da..97e129e 100644 --- a/src/DSWaylandServer/dswayland-server-tizen_policy_ext.cpp +++ b/src/DSWaylandServer/dswayland-server-tizen_policy_ext.cpp @@ -1,6 +1,8 @@ /* Protocol XML file : wayland-extension/tizen_policy_ext.xml */ -#include "dswayland-server-tizen-policy-ext.h" +#include +#include "tizen_policy_ext-server-protocol.h" +#include "dswayland-server-tizen_policy_ext.h" #ifndef DS_UNLIKELY #define DS_UNLIKELY(X) X @@ -105,7 +107,7 @@ namespace DSWaylandServer { void tizen_policy_ext::init(struct ::wl_display *display, int version) { - m_global = wl_global_create(display, &::tizen_policy_ext_interface, version, this, bind_func); + m_global = wl_global_create(display, &::tizen_policy_ext_interface3, version, this, bind_func); m_globalVersion = version; m_displayDestroyedListener.notify = tizen_policy_ext::display_destroy_func; m_displayDestroyedListener.parent = this; @@ -114,7 +116,7 @@ namespace DSWaylandServer { const struct wl_interface *tizen_policy_ext::interface() { - return &::tizen_policy_ext_interface; + return &::tizen_policy_ext_interface3; } tizen_policy_ext::Resource *tizen_policy_ext::tizen_policy_ext_allocate() @@ -156,7 +158,7 @@ namespace DSWaylandServer { tizen_policy_ext::Resource *tizen_policy_ext::bind(struct ::wl_client *client, uint32_t id, int version) { DS_ASSERT_X(!wl_client_get_object(client, id), "DSWaylandObject bind", "binding to object %u more than once", id); - struct ::wl_resource *handle = wl_resource_create(client, &::tizen_policy_ext_interface, version, id); + struct ::wl_resource *handle = wl_resource_create(client, &::tizen_policy_ext_interface3, version, id); return bind(handle); } @@ -174,7 +176,7 @@ namespace DSWaylandServer { { if (DS_UNLIKELY(!resource)) return NULL; - if (wl_resource_instance_of(resource, &::tizen_policy_ext_interface, &m_tizen_policy_ext_interface)) + if (wl_resource_instance_of(resource, &::tizen_policy_ext_interface3, &m_tizen_policy_ext_interface)) return static_cast(wl_resource_get_user_data(resource)); return NULL; } diff --git a/src/DSWaylandServer/dswayland-server-tizen_policy_ext.h b/src/DSWaylandServer/dswayland-server-tizen_policy_ext.h index 66d7b92..9069fe7 100644 --- a/src/DSWaylandServer/dswayland-server-tizen_policy_ext.h +++ b/src/DSWaylandServer/dswayland-server-tizen_policy_ext.h @@ -4,7 +4,8 @@ #define __DS_TIZEN_POLICY_EXT_PROTOCOL_H__ #include "wayland-server-core.h" -#include "tizen-policy-ext-server-protocol.h" +#include +#include "tizen_policy_ext-server-protocol.h" #include #include #include diff --git a/src/meson.build b/src/meson.build index 7691d3b..48b1a58 100644 --- a/src/meson.build +++ b/src/meson.build @@ -97,6 +97,8 @@ libds_wayland_srcs = [ 'DSWaylandServer/dswayland-server-tizen-launch.h', 'DSWaylandServer/dswayland-server-input-method.cpp', 'DSWaylandServer/dswayland-server-input-method.h', + 'DSWaylandServer/dswayland-server-tizen_policy_ext.cpp', + 'DSWaylandServer/dswayland-server-tizen_policy_ext.h', 'DSWaylandServer/DSWaylandCallback.cpp', 'DSWaylandServer/DSWaylandCallback.h', 'DSWaylandServer/DSWaylandCallbackPrivate.h', -- 2.7.4