X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fx11%2Fx-event-handler.cpp;h=aa4a27263210e36c6445ce9cfa020d9d0eb877de;hb=7813c373f03786489b2ffe5d802088f3f5879559;hp=0e73249f80c476171551aba35a3e1dfaa17e2da2;hpb=7a0a1bb654a45e42a33fb22650c8da62bbb30291;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/adaptors/x11/x-event-handler.cpp b/adaptors/x11/x-event-handler.cpp
index 0e73249..aa4a272 100644
--- a/adaptors/x11/x-event-handler.cpp
+++ b/adaptors/x11/x-event-handler.cpp
@@ -145,7 +145,7 @@ struct EventHandler::Impl : public WindowEventInterface
   {
     mHandler->SendEvent( point, timeStamp );
   }
-  virtual void KeyEvent( Dali::KeyEvent& keyEvent )
+  virtual void KeyEvent( Integration::KeyEvent& keyEvent )
   {
     mHandler->SendEvent( keyEvent );
   }
@@ -239,21 +239,19 @@ void EventHandler::SendEvent(Dali::Integration::Point& point, unsigned long time
   }
 }
 
-void EventHandler::SendEvent(KeyEvent& keyEvent)
+void EventHandler::SendEvent(Integration::KeyEvent& keyEvent)
 {
   Dali::PhysicalKeyboard physicalKeyboard = PhysicalKeyboard::Get();
   if ( physicalKeyboard )
   {
-    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyPressedName.c_str() ) )
+    if ( ! KeyLookup::IsDeviceButton( keyEvent.keyName.c_str() ) )
     {
       GetImplementation( physicalKeyboard ).KeyReceived( keyEvent.time > 1 );
     }
   }
 
-  // Create KeyEvent and send to Core.
-  Integration::KeyEvent event(keyEvent.keyPressedName, keyEvent.keyPressed, keyEvent.keyCode,
-  keyEvent.keyModifier, keyEvent.time, static_cast<Integration::KeyEvent::State>(keyEvent.state));
-  mCoreEventInterface.QueueCoreEvent( event );
+  // Create send KeyEvent to Core.
+  mCoreEventInterface.QueueCoreEvent( keyEvent );
   mCoreEventInterface.ProcessCoreEvents();
 }
 
@@ -305,7 +303,8 @@ void EventHandler::FeedWheelEvent( WheelEvent& wheelEvent )
 
 void EventHandler::FeedKeyEvent( KeyEvent& event )
 {
-  SendEvent( event );
+  Integration::KeyEvent convertedEvent( event );
+  SendEvent( convertedEvent );
 }
 
 void EventHandler::FeedEvent( Integration::Event& event )