forked from enlightenment/enlightenment
parent
bbdb3c7b05
commit
afa152690c
|
@ -1,13 +1,13 @@
|
|||
#include "e.h"
|
||||
|
||||
EAPI E_Path *path_data = NULL;
|
||||
EAPI E_Path *path_images = NULL;
|
||||
EAPI E_Path *path_fonts = NULL;
|
||||
EAPI E_Path *path_themes = NULL;
|
||||
EAPI E_Path *path_icons = NULL;
|
||||
EAPI E_Path *path_modules = NULL;
|
||||
EAPI E_Path *path_backgrounds = NULL;
|
||||
EAPI E_Path *path_messages = NULL;
|
||||
EAPI E_Path * path_data = NULL;
|
||||
EAPI E_Path * path_images = NULL;
|
||||
EAPI E_Path * path_fonts = NULL;
|
||||
EAPI E_Path * path_themes = NULL;
|
||||
EAPI E_Path * path_icons = NULL;
|
||||
EAPI E_Path * path_modules = NULL;
|
||||
EAPI E_Path * path_backgrounds = NULL;
|
||||
EAPI E_Path * path_messages = NULL;
|
||||
|
||||
typedef struct _E_Util_Fake_Mouse_Up_Info E_Util_Fake_Mouse_Up_Info;
|
||||
typedef struct _E_Util_Image_Import_Settings E_Util_Image_Import_Settings;
|
||||
|
@ -144,10 +144,12 @@ e_util_glob_case_match(const char *str, const char *pattern)
|
|||
}
|
||||
if (!strcmp(pattern, "*")) return 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;
|
||||
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;
|
||||
if (!fnmatch(tglob, tstr, 0)) return 1;
|
||||
return 0;
|
||||
|
@ -393,7 +395,6 @@ e_util_edje_icon_check(const char *name)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* WARNING This function is deprecated,. must be made static.
|
||||
* You should use e_util_icon_theme_set instead
|
||||
*/
|
||||
|
@ -485,7 +486,7 @@ _e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name, Eina_Bool fal
|
|||
|
||||
if ((!name) || (!name[0])) return 0;
|
||||
|
||||
if ((!fallback) && (name[0]=='/') && ecore_file_exists(name))
|
||||
if ((!fallback) && (name[0] == '/') && ecore_file_exists(name))
|
||||
{
|
||||
e_menu_item_icon_edje_set(mi, name, "icon");
|
||||
return 1;
|
||||
|
@ -601,15 +602,19 @@ e_util_desk_border_above(E_Border *bd)
|
|||
E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, NULL);
|
||||
|
||||
if (bd->layer == 0) pos = 0;
|
||||
else if ((bd->layer > 0) && (bd->layer <= 50)) pos = 1;
|
||||
else if ((bd->layer > 50) && (bd->layer <= 100)) pos = 2;
|
||||
else if ((bd->layer > 100) && (bd->layer <= 150)) pos = 3;
|
||||
else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
|
||||
else if ((bd->layer > 0) && (bd->layer <= 50))
|
||||
pos = 1;
|
||||
else if ((bd->layer > 50) && (bd->layer <= 100))
|
||||
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;
|
||||
|
||||
EINA_LIST_FOREACH(eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd), l, bd2)
|
||||
{
|
||||
if(!eina_list_next(l) || above) break;
|
||||
if (!eina_list_next(l) || above) break;
|
||||
above = eina_list_data_get(eina_list_next(l));
|
||||
if ((above->desk != bd->desk) && (!above->sticky))
|
||||
above = NULL;
|
||||
|
@ -642,10 +647,14 @@ e_util_desk_border_below(E_Border *bd)
|
|||
E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, NULL);
|
||||
|
||||
if (bd->layer == 0) pos = 0;
|
||||
else if ((bd->layer > 0) && (bd->layer <= 50)) pos = 1;
|
||||
else if ((bd->layer > 50) && (bd->layer <= 100)) pos = 2;
|
||||
else if ((bd->layer > 100) && (bd->layer <= 150)) pos = 3;
|
||||
else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
|
||||
else if ((bd->layer > 0) && (bd->layer <= 50))
|
||||
pos = 1;
|
||||
else if ((bd->layer > 50) && (bd->layer <= 100))
|
||||
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;
|
||||
|
||||
for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd); l; l = l->prev)
|
||||
|
@ -1081,7 +1090,7 @@ e_util_winid_str_get(Ecore_X_Window win)
|
|||
id[4] = vals[(val >> 12) & 0xf];
|
||||
id[5] = vals[(val >> 8) & 0xf];
|
||||
id[6] = vals[(val >> 4) & 0xf];
|
||||
id[7] = vals[(val ) & 0xf];
|
||||
id[7] = vals[(val) & 0xf];
|
||||
id[8] = 0;
|
||||
return id;
|
||||
}
|
||||
|
@ -1349,7 +1358,6 @@ e_util_image_import(const char *image_path, const char *edje_path, const char *e
|
|||
" min: %d %d;\n"
|
||||
" max: %d %d;\n",
|
||||
w, h, w, h);
|
||||
|
||||
}
|
||||
else if ((mode == E_IMAGE_IMPORT_SCALE_ASPECT_IN) ||
|
||||
(mode == E_IMAGE_IMPORT_SCALE_ASPECT_OUT))
|
||||
|
@ -1554,7 +1562,7 @@ _e_util_conf_timer_old(void *data)
|
|||
"You can re-configure things now to your<br>"
|
||||
"liking. Sorry for the inconvenience.<br>");
|
||||
|
||||
snprintf(buf, sizeof(buf),N_("%s Configuration Updated"), module_name);
|
||||
snprintf(buf, sizeof(buf), N_("%s Configuration Updated"), module_name);
|
||||
e_util_dialog_internal(buf, msg);
|
||||
E_FREE(module_name);
|
||||
|
||||
|
@ -1578,7 +1586,7 @@ _e_util_conf_timer_new(void *data)
|
|||
"restored to<br>defaults. Sorry for the "
|
||||
"inconvenience.<br>");
|
||||
|
||||
snprintf(buf, sizeof(buf),N_("%s Configuration Updated"), module_name);
|
||||
snprintf(buf, sizeof(buf), N_("%s Configuration Updated"), module_name);
|
||||
e_util_dialog_internal(buf, msg);
|
||||
E_FREE(module_name);
|
||||
|
||||
|
@ -1652,3 +1660,4 @@ e_util_fullscreen_any(void)
|
|||
}
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue