From: Sunghyun Kim <scholb.kim@samsung.com>
Date: Tue, 10 Aug 2021 08:14:48 +0000 (+0900)
Subject: Delete unnecessary keyMap conversion code
X-Git-Tag: submit/tizen/20211007.044910~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48bcf7316ab9bff4cad25b3cf14da0639fd390e8;p=platform%2Fcore%2Fuifw%2Fwidget-viewer-dali.git

Delete unnecessary keyMap conversion code

WidgetView was converting KeyMap directly and handing it over to Widget.
But using dali keyMap, this process is unnecessary.
Therefore, i deletes unnecessary code.

Change-Id: I4d595d68793ce73c8105a3600ec8da77cf3ce85c
---

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index ef6ec5f..9775817 100644
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -149,100 +149,6 @@ static const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER(
     }\n
 );
 
-// ToDo: Now dali provides only dali key codes.
-// This funtion will be used to get platform specific key codes from key name
-struct KeyCodeMap
-{
-  xkb_keysym_t keySym;
-  xkb_keycode_t keyCode;
-  bool isKeyCode;
-};
-
-static void FindKeyCode( struct xkb_keymap* keyMap, xkb_keycode_t key, void* data )
-{
-  KeyCodeMap* foundKeyCode = static_cast< KeyCodeMap* >( data );
-  if( foundKeyCode->isKeyCode )
-  {
-    return;
-  }
-
-  xkb_keysym_t keySym = foundKeyCode->keySym;
-  int nsyms = 0;
-  const xkb_keysym_t* symsOut = NULL;
-
-  nsyms = xkb_keymap_key_get_syms_by_level( keyMap, key, 0, 0, &symsOut );
-
-  if( nsyms && symsOut )
-  {
-    if( *symsOut == keySym )
-    {
-      foundKeyCode->keyCode = key;
-      foundKeyCode->isKeyCode = true;
-    }
-  }
-}
-
-static bool GetKeyCode( std::string keyName, int32_t& keyCode )
-{
-  xkb_keymap* keyMap = NULL;
-  xkb_keysym_t sym = XKB_KEY_NoSymbol;
-  KeyCodeMap foundKeyCode;
-
-#ifdef ECORE_WL2
-  Ecore_Wl2_Input* ecoreWlInput = NULL;
-
-  Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get(NULL);
-  if( !wl2_display )
-  {
-    DALI_LOG_ERROR( "Failed to get Ecore_Wl2_Display in WidgetView\n" );
-    return false;
-  }
-
-  ecoreWlInput = ecore_wl2_input_default_input_get(wl2_display);
-  if( !ecoreWlInput )
-  {
-    DALI_LOG_ERROR( "Failed to get Ecore_Wl2_Input in WidgetView\n" );
-    return false;
-  }
-
-  keyMap = ecore_wl2_input_keymap_get( ecoreWlInput );
-  if( !keyMap )
-  {
-    DALI_LOG_ERROR( "Failed to get keymap in WidgetView\n" );
-    return false;
-  }
-#else
-  Ecore_Wl_Input* ecoreWlInput = NULL;
-
-  ecoreWlInput = ecore_wl_input_get();
-
-  if( !ecoreWlInput )
-  {
-    DALI_LOG_ERROR( "Failed to get Ecore_Wl_Input in WidgetView\n" );
-    return false;
-  }
-
-  keyMap = ecore_wl_input_keymap_get( ecoreWlInput );
-  if( !keyMap )
-  {
-    DALI_LOG_ERROR( "Failed to get keymap in WidgetView\n" );
-    return false;
-  }
-#endif
-  sym = xkb_keysym_from_name( keyName.c_str(), XKB_KEYSYM_NO_FLAGS );
-  if( sym == XKB_KEY_NoSymbol )
-  {
-    DALI_LOG_ERROR( "Failed to get keysym in WidgetView\n" );
-    return false;
-  }
-
-  foundKeyCode.keySym = sym;
-  foundKeyCode.isKeyCode = false;
-  xkb_keymap_key_for_each( keyMap, FindKeyCode, &foundKeyCode );
-  keyCode = static_cast< int32_t >( foundKeyCode.keyCode );
-  return true;
-}
-
 static void OnBufferUpdated( struct tizen_remote_surface *surface, uint32_t type, struct wl_buffer *buffer,
                               int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys,
                               const char *appid, const char *instance_id, const int pid, void *data)
@@ -1289,15 +1195,9 @@ bool WidgetView::OnKeyEvent( const Dali::KeyEvent& event )
     }
   }
 
-  int32_t keyCode;
-  if( GetKeyCode( event.GetKeyString(), keyCode ) == false )
-  {
-    return false;
-  }
-
   tizen_remote_surface_transfer_key_event( mRemoteSurface,
                                            type,
-                                           keyCode,
+                                           event.GetKeyCode(),
                                            event.GetDeviceClass(),
                                            event.GetDeviceSubclass(),
                                            "",