Revert "[Tizen] Sync for libds"

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / common / gl-window-impl.cpp

diff --git a/dali/internal/window-system/common/gl-window-impl.cpp b/dali/internal/window-system/common/gl-window-impl.cpp
index 8ac0e17..648feeb 100644 (file)
--- a/dali/internal/window-system/common/gl-window-impl.cpp
+++ b/dali/internal/window-system/common/gl-window-impl.cpp
@@ -25,6 +25,7 @@
 #include <dali/devel-api/adaptor-framework/gl-window.h>
 #include <dali/integration-api/events/touch-integ.h>
 #include <dali/integration-api/events/key-event-integ.h>
+#include <dali/devel-api/events/key-event-devel.h>
 
 // INTERNAL HEADERS
 //#include <dali/internal/graphics/gles/egl-graphics.h>
@@ -94,6 +95,9 @@ GlWindow::GlWindow()
   mFocusChangeSignal(),
   mResizedSignal(),
   mVisibilityChangedSignal(),
+  mGLInitCallback( 0 ),
+  mGLRenderFrameCallback( 0 ),
+  mGLTerminateCallback( 0 ),
   mGLRenderCallback( nullptr ),
   mEGLSurface( nullptr ),
   mEGLContext( nullptr ),
@@ -113,7 +117,10 @@ GlWindow::~GlWindow()
     mEventHandler->RemoveObserver( *this );
   }
 
-  mGLTerminateCallback();
+  if( mGLTerminateCallback )
+  {
+    mGLTerminateCallback();
+  }
 
   if( mIsEGLInitialize )
   {
@@ -487,6 +494,7 @@ void GlWindow::OnTouchPoint( Dali::Integration::Point& point, int timeStamp )
     return;
   }
 
+  RecalculateTouchPosition( point );
   Dali::TouchEvent touchEvent = Dali::Integration::NewTouchEvent( timeStamp, point );
   mTouchSignal.Emit( touchEvent );
 }
@@ -499,7 +507,9 @@ void GlWindow::OnWheelEvent( Dali::Integration::WheelEvent& wheelEvent )
 
 void GlWindow::OnKeyEvent( Dali::Integration::KeyEvent& keyEvent )
 {
-  Dali::KeyEvent event = Dali::Integration::KeyEvent::Convert( keyEvent );
+  Dali::KeyEvent event = Dali::DevelKeyEvent::New( keyEvent.keyName, keyEvent.logicalKey, keyEvent.keyString, keyEvent.keyCode,
+                                                   keyEvent.keyModifier, keyEvent.time, static_cast<Dali::KeyEvent::State>(keyEvent.state),
+                                                   keyEvent.compose, keyEvent.deviceName, keyEvent.deviceClass, keyEvent.deviceSubclass );
   mKeyEventSignal.Emit( event );
 }
 
@@ -767,11 +777,17 @@ bool GlWindow::RunCallback()
 
   if( !mInitCallback )
   {
-    mGLInitCallback();
+    if( mGLInitCallback )
+    {
+      mGLInitCallback();
+    }
     mInitCallback = true;
   }
 
-  mGLRenderFrameCallback();
+  if( mGLRenderFrameCallback )
+  {
+    mGLRenderFrameCallback();
+  }
 
   if( mIsWindowRotated )
   {