Thread: E SVN: jeffdameth trunk/e/src/modules/everything (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Log:
  'everything' module:
  - core: cleanup async_update function
  - tracker: cleanups
  
Author:       jeffdameth
Date:         2009-08-12 11:47:46 -0700 (Wed, 12 Aug 2009)
New Revision: 41715

Modified:
  trunk/e/src/modules/everything/evry.c trunk/e/src/modules/everything/evry_plug_border.c trunk/e/src/modules/everything/evry_plug_tracker.c 

Modified: trunk/e/src/modules/everything/evry.c
===================================================================

--- trunk/e/src/modules/everything/evry.c	2009-08-12 17:57:34 UTC (rev 41714)
+++ trunk/e/src/modules/everything/evry.c	2009-08-12 18:47:46 UTC (rev 41715)
@@ -599,20 +599,21 @@
 static void
 _evry_selector_activate(Evry_Selector *sel)
 {
-   if (selector)
+   if (selector && selector->state)
      {
+	Evry_State *s = selector->state;
+	Evry_Plugin *p;
+	Eina_List *l;
+
+	_evry_list_clear_list(s);
+	
 	edje_object_signal_emit(selector->o_main, "e,state,unselected", "e");
-
 	edje_object_part_text_set(selector->o_main, "e.text.plugin", "");
-
+	
 	if (update_timer)
 	  {
-	     Evry_State *s = selector->state;
-	     
-	     /* XXX what if an async plugin is selected */
-	     if (s && s->plugin && !s->plugin->async_query)
+	     if (s->plugin && !s->plugin->async_query)
 	       {
-		  _evry_list_clear_list(s); 
 		  _evry_matches_update(selector);
 		  _evry_selector_update(selector); 
 	       }
@@ -620,6 +621,13 @@
 	     update_timer = NULL;
 	  }
 	
+	EINA_LIST_FOREACH(selector->plugins, l, p)
+	  {
+	     e_box_unpack(p->tab); 
+	     evas_object_del(p->tab);
+	     p->tab = NULL;
+	  }
+
 	_evry_list_win_hide();
      }
    
@@ -704,7 +712,7 @@
 	
 	it = s->sel_item;
 
-	if (!it && s->plugin)
+	if (s->plugin && (!it || s->item_auto_selected))
 	  {
 	     /* get first item */
 	     if (s->plugin->items)
@@ -943,6 +951,7 @@
    _evry_list_clear_list(s);
    _evry_state_pop(sel);
    _evry_selector_update(sel);
+   sel->aggregator->fetch(sel->aggregator, NULL);
    _evry_list_update(sel->state);
    _evry_update_text_label(sel->state);
 }
@@ -969,7 +978,7 @@
 
 	     if (update_timer)
 	       {
-		  /* XXX redundant > selector_activate,
+		  /* duplicate code: selector_activate,
 		     plugin_action, update_timer !!! */
 		  if (!s->plugin->async_query)
 		    {
@@ -1003,8 +1012,6 @@
 	edje_object_signal_emit(win->o_main,
 				"e,state,object_selector_hide", "e");
 
-	_evry_list_clear_list(s);
-	     
 	while (selector->states)
 	  _evry_state_pop(selector);
 	     
@@ -1510,11 +1517,13 @@
 static void
 _evry_list_item_sel(Evry_State *s, Evry_Item *it)
 {
+   if (s->sel_item == it) return;
+
    if (list->visible && selector->state == s)
      {
 	if (s->sel_item)
 	  _evry_list_item_desel(s, s->sel_item);
-	    
+
 	edje_object_signal_emit(it->o_bg, "e,state,selected", "e");
 	if (it->o_icon)
 	  edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
@@ -1754,9 +1763,10 @@
 static void
 _evry_list_tabs_update(Evry_State *s)
 {
+
    Eina_List *l;
    Evry_Plugin *p;
-   
+
    /* remove tabs for not active plugins */
    EINA_LIST_FOREACH(selector->plugins, l, p)
      {
@@ -1767,7 +1777,7 @@
 	     p->tab = NULL;
 	  }
      }
-
+   
    /* show/update tabs of active plugins */
    EINA_LIST_FOREACH(s->cur_plugins, l, p)
      {	
@@ -1844,7 +1854,7 @@
    pc = E_NEW(Plugin_Config, 1);
    pc->name = eina_stringshare_add(p->name);
    pc->enabled = 1;
-   pc->priority = 100;
+   pc->priority = 1;
    p->config = pc;
 
    action_selector = p;
@@ -1921,7 +1931,6 @@
 	  }
      }
 
-   /* if (input) TODO sort */
    if (p->items) return 1;
 
    return 0;
@@ -1976,7 +1985,7 @@
    pc = E_NEW(Plugin_Config, 1);
    pc->name = eina_stringshare_add(p->name);
    pc->enabled = 1;
-   pc->priority = 100;
+   pc->priority = -1;
    p->config = pc;
 
    return p;
@@ -2004,7 +2013,6 @@
      eina_list_free(p->items);
    p->items = NULL;
 
-   
    EINA_LIST_FOREACH(s->cur_plugins, l, plugin)
      {
 	for (cnt = 0, ll = plugin->items; ll && cnt < 15; ll = ll->next, cnt++)
@@ -2042,19 +2050,44 @@
    return NULL;
 }
 
+static void
+_evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p)
+{
+   Eina_List *l;
+   Evry_Plugin *plugin;
+   
+   EINA_LIST_FOREACH(s->cur_plugins, l, plugin)
+     if (p == plugin)
+       return;
+     else
+       if (p->config->priority < plugin->config->priority)
+       break;
+
+   if (l)
+     s->cur_plugins = eina_list_prepend_relative_list(s->cur_plugins, p, l);
+   else
+     s->cur_plugins = eina_list_append(s->cur_plugins, p);
+   
+}
+
 EAPI void
 evry_plugin_async_update(Evry_Plugin *p, int action)
 {
    Evry_State *s;
-
+   Evry_Plugin *agg;
+   
    if (!win) return;
 
    s = selector->state;
 
+   /* received data from a plugin of the current selector ? */
    if (!s || !eina_list_data_find(s->plugins, p)) return;
 
+   agg = selector->aggregator;
+   
    if (action == EVRY_ASYNC_UPDATE_ADD)
      {
+	/* remove plugin and update selector. */
 	if (!p->items)
 	  {
 	     if (!eina_list_data_find(s->cur_plugins, p)) return;
@@ -2064,82 +2097,71 @@
 	     if (p == s->plugin)
 	       {
 		  s->plugin = NULL;
-		  /* _evry_list_clear_list(s); */
 		  _evry_selector_update(selector);
-		  if (list->visible)
-		    _evry_list_tabs_update(s);
 	       }
-	     return;
 	  }
-	
-	if (!eina_list_data_find(s->cur_plugins, p))
+	else
 	  {
-	     s->cur_plugins = eina_list_append(s->cur_plugins, p);
-	     if (!s->plugin) _evry_select_plugin(s, p);
-	  }
+	     /* add plugin to current plugins*/
+	     _evry_plugin_list_insert(s, p);
 
-	if (eina_list_count(s->cur_plugins) > 1)
-	  {
-	     if (s->plugin == selector->aggregator)
-	       _evry_list_clear_list(s);
-
-	     selector->aggregator->fetch(selector->aggregator, NULL);
-	     
-	     if (!eina_list_data_find(s->cur_plugins, selector->aggregator))
+	     /* update aggregator */
+	     if (eina_list_count(s->cur_plugins) > 1)
 	       {
-		  s->cur_plugins = eina_list_prepend(s->cur_plugins,
-						     selector->aggregator);
-		  _evry_list_clear_list(s);
+		  if (s->plugin == agg)
+		    _evry_list_clear_list(s);
 
-		  s->plugin = selector->aggregator;
+		  agg->fetch(agg, NULL);
+
+		  /* add aggregator */
+		  if (!(s->cur_plugins->data == agg))
+		    {
+		       s->cur_plugins = eina_list_prepend(s->cur_plugins, agg);
+		       _evry_list_clear_list(s);
+		       s->plugin = agg;
+		    }
 	       }
-	  }
 
-	if (list->visible)
-	  _evry_list_tabs_update(s);
-	
-	if ((s->plugin == p) || (s->plugin == selector->aggregator))
-	  {
-	     p = s->plugin;
-	     
-	     if ((s->item_auto_selected) && (s->plugin->items->data != s->sel_item))
+	     /* plugin is active */
+	     if ((s->plugin == p) || (s->plugin == agg))
 	       {
-		  s->sel_item = NULL;
+		  p = s->plugin;
 		  _evry_selector_update(selector);
-	       }
 
-	     if (list->visible)
-	       {
-		  Eina_List *l;
-		  Evry_Item *it;
-		  evas_event_freeze(list->popup->evas);
-		  e_box_freeze(list->o_list);
-		  EINA_LIST_FOREACH(p->items, l, it)
-		    if (it->o_bg) e_box_unpack(it->o_bg); 
-	     
-		  e_box_thaw(list->o_list);
-		  evas_event_thaw(list->popup->evas);
-	       }
+		  if (list->visible)
+		    {
+		       Eina_List *l;
+		       Evry_Item *it;
+		       evas_event_freeze(list->popup->evas);
+		       e_box_freeze(list->o_list);
+		       EINA_LIST_FOREACH(p->items, l, it)
+			 if (it->o_bg) e_box_unpack(it->o_bg); 	     
+		       e_box_thaw(list->o_list);
+		       evas_event_thaw(list->popup->evas);
 
-	     _evry_list_show_items(s, p);
-
-	     if (list->visible && s->sel_item)
-	       {
-		  /* TODO check this again!*/
-		  _evry_list_item_sel(s, s->sel_item);
-		  _evry_list_scroll_to(s, s->sel_item); 
+		       _evry_list_show_items(s, p);
+		       _evry_list_scroll_to(s, s->sel_item); 		       
+		    }
 	       }
 	  }
-	else if (s->plugin)
+
+	/* plugin box was updated: realign */
+	if (s->plugin)
 	  {
+	     _evry_list_tabs_update(s);
 	     _evry_list_tab_scroll_to(s, s->plugin);
 	  }
-	
-	_evry_selector_update(selector);
      }
-   else if ((action == EVRY_ASYNC_UPDATE_CLEAR) && (s->plugin == p))
+   else if (action == EVRY_ASYNC_UPDATE_CLEAR)
      {
+	Evry_Plugin *tmp = s->plugin;
+
+	s->plugin = p;
 	_evry_list_clear_list(s);
+	s->plugin = tmp;
+
+	s->cur_plugins = eina_list_remove(s->cur_plugins, p);
+	agg->fetch(agg, NULL);
      }
 }
 

Modified: trunk/e/src/modules/everything/evry_plug_border.c
===================================================================
--- trunk/e/src/modules/everything/evry_plug_border.c	2009-08-12 17:57:34 UTC (rev 41714)
+++ trunk/e/src/modules/everything/evry_plug_border.c	2009-08-12 18:47:46 UTC (rev 41715)
@@ -85,12 +85,8 @@
 	       {
 		  if (e_util_glob_case_match(bd->desktop->exec, match1))
 		    _item_add(p, bd, 1);
-		  else if (e_util_glob_case_match(bd->desktop->exec, match2))
-		    _item_add(p, bd, 2);
 		  else if (e_util_glob_case_match(bd->desktop->name, match1))
 		    _item_add(p, bd, 1);
-		  else if (e_util_glob_case_match(bd->desktop->name, match2))
-		    _item_add(p, bd, 2);
 	       }
 	  }
      }

Modified: trunk/e/src/modules/everything/evry_plug_tracker.c
===================================================================
--- trunk/e/src/modules/everything/evry_plug_tracker.c	2009-08-12 17:57:34 UTC (rev 41714)
+++ trunk/e/src/modules/everything/evry_plug_tracker.c	2009-08-12 18:47:46 UTC (rev 41715)
@@ -10,16 +10,10 @@
   int active;
   char *condition;
   char *service;
-  /* Eina_List *items; */
   int max_hits;
 };
 
 static E_DBus_Connection *conn = NULL;
-
-/* static Evry_Plugin *p1 = NULL;
- * static Evry_Plugin *p2 = NULL;
- * static Evry_Plugin *p3 = NULL;
- * static Evry_Plugin *p4 = NULL; */
 static Eina_List *plugins = NULL;
 
 
@@ -136,10 +130,6 @@
 	return;
      }
 
-   /* evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_CLEAR);
-    * _cleanup(p);
-    *  */
-   
    dbus_message_iter_init(msg, &array);
    if(dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_ARRAY)
      {
@@ -155,9 +145,10 @@
 		  /* dbus_message_iter_get_basic(&iter, &service); */
 		  dbus_message_iter_next(&iter);
 		  dbus_message_iter_get_basic(&iter, &mime);
+
 		  /* dbus_message_iter_next(&iter);
-		   * dbus_message_iter_get_basic(&iter, &date); */
-		  /* printf("date: %s\n",date); */
+		   * dbus_message_iter_get_basic(&iter, &date);
+		   * printf("%s : %s\n",  date, uri); */
 		  
 		  if (uri && mime) _item_add(p, uri, mime, 1); 
 	       }
@@ -173,20 +164,22 @@
 {
    Inst *inst = p->private;
    DBusMessage *msg;
-   DBusMessageIter iter;
    int live_query_id = 0;
+   int max_hits = inst->max_hits;
    int offset = 0;
    int sort_descending = 1;
    int sort_by_service = 0;
+   int sort_by_access = 0;
    char *search_text;
    char *fields[2];
    char *keywords[1];
    char *sort_fields[1];   
    fields[0] = "File:Mime";
+   /* fields[1] = "File:Modified"; */
    fields[1] = "File:Accessed";
    keywords[0] = "";
-   sort_fields[0] = "";
-   
+   /* sort_fields[0] = "File:Modified"; */
+   sort_fields[0] = "File:Accessed";
    char **_fields = fields;
    char **_keywords = keywords;
    char **_sort_fields = sort_fields;
@@ -194,15 +187,17 @@
    _cleanup(p);
 
    if (!conn) return 0;
-   /* if (!input || (strlen(input) < 3)) return 0; */
 
    if (input && (strlen(input) > 2)) 
      {	
 	search_text = malloc(sizeof(char) * strlen(input) + 3);
 	sprintf(search_text, "*%s*", input);
+	max_hits = 50;
      }
-   else if (!p->begin)
+   else if (!p->begin && p->type == type_object)
      {
+	
+	sort_by_access = 1;
 	search_text = "";
      }
    else return 0;
@@ -216,15 +211,15 @@
    dbus_message_append_args(msg,
 			    DBUS_TYPE_INT32,   &live_query_id,
 			    DBUS_TYPE_STRING,  &inst->service,
-			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING, &_fields, 1,
+			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING, &_fields, 1 + sort_by_access,
 			    DBUS_TYPE_STRING,  &search_text,
 			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING, &_keywords, 0,
 			    DBUS_TYPE_STRING,  &inst->condition,
 			    DBUS_TYPE_BOOLEAN, &sort_by_service,
-			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING, &_sort_fields, 0,
+			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING, &_sort_fields, sort_by_access,
 			    DBUS_TYPE_BOOLEAN, &sort_descending,
 			    DBUS_TYPE_INT32,   &offset,
-			    DBUS_TYPE_INT32,   &inst->max_hits,
+			    DBUS_TYPE_INT32,   &max_hits,
 			    DBUS_TYPE_INVALID);
 
    e_dbus_message_send(conn, msg, _dbus_cb_reply, -1, p);
@@ -304,61 +299,11 @@
    _plugin_new("Music",      type_subject, "Music", 20, 0);
    _plugin_new("Videos",     type_subject, "Videos", 20, 0);
    _plugin_new("Documents",  type_subject, "Documents", 20, 0);
-   _plugin_new("Text",       type_subject, "Text Files", 20, 0);
+   _plugin_new("Text",       type_subject, "TextFiles", 20, 0);
 
    _plugin_new("Find Files", type_object,  "Files", 20, 1);
    _plugin_new("Folders",    type_object,  "Folders", 20, 0);
    
-   
-   /* p = E_NEW(Evry_Plugin, 1);
-    * p->name = "Images";
-    * p->type = type_subject;
-    * p->type_in = "NONE";
-    * p->type_out = "FILE";
-    * p->async_query = 1;
-    * p->fetch = &_fetch;
-    * p->cleanup = &_cleanup;
-    * p->icon_get = &_item_icon_get;
-    * inst = E_NEW(Inst, 1);
-    * inst->condition = "";
-    * inst->service = "Images";
-    * inst->results = 10;
-    * p->private = inst;
-    * evry_plugin_register(p);
-    * plugins = eina_list_append(plugins, p);
-    * 
-    * p = E_NEW(Evry_Plugin, 1);
-    * p->name = "Find Files";
-    * p->type = type_object;
-    * p->type_in = "NONE";
-    * p->type_out = "FILE";
-    * p->async_query = 1;
-    * p->begin = &_begin;
-    * p->fetch = &_fetch;
-    * p->cleanup = &_cleanup;
-    * p->icon_get = &_item_icon_get;
-    * inst = E_NEW(Inst, 1);
-    * inst->condition = "";
-    * inst->service = "Files";
-    * p->private = inst;
-    * evry_plugin_register(p);
-    * plugins = eina_list_append(plugins, p);
-    * 
-    * p4 = E_NEW(Evry_Plugin, 1);
-    * p4->name = "Folders";
-    * p4->type = type_object;
-    * p4->type_in = "NONE";
-    * p4->type_out = "FILE";
-    * p4->async_query = 1;
-    * p4->fetch = &_fetch;
-    * p4->cleanup = &_cleanup;
-    * p4->icon_get = &_item_icon_get;
-    * inst = E_NEW(Inst, 1);
-    * inst->condition = "";
-    * inst->service = "Folders";
-    * p4->private = inst;
-    * evry_plugin_register(p4); */
-
    return EINA_TRUE;
 }
 





Thread: E SVN: jeffdameth trunk/e/src/modules/everything (Page 3)

enlightenment-svn