jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

full, working tab completion for efm widgets, also slightly decrease typebuf hide timer to 3.5s from 5.0s: this was just way too long 

SVN revision: 73967
This commit is contained in:
Mike Blumenkrantz 2012-07-17 10:26:05 +00:00
parent eaaa60e655
commit 091e897f64
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/bin/e_fm.c
View File

@ -288,7 +288,7 @@ static void _e_fm2_typebuf_hide(Evas_Object *obj);
//static void _e_fm2_typebuf_history_prev(Evas_Object *obj);
//static void _e_fm2_typebuf_history_next(Evas_Object *obj);
static void _e_fm2_typebuf_run(Evas_Object *obj);
static void _e_fm2_typebuf_match(Evas_Object *obj, int next);
static E_Fm2_Icon *_e_fm2_typebuf_match(Evas_Object *obj, int next);
static void _e_fm2_typebuf_complete(Evas_Object *obj);
static void _e_fm2_typebuf_char_append(Evas_Object *obj, const char *ch);
static void _e_fm2_typebuf_char_backspace(Evas_Object *obj);
@ -5540,7 +5540,7 @@ _e_fm_typebuf_timer_cb(void *data)
return ECORE_CALLBACK_CANCEL;
}
static void
static E_Fm2_Icon *
_e_fm2_typebuf_match(Evas_Object *obj, int next)
{
E_Fm2_Smart_Data *sd;
@ -5550,13 +5550,12 @@ _e_fm2_typebuf_match(Evas_Object *obj, int next)
int tblen;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
if (!sd->typebuf.buf) return;
if (!sd->icons) return;
if (!sd) return NULL;
if (!sd->typebuf.buf) return NULL;
if (!sd->icons) return NULL;
tblen = strlen(sd->typebuf.buf);
tb = alloca(tblen + 2);
if (!tb) return;
memcpy(tb, sd->typebuf.buf, tblen);
tb[tblen] = '*';
tb[tblen + 1] = '\0';
@ -5586,18 +5585,44 @@ _e_fm2_typebuf_match(Evas_Object *obj, int next)
}
if (sd->typebuf.timer) ecore_timer_reset(sd->typebuf.timer);
else sd->typebuf.timer = ecore_timer_add(5.0, _e_fm_typebuf_timer_cb, sd);
else sd->typebuf.timer = ecore_timer_add(3.5, _e_fm_typebuf_timer_cb, sd);
return ic_match;
}
static void
_e_fm2_typebuf_complete(Evas_Object *obj)
{
E_Fm2_Smart_Data *sd;
E_Fm2_Icon *ic;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
/* FIXME: do */
_e_fm2_typebuf_match(obj, 0);
if ((!sd->typebuf.buf) || (!sd->typebuf.buf[0])) return;
ic = _e_fm2_typebuf_match(obj, 0);
if (!ic) return;
if ((sd->typebuf.buf[0] == '/') || (!memcmp(sd->typebuf.buf, "~/", 2)))
{
char *buf, *s;
size_t size;
s = strrchr(sd->typebuf.buf, '/');
s++;
s[0] = 0;
size = s - sd->typebuf.buf + strlen(ic->info.file) + 1;
buf = malloc(size);
snprintf(buf, size, "%s%s", sd->typebuf.buf, ic->info.file);
free(sd->typebuf.buf);
sd->typebuf.buf = buf;
edje_object_part_text_set(sd->overlay, "e.text.typebuf_label", sd->typebuf.buf);
evas_object_smart_callback_call(sd->obj, "typebuf_changed", sd->typebuf.buf);
}
else
{
free(sd->typebuf.buf);
sd->typebuf.buf = strdup(ic->info.file);
edje_object_part_text_set(sd->overlay, "e.text.typebuf_label", sd->typebuf.buf);
evas_object_smart_callback_call(sd->obj, "typebuf_changed", sd->typebuf.buf);
}
}
static void
@ -10086,3 +10111,10 @@ e_fm2_view_mode_get(Evas_Object *obj)
EFM_SMART_CHECK(0);
return _e_fm2_view_mode_get(sd);
}
EAPI Eina_Bool
e_fm2_typebuf_visible_get(Evas_Object *obj)
{
EFM_SMART_CHECK(EINA_FALSE);
return sd->typebuf_visible;
}

1
src/bin/e_fm.h
View File

@ -185,6 +185,7 @@ EAPI Evas_Object *e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, Evas_Smart_Cb g
void *data, int force_gen, const char **type_ret);
EAPI E_Fm2_Icon_Info *e_fm2_icon_file_info_get(E_Fm2_Icon *ic);
EAPI void e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h);
EAPI Eina_Bool e_fm2_typebuf_visible_get(Evas_Object *obj);
EAPI void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e);
EAPI void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e);