enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

santiago's embryo swallow patchs. 

SVN revision: 34249
This commit is contained in:
Carsten Haitzler 2008-04-11 23:36:35 +00:00
parent 27f1963fcb
commit 0afa61a56a
3 changed files with 186 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/edje/data/include/edje.inc
View File

@ -108,6 +108,7 @@ native stop_program (program_id);
native stop_programs_on (part_id); native stop_programs_on (part_id);
native set_min_size (Float:w, Float:h); native set_min_size (Float:w, Float:h);
native set_max_size (Float:w, Float:h); native set_max_size (Float:w, Float:h);
native part_swallow (part_id, GROUP:str[]);
enum Msg_Type enum Msg_Type
{ {

218
legacy/edje/src/bin/edje_cc_out.c
View File

@ -12,6 +12,7 @@
typedef struct _Part_Lookup Part_Lookup; typedef struct _Part_Lookup Part_Lookup;
typedef struct _Program_Lookup Program_Lookup; typedef struct _Program_Lookup Program_Lookup;
typedef struct _Group_Lookup Group_Lookup;
typedef struct _String_Lookup Image_Lookup; typedef struct _String_Lookup Image_Lookup;
typedef struct _String_Lookup Spectrum_Lookup; typedef struct _String_Lookup Spectrum_Lookup;
typedef struct _Slave_Lookup Slave_Lookup; typedef struct _Slave_Lookup Slave_Lookup;
@ -31,6 +32,11 @@ struct _Program_Lookup
int *dest; int *dest;
}; };
struct _Group_Lookup
{
char *name;
};
struct _String_Lookup struct _String_Lookup
{ {
char *name; char *name;
@ -50,8 +56,8 @@ struct _Code_Lookup
int val; int val;
}; };
static void data_queue_image_pc_lookup(Edje_Part_Collection *pc, char *name, int *dest); static void data_queue_image_pc_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len);
static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, int *val)); static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char *ptr, int len));
Edje_File *edje_file = NULL; Edje_File *edje_file = NULL;
Evas_List *edje_collections = NULL; Evas_List *edje_collections = NULL;
@ -77,6 +83,7 @@ static Eet_Data_Descriptor *edd_edje_spectrum_color = NULL;
static Evas_List *part_lookups = NULL; static Evas_List *part_lookups = NULL;
static Evas_List *program_lookups = NULL; static Evas_List *program_lookups = NULL;
static Evas_List *group_lookups = NULL;
static Evas_List *image_lookups = NULL; static Evas_List *image_lookups = NULL;
static Evas_List *spectrum_lookups = NULL; static Evas_List *spectrum_lookups = NULL;
static Evas_List *part_slave_lookups = NULL; static Evas_List *part_slave_lookups = NULL;
@ -820,6 +827,16 @@ data_write(void)
} }
} }
void
data_queue_group_lookup(char *name)
{
Group_Lookup *gl;
gl = mem_alloc(SZ(Group_Lookup));
group_lookups = evas_list_append(group_lookups, gl);
gl->name = mem_strdup(name);
}
void void
data_queue_part_lookup(Edje_Part_Collection *pc, char *name, int *dest) data_queue_part_lookup(Edje_Part_Collection *pc, char *name, int *dest)
{ {
@ -975,6 +992,31 @@ data_process_lookups(void)
free(pl); free(pl);
} }
while (group_lookups)
{
Group_Lookup *gl;
gl = group_lookups->data;
for (l = edje_file->collection_dir->entries; l; l = l->next)
{
Edje_Part_Collection_Directory_Entry *de;
de = l->data;
if (!strcmp(de->entry, gl->name))
{
break;
}
}
if (!l)
{
fprintf(stderr, "%s: Error. unable to find group name %s\n",
progname, gl->name);
exit(-1);
}
group_lookups = evas_list_remove(group_lookups, gl);
free(gl->name);
free(gl);
}
while (image_lookups) while (image_lookups)
{ {
Image_Lookup *il; Image_Lookup *il;
@ -1069,7 +1111,7 @@ data_process_lookups(void)
} }
static void static void
data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, int *val)) data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char* ptr, int len))
{ {
char *p; char *p;
char *key; char *key;
@ -1097,78 +1139,72 @@ data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void
{ {
if (!strncmp(p, key, keyl)) if (!strncmp(p, key, keyl))
{ {
Code_Lookup *cl; char *ptr;
int len;
int inesc = 0;
char *name;
cl = mem_alloc(SZ(Code_Lookup)); ptr = p;
if (cl) p += keyl;
while ((*p))
{ {
int inesc = 0; if (!inesc)
char *name; {
if (*p == '\\') inesc = 1;
cl->ptr = p; else if (*p == '\"')
p += keyl;
while ((*p))
{
if (!inesc)
{ {
if (*p == '\\') inesc = 1; /* string concatenation, see below */
else if (*p == '\"') if (*(p + 1) != '\"')
{ break;
/* string concatenation, see below */ else
if (*(p + 1) != '\"') p++;
break;
else
p++;
}
} }
else
inesc = 0;
p++;
} }
cl->len = p - cl->ptr + 1; else
name = alloca(cl->len); inesc = 0;
if (name) p++;
{ }
char *pp; len = p - ptr + 1;
int i; name = alloca(len);
if (name)
{
char *pp;
int i;
name[0] = 0; name[0] = 0;
pp = cl->ptr + keyl; pp = ptr + keyl;
inesc = 0; inesc = 0;
i = 0; i = 0;
while (*pp) while (*pp)
{
if (!inesc)
{ {
if (!inesc) if (*pp == '\\') inesc = 1;
{ else if (*pp == '\"')
if (*pp == '\\') inesc = 1; {
else if (*pp == '\"') /* concat strings like "foo""bar" to "foobar" */
{ if (*(pp + 1) == '\"')
/* concat strings like "foo""bar" to "foobar" */ pp++;
if (*(pp + 1) == '\"')
pp++;
else
{
name[i] = 0;
break;
}
}
else else
{ {
name[i] = *pp; name[i] = 0;
name[i + 1] = 0; break;
i++;
} }
} }
else else
inesc = 0; {
pp++; name[i] = *pp;
name[i + 1] = 0;
i++;
}
} }
func(pc, name, &(cl->val)); else
} inesc = 0;
code_lookups = evas_list_append(code_lookups, cl); pp++;
} }
else break; func(pc, name, ptr, len);
} }
}
} }
else else
{ {
@ -1186,13 +1222,49 @@ data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void
} }
static void static void
data_queue_image_pc_lookup(Edje_Part_Collection *pc, char *name, int *dest) _data_queue_part_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len)
{ {
data_queue_image_lookup(name, dest); Code_Lookup *cl;
cl = mem_alloc(SZ(Code_Lookup));
cl->ptr = ptr;
cl->len = len;
data_queue_part_lookup(pc, name, &(cl->val));
code_lookups = evas_list_append(code_lookups, cl);
}
static void
_data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len)
{
Code_Lookup *cl;
cl = mem_alloc(SZ(Code_Lookup));
cl->ptr = ptr;
cl->len = len;
data_queue_program_lookup(pc, name, &(cl->val));
code_lookups = evas_list_append(code_lookups, cl);
}
static void
_data_queue_group_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len)
{
data_queue_group_lookup(name);
}
static void
_data_queue_image_pc_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len)
{
Code_Lookup *cl;
cl = mem_alloc(SZ(Code_Lookup));
cl->ptr = ptr;
cl->len = len;
data_queue_image_lookup(name, &(cl->val));
code_lookups = evas_list_append(code_lookups, cl);
} }
static void static void
data_queue_spectrum_pc_lookup(Edje_Part_Collection *pc, char *name, int *dest) _data_queue_spectrum_pc_lookup(Edje_Part_Collection *pc, char *name, int *dest)
{ {
data_queue_spectrum_lookup(name, dest); data_queue_spectrum_lookup(name, dest);
} }
@ -1215,9 +1287,10 @@ data_process_scripts(void)
if (cd->shared) if (cd->shared)
{ {
data_process_string(pc, "PART", cd->shared, data_queue_part_lookup); data_process_string(pc, "PART", cd->shared, _data_queue_part_lookup);
data_process_string(pc, "PROGRAM", cd->shared, data_queue_program_lookup); data_process_string(pc, "PROGRAM", cd->shared, _data_queue_program_lookup);
data_process_string(pc, "IMAGE", cd->shared, data_queue_image_pc_lookup); data_process_string(pc, "IMAGE", cd->shared, _data_queue_image_pc_lookup);
data_process_string(pc, "GROUP", cd->shared, _data_queue_group_lookup);
} }
for (ll = cd->programs; ll; ll = ll->next) for (ll = cd->programs; ll; ll = ll->next)
{ {
@ -1226,9 +1299,10 @@ data_process_scripts(void)
cp = ll->data; cp = ll->data;
if (cp->script) if (cp->script)
{ {
data_process_string(pc, "PART", cp->script, data_queue_part_lookup); data_process_string(pc, "PART", cp->script, _data_queue_part_lookup);
data_process_string(pc, "PROGRAM", cp->script, data_queue_program_lookup); data_process_string(pc, "PROGRAM", cp->script, _data_queue_program_lookup);
data_process_string(pc, "IMAGE", cp->script, data_queue_image_pc_lookup); data_process_string(pc, "IMAGE", cp->script, _data_queue_image_pc_lookup);
data_process_string(pc, "GROUP", cp->script, _data_queue_group_lookup);
} }
} }
} }

39
legacy/edje/src/lib/edje_embryo.c
View File

@ -174,6 +174,7 @@
* set_clip(part_id, clip_part_id) * set_clip(part_id, clip_part_id)
* get_clip(part_id) * get_clip(part_id)
* *
* part_swallow(part_id, group_name)
* *
* ADD/DEL CUSTOM OBJECTS UNDER SOLE EMBRYO SCRIPT CONTROL * ADD/DEL CUSTOM OBJECTS UNDER SOLE EMBRYO SCRIPT CONTROL
* *
@ -2129,6 +2130,42 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
return 0; return 0;
} }
/* part_swallow(part_id, group_name) */
static Embryo_Cell
_edje_embryo_fn_part_swallow(Embryo_Program *ep, Embryo_Cell *params)
{
int part_id = 0;
char* group_name = 0;
Edje *ed;
Edje_Real_Part *rp;
Evas_Object *new_obj;
CHKPARAM(2);
part_id = params[1];
if (part_id < 0) return 0;
GETSTR(group_name, params[2]);
if (!group_name) return 0;
ed = embryo_program_data_get(ep);
rp = ed->table_parts[part_id % ed->table_parts_size];
if (!rp) return 0;
new_obj = edje_object_add(ed->evas);
if (!new_obj) return 0;
if (!edje_object_file_set(new_obj, ed->file->path, group_name))
{
evas_object_del(new_obj);
return 0;
}
edje_object_part_swallow(ed->obj, rp->part->name, new_obj);
return 0;
}
void void
_edje_embryo_script_init(Edje *ed) _edje_embryo_script_init(Edje *ed)
{ {
@ -2203,6 +2240,8 @@ _edje_embryo_script_init(Edje *ed)
embryo_program_native_call_add(ep, "set_state_val", _edje_embryo_fn_set_state_val); embryo_program_native_call_add(ep, "set_state_val", _edje_embryo_fn_set_state_val);
embryo_program_native_call_add(ep, "get_state_val", _edje_embryo_fn_get_state_val); embryo_program_native_call_add(ep, "get_state_val", _edje_embryo_fn_get_state_val);
embryo_program_native_call_add(ep, "part_swallow", _edje_embryo_fn_part_swallow);
// embryo_program_vm_push(ed->collection->script); // embryo_program_vm_push(ed->collection->script);
// _edje_embryo_globals_init(ed); // _edje_embryo_globals_init(ed);
} }