projects / platform / core / uifw / e-mod-tizen-wl-textinput.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5321139)
Reduce the code to check text input value 18/276818/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 27 Jun 2022 02:50:14 +0000 (11:50 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 27 Jun 2022 02:50:14 +0000 (11:50 +0900)
Change-Id: Iae5e6e32d2dbd5ea8d4ddbc42f769ad41507569f
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
src/e_mod_main.c patch | blob | history

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 6f967f6..de68333 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -19,6 +19,15 @@
 
 #define WTI_WARNING(resource, code, msg)     (_e_text_input_log_show((resource), (code), (msg), __func__))
 
+#define CHECK_TEXT_INPUT(resource, text_input) \
+   if (!text_input) \
+     { \
+        WTI_WARNING(resource, \
+                    WL_DISPLAY_ERROR_INVALID_OBJECT, \
+                    "No Text Input For Resource"); \
+        return; \
+     }
+
 tizen_profile_t _get_tizen_profile()
 {
    static tizen_profile_t profile = TIZEN_PROFILE_UNKNOWN;
@@ -242,13 +251,7 @@ _input_panel_hide(struct wl_client *client, struct wl_resource *resource, Eina_B
    double timeout;
    int effect_run;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    text_input->input_panel_visible = EINA_FALSE;
 
@@ -997,13 +1000,7 @@ _e_text_input_method_context_cb_hide_input_panel(struct wl_client *client EINA_U
    E_Text_Input *text_input = g_text_input;
    E_Input_Method *input_method = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    text_input->input_panel_visible = EINA_FALSE;
 
@@ -1398,13 +1395,7 @@ _e_text_input_cb_deactivate(struct wl_client *client EINA_UNUSED, struct wl_reso
    E_Text_Input *text_input = wl_resource_get_user_data(resource);
    E_Input_Method *input_method = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    if (text_input == g_text_input)
      {
@@ -1483,13 +1474,7 @@ _e_text_input_cb_input_panel_show(struct wl_client *client, struct wl_resource *
 
    LOGI("text_input : %p\n", text_input);
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    text_input->input_panel_show_requested = EINA_TRUE;
 
@@ -1599,13 +1584,7 @@ _e_text_input_cb_reset(struct wl_client *client EINA_UNUSED, struct wl_resource
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1622,13 +1601,7 @@ _e_text_input_cb_content_type_set(struct wl_client *client EINA_UNUSED, struct w
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1645,13 +1618,7 @@ _e_text_input_cb_cursor_rectangle_set(struct wl_client *client EINA_UNUSED, stru
 {
    E_Text_Input *text_input = wl_resource_get_user_data(resource);
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    /* TODO: issue event update input_panel */
 }
@@ -1663,13 +1630,7 @@ _e_text_input_cb_preferred_language_set(struct wl_client *client EINA_UNUSED, st
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1688,13 +1649,7 @@ _e_text_input_cb_state_commit(struct wl_client *client EINA_UNUSED, struct wl_re
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1712,13 +1667,7 @@ _e_text_input_cb_action_invoke(struct wl_client *client EINA_UNUSED, struct wl_r
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1737,13 +1686,7 @@ _e_text_input_cb_return_key_type_set(struct wl_client *client EINA_UNUSED, struc
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1762,13 +1705,7 @@ _e_text_input_cb_return_key_disabled_set(struct wl_client *client EINA_UNUSED, s
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1787,13 +1724,7 @@ _e_text_input_cb_input_panel_data_set(struct wl_client *client EINA_UNUSED, stru
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1830,13 +1761,7 @@ _e_text_input_cb_bidi_direction_set(struct wl_client *client EINA_UNUSED, struct
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1855,13 +1780,7 @@ _e_text_input_cb_cursor_position_set(struct wl_client *client EINA_UNUSED, struc
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1879,13 +1798,7 @@ _e_text_input_cb_process_input_device_event(struct wl_client *client EINA_UNUSED
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -1907,13 +1820,7 @@ _e_text_input_cb_filter_key_event(struct wl_client *client EINA_UNUSED, struct w
   E_Text_Input *text_input = wl_resource_get_user_data(resource);
   E_Input_Method *input_method = NULL;
 
-  if (!text_input)
-    {
-       WTI_WARNING(resource,
-                   WL_DISPLAY_ERROR_INVALID_OBJECT,
-                   "No Text Input For Resource");
-       return;
-    }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    /* FIXME: should get input_method object from seat. */
    if (g_input_method && g_input_method->resource)
@@ -1944,13 +1851,7 @@ _e_text_input_cb_get_hide_permission(struct wl_client *client EINA_UNUSED, struc
    uint32_t permission = 1;
    E_Client *focused_ec = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    focused_ec = e_client_focused_get();
    if (focused_ec)
@@ -1981,13 +1882,7 @@ _e_text_input_cb_set_capital_mode(struct wl_client *client EINA_UNUSED, struct w
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -2004,13 +1899,7 @@ _e_text_input_cb_prediction_hint_set(struct wl_client *client EINA_UNUSED, struc
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -2028,13 +1917,7 @@ _e_text_input_cb_prediction_hint_data_set(struct wl_client *client EINA_UNUSED,
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -2052,13 +1935,7 @@ _e_text_input_cb_input_panel_enabled_set(struct wl_client *client EINA_UNUSED, s
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -2076,13 +1953,7 @@ _e_text_input_cb_mime_type_accept_set(struct wl_client *client EINA_UNUSED, stru
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -2098,13 +1969,7 @@ _e_text_input_cb_input_panel_position_set(struct wl_client *client EINA_UNUSED,
 {
    E_Text_Input *text_input = wl_resource_get_user_data(resource);
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
    e_input_panel_floating_position_set(x, y);
 }
 
@@ -2115,13 +1980,7 @@ _e_text_input_cb_finalize_content(struct wl_client *client EINA_UNUSED, struct w
    E_Input_Method *input_method = NULL;
    Eina_List *l = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    EINA_LIST_FOREACH(text_input->input_methods, l, input_method)
      {
@@ -2138,13 +1997,7 @@ _e_text_input_cb_resource_destroy(struct wl_resource *resource)
    E_Text_Input *text_input = wl_resource_get_user_data(resource);
    E_Input_Method *input_method = NULL;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    LOGI("resource : %p", resource);
 
@@ -2180,13 +2033,7 @@ _e_text_input_cb_destroy(struct wl_client *client, struct wl_resource *resource)
    E_Input_Method *input_method = NULL;
    Eina_Bool _context_created = EINA_FALSE;
 
-   if (!text_input)
-     {
-        WTI_WARNING(resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(resource, text_input);
 
    if (g_input_method && g_input_method->resource)
      input_method = wl_resource_get_user_data(g_input_method->resource);
@@ -2552,13 +2399,7 @@ e_text_input_update_input_panel_state(Eina_Bool state)
 
    E_Text_Input *text_input = wl_resource_get_user_data(g_text_input->resource);
 
-   if (!text_input)
-     {
-        WTI_WARNING(g_text_input->resource,
-                    WL_DISPLAY_ERROR_INVALID_OBJECT,
-                    "No Text Input For Resource");
-        return;
-     }
+   CHECK_TEXT_INPUT(g_text_input->resource, text_input);
 
    if (text_input->resource)
      {
Domain: UI Framework / Text Input;