enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

'everything' module: 

- use border focus stack instead of border list
- border ref/unref seems not to work here. todo: handle border remove events 


SVN revision: 41765
This commit is contained in:
Hannes Janetzek 2009-08-14 15:33:13 +00:00
parent fbb36478cc
commit d198ef5e96
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/everything/evry.c
View File

@ -471,7 +471,7 @@ evry_fuzzy_match(const char *str, const char *match)
{
if (tolower(*p) == mc)
{
cnt += cnt * (pos - last);
cnt += cnt * (pos - last) * 10;
last = pos;
m++;
mc = tolower(*m);
@ -480,7 +480,7 @@ evry_fuzzy_match(const char *str, const char *match)
if (cnt > MAX_FUZZ) return 0;
if (isspace(mc) && strchr(p, ' '))
if (isspace(mc) && !strchr(p, ' '))
break;
}
@ -513,7 +513,8 @@ _evry_list_win_new(E_Zone *zone)
x = (zone->w / 2) - (win->popup->w / 3);
y = (zone->h / 2);
popup = e_popup_new(zone, x + 50, y - 4, /*XXX get from theme ?*/
/* TODO get offsets from theme */
popup = e_popup_new(zone, x + 50, y - 4,
win->popup->w * 2/3 - 100,
evry_conf->height);
if (!popup) return NULL;

18
src/modules/everything/evry_plug_border.c
View File

@ -3,6 +3,7 @@
static Evry_Plugin *p;
/* TODO handle border remove events */
static void
_cleanup(Evry_Plugin *p)
@ -16,7 +17,7 @@ _cleanup(Evry_Plugin *p)
static void
_item_free(Evry_Item *it)
{
if (it->data[0]) e_object_unref(E_OBJECT(it->data[0]));
/* if (it->data[0]) e_object_unref(E_OBJECT(it->data[0])); */
}
static void
@ -26,17 +27,16 @@ _item_add(Evry_Plugin *p, E_Border *bd, int fuzz, int *prio)
it = evry_item_new(p, e_border_name_get(bd), &_item_free);
e_object_ref(E_OBJECT(bd));
/* e_object_ref(E_OBJECT(bd)); */
it->data[0] = bd;
it->fuzzy_match = fuzz;
it->priority = *prio;
*prio = *prio - 1;
*prio += 1;
p->items = eina_list_append(p->items, it);
}
/* TODO sort by focus history and name? */
static int
_cb_sort(const void *data1, const void *data2)
{
@ -52,20 +52,17 @@ _cb_sort(const void *data1, const void *data2)
static int
_fetch(Evry_Plugin *p, const char *input)
{
E_Manager *man;
E_Zone *zone;
E_Border *bd;
E_Border_List *bl;
Eina_List *l;
int fuzz;
int prio = 0;
_cleanup(p);
man = e_manager_current_get();
zone = e_util_zone_current_get(man);
zone = e_util_zone_current_get(e_manager_current_get());
bl = e_container_border_list_first(e_container_current_get(man));
while ((bd = e_container_border_list_next(bl)))
EINA_LIST_FOREACH(e_border_focus_stack_get(), l, bd)
{
if (zone == bd->zone)
{
@ -83,7 +80,6 @@ _fetch(Evry_Plugin *p, const char *input)
}
}
}
e_container_border_list_free(bl);
if (p->items)
{