forked from enlightenment/enventor
enventor - fixed all the build warnings and errors from refactoring commit.
This commit is contained in:
parent
e0672e4ae5
commit
9262556d4e
|
@ -79,28 +79,24 @@ void base_hotkeys_set(Evas_Object *hotkeys)
|
|||
void
|
||||
base_full_view_left()
|
||||
{
|
||||
base_data *bd = g_bd;
|
||||
panes_full_view_left();
|
||||
}
|
||||
|
||||
void
|
||||
base_full_view_right()
|
||||
{
|
||||
base_data *bd = g_bd;
|
||||
panes_full_view_right();
|
||||
}
|
||||
|
||||
void
|
||||
base_right_view_set(Evas_Object *right)
|
||||
{
|
||||
base_data *bd = g_bd;
|
||||
panes_content_set("right", right);
|
||||
}
|
||||
|
||||
void
|
||||
base_left_view_set(Evas_Object *left)
|
||||
{
|
||||
base_data *bd = g_bd;
|
||||
panes_content_set("left", left);
|
||||
}
|
||||
|
||||
|
|
|
@ -81,10 +81,9 @@ part_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
|||
}
|
||||
|
||||
static void
|
||||
layout_resize_cb(void *data, Evas *e EINA_UNUSED,
|
||||
layout_resize_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
|
||||
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
view_data *vd = data;
|
||||
if (!config_stats_bar_get()) return;
|
||||
|
||||
Evas_Coord w, h;
|
||||
|
@ -94,10 +93,9 @@ layout_resize_cb(void *data, Evas *e EINA_UNUSED,
|
|||
}
|
||||
|
||||
static void
|
||||
rect_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
|
||||
rect_mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
|
||||
Evas_Object *obj EINA_UNUSED, void *event_info)
|
||||
{
|
||||
view_data *vd = data;
|
||||
if (!config_stats_bar_get()) return;
|
||||
|
||||
Evas_Event_Mouse_Move *ev = event_info;
|
||||
|
|
|
@ -93,7 +93,7 @@ part_highlight_toggle(app_data *ad, Eina_Bool msg)
|
|||
}
|
||||
|
||||
static void
|
||||
auto_indentation_toggle(app_data *ad)
|
||||
auto_indentation_toggle(void)
|
||||
{
|
||||
Eina_Bool toggle = !config_auto_indent_get();
|
||||
if (toggle) stats_info_msg_update("Auto Indentation Enabled.");
|
||||
|
@ -197,7 +197,7 @@ ctrl_func(app_data *ad, const char *key)
|
|||
//Auto Indentation
|
||||
if (!strcmp(key, "i") || !strcmp(key, "I"))
|
||||
{
|
||||
auto_indentation_toggle(ad);
|
||||
auto_indentation_toggle();
|
||||
return ECORE_CALLBACK_DONE;
|
||||
}
|
||||
//Font Size Up
|
||||
|
@ -328,7 +328,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev)
|
|||
}
|
||||
|
||||
static void
|
||||
edc_view_set(app_data *ad, Eina_Stringshare *group)
|
||||
edc_view_set(Eina_Stringshare *group)
|
||||
{
|
||||
view_data *vd = edj_mgr_view_get(group);
|
||||
if (vd) edj_mgr_view_switch_to(vd);
|
||||
|
@ -340,12 +340,11 @@ edc_view_set(app_data *ad, Eina_Stringshare *group)
|
|||
}
|
||||
|
||||
static void
|
||||
view_sync_cb(void *data, Eina_Stringshare *part_name,
|
||||
view_sync_cb(void *data EINA_UNUSED, Eina_Stringshare *part_name,
|
||||
Eina_Stringshare *group_name)
|
||||
{
|
||||
app_data *ad = data;
|
||||
if (stats_group_name_get() != group_name)
|
||||
edc_view_set(ad, group_name);
|
||||
edc_view_set(group_name);
|
||||
view_part_highlight_set(VIEW_DATA, part_name);
|
||||
}
|
||||
|
||||
|
@ -360,7 +359,7 @@ edc_edit_set(app_data *ad)
|
|||
}
|
||||
|
||||
static void
|
||||
statusbar_set(app_data *ad)
|
||||
statusbar_set(void)
|
||||
{
|
||||
Evas_Object *obj = stats_init(base_layout_get());
|
||||
elm_object_part_content_set(base_layout_get(), "elm.swallow.statusbar",
|
||||
|
@ -387,7 +386,7 @@ config_update_cb(void *data)
|
|||
build_edc();
|
||||
edit_changed_set(ad->ed, EINA_FALSE);
|
||||
edj_mgr_clear();
|
||||
edc_view_set(ad, stats_group_name_get());
|
||||
edc_view_set(stats_group_name_get());
|
||||
if (ad->edc_monitor) eio_monitor_del(ad->edc_monitor);
|
||||
ad->edc_monitor = eio_monitor_add(config_edc_path_get());
|
||||
}
|
||||
|
@ -506,7 +505,7 @@ elm_setup()
|
|||
}
|
||||
|
||||
static void
|
||||
edj_mgr_set(app_data *ad)
|
||||
edj_mgr_set(void)
|
||||
{
|
||||
edj_mgr_init(base_layout_get());
|
||||
base_left_view_set(edj_mgr_obj_get());
|
||||
|
@ -537,10 +536,10 @@ init(app_data *ad, int argc, char **argv)
|
|||
if (!edc_proto_setup()) return EINA_FALSE;
|
||||
if (!base_gui_init()) return EINA_FALSE;
|
||||
|
||||
edj_mgr_set(ad);
|
||||
statusbar_set(ad);
|
||||
edj_mgr_set();
|
||||
statusbar_set();
|
||||
edc_edit_set(ad);
|
||||
edc_view_set(ad, stats_group_name_get());
|
||||
edc_view_set(stats_group_name_get());
|
||||
menu_init(ad->ed);
|
||||
hotkeys_set(ad->ed);
|
||||
|
||||
|
|
|
@ -146,14 +146,14 @@ right_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
|||
}
|
||||
|
||||
void
|
||||
panes_full_view_right(Evas_Object *panes)
|
||||
panes_full_view_right(void)
|
||||
{
|
||||
panes_data *pd = g_pd;
|
||||
right_clicked_cb(pd, pd->right_arrow, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
panes_full_view_left(Evas_Object *panes)
|
||||
panes_full_view_left(void)
|
||||
{
|
||||
panes_data *pd = g_pd;
|
||||
left_clicked_cb(pd, pd->left_arrow, NULL);
|
||||
|
|
|
@ -4,9 +4,12 @@ Eina_Bool base_gui_init();
|
|||
Evas_Object *base_win_get();
|
||||
Evas_Object *base_layout_get();
|
||||
void base_win_resize_object_add(Evas_Object *resize_obj);
|
||||
void base_title_set(const char *path);
|
||||
void base_statusbar_toggle();
|
||||
void base_hotkey_toggle();
|
||||
void base_hotkeys_set(Evas_Object *hotkeys);
|
||||
void base_full_view_left();
|
||||
void base_full_view_right();
|
||||
void base_left_view_set();
|
||||
void base_gui_term();
|
||||
void base_right_view_set();
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
edit_data *edit_init(Evas_Object *win, stats_data *sd);
|
||||
edit_data *edit_init(Evas_Object *win);
|
||||
void edit_term(edit_data *ed);
|
||||
void edit_edc_read(edit_data *ed, const char *file_path);
|
||||
void edit_focus_set(edit_data *ed);
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
void edj_mgr_init(Evas_Object *parent);
|
||||
void edj_mgr_term();
|
||||
view_data * edj_mgr_view_new(const char *group, stats_data *sd);
|
||||
view_data * edj_mgr_view_new(const char *group);
|
||||
view_data *edj_mgr_view_get(Eina_Stringshare *group);
|
||||
Evas_Object * edj_mgr_obj_get();
|
||||
view_data *edj_mgr_view_switch_to(view_data *vd);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
view_data * view_init(Evas_Object *parent, const char *group, stats_data *sd,
|
||||
view_data * view_init(Evas_Object *parent, const char *group,
|
||||
void (*del_cb)(void *data), void *data);
|
||||
void view_term(view_data *vd);
|
||||
Evas_Object *view_obj_get(view_data *vd);
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
stats_data *stats_init(Evas_Object *parent);
|
||||
void stats_term(stats_data *sd);
|
||||
void stats_view_size_update(stats_data *sd);
|
||||
void stats_cursor_pos_update(stats_data *sd, Evas_Coord x, Evas_Coord y, float rel_x, float rel_y);
|
||||
void stats_info_msg_update(stats_data *sd, const char *msg);
|
||||
void stats_line_num_update(stats_data *sd, int cur_line, int max_line);
|
||||
Evas_Object *stats_obj_get(stats_data *sd);
|
||||
void stats_edc_group_set(stats_data *sd, const char *group_name);
|
||||
Eina_Stringshare *stats_group_name_get(stats_data *sd);
|
||||
Evas_Object *stats_init(Evas_Object *parent);
|
||||
void stats_term(void);
|
||||
void stats_view_size_update(void);
|
||||
void stats_cursor_pos_update(Evas_Coord x, Evas_Coord y, float rel_x, float rel_y);
|
||||
void stats_info_msg_update(const char *msg);
|
||||
void stats_line_num_update(int cur_line, int max_line);
|
||||
Evas_Object *stats_obj_get(void);
|
||||
void stats_edc_group_set(const char *group_name);
|
||||
Eina_Stringshare *stats_group_name_get(void);
|
||||
|
|
Loading…
Reference in New Issue