forked from enlightenment/enventor
enventor - code refactoring
This commit is contained in:
parent
2e91d7700b
commit
bb6f0cd5e8
|
@ -23,7 +23,6 @@ struct editor_s
|
|||
int cur_line;
|
||||
int line_max;
|
||||
Eina_Stringshare *group_name;
|
||||
Eina_Stringshare *part_name;
|
||||
|
||||
Ecore_Idler *syntax_color_timer;
|
||||
|
||||
|
@ -594,35 +593,20 @@ edit_cursor_double_clicked_cb(void *data, Evas_Object *obj,
|
|||
}
|
||||
|
||||
static void
|
||||
part_name_get_cb(void *data, Eina_Stringshare *part_name)
|
||||
cur_name_get_cb(void *data, Eina_Stringshare *part_name,
|
||||
Eina_Stringshare *group_name)
|
||||
{
|
||||
edit_data *ed = data;
|
||||
ed->part_name = part_name;
|
||||
if (ed->part_changed_cb)
|
||||
ed->part_changed_cb(ed->part_changed_cb_data, ed->part_name);
|
||||
}
|
||||
|
||||
static void
|
||||
group_name_get_cb(void *data, Eina_Stringshare *part_name)
|
||||
{
|
||||
edit_data *ed = data;
|
||||
/* ed->part_name = part_name;
|
||||
if (ed->part_changed_cb)
|
||||
ed->part_changed_cb(ed->part_changed_cb_data, ed->part_name); */
|
||||
ed->part_changed_cb(ed->part_changed_cb_data, part_name);
|
||||
}
|
||||
|
||||
void
|
||||
edit_cur_part_update(edit_data *ed)
|
||||
edit_view_sync(edit_data *ed)
|
||||
{
|
||||
if (!config_part_highlight_get(ed->cd)) return;
|
||||
|
||||
parser_part_name_get(ed->pd, ed->en_edit, part_name_get_cb, ed);
|
||||
}
|
||||
|
||||
static void
|
||||
edit_cur_group_update(edit_data *ed)
|
||||
{
|
||||
parser_group_name_get(ed->pd, ed->en_edit, group_name_get_cb, ed);
|
||||
parser_cur_name_get(ed->pd, ed->en_edit, cur_name_get_cb, ed);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -631,8 +615,7 @@ edit_cursor_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
|
|||
{
|
||||
edit_data *ed = data;
|
||||
cur_line_pos_set(ed);
|
||||
edit_cur_group_update(ed);
|
||||
edit_cur_part_update(ed);
|
||||
edit_view_sync(ed);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -19,8 +19,10 @@ typedef struct cur_name_thread_data_s
|
|||
parser_data *pd;
|
||||
char *utf8;
|
||||
int cur_pos;
|
||||
const char *cur_name;
|
||||
void (*cb)(void *data, Eina_Stringshare *cur_name);
|
||||
const char *part_name;
|
||||
const char *group_name;
|
||||
void (*cb)(void *data, Eina_Stringshare *part_name,
|
||||
Eina_Stringshare *group_name);
|
||||
void *cb_data;
|
||||
} cur_name_td;
|
||||
|
||||
|
@ -359,15 +361,14 @@ end:
|
|||
free(utf8);
|
||||
td->utf8 = NULL;
|
||||
}
|
||||
td->cur_name = part_name;
|
||||
td->part_name = part_name;
|
||||
}
|
||||
|
||||
static void
|
||||
part_name_thread_end(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||
{
|
||||
cur_name_td *td = data;
|
||||
Eina_Stringshare *part_name = td->cur_name;
|
||||
td->cb(td->cb_data, part_name);
|
||||
td->cb(td->cb_data, td->part_name, td->group_name);
|
||||
td->pd->thread = NULL;
|
||||
free(td);
|
||||
}
|
||||
|
@ -470,14 +471,7 @@ parser_paragh_name_get(parser_data *pd EINA_UNUSED, Evas_Object *entry)
|
|||
}
|
||||
|
||||
void
|
||||
parser_group_name_get(parser_data *pd, Evas_Object *entry, void (*cb)(void *data, Eina_Stringshare *group_name), void *data)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
parser_part_name_get(parser_data *pd, Evas_Object *entry, void (*cb)(void *data, Eina_Stringshare *part_name), void *data)
|
||||
parser_cur_name_get(parser_data *pd, Evas_Object *entry, void (*cb)(void *data, Eina_Stringshare *part_name, Eina_Stringshare *group_name), void *data)
|
||||
{
|
||||
if (pd->thread) ecore_thread_cancel(pd->thread);
|
||||
|
||||
|
|
|
@ -183,7 +183,7 @@ static void
|
|||
part_highlight_toggle(app_data *ad, Eina_Bool msg)
|
||||
{
|
||||
Eina_Bool highlight = config_part_highlight_get(ad->cd);
|
||||
if (highlight) edit_cur_part_update(ad->ed);
|
||||
if (highlight) edit_view_sync(ad->ed);
|
||||
else view_part_highlight_set(ad->vd, NULL);
|
||||
|
||||
if (!msg) return;
|
||||
|
|
Loading…
Reference in New Issue