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

remove manager/container id from bg/wallpaper things

This commit is contained in:
Mike Blumenkrantz 2015-03-19 16:54:50 -04:00
parent 58447e9508
commit b6eb319146
10 changed files with 56 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/tools/enlightenment_remote
View File

@ -342,14 +342,14 @@ er_desktop_show_by_name(){
# E Desktop background add
#-------------------------------------------------------------------------------
er_desktop_bg_add(){
ERCIIIIS org.enlightenment.wm.Desktop.Background.Add "$2" "$3" "$4" "$5" "$6"
ERCIIIIS org.enlightenment.wm.Desktop.Background.Add "$2" "$3" "$4" "$5"
}
#-------------------------------------------------------------------------------
# E Desktop background del
#-------------------------------------------------------------------------------
er_desktop_bg_del(){
ERCIIII org.enlightenment.wm.Desktop.Background.Del "$2" "$3" "$4" "$5"
ERCIIII org.enlightenment.wm.Desktop.Background.Del "$2" "$3" "$4"
}
#-------------------------------------------------------------------------------

14
src/bin/e_bg.c
View File

@ -319,7 +319,6 @@ e_bg_default_set(const char *file)
e_config->desktop_default_background = NULL;
ev = E_NEW(E_Event_Bg_Update, 1);
ev->manager = -1;
ev->zone = -1;
ev->desk_x = -1;
ev->desk_y = -1;
@ -327,7 +326,7 @@ e_bg_default_set(const char *file)
}
EAPI void
e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
e_bg_add(int zone, int desk_x, int desk_y, const char *file)
{
const Eina_List *l;
E_Config_Desktop_Background *cfbg;
@ -338,7 +337,6 @@ e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
{
if ((cfbg) &&
(cfbg->manager == manager) &&
(cfbg->zone == zone) &&
(cfbg->desk_x == desk_x) &&
(cfbg->desk_y == desk_y) &&
@ -349,9 +347,8 @@ e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
}
}
e_bg_del(manager, zone, desk_x, desk_y);
e_bg_del(zone, desk_x, desk_y);
cfbg = E_NEW(E_Config_Desktop_Background, 1);
cfbg->manager = manager;
cfbg->zone = zone;
cfbg->desk_x = desk_x;
cfbg->desk_y = desk_y;
@ -361,7 +358,6 @@ e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
e_filereg_register(cfbg->file);
ev = E_NEW(E_Event_Bg_Update, 1);
ev->manager = manager;
ev->zone = zone;
ev->desk_x = desk_x;
ev->desk_y = desk_y;
@ -369,7 +365,7 @@ 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)
e_bg_del(int zone, int desk_x, int desk_y)
{
Eina_List *l;
E_Config_Desktop_Background *cfbg;
@ -378,8 +374,7 @@ e_bg_del(int manager, int zone, int desk_x, int desk_y)
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
{
if (!cfbg) continue;
if ((cfbg->manager == manager) && (cfbg->zone == zone) &&
(cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
if ((cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
{
e_config->desktop_backgrounds = eina_list_remove_list(e_config->desktop_backgrounds, l);
e_filereg_deregister(cfbg->file);
@ -390,7 +385,6 @@ e_bg_del(int manager, int zone, int desk_x, int desk_y)
}
ev = E_NEW(E_Event_Bg_Update, 1);
ev->manager = manager;
ev->zone = zone;
ev->desk_x = desk_x;
ev->desk_y = desk_y;

5
src/bin/e_bg.h
View File

@ -19,7 +19,6 @@ extern EAPI int E_EVENT_BG_UPDATE;
struct _E_Event_Bg_Update
{
int manager;
int zone;
int desk_x;
int desk_y;
@ -31,8 +30,8 @@ EINTERN int e_bg_shutdown(void);
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);
EAPI void e_bg_add(int zone, int desk_x, int desk_y, const char *file);
EAPI void e_bg_del(int zone, int desk_x, int desk_y);
EAPI void e_bg_default_set(const char *file);
EAPI void e_bg_update(void);

2
src/bin/e_config.c
View File

@ -203,8 +203,6 @@ _e_config_edd_init(Eina_Bool old)
#undef D
#define T E_Config_Desktop_Background
#define D _e_config_desktop_bg_edd
EET_DATA_DESCRIPTOR_ADD_BASIC(D, T, "container", manager, EET_T_INT);
E_CONFIG_VAL(D, T, manager /*container */, INT);
E_CONFIG_VAL(D, T, zone, INT);
E_CONFIG_VAL(D, T, desk_x, INT);
E_CONFIG_VAL(D, T, desk_y, INT);

1
src/bin/e_config.h
View File

@ -542,7 +542,6 @@ struct _E_Config_Binding_Acpi
struct _E_Config_Desktop_Background
{
int manager;
int zone;
int desk_x;
int desk_y;

1
src/bin/e_desklock.c
View File

@ -105,7 +105,6 @@ e_desklock_user_wallpaper_get(E_Zone *zone)
desk = e_desk_current_get(zone);
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cdbg)
{
if ((cdbg->manager > -1) && (cdbg->manager != (int)e_comp->num)) continue;
if ((cdbg->zone > -1) && (cdbg->zone != (int)zone->num)) continue;
if ((cdbg->desk_x > -1) && (cdbg->desk_x != desk->x)) continue;
if ((cdbg->desk_y > -1) && (cdbg->desk_y != desk->y)) continue;

10
src/bin/e_widget_bgpreview.c
View File

@ -11,7 +11,7 @@ typedef struct _E_Widget_Desk_Data E_Widget_Desk_Data;
struct _E_Widget_Desk_Data
{
Evas_Object *icon, *thumb, *live;
int zone, manager, x, y;
int zone, x, y;
Ecore_Event_Handler *bg_upd_hdl;
Ecore_Job *resize_job;
Eina_Bool configurable : 1;
@ -74,7 +74,6 @@ e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y)
bgfile = e_bg_file_get(zone->num, x, y);
dd = E_NEW(E_Widget_Desk_Data, 1);
dd->manager = e_comp->num;
dd->zone = zone->num;
dd->x = x;
dd->y = y;
@ -280,8 +279,8 @@ _e_wid_desk_cb_config(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_
{
char buff[256];
snprintf(buff, sizeof(buff), "%i %i %i %i",
dd->manager, dd->zone, dd->x, dd->y);
snprintf(buff, sizeof(buff), "%i %i %i",
dd->zone, dd->x, dd->y);
e_configure_registry_call("internal/desk", NULL, buff);
}
}
@ -305,8 +304,7 @@ _e_wid_cb_bg_update(void *data, int type, void *event)
if (!(dd = data)) return ECORE_CALLBACK_PASS_ON;
ev = event;
if (((ev->manager < 0) || (dd->manager == ev->manager)) &&
((ev->zone < 0) || (dd->zone == ev->zone)) &&
if (((ev->zone < 0) || (dd->zone == ev->zone)) &&
((ev->desk_x < 0) || (dd->x == ev->desk_x)) &&
((ev->desk_y < 0) || (dd->y == ev->desk_y)))
{

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

@ -30,7 +30,7 @@ e_int_config_desk(Evas_Object *parent EINA_UNUSED, const char *params)
if (!params) return NULL;
man_num = zone_num = dx = dy = -1;
if (sscanf(params, "%i %i %i %i", &man_num, &zone_num, &dx, &dy) != 4)
if (sscanf(params, "%i %i %i", &zone_num, &dx, &dy) != 4)
return NULL;
if (e_config_dialog_find("E", "internal/desk")) return NULL;
@ -151,8 +151,8 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
e_desk_window_profile_add(cfdata->man_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y, cfdata->profile);
e_desk_window_profile_update();
e_bg_del(cfdata->man_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
e_bg_add(cfdata->man_num, cfdata->zone_num,
e_bg_del(cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
e_bg_add(cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y, cfdata->bg);
e_bg_update();
@ -209,8 +209,8 @@ _cb_config(void *data, void *data2 EINA_UNUSED)
cfdata = data;
if (!cfdata) return;
snprintf(buf, sizeof(buf), "%i %i %i %i",
cfdata->man_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
snprintf(buf, sizeof(buf), "%i %i %i",
cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
e_configure_registry_call("internal/wallpaper_desk", NULL, buf);
}
@ -225,7 +225,6 @@ _cb_bg_change(void *data, int type, void *event)
cfdata = data;
ev = event;
if (ev->manager != cfdata->man_num) return ECORE_CALLBACK_PASS_ON;
if (ev->zone != cfdata->zone_num) return ECORE_CALLBACK_PASS_ON;
if (ev->desk_x != cfdata->desk_x) return ECORE_CALLBACK_PASS_ON;
if (ev->desk_y != cfdata->desk_y) return ECORE_CALLBACK_PASS_ON;

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

@ -9,7 +9,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config
static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static E_Config_Dialog *_e_int_config_wallpaper_desk(Evas_Object *parent EINA_UNUSED, int man_num, int zone_num, int desk_x, int desk_y);
static E_Config_Dialog *_e_int_config_wallpaper_desk(Evas_Object *parent EINA_UNUSED, int zone_num, int desk_x, int desk_y);
static void _cb_button_up(void *data1, void *data2);
static void _cb_files_changed(void *data, Evas_Object *obj, void *event_info);
@ -27,7 +27,7 @@ static void _cb_import(void *data1, void *data2);
struct _E_Config_Wallpaper
{
int specific_config;
int man_num, zone_num;
int zone_num;
int desk_x, desk_y;
};
@ -54,23 +54,23 @@ struct _E_Config_Dialog_Data
E_Config_Dialog *
e_int_config_wallpaper(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
{
return _e_int_config_wallpaper_desk(NULL, -1, -1, -1, -1);
return _e_int_config_wallpaper_desk(NULL, -1, -1, -1);
}
E_Config_Dialog *
e_int_config_wallpaper_desk(Evas_Object *parent EINA_UNUSED, const char *params)
{
int man_num, zone_num, desk_x, desk_y;
int zone_num, desk_x, desk_y;
if (!params) return NULL;
man_num = zone_num = desk_x = desk_y = -1;
if (sscanf(params, "%i %i %i %i", &man_num, &zone_num, &desk_x, &desk_y) != 4)
zone_num = desk_x = desk_y = -1;
if (sscanf(params, "%i %i %i", &zone_num, &desk_x, &desk_y) != 4)
return NULL;
return _e_int_config_wallpaper_desk(NULL, man_num, zone_num, desk_x, desk_y);
return _e_int_config_wallpaper_desk(NULL, zone_num, desk_x, desk_y);
}
static E_Config_Dialog *
_e_int_config_wallpaper_desk(Evas_Object *parent EINA_UNUSED, int man_num, int zone_num, int desk_x, int desk_y)
_e_int_config_wallpaper_desk(Evas_Object *parent EINA_UNUSED, int zone_num, int desk_x, int desk_y)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
@ -85,7 +85,7 @@ _e_int_config_wallpaper_desk(Evas_Object *parent EINA_UNUSED, int man_num, int z
v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create;
if (!(man_num == -1 && zone_num == -1 && desk_x == -1 && desk_y == -1))
if (!(zone_num == -1 && desk_x == -1 && desk_y == -1))
cw->specific_config = 1;
else
{
@ -95,7 +95,6 @@ _e_int_config_wallpaper_desk(Evas_Object *parent EINA_UNUSED, int man_num, int z
v->override_auto_apply = 1;
cw->man_num = man_num;
cw->zone_num = zone_num;
cw->desk_x = desk_x;
cw->desk_y = desk_y;
@ -348,7 +347,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
/* if we have a config for this bg, use it. */
if (cfbg)
{
if (cfbg->manager >= 0 && cfbg->zone >= 0)
if (cfbg->zone >= 0)
{
if (cfbg->desk_x >= 0 && cfbg->desk_y >= 0)
cfdata->all_this_desk_screen = E_CONFIG_WALLPAPER_DESK;
@ -526,8 +525,8 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cw->specific_config)
{
/* update a specific config */
e_bg_del(cw->man_num, cw->zone_num, cw->desk_x, cw->desk_y);
e_bg_add(cw->man_num, cw->zone_num, cw->desk_x, cw->desk_y, cfdata->bg);
e_bg_del(cw->zone_num, cw->desk_x, cw->desk_y);
e_bg_add(cw->zone_num, cw->desk_x, cw->desk_y, cfdata->bg);
}
else
{
@ -537,7 +536,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
E_Config_Desktop_Background *cfbg;
cfbg = e_config->desktop_backgrounds->data;
e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
e_bg_del(cfbg->zone, cfbg->desk_x, cfbg->desk_y);
}
if ((cfdata->use_theme_bg) || (!cfdata->bg))
e_bg_default_set(NULL);
@ -662,7 +661,7 @@ _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
E_Config_Desktop_Background *cfbg;
cfbg = e_config->desktop_backgrounds->data;
e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
e_bg_del(cfbg->zone, cfbg->desk_x, cfbg->desk_y);
}
e_bg_default_set(NULL);
}
@ -675,17 +674,17 @@ _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
E_Config_Desktop_Background *cfbg;
cfbg = e_config->desktop_backgrounds->data;
e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
e_bg_del(cfbg->zone, cfbg->desk_x, cfbg->desk_y);
}
e_bg_default_set(cfdata->bg);
}
else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_DESK)
{
e_bg_del(e_comp->num, z->num, d->x, d->y);
e_bg_del(e_comp->num, -1, d->x, d->y);
e_bg_del(-1, z->num, d->x, d->y);
e_bg_del(-1, -1, d->x, d->y);
e_bg_add(e_comp->num, z->num, d->x, d->y, cfdata->bg);
e_bg_del(z->num, d->x, d->y);
e_bg_del(-1, d->x, d->y);
e_bg_del(z->num, d->x, d->y);
e_bg_del(-1, d->x, d->y);
e_bg_add(z->num, d->x, d->y, cfdata->bg);
}
else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_SCREEN)
{
@ -694,8 +693,7 @@ _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
E_Config_Desktop_Background *cfbg;
cfbg = l->data;
if ((cfbg->manager == (int)e_comp->num) &&
(cfbg->zone == (int)z->num))
if (cfbg->zone == (int)z->num)
fl = eina_list_append(fl, cfbg);
}
while (fl)
@ -703,11 +701,11 @@ _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
E_Config_Desktop_Background *cfbg;
cfbg = fl->data;
e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x,
e_bg_del(cfbg->zone, cfbg->desk_x,
cfbg->desk_y);
fl = eina_list_remove_list(fl, fl);
}
e_bg_add(e_comp->num, z->num, -1, -1, cfdata->bg);
e_bg_add(z->num, -1, -1, cfdata->bg);
}
}
e_bg_update();

32
src/modules/msgbus/msgbus_desktop.c
View File

@ -100,20 +100,20 @@ static Eldbus_Message *
cb_desktop_bgadd(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *msg)
{
int manager, zone, desk_x, desk_y;
int zone, desk_x, desk_y;
const char *path;
Eldbus_Message *reply = eldbus_message_method_return_new(msg);
if (!eldbus_message_arguments_get(msg, "iiiis", &manager, &zone, &desk_x,
if (!eldbus_message_arguments_get(msg, "iiis", &zone, &desk_x,
&desk_y, &path))
{
ERR("could not get Add arguments");
return reply;
}
DBG("add bg manager=%d, zone=%d, pos=%d,%d path=%s",
manager, zone, desk_x, desk_y, path);
e_bg_add(manager, zone, desk_x, desk_y, path);
DBG("add bg zone=%d, pos=%d,%d path=%s",
zone, desk_x, desk_y, path);
e_bg_add(zone, desk_x, desk_y, path);
e_bg_update();
e_config_save_queue();
@ -124,19 +124,19 @@ static Eldbus_Message *
cb_desktop_bgdel(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *msg)
{
int manager, zone, desk_x, desk_y;
int zone, desk_x, desk_y;
Eldbus_Message *reply = eldbus_message_method_return_new(msg);
if (!eldbus_message_arguments_get(msg, "iiii", &manager, &zone, &desk_x,
if (!eldbus_message_arguments_get(msg, "iii", &zone, &desk_x,
&desk_y))
{
ERR("could not get Del arguments");
return reply;
}
DBG("del bg manager=%d, zone=%d, pos=%d,%d",
manager, zone, desk_x, desk_y);
e_bg_del(manager, zone, desk_x, desk_y);
DBG("del bg zone=%d, pos=%d,%d",
zone, desk_x, desk_y);
e_bg_del(zone, desk_x, desk_y);
e_bg_update();
e_config_save_queue();
@ -170,11 +170,11 @@ cb_desktop_bglist(const Eldbus_Service_Interface *iface EINA_UNUSED,
{
continue;
}
DBG("Background manager=%d zone=%d pos=%d,%d path=%s",
bg->manager, bg->zone, bg->desk_x, bg->desk_y, bg->file);
DBG("Background zone=%d pos=%d,%d path=%s",
bg->zone, bg->desk_x, bg->desk_y, bg->file);
eldbus_message_iter_arguments_append(array, "(iiiis)", &s);
if (!s) continue;
eldbus_message_iter_arguments_append(s, "iiiis", bg->manager, bg->zone,
eldbus_message_iter_arguments_append(s, "iiiis", bg->zone,
bg->desk_x, bg->desk_y, bg->file);
eldbus_message_iter_container_close(array, s);
}
@ -197,11 +197,11 @@ static const Eldbus_Method desktop_methods[] = {
static const Eldbus_Method background_methods[] = {
{ "Add",
ELDBUS_ARGS({"i", "manager"}, {"i", "zone"}, {"i", "desk_x"}, {"i", "desk_y"}, {"s", "path"}),
ELDBUS_ARGS({"i", "zone"}, {"i", "desk_x"}, {"i", "desk_y"}, {"s", "path"}),
NULL, cb_desktop_bgadd, 0 },
{ "Del", ELDBUS_ARGS({"i", "manager"}, {"i", "zone"}, {"i", "desk_x"}, {"i", "desk_y"}),
{ "Del", ELDBUS_ARGS({"i", "zone"}, {"i", "desk_x"}, {"i", "desk_y"}),
NULL, cb_desktop_bgdel, 0 },
{ "List", ELDBUS_ARGS({"a(iiiis)", "array_of_bg"}), NULL, cb_desktop_bglist, 0 },
{ "List", ELDBUS_ARGS({"a(iiis)", "array_of_bg"}), NULL, cb_desktop_bglist, 0 },
{ NULL, NULL, NULL, NULL, 0 }
};