From: Yoonsang Lee <ysang114.lee@samsung.com>
Date: Mon, 27 Apr 2015 10:33:06 +0000 (+0900)
Subject: [3.0] Add key grab/ungrab API for Tizen (X11/Wayland)
X-Git-Tag: accepted/tizen/mobile/20150820.115751^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1cce0fe3509ce24f6c6e3ec54a01bec7c30eb9a4;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[3.0] Add key grab/ungrab API for Tizen (X11/Wayland)

- Key grab feature is designed for following example scenarios:
  - TV : A user might want to change the volume or channel of the background TV contents while focusing on the foregrund app.
  - Mobile : When a user presses Home key, the homescreen appears regardless of current foreground app.
  - Mobile : Using volume up/down as zoom up/down in camera apps.

- Add --enable-profile option to build.sh of automated-tests
  - Key grab feature is available only in Tizen. It's UTCs should not be compiled in Ubuntu.
  - Desktop dali-adaptor automated-tests should be built with --enable-profile=UBUNTU similar to desktop dali-adaptor.

Change-Id: Ic523f094d65d21359b3c4140131efbaf91214082
---

diff --git a/adaptors/wayland/file.list b/adaptors/wayland/file.list
index b44598b..3b655dc 100644
--- a/adaptors/wayland/file.list
+++ b/adaptors/wayland/file.list
@@ -15,7 +15,8 @@ adaptor_wayland_tizen_internal_src_files = \
   $(adaptor_wayland_dir)/pixmap-render-surface-wl.cpp \
   $(adaptor_wayland_dir)/ecore-wl-render-surface.cpp \
   $(adaptor_wayland_dir)/window-render-surface-wl.cpp \
-  $(adaptor_wayland_dir)/key-mapping-wl.cpp
+  $(adaptor_wayland_dir)/key-mapping-wl.cpp \
+  $(adaptor_wayland_dir)/key-grab-wl.cpp
 
 adaptor_wayland_tizen_common_internal_default_profile_src_files = \
   $(adaptor_wayland_dir)/ecore-wl-render-surface-factory.cpp \
diff --git a/adaptors/x11/file.list b/adaptors/x11/file.list
index 81a71b9..5c3ec38 100644
--- a/adaptors/x11/file.list
+++ b/adaptors/x11/file.list
@@ -32,7 +32,8 @@ adaptor_x11_tizen_internal_src_files = \
   $(adaptor_x11_dir)/accessibility-adaptor-impl-x.cpp \
   $(adaptor_x11_dir)/framework-x.cpp \
   $(adaptor_x11_dir)/key-mapping-x.cpp \
-  $(adaptor_x11_dir)/window-extensions.cpp
+  $(adaptor_x11_dir)/window-extensions.cpp \
+  $(adaptor_x11_dir)/key-grab-x.cpp
 
 adaptor_x11_tv_internal_src_files = \
   $(_adaptor_x11_internal_src_files) \
diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 74b8c4e..c5b6fd3 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -352,6 +352,15 @@ libdali_adaptor_la_LIBADD += $(UTILX_LIBS)
 endif
 endif
 
+if !UBUNTU_PROFILE
+if WAYLAND
+else
+# X11
+libdali_adaptor_la_CXXFLAGS += $(UTILX_CFLAGS)
+libdali_adaptor_la_LIBADD += $(UTILX_LIBS)
+endif
+endif
+
 tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
 tizenadaptorpublicapi_HEADERS = $(public_api_header_files)