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

Move the manipulation of user specified policy flags (ALLOW_OVERLAP and ALWAYS_ON_TOP (not used yet)) to the gadman edit menu, saves a LOT of code inside modules 

SVN revision: 21226
This commit is contained in:
handyande 2006-03-12 16:12:59 +00:00 committed by handyande
parent 1b6ecaa408
commit 00330faaf9
24 changed files with 76 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/bin/e_gadman.c
View File

@ -23,6 +23,7 @@ struct _Gadman_Client_Config
int edge;
int zone;
int use_autow, use_autoh;
int allow_overlap, always_on_top;
struct {
int w, h;
Evas_List *others;
@ -74,6 +75,8 @@ static void _e_gadman_cb_full_height(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_gadman_cb_auto_height(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_gadman_cb_center_vert(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_gadman_cb_allow_overlap(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_gadman_cb_always_on_top(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_gadman_cb_end_edit_mode(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_gadman_config_free(Gadman_Client_Config *cf);
@ -104,6 +107,8 @@ e_gadman_init(void)
E_CONFIG_VAL(D, T, zone, INT);
E_CONFIG_VAL(D, T, use_autow, INT);
E_CONFIG_VAL(D, T, use_autoh, INT);
E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_VAL(D, T, always_on_top, INT);
E_CONFIG_VAL(D, T, res.w, INT);
E_CONFIG_VAL(D, T, res.h, INT);
E_CONFIG_LIST(D, T, res.others, gadman_config_edd);
@ -328,6 +333,12 @@ e_gadman_client_load(E_Gadman_Client *gmc)
gmc->edge = cf->edge;
gmc->use_autow = cf->use_autow;
gmc->use_autoh = cf->use_autoh;
gmc->allow_overlap = cf->allow_overlap;
if (gmc->allow_overlap)
gmc->policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
gmc->always_on_top = cf->always_on_top;
if (gmc->always_on_top)
gmc->policy |= E_GADMAN_POLICY_ALWAYS_ON_TOP;
zone = e_container_zone_number_get(gmc->zone->container, cf->zone);
if (zone) gmc->zone = zone;
if (gmc->use_autow)
@ -729,6 +740,29 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
}
/* user configurable policy flags */
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Allow Overlap"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->allow_overlap);
s = e_path_find(path_icons, "default.edj"),
e_menu_item_icon_edje_set(mi, s, "allow_overlap");
if (s) evas_stringshare_del(s);
e_menu_item_callback_set(mi, _e_gadman_cb_allow_overlap, gmc);
/* Not used yet
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always On Top"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, gmc->always_on_top);
s = e_path_find(path_icons, "default.edj"),
e_menu_item_icon_edje_set(mi, s, "always_on_top");
if (s) evas_stringshare_del(s);
e_menu_item_callback_set(mi, _e_gadman_cb_always_on_top, gmc);
*/
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("End Edit Mode"));
e_menu_item_callback_set(mi, _e_gadman_cb_end_edit_mode, gmc);
@ -1982,6 +2016,44 @@ _e_gadman_cb_center_vert(void *data, E_Menu *m, E_Menu_Item *mi)
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE);
}
static void
_e_gadman_cb_allow_overlap(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
gmc = data;
if (e_menu_item_toggle_get(mi))
{
gmc->allow_overlap = 1;
gmc->policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
}
else
{
gmc->allow_overlap = 0;
gmc->policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
}
e_gadman_client_save(gmc);
}
static void
_e_gadman_cb_always_on_top(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
gmc = data;
if (e_menu_item_toggle_get(mi))
{
gmc->allow_overlap = 1;
gmc->policy |= E_GADMAN_POLICY_ALWAYS_ON_TOP;
}
else
{
gmc->allow_overlap = 0;
gmc->policy &= ~E_GADMAN_POLICY_ALWAYS_ON_TOP;
}
e_gadman_client_save(gmc);
}
static void
_e_gadman_cb_end_edit_mode(void *data, E_Menu *m, E_Menu_Item *mi)
{
@ -2022,4 +2094,6 @@ _e_gadman_client_geom_store(E_Gadman_Client *gmc)
cf->zone = gmc->zone->num;
cf->use_autow = gmc->use_autow;
cf->use_autoh = gmc->use_autoh;
cf->allow_overlap = gmc->allow_overlap;
cf->always_on_top = gmc->always_on_top;
}

2
src/bin/e_gadman.h
View File

@ -83,6 +83,8 @@ struct _E_Gadman_Client
Evas_Coord minw, minh, maxw, maxh;
unsigned char use_autow : 1;
unsigned char use_autoh : 1;
unsigned char allow_overlap : 1;
unsigned char always_on_top : 1;
Evas_Coord autow, autoh;
double ax, ay;
double mina, maxa;

22
src/modules/battery/e_mod_config.c
View File

@ -10,7 +10,6 @@ struct _E_Config_Dialog_Data
int show_alert;
double poll_time;
int alarm_time;
int allow_overlap;
};
struct _Cfg_File_Data
@ -55,7 +54,6 @@ _fill_data(Battery *b, E_Config_Dialog_Data *cfdata)
cfdata->show_alert = 1;
else
cfdata->show_alert = 0;
cfdata->allow_overlap = b->conf->allow_overlap;
}
static void *
@ -90,11 +88,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
ob = e_widget_check_add(evas, _("Show alert when battery is low"), &(cfdata->show_alert));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -107,11 +100,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_border_button_bindings_ungrab_all();
b->conf->poll_time = 10.0;
if (cfdata->allow_overlap && !b->conf->allow_overlap)
b->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && b->conf->allow_overlap)
b->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();
@ -143,11 +131,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1, 60, 1, 0, NULL, &(cfdata->alarm_time), 200);
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -166,11 +149,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
else
b->conf->alarm = 0;
if (cfdata->allow_overlap && !b->conf->allow_overlap)
b->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && b->conf->allow_overlap)
b->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();

32
src/modules/battery/e_mod_main.c
View File

@ -64,8 +64,6 @@ static char *_battery_string_get(char *buf);
static void _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
static void _battery_face_cb_update_policy(void *data);
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
@ -191,7 +189,6 @@ _battery_new()
#define D conf_edd
E_CONFIG_VAL(D, T, poll_time, DOUBLE);
E_CONFIG_VAL(D, T, alarm, INT);
E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, faces, conf_face_edd);
e->conf = e_config_domain_load("module.battery", conf_edd);
@ -200,11 +197,9 @@ _battery_new()
e->conf = E_NEW(Config, 1);
e->conf->poll_time = 30.0;
e->conf->alarm = 30;
e->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(e->conf->poll_time, 0.5, 1000.0);
E_CONFIG_LIMIT(e->conf->alarm, 0, 60);
E_CONFIG_LIMIT(e->conf->allow_overlap, 0, 1);
_battery_config_menu_new(e);
@ -340,10 +335,6 @@ _battery_face_new(Battery *bat, E_Container *con)
E_GADMAN_POLICY_VMOVE |
E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE;
if (bat->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(ef->gmc, policy);
e_gadman_client_min_size_set(ef->gmc, 4, 4);
e_gadman_client_max_size_set(ef->gmc, 128, 128);
@ -1645,31 +1636,8 @@ _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
void
_battery_face_cb_config_updated(Battery *bat)
{
/* Call all functions needed to update battery */
_battery_face_cb_update_policy((void*)bat);
/* Update Poll Time */
ecore_timer_del(bat->battery_check_timer);
bat->battery_check_timer = ecore_timer_add(bat->conf->poll_time, _battery_cb_check, bat);
}
static void _battery_face_cb_update_policy(void *data)
{
Battery *bat;
Battery_Face *bf;
Evas_List *l;
E_Gadman_Policy policy;
bat = data;
for (l = bat->faces; l; l = l->next)
{
bf = l->data;
policy = bf->gmc->policy;
if (bat->conf->allow_overlap ==0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(bf->gmc , policy);
}
}

1
src/modules/battery/e_mod_main.h
View File

@ -20,7 +20,6 @@ struct _Config
{
double poll_time;
int alarm;
int allow_overlap;
Evas_List *faces;
};

12
src/modules/clock/e_mod_config.c
View File

@ -8,7 +8,6 @@ typedef struct _Cfg_File_Data Cfg_File_Data;
struct _E_Config_Dialog_Data
{
int digital_style;
int allow_overlap;
};
struct _Cfg_File_Data
@ -46,7 +45,6 @@ static void
_fill_data(Clock_Face *clk, E_Config_Dialog_Data *cfdata)
{
cfdata->digital_style = clk->conf->digitalStyle;
cfdata->allow_overlap = clk->clock->conf->allow_overlap;
}
static void *
@ -88,11 +86,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -105,11 +98,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_border_button_bindings_ungrab_all();
clk->conf->digitalStyle = cfdata->digital_style;
if (cfdata->allow_overlap && !clk->clock->conf->allow_overlap)
clk->clock->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && clk->clock->conf->allow_overlap)
clk->clock->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();

32
src/modules/clock/e_mod_main.c
View File

@ -24,8 +24,6 @@ static void _clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_update_policy(void *data);
static int _clock_count;
static E_Config_DD *conf_edd;
@ -139,16 +137,13 @@ _clock_new()
#undef D
#define T Config
#define D conf_edd
E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, faces, conf_face_edd);
clock->conf = e_config_domain_load("module.clock", conf_edd);
if (!clock->conf)
{
clock->conf = E_NEW(Config, 1);
clock->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(clock->conf->allow_overlap, 0, 1);
_clock_config_menu_new(clock);
@ -281,11 +276,6 @@ _clock_face_new(Clock *clock, E_Container *con)
E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE;
if (clock->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(face->gmc, policy);
e_gadman_client_min_size_set(face->gmc, 4, 4);
e_gadman_client_max_size_set(face->gmc, 512, 512);
@ -455,27 +445,5 @@ _clock_face_cb_config_updated(void *data)
snprintf(buf, sizeof(buf), "%i", face->conf->digitalStyle);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
_clock_face_cb_update_policy(face->clock);
}
static void _clock_face_cb_update_policy(void *data)
{
Clock *clock;
Clock_Face *cf;
Evas_List *l;
E_Gadman_Policy policy;
clock = data;
for (l = clock->faces; l; l = l->next)
{
cf = l->data;
policy = cf->gmc->policy;
if (clock->conf->allow_overlap ==0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(cf->gmc , policy);
}
}

1
src/modules/clock/e_mod_main.h
View File

@ -11,7 +11,6 @@ typedef struct _Clock_Face Clock_Face;
struct _Config
{
int allow_overlap;
Evas_List *faces;
};

56
src/modules/cpufreq/e_mod_main.c
View File

@ -25,7 +25,6 @@ static void _cpufreq_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_normal(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_slow(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_very_slow(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_cb_allow_overlap(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_restore_governor(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_governor(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_frequency(void *data, E_Menu *m, E_Menu_Item *mi);
@ -51,8 +50,6 @@ static void _cpufreq_face_update_current(Cpufreq_Face *face);
static void _cpufreq_face_cb_set_frequency(void *data, Evas_Object *o, const char *emission, const char *source);
static void _cpufreq_face_cb_set_governor(void *data, Evas_Object *o, const char *emission, const char *source);
static void _cpufreq_cb_update_policy(Cpufreq *e);
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
@ -144,7 +141,6 @@ _cpufreq_new(E_Module *module)
#define T Config
#define D conf_edd
E_CONFIG_VAL(D, T, poll_time, DOUBLE);
E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, faces, conf_face_edd);
E_CONFIG_VAL(D, T, restore_governor, INT);
E_CONFIG_VAL(D, T, governor, STR);
@ -156,10 +152,8 @@ _cpufreq_new(E_Module *module)
e->conf->poll_time = 2.0;
e->conf->restore_governor = 0;
e->conf->governor = NULL;
e->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(e->conf->poll_time, 0.5, 60.0);
E_CONFIG_LIMIT(e->conf->allow_overlap, 0, 1);
#ifdef __FreeBSD__
/* does e_module_dir_get(module) work correctly in linux??? - yes it does... what's wrong in bsd? */
snprintf(buf, sizeof(buf), "%s/%s/cpufreq/freqset", e_module_dir_get(module), MODULE_ARCH);
@ -215,13 +209,6 @@ _cpufreq_new(E_Module *module)
_cpufreq_face_menu_new(ef);
/* Add 'Allow Overlap' option */
mi = e_menu_item_new(ef->menu);
e_menu_item_label_set(mi, _("Allow Overlap"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, e->conf->allow_overlap);
e_menu_item_callback_set(mi, _cpufreq_menu_cb_allow_overlap, e);
/* Add poll time menu to this face */
mi = e_menu_item_new(ef->menu);
e_menu_item_label_set(mi, _("Set Poll Time"));
@ -409,38 +396,6 @@ _cpufreq_menu_very_slow(void *data, E_Menu *m, E_Menu_Item *mi)
e_config_save_queue();
}
static void _cpufreq_cb_update_policy(Cpufreq *e)
{
Cpufreq_Face *cf;
Evas_List *l;
E_Gadman_Policy policy;
for (l = e->faces; l; l = l->next)
{
cf = l->data;
policy = cf->gmc->policy;
if (e->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(cf->gmc, policy);
}
}
static void _cpufreq_menu_cb_allow_overlap(void *data, E_Menu *m, E_Menu_Item *mi)
{
Cpufreq *e;
e = data;
e->conf->allow_overlap = e_menu_item_toggle_get(mi);
_cpufreq_cb_update_policy(e);
e_config_save_queue();
}
static void
_cpufreq_menu_restore_governor(void *data, E_Menu *m, E_Menu_Item *mi)
{
@ -586,12 +541,6 @@ _cpufreq_config_menu_new(Cpufreq *e)
}
mn = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Allow Overlap"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, e->conf->allow_overlap);
e_menu_item_callback_set(mi, _cpufreq_menu_cb_allow_overlap, e);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Set Poll Time"));
@ -949,11 +898,6 @@ _cpufreq_face_new(E_Container *con, Cpufreq *owner)
E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE;
if (owner->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(ef->gmc, policy);
e_gadman_client_min_size_set(ef->gmc, 4, 4);
e_gadman_client_max_size_set(ef->gmc, 128, 128);

1
src/modules/cpufreq/e_mod_main.h
View File

@ -23,7 +23,6 @@ struct _Status
struct _Config
{
double poll_time;
int allow_overlap;
Evas_List *faces;
int restore_governor;

15
src/modules/ibar/e_mod_config.c
View File

@ -10,7 +10,6 @@ struct _E_Config_Dialog_Data
int autofit;
int follower;
int iconsize;
int allow_overlap;
double follow_speed;
double autoscroll_speed;
};
@ -56,7 +55,6 @@ _fill_data(IBar *ib, E_Config_Dialog_Data *cfdata)
cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
cfdata->follower = ib->conf->follower;
cfdata->iconsize = ib->conf->iconsize;
cfdata->allow_overlap = ib->conf->allow_overlap;
cfdata->follow_speed = ib->conf->follow_speed;
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
}
@ -94,7 +92,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->autofit));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
return o;
}
@ -115,11 +112,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
ib->conf->follower = 0;
}
if (cfdata->allow_overlap && !ib->conf->allow_overlap)
ib->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
ib->conf->allow_overlap = 0;
if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED))
{
ib->conf->width = IBAR_WIDTH_AUTO;
@ -167,7 +159,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
/* allow overlap checkbox */
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
@ -189,12 +180,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
ib->conf->follower = 0;
}
/* allow overlap check box */
if (cfdata->allow_overlap && !ib->conf->allow_overlap)
ib->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
ib->conf->allow_overlap = 0;
if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED))
{
ib->conf->width = IBAR_WIDTH_AUTO;

18
src/modules/ibar/e_mod_main.c
View File

@ -222,7 +222,6 @@ _ibar_new()
E_CONFIG_VAL(D, T, autoscroll_speed, DOUBLE);
E_CONFIG_VAL(D, T, iconsize, INT);
E_CONFIG_VAL(D, T, width, INT);
E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, bars, conf_bar_edd);
ib->conf = e_config_domain_load("module.ibar", conf_edd);
@ -234,14 +233,12 @@ _ibar_new()
ib->conf->follow_speed = 0.9;
ib->conf->autoscroll_speed = 0.95;
ib->conf->iconsize = 24;
ib->conf->allow_overlap = 0;
ib->conf->width = IBAR_WIDTH_AUTO;
}
E_CONFIG_LIMIT(ib->conf->follow_speed, 0.01, 1.0);
E_CONFIG_LIMIT(ib->conf->autoscroll_speed, 0.01, 1.0);
E_CONFIG_LIMIT(ib->conf->iconsize, 2, 400);
E_CONFIG_LIMIT(ib->conf->width, -2, -1);
E_CONFIG_LIMIT(ib->conf->allow_overlap, 0, 1);
_ibar_config_menu_new(ib);
@ -587,11 +584,6 @@ _ibar_bar_new(IBar *ib, E_Container *con)
if (ibb->ibar->conf->width == IBAR_WIDTH_FIXED)
policy |= E_GADMAN_POLICY_HSIZE;
if (ibb->ibar->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(ibb->gmc, policy);
e_gadman_client_min_size_set(ibb->gmc, 8, 8);
e_gadman_client_max_size_set(ibb->gmc, 3200, 3200);
@ -1019,11 +1011,6 @@ _ibar_bar_edge_change(IBar_Bar *ibb, int edge)
e_box_align_set(ibb->box_object, 0.5, 0.5);
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_VMOVE;
if (ibb->ibar->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
if ((edge == E_GADMAN_EDGE_BOTTOM) ||
(edge == E_GADMAN_EDGE_TOP))
{
@ -1068,11 +1055,6 @@ _ibar_bar_update_policy(IBar_Bar *ibb)
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_VMOVE;
if (ibb->ibar->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
if ((e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM) ||
(e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_TOP))
{

1
src/modules/ibar/e_mod_main.h
View File

@ -21,7 +21,6 @@ struct _Config
double autoscroll_speed;
int iconsize;
int width;
int allow_overlap;
Evas_List *bars;
};

20
src/modules/ibox/e_mod_config.c
View File

@ -12,7 +12,6 @@ struct _E_Config_Dialog_Data
int iconsize;
double follow_speed;
double autoscroll_speed;
int allow_overlap;
};
struct _Cfg_File_Data
@ -58,7 +57,6 @@ _fill_data(IBox *ib, E_Config_Dialog_Data *cfdata)
cfdata->iconsize = ib->conf->iconsize;
cfdata->follow_speed = ib->conf->follow_speed;
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
cfdata->allow_overlap = ib->conf->allow_overlap;
}
static void *
@ -97,9 +95,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->autofit));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
return o;
}
@ -128,11 +123,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
ib->conf->width = IBOX_WIDTH_FIXED;
}
if (cfdata->allow_overlap && !ib->conf->allow_overlap)
ib->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
ib->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();
@ -174,11 +164,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -220,11 +205,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
ib->conf->autoscroll_speed = cfdata->autoscroll_speed;
}
if (cfdata->allow_overlap && !ib->conf->allow_overlap)
ib->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
ib->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();

18
src/modules/ibox/e_mod_main.c
View File

@ -203,7 +203,6 @@ _ibox_new()
E_CONFIG_VAL(D, T, autoscroll_speed, DOUBLE);
E_CONFIG_VAL(D, T, iconsize, INT);
E_CONFIG_VAL(D, T, width, INT);
E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, boxes, conf_box_edd);
ib->conf = e_config_domain_load("module.ibox", conf_edd);
@ -215,13 +214,11 @@ _ibox_new()
ib->conf->autoscroll_speed = 0.95;
ib->conf->iconsize = 24;
ib->conf->width = IBOX_WIDTH_AUTO;
ib->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(ib->conf->follow_speed, 0.01, 1.0);
E_CONFIG_LIMIT(ib->conf->autoscroll_speed, 0.01, 1.0);
E_CONFIG_LIMIT(ib->conf->iconsize, 2, 400);
E_CONFIG_LIMIT(ib->conf->width, -2, -1);
E_CONFIG_LIMIT(ib->conf->allow_overlap, 0, 1);
_ibox_config_menu_new(ib);
@ -401,11 +398,6 @@ _ibox_box_new(IBox *ib, E_Container *con)
if (ibb->ibox->conf->width == IBOX_WIDTH_FIXED)
policy |= E_GADMAN_POLICY_VSIZE;
if (ibb->ibox->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(ibb->gmc, policy);
e_gadman_client_min_size_set(ibb->gmc, 8, 8);
e_gadman_client_max_size_set(ibb->gmc, 3200, 3200);
@ -723,11 +715,6 @@ _ibox_box_edge_change(IBox_Box *ibb, int edge)
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_VMOVE;
if (ibb->ibox->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
if ((edge == E_GADMAN_EDGE_BOTTOM) ||
(edge == E_GADMAN_EDGE_TOP))
{
@ -772,11 +759,6 @@ _ibox_box_update_policy(IBox_Box *ibb)
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_VMOVE;
if (ibb->ibox->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
if ((e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM) ||
(e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_TOP))
{

1
src/modules/ibox/e_mod_main.h
View File

@ -19,7 +19,6 @@ struct _Config
int follower;
double autoscroll_speed;
int iconsize;
int allow_overlap;
int width;
Evas_List *boxes;
};

20
src/modules/itray/e_mod_config.c
View File

@ -9,7 +9,6 @@ typedef struct _Cfg_File_Data Cfg_File_Data;
struct _cfdata
{
int rowsize;
int allow_overlap;
};
struct _Cfg_File_Data
@ -51,7 +50,6 @@ static void
_fill_data(ITray *ib, CFData *cfdata)
{
cfdata->rowsize = ib->conf->rowsize;
cfdata->allow_overlap = ib->conf->allow_overlap;
}
static void *
@ -83,11 +81,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -97,10 +90,6 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
ITray *ib;
ib = cfd->data;
if (cfdata->allow_overlap && !ib->conf->allow_overlap)
ib->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
ib->conf->allow_overlap = 0;
e_config_save_queue();
_itray_box_cb_config_updated(ib);
@ -119,11 +108,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -136,10 +120,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
e_border_button_bindings_ungrab_all();
if (cfdata->rowsize != ib->conf->rowsize)
ib->conf->rowsize = cfdata->rowsize;
if (cfdata->allow_overlap && !ib->conf->allow_overlap)
ib->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
ib->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();

1
src/modules/itray/e_mod_main.h
View File

@ -18,7 +18,6 @@ struct _Config
int rowsize;
int width;
Evas_List *boxes;
int allow_overlap;
};
struct _Config_Box

22
src/modules/pager/e_mod_config.c
View File

@ -11,7 +11,6 @@ struct _E_Config_Dialog_Data
int name_pos;
int show_popup;
double popup_speed;
int allow_overlap;
};
struct _Cfg_File_Data
@ -64,7 +63,6 @@ _fill_data(Pager *p, E_Config_Dialog_Data *cfdata)
cfdata->show_popup = p->conf->popup;
cfdata->popup_speed = p->conf->popup_speed;
cfdata->allow_overlap = p->conf->allow_overlap;
}
static void *
@ -111,11 +109,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
/* Not Supported Yet ??
ob = e_widget_radio_add(evas, _("Left"), PAGER_DESKNAME_LEFT, rg);
e_widget_framelist_object_append(of, ob);
@ -137,11 +130,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
p->conf->deskname_pos = cfdata->name_pos;
if (!cfdata->show_name) p->conf->deskname_pos = PAGER_DESKNAME_NONE;
if (cfdata->allow_overlap && !p->conf->allow_overlap)
p->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && p->conf->allow_overlap)
p->conf->allow_overlap = 0;
e_config_save_queue();
_pager_cb_config_updated(p);
@ -184,11 +172,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -205,11 +188,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (!cfdata->show_name) p->conf->deskname_pos = PAGER_DESKNAME_NONE;
p->conf->popup_speed = cfdata->popup_speed;
if (cfdata->allow_overlap && !p->conf->allow_overlap)
p->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && p->conf->allow_overlap)
p->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();

31
src/modules/pager/e_mod_main.c
View File

@ -85,8 +85,6 @@ static void _pager_menu_cb_aspect_keep_height(void *data, E_Menu *m, E_Me
static void _pager_menu_cb_aspect_keep_width(void *data, E_Menu *m, E_Menu_Item *mi);
static void _pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
static void _pager_cb_update_policy(void *data);
static int _pager_count;
static E_Config_DD *_conf_edd;
@ -225,7 +223,6 @@ _pager_new(void)
E_CONFIG_VAL(D, T, deskname_pos, UINT);
E_CONFIG_VAL(D, T, popup_speed, DOUBLE);
E_CONFIG_VAL(D, T, popup, UINT);
E_CONFIG_VAL(D, T, allow_overlap, INT);
pager->conf = e_config_domain_load("module.pager", _conf_edd);
@ -235,12 +232,10 @@ _pager_new(void)
pager->conf->deskname_pos = PAGER_DESKNAME_NONE;
pager->conf->popup_speed = 1.0;
pager->conf->popup = 1;
pager->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(pager->conf->deskname_pos, PAGER_DESKNAME_NONE, PAGER_DESKNAME_RIGHT);
E_CONFIG_LIMIT(pager->conf->popup_speed, 0.1, 10.0);
E_CONFIG_LIMIT(pager->conf->popup, 0, 1);
E_CONFIG_LIMIT(pager->conf->allow_overlap, 0, 1);
_pager_config_menu_new(pager);
@ -486,11 +481,6 @@ _pager_face_new(Pager *pager, E_Zone *zone, Evas *evas, int use_gmc)
// E_GADMAN_POLICY_FIXED_ZONE |
E_GADMAN_POLICY_VSIZE;
if (pager->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(face->gmc, policy);
e_gadman_client_min_size_set(face->gmc, 8, 8);
@ -2156,7 +2146,6 @@ _pager_cb_config_updated(void *data)
/* Handle Desktop Name Position Change */
pager = data;
_pager_cb_update_policy(pager);
for (l = pager->faces; l; l = l->next)
{
Pager_Face *face;
@ -2165,24 +2154,4 @@ _pager_cb_config_updated(void *data)
_pager_face_deskname_position_change(face);
}
}
static void _pager_cb_update_policy(void *data)
{
Pager *pg;
Pager_Face *pf;
Evas_List *l;
E_Gadman_Policy policy;
pg = data;
for (l = pg->faces; l; l = l->next)
{
pf = l->data;
policy = pf->gmc->policy;
if (pg->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(pf->gmc , policy);
}
}

1
src/modules/pager/e_mod_main.h
View File

@ -33,7 +33,6 @@ struct _Config
/* Show popup? */
unsigned int popup;
int allow_overlap;
};
struct _Config_Face

24
src/modules/temperature/e_mod_config.c
View File

@ -30,8 +30,6 @@ struct _E_Config_Dialog_Data
int high_method;
int high_temp;
int allow_overlap;
int sensor;
};
@ -112,8 +110,6 @@ _fill_data(Temperature *t, E_Config_Dialog_Data *cfdata)
cfdata->sensor = 1;
else if (!strcmp(t->conf->sensor_name, "temp3"))
cfdata->sensor = 2;
cfdata->allow_overlap = t->conf->allow_overlap;
}
static void *
@ -215,11 +211,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_list_object_append(o, of, 1, 1, 0.5);
}
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -248,11 +239,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
t->conf->high = cfdata->high_method;
}
if (cfdata->allow_overlap && !t->conf->allow_overlap)
t->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && t->conf->allow_overlap)
t->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();
@ -365,11 +351,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(o, of, 1, 1, 0.5);
}
of = e_widget_framelist_add(evas, _("Extras"), 0);
ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"), &(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@ -420,11 +401,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
break;
}
if (cfdata->allow_overlap && !t->conf->allow_overlap)
t->conf->allow_overlap = 1;
else if (!cfdata->allow_overlap && t->conf->allow_overlap)
t->conf->allow_overlap = 0;
e_border_button_bindings_grab_all();
e_config_save_queue();

38
src/modules/temperature/e_mod_main.c
View File

@ -25,8 +25,6 @@ static void _temperature_face_free(void *data, E_Gadget_Face *face);
static void _temperature_face_level_set(E_Gadget_Face *face, double level);
static void _temperature_cb_update_policy(void *data);
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
@ -166,7 +164,6 @@ _temperature_new()
E_CONFIG_LIST(D, T, faces, conf_face_edd);
E_CONFIG_VAL(D, T, sensor_name, STR);
E_CONFIG_VAL(D, T, units, INT);
E_CONFIG_VAL(D, T, allow_overlap, INT);
e->conf = e_config_domain_load("module.temperature", conf_edd);
if (!e->conf)
@ -177,13 +174,11 @@ _temperature_new()
e->conf->high = 80;
e->conf->sensor_name = "temp1";
e->conf->units = CELCIUS;
e->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(e->conf->poll_time, 0.5, 1000.0);
E_CONFIG_LIMIT(e->conf->low, 0, 100);
E_CONFIG_LIMIT(e->conf->high, 0, 220);
E_CONFIG_LIMIT(e->conf->units, CELCIUS, FAHRENHEIT);
E_CONFIG_LIMIT(e->conf->allow_overlap, 0, 1);
e->have_temp = -1;
@ -210,11 +205,6 @@ void _temperature_face_init(void *data, E_Gadget_Face *face)
E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE;
if (e->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(face->gmc, policy);
ef->conf = evas_list_nth(e->conf->faces, face->face_num);
@ -451,34 +441,6 @@ _temperature_face_cb_config_updated(Temperature *temp)
/* Call all funcs needed to handle update */
ecore_timer_del(temp->temperature_check_timer);
temp->temperature_check_timer = ecore_timer_add(temp->conf->poll_time, _temperature_cb_check, temp->gad);
_temperature_cb_update_policy(temp);
}
void
_temperature_cb_update_policy(void *data)
{
Temperature *temp;
E_Gadget_Face *face;
Evas_List *l;
E_Gadman_Policy policy;
E_Gadget *gad;
temp = data;
if (!temp) return;
gad = temp->gad;
if (!gad) return;
for (l = gad->faces; l; l = l->next)
{
face = l->data;
policy = face->gmc->policy;
if (temp->conf->allow_overlap == 0)
policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
else
policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(face->gmc, policy);
}
}

1
src/modules/temperature/e_mod_main.h
View File

@ -22,7 +22,6 @@ struct _Config
Evas_List *faces;
char *sensor_name;
Unit units;
int allow_overlap;
};
struct _Config_Face