Merge 'develop':v0.2.2

  - add rotation of target in simulation mode;
  - fixes according to coverage testing;

11 files changed, 138 insertions, 28 deletions

diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index 1e4a3f5..40eedb9 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -413,6 +413,8 @@ _sub_wins_hide_show_cb(void *data, Evas_Object *_obj EINA_UNUSED, void *event_in
            case PROPERTIES_VIEW:
               eo_do(g->right_panel_box, elm_obj_box_pack_end(obj));
               break;
+           default:
+              break;
           }
      }
    else
diff --git a/src/bin/main.c b/src/bin/main.c
index d6a84b7..4641149 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -11,7 +11,7 @@
 #include "egui_logic.h"
 #endif
 
-static int
+static Eina_Bool
 _generate(const char *filename, const char* path, const char *project)
 {
    Gui_Context *ctx;
@@ -19,19 +19,20 @@ _generate(const char *filename, const char* path, const char *project)
    if (!ctx)
      {
         ERR("Can not create context: %p", ctx);
+        return EINA_FALSE;
      }
 
    if (!gui_parser_json_file_read(ctx, filename))
      {
         gui_context_del(ctx);
-        return 0;
+        return EINA_FALSE;
      }
 
    gui_context_validate(ctx);
 
    generator_ctx_source_generate(ctx, path, project);
    gui_context_del(ctx);
-   return 0;
+   return EINA_TRUE;
 }
 
 static void
diff --git a/src/lib/database.c b/src/lib/database.c
index 4fe76e1..9215d46 100644
--- a/src/lib/database.c
+++ b/src/lib/database.c
@@ -480,18 +480,18 @@ db_op_desc_param_number_get(const Op_Desc *p)
 Op_Flag
 db_op_desc_flag_get(const Op_Desc *op_desc)
 {
-   return op_desc->op_flag;
+   return (op_desc?op_desc->op_flag:EGUI_NO_CALL);
 }
 
 /* Get Eo op id for current op*/
 Eo_Op
 db_op_desc_op_id_get(const Op_Desc *op_desc)
 {
-   if ((op_desc) && (!op_desc->base_op_id))
+   if (!op_desc || (!op_desc->base_op_id))
      {
         return -1;
      }
-   return *op_desc->base_op_id + op_desc->relative_op_id;
+   return *(op_desc->base_op_id) + op_desc->relative_op_id;
 }
 
 /* Get func name for current op*/
diff --git a/src/lib/eina_json.c b/src/lib/eina_json.c
index 9de6bd6..3e14cd0 100644
--- a/src/lib/eina_json.c
+++ b/src/lib/eina_json.c
@@ -1197,7 +1197,11 @@ eina_json_object_value_get_internal(Eina_Json_Value *obj, ...)
    va_start(vl, obj);
    while ((jkey = va_arg(vl, char*)))
      {
-        if (jval->type != EINA_JSON_TYPE_OBJECT) return NULL;
+        if (jval->type != EINA_JSON_TYPE_OBJECT)
+          {
+             va_end(vl);
+             return NULL;
+          }
         for (l = jval->lst; l; l = l->next)
           {
              jval = EINA_INLIST_CONTAINER_GET(l, Eina_Json_Value);
diff --git a/src/lib/ffi_abstraction.c b/src/lib/ffi_abstraction.c
index 5ac43bc..dc264cf 100644
--- a/src/lib/ffi_abstraction.c
+++ b/src/lib/ffi_abstraction.c
@@ -195,7 +195,10 @@ _ffi_eo_add(const Gui_Session *session, const Gui_Widget *wdg)
      {
         parent_eo = session_eo_get(session, parent_wdg);
         if (!parent_eo)
-          return NULL;
+          {
+             ret = NULL;
+             goto end;
+          }
      }
 
    types[3] = &ffi_type_pointer;
diff --git a/src/lib/ffi_glue.c b/src/lib/ffi_glue.c
index 9e2114d..ed33e6e 100644
--- a/src/lib/ffi_glue.c
+++ b/src/lib/ffi_glue.c
@@ -106,7 +106,7 @@ Eina_Bool
 manager_widget_create(Gui_Session *session, const Gui_Widget *wdg, Action_Mode mode, void *data)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(wdg, EINA_FALSE);
-   Eina_Bool ret;
+   Eina_Bool ret = EINA_TRUE;
 
    if (_modes_functions[mode].wdg_add)
      {
diff --git a/src/lib/generator.c b/src/lib/generator.c
index 7f29b34..14204c5 100644
--- a/src/lib/generator.c
+++ b/src/lib/generator.c
@@ -269,12 +269,13 @@ _wdg_add_generate(Gui_Session *session, const Gui_Widget *wdg, void *data)
 {
    char *parent_id, *constr_id;
    Eina_Stringshare *class_id;
+
    char *ret = calloc(1000, 1);
 
    if (!wdg)
      {
         WRN("Wdg is NULL");
-        return EINA_FALSE;
+        goto bad_end;
      }
 
    parent_id = wdg_parent_name_get(wdg);
@@ -284,7 +285,7 @@ _wdg_add_generate(Gui_Session *session, const Gui_Widget *wdg, void *data)
    if (!class_id)
      {
         ERR("Property \"class\" is missing in widget: \"%s\"\n", wdg_name_get(wdg));
-        return EINA_FALSE;
+        goto bad_end;
      }
 
    /* if there is no property "constructor", it means - using eo constr */
@@ -308,7 +309,7 @@ _wdg_add_generate(Gui_Session *session, const Gui_Widget *wdg, void *data)
         if (!op_desc)
           {
              ERR("Constructor: \"%s\" was not found in hash table.\n", constr_id);
-             return EINA_FALSE;
+             goto bad_end;
           }
 
         values_lst = prop_value_get(wdg_prop_get(wdg, constr_id));
@@ -320,7 +321,7 @@ _wdg_add_generate(Gui_Session *session, const Gui_Widget *wdg, void *data)
         if (!format_string)
           {
              ERR("calloc failed");
-             return EINA_FALSE;
+             goto bad_end;
           }
 
         p_fs = format_string;
@@ -350,6 +351,9 @@ _wdg_add_generate(Gui_Session *session, const Gui_Widget *wdg, void *data)
 
    session_wdg_existence_set(session, wdg, EINA_TRUE);
    return EINA_TRUE;
+bad_end:
+   free(ret);
+   return EINA_FALSE;
 }
 
 /* Recursively generate context for widget and its children. */
@@ -642,8 +646,6 @@ _ctx_to_file_save(Gui_Context *ctx, const char *path, const char *project)
                      "#endif");
     }
 
-  fclose(fp_c);
-  fclose(fp_h);
   free(gl_gen_ctx.buf);
   eina_array_free(gl_gen_ctx.global_names);
   eina_hash_free(gl_gen_ctx.created_sequences_hash);
@@ -651,8 +653,10 @@ _ctx_to_file_save(Gui_Context *ctx, const char *path, const char *project)
   session_del(session);
 
 end:
-   free(filename_c);
-   free(filename_h);
+  if (fp_c) fclose(fp_c);
+  if (fp_h) fclose(fp_h);
+  free(filename_c);
+  free(filename_h);
 }
 
 void
diff --git a/src/lib/gui_parser.c b/src/lib/gui_parser.c
index 6d29524..153cc5b 100644
--- a/src/lib/gui_parser.c
+++ b/src/lib/gui_parser.c
@@ -16,7 +16,7 @@ char*
 gui_parser_file_string_get(const char *filename)
 {
    char *file_data = NULL;
-   size_t file_size;
+   int file_size;
    FILE *fp = fopen(filename, "r");
    if (!fp)
      {
@@ -26,6 +26,12 @@ gui_parser_file_string_get(const char *filename)
 
    fseek(fp, 0, SEEK_END);
    file_size = ftell(fp);
+   if (file_size == -1)
+     {
+        fclose(fp);
+        printf("Can not ftell file: \"%s\".\n", filename);
+        return NULL;
+     }
    rewind(fp);
    file_data = (char *) calloc(1, file_size + 1);
    if (!file_data)
@@ -34,8 +40,14 @@ gui_parser_file_string_get(const char *filename)
         ERR("Calloc failed");
         return NULL;
      }
-   fread(file_data, file_size, 1, fp);
+   int res = fread(file_data, file_size, 1, fp);
    fclose(fp);
+   if (!res)
+     {
+        free(file_data);
+        file_data = NULL;
+        ERR("fread failed");
+     }
    return file_data;
 }
 
@@ -339,7 +351,10 @@ _json_arr_to_eina_list(Eina_Json_Value *jv)
                 }
               break;
            default:
-              ERR("default case");
+                {
+                   g_type = GUI_TYPE_NONE;
+                   ERR("default case");
+                }
           }
         gui_value_set(g_val, g_type, p_value);
         values = eina_list_append(values, g_val);
@@ -364,6 +379,7 @@ _widget_parse(Gui_Context *gui_ctx, const char *widget_name, Eina_Json_Value *wi
    /* Get "class" from json */
    Eina_Json_Value *j = EINA_JSON_OBJECT_VALUE_GET(widget_js, "Desc", "class");
    Eina_Json_Value *tmp = NULL;
+   if (!j) goto bad_end;
    class_name = eina_json_string_get(j);
    wdg_class_name_set(wdg, class_name);
 
diff --git a/src/lib/gui_widget.c b/src/lib/gui_widget.c
index 99d3d02..bbdb986 100644
--- a/src/lib/gui_widget.c
+++ b/src/lib/gui_widget.c
@@ -639,19 +639,20 @@ wdg_lst_get(const Gui_Context *ctx)
 void
 wdg_class_name_set(Gui_Widget *wdg, const char *class_name)
 {
-   wdg->class_name = eina_stringshare_add(class_name);
+   if (wdg)
+      wdg->class_name = eina_stringshare_add(class_name);
 }
 
 Eina_Stringshare*
 wdg_class_name_get(const Gui_Widget *wdg)
 {
-   return wdg->class_name;
+   return (wdg?wdg->class_name:NULL);
 }
 
 const Gui_Widget*
 wdg_parent_get(const Gui_Widget *wdg)
 {
-   return wdg->parent;
+   return (wdg?wdg->parent:NULL);
 }
 
 char*
@@ -1720,6 +1721,12 @@ session_target_view_pop(Gui_Session *session)
    return ret;
 }
 
+const Gui_Widget*
+session_target_view_top(Gui_Session *session)
+{
+   return eina_list_data_get(session->views);
+}
+
 void session_target_local_geometry_set(Gui_Session *session, int w, int h)
 {
    session->target_local_w = w;
diff --git a/src/lib/gui_widget.h b/src/lib/gui_widget.h
index 88dfe62..e8e8055 100644
--- a/src/lib/gui_widget.h
+++ b/src/lib/gui_widget.h
@@ -538,4 +538,8 @@ session_target_view_push(Gui_Session *session, const Gui_Widget* view);
 const Gui_Widget*
 session_target_view_pop(Gui_Session *session);
 
+/* Get currently top window from stack of views. */
+const Gui_Widget*
+session_target_view_top(Gui_Session *session);
+
 #endif
diff --git a/src/lib/simulator.c b/src/lib/simulator.c
index 0e771df..b0c0dd4 100644
--- a/src/lib/simulator.c
+++ b/src/lib/simulator.c
@@ -147,6 +147,18 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg, void *data EINA_UNUSED)
              parent_win = target;
              win_type = ELM_WIN_INLINED_IMAGE;
              o = eo_add_custom(ELM_OBJ_WIN_CLASS, parent_win, elm_obj_win_constructor(NULL, win_type));
+
+             /* Hide currently top window, because following window could be resized. */
+               {
+                  const Gui_Widget *top_wdg = session_target_view_top(session);
+                  if (top_wdg)
+                    {
+                       Eo *top_o;
+                       top_o = session_eo_get(session, top_wdg);
+                       eo_do(top_o, evas_obj_visibility_set(EINA_FALSE));
+                  }
+               }
+
              session_target_view_push(session, wdg);
              eo_do(o, evas_obj_size_set(local_w, local_h));
              io = elm_win_inlined_image_object_get(o);
@@ -183,7 +195,7 @@ _widget_del(Gui_Session *session, const Gui_Widget *wdg, void *data EINA_UNUSED)
 static Eina_Bool
 _widget_eo_do(Gui_Session *session, const Gui_Widget *wdg, void *prop, void *data EINA_UNUSED)
 {
-   Eina_Bool ret;
+   Eina_Bool ret = EINA_TRUE;
    if (IS_WIN(wdg) && (!strcmp(SIZE_SET, prop_name_get((Gui_Widget_Property* ) prop))))
      {
         /* If target exists, don't resize win, because it's defined by target's size. */
@@ -209,10 +221,58 @@ _target_back_button_clicked(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Desc
    Gui_Session *session = data;
    Gui_Widget *wdg;
    wdg = (Gui_Widget *) session_target_view_pop(session);
-   if (wdg)
-     {
-        manager_widget_delete(session, wdg, MODE_SIMULATOR, NULL);
-     }
+
+   if (!wdg)
+     return EO_CALLBACK_CONTINUE;
+
+   /* Delete upper window. */
+   manager_widget_delete(session, wdg, MODE_SIMULATOR, NULL);
+
+   /* Probably rotation was changed on child window. So when we go back,
+    * need to resize currently upper window. */
+   Evas_Coord w, h;
+   session_target_local_geometry_get(session, &w, &h);
+
+   Eo *o, *io;
+   wdg = (Gui_Widget *) session_target_view_top(session);
+   o = session_eo_get(session, wdg);
+   io = elm_win_inlined_image_object_get(o);
+   eo_do(o, evas_obj_size_set(w, h));
+   /* Show previous window. */
+   eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(io, evas_obj_size_set(w, h));
+
+   return EO_CALLBACK_CONTINUE;
+}
+
+/* Rotate callback*/
+static Eina_Bool
+_target_rotate_button_clicked(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Gui_Session *session = data;
+   Eo *menu_box;
+   eo_do(obj, eo_base_data_get("menu_box", (void **) &menu_box));
+
+   /* Flip width and height */
+   Evas_Coord w, h;
+   session_target_local_geometry_get(session, &w, &h);
+   session_target_local_geometry_set(session, h, w);
+
+   /* Flip window's dimensions. */
+   Eo *win = (Eo *) session_target_win_get(session);
+   eo_do(win, evas_obj_size_set(h, w + 50));
+
+   /* Change position of the box*/
+   eo_do(menu_box, evas_obj_position_set(0, w));
+   eo_do(menu_box, evas_obj_size_set(h, 50));
+
+   Gui_Widget *wdg;
+   Eo *o, *io;
+   wdg = (Gui_Widget *) session_target_view_top(session);
+   o = session_eo_get(session, wdg);
+   eo_do(o, evas_obj_size_set(h, w));
+   io = elm_win_inlined_image_object_get(o);
+   eo_do(io, evas_obj_size_set(h, w));
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -257,6 +317,14 @@ simulator_ctx_call(Gui_Context *ctx, const char *target_name)
              eo_do(back, evas_obj_visibility_set(EINA_TRUE));
              eo_do(menu_box, elm_obj_box_pack_end(back));
 
+             Eo *rotate = eo_add(ELM_OBJ_BUTTON_CLASS, menu_box);
+             eo_unref(rotate);
+             eo_do(rotate, elm_wdg_part_text_set(NULL, "Rotate"));
+             eo_do(rotate, evas_obj_visibility_set(EINA_TRUE));
+             eo_do(menu_box, elm_obj_box_pack_end(rotate));
+             /* Hack arpund box, because I need to set position for box, when rotating. */
+             eo_do(rotate, eo_base_data_set("menu_box", menu_box, NULL));
+
              /* We know current display's DPI and target's dpi. So we can calculate
               * target's size in pixels in current DPI to match metric size of target. */
              int target_dpix, target_dpiy, target_w, target_h;
@@ -277,6 +345,7 @@ simulator_ctx_call(Gui_Context *ctx, const char *target_name)
              eo_do(tw, evas_obj_size_set(w, h + 50));
 
              eo_do(back, eo_event_callback_add(&_CLICKED_EVENT, _target_back_button_clicked, exec_data.session));
+             eo_do(rotate, eo_event_callback_add(&_CLICKED_EVENT, _target_rotate_button_clicked, exec_data.session));
              eo_do(tw, evas_obj_visibility_set(EINA_TRUE));
           }
         session_target_win_set(exec_data.session, td, tw);