bugfix: TIVI-2396: Virtual Keyboard doesn't catch the mouse event with the ICO UI

Change-Id: I748f1346e98ed9e06e05a0b9778d3ca856353bee
Signed-off-by: Masayuki Sasaki <masayuki.sasaki@mail.toyota-td.jp>

diff --git a/packaging/ico-uxf-weston-plugin.changes b/packaging/ico-uxf-weston-plugin.changes
index ef29faa..01a44c3 100644 (file)
--- a/packaging/ico-uxf-weston-plugin.changes
+++ b/packaging/ico-uxf-weston-plugin.changes
@@ -1,3 +1,6 @@
+* Thu Feb 13 2014 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen/ivi/20140128.174118@4018b9f
+- bugfix:  TIVI-2396: Virtual Keyboard doesn't catch the mouse event with the ICO UI
+
 * Fri Feb 07 2014 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen/ivi/20140128.174118@6241868
 - 0.9.14 release
 -- improve: it corresponded to Wayland/Weston 1.4.0

diff --git a/packaging/ico-uxf-weston-plugin.spec b/packaging/ico-uxf-weston-plugin.spec
index d81c088..7af2372 100644 (file)
--- a/packaging/ico-uxf-weston-plugin.spec
+++ b/packaging/ico-uxf-weston-plugin.spec
@@ -67,6 +67,7 @@ install -m 0644 settings/weston.ini %{buildroot}%{weston_conf}
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/desktop-shell-client-protocol.h
+%{_includedir}/%{name}/xdg-shell-client-protocol.h
 %{_includedir}/%{name}/input-method-client-protocol.h
 %{_includedir}/%{name}/workspaces-client-protocol.h
 %{_includedir}/%{name}/ico_input_mgr-client-protocol.h

diff --git a/src/ico_plugin_version.h b/src/ico_plugin_version.h
index 32c09f3..9236f0f 100644 (file)
--- a/src/ico_plugin_version.h
+++ b/src/ico_plugin_version.h
@@ -1 +1 @@
-#define ICO_PLUIGN_VERSION  "0.9.14 (Feb-07-2014)"
+#define ICO_PLUIGN_VERSION  "0.9.14 (Feb-13-2014)"

diff --git a/src/ico_window_mgr.c b/src/ico_window_mgr.c
index 11f634f..fec092b 100644 (file)
--- a/src/ico_window_mgr.c
+++ b/src/ico_window_mgr.c
@@ -1717,8 +1717,6 @@ ico_window_mgr_restack_layer(struct uifw_win_surface *usurf)
 
     /* remove all surfaces in panel_layer   */
     wl_list_for_each_safe (view, viewtmp, &wlayer->view_list, layer_link)   {
-uifw_debug("ico_window_mgr_restack_layer: remove view %08x surf=%08x",
-        (int)view, (int)view->surface);
         wl_list_remove(&view->layer_link);
         wl_list_init(&view->layer_link);
     }
@@ -1766,8 +1764,6 @@ uifw_debug("ico_window_mgr_restack_layer: remove view %08x surf=%08x",
                     new_y = (float)(eu->y + eu->node_tbl->disp_y + eu->yadd);
                 }
                 wl_list_for_each (view, &eu->surface->views, surface_link)  {
-uifw_debug("ico_window_mgr_restack_layer: add %08x view %08x surf=%08x",
-        eu->surfaceid, (int)view, (int)view->surface);
                     wl_list_remove(&view->layer_link);
                     wl_list_init(&view->layer_link);
                     wl_list_insert(wlayer->view_list.prev, &view->layer_link);
@@ -1788,10 +1784,6 @@ uifw_debug("ico_window_mgr_restack_layer: add %08x view %08x surf=%08x",
             }
         }
     }
-    wl_list_for_each (view, &wlayer->view_list, layer_link)   {
-uifw_debug("ico_window_mgr_restack_layer: panel_layer view %08x surf=%08x",
-        (int)view, (int)view->surface);
-    }
 
     /* damage(redraw) target surfacem if target exist   */
     if (usurf) {
@@ -5325,9 +5317,6 @@ win_mgr_set_scale(struct uifw_win_surface *usurf)
                 weston_matrix_init(&usurf->transform.matrix);
                 weston_matrix_scale(&usurf->transform.matrix, scalex, scaley, 1.0f);
                 uifw_trace("win_mgr_set_scale: change scale(%d)", usurf->set_transform);
-uifw_trace("ev=%08x transformation_list=%08x next=%08x prev=%08x",
-    (int)ev, (int)&ev->geometry.transformation_list,
-    (int)ev->geometry.transformation_list.next, (int)ev->geometry.transformation_list.prev);
                 if (usurf->set_transform == 0)  {
                     usurf->set_transform = 1;
                     wl_list_init(&usurf->transform.link);