yay jeffdameth is alive! Daniel Juyung Seo (SeoZ)
On Fri, Nov 2, 2012 at 12:02 AM, Enlightenment SVN < no-re...@enlightenment.org> wrote: > Log: > e17/evry: exebuf name some variables by what they do > - fix segv in config dialog. did e_widget change? > i beleive e_widget_entry_add(e, &(page->trigger)) must have always > set page->trigger to be not null > ... just in case there are other places where this was not chacked > before > > > Author: jeffdameth > Date: 2012-11-01 08:02:03 -0700 (Thu, 01 Nov 2012) > New Revision: 78793 > Trac: http://trac.enlightenment.org/e/changeset/78793 > > Modified: > trunk/e/src/modules/everything/evry_config.c > trunk/e/src/modules/everything/evry_plug_apps.c > > Modified: trunk/e/src/modules/everything/evry_config.c > =================================================================== > --- trunk/e/src/modules/everything/evry_config.c 2012-11-01 > 14:58:46 UTC (rev 78792) > +++ trunk/e/src/modules/everything/evry_config.c 2012-11-01 > 15:02:03 UTC (rev 78793) > @@ -165,7 +165,7 @@ > > if (pc) > { > - if (cfdata->page[i].trigger[0]) > + if (cfdata->page[i].trigger && cfdata->page[i].trigger[0]) > eina_stringshare_replace(&pc->trigger, > cfdata->page[i].trigger); > else > eina_stringshare_replace(&pc->trigger, NULL); > > Modified: trunk/e/src/modules/everything/evry_plug_apps.c > =================================================================== > --- trunk/e/src/modules/everything/evry_plug_apps.c 2012-11-01 > 14:58:46 UTC (rev 78792) > +++ trunk/e/src/modules/everything/evry_plug_apps.c 2012-11-01 > 15:02:03 UTC (rev 78793) > @@ -12,6 +12,9 @@ > * #define DBG(...) ERR(__VA_ARGS__) */ > > #define MAX_ITEMS 200 > +#define MAX_EXE 50 > +#define DEFAULT_MATCH_PRIORITY 15 > +#define PREFIX_MATCH_PRIORITY 11 > > typedef struct _Plugin Plugin; > typedef struct _Module_Config Module_Config; > @@ -233,11 +236,11 @@ > Eina_List *l; > Evry_Item *eit; > History_Types *ht; > - unsigned int len = (input ? strlen(input) : 0); > + unsigned int input_len = (input ? strlen(input) : 0); > double max = 0.0; > - const char *tmp, *file = NULL; > - unsigned int min = 0, cnt = 0, end = len, tmp_len; > - unsigned int query = (len >= (unsigned int)plugin->config->min_query); > + const char *tmp, *first_match = NULL; > + unsigned int min = 0, cnt = 0, end = input_len; > + Eina_Bool query = (input_len >= (unsigned > int)plugin->config->min_query); > EVRY_PLUGIN_ITEMS_CLEAR(p); > > p->input = input; > @@ -247,45 +250,49 @@ > > if (input) > { > + const char *cmd; > + > + // begin of arguments (end of executable part) > if ((tmp = strchr(input, ' '))) > end = tmp - input; > > if ((!exe_list) && (!exe_scan_idler)) > _scan_executables(); > - > - EINA_LIST_FOREACH (exe_list, l, tmp) > + > + EINA_LIST_FOREACH (exe_list, l, cmd) > { > - tmp_len = strlen(tmp); > + unsigned int cmd_len = strlen(cmd); > > - if ((end < len) && (tmp_len > end)) > + if ((end < input_len) && (cmd_len > end)) > continue; > > - if (!strncmp(input, tmp, end)) > + if (!strncmp(input, cmd, end)) > { > - if (query && (cnt++ < 50) && (len != tmp_len)) > - _item_exe_add(p, tmp, 15); > + if (query && (cnt++ < MAX_EXE) && (input_len != > cmd_len)) > + _item_exe_add(p, cmd, DEFAULT_MATCH_PRIORITY); > > - if ((!min) || (tmp_len < min)) > + if ((!min) || (cmd_len < min)) > { > - min = tmp_len; > - file = tmp; > + min = cmd_len; > + first_match = cmd; > } > - if ((!query) && (tmp_len == len)) > + > + if ((!query) && (cmd_len == input_len)) > break; > } > } > > - if (file) > + if (first_match) > { > GET_ITEM(it, p->command); > > - if (strlen(file) < len) > - file = input; > + if (strlen(first_match) < input_len) > + first_match = input; > > - EVRY_ITEM_LABEL_SET(it, file); > + EVRY_ITEM_LABEL_SET(it, first_match); > IF_RELEASE(p->command->file); > p->command->file = eina_stringshare_ref(it->label); > - it->fuzzy_match = 11; // prefix match > + it->fuzzy_match = PREFIX_MATCH_PRIORITY; > EVRY_PLUGIN_ITEM_APPEND(p, it); > evry->item_changed(it, 0, 0); > } > @@ -294,7 +301,7 @@ > EINA_LIST_FOREACH (plugin->items, l, eit) > { > evry->history_item_usage_set(eit, input, NULL); > - if (input && (eit->usage > max) && !strncmp(input, eit->label, > len)) > + if (input && (eit->usage > max) && !strncmp(input, eit->label, > input_len)) > max = eit->usage; > } > EVRY_ITEM(p->command)->usage = (max * 2.0); > > > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_sfd2d_oct > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
