Changeset 63933 in webkit

Timestamp:

Jul 22, 2010 6:11:17 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-22 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Implement input method notification
​https://bugs.webkit.org/show_bug.cgi?id=42640

Notify browser when keyboard should be shown/hidden. Input method
hints are updated before sending the signal. Client should be able to
determine the input type by calling ewk_view_imh_get().

• efl/EWebLauncher/main.c: (on_inputmethod_changed): example implementation that just prints to stdout if keyboard should be shown or hidden and the imh flags. (browserCreate): listen to signal about input method changing its state.
• efl/WebCoreSupport/EditorClientEfl.cpp: (WebCore::EditorClientEfl::setInputMethodState): call new function responsible for implementing this notification.
• efl/ewk/ewk_private.h: ewk_view_input_method_state_set() is called only from inside WebKit.
• efl/ewk/ewk_view.cpp: implement setters and getters (ewk_view_imh_get): (ewk_view_input_method_state_set):
• efl/ewk/ewk_view.h: introduce Ewk_Imh enum which contains the possible input types. (_Ewk_View_Smart_Class::):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• efl/EWebLauncher/main.c (modified) (2 diffs)
• efl/WebCoreSupport/EditorClientEfl.cpp (modified) (1 diff)
• efl/ewk/ewk_private.h (modified) (1 diff)
• efl/ewk/ewk_view.cpp (modified) (4 diffs)
• efl/ewk/ewk_view.h (modified) (3 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-07-22  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Implement input method notification
+        https://bugs.webkit.org/show_bug.cgi?id=42640
+
+        Notify browser when keyboard should be shown/hidden. Input method
+        hints are updated before sending the signal. Client should be able to
+        determine the input type by calling ewk_view_imh_get().
+
+        * efl/EWebLauncher/main.c:
+        (on_inputmethod_changed): example implementation that just prints to
+        stdout if keyboard should be shown or hidden and the imh flags.
+        (browserCreate): listen to signal about input method changing its
+        state.
+        * efl/WebCoreSupport/EditorClientEfl.cpp:
+        (WebCore::EditorClientEfl::setInputMethodState): call new function
+        responsible for implementing this notification.
+        * efl/ewk/ewk_private.h: ewk_view_input_method_state_set() is called
+        only from inside WebKit.
+        * efl/ewk/ewk_view.cpp: implement setters and getters
+        (ewk_view_imh_get):
+        (ewk_view_input_method_state_set):
+        * efl/ewk/ewk_view.h: introduce Ewk_Imh enum which contains the
+        possible input types.
+        (_Ewk_View_Smart_Class::):
+
 2010-07-20  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 

trunk/WebKit/efl/EWebLauncher/main.c

@@ -374 +374 @@
 }
 
+static void
+on_inputmethod_changed(void* user_data, Evas_Object* webview, void* event_info)
+{
+    Eina_Bool active = (Eina_Bool)(long)event_info;
+    unsigned int imh;
+    info("Keyboard changed: %d\n", active);
+
+    if (!active)
+        return;
+
+    imh = ewk_view_imh_get(webview);
+    info("    Keyboard flags: %#.2x\n", imh);
+
+}
+
 /**
  * "viewport,changed" signal will be always emitted regardless of the viewport existence.
@@ -662 +677 @@
     evas_object_smart_callback_add(app->browser, "menubar,visible,get", on_menubar_visible_get, app);
     evas_object_smart_callback_add(app->browser, "tooltip,text,set", on_tooltip_text_set, app);
+    evas_object_smart_callback_add(app->browser, "inputmethod,changed", on_inputmethod_changed, app);
 
 /*     ewk_callback_resize_requested_add(app->browser, on_resize_requested, app->ee); */

trunk/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp

@@ -48 +48 @@
 void EditorClientEfl::setInputMethodState(bool active)
 {
-    notImplemented();
+    ewk_view_input_method_state_set(m_view, active);
 }
 

trunk/WebKit/efl/ewk/ewk_private.h

@@ -50 +50 @@
 
 void ewk_view_ready(Evas_Object *o);
+void ewk_view_input_method_state_set(Evas_Object* o, Eina_Bool active);
 void ewk_view_title_set(Evas_Object *o, const char *title);
 void ewk_view_uri_changed(Evas_Object *o);

trunk/WebKit/efl/ewk/ewk_view.cpp

@@ -35 +35 @@
 #include "FrameView.h"
 #include "GraphicsContext.h"
+#include "HTMLElement.h"
+#include "HTMLInputElement.h"
+#include "HTMLNames.h"
 #include "InspectorClientEfl.h"
 #include "PlatformMouseEvent.h"
@@ -80 +83 @@
         size_t allocated;
     } scrolls;
+    unsigned int imh; /**< input method hints */
     struct {
         const char* user_agent;
@@ -2151 +2155 @@
 
 /**
+ * Get input method hints
+ *
+ * @param o View.
+ *
+ * @return input method hints
+ */
+unsigned int ewk_view_imh_get(Evas_Object *o)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
+    return priv->imh;
+}
+
+/**
  * Cancel (clear) previous pre-render requests.
  *
@@ -3023 +3041 @@
     DBG("o=%p", o);
     evas_object_smart_callback_call(o, "ready", 0);
+}
+
+/**
+ * @internal
+ * Reports the state of input method changed. This is triggered, for example
+ * when a input field received/lost focus
+ *
+ * Emits signal: "inputmethod,changed" with a boolean indicating whether it's
+ * enabled or not.
+ */
+void ewk_view_input_method_state_set(Evas_Object* o, Eina_Bool active)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+    EWK_VIEW_PRIV_GET(sd, priv);
+    WebCore::Frame* focusedFrame = priv->page->focusController()->focusedOrMainFrame();
+
+    if (focusedFrame
+        && focusedFrame->document()
+        && focusedFrame->document()->focusedNode()
+        && focusedFrame->document()->focusedNode()->hasTagName(WebCore::HTMLNames::inputTag)) {
+        WebCore::HTMLInputElement* inputElement;
+
+        inputElement = static_cast<WebCore::HTMLInputElement*>(focusedFrame->document()->focusedNode());
+        if (inputElement) {
+            priv->imh = 0;
+            // for password fields, active == false
+            if (!active) {
+                active = inputElement->isPasswordField();
+                priv->imh = inputElement->isPasswordField() * EWK_IMH_PASSWORD;
+            } else {
+                // Set input method hints for "number", "tel", "email", and "url" input elements.
+                priv->imh |= inputElement->isTelephoneField() * EWK_IMH_TELEPHONE;
+                priv->imh |= inputElement->isNumberField() * EWK_IMH_NUMBER;
+                priv->imh |= inputElement->isEmailField() * EWK_IMH_EMAIL;
+                priv->imh |= inputElement->isUrlField() * EWK_IMH_URL;
+            }
+        }
+    }
+
+    evas_object_smart_callback_call(o, "inputmethod,changed", (void*)active);
 }
 

trunk/WebKit/efl/ewk/ewk_view.h

@@ -87 +87 @@
  *  - "icon,received", void: main frame received an icon.
  *  - "viewport,changed", void: Report that viewport has changed.
+ *  - "inputmethods,changed" with a boolean indicating whether it's enabled or not.
  */
 
@@ -186 +187 @@
  */
 #define EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION(name) EWK_VIEW_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NAME_VERSION(name))
+
+enum _Ewk_Imh {
+    EWK_IMH_TELEPHONE = (1 << 0),
+    EWK_IMH_NUMBER = (1 << 1),
+    EWK_IMH_EMAIL = (1 << 2),
+    EWK_IMH_URL = (1 << 3),
+    EWK_IMH_PASSWORD = (1 << 4)
+};
+typedef enum _Ewk_Imh Ewk_Imh;
 
 /**
@@ -358 +368 @@
 EAPI void         ewk_view_pre_render_cancel(Evas_Object *o);
 
+EAPI unsigned int ewk_view_imh_get(Evas_Object *o);
+
 /* settings */
 EAPI const char  *ewk_view_setting_user_agent_get(const Evas_Object *o);