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

remove manager number from e_bg functions 

this is no longer relevant; related code will be removed soon
This commit is contained in:
Mike Blumenkrantz 2015-03-18 19:12:32 -04:00
parent bc087bd6f9
commit dbcd03044e
12 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_bg.c
View File

@ -76,7 +76,7 @@ e_bg_shutdown(void)
* The most specific match will be returned
*/
EAPI const E_Config_Desktop_Background *
e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
e_bg_config_get(int zone_num, int desk_x, int desk_y)
{
Eina_List *l, *entries;
E_Config_Desktop_Background *bg = NULL, *cfbg = NULL;
@ -85,7 +85,7 @@ e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
int current_spec = 0; /* how specific the setting is - we want the least general one that applies */
/* look for desk specific background. */
if (manager_num >= 0 || zone_num >= 0 || desk_x >= 0 || desk_y >= 0)
if (zone_num >= 0 || desk_x >= 0 || desk_y >= 0)
{
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
{
@ -93,9 +93,6 @@ e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
if (!cfbg) continue;
spec = 0;
if (cfbg->manager == manager_num) spec++;
else if (cfbg->manager >= 0)
continue;
if (cfbg->zone == zone_num) spec++;
else if (cfbg->zone >= 0)
continue;
@ -144,13 +141,13 @@ e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
}
EAPI Eina_Stringshare *
e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y)
e_bg_file_get(int zone_num, int desk_x, int desk_y)
{
const E_Config_Desktop_Background *cfbg;
const char *bgfile = NULL;
int ok = 0;
cfbg = e_bg_config_get(manager_num, zone_num, desk_x, desk_y);
cfbg = e_bg_config_get(zone_num, desk_x, desk_y);
/* fall back to default */
if (cfbg)
@ -208,9 +205,9 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
desk = e_desk_current_get(zone);
if (desk)
bgfile = e_bg_file_get(e_comp->num, zone->num, desk->x, desk->y);
bgfile = e_bg_file_get(zone->num, desk->x, desk->y);
else
bgfile = e_bg_file_get(e_comp->num, zone->num, -1, -1);
bgfile = e_bg_file_get(zone->num, -1, -1);
if (zone->bg_object)
{

4
src/bin/e_bg.h
View File

@ -28,8 +28,8 @@ struct _E_Event_Bg_Update
EINTERN int e_bg_init(void);
EINTERN int e_bg_shutdown(void);
EAPI const E_Config_Desktop_Background *e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y);
EAPI Eina_Stringshare *e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y);
EAPI const E_Config_Desktop_Background *e_bg_config_get(int zone_num, int desk_x, int desk_y);
EAPI Eina_Stringshare *e_bg_file_get(int zone_num, int desk_x, int desk_y);
EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
EAPI void e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file);
EAPI void e_bg_del(int manager, int zone, int desk_x, int desk_y);

2
src/bin/e_int_client_menu.c
View File

@ -944,7 +944,7 @@ _e_client_menu_cb_sendto_icon_pre(void *data, E_Menu *m, E_Menu_Item *mi)
tw = 50;
th = (tw * desk->zone->h) / desk->zone->w;
bgfile = e_bg_file_get(e_comp->num, desk->zone->num,
bgfile = e_bg_file_get(desk->zone->num,
desk->x, desk->y);
o = e_thumb_icon_add(m->evas);
e_thumb_icon_file_set(o, bgfile, "e/desktop/background");

2
src/bin/e_int_menus.c
View File

@ -1102,7 +1102,7 @@ _e_int_menus_virtuals_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi)
tw = 50;
th = (tw * desk->zone->h) / desk->zone->w;
bgfile = e_bg_file_get(e_comp->num, desk->zone->num, desk->x, desk->y);
bgfile = e_bg_file_get(desk->zone->num, desk->x, desk->y);
o = e_thumb_icon_add(m->evas);
e_thumb_icon_file_set(o, bgfile, "e/desktop/background");
eina_stringshare_del(bgfile);

4
src/bin/e_widget_bgpreview.c
View File

@ -71,7 +71,7 @@ e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y)
E_Widget_Desk_Data *dd;
const char *bgfile;
bgfile = e_bg_file_get(e_comp->num, zone->num, x, y);
bgfile = e_bg_file_get(zone->num, x, y);
dd = E_NEW(E_Widget_Desk_Data, 1);
dd->manager = e_comp->num;
@ -312,7 +312,7 @@ _e_wid_cb_bg_update(void *data, int type, void *event)
{
const char *bgfile;
bgfile = e_bg_file_get(dd->manager, dd->zone, dd->x, dd->y);
bgfile = e_bg_file_get(dd->zone, dd->x, dd->y);
edje_object_file_set(dd->thumb, bgfile, "e/desktop/background");
eina_stringshare_del(bgfile);
}

2
src/modules/conf_bindings/e_int_config_edgebindings.c
View File

@ -916,7 +916,7 @@ _edge_grab_wnd_show(E_Config_Dialog_Data *cfdata)
e_dialog_content_set(cfdata->locals.dia, o, minw, minh);
bgfile = e_bg_file_get(0, 0, 0, 0);
bgfile = e_bg_file_get(0, 0, 0);
obg = e_thumb_icon_add(evas);
e_icon_fill_inside_set(obg, 0);
e_thumb_icon_file_set(obg, bgfile, "e/desktop/background");

4
src/modules/conf_display/e_int_config_desk.c
View File

@ -61,7 +61,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
char name[40];
int ok = 0;
E_Config_Desktop_Window_Profile *prof;
cfdata->bg = e_bg_file_get(cfdata->man_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
cfdata->bg = e_bg_file_get(cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
for (l = e_config->desktop_names; l; l = l->next)
{
@ -230,7 +230,7 @@ _cb_bg_change(void *data, int type, void *event)
if (ev->desk_x != cfdata->desk_x) return ECORE_CALLBACK_PASS_ON;
if (ev->desk_y != cfdata->desk_y) return ECORE_CALLBACK_PASS_ON;
file = e_bg_file_get(cfdata->man_num, cfdata->zone_num,
file = e_bg_file_get(cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y);
eina_stringshare_replace(&cfdata->bg, file);
e_widget_preview_edje_set(cfdata->preview, cfdata->bg,

2
src/modules/conf_randr/e_smart_monitor.c
View File

@ -881,7 +881,7 @@ _e_smart_monitor_background_set(E_Smart_Data *sd, int dx, int dy)
if (!sd) return;
/* try to get the background file for this desktop */
if ((bg = e_bg_file_get(sd->man_num, sd->zone_num, dx, dy)))
if ((bg = e_bg_file_get(sd->zone_num, dx, dy)))
{
Evas_Object *o;

2
src/modules/conf_theme/e_int_config_scale.c
View File

@ -98,7 +98,7 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp
e_widget_preview_vsize_set(ob, SZW, SZH);
bg = edje_object_add(e_widget_preview_evas_get(ob));
file = e_bg_file_get(0, 0, 0, 0);
file = e_bg_file_get(0, 0, 0);
edje_object_file_set(bg, file, "e/desktop/background");
eina_stringshare_del(file);
evas_object_move(bg, 0, 0);

4
src/modules/conf_theme/e_int_config_wallpaper.c
View File

@ -333,7 +333,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
if (cw->specific_config)
{
/* specific config passed in. set for that only */
cfdata->bg = e_bg_file_get(cw->man_num, cw->zone_num, cw->desk_x, cw->desk_y);
cfdata->bg = e_bg_file_get(cw->zone_num, cw->desk_x, cw->desk_y);
}
else
{
@ -344,7 +344,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
zone = e_zone_current_get();
desk = e_desk_current_get(zone);
cfbg = e_bg_config_get(e_comp->num, zone->num, desk->x, desk->y);
cfbg = e_bg_config_get(zone->num, desk->x, desk->y);
/* if we have a config for this bg, use it. */
if (cfbg)
{

2
src/modules/pager_plain/e_mod_main.c
View File

@ -409,7 +409,7 @@ _pager_desk_livethumb_setup(Pager_Desk *pd)
o = e_livethumb_thumb_get(pd->o_bg);
if (!o) o = edje_object_add(e_livethumb_evas_get(pd->o_bg));
bgfile = e_bg_file_get(e_comp->num, pd->desk->zone->num, pd->desk->x, pd->desk->y);
bgfile = e_bg_file_get(pd->desk->zone->num, pd->desk->x, pd->desk->y);
edje_object_file_set(o, bgfile, "e/desktop/background");
e_livethumb_thumb_set(pd->o_bg, o);
eina_stringshare_del(bgfile);

2
src/modules/wizard/page_050.c
View File

@ -63,7 +63,7 @@ _scale_preview_new(Evas *e, double sc, double *scp)
e_widget_preview_vsize_set(ob, SZW, SZH);
bg = edje_object_add(e_widget_preview_evas_get(ob));
file = e_bg_file_get(0, 0, 0, 0);
file = e_bg_file_get(0, 0, 0);
edje_object_file_set(bg, file, "e/desktop/background");
eina_stringshare_del(file);
evas_object_move(bg, 0, 0);