- Added an API to set the allowed MIME type to deliver to the input panel.
- Added a callback to receive the content of the input method URI.
Change-Id: I6fb970d392fb66a438bd4590440c01503c572c45
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
return Internal::Adaptor::InputMethodContext::GetImplementation(*this).GetInputPanelLocale();
}
+void InputMethodContext::SetContentMIMETypes( const std::string& mimeTypes )
+{
+ Internal::Adaptor::InputMethodContext::GetImplementation(*this).SetContentMIMETypes( mimeTypes );
+}
+
bool InputMethodContext::FilterEventKey( const Dali::KeyEvent& keyEvent )
{
return Internal::Adaptor::InputMethodContext::GetImplementation(*this).FilterEventKey( keyEvent );
return Internal::Adaptor::InputMethodContext::GetImplementation(*this).KeyboardTypeChangedSignal();
}
+InputMethodContext::ContentReceivedSignalType& InputMethodContext::ContentReceivedSignal()
+{
+ return Internal::Adaptor::InputMethodContext::GetImplementation(*this).ContentReceivedSignal();
+}
+
InputMethodContext::InputMethodContext(Internal::Adaptor::InputMethodContext *impl)
: BaseHandle(impl)
{
typedef Signal< void ( KeyboardType ) > KeyboardTypeSignalType; ///< keyboard type
typedef Signal< void ( int ) > KeyboardResizedSignalType; ///< Keyboard resized signal
typedef Signal< void ( int ) > LanguageChangedSignalType; ///< Language changed signal
+ typedef Signal< void ( const std::string&, const std::string&, const std::string& ) > ContentReceivedSignalType; ///< Content received signal
public:
std::string GetInputPanelLocale();
/**
+ * @brief Sets the allowed MIME Types to deliver to the input panel.
+ *
+ * ex) std::string mimeTypes = "text/plain,image/png,image/gif,application/pdf";
+ *
+ * You can receive a media content URI and its MIME type from ContentReceivedSignal(). @see ContentReceivedSignal
+ * @param[in] mimeTypes The allowed MIME types
+ */
+ void SetContentMIMETypes( const std::string& mimeTypes );
+
+ /**
* @brief Process event key down or up, whether filter a key to isf.
*
* @param[in] keyEvent The event key to be handled.
*/
KeyboardTypeSignalType& KeyboardTypeChangedSignal();
+ /**
+ * @brief Connect to this signal to be notified when the content, such as images, of input method is received.
+ *
+ * A callback of the following type may be connected:
+ * @code
+ * void YourCallbackName( const std::string& contentUri, const std::string& description, const std::string& contentMIMEType );
+ * @endcode
+ *
+ * @return The signal to connect to.
+ */
+ ContentReceivedSignalType& ContentReceivedSignal();
+
public:
/**
using KeyboardTypeSignalType = Dali::InputMethodContext::KeyboardTypeSignalType;
using LanguageChangedSignalType = Dali::InputMethodContext::LanguageChangedSignalType;
using KeyboardResizedSignalType = Dali::InputMethodContext::KeyboardResizedSignalType;
+ using ContentReceivedSignalType = Dali::InputMethodContext::ContentReceivedSignalType;
public:
/**
* @copydoc Dali::InputMethodContext::PreEditChanged()
*/
- virtual void PreEditChanged( void *data, ImfContext* imfContext, void *event_info ) {}
+ virtual void PreEditChanged( void *data, ImfContext* imfContext, void *eventInfo ) {}
/**
* @copydoc Dali::InputMethodContext::CommitReceived()
*/
- virtual void CommitReceived( void *data, ImfContext* imfContext, void *event_info ) {}
+ virtual void CommitReceived( void *data, ImfContext* imfContext, void *eventInfo ) {}
/**
* @copydoc Dali::InputMethodContext::RetrieveSurrounding()
/**
* @copydoc Dali::InputMethodContext::DeleteSurrounding()
*/
- virtual void DeleteSurrounding( void *data, ImfContext* imfContext, void *event_info ) {}
+ virtual void DeleteSurrounding( void *data, ImfContext* imfContext, void *eventInfo ) {}
/**
* @copydoc Dali::InputMethodContext::SendPrivateCommand()
*/
- virtual void SendPrivateCommand( void* data, ImfContext* imfContext, void* event_info ) {}
+ virtual void SendPrivateCommand( void* data, ImfContext* imfContext, void* eventInfo ) {}
+
+ /**
+ * @copydoc Dali::InputMethodContext::SendCommitContent()
+ */
+ virtual void SendCommitContent( void* data, ImfContext* imfContext, void* eventInfo ) {}
// Cursor related
/**
virtual std::string GetInputPanelLocale() { return std::string(); }
/**
+ * @copydoc Dali::InputMethodContext::SetContentMIMETypes()
+ */
+ virtual void SetContentMIMETypes( const std::string& mimeTypes ) {}
+
+ /**
* @copydoc Dali::InputMethodContext::FilterEventKey()
*/
virtual bool FilterEventKey( const Dali::KeyEvent& keyEvent ) { return false; }
*/
KeyboardTypeSignalType& KeyboardTypeChangedSignal() { return mKeyboardTypeChangedSignal; }
+ /**
+ * @copydoc Dali::InputMethodContext::ContentReceivedSignal()
+ */
+ ContentReceivedSignalType& ContentReceivedSignal() { return mContentReceivedSignal; }
+
public:
/**
KeyboardResizedSignalType mKeyboardResizeSignal;
LanguageChangedSignalType mKeyboardLanguageChangedSignal;
KeyboardTypeSignalType mKeyboardTypeChangedSignal;
+ ContentReceivedSignalType mContentReceivedSignal;
public:
}
// Static function calls used by ecore 'c' style callback registration
-void Commit( void *data, Ecore_IMF_Context *imfContext, void *event_info )
+void Commit( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
{
if ( data )
{
InputMethodContextEcoreWl* inputMethodContext = reinterpret_cast< InputMethodContextEcoreWl* > ( data );
- inputMethodContext->CommitReceived( data, imfContext, event_info );
+ inputMethodContext->CommitReceived( data, imfContext, eventInfo );
}
}
-void PreEdit( void *data, Ecore_IMF_Context *imfContext, void *event_info )
+void PreEdit( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
{
if ( data )
{
InputMethodContextEcoreWl* inputMethodContext = reinterpret_cast< InputMethodContextEcoreWl* > ( data );
- inputMethodContext->PreEditChanged( data, imfContext, event_info );
+ inputMethodContext->PreEditChanged( data, imfContext, eventInfo );
}
}
* Called when an IMF delete surrounding event is received.
* Here we tell the application that it should delete a certain range.
*/
-void ImfDeleteSurrounding( void *data, Ecore_IMF_Context *imfContext, void *event_info )
+void ImfDeleteSurrounding( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
{
if ( data )
{
InputMethodContextEcoreWl* inputMethodContext = reinterpret_cast< InputMethodContextEcoreWl* > ( data );
- inputMethodContext->DeleteSurrounding( data, imfContext, event_info );
+ inputMethodContext->DeleteSurrounding( data, imfContext, eventInfo );
}
}
/**
* Called when the input method sends a private command.
*/
-void PrivateCommand( void *data, Ecore_IMF_Context *imfContext, void *event_info )
+void PrivateCommand( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
{
if ( data )
{
InputMethodContextEcoreWl* inputMethodContext = reinterpret_cast< InputMethodContextEcoreWl* > ( data );
- inputMethodContext->SendPrivateCommand( data, imfContext, event_info );
+ inputMethodContext->SendPrivateCommand( data, imfContext, eventInfo );
+ }
+}
+
+/**
+ * Called when the input method commits content, such as an image.
+ */
+void CommitContent( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
+{
+ if ( data )
+ {
+ InputMethodContextEcoreWl* inputMethodContext = reinterpret_cast< InputMethodContextEcoreWl* > ( data );
+ inputMethodContext->SendCommitContent( data, imfContext, eventInfo );
}
}
ecore_imf_context_event_callback_add( mIMFContext, ECORE_IMF_CALLBACK_COMMIT, Commit, this );
ecore_imf_context_event_callback_add( mIMFContext, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, ImfDeleteSurrounding, this );
ecore_imf_context_event_callback_add( mIMFContext, ECORE_IMF_CALLBACK_PRIVATE_COMMAND_SEND, PrivateCommand, this );
+ ecore_imf_context_event_callback_add( mIMFContext, ECORE_IMF_CALLBACK_COMMIT_CONTENT, CommitContent, this );
ecore_imf_context_input_panel_event_callback_add( mIMFContext, ECORE_IMF_INPUT_PANEL_STATE_EVENT, InputPanelStateChangeCallback, this );
ecore_imf_context_input_panel_event_callback_add( mIMFContext, ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT, InputPanelLanguageChangeCallback, this );
ecore_imf_context_event_callback_del( mIMFContext, ECORE_IMF_CALLBACK_COMMIT, Commit );
ecore_imf_context_event_callback_del( mIMFContext, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, ImfDeleteSurrounding );
ecore_imf_context_event_callback_del( mIMFContext, ECORE_IMF_CALLBACK_PRIVATE_COMMAND_SEND, PrivateCommand );
+ ecore_imf_context_event_callback_del( mIMFContext, ECORE_IMF_CALLBACK_COMMIT_CONTENT, CommitContent );
ecore_imf_context_input_panel_event_callback_del( mIMFContext, ECORE_IMF_INPUT_PANEL_STATE_EVENT, InputPanelStateChangeCallback );
ecore_imf_context_input_panel_event_callback_del( mIMFContext, ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT, InputPanelLanguageChangeCallback );
* We are still predicting what the user is typing. The latest string is what the InputMethodContext module thinks
* the user wants to type.
*/
-void InputMethodContextEcoreWl::PreEditChanged( void*, ImfContext* imfContext, void* event_info )
+void InputMethodContextEcoreWl::PreEditChanged( void*, ImfContext* imfContext, void* eventInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::PreEditChanged\n" );
auto context = reinterpret_cast<Ecore_IMF_Context*>(imfContext);
free( preEditString );
}
-void InputMethodContextEcoreWl::CommitReceived( void*, ImfContext* imfContext, void* event_info )
+void InputMethodContextEcoreWl::CommitReceived( void*, ImfContext* imfContext, void* eventInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::CommitReceived\n" );
if ( Dali::Adaptor::IsAvailable() )
{
- const std::string keyString( static_cast<char*>( event_info ) );
+ const std::string keyString( static_cast<char*>( eventInfo ) );
Dali::InputMethodContext handle( this );
Dali::InputMethodContext::EventData eventData( Dali::InputMethodContext::COMMIT, keyString, 0, 0 );
* Called when an InputMethodContext delete surrounding event is received.
* Here we tell the application that it should delete a certain range.
*/
-void InputMethodContextEcoreWl::DeleteSurrounding( void* data, ImfContext* imfContext, void* event_info )
+void InputMethodContextEcoreWl::DeleteSurrounding( void* data, ImfContext* imfContext, void* eventInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::DeleteSurrounding\n" );
if( Dali::Adaptor::IsAvailable() )
{
- Ecore_IMF_Event_Delete_Surrounding* deleteSurroundingEvent = static_cast<Ecore_IMF_Event_Delete_Surrounding*>( event_info );
+ Ecore_IMF_Event_Delete_Surrounding* deleteSurroundingEvent = static_cast<Ecore_IMF_Event_Delete_Surrounding*>( eventInfo );
Dali::InputMethodContext::EventData imfData( Dali::InputMethodContext::DELETE_SURROUNDING, std::string(), deleteSurroundingEvent->offset, deleteSurroundingEvent->n_chars );
Dali::InputMethodContext handle( this );
/**
* Called when the input method sends a private command.
*/
-void InputMethodContextEcoreWl::SendPrivateCommand( void* data, ImfContext* imfContext, void* event_info )
+void InputMethodContextEcoreWl::SendPrivateCommand( void* data, ImfContext* imfContext, void* eventInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::SendPrivateCommand\n" );
if( Dali::Adaptor::IsAvailable() )
{
- const char* privateCommandSendEvent = static_cast<const char*>( event_info );
+ const char* privateCommandSendEvent = static_cast<const char*>( eventInfo );
Dali::InputMethodContext::EventData imfData( Dali::InputMethodContext::PRIVATE_COMMAND, privateCommandSendEvent, 0, 0 );
Dali::InputMethodContext handle( this );
}
}
+/**
+ * Called when the input method commits content, such as an image.
+ */
+void InputMethodContextEcoreWl::SendCommitContent( void* data, ImfContext* imfContext, void* eventInfo )
+{
+ DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::SendCommitContent\n" );
+
+ if( Dali::Adaptor::IsAvailable() )
+ {
+ Ecore_IMF_Event_Commit_Content* commitContent = static_cast<Ecore_IMF_Event_Commit_Content *>( eventInfo );
+ if( commitContent )
+ {
+ DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::SendCommitContent commit content : %s, description : %s, mime type : %s\n",
+ commitContent->content_uri, commitContent->description, commitContent->mime_types );
+ mContentReceivedSignal.Emit( commitContent->content_uri, commitContent->description, commitContent->mime_types );
+ }
+ }
+}
+
void InputMethodContextEcoreWl::NotifyCursorPosition()
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::NotifyCursorPosition\n" );
return locale;
}
+void InputMethodContextEcoreWl::SetContentMIMETypes( const std::string& mimeTypes )
+{
+ DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::SetContentMIMETypes\n" );
+
+ if( mIMFContext )
+ {
+ ecore_imf_context_mime_type_accept_set( mIMFContext, mimeTypes.c_str() );
+ }
+}
+
bool InputMethodContextEcoreWl::FilterEventKey( const Dali::KeyEvent& keyEvent )
{
bool eventHandled( false );
/**
* @copydoc Dali::InputMethodContext::PreEditChanged()
*/
- void PreEditChanged( void *data, ImfContext *imfContext, void *event_info ) override;
+ void PreEditChanged( void *data, ImfContext *imfContext, void *eventInfo ) override;
/**
* @copydoc Dali::InputMethodContext::NotifyCursorPosition()
*/
- void CommitReceived( void *data, ImfContext *imfContext, void *event_info ) override;
+ void CommitReceived( void *data, ImfContext *imfContext, void *eventInfo ) override;
/**
* @copydoc Dali::InputMethodContext::NotifyCursorPosition()
/**
* @copydoc Dali::InputMethodContext::DeleteSurrounding()
*/
- void DeleteSurrounding( void *data, ImfContext *imfContext, void *event_info ) override;
+ void DeleteSurrounding( void *data, ImfContext *imfContext, void *eventInfo ) override;
/**
* @copydoc Dali::InputMethodContext::SendPrivateCommand()
*/
- void SendPrivateCommand( void* data, ImfContext* imfContext, void* event_info ) override;
+ void SendPrivateCommand( void* data, ImfContext* imfContext, void* eventInfo ) override;
+
+ /**
+ * @copydoc Dali::InputMethodContext::SendCommitContent()
+ */
+ void SendCommitContent( void* data, ImfContext* imfContext, void* eventInfo ) override;
// Cursor related
/**
std::string GetInputPanelLocale() override;
/**
+ * @copydoc Dali::InputMethodContext::SetContentMIMETypes()
+ */
+ void SetContentMIMETypes( const std::string& mimeTypes ) override;
+
+ /**
* @copydoc Dali::InputMethodContext::FilterEventKey()
*/
bool FilterEventKey( const Dali::KeyEvent& keyEvent ) override;
}
// Static function calls used by ecore 'c' style callback registration
-void Commit( void *data, Ecore_IMF_Context *imfContext, void *event_info )
+void Commit( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
{
if ( data )
{
InputMethodContextX* inputMethodContext = reinterpret_cast< InputMethodContextX* > ( data );
- inputMethodContext->CommitReceived( data, imfContext, event_info );
+ inputMethodContext->CommitReceived( data, imfContext, eventInfo );
}
}
-void PreEdit( void *data, Ecore_IMF_Context *imfContext, void *event_info )
+void PreEdit( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
{
if ( data )
{
InputMethodContextX* inputMethodContext = reinterpret_cast< InputMethodContextX* > ( data );
- inputMethodContext->PreEditChanged( data, imfContext, event_info );
+ inputMethodContext->PreEditChanged( data, imfContext, eventInfo );
}
}
* Called when an InputMethodContext delete surrounding event is received.
* Here we tell the application that it should delete a certain range.
*/
-void ImfDeleteSurrounding( void *data, Ecore_IMF_Context *imfContext, void *event_info )
+void ImfDeleteSurrounding( void *data, Ecore_IMF_Context *imfContext, void *eventInfo )
{
if ( data )
{
InputMethodContextX* inputMethodContext = reinterpret_cast< InputMethodContextX* > ( data );
- inputMethodContext->DeleteSurrounding( data, imfContext, event_info );
+ inputMethodContext->DeleteSurrounding( data, imfContext, eventInfo );
}
}
* We are still predicting what the user is typing. The latest string is what the InputMethodContext module thinks
* the user wants to type.
*/
-void InputMethodContextX::PreEditChanged( void*, ImfContext* imfContext, void* event_info )
+void InputMethodContextX::PreEditChanged( void*, ImfContext* imfContext, void* eventInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextX::PreEditChanged\n" );
auto context = reinterpret_cast<Ecore_IMF_Context*>(imfContext);
free( preEditString );
}
-void InputMethodContextX::CommitReceived( void*, ImfContext* imfContext, void* event_info )
+void InputMethodContextX::CommitReceived( void*, ImfContext* imfContext, void* eventInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextX::CommitReceived\n" );
if ( Dali::Adaptor::IsAvailable() )
{
- const std::string keyString( static_cast<char*>( event_info ) );
+ const std::string keyString( static_cast<char*>( eventInfo ) );
Dali::InputMethodContext handle( this );
Dali::InputMethodContext::EventData eventData( Dali::InputMethodContext::COMMIT, keyString, 0, 0 );
* Called when an InputMethodContext delete surrounding event is received.
* Here we tell the application that it should delete a certain range.
*/
-void InputMethodContextX::DeleteSurrounding( void* data, ImfContext* imfContext, void* event_info )
+void InputMethodContextX::DeleteSurrounding( void* data, ImfContext* imfContext, void* eventInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextX::DeleteSurrounding\n" );
if( Dali::Adaptor::IsAvailable() )
{
- Ecore_IMF_Event_Delete_Surrounding* deleteSurroundingEvent = static_cast<Ecore_IMF_Event_Delete_Surrounding*>( event_info );
+ Ecore_IMF_Event_Delete_Surrounding* deleteSurroundingEvent = static_cast<Ecore_IMF_Event_Delete_Surrounding*>( eventInfo );
Dali::InputMethodContext::EventData imfData( Dali::InputMethodContext::DELETE_SURROUNDING, std::string(), deleteSurroundingEvent->offset, deleteSurroundingEvent->n_chars );
Dali::InputMethodContext handle( this );
return locale;
}
+void InputMethodContextX::SetContentMIMETypes( const std::string& mimeTypes )
+{
+ DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextX::SetContentMIMETypes\n" );
+ // ecore_imf_context_mime_type_accept_set() is supported from ecore-imf 1.20.0 version.
+}
+
bool InputMethodContextX::FilterEventKey( const Dali::KeyEvent& keyEvent )
{
bool eventHandled( false );
/**
* @copydoc Dali::InputMethodContext::PreEditChanged()
*/
- void PreEditChanged( void* data, ImfContext* imfContext, void* event_info ) override;
+ void PreEditChanged( void* data, ImfContext* imfContext, void* eventInfo ) override;
/**
* @copydoc Dali::InputMethodContext::NotifyCursorPosition()
*/
- void CommitReceived( void* data, ImfContext* imfContext, void* event_info ) override;
+ void CommitReceived( void* data, ImfContext* imfContext, void* eventInfo ) override;
/**
* @copydoc Dali::InputMethodContext::NotifyCursorPosition()
/**
* @copydoc Dali::InputMethodContext::DeleteSurrounding()
*/
- void DeleteSurrounding( void* data, ImfContext* imfContext, void* event_info ) override;
+ void DeleteSurrounding( void* data, ImfContext* imfContext, void* eventInfo ) override;
/**
* @copydoc Dali::InputMethodContext::SendPrivateCommand()
*/
- void SendPrivateCommand( void* data, ImfContext* imfContext, void* event_info ) override
+ void SendPrivateCommand( void* data, ImfContext* imfContext, void* eventInfo ) override
+ {}
+
+ /**
+ * @copydoc Dali::InputMethodContext::SendCommitContent()
+ */
+ void SendCommitContent( void* data, ImfContext* imfContext, void* eventInfo ) override
{}
// Cursor related
std::string GetInputPanelLocale() override;
/**
+ * @copydoc Dali::InputMethodContext::SetContentMIMETypes()
+ */
+ void SetContentMIMETypes( const std::string& mimeTypes ) override;
+
+ /**
* @copydoc Dali::InputMethodContext::FilterEventKey()
*/
bool FilterEventKey( const Dali::KeyEvent& keyEvent ) override;
* We are still predicting what the user is typing. The latest string is what the InputMethodContext module thinks\r
* the user wants to type.\r
*/\r
-void InputMethodContextWin::PreEditChanged( void*, ImfContext* imfContext, void* event_info )\r
+void InputMethodContextWin::PreEditChanged( void*, ImfContext* imfContext, void* eventInfo )\r
{\r
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::PreEditChanged\n" );\r
}\r
\r
-void InputMethodContextWin::CommitReceived( void*, ImfContext* imfContext, void* event_info )\r
+void InputMethodContextWin::CommitReceived( void*, ImfContext* imfContext, void* eventInfo )\r
{\r
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::CommitReceived\n" );\r
\r
if ( Dali::Adaptor::IsAvailable() )\r
{\r
- const std::string keyString( static_cast<char*>( event_info ) );\r
+ const std::string keyString( static_cast<char*>( eventInfo ) );\r
\r
Dali::InputMethodContext handle( this );\r
Dali::InputMethodContext::EventData eventData( Dali::InputMethodContext::COMMIT, keyString, 0, 0 );\r
* Called when an InputMethodContext delete surrounding event is received.\r
* Here we tell the application that it should delete a certain range.\r
*/\r
-void InputMethodContextWin::DeleteSurrounding( void* data, ImfContext* imfContext, void* event_info )\r
+void InputMethodContextWin::DeleteSurrounding( void* data, ImfContext* imfContext, void* eventInfo )\r
{\r
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::DeleteSurrounding\n" );\r
}\r
return locale;\r
}\r
\r
+void InputMethodContextWin::SetContentMIMETypes( const std::string& mimeTypes )\r
+{\r
+ DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::SetContentMIMETypes\n" );\r
+}\r
+\r
bool InputMethodContextWin::FilterEventKey( const Dali::KeyEvent& keyEvent )\r
{\r
bool eventHandled( false );\r
/**\r
* @copydoc Dali::InputMethodContext::PreEditChanged()\r
*/\r
- void PreEditChanged( void* data, ImfContext* imfContext, void* event_info ) override;\r
+ void PreEditChanged( void* data, ImfContext* imfContext, void* eventInfo ) override;\r
\r
/**\r
* @copydoc Dali::InputMethodContext::NotifyCursorPosition()\r
*/\r
- void CommitReceived( void* data, ImfContext* imfContext, void* event_info ) override;\r
+ void CommitReceived( void* data, ImfContext* imfContext, void* eventInfo ) override;\r
\r
/**\r
* @copydoc Dali::InputMethodContext::NotifyCursorPosition()\r
/**\r
* @copydoc Dali::InputMethodContext::DeleteSurrounding()\r
*/\r
- void DeleteSurrounding( void* data, ImfContext* imfContext, void* event_info ) override;\r
+ void DeleteSurrounding( void* data, ImfContext* imfContext, void* eventInfo ) override;\r
\r
/**\r
* @copydoc Dali::InputMethodContext::SendPrivateCommand()\r
*/\r
- void SendPrivateCommand( void* data, ImfContext* imfContext, void* event_info ) override\r
+ void SendPrivateCommand( void* data, ImfContext* imfContext, void* eventInfo ) override\r
+ {}\r
+\r
+ /**\r
+ * @copydoc Dali::InputMethodContext::SendCommitContent()\r
+ */\r
+ void SendCommitContent( void* data, ImfContext* imfContext, void* eventInfo ) override\r
{}\r
\r
// Cursor related\r
std::string GetInputPanelLocale() override;\r
\r
/**\r
+ * @copydoc Dali::InputMethodContext::SetContentMIMETypes()\r
+ */\r
+ void SetContentMIMETypes( const std::string& mimeTypes ) override;\r
+\r
+ /**\r
* @copydoc Dali::InputMethodContext::FilterEventKey()\r
*/\r
bool FilterEventKey( const Dali::KeyEvent& keyEvent ) override;\r