styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more gadcon work! - getting there. slowly. the pieces are coming together... 

SVN revision: 20379
This commit is contained in:
Carsten Haitzler 2006-02-10 08:14:57 +00:00
parent cc3d6d26b7
commit 15c398e635
7 changed files with 526 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_actions.c
View File

@ -1216,6 +1216,7 @@ ACT_FN_GO(edit_mode)
if (!obj) return; if (!obj) return;
} }
e_gadman_mode_set(((E_Container *)obj)->gadman, E_GADMAN_MODE_EDIT); e_gadman_mode_set(((E_Container *)obj)->gadman, E_GADMAN_MODE_EDIT);
e_gadcon_all_edit_begin();
} }
ACT_FN_END(edit_mode) ACT_FN_END(edit_mode)
{ {
@ -1227,6 +1228,7 @@ ACT_FN_END(edit_mode)
if (!obj) return; if (!obj) return;
} }
e_gadman_mode_set(((E_Container *)obj)->gadman, E_GADMAN_MODE_NORMAL); e_gadman_mode_set(((E_Container *)obj)->gadman, E_GADMAN_MODE_NORMAL);
e_gadcon_all_edit_end();
} }
/***************************************************************************/ /***************************************************************************/

62
src/bin/e_config.c
View File

@ -35,6 +35,8 @@ static E_Config_DD *_e_config_desktop_bg_edd = NULL;
static E_Config_DD *_e_config_desktop_name_edd = NULL; static E_Config_DD *_e_config_desktop_name_edd = NULL;
static E_Config_DD *_e_config_remember_edd = NULL; static E_Config_DD *_e_config_remember_edd = NULL;
static E_Config_DD *_e_config_color_class_edd = NULL; static E_Config_DD *_e_config_color_class_edd = NULL;
static E_Config_DD *_e_config_gadcon_edd = NULL;
static E_Config_DD *_e_config_gadcon_client_edd = NULL;
/* externally accessible functions */ /* externally accessible functions */
@ -75,6 +77,27 @@ e_config_init(void)
_e_config_profile = strdup("default"); _e_config_profile = strdup("default");
} }
else _e_config_profile = strdup(_e_config_profile); else _e_config_profile = strdup(_e_config_profile);
_e_config_gadcon_client_edd = E_CONFIG_DD_NEW("E_Config_Gadcon_Client", E_Config_Gadcon_Client);
#undef T
#undef D
#define T E_Config_Gadcon_Client
#define D _e_config_gadcon_client_edd
E_CONFIG_VAL(D, T, name, STR);
E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_VAL(D, T, geom.pos, INT);
E_CONFIG_VAL(D, T, geom.size, INT);
E_CONFIG_VAL(D, T, geom.res, INT);
_e_config_gadcon_edd = E_CONFIG_DD_NEW("E_Config_Gadcon", E_Config_Gadcon);
#undef T
#undef D
#define T E_Config_Gadcon
#define D _e_config_gadcon_edd
E_CONFIG_VAL(D, T, name, STR);
E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_LIST(D, T, clients, _e_config_gadcon_client_edd);
_e_config_desktop_bg_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Background", E_Config_Desktop_Background); _e_config_desktop_bg_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Background", E_Config_Desktop_Background);
#undef T #undef T
#undef D #undef D
@ -402,6 +425,7 @@ e_config_init(void)
E_CONFIG_VAL(D, T, exebuf_pos_max_h, INT); E_CONFIG_VAL(D, T, exebuf_pos_max_h, INT);
E_CONFIG_LIST(D, T, color_classes, _e_config_color_class_edd); E_CONFIG_LIST(D, T, color_classes, _e_config_color_class_edd);
E_CONFIG_VAL(D, T, use_app_icon, INT); E_CONFIG_VAL(D, T, use_app_icon, INT);
E_CONFIG_LIST(D, T, gadcons, _e_config_gadcon_edd);
e_config = e_config_domain_load("e", _e_config_edd); e_config = e_config_domain_load("e", _e_config_edd);
if (e_config) if (e_config)
{ {
@ -549,6 +573,42 @@ e_config_init(void)
e_config->exebuf_pos_max_h = 320; e_config->exebuf_pos_max_h = 320;
e_config->color_classes = NULL; e_config->color_classes = NULL;
e_config->use_app_icon = 0; e_config->use_app_icon = 0;
e_config->gadcons = NULL;
/* FIXME: fill up default gadcons! */
{
E_Config_Gadcon *cf_gc;
E_Config_Gadcon_Client *cf_gcc;
cf_gc = E_NEW(E_Config_Gadcon, 1);
cf_gc->name = evas_stringshare_add("shelf");
cf_gc->id = evas_stringshare_add("0");
e_config->gadcons = evas_list_append(e_config->gadcons, cf_gc);
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1);
cf_gcc->name = evas_stringshare_add("ibar");
cf_gcc->id = evas_stringshare_add("default");
cf_gcc->geom.res = 800;
cf_gcc->geom.size = 200;
cf_gcc->geom.pos = 400 - (cf_gcc->geom.size / 2);
cf_gc->clients = evas_list_append(cf_gc->clients, cf_gcc);
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1);
cf_gcc->name = evas_stringshare_add("clock");
cf_gcc->id = evas_stringshare_add("default");
cf_gcc->geom.res = 800;
cf_gcc->geom.size = 32;
cf_gcc->geom.pos = 800 - (cf_gcc->geom.size);
cf_gc->clients = evas_list_append(cf_gc->clients, cf_gcc);
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1);
cf_gcc->name = evas_stringshare_add("start");
cf_gcc->id = evas_stringshare_add("default");
cf_gcc->geom.res = 800;
cf_gcc->geom.size = 32;
cf_gcc->geom.pos = 0;
cf_gc->clients = evas_list_append(cf_gc->clients, cf_gcc);
}
{ {
E_Config_Module *em; E_Config_Module *em;
@ -1559,6 +1619,8 @@ e_config_shutdown(void)
E_CONFIG_DD_FREE(_e_config_desktop_bg_edd); E_CONFIG_DD_FREE(_e_config_desktop_bg_edd);
E_CONFIG_DD_FREE(_e_config_desktop_name_edd); E_CONFIG_DD_FREE(_e_config_desktop_name_edd);
E_CONFIG_DD_FREE(_e_config_remember_edd); E_CONFIG_DD_FREE(_e_config_remember_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_client_edd);
return 1; return 1;
} }

20
src/bin/e_config.h
View File

@ -33,6 +33,9 @@ typedef struct _E_Config_Binding_Signal E_Config_Binding_Signal;
typedef struct _E_Config_Binding_Wheel E_Config_Binding_Wheel; typedef struct _E_Config_Binding_Wheel E_Config_Binding_Wheel;
typedef struct _E_Config_Desktop_Background E_Config_Desktop_Background; typedef struct _E_Config_Desktop_Background E_Config_Desktop_Background;
typedef struct _E_Config_Desktop_Name E_Config_Desktop_Name; typedef struct _E_Config_Desktop_Name E_Config_Desktop_Name;
typedef struct _E_Config_Gadcon E_Config_Gadcon;
typedef struct _E_Config_Gadcon_Client E_Config_Gadcon_Client;
typedef Eet_Data_Descriptor E_Config_DD; typedef Eet_Data_Descriptor E_Config_DD;
#else #else
@ -44,7 +47,7 @@ typedef Eet_Data_Descriptor E_Config_DD;
* versioning feature. the value of this is really irrelevant - just as * versioning feature. the value of this is really irrelevant - just as
* long as it increases every time we change something * long as it increases every time we change something
*/ */
#define E_CONFIG_FILE_VERSION 135 #define E_CONFIG_FILE_VERSION 136
#define E_EVAS_ENGINE_DEFAULT 0 #define E_EVAS_ENGINE_DEFAULT 0
#define E_EVAS_ENGINE_SOFTWARE_X11 1 #define E_EVAS_ENGINE_SOFTWARE_X11 1
@ -201,6 +204,7 @@ struct _E_Config
int exebuf_pos_max_h; int exebuf_pos_max_h;
Evas_List *color_classes; Evas_List *color_classes;
int use_app_icon; int use_app_icon;
Evas_List *gadcons;
}; };
struct _E_Config_Module struct _E_Config_Module
@ -275,6 +279,20 @@ struct _E_Config_Desktop_Name
char *name; char *name;
}; };
struct _E_Config_Gadcon
{
char *name, *id;
Evas_List *clients;
};
struct _E_Config_Gadcon_Client
{
char *name, *id;
struct {
int pos, size, res;
} geom;
};
EAPI int e_config_init(void); EAPI int e_config_init(void);
EAPI int e_config_shutdown(void); EAPI int e_config_shutdown(void);

556
src/bin/e_gadcon.c
View File

@ -6,6 +6,8 @@
static void _e_gadcon_free(E_Gadcon *gc); static void _e_gadcon_free(E_Gadcon *gc);
static void _e_gadcon_client_free(E_Gadcon_Client *gcc); static void _e_gadcon_client_free(E_Gadcon_Client *gcc);
static void _e_gadcon_client_save(E_Gadcon_Client *gcc);
static void _e_gadcon_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _e_gadcon_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _e_gadcon_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _e_gadcon_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _e_gadcon_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _e_gadcon_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
@ -31,16 +33,21 @@ static void _e_gadcon_cb_signal_resize_down_go(void *data, Evas_Object *obj, con
static Evas_Object *e_gadcon_layout_add(Evas *evas); static Evas_Object *e_gadcon_layout_add(Evas *evas);
static void e_gadcon_layout_orientation_set(Evas_Object *obj, int horizontal); static void e_gadcon_layout_orientation_set(Evas_Object *obj, int horizontal);
static int e_gadcon_layout_orientation_get(Evas_Object *obj);
static void e_gadcon_layout_freeze(Evas_Object *obj);
static void e_gadcon_layout_thaw(Evas_Object *obj);
static void e_gadcon_layout_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); static void e_gadcon_layout_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
static void e_gadcon_layout_asked_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); static void e_gadcon_layout_asked_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
static int e_gadcon_layout_pack(Evas_Object *obj, Evas_Object *child); static int e_gadcon_layout_pack(Evas_Object *obj, Evas_Object *child);
static void e_gadcon_layout_pack_size_set(Evas_Object *obj, int size); static void e_gadcon_layout_pack_size_set(Evas_Object *obj, int size);
static void e_gadcon_layout_pack_request_set(Evas_Object *obj, int pos, int size); static void e_gadcon_layout_pack_request_set(Evas_Object *obj, int pos, int size);
static void e_gadcon_layout_pack_options_set(Evas_Object *obj, int pos, int size, int res); static void e_gadcon_layout_pack_options_set(Evas_Object *obj, int pos, int size, int res);
static void e_gadcon_layout_pack_min_size_set(Evas_Object *obj, int w, int h);
static void e_gadcon_layout_unpack(Evas_Object *obj); static void e_gadcon_layout_unpack(Evas_Object *obj);
static Evas_Hash *providers = NULL; static Evas_Hash *providers = NULL;
static Evas_List *gadcons = NULL;
static E_Gadcon_Client * static E_Gadcon_Client *
__test(E_Gadcon *gc, char *name, char *id) __test(E_Gadcon *gc, char *name, char *id)
{ {
@ -91,17 +98,6 @@ e_gadcon_init(void)
}; };
e_gadcon_provider_register(&cc); e_gadcon_provider_register(&cc);
} }
{
static E_Gadcon_Client_Class cc =
{
GADCON_CLIENT_CLASS_VERSION,
"pager",
{
__test, __test2, NULL
}
};
e_gadcon_provider_register(&cc);
}
{ {
static E_Gadcon_Client_Class cc = static E_Gadcon_Client_Class cc =
{ {
@ -154,6 +150,7 @@ e_gadcon_swallowed_new(char *name, char *id, Evas_Object *obj, char *swallow_nam
gc->o_container = e_gadcon_layout_add(gc->evas); gc->o_container = e_gadcon_layout_add(gc->evas);
evas_object_show(gc->o_container); evas_object_show(gc->o_container);
edje_object_part_swallow(gc->edje.o_parent, gc->edje.swallow_name, gc->o_container); edje_object_part_swallow(gc->edje.o_parent, gc->edje.swallow_name, gc->o_container);
gadcons = evas_list_append(gadcons, gc);
return gc; return gc;
} }
@ -171,52 +168,57 @@ EAPI void
e_gadcon_populate(E_Gadcon *gc) e_gadcon_populate(E_Gadcon *gc)
{ {
Evas_List *l; Evas_List *l;
int i; int ok;
E_Config_Gadcon *cf_gc;
E_Config_Gadcon_Client *cf_gcc;
E_OBJECT_CHECK_RETURN(gc, NULL); E_OBJECT_CHECK_RETURN(gc, NULL);
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
for (i = 0; i < 6; i++) ok = 0;
e_gadcon_layout_freeze(gc->o_container);
printf("e_config->gadcons = %p\n", e_config->gadcons);
for (l = e_config->gadcons; l; l = l->next)
{ {
E_Gadcon_Client_Class *cc; cf_gc = l->data;
char *name, *id; printf("%s == %s, %s == %s\n", cf_gc->name, gc->name, cf_gc->id, gc->id);
int pos, size, res; if ((!strcmp(cf_gc->name, gc->name)) &&
(!strcmp(cf_gc->id, gc->id)))
/* FIXME: a hardcoded sample that woudl cnormally be saved config
*/
if (i == 0) {
name = "ibar"; id = "0";
size = 280; pos = 400 - (size / 2); res = 800;
} else if (i == 1) {
name = "start"; id = "0";
size = 32; pos = 0; res = 800;
} else if (i == 2) {
name = "pager"; id = "0";
size = 200; pos = 0; res = 800;
} else if (i == 3) {
name = "clock"; id = "0";
size = 32; pos = 800 - size; res = 800;
} else if (i == 4) {
name = "clock"; id = "1";
size = 32; pos = 800 - size; res = 800;
} else if (i == 5) {
name = "clock"; id = "2";
size = 32; pos = 800 - size; res = 800;
}
cc = evas_hash_find(providers, name);
if (cc)
{ {
E_Gadcon_Client *gcc; ok = 1;
break;
}
}
if (ok)
{
for (l = cf_gc->clients; l; l = l->next)
{
E_Gadcon_Client_Class *cc;
gcc = cc->func.init(gc, cc->name, id); cf_gcc = l->data;
if (gcc) printf("cf_gcc->name = %s\n", cf_gcc->name);
cc = evas_hash_find(providers, cf_gcc->name);
if (cc)
{ {
gcc->client_class = *cc; E_Gadcon_Client *gcc;
e_gadcon_layout_pack_options_set(gcc->o_base, pos, size, res);
if (gcc->client_class.func.orient) gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id);
gcc->client_class.func.orient(gcc); if (gcc)
{
gcc->client_class = *cc;
gcc->config.pos = cf_gcc->geom.pos;
gcc->config.size = cf_gcc->geom.size;
gcc->config.res = cf_gcc->geom.res;
e_gadcon_layout_pack_options_set(gcc->o_base,
gcc->config.pos,
gcc->config.size,
gcc->config.res);
if (gcc->client_class.func.orient)
gcc->client_class.func.orient(gcc);
}
} }
} }
} }
e_gadcon_layout_thaw(gc->o_container);
} }
EAPI void EAPI void
@ -228,6 +230,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
if (gc->orient == orient) return; if (gc->orient == orient) return;
gc->orient = orient; gc->orient = orient;
e_gadcon_layout_freeze(gc->o_container);
for (l = gc->clients; l; l = l->next) for (l = gc->clients; l; l = l->next)
{ {
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
@ -236,6 +239,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
if (gcc->client_class.func.orient) if (gcc->client_class.func.orient)
gcc->client_class.func.orient(gcc); gcc->client_class.func.orient(gcc);
} }
e_gadcon_layout_thaw(gc->o_container);
} }
EAPI void EAPI void
@ -245,6 +249,7 @@ e_gadcon_edit_begin(E_Gadcon *gc)
E_OBJECT_CHECK(gc); E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
e_gadcon_layout_freeze(gc->o_container);
for (l = gc->clients; l; l = l->next) for (l = gc->clients; l; l = l->next)
{ {
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
@ -252,6 +257,53 @@ e_gadcon_edit_begin(E_Gadcon *gc)
gcc = l->data; gcc = l->data;
e_gadcon_client_edit_begin(gcc); e_gadcon_client_edit_begin(gcc);
} }
e_gadcon_layout_thaw(gc->o_container);
}
EAPI void
e_gadcon_edit_end(E_Gadcon *gc)
{
Evas_List *l;
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
e_gadcon_layout_freeze(gc->o_container);
for (l = gc->clients; l; l = l->next)
{
E_Gadcon_Client *gcc;
gcc = l->data;
e_gadcon_client_edit_end(gcc);
}
e_gadcon_layout_thaw(gc->o_container);
}
EAPI void
e_gadcon_all_edit_begin(void)
{
Evas_List *l;
for (l = gadcons; l; l = l->next)
{
E_Gadcon *gc;
gc = l->data;
e_gadcon_edit_begin(gc);
}
}
EAPI void
e_gadcon_all_edit_end(void)
{
Evas_List *l;
for (l = gadcons; l; l = l->next)
{
E_Gadcon *gc;
gc = l->data;
e_gadcon_edit_end(gc);
}
} }
EAPI E_Gadcon_Client * EAPI E_Gadcon_Client *
@ -280,6 +332,8 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
E_OBJECT_CHECK(gcc); E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
if (gcc->o_control) return;
gcc->o_control = edje_object_add(gcc->gadcon->evas); gcc->o_control = edje_object_add(gcc->gadcon->evas);
evas_object_layer_set(gcc->o_control, 100); evas_object_layer_set(gcc->o_control, 100);
@ -343,6 +397,22 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
evas_object_show(gcc->o_control); evas_object_show(gcc->o_control);
} }
EAPI void
e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
{
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
if (gcc->moving)
{
gcc->moving = 0;
_e_gadcon_client_save(gcc);
}
if (gcc->o_event) evas_object_del(gcc->o_event);
gcc->o_event = NULL;
if (gcc->o_control) evas_object_del(gcc->o_control);
gcc->o_control = NULL;
}
EAPI void EAPI void
e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h) e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
{ {
@ -370,19 +440,14 @@ e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
{ {
E_OBJECT_CHECK(gcc); E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
} e_gadcon_layout_pack_min_size_set(gcc->o_base, w, h);
EAPI void
e_gadcon_client_max_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
{
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
} }
/* local subsystem functions */ /* local subsystem functions */
static void static void
_e_gadcon_free(E_Gadcon *gc) _e_gadcon_free(E_Gadcon *gc)
{ {
gadcons = evas_list_remove(gadcons, gc);
if (gc->o_container) evas_object_del(gc->o_container); if (gc->o_container) evas_object_del(gc->o_container);
evas_stringshare_del(gc->name); evas_stringshare_del(gc->name);
evas_stringshare_del(gc->id); evas_stringshare_del(gc->id);
@ -399,7 +464,60 @@ _e_gadcon_client_free(E_Gadcon_Client *gcc)
free(gcc); free(gcc);
} }
static void
_e_gadcon_client_save(E_Gadcon_Client *gcc)
{
Evas_List *l, *l2;
E_Config_Gadcon *cf_gc;
E_Config_Gadcon_Client *cf_gcc;
int ok;
ok = 0;
for (l = e_config->gadcons; l; l = l->next)
{
cf_gc = l->data;
if ((!strcmp(cf_gc->name, gcc->gadcon->name)) &&
(!strcmp(cf_gc->id, gcc->gadcon->id)))
{
ok++;
for (l2 = cf_gc->clients; l2; l2 = l2->next)
{
cf_gcc = l2->data;
if ((!strcmp(cf_gcc->name, gcc->name)) &&
(!strcmp(cf_gcc->id, gcc->id)))
{
cf_gcc->geom.pos = gcc->config.pos;
cf_gcc->geom.size = gcc->config.size;
cf_gcc->geom.res = gcc->config.res;
ok++;
break;
}
}
break;
}
}
if (ok == 0)
{
cf_gc = E_NEW(E_Config_Gadcon, 1);
cf_gc->name = evas_stringshare_add(gcc->gadcon->name);
cf_gc->id = evas_stringshare_add(gcc->gadcon->id);
e_config->gadcons = evas_list_append(e_config->gadcons, cf_gc);
ok++;
}
if (ok == 1)
{
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1);
cf_gcc->name = evas_stringshare_add(gcc->name);
cf_gcc->id = evas_stringshare_add(gcc->id);
cf_gcc->geom.pos = gcc->config.pos;
cf_gcc->geom.size = gcc->config.size;
cf_gcc->geom.res = gcc->config.res;
cf_gc->clients = evas_list_append(cf_gc->clients, cf_gcc);
ok++;
}
e_config_save_queue();
}
static void static void
_e_gadcon_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) _e_gadcon_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
@ -494,6 +612,7 @@ _e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission
gcc = data; gcc = data;
gcc->moving = 0; gcc->moving = 0;
_e_gadcon_client_save(gcc);
} }
static void static void
@ -508,7 +627,22 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
x = x - gcc->dx; x = x - gcc->dx;
y = y - gcc->dy; y = y - gcc->dy;
evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h); evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->sx + x, w); if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
{
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->sx + x, w);
gcc->config.pos = gcc->sx + x;
gcc->config.size = w;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = w;
}
else
{
e_gadcon_layout_pack_request_set(gcc->o_base, gcc->sy + y, h);
gcc->config.pos = gcc->sy + y;
gcc->config.size = h;
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
gcc->config.res = h;
}
} }
static void static void
@ -623,13 +757,14 @@ struct _E_Smart_Data
Evas_Object *clip; Evas_Object *clip;
unsigned char horizontal : 1; unsigned char horizontal : 1;
Evas_List *items; Evas_List *items;
int frozen;
}; };
struct _E_Gadcon_Layout_Item struct _E_Gadcon_Layout_Item
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
struct { struct {
int pos, size, res; int pos, size, size2, res;
} ask; } ask;
int hookp; int hookp;
struct { struct {
@ -681,6 +816,37 @@ e_gadcon_layout_orientation_set(Evas_Object *obj, int horizontal)
_e_gadcon_layout_smart_reconfigure(sd); _e_gadcon_layout_smart_reconfigure(sd);
} }
static int
e_gadcon_layout_orientation_get(Evas_Object *obj)
{
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
return sd->horizontal;
}
static void
e_gadcon_layout_freeze(Evas_Object *obj)
{
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
sd->frozen++;
}
static void
e_gadcon_layout_thaw(Evas_Object *obj)
{
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
sd->frozen--;
_e_gadcon_layout_smart_reconfigure(sd);
}
static void static void
e_gadcon_layout_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) e_gadcon_layout_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{ {
@ -817,6 +983,8 @@ e_gadcon_layout_pack_request_set(Evas_Object *obj, int pos, int size)
bi->ask.res = bi->sd->w; bi->ask.res = bi->sd->w;
else else
bi->ask.res = bi->sd->h; bi->ask.res = bi->sd->h;
if (pos < 0) pos = 0;
if ((bi->ask.res - pos) < size) pos = bi->ask.res - size;
bi->ask.size = size; bi->ask.size = size;
bi->ask.pos = pos; bi->ask.pos = pos;
_e_gadcon_layout_smart_reconfigure(bi->sd); _e_gadcon_layout_smart_reconfigure(bi->sd);
@ -836,6 +1004,18 @@ e_gadcon_layout_pack_options_set(Evas_Object *obj, int pos, int size, int res)
_e_gadcon_layout_smart_reconfigure(bi->sd); _e_gadcon_layout_smart_reconfigure(bi->sd);
} }
static void
e_gadcon_layout_pack_min_size_set(Evas_Object *obj, int w, int h)
{
E_Gadcon_Layout_Item *bi;
bi = evas_object_data_get(obj, "e_gadcon_layout_data");
if (!bi) return;
bi->min.w = w;
bi->min.h = h;
_e_gadcon_layout_smart_reconfigure(bi->sd);
}
static void static void
e_gadcon_layout_unpack(Evas_Object *obj) e_gadcon_layout_unpack(Evas_Object *obj)
{ {
@ -939,11 +1119,88 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
int count, expand; int count, expand;
Evas_List *list_s = NULL, *list_m = NULL, *list_e = NULL, *list = NULL; Evas_List *list_s = NULL, *list_m = NULL, *list_e = NULL, *list = NULL;
if (sd->frozen) return;
x = sd->x; x = sd->x;
y = sd->y; y = sd->y;
w = sd->w; w = sd->w;
h = sd->h; h = sd->h;
min = 0;
cur = 0;
for (l = sd->items; l; l = l->next)
{
E_Gadcon_Layout_Item *bi;
Evas_Object *obj;
obj = l->data;
bi = evas_object_data_get(obj, "e_gadcon_layout_data");
cur += bi->ask.size;
if (sd->horizontal)
min += bi->min.w;
else
min += bi->min.h;
bi->ask.size2 = bi->ask.size;
}
if (sd->horizontal)
{
if (cur < w)
{
/* all is fine - it should all fit */
}
else
{
int sub, give, num, given, i;
sub = cur - w; /* we need to find "sub" extra pixels */
if (min <= w)
{
for (l = sd->items; l; l = l->next)
{
E_Gadcon_Layout_Item *bi;
Evas_Object *obj;
obj = l->data;
bi = evas_object_data_get(obj, "e_gadcon_layout_data");
give = bi->ask.size - bi->min.w; // how much give does this have?
if (give < sub) give = sub;
bi->ask.size2 = bi->ask.size - give;
sub -= give;
if (sub <= 0) break;
}
}
else
{ /* EEK - all items just cant fit at their minimum! what do we do? */
num = 0;
num = evas_list_count(sd->items);
give = min - w; // how much give total below minw we need
given = 0;
for (l = sd->items; l; l = l->next)
{
E_Gadcon_Layout_Item *bi;
Evas_Object *obj;
obj = l->data;
bi = evas_object_data_get(obj, "e_gadcon_layout_data");
bi->ask.size2 = bi->min.w;
if (!l->next)
{
bi->ask.size2 -= (give - given);
}
else
{
i = (give + (num / 2)) / num;
given -= i;
bi->ask.size2 -= i;
}
}
}
}
}
else
{
}
for (l = sd->items; l; l = l->next) for (l = sd->items; l; l = l->next)
{ {
E_Gadcon_Layout_Item *bi; E_Gadcon_Layout_Item *bi;
@ -958,36 +1215,36 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
if (xx < (bi->ask.res / 3)) if (xx < (bi->ask.res / 3))
{ /* hooked to start */ { /* hooked to start */
bi->x = bi->ask.pos; bi->x = bi->ask.pos;
bi->w = bi->ask.size; bi->w = bi->ask.size2;
list_s = evas_list_append(list_s, obj); list_s = evas_list_append(list_s, obj);
bi->hookp = 0; bi->hookp = 0;
} }
else if (xx > ((2 * bi->ask.res) / 3)) else if (xx > ((2 * bi->ask.res) / 3))
{ /* hooked to end */ { /* hooked to end */
bi->x = (bi->ask.pos - bi->ask.res) + w; bi->x = (bi->ask.pos - bi->ask.res) + w;
bi->w = bi->ask.size; bi->w = bi->ask.size2;
list_e = evas_list_append(list_e, obj); list_e = evas_list_append(list_e, obj);
bi->hookp = bi->ask.res; bi->hookp = bi->ask.res;
} }
else else
{ /* hooked to middle */ { /* hooked to middle */
if ((bi->ask.pos <= (bi->ask.res / 2)) && if ((bi->ask.pos <= (bi->ask.res / 2)) &&
((bi->ask.pos + bi->ask.size) > (bi->ask.res / 2))) ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
{ /* straddles middle */ { /* straddles middle */
if (bi->ask.res > 2) if (bi->ask.res > 2)
bi->x = (w / 2) + bi->x = (w / 2) +
(((bi->ask.pos + (bi->ask.size / 2) - (((bi->ask.pos + (bi->ask.size2 / 2) -
(bi->ask.res / 2)) * (bi->ask.res / 2)) *
(bi->ask.res / 2)) / (bi->ask.res / 2)) /
(bi->ask.res / 2)) - (bi->ask.size / 2); (bi->ask.res / 2)) - (bi->ask.size2 / 2);
else else
bi->x = w / 2; bi->x = w / 2;
bi->w = bi->ask.size; bi->w = bi->ask.size2;
} }
else else
{ /* either side of middle */ { /* either side of middle */
bi->x = (bi->ask.pos - (bi->ask.res / 2)) + (w / 2); bi->x = (bi->ask.pos - (bi->ask.res / 2)) + (w / 2);
bi->w = bi->ask.size; bi->w = bi->ask.size2;
} }
list_m = evas_list_append(list_m, obj); list_m = evas_list_append(list_m, obj);
bi->hookp = bi->ask.res / 2; bi->hookp = bi->ask.res / 2;
@ -997,40 +1254,40 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
} }
else else
{ {
yy = bi->ask.pos + (bi->ask.size / 2); yy = bi->ask.pos + (bi->ask.size2 / 2);
if (yy < (bi->ask.res / 3)) if (yy < (bi->ask.res / 3))
{ /* hooked to start */ { /* hooked to start */
bi->y = bi->ask.pos; bi->y = bi->ask.pos;
bi->h = bi->ask.size; bi->h = bi->ask.size2;
list_s = evas_list_append(list_s, obj); list_s = evas_list_append(list_s, obj);
bi->hookp = 0; bi->hookp = 0;
} }
else if (yy > ((2 * bi->ask.res) / 3)) else if (yy > ((2 * bi->ask.res) / 3))
{ /* hooked to end */ { /* hooked to end */
bi->y = (bi->ask.pos - bi->ask.res) + h; bi->y = (bi->ask.pos - bi->ask.res) + h;
bi->h = bi->ask.size; bi->h = bi->ask.size2;
list_e = evas_list_append(list_e, obj); list_e = evas_list_append(list_e, obj);
bi->hookp = bi->ask.res; bi->hookp = bi->ask.res;
} }
else else
{ /* hooked to middle */ { /* hooked to middle */
if ((bi->ask.pos <= (bi->ask.res / 2)) && if ((bi->ask.pos <= (bi->ask.res / 2)) &&
((bi->ask.pos + bi->ask.size) > (bi->ask.res / 2))) ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
{ /* straddles middle */ { /* straddles middle */
if (bi->ask.res > 2) if (bi->ask.res > 2)
bi->y = (h / 2) + bi->y = (h / 2) +
(((bi->ask.pos + (bi->ask.size / 2) - (((bi->ask.pos + (bi->ask.size2 / 2) -
(bi->ask.res / 2)) * (bi->ask.res / 2)) *
(bi->ask.res / 2)) / (bi->ask.res / 2)) /
(bi->ask.res / 2)) - (bi->ask.size / 2); (bi->ask.res / 2)) - (bi->ask.size2 / 2);
else else
bi->y = h / 2; bi->y = h / 2;
bi->h = bi->ask.size; bi->h = bi->ask.size2;
} }
else else
{ /* either side of middle */ { /* either side of middle */
bi->y = (bi->ask.pos - (bi->ask.res / 2)) + (h / 2); bi->y = (bi->ask.pos - (bi->ask.res / 2)) + (h / 2);
bi->h = bi->ask.size; bi->h = bi->ask.size2;
} }
list_s = evas_list_append(list_s, obj); list_s = evas_list_append(list_s, obj);
bi->hookp = bi->ask.res / 2; bi->hookp = bi->ask.res / 2;
@ -1109,8 +1366,6 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
} }
} }
} }
min = 0;
cur = 0;
for (l = list; l; l = l->next) for (l = list; l; l = l->next)
{ {
E_Gadcon_Layout_Item *bi; E_Gadcon_Layout_Item *bi;
@ -1118,11 +1373,6 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
obj = l->data; obj = l->data;
bi = evas_object_data_get(obj, "e_gadcon_layout_data"); bi = evas_object_data_get(obj, "e_gadcon_layout_data");
cur += bi->ask.size;
if (sd->horizontal)
min += bi->min.w;
else
min += bi->min.h;
bi->can_move = 1; bi->can_move = 1;
if (!l->prev) if (!l->prev)
{ {
@ -1143,67 +1393,115 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
} }
if (sd->horizontal) if (sd->horizontal)
{ {
if (cur < w) int overlap;
{ /* reshuffle so things fit */ int count;
int overlap;
int count; overlap = 1;
count = 0;
overlap = 1; while (overlap)
count = 0; {
while (overlap) overlap = 0;
for (l = list; l; l = l->next)
{ {
printf("FIX OVERLAP!\n"); E_Gadcon_Layout_Item *bi;
overlap = 0; Evas_Object *obj;
for (l = list; l; l = l->next)
obj = l->data;
bi = evas_object_data_get(obj, "e_gadcon_layout_data");
if (bi->can_move)
{ {
E_Gadcon_Layout_Item *bi; for (l2 = l->next; l2; l2 = l2->next)
Evas_Object *obj;
obj = l->data;
bi = evas_object_data_get(obj, "e_gadcon_layout_data");
if (bi->can_move)
{ {
for (l2 = l->next; l2; l2 = l2->next) E_Gadcon_Layout_Item *bi2;
obj = l2->data;
bi2 = evas_object_data_get(obj, "e_gadcon_layout_data");
if (E_SPANS_COMMON(bi->x, bi->w, bi2->x, bi2->w))
{ {
E_Gadcon_Layout_Item *bi2; bi->x = bi2->x - bi->w;
if (!bi2->can_move) bi->can_move = 0;
obj = l2->data; if ((bi->x + bi->w) >= w) bi->x = w - bi->w;
bi2 = evas_object_data_get(obj, "e_gadcon_layout_data"); if (bi->x <= 0) bi->x = 0;
if (E_SPANS_COMMON(bi->x, bi->w, bi2->x, bi2->w)) overlap = 1;
{
bi->x = bi2->x - bi->w;
if (!bi2->can_move) bi->can_move = 0;
if ((bi->x + bi->w) >= w) bi->x = w - bi->w;
if (bi->x <= 0) bi->x = 0;
overlap = 1;
}
} }
for (l2 = l->prev; l2; l2 = l2->prev) }
for (l2 = l->prev; l2; l2 = l2->prev)
{
E_Gadcon_Layout_Item *bi2;
obj = l2->data;
bi2 = evas_object_data_get(obj, "e_gadcon_layout_data");
if (E_SPANS_COMMON(bi->x, bi->w, bi2->x, bi2->w))
{ {
E_Gadcon_Layout_Item *bi2; bi->x = bi2->x + bi2->w;
if (!bi2->can_move) bi->can_move = 0;
obj = l2->data; if ((bi->x + bi->w) >= w) bi->x = w - bi->w;
bi2 = evas_object_data_get(obj, "e_gadcon_layout_data"); if (bi->x <= 0) bi->x = 0;
if (E_SPANS_COMMON(bi->x, bi->w, bi2->x, bi2->w)) overlap = 1;
{
bi->x = bi2->x + bi2->w;
if (!bi2->can_move) bi->can_move = 0;
if ((bi->x + bi->w) >= w) bi->x = w - bi->w;
if (bi->x <= 0) bi->x = 0;
overlap = 1;
}
} }
} }
} }
count++;
if (count > 200) break; // quick infinite loop fix
} }
count++;
if (count > 200) break; // quick infinite loop fix
} }
else if (min < w) }
else
{
/* FIXME: for how this is just a copy of the above but in the vertical
* so when the above is "fixeD" the below needs to mirror it
*/
int overlap;
int count;
overlap = 1;
count = 0;
while (overlap)
{ {
} overlap = 0;
else for (l = list; l; l = l->next)
{ /* EEK - all items just cant fit at their minimum! what do we do? */ {
E_Gadcon_Layout_Item *bi;
Evas_Object *obj;
obj = l->data;
bi = evas_object_data_get(obj, "e_gadcon_layout_data");
if (bi->can_move)
{
for (l2 = l->next; l2; l2 = l2->next)
{
E_Gadcon_Layout_Item *bi2;
obj = l2->data;
bi2 = evas_object_data_get(obj, "e_gadcon_layout_data");
if (E_SPANS_COMMON(bi->y, bi->h, bi2->y, bi2->h))
{
bi->y = bi2->y - bi->h;
if (!bi2->can_move) bi->can_move = 0;
if ((bi->y + bi->h) >= h) bi->y = h - bi->h;
if (bi->y <= 0) bi->y = 0;
overlap = 1;
}
}
for (l2 = l->prev; l2; l2 = l2->prev)
{
E_Gadcon_Layout_Item *bi2;
obj = l2->data;
bi2 = evas_object_data_get(obj, "e_gadcon_layout_data");
if (E_SPANS_COMMON(bi->y, bi->h, bi2->y, bi2->h))
{
bi->y = bi2->y + bi2->h;
if (!bi2->can_move) bi->can_move = 0;
if ((bi->y + bi->h) >= h) bi->y = h - bi->h;
if (bi->y <= 0) bi->y = 0;
overlap = 1;
}
}
}
}
count++;
if (count > 200) break; // quick infinite loop fix
} }
} }

9
src/bin/e_gadcon.h
View File

@ -76,6 +76,10 @@ struct _E_Gadcon_Client
Evas_Object *o_event; Evas_Object *o_event;
E_Gadcon_Client_Class client_class; E_Gadcon_Client_Class client_class;
void *data; void *data;
struct {
int pos, size, res;
} config;
unsigned char moving : 1; unsigned char moving : 1;
Evas_Coord dx, dy, sx, sy; Evas_Coord dx, dy, sx, sy;
}; };
@ -89,12 +93,15 @@ EAPI void e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_P
EAPI void e_gadcon_populate(E_Gadcon *gc); EAPI void e_gadcon_populate(E_Gadcon *gc);
EAPI void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient); EAPI void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient);
EAPI void e_gadcon_edit_begin(E_Gadcon *gc); EAPI void e_gadcon_edit_begin(E_Gadcon *gc);
EAPI void e_gadcon_edit_end(E_Gadcon *gc);
EAPI void e_gadcon_all_edit_begin(void);
EAPI void e_gadcon_all_edit_end(void);
EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, char *name, char *id, Evas_Object *base_obj); EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, char *name, char *id, Evas_Object *base_obj);
EAPI void e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h); EAPI void e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h);
EAPI void e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h); EAPI void e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h);
EAPI void e_gadcon_client_max_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h);
EAPI void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc); EAPI void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc);
EAPI void e_gadcon_client_edit_end(E_Gadcon_Client *gcc);
#endif #endif
#endif #endif

10
src/bin/e_int_menus.c
View File

@ -794,9 +794,15 @@ _e_int_menus_gadgets_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi)
gm = data; gm = data;
if (e_menu_item_toggle_get(mi)) if (e_menu_item_toggle_get(mi))
e_gadman_mode_set(gm, E_GADMAN_MODE_EDIT); {
e_gadcon_all_edit_begin();
e_gadman_mode_set(gm, E_GADMAN_MODE_EDIT);
}
else else
e_gadman_mode_set(gm, E_GADMAN_MODE_NORMAL); {
e_gadcon_all_edit_end();
e_gadman_mode_set(gm, E_GADMAN_MODE_NORMAL);
}
} }
/* FIXME: /* FIXME:

1
src/bin/e_main.c
View File

@ -685,7 +685,6 @@ main(int argc, char **argv)
zone = l3->data; zone = l3->data;
es = e_shelf_zone_new(zone, "shelf"); es = e_shelf_zone_new(zone, "shelf");
e_shelf_populate(es); e_shelf_populate(es);
e_gadcon_edit_begin(es->gadcon);
} }
} }
} }