enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

formatting 

SVN revision: 72941
This commit is contained in:
Mike Blumenkrantz 2012-06-27 12:19:00 +00:00
parent bbdb3c7b05
commit afa152690c
1 changed files with 463 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bin/e_utils.c
View File

@ -144,10 +144,12 @@ e_util_glob_case_match(const char *str, const char *pattern)
} }
if (!strcmp(pattern, "*")) return 1; if (!strcmp(pattern, "*")) return 1;
tstr = alloca(strlen(str) + 1); tstr = alloca(strlen(str) + 1);
for (tp = tstr, p = str; *p != 0; p++, tp++) *tp = tolower(*p); for (tp = tstr, p = str; *p != 0; p++, tp++)
*tp = tolower(*p);
*tp = 0; *tp = 0;
tglob = alloca(strlen(pattern) + 1); tglob = alloca(strlen(pattern) + 1);
for (tp = tglob, p = pattern; *p != 0; p++, tp++) *tp = tolower(*p); for (tp = tglob, p = pattern; *p != 0; p++, tp++)
*tp = tolower(*p);
*tp = 0; *tp = 0;
if (!fnmatch(tglob, tstr, 0)) return 1; if (!fnmatch(tglob, tstr, 0)) return 1;
return 0; return 0;
@ -393,7 +395,6 @@ e_util_edje_icon_check(const char *name)
return 0; return 0;
} }
/* WARNING This function is deprecated,. must be made static. /* WARNING This function is deprecated,. must be made static.
* You should use e_util_icon_theme_set instead * You should use e_util_icon_theme_set instead
*/ */
@ -601,10 +602,14 @@ e_util_desk_border_above(E_Border *bd)
E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, NULL); E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, NULL);
if (bd->layer == 0) pos = 0; if (bd->layer == 0) pos = 0;
else if ((bd->layer > 0) && (bd->layer <= 50)) pos = 1; else if ((bd->layer > 0) && (bd->layer <= 50))
else if ((bd->layer > 50) && (bd->layer <= 100)) pos = 2; pos = 1;
else if ((bd->layer > 100) && (bd->layer <= 150)) pos = 3; else if ((bd->layer > 50) && (bd->layer <= 100))
else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4; pos = 2;
else if ((bd->layer > 100) && (bd->layer <= 150))
pos = 3;
else if ((bd->layer > 150) && (bd->layer <= 200))
pos = 4;
else pos = 5; else pos = 5;
EINA_LIST_FOREACH(eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd), l, bd2) EINA_LIST_FOREACH(eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd), l, bd2)
@ -642,10 +647,14 @@ e_util_desk_border_below(E_Border *bd)
E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, NULL); E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, NULL);
if (bd->layer == 0) pos = 0; if (bd->layer == 0) pos = 0;
else if ((bd->layer > 0) && (bd->layer <= 50)) pos = 1; else if ((bd->layer > 0) && (bd->layer <= 50))
else if ((bd->layer > 50) && (bd->layer <= 100)) pos = 2; pos = 1;
else if ((bd->layer > 100) && (bd->layer <= 150)) pos = 3; else if ((bd->layer > 50) && (bd->layer <= 100))
else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4; pos = 2;
else if ((bd->layer > 100) && (bd->layer <= 150))
pos = 3;
else if ((bd->layer > 150) && (bd->layer <= 200))
pos = 4;
else pos = 5; else pos = 5;
for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd); l; l = l->prev) for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd); l; l = l->prev)
@ -1349,7 +1358,6 @@ e_util_image_import(const char *image_path, const char *edje_path, const char *e
" min: %d %d;\n" " min: %d %d;\n"
" max: %d %d;\n", " max: %d %d;\n",
w, h, w, h); w, h, w, h);
} }
else if ((mode == E_IMAGE_IMPORT_SCALE_ASPECT_IN) || else if ((mode == E_IMAGE_IMPORT_SCALE_ASPECT_IN) ||
(mode == E_IMAGE_IMPORT_SCALE_ASPECT_OUT)) (mode == E_IMAGE_IMPORT_SCALE_ASPECT_OUT))
@ -1652,3 +1660,4 @@ e_util_fullscreen_any(void)
} }
return EINA_FALSE; return EINA_FALSE;
} }