[SDL_Tizen] Disable indicator 25/108625/2
authorhuiyu.eun <huiyu.eun@samsung.com>
Thu, 5 Jan 2017 08:23:34 +0000 (17:23 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Thu, 5 Jan 2017 08:42:37 +0000 (17:42 +0900)
Disable indicator

Change-Id: Iff47d2fea71304779ba8c5bed96b70c8679d3157
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
src/video/tizen/SDL_tizenmouse.c
src/video/tizen/SDL_tizenopengles.c
src/video/tizen/SDL_tizenvideo.c
src/video/tizen/SDL_tizenwindow.c

index 151eda1..371a361 100755 (executable)
@@ -35,7 +35,6 @@
 
 #include "SDL_log.h"
 #include "SDL_timer.h"
-#include "SDL_tizenindicator.h"
 #include "SDL_tizenmouse.h"
 #include "SDL_tizentouch.h"
 
@@ -280,23 +279,12 @@ _tizen_cb_event_mousedown_change(void *data, int type, void *event)
     Ecore_Event_Mouse_Button *e = event;
     Ecore_Wl_Window *ew;
     SDL_Window *window;
-    SDL_WindowData *wind;
 
     ew = ecore_wl_window_find(e->window);
     window = Tizen_FindWindow(_this, ew);
-    wind = window->driverdata;
 
     int x, y;
     _tizen_get_mouseXY(window, (int)e->x, (int)e->y, &x, &y);
-    if(Tizen_isTouchIndicator(window, wind, wind->rotation, x, y))
-    {
-        ModelMatrixTranslateInit(window, wind->rotation);
-        wind->indicator_show = SDL_TRUE;
-        wind->last_indicator_showtime = SDL_GetTicks();
-
-        if(!wind->support_pre_rotation)
-            Tizen_IndicatorProcessEvent(_this->current_glwin, wind->rotation);
-    }
 
     SDL_SendMouseMotion(window, 0, 0, x, y);
     SDL_SendMouseButton(window, 0, SDL_PRESSED, SDL_BUTTON_LEFT);
index 6604d88..bf6fe6e 100755 (executable)
@@ -26,7 +26,6 @@
 #include "SDL_log.h"
 #include "SDL_hints.h"
 #include "SDL_tizenopengles.h"
-#include "SDL_tizenindicator.h"
 #include "SDL_tizenvideo.h"
 #include "SDL_tizenwindow.h"
 
@@ -58,25 +57,6 @@ SDL_GLContext
 Tizen_GLES_CreateContext(_THIS, SDL_Window *window)
 {
     SDL_GLContext context = SDL_EGL_CreateContext(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);
-    SDL_VideoData *data = (SDL_VideoData *) (SDL_GetVideoDevice()->driverdata);
-    SDL_WindowData *wind = window->driverdata;
-    wind->need_indicator = SDL_TRUE;//Init
-
-    if(data->current_thread != SDL_GetThreadID(0))
-    {
-        wind->need_indicator = SDL_FALSE;
-        return context;
-    }
-
-    if(!(window->flags & SDL_WINDOW_FULLSCREEN) && !(window->flags & SDL_WINDOW_BORDERLESS))
-    {
-        if(!Tizen_Indicator_GLES_Init(window))
-        {
-            wind->need_indicator = SDL_FALSE;//Fail
-            SDL_LogError(SDL_LOG_CATEGORY_ASSERT, "Indicator GLES init error!");
-        }
-    }
-
     return context;
 }
 
@@ -84,16 +64,6 @@ void
 Tizen_GLES_SwapWindow(_THIS, SDL_Window *window)
 {
     SDL_WindowData* wdata = (SDL_WindowData*)window->driverdata;
-    if(!(window->flags & SDL_WINDOW_FULLSCREEN) && !(window->flags & SDL_WINDOW_BORDERLESS) && wdata->need_indicator)
-    {
-        if(!Tizen_Indicator_GLES_Init(window))
-        {
-            wdata->need_indicator = SDL_FALSE;//Fail
-            SDL_LogError(SDL_LOG_CATEGORY_ASSERT, "Indicator GLES init error!");
-        }
-    }
-
-    Tizen_DrawIndicator(window);
 
     if (wdata->received_rotation == 1) {
         if(wdata->support_pre_rotation) {
@@ -112,11 +82,6 @@ Tizen_GLES_SwapWindow(_THIS, SDL_Window *window)
             }
         }
         SDL_SendWindowEvent(window, SDL_WINDOWEVENT_SIZE_CHANGED, window->w, window->h);
-
-        const char* hint = SDL_GetHint(SDL_HINT_ORIENTATIONS);
-        if(hint && *hint != '\0')
-            Tizen_IndicatorProcessEvent(_this->current_glwin, wdata->rotation);
-
         ecore_wl_window_rotation_change_done_send(wdata->window);
         wdata->received_rotation = 0;
     }
index f9ad236..a2b87b9 100755 (executable)
@@ -36,7 +36,6 @@
 #include "SDL_tizenkeyboard.h"
 #include "SDL_tizenvulkan.h"
 #include "SDL_tizenopengles.h"
-#include "SDL_tizenindicator.h"
 
 #include "SDL_tizenevents_c.h"
 #include "SDL_tizenmouse.h"
@@ -111,7 +110,7 @@ Tizen_CreateDevice(int devindex)
     device->GL_UnloadLibrary = Tizen_GLES_UnloadLibrary;
     device->GL_GetProcAddress = Tizen_GLES_GetProcAddress;
     device->GL_DeleteContext = Tizen_GLES_DeleteContext;
-    device->SetWindowBordered = Tizen_SetWindowBordered;
+//    device->SetWindowBordered = Tizen_SetWindowBordered;
 #endif
     device->CreateWindow = Tizen_CreateWindow;
     device->ShowWindow = Tizen_ShowWindow;
@@ -185,8 +184,6 @@ Tizen_VideoQuit(_THIS)
 {
     SDL_VideoData *data = _this->driverdata;
 
-    Tizen_FiniIndicator();
-
     Tizen_DeinitWindow(_this);
     Tizen_FiniKeyboard();
     Tizen_FiniMouse();
index a831a90..1034853 100755 (executable)
@@ -28,8 +28,6 @@
 #include "SDL_hints.h"
 #include "SDL_loadso.h"
 
-#include "SDL_tizenindicator.h"
-
 #include "SDL_tizenvideo.h"
 #include "SDL_tizentouch.h"
 #include "SDL_tizenkeyboard.h"