Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
2 pending patches in my inbox.
1. "allow overlap" patch for modules - needs better names in the gui (Allow
windows to overlap maybe - as allow overlap is very vague)
2. itray module (buggy - buggy - beware. i know why. beware i said!)
3. TODO items
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_config.c 14 Jan 2006 16:10:56 -0000 1.11
+++ e_mod_config.c 20 Jan 2006 04:04:12 -0000 1.12
@@ -8,6 +8,7 @@
struct _E_Config_Dialog_Data
{
int digital_style;
+ int allow_overlap;
};
struct _Cfg_File_Data
@@ -45,6 +46,7 @@
_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 *
@@ -86,6 +88,12 @@
ob = e_widget_radio_add(evas, _("24 Hour Display"), 2, rg);
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 Overlap"), &(cfdata->allow_overlap));
+ e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+
return o;
}
@@ -97,6 +105,12 @@
clk = cfd->data;
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();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_mod_main.c 7 Jan 2006 10:39:46 -0000 1.51
+++ e_mod_main.c 20 Jan 2006 04:04:12 -0000 1.52
@@ -14,7 +14,7 @@
static void _clock_shutdown(Clock *clock);
static void _clock_config_menu_new(Clock *clock);
-static Clock_Face *_clock_face_new(E_Container *con);
+static Clock_Face *_clock_face_new(Clock *clock, E_Container *con);
static void _clock_face_free(Clock_Face *face);
/* static void _clock_face_enable(Clock_Face *face); */
static void _clock_face_disable(Clock_Face *face);
@@ -24,6 +24,8 @@
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;
@@ -137,13 +139,16 @@
#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);
@@ -160,9 +165,10 @@
Clock_Face *face;
con = l2->data;
- face = _clock_face_new(con);
+ face = _clock_face_new(clock, con);
if (face)
{
+ face->clock = clock;
clock->faces = evas_list_append(clock->faces, face);
/* Config */
if (!cl)
@@ -228,11 +234,12 @@
}
static Clock_Face *
-_clock_face_new(E_Container *con)
+_clock_face_new(Clock *clock, E_Container *con)
{
Clock_Face *face;
Evas_Object *o;
Evas_Coord x, y, w, h;
+ E_Gadman_Policy policy;
face = E_NEW(Clock_Face, 1);
if (!face) return NULL;
@@ -266,12 +273,19 @@
face->gmc = e_gadman_client_new(con->gadman);
e_gadman_client_domain_set(face->gmc, "module.clock", _clock_count++);
- e_gadman_client_policy_set(face->gmc,
- E_GADMAN_POLICY_ANYWHERE |
- E_GADMAN_POLICY_HMOVE |
- E_GADMAN_POLICY_VMOVE |
- E_GADMAN_POLICY_HSIZE |
- E_GADMAN_POLICY_VSIZE);
+
+ policy = E_GADMAN_POLICY_ANYWHERE |
+ E_GADMAN_POLICY_HMOVE |
+ E_GADMAN_POLICY_VMOVE |
+ 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);
e_gadman_client_auto_size_set(face->gmc,
@@ -437,4 +451,28 @@
memset(buf, 0, sizeof(buf));
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);
+ }
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.h 6 Jan 2006 21:26:28 -0000 1.16
+++ e_mod_main.h 20 Jan 2006 04:04:12 -0000 1.17
@@ -11,6 +11,7 @@
struct _Config
{
+ int allow_overlap;
Evas_List *faces;
};
@@ -33,6 +34,7 @@
E_Container *con;
E_Menu *menu;
Config_Face *conf;
+ Clock *clock;
struct {
Evas_Coord l, r, t, b;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
