The change of the configuration and the implementation of the event input.

[profile/ivi/ico-uxf-weston-plugin.git] / src / ico_ivi_shell.c

diff --git a/src/ico_ivi_shell.c b/src/ico_ivi_shell.c
index 8bc0757..25e8698 100644 (file)
--- a/src/ico_ivi_shell.c
+++ b/src/ico_ivi_shell.c
@@ -303,8 +303,10 @@ static char *shell_exe = NULL;
 static int  ico_debug_level = DEFAULT_DEBUG_LEVEL;  /* Debug Level                  */
 
 /* debug log macros         */
+#define uifw_debug(fmt,...)  \
+    { if (ico_debug_level >= 5) {weston_log("DBG>"fmt" (%s:%d)\n",##__VA_ARGS__,__FILE__,__LINE__);} }
 #define uifw_trace(fmt,...)  \
-    { if (ico_debug_level >= 4) {weston_log("DBG>"fmt" (%s:%d)\n",##__VA_ARGS__,__FILE__,__LINE__);} }
+    { if (ico_debug_level >= 4) {weston_log("TRC>"fmt" (%s:%d)\n",##__VA_ARGS__,__FILE__,__LINE__);} }
 #define uifw_info(fmt,...)  \
     { if (ico_debug_level >= 3) {weston_log("INF>"fmt" (%s:%d)\n",##__VA_ARGS__,__FILE__,__LINE__);} }
 #define uifw_warn(fmt,...)  \
@@ -366,6 +368,11 @@ shell_grab_start(struct shell_grab *grab,
 {
     struct desktop_shell *shell = shsurf->shell;
 
+    /* if ico_window_mgr hook, not change grab  */
+    if (shell_hook_select)  {
+        return;
+    }
+
     popup_grab_end(pointer);
 
     grab->grab.interface = interface;
@@ -3169,6 +3176,11 @@ activate(struct desktop_shell *shell, struct weston_surface *es,
     wl_list_remove(&state->surface_destroy_listener.link);
     wl_signal_add(&es->destroy_signal, &state->surface_destroy_listener);
 
+    /* if ico_window_mgr hook, not change surface stack */
+    if (shell_hook_select)  {
+        return;
+    }
+
     switch (get_shell_surface_type(main_surface)) {
     case SHELL_SURFACE_FULLSCREEN:
         /* should on top of panels */