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
|
rom 42f5cc1e4436c34dd1c939ff49f403be609f8f1c Mon Sep 17 00:00:00 2001
From: Imran Zaman <imran.zaman@intel.com>
Date: Thu, 5 Feb 2015 13:21:44 +0100
Subject: [PATCH] Enable/disable default virtual keyboard
Adapted from Tizen commit ad9e205ea7fdb859679b63698a931fa127c5523a
Adapted for weston 1.6.0
<quote>
Since fullscreen shell does not support virtual keyboard,
added configure option to enable/disable default virtual
keyboard. This avoids unnecessary trial of launching vkb
and hence will improve boot time
Change-Id: I67bdd8ee231d101d6e3747a45968758af42ebc5a
Bug-Tizen: TC-810
Signed-off-by: Imran Zaman <imran.zaman@intel.com>
</quote>
Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac
+++ git/configure.ac
@@ -449,6 +449,15 @@ AC_ARG_ENABLE(ivi-shell,
enable_ivi_shell=yes)
AM_CONDITIONAL(ENABLE_IVI_SHELL, test "x$enable_ivi_shell" = "xyes")
+AC_ARG_ENABLE([default-vkb],
+ [AC_HELP_STRING([--enable-default-vkb],
+ [Enable default virtual keyboard])],
+ [],
+ [enable_default_vkb=yes])
+if test "x$enable_default_vkb" = "xyes"; then
+ AC_DEFINE(HAVE_DEFAULT_VKB, [1], [Enable default virtual keyboard])
+fi
+
AC_ARG_ENABLE(wcap-tools, [ --disable-wcap-tools],, enable_wcap_tools=yes)
AM_CONDITIONAL(BUILD_WCAP_TOOLS, test x$enable_wcap_tools = xyes)
if test x$enable_wcap_tools = xyes; then
@@ -551,6 +560,7 @@ AC_MSG_RESULT([
dbus ${enable_dbus}
ivi-shell ${enable_ivi_shell}
+ default virtual keyboard ${enable_default_vkb}
Build wcap utility ${enable_wcap_tools}
Build Fullscreen Shell ${enable_fullscreen_shell}
Index: git/src/text-backend.c
===================================================================
--- git.orig/src/text-backend.c
+++ git/src/text-backend.c
@@ -948,8 +948,10 @@ text_backend_configuration(struct text_b
section = weston_config_get_section(text_backend->compositor->config,
"input-method", NULL, NULL);
+ #if HAVE_DEFAULT_VKB
ret = asprintf(&client, "%s/weston-keyboard",
weston_config_get_libexec_dir());
+ #endif
if (ret < 0)
client = NULL;
weston_config_section_get_string(section, "path",
|
