From 2c271133a30340b33985732956d2034d39a2dd71 Mon Sep 17 00:00:00 2001 From: DaeKwang Ryu Date: Tue, 1 Nov 2016 13:25:44 +0900 Subject: [PATCH] Revert "[SDL_Tizen] fix Skip event" This reverts commit 0958f98c448f8a06b92c1e2bbecb959dd1a81a1b. Change-Id: I238544e89819a40c6e350b4a0d148a0522c91418 --- include/SDL_video.h | 4 +--- src/video/SDL_video.c | 3 +-- src/video/tizen/SDL_tizenwindow.c | 23 +++++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/SDL_video.h b/include/SDL_video.h index b9ae044..4c60c27 100755 --- a/include/SDL_video.h +++ b/include/SDL_video.h @@ -110,9 +110,7 @@ typedef enum SDL_WINDOW_FOREIGN = 0x00000800, /**< window not created by SDL */ SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000, /**< window should be created in high-DPI mode if supported */ SDL_WINDOW_MOUSE_CAPTURE = 0x00004000, /**< window has mouse captured (unrelated to INPUT_GRABBED) */ - SDL_WINDOW_VULKAN = 0x10000000, /**< window usable with Vulkan */ - SDL_WINDOW_INPUT_UNFOCUS = 0x20000000, /**< window loses input focus */ - SDL_WINDOW_MOUSE_UNFOCUS = 0x40000000 /**< window loses mouse focus */ + SDL_WINDOW_VULKAN = 0x10000000 /**< window usable with Vulkan */ } SDL_WindowFlags; /** diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index b485353..e5fc528 100755 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -1298,8 +1298,7 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen) } #define CREATE_FLAGS \ - (SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI | \ - SDL_WINDOW_VULKAN | SDL_WINDOW_INPUT_UNFOCUS | SDL_WINDOW_MOUSE_UNFOCUS ) + (SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_VULKAN | 0x00008000) static void SDL_FinishWindowCreation(SDL_Window *window, Uint32 flags) diff --git a/src/video/tizen/SDL_tizenwindow.c b/src/video/tizen/SDL_tizenwindow.c index cecdca5..6618076 100644 --- a/src/video/tizen/SDL_tizenwindow.c +++ b/src/video/tizen/SDL_tizenwindow.c @@ -193,6 +193,12 @@ Tizen_CreateWindow(_THIS, SDL_Window *window) wind->received_rotation = 0; ecore_wl_window_opaque_region_set(wind->window, window->x, window->y, window->w, window->h); + if (window->flags & 0x00008000) + { + ecore_wl_window_input_region_set(wind->window, 0, 0, 0, 0); + ecore_wl_window_focus_skip_set(wind->window, EINA_TRUE); + } + #if SDL_VIDEO_OPENGL_EGL if (window->flags & SDL_WINDOW_OPENGL) { wind->egl_window = wl_egl_window_create(ecore_wl_window_surface_get(wind->window), window->w, window->h); @@ -211,17 +217,14 @@ Tizen_CreateWindow(_THIS, SDL_Window *window) Tizen_InitKeyboard(_this); - if (window->flags & SDL_WINDOW_MOUSE_UNFOCUS) { - SDL_Log("SDL_WINDOW_MOUSE_UNFOCUS is set. Mouse event will be passed the focused window."); - ecore_wl_window_input_region_set(wind->window, -1, -1, 1, 1); - } - else { - SDL_SetMouseFocus(window); - } + SDL_SetMouseFocus(window); - if (window->flags & SDL_WINDOW_INPUT_UNFOCUS) { - SDL_Log("SDL_WINDOW_INPUT_UNFOCUS is set. Key event will be passed the focused window."); - ecore_wl_window_focus_skip_set(wind->window, EINA_TRUE); + if (window->flags & 0x00008000) { + SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "---------------------------------------"); + SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "[SDL] touch bypass setting is done!\n"); + SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "---------------------------------------"); + ecore_wl_window_input_region_set(wind->window, -1, -1, 1, 1); + //ecore_wl_window_focus_skip_set(wind->window, EINA_TRUE); } EINA_INLIST_FOREACH(globals, global) { -- 2.7.4