forked from dalihub/dali-example
-
Notifications
You must be signed in to change notification settings - Fork 1
/
test2.patch
142 lines (132 loc) · 4.39 KB
/
test2.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index cbc8633..c3a9b78 100644
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -36,6 +36,8 @@ SET(DEMO_IMAGE_DIR ${IMAGES_DIR})
SET(DEMO_STYLE_DIR "${STYLE_DIR}")
SET(DEMO_LANG "${LANG}")
+ADD_DEFINITIONS("-DEXPORTED=__attribute__((visibility(\"default\")))")
+
# Image Resources
INSTALL(DIRECTORY ${LOCAL_IMAGES_DIR} DESTINATION ${APP_DATA_RES_DIR})
@@ -56,7 +58,9 @@ SET(PKG_LIST dali2-core
dali2-adaptor
dali2-toolkit
glesv2
- libtbm)
+ libtbm
+ capi-ui-inputmethod
+ dlog)
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(REQUIRED_PKGS REQUIRED ${PKG_LIST})
diff --git a/com.samsung.dali-example.xml b/com.samsung.dali-example.xml
index d8ba0e5..99d564a 100644
--- a/com.samsung.dali-example.xml
+++ b/com.samsung.dali-example.xml
@@ -5,12 +5,15 @@
<author email="[email protected]" href="www.samsung.com">Adeel Kazmi</author>
<description>DALi Example</description>
- <ui-application appid="com.samsung.dali-example" exec="/usr/apps/com.samsung.dali-example/bin/dali-example" nodisplay="false" multiple="false" type="c++app" taskmanage="true">
+ <ui-application appid="com.samsung.dali-example" exec="/usr/apps/com.samsung.dali-example/bin/dali-example" nodisplay="true" multiple="false" type="c++app" taskmanage="false">
+ <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
+ <category name="http://tizen.org/category/ime"/>
<icon>/usr/share/icons/com.samsung.dali-example.png</icon>
<label>DALi Example</label>
</ui-application>
<privileges>
+ <privilege>http://tizen.org/privilege/ime</privilege>
<privilege>http://tizen.org/privilege/mediastorage</privilege>
<privilege>http://tizen.org/privilege/externalstorage</privilege>
<privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>
diff --git a/packaging/com.samsung.dali-example.spec b/packaging/com.samsung.dali-example.spec
index 583e801..b4f1ab8 100755
--- a/packaging/com.samsung.dali-example.spec
+++ b/packaging/com.samsung.dali-example.spec
@@ -20,6 +20,8 @@ BuildRequires: pkgconfig(dali2-toolkit)
BuildRequires: pkgconfig(libtzplatform-config)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(libtbm)
+BuildRequires: pkgconfig(capi-ui-inputmethod)
+BuildRequires: pkgconfig(dlog)
%description
A simple DALi example with resources and a style.
diff --git a/src/dali-example.cpp b/src/dali-example.cpp
index bdc47e6..233c1ad 100644
--- a/src/dali-example.cpp
+++ b/src/dali-example.cpp
@@ -20,6 +20,8 @@
#include <dali/devel-api/adaptor-framework/window-devel.h>
#include <dali/integration-api/debug.h>
#include <iostream>
+#include <inputmethod.h>
+#include <inputmethod_internal.h>
using namespace Dali;
using namespace Dali::Toolkit;
@@ -95,7 +97,7 @@ public:
DevelWindow::SetPartialWindowOrientation(winHandle, Dali::WindowOrientation::PORTRAIT_INVERSE, PositionSize(0, 0, 720, 442));
DevelWindow::SetPartialWindowOrientation(winHandle, Dali::WindowOrientation::LANDSCAPE_INVERSE, PositionSize(0, 0, 318, 1280));
- winHandle.Show();
+ //winHandle.Show();
}
bool OnTimerTick()
@@ -172,10 +174,57 @@ private:
Dali::Window mSecondWindow;
};
+static int _argc;
+static char **_argv;
+static Application application;
+
+static void ime_app_create_cb(void *user_data)
+{
+}
+
+static void ime_app_exit_cb(void *user_data)
+{
+}
+
+static void ime_app_show_cb(int ic, ime_context_h ime_ctx, void *user_data)
+{
+}
+
+static void ime_app_hide_cb(int ic, void *user_data)
+{
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EXPORTED void ime_app_main(int argc, char **argv)
+{
+ ime_callback_s basic_callback = {
+ ime_app_create_cb,
+ ime_app_exit_cb,
+ ime_app_show_cb,
+ ime_app_hide_cb
+ };
+
+ ime_set_dotnet_flag(TRUE);
+ ime_set_window_creation_defer_flag(TRUE);
+ ime_run(&basic_callback, NULL);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+
int DALI_EXPORT_API main( int argc, char **argv )
{
- Application application = Application::New( &argc, &argv );
- HelloWorldController test( application );
- application.MainLoop();
- return 0;
+ _argc = argc;
+ _argv = argv;
+ application = Application::New( &_argc, &_argv );
+ HelloWorldController test( application );
+ application.MainLoop();
+ ime_app_main(argc, argv);
+
+ return 0;
}