Support conditional build for candidate UI

Change-Id: Iaf95f87765dc12b51136bdd3800cf0cc5e01f88c
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index 4a2628df3974e114ed4947d38922ba97c5e38bb9..1ca8a358bc4c83d7b83a1009ded2bd958799822d 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -153,18 +153,18 @@ typedef std::vector < std::pair <String, uint32> >    VectorPairStringUint32;
 /////////////////////////////////////////////////////////////////////////////
 // Declaration of internal functions.
 /////////////////////////////////////////////////////////////////////////////
-#if ISF_BUILD_CANDIDATE_UI
-static Evas_Object *efl_create_window                  (const char *strWinName, const char *strEffect);
-#endif /* CANDIDATE */
 
 #ifdef HAVE_ECOREX
 static void       efl_set_transient_for_app_window     (Ecore_X_Window window);
 #endif
-#if ISF_BUILD_CANDIDATE_UI
-static int        efl_get_app_window_angle             (void);
-#endif /* CANDIDATE */
+
 static int        efl_get_ise_window_angle             (void);
+static void       set_soft_candidate_geometry(int x, int y, int width, int height);
+
 #if ISF_BUILD_CANDIDATE_UI
+static Evas_Object *efl_create_window(const char *strWinName, const char *strEffect);
+static int        efl_get_app_window_angle(void);
+
 #ifdef HAVE_ECOREX
 static int        efl_get_quickpanel_window_angle      (void);
 #endif /* HAVE_ECOREX */
@@ -177,14 +177,10 @@ static void       ui_candidate_show                    (bool bSetVirtualKbd = tr
 static void       ui_create_candidate_window           (void);
 static void       update_table                         (int table_type, const LookupTable &table);
 static void       ui_candidate_window_close_button_cb  (void *data, Evas *e, Evas_Object *button, void *event_info);
-#endif /* CANDIDATE */
-static void       set_soft_candidate_geometry          (int x, int y, int width, int height);
-#if ISF_BUILD_CANDIDATE_UI
+
 static void       set_highlight_color                  (Evas_Object *item, uint32 nForeGround, uint32 nBackGround, bool bSetBack);
 static void       ui_tts_focus_rect_hide               (void);
-#endif /* CANDIDATE */
 
-#if ISF_BUILD_CANDIDATE_UI
 static Evas_Object *get_candidate                      (const String& str, Evas_Object *parent, int *total_width, uint32 ForeGround, uint32 BackGround, bool HighLight, bool SetBack, int item_num, int item);
 static bool       tokenize_tag                         (const String& str, struct image *image_data);
 #endif /* CANDIDATE */
@@ -312,10 +308,8 @@ static int                _candidate_x                      = 0;
 static int                _candidate_y                      = 0;
 static int                _candidate_width                  = 0;
 static int                _candidate_height                 = 0;
-#endif /* CANDIDATE */
 static int                _soft_candidate_width             = 0;
 static int                _soft_candidate_height            = 0;
-#if ISF_BUILD_CANDIDATE_UI
 static int                _candidate_valid_height           = 0;
 
 static bool               _candidate_area_1_visible         = false;
@@ -388,13 +382,13 @@ static int                _spot_location_x                  = -1;
 static int                _spot_location_y                  = -1;
 static int                _spot_location_top_y              = -1;
 static int                _candidate_angle                  = 0;
+static int                _ise_width = 0;
+static int                _ise_height = 0;
 #endif /* CANDIDATE */
 
 static int                _ise_angle                        = -1;
 static int                _ise_x                            = 0;
 static int                _ise_y                            = 0;
-static int                _ise_width                        = 0;
-static int                _ise_height                       = 0;
 static WINDOW_STATE       _ise_state                        = WINDOW_STATE_HIDE;
 static WINDOW_STATE       _candidate_state                  = WINDOW_STATE_HIDE;
 
@@ -510,6 +504,7 @@ static String            _ise_check_pid_alive_uuid;
 
 static Ecore_Timer       *g_monitor_user_data_path_timer = NULL;
 
+#if ISF_BUILD_CANDIDATE_UI
 enum {
     EMOJI_IMAGE_WIDTH = 0,
     EMOJI_IMAGE_HEIGHT,
@@ -524,6 +519,7 @@ struct image
     String path;
     int emoji_option[EMOJI_IMAGE_END];
 };
+#endif
 
 /* This structure stores the geometry information reported by ISE */
 struct GeometryCache
@@ -1997,14 +1993,15 @@ static bool set_active_ise (const String &uuid, bool launch_ise)
                 _ime_info[i].options |= ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT;
                 _info_manager->set_current_helper_option (_ime_info[i].options);
                 _info_manager->set_current_ise_name (_ime_info[i].label);
-                _ise_width  = 0;
-                _ise_height = 0;
                 _ise_state  = WINDOW_STATE_HIDE;
                 _candidate_mode      = SOFT_CANDIDATE_WINDOW;
                 _candidate_port_line = ONE_LINE_CANDIDATE;
+#if ISF_BUILD_CANDIDATE_UI
+                _ise_width = 0;
+                _ise_height = 0;
                 _soft_candidate_width = 0;
                 _soft_candidate_height = 0;
-#if ISF_BUILD_CANDIDATE_UI
+
                 if (_candidate_window)
                     ui_create_candidate_window ();
 #endif
@@ -3867,9 +3864,9 @@ static void set_soft_candidate_geometry (int x, int y, int width, int height)
     if ((_candidate_mode != SOFT_CANDIDATE_WINDOW) || (_info_manager->get_current_toolbar_mode () != TOOLBAR_KEYBOARD_MODE))
         return;
 
-     _soft_candidate_width  = width;
-     _soft_candidate_height = height;
 #ifdef HAVE_ECOREX
+    _soft_candidate_width = width;
+    _soft_candidate_height = height;
      set_keyboard_geometry_atom_info (_app_window, get_ise_geometry());
 #endif
     _info_manager->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
@@ -4694,10 +4691,11 @@ static void slot_update_ise_geometry (int x, int y, int width, int height)
 
     _ise_x = x;
     _ise_y = y;
-    _ise_width  = width;
-    _ise_height = height;
 
 #if ISF_BUILD_CANDIDATE_UI
+    _ise_width = width;
+    _ise_height = height;
+
     if (_candidate_window && _candidate_state == WINDOW_STATE_SHOW) {
         ui_settle_candidate_window ();
     }