fix compile errors.

It haven't been managed long time. Make it buildable, first of all, Revenant Enventor.

Still it has some abi issues. Need to fix them all.

configure.ac

@@ -73,6 +73,7 @@ EFL_ENABLE_EO_API_SUPPORT
 EFL_ENABLE_BETA_API_SUPPORT
 AC_DEFINE_UNQUOTED(ENVENTOR_WIN32_BUILD_SUPPORT, 1, "Support Win32 dllexport")
 AC_DEFINE_UNQUOTED(ENVENTOR_BETA_API_SUPPORT, 1, "Enable access to unstable ENVENTOR API that are still in beta")
+AC_DEFINE_UNQUOTED(EFL_UI_FOCUS_OBJECT_PROTECTED, 1, "Enable Focus Protected API")
 
 efl_version="1.18.0"
 requirement_enventor=" \

src/bin/file_mgr.c

@@ -28,7 +28,7 @@ warning_dismiss_done(void *data, Evas_Object *obj EINA_UNUSED,
 {
    file_mgr_data *fmd = data;
    evas_object_del(fmd->warning_layout);
-   enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
+   efl_ui_focus_object_focus_set(base_enventor_get(), EINA_TRUE);
    fmd->warning_layout = NULL;
 }
 

src/bin/main.c

@@ -557,7 +557,7 @@ enventor_ctxpopup_dismissed_cb(void *data EINA_UNUSED, Enventor_Object *obj,
                                void *event_info EINA_UNUSED)
 {
    if (menu_activated_get() > 0)
-     enventor_object_focus_set(obj, EINA_FALSE);
+     efl_ui_focus_object_focus_set(obj, EINA_FALSE);
 }
 
 static void
@@ -747,7 +747,7 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
 
         if (live_edit_cancel(EINA_TRUE))
           {
-             enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
+             efl_ui_focus_object_focus_set(base_enventor_get(), EINA_TRUE);
              return;
           }
         if (file_mgr_warning_is_opened())
@@ -1123,7 +1123,7 @@ init(app_data *ad, int argc, char **argv)
    base_gui_show();
 
    //Guarantee Enventor editor has focus.
-   enventor_object_focus_set(enventor, EINA_TRUE);
+   efl_ui_focus_object_focus_set(enventor, EINA_TRUE);
 
    menu_init();
 

src/bin/menu.c

@@ -766,7 +766,7 @@ menu_deactivate_request(void)
 
    if (md->active_request == 0)
      {
-        enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
+        efl_ui_focus_object_focus_set(base_enventor_get(), EINA_TRUE);
      }
    if (!md->menu_layout) return;
    elm_object_disabled_set(md->menu_layout, EINA_FALSE);

src/bin/statusbar.c

@@ -1,3 +1,4 @@
+#define EFL_UI_FOCUS_OBJECT_PROTECTED 1
 #include "common.h"
 
 #define VIEW_RESIZE_TYPE_W "W"
@@ -52,7 +53,7 @@ ctxpopup_dismissed_cb(void *data, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
    stats_data *sd = data;
-   enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
+   efl_ui_focus_object_focus_set(base_enventor_get(), EINA_TRUE);
    evas_object_del(obj);
    sd->ctxpopup = NULL;
 }

src/lib/enventor_object.eo

@@ -3,7 +3,8 @@ type Enventor_Syntax_Color_Type: __undefined_type;
 type Enventor_Template_Insert_Type: __undefined_type;
 type Edje_Part_Type: __undefined_type;
 
-class Enventor.Object (Efl.Ui.Widget, Efl.File) {
+class Enventor.Object (Efl.Ui.Widget, Efl.File, Efl.Ui.Focus.Object)
+{
    legacy_prefix: enventor_object;
    eo_prefix: enventor_obj;
    methods {
@@ -79,15 +80,6 @@ class Enventor.Object (Efl.Ui.Widget, Efl.File) {
             ctxpopup: bool;
          }
       }
-      @property focus {
-         set {
-         }
-         get {
-         }
-         values {
-            focus: bool;
-         }
-      }
       @property font_scale {
          set {
          }
@@ -119,7 +111,7 @@ class Enventor.Object (Efl.Ui.Widget, Efl.File) {
          return: bool;
          params {
             @in type: Enventor_Path_Type;
-            @in pathes: const (list< stringshare @owned >) @owned ;
+            @in pathes: list< stringshare @owned > @owned ;
          }
       }
       path_get {
@@ -214,12 +206,13 @@ class Enventor.Object (Efl.Ui.Widget, Efl.File) {
       class.constructor;
       Efl.Object.constructor;
       Efl.Object.destructor;
-      Efl.Gfx.visible {set;}
-      Efl.Gfx.position {set;}
-      Efl.Gfx.size {set;}
-      Efl.Canvas.Object.clip {set;}
+      Efl.Gfx.visible { set; }
+      Efl.Gfx.position { set; }
+      Efl.Gfx.size { set; }
+      Efl.Canvas.Object.clip { set; }
       Efl.Canvas.Group.group_member_add;
-      Efl.File.file {set;}
+      Efl.File.file { set; }
+      Efl.Ui.Focus.Object.focus { set; get; }
    }
    events {
       cursor,line,changed;

src/lib/enventor_smart.c

@@ -509,7 +509,7 @@ _enventor_object_auto_complete_list_show(Eo *obj EINA_UNUSED,
 EOLIAN static Eina_Bool
 _enventor_object_path_set(Eo *obj EINA_UNUSED,
                           Enventor_Object_Data *pd EINA_UNUSED,
-                          Enventor_Path_Type type, const Eina_List *pathes)
+                          Enventor_Path_Type type, Eina_List *pathes)
 {
    return build_path_set(type, pathes);
 }
@@ -662,16 +662,17 @@ _enventor_object_mirror_mode_get(Eo *obj EINA_UNUSED,
 }
 
 EOLIAN static void
-_enventor_object_focus_set(Eo *obj EINA_UNUSED,
+_enventor_object_efl_ui_focus_object_focus_set(Eo *obj EINA_UNUSED,
                            Enventor_Object_Data *pd EINA_UNUSED,
                            Eina_Bool focus)
 {
    if (!pd->focused_it) return;
+
    edit_focus_set(pd->focused_it->ed, focus);
 }
 
 EOLIAN static Eina_Bool
-_enventor_object_focus_get(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd)
+_enventor_object_efl_ui_focus_object_focus_get(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd)
 {
    if (!pd->focused_it) return EINA_FALSE;
    return edit_focus_get(pd->focused_it->ed);