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

edje: reformat bin/ c files 

a lot of this was unreadable due to mixed tabs/spaces or just random
formatting
This commit is contained in:
Mike Blumenkrantz 2018-02-26 16:15:30 -05:00
parent 645c573efb
commit 30378f26fa
18 changed files with 6282 additions and 5939 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/edje/edje_cc.c
View File

@ -72,12 +72,15 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
case EINA_LOG_LEVEL_CRITICAL: case EINA_LOG_LEVEL_CRITICAL:
prefix = "Critical. "; prefix = "Critical. ";
break; break;
case EINA_LOG_LEVEL_ERR: case EINA_LOG_LEVEL_ERR:
prefix = "Error. "; prefix = "Error. ";
break; break;
case EINA_LOG_LEVEL_WARN: case EINA_LOG_LEVEL_WARN:
prefix = "Warning. "; prefix = "Warning. ";
break; break;
default: default:
prefix = ""; prefix = "";
} }
@ -448,3 +451,4 @@ main(int argc, char **argv)
return 0; return 0;
} }

291
src/bin/edje/edje_cc_handlers.c
View File

File diff suppressed because it is too large Load Diff

1
src/bin/edje/edje_cc_mem.c
View File

@ -32,3 +32,4 @@ mem_strdup(const char *s)
exit(-1); exit(-1);
return NULL; return NULL;
} }

35
src/bin/edje/edje_cc_out.c
View File

@ -34,7 +34,6 @@ typedef struct _Group_Lookup Group_Lookup;
typedef struct _Image_Lookup Image_Lookup; typedef struct _Image_Lookup Image_Lookup;
typedef struct _Code_Lookup Code_Lookup; typedef struct _Code_Lookup Code_Lookup;
struct _External_Lookup struct _External_Lookup
{ {
char *name; char *name;
@ -44,9 +43,11 @@ struct _Part_Lookup_Key
{ {
Edje_Part_Collection *pc; Edje_Part_Collection *pc;
union { union
{
int *dest; int *dest;
struct { struct
{
unsigned char **base; unsigned char **base;
int offset; int offset;
} reallocated; } reallocated;
@ -476,7 +477,6 @@ check_text_part_desc(Edje_Part_Collection *pc, Edje_Part *ep,
if (epd->text.id_text_source != -1) if (epd->text.id_text_source != -1)
{ {
if ((pc->parts[epd->text.id_text_source]->type == EDJE_PART_TYPE_TEXT) || if ((pc->parts[epd->text.id_text_source]->type == EDJE_PART_TYPE_TEXT) ||
(pc->parts[epd->text.id_text_source]->type == EDJE_PART_TYPE_TEXTBLOCK)) (pc->parts[epd->text.id_text_source]->type == EDJE_PART_TYPE_TEXTBLOCK))
return; return;
@ -621,7 +621,6 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
check_text_part_desc(pc, ep, (Edje_Part_Description_Text *)ep->other.desc[i], ef); check_text_part_desc(pc, ep, (Edje_Part_Description_Text *)ep->other.desc[i], ef);
} }
/* FIXME: When smart masks are supported, remove this check */ /* FIXME: When smart masks are supported, remove this check */
if (ep->clip_to_id != -1 && if (ep->clip_to_id != -1 &&
(pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) &&
@ -645,6 +644,7 @@ check_program(Edje_Part_Collection *pc, Edje_Program *ep, Eet_File *ef)
error_and_abort(ef, "Collection %i: target missing in program " error_and_abort(ef, "Collection %i: target missing in program "
"\"%s\"", pc->id, ep->name); "\"%s\"", pc->id, ep->name);
break; break;
default: default:
break; break;
} }
@ -1495,7 +1495,6 @@ data_check_models(Eet_File *ef EINA_UNUSED, int *model_num EINA_UNUSED)
snprintf(buf, sizeof(buf), "%s/%s", s, model->entry); snprintf(buf, sizeof(buf), "%s/%s", s, model->entry);
file_exist = file_exist || ecore_file_exists(buf); file_exist = file_exist || ecore_file_exists(buf);
} }
if (!file_exist) if (!file_exist)
{ {
@ -1684,7 +1683,6 @@ data_thread_mo(void *data, Ecore_Thread *thread EINA_UNUSED)
INF("Wrote %9i bytes (%4iKb) for \"%s\" %s mo entry \"%s\"", INF("Wrote %9i bytes (%4iKb) for \"%s\" %s mo entry \"%s\"",
bytes, (bytes + 512) / 1024, moid_str, "RAW PCM", mw->mo_entry->locale); bytes, (bytes + 512) / 1024, moid_str, "RAW PCM", mw->mo_entry->locale);
} }
static void static void
@ -1886,6 +1884,7 @@ data_write_vibrations(Eet_File *ef, int *num)
} }
} }
} }
static void static void
check_groups(Eet_File *ef) check_groups(Eet_File *ef)
{ {
@ -2002,7 +2001,8 @@ create_script_file(Eet_File *ef, const char *filename, const Code *cd, int fd)
newlined = 0; newlined = 0;
if (sp[0] == '\n') newlined = 1; if (sp[0] == '\n') newlined = 1;
if (!hash) fputc(sp[0], f); if (!hash) fputc(sp[0], f);
else if (sp[0] == '\n') hash = 0; else if (sp[0] == '\n')
hash = 0;
} }
fputc('\n', f); fputc('\n', f);
} }
@ -2034,7 +2034,8 @@ create_script_file(Eet_File *ef, const char *filename, const Code *cd, int fd)
newlined = 0; newlined = 0;
if (sp[0] == '\n') newlined = 1; if (sp[0] == '\n') newlined = 1;
if (!hash) fputc(sp[0], f); if (!hash) fputc(sp[0], f);
else if (sp[0] == '\n') hash = 0; else if (sp[0] == '\n')
hash = 0;
} }
} }
fprintf(f, "}\n"); fprintf(f, "}\n");
@ -2311,7 +2312,6 @@ _edje_lua_script_writer(lua_State *L EINA_UNUSED, const void *chunk_buf, size_t
Script_Lua_Writer *data; Script_Lua_Writer *data;
void *old; void *old;
data = (Script_Lua_Writer *)_data; data = (Script_Lua_Writer *)_data;
old = data->buf; old = data->buf;
data->buf = realloc(data->buf, data->size + chunk_size); data->buf = realloc(data->buf, data->size + chunk_size);
@ -2328,6 +2328,7 @@ _edje_lua_script_writer(lua_State *L EINA_UNUSED, const void *chunk_buf, size_t
return 0; return 0;
} }
#endif #endif
void void
@ -2341,15 +2342,19 @@ _edje_lua_error_and_abort(lua_State *L, int err_code, Script_Write *sc)
case LUA_ERRRUN: case LUA_ERRRUN:
err_type = "runtime"; err_type = "runtime";
break; break;
case LUA_ERRSYNTAX: case LUA_ERRSYNTAX:
err_type = "syntax"; err_type = "syntax";
break; break;
case LUA_ERRMEM: case LUA_ERRMEM:
err_type = "memory allocation"; err_type = "memory allocation";
break; break;
case LUA_ERRERR: case LUA_ERRERR:
err_type = "error handler"; err_type = "error handler";
break; break;
default: default:
err_type = "unknown"; err_type = "unknown";
break; break;
@ -3080,7 +3085,6 @@ part_lookup_del(Edje_Part_Collection *pc, int *dest)
eina_hash_del(part_pc_dest_lookup, &key, pl); eina_hash_del(part_pc_dest_lookup, &key, pl);
} }
void void
part_lookup_delete(Edje_Part_Collection *pc, const char *name, int *dest, char **dest2) part_lookup_delete(Edje_Part_Collection *pc, const char *name, int *dest, char **dest2)
{ {
@ -3624,7 +3628,6 @@ _data_image_id_update(Eina_List *images_unused_list)
break; break;
} }
} }
} }
} }
} }
@ -4256,7 +4259,8 @@ data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void
if (!escape) if (!escape)
{ {
if (*p == '\"') quote = 0; if (*p == '\"') quote = 0;
else if (*p == '\\') escape = 1; else if (*p == '\\')
escape = 1;
} }
else if (escape) else if (escape)
{ {
@ -4279,6 +4283,7 @@ _data_queue_part_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len
code_lookups = eina_list_append(code_lookups, cl); code_lookups = eina_list_append(code_lookups, cl);
} }
static void static void
_data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len) _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int len)
{ {
@ -4292,11 +4297,13 @@ _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int
code_lookups = eina_list_append(code_lookups, cl); code_lookups = eina_list_append(code_lookups, cl);
} }
static void static void
_data_queue_group_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr EINA_UNUSED, int len EINA_UNUSED) _data_queue_group_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr EINA_UNUSED, int len EINA_UNUSED)
{ {
data_queue_group_lookup(name, NULL); data_queue_group_lookup(name, NULL);
} }
static void static void
_data_queue_image_pc_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr, int len) _data_queue_image_pc_lookup(Edje_Part_Collection *pc EINA_UNUSED, char *name, char *ptr, int len)
{ {
@ -4536,7 +4543,6 @@ process_color_tree(char *s, const char *f_in, int ln)
} }
id = !id; id = !id;
} while (*s); } while (*s);
if (eina_array_count(array)) if (eina_array_count(array))
@ -4644,3 +4650,4 @@ convert_color_code(char *str, int *r, int *g, int *b, int *a)
free(str); free(str);
} }

39
src/bin/edje/edje_cc_parse.c
View File

@ -2,7 +2,6 @@
# include <config.h> # include <config.h>
#endif #endif
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <limits.h> #include <limits.h>
@ -66,7 +65,6 @@ static int _is_op2f(char c);
static double _calcf(char op, double a, double b); static double _calcf(char op, double a, double b);
static int strstrip(const char *in, char *out, size_t size); static int strstrip(const char *in, char *out, size_t size);
int line = 0; int line = 0;
Eina_List *stack = NULL; Eina_List *stack = NULL;
Eina_Array params; Eina_Array params;
@ -473,11 +471,11 @@ next_token(char *p, char *end, char **new_p, int *delim)
(isspace(*p)) || (isspace(*p)) ||
((*delim) && (!isdelim(*p))) || ((*delim) && (!isdelim(*p))) ||
(isdelim(*p)) (isdelim(*p))
) ) /*the line below this is never used because it skips to
{/*the line below this is never used because it skips to
* the 'done' label which is after the return call for * the 'done' label which is after the return call for
* in_tok being 0. is this intentional? * in_tok being 0. is this intentional?
*/ */
{
in_tok = 0; in_tok = 0;
tok_end = p - 1; tok_end = p - 1;
@ -785,7 +783,8 @@ parse(char *data, off_t size)
err_show(); err_show();
exit(-1); exit(-1);
} }
else if (*token == ',' || *token == ':') do_params = 1; else if (*token == ',' || *token == ':')
do_params = 1;
else if (*token == '}') else if (*token == '}')
{ {
if (do_params) if (do_params)
@ -922,7 +921,8 @@ parse(char *data, off_t size)
else if ((!inquotes) && (!insquotes)) else if ((!inquotes) && (!insquotes))
{ {
if (p[0] == '{') squigglie++; if (p[0] == '{') squigglie++;
else if (p[0] == '}') squigglie--; else if (p[0] == '}')
squigglie--;
if (squigglie == 0) if (squigglie == 0)
{ {
verbatim_2 = p - 1; verbatim_2 = p - 1;
@ -1665,7 +1665,7 @@ _get_numi(char *s, int *val)
} }
buf[pos] = '\0'; buf[pos] = '\0';
(*val) = atoi(buf); (*val) = atoi(buf);
return (s + pos); return s + pos;
} }
int int
@ -1683,8 +1683,11 @@ _is_op1i(char c)
switch (c) switch (c)
{ {
case '*':; case '*':;
case '%':; case '%':;
case '/': return 1; case '/': return 1;
default: break; default: break;
} }
return 0; return 0;
@ -1696,7 +1699,9 @@ _is_op2i(char c)
switch (c) switch (c)
{ {
case '+':; case '+':;
case '-': return 1; case '-': return 1;
default: break; default: break;
} }
return 0; return 0;
@ -1710,22 +1715,27 @@ _calci(char op, int a, int b)
case '+': case '+':
a += b; a += b;
return a; return a;
case '-': case '-':
a -= b; a -= b;
return a; return a;
case '/': case '/':
if (0 != b) a /= b; if (0 != b) a /= b;
else else
ERR("%s:%i divide by zero", file_in, line - 1); ERR("%s:%i divide by zero", file_in, line - 1);
return a; return a;
case '*': case '*':
a *= b; a *= b;
return a; return a;
case '%': case '%':
if (0 != b) a = a % b; if (0 != b) a = a % b;
else else
ERR("%s:%i modula by zero", file_in, line - 1); ERR("%s:%i modula by zero", file_in, line - 1);
return a; return a;
default: default:
ERR("%s:%i unexpected character '%c'", file_in, line - 1, op); ERR("%s:%i unexpected character '%c'", file_in, line - 1, op);
} }
@ -1870,7 +1880,7 @@ _get_numf(char *s, double *val)
} }
buf[pos] = '\0'; buf[pos] = '\0';
(*val) = atof(buf); (*val) = atof(buf);
return (s+pos); return s + pos;
} }
static int static int
@ -1890,8 +1900,11 @@ _is_op1f(char c)
switch (c) switch (c)
{ {
case '*':; case '*':;
case '%':; case '%':;
case '/': return 1; case '/': return 1;
default: break; default: break;
} }
return 0; return 0;
@ -1903,7 +1916,9 @@ _is_op2f(char c)
switch (c) switch (c)
{ {
case '+':; case '+':;
case '-': return 1; case '-': return 1;
default: break; default: break;
} }
return 0; return 0;
@ -1917,22 +1932,27 @@ _calcf(char op, double a, double b)
case '+': case '+':
a += b; a += b;
return a; return a;
case '-': case '-':
a -= b; a -= b;
return a; return a;
case '/': case '/':
if (b != 0) a /= b; if (b != 0) a /= b;
else else
ERR("%s:%i divide by zero", file_in, line - 1); ERR("%s:%i divide by zero", file_in, line - 1);
return a; return a;
case '*': case '*':
a *= b; a *= b;
return a; return a;
case '%': case '%':
if (0 != b) a = (double)((int)a % (int)b); if (0 != b) a = (double)((int)a % (int)b);
else else
ERR("%s:%i modula by zero", file_in, line - 1); ERR("%s:%i modula by zero", file_in, line - 1);
return a; return a;
default: default:
ERR("%s:%i unexpected character '%c'", file_in, line - 1, op); ERR("%s:%i unexpected character '%c'", file_in, line - 1, op);
} }
@ -1982,5 +2002,6 @@ get_param_index(char *str)
int int
param_had_quote(int n) param_had_quote(int n)
{ {
return (params_quote & (1 << n)); return params_quote & (1 << n);
} }

17
src/bin/edje/edje_cc_script.c
View File

@ -102,6 +102,7 @@ code_parse_internal(Code *code)
sym = mem_alloc(SZ(Code_Symbol)); sym = mem_alloc(SZ(Code_Symbol));
sym->tag = eina_array_pop(name_stack); sym->tag = eina_array_pop(name_stack);
break; break;
case TOKEN_TYPE_SEMICOLON: case TOKEN_TYPE_SEMICOLON:
if (eina_array_count(name_stack)) if (eina_array_count(name_stack))
{ {
@ -114,6 +115,7 @@ code_parse_internal(Code *code)
} }
is_public = EINA_FALSE; is_public = EINA_FALSE;
break; break;
case TOKEN_TYPE_COMMA: case TOKEN_TYPE_COMMA:
if (!sym) if (!sym)
sym = mem_alloc(SZ(Code_Symbol)); sym = mem_alloc(SZ(Code_Symbol));
@ -127,6 +129,7 @@ code_parse_internal(Code *code)
} }
sym = NULL; sym = NULL;
break; break;
case TOKEN_TYPE_PARENS: case TOKEN_TYPE_PARENS:
is_args = !is_args; is_args = !is_args;
if (is_args) if (is_args)
@ -152,6 +155,7 @@ code_parse_internal(Code *code)
sym = func; sym = func;
} }
break; break;
case TOKEN_TYPE_BRACES: case TOKEN_TYPE_BRACES:
depth = 1; depth = 1;
body = begin; body = begin;
@ -164,6 +168,7 @@ code_parse_internal(Code *code)
case '{': case '{':
depth++; depth++;
break; break;
case '}': case '}':
depth--; depth--;
break; break;
@ -182,13 +187,16 @@ code_parse_internal(Code *code)
sym = NULL; sym = NULL;
is_public = EINA_FALSE; is_public = EINA_FALSE;
break; break;
case TOKEN_TYPE_PUBLIC: case TOKEN_TYPE_PUBLIC:
is_public = EINA_TRUE; is_public = EINA_TRUE;
break; break;
case TOKEN_TYPE_IDENTIFIER: case TOKEN_TYPE_IDENTIFIER:
eina_array_push(name_stack, token->str); eina_array_push(name_stack, token->str);
token->str = NULL; token->str = NULL;
break; break;
default: default:
break; break;
} }
@ -231,6 +239,7 @@ next_token(char **begin, char *end)
if (index > 0) if (index > 0)
parsed = EINA_TRUE; parsed = EINA_TRUE;
break; break;
case ':': case ':':
case ';': case ';':
case ',': case ',':
@ -245,6 +254,7 @@ next_token(char **begin, char *end)
src++; src++;
} }
goto exit; goto exit;
default: default:
if (parsed) if (parsed)
goto exit; goto exit;
@ -259,23 +269,29 @@ exit:
case ':': case ':':
token->type = TOKEN_TYPE_COLON; token->type = TOKEN_TYPE_COLON;
break; break;
case ';': case ';':
token->type = TOKEN_TYPE_SEMICOLON; token->type = TOKEN_TYPE_SEMICOLON;
break; break;
case ',': case ',':
token->type = TOKEN_TYPE_COMMA; token->type = TOKEN_TYPE_COMMA;
break; break;
case '(': case '(':
case ')': case ')':
token->type = TOKEN_TYPE_PARENS; token->type = TOKEN_TYPE_PARENS;
break; break;
case '{': case '{':
case '}': case '}':
token->type = TOKEN_TYPE_BRACES; token->type = TOKEN_TYPE_BRACES;
break; break;
case '=': case '=':
token->type = TOKEN_TYPE_EQUAL_MARK; token->type = TOKEN_TYPE_EQUAL_MARK;
break; break;
case '\0': case '\0':
token->type = TOKEN_TYPE_EOF; token->type = TOKEN_TYPE_EOF;
break; break;
@ -448,3 +464,4 @@ script_rewrite(Code *code)
code->vars = vars; code->vars = vars;
code->func = func; code->func = func;
} }

5
src/bin/edje/edje_cc_sources.c
View File

@ -132,7 +132,8 @@ source_fetch_file(const char *fil, const char *filname)
char end = '\0'; char end = '\0';
if (*p == '"') end = '"'; if (*p == '"') end = '"';
else if (*p == '<') end = '>'; else if (*p == '<')
end = '>';
if (end) if (end)
{ {
@ -166,7 +167,6 @@ source_fetch_file(const char *fil, const char *filname)
file[l - 1] = 0; file[l - 1] = 0;
} }
fname = strdup(p + 1); fname = strdup(p + 1);
pp = strrchr(fname, end); pp = strrchr(fname, end);
if (pp) *pp = 0; if (pp) *pp = 0;
@ -230,3 +230,4 @@ source_fontmap_load(Eet_File *ef)
fl = eet_data_read(ef, _font_list_edd, "edje_source_fontmap"); fl = eet_data_read(ef, _font_list_edd, "edje_source_fontmap");
return fl; return fl;
} }

14
src/bin/edje/edje_codegen.c
View File

@ -338,9 +338,9 @@ static Eina_List *externals = NULL;
"void %s_%s_callback_del_full(Evas_Object *o, Edje_Signal_Cb func, " \ "void %s_%s_callback_del_full(Evas_Object *o, Edje_Signal_Cb func, " \
"void *data);\n" "void *data);\n"
typedef struct _Part_External_Info Part_External_Info; typedef struct _Part_External_Info Part_External_Info;
struct _Part_External_Info { struct _Part_External_Info
{
const char *description, *name, *source; const char *description, *name, *source;
char *apiname; char *apiname;
Eina_Bool draggable; Eina_Bool draggable;
@ -555,18 +555,23 @@ _write_part_external_param(const Part_External_Info *info,
case EDJE_EXTERNAL_PARAM_TYPE_INT: case EDJE_EXTERNAL_PARAM_TYPE_INT:
WRITE_TEMPLATE("int ", "EDJE_EXTERNAL_PARAM_TYPE_INT", "i"); WRITE_TEMPLATE("int ", "EDJE_EXTERNAL_PARAM_TYPE_INT", "i");
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
WRITE_TEMPLATE("double ", "EDJE_EXTERNAL_PARAM_TYPE_DOUBLE", "d"); WRITE_TEMPLATE("double ", "EDJE_EXTERNAL_PARAM_TYPE_DOUBLE", "d");
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_STRING: case EDJE_EXTERNAL_PARAM_TYPE_STRING:
WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_STRING", "s"); WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_STRING", "s");
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_BOOL: case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
WRITE_TEMPLATE("Eina_Bool ", "EDJE_EXTERNAL_PARAM_TYPE_BOOL", "i"); WRITE_TEMPLATE("Eina_Bool ", "EDJE_EXTERNAL_PARAM_TYPE_BOOL", "i");
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE: case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_CHOICE", "s"); WRITE_TEMPLATE("const char *", "EDJE_EXTERNAL_PARAM_TYPE_CHOICE", "s");
break; break;
default: default:
break; break;
} }
@ -643,7 +648,6 @@ _write_part_external(Eina_List **parts)
free(ei); free(ei);
*parts = eina_list_remove_list(*parts, l); *parts = eina_list_remove_list(*parts, l);
} }
} }
} }
@ -1127,7 +1131,8 @@ main(int argc, char *argv[])
ret = 1; ret = 1;
goto error_getopt; goto error_getopt;
} }
else if (quit_option) goto error_getopt; else if (quit_option)
goto error_getopt;
else if (arg_index != argc - 4) else if (arg_index != argc - 4)
{ {
fprintf(stderr, "Incorrect number of parameters. Requires " \ fprintf(stderr, "Incorrect number of parameters. Requires " \
@ -1233,3 +1238,4 @@ main(int argc, char *argv[])
return ret; return ret;
} }

5
src/bin/edje/edje_convert.c
View File

@ -221,7 +221,6 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
int *count; int *count;
int dummy = 0; int dummy = 0;
switch (part->type) switch (part->type)
{ {
#define CSP(Tp, Ce) \ #define CSP(Tp, Ce) \
@ -239,6 +238,7 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
CSP(TABLE, ce); CSP(TABLE, ce);
CSP(EXTERNAL, ce); CSP(EXTERNAL, ce);
CSP(VECTOR, ce); CSP(VECTOR, ce);
default: default:
count = &dummy; count = &dummy;
break; break;
@ -402,10 +402,12 @@ _edje_description_convert(int type,
result = eina_mempool_malloc(ce->mp.RECTANGLE, result = eina_mempool_malloc(ce->mp.RECTANGLE,
sizeof (Edje_Part_Description_Common)); sizeof (Edje_Part_Description_Common));
break; break;
case EDJE_PART_TYPE_SWALLOW: case EDJE_PART_TYPE_SWALLOW:
result = eina_mempool_malloc(ce->mp.SWALLOW, result = eina_mempool_malloc(ce->mp.SWALLOW,
sizeof (Edje_Part_Description_Common)); sizeof (Edje_Part_Description_Common));
break; break;
case EDJE_PART_TYPE_GROUP: case EDJE_PART_TYPE_GROUP:
result = eina_mempool_malloc(ce->mp.GROUP, result = eina_mempool_malloc(ce->mp.GROUP,
sizeof (Edje_Part_Description_Common)); sizeof (Edje_Part_Description_Common));
@ -467,3 +469,4 @@ _edje_description_convert(int type,
free(oed); free(oed);
return result; return result;
} }

1
src/bin/edje/edje_convert_main.c
View File

@ -205,3 +205,4 @@ main(int argc, char **argv)
return 0; return 0;
} }

1
src/bin/edje/edje_data_convert.c
View File

@ -454,3 +454,4 @@ _edje_edd_old_init(void)
0, /* 0, */ NULL, NULL); 0, /* 0, */ NULL, NULL);
} }
} }

22
src/bin/edje/edje_decc.c
View File

@ -12,7 +12,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#include <Ecore_File.h> #include <Ecore_File.h>
#include <Ecore_Evas.h> #include <Ecore_Evas.h>
@ -38,7 +37,6 @@ void output(void);
static int compiler_cmd_is_sane(void); static int compiler_cmd_is_sane(void);
static int root_filename_is_sane(void); static int root_filename_is_sane(void);
static void static void
_edje_cc_log_cb(const Eina_Log_Domain *d, _edje_cc_log_cb(const Eina_Log_Domain *d,
Eina_Log_Level level, Eina_Log_Level level,
@ -66,18 +64,23 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
case EINA_LOG_LEVEL_CRITICAL: case EINA_LOG_LEVEL_CRITICAL:
color = FOREGROUND_RED | FOREGROUND_INTENSITY; color = FOREGROUND_RED | FOREGROUND_INTENSITY;
break; break;
case EINA_LOG_LEVEL_ERR: case EINA_LOG_LEVEL_ERR:
color = FOREGROUND_RED; color = FOREGROUND_RED;
break; break;
case EINA_LOG_LEVEL_WARN: case EINA_LOG_LEVEL_WARN:
color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY; color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
break; break;
case EINA_LOG_LEVEL_INFO: case EINA_LOG_LEVEL_INFO:
color = FOREGROUND_GREEN | FOREGROUND_INTENSITY; color = FOREGROUND_GREEN | FOREGROUND_INTENSITY;
break; break;
case EINA_LOG_LEVEL_DBG: case EINA_LOG_LEVEL_DBG:
color = FOREGROUND_BLUE | FOREGROUND_INTENSITY; color = FOREGROUND_BLUE | FOREGROUND_INTENSITY;
break; break;
default: default:
color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
} }
@ -90,12 +93,15 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
case EINA_LOG_LEVEL_CRITICAL: case EINA_LOG_LEVEL_CRITICAL:
prefix = "Critical. "; prefix = "Critical. ";
break; break;
case EINA_LOG_LEVEL_ERR: case EINA_LOG_LEVEL_ERR:
prefix = "Error. "; prefix = "Error. ";
break; break;
case EINA_LOG_LEVEL_WARN: case EINA_LOG_LEVEL_WARN:
prefix = "Warning. "; prefix = "Warning. ";
break; break;
default: default:
prefix = ""; prefix = "";
} }
@ -111,7 +117,6 @@ _edje_cc_log_cb(const Eina_Log_Domain *d,
#endif #endif
} }
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
putc('\n', stderr); putc('\n', stderr);
} }
@ -285,7 +290,6 @@ output(void)
} }
} }
tef = eet_open(file_in, EET_FILE_MODE_READ); tef = eet_open(file_in, EET_FILE_MODE_READ);
if (edje_file->image_dir) if (edje_file->image_dir)
@ -443,7 +447,6 @@ output(void)
FILE *f; FILE *f;
sf = eina_list_data_get(srcfiles->list); sf = eina_list_data_get(srcfiles->list);
if (build_sh) if (build_sh)
{ {
snprintf(out, sizeof(out), "%s/build.sh", outdir); snprintf(out, sizeof(out), "%s/build.sh", outdir);
@ -478,7 +481,6 @@ output(void)
ERR("symlink %s -> %s failed", sf->name, out); ERR("symlink %s -> %s failed", sf->name, out);
} }
} }
} }
if (edje_file->sound_dir) if (edje_file->sound_dir)
@ -526,7 +528,6 @@ output(void)
else ERR("Could not open for writing sound: %s: %s", out1, strerror(errno)); else ERR("Could not open for writing sound: %s: %s", out1, strerror(errno));
} }
} }
} }
if (edje_file->vibration_dir) if (edje_file->vibration_dir)
{ {
@ -617,8 +618,12 @@ root_filename_is_sane()
/* only allow [a-z][A-Z][0-9]_-./ */ /* only allow [a-z][A-Z][0-9]_-./ */
switch (*ptr) switch (*ptr)
{ {
case '_': case '-': case '.': case '/': case '_':
case '-':
case '.':
case '/':
break; break;
default: default:
if (!isalnum(*ptr)) if (!isalnum(*ptr))
{ {
@ -628,3 +633,4 @@ root_filename_is_sane()
} }
return 1; return 1;
} }

40
src/bin/edje/edje_external_inspector.c
View File

@ -30,7 +30,6 @@ static char *type_glob = NULL;
static char *const *module_patterns; static char *const *module_patterns;
static const Eina_List *modules; static const Eina_List *modules;
static char * static char *
_module_patterns_str_new(void) _module_patterns_str_new(void)
{ {
@ -93,10 +92,15 @@ _param_type_str_get(const Edje_External_Param_Info *param)
switch (param->type) switch (param->type)
{ {
case EDJE_EXTERNAL_PARAM_TYPE_INT: return "int"; case EDJE_EXTERNAL_PARAM_TYPE_INT: return "int";
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: return "double"; case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: return "double";
case EDJE_EXTERNAL_PARAM_TYPE_STRING: return "string"; case EDJE_EXTERNAL_PARAM_TYPE_STRING: return "string";
case EDJE_EXTERNAL_PARAM_TYPE_BOOL: return "bool"; case EDJE_EXTERNAL_PARAM_TYPE_BOOL: return "bool";
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE: return "choice"; case EDJE_EXTERNAL_PARAM_TYPE_CHOICE: return "choice";
default: default:
ERR("Unknown parameter type %d", param->type); ERR("Unknown parameter type %d", param->type);
return "???"; return "???";
@ -123,7 +127,8 @@ _param_value_str_get(const Edje_External_Type *type, const Edje_External_Param_I
case EDJE_EXTERNAL_PARAM_TYPE_BOOL: case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
if (param->info.b.def == 0) return "0"; if (param->info.b.def == 0) return "0";
else if (param->info.b.def == 1) return "1"; else if (param->info.b.def == 1)
return "1";
return NULL; return NULL;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE: case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
@ -273,7 +278,8 @@ _param_extra_details(const Edje_External_Type *type, const Edje_External_Param_I
{ {
char **itr; char **itr;
_param_choices_print((const char *const *)choices); _param_choices_print((const char *const *)choices);
for (itr = choices; *itr; itr++) free(*itr); for (itr = choices; *itr; itr++)
free(*itr);
free(choices); free(choices);
} }
} }
@ -397,12 +403,14 @@ _info_list(void)
if (!type->label_get) str = NULL; if (!type->label_get) str = NULL;
else str = type->label_get(type->data); else str = type->label_get(type->data);
if (machine) printf("LABEL: %s\n", str ? str : ""); if (machine) printf("LABEL: %s\n", str ? str : "");
else if (str) printf(INDENT3 "label: \"%s\";\n", str); else if (str)
printf(INDENT3 "label: \"%s\";\n", str);
if (!type->description_get) str = NULL; if (!type->description_get) str = NULL;
else str = type->description_get(type->data); else str = type->description_get(type->data);
if (machine) printf("DESCRIPTION: %s\n", str ? str : ""); if (machine) printf("DESCRIPTION: %s\n", str ? str : "");
else if (str) printf(INDENT3 "description: \"%s\";\n", str); else if (str)
printf(INDENT3 "description: \"%s\";\n", str);
} }
if (machine) puts("PARAMS-BEGIN"); if (machine) puts("PARAMS-BEGIN");
@ -422,7 +430,8 @@ _info_list(void)
const char *str = _param_value_str_get const char *str = _param_value_str_get
(type, param, buf, sizeof(buf)); (type, param, buf, sizeof(buf));
if (machine) printf("DEFAULT: %s\n", str ? str : ""); if (machine) printf("DEFAULT: %s\n", str ? str : "");
else if (str) printf(" \"%s\"", str); else if (str)
printf(" \"%s\"", str);
if (detail > 1) if (detail > 1)
{ {
@ -432,7 +441,8 @@ _info_list(void)
} }
if (machine) puts("PARAM-END"); if (machine) puts("PARAM-END");
else if (detail > 1) putchar('\n'); else if (detail > 1)
putchar('\n');
else puts(";"); else puts(";");
} }
@ -625,15 +635,18 @@ main(int argc, char **argv)
ret = 1; ret = 1;
goto error_getopt; goto error_getopt;
} }
else if (quit_option) goto error_getopt; else if (quit_option)
goto error_getopt;
if (!mode) mode = (char *)mode_choices[0]; if (!mode) mode = (char *)mode_choices[0];
if (detail_name) if (detail_name)
{ {
if (!strcmp(detail_name, "none")) detail = 0; if (!strcmp(detail_name, "none")) detail = 0;
else if (!strcmp(detail_name, "terse")) detail = 1; else if (!strcmp(detail_name, "terse"))
else if (!strcmp(detail_name, "all")) detail = 2; detail = 1;
else if (!strcmp(detail_name, "all"))
detail = 2;
else ERR("Unknown detail level: '%s'", detail_name); else ERR("Unknown detail level: '%s'", detail_name);
} }
@ -644,8 +657,10 @@ main(int argc, char **argv)
module_patterns_str = _module_patterns_str_new(); module_patterns_str = _module_patterns_str_new();
if (!strcmp(mode, "info")) ret = _info_list(); if (!strcmp(mode, "info")) ret = _info_list();
else if (!strcmp(mode, "modules-names")) ret = _modules_names_list(); else if (!strcmp(mode, "modules-names"))
else if (!strcmp(mode, "types-names")) ret = _types_names_list(); ret = _modules_names_list();
else if (!strcmp(mode, "types-names"))
ret = _types_names_list();
else else
{ {
ERR("Unknown mode: %s", mode); ERR("Unknown mode: %s", mode);
@ -663,3 +678,4 @@ main(int argc, char **argv)
return ret; return ret;
} }

159
src/bin/edje/edje_inspector.c
View File

@ -130,12 +130,14 @@ group_details(Evas_Object *ed)
w = edje_edit_group_min_w_get(ed); w = edje_edit_group_min_w_get(ed);
h = edje_edit_group_min_h_get(ed); h = edje_edit_group_min_h_get(ed);
if (machine) printf("MIN-W: %d\nMIN-H: %d\n", w, h); if (machine) printf("MIN-W: %d\nMIN-H: %d\n", w, h);
else if ((w > 0) || (h > 0)) printf(INDENT "min: %d %d;\n", w, h); else if ((w > 0) || (h > 0))
printf(INDENT "min: %d %d;\n", w, h);
w = edje_edit_group_max_w_get(ed); w = edje_edit_group_max_w_get(ed);
h = edje_edit_group_max_h_get(ed); h = edje_edit_group_max_h_get(ed);
if (machine) printf("MAX-W: %d\nMAX-H: %d\n", w, h); if (machine) printf("MAX-W: %d\nMAX-H: %d\n", w, h);
else if ((w > 0) || (h > 0)) printf(INDENT "max: %d %d;\n", w, h); else if ((w > 0) || (h > 0))
printf(INDENT "max: %d %d;\n", w, h);
if (detail > 1) if (detail > 1)
{ {
@ -186,28 +188,40 @@ part_type_name_get(Edje_Part_Type t)
{ {
case EDJE_PART_TYPE_RECTANGLE: case EDJE_PART_TYPE_RECTANGLE:
return "RECT"; return "RECT";
case EDJE_PART_TYPE_TEXT: case EDJE_PART_TYPE_TEXT:
return "TEXT"; return "TEXT";
case EDJE_PART_TYPE_IMAGE: case EDJE_PART_TYPE_IMAGE:
return "IMAGE"; return "IMAGE";
case EDJE_PART_TYPE_PROXY: case EDJE_PART_TYPE_PROXY:
return "PROXY"; return "PROXY";
case EDJE_PART_TYPE_SWALLOW: case EDJE_PART_TYPE_SWALLOW:
return "SWALLOW"; return "SWALLOW";
case EDJE_PART_TYPE_TEXTBLOCK: case EDJE_PART_TYPE_TEXTBLOCK:
return "TEXTBLOCK"; return "TEXTBLOCK";
case EDJE_PART_TYPE_GRADIENT: case EDJE_PART_TYPE_GRADIENT:
return "GRADIENT"; return "GRADIENT";
case EDJE_PART_TYPE_GROUP: case EDJE_PART_TYPE_GROUP:
return "GROUP"; return "GROUP";
case EDJE_PART_TYPE_BOX: case EDJE_PART_TYPE_BOX:
return "BOX"; return "BOX";
case EDJE_PART_TYPE_TABLE: case EDJE_PART_TYPE_TABLE:
return "TABLE"; return "TABLE";
case EDJE_PART_TYPE_EXTERNAL: case EDJE_PART_TYPE_EXTERNAL:
return "EXTERNAL"; return "EXTERNAL";
case EDJE_PART_TYPE_SPACER: case EDJE_PART_TYPE_SPACER:
return "SPACER"; return "SPACER";
case EDJE_PART_TYPE_VECTOR: case EDJE_PART_TYPE_VECTOR:
return "VECTOR"; return "VECTOR";
@ -215,6 +229,7 @@ part_type_name_get(Edje_Part_Type t)
case EDJE_PART_TYPE_LAST: case EDJE_PART_TYPE_LAST:
ERR("Invalid part type %d", t); ERR("Invalid part type %d", t);
return "???"; return "???";
default: default:
ERR("Unknown part type %d", t); ERR("Unknown part type %d", t);
return "???"; return "???";
@ -239,9 +254,13 @@ aspect_pref_name_get(int id)
switch (id) switch (id)
{ {
case 0: return "NONE"; case 0: return "NONE";
case 1: return "VERTICAL"; case 1: return "VERTICAL";
case 2: return "HORIZONTAL"; case 2: return "HORIZONTAL";
case 3: return "BOTH"; case 3: return "BOTH";
default: default:
ERR("Unknown aspect preference %d", id); ERR("Unknown aspect preference %d", id);
return "???"; return "???";
@ -254,8 +273,11 @@ border_fill_name_get(int id)
switch (id) switch (id)
{ {
case 0: return "NONE"; case 0: return "NONE";
case 1: return "DEFAULT"; case 1: return "DEFAULT";
case 2: return "SOLID"; case 2: return "SOLID";
default: default:
ERR("Unknown border fill %d", id); ERR("Unknown border fill %d", id);
return "???"; return "???";
@ -274,7 +296,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
b = edje_edit_state_visible_get(ed, ppart, state, value); b = edje_edit_state_visible_get(ed, ppart, state, value);
if (machine) printf("VISIBLE: %d\n", b); if (machine) printf("VISIBLE: %d\n", b);
else if (!b) puts(INDENT4 "visible: 0;"); else if (!b)
puts(INDENT4 "visible: 0;");
edje_edit_state_color_get(ed, ppart, state, value, &r, &g, &b, &a); edje_edit_state_color_get(ed, ppart, state, value, &r, &g, &b, &a);
if (machine) if (machine)
@ -308,12 +331,14 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
x = edje_edit_state_min_w_get(ed, ppart, state, value); x = edje_edit_state_min_w_get(ed, ppart, state, value);
y = edje_edit_state_min_h_get(ed, ppart, state, value); y = edje_edit_state_min_h_get(ed, ppart, state, value);
if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y); if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y);
else if ((x) || (y)) printf(INDENT4 "min: %d %d;\n", x, y); else if ((x) || (y))
printf(INDENT4 "min: %d %d;\n", x, y);
x = edje_edit_state_max_w_get(ed, ppart, state, value); x = edje_edit_state_max_w_get(ed, ppart, state, value);
y = edje_edit_state_max_h_get(ed, ppart, state, value); y = edje_edit_state_max_h_get(ed, ppart, state, value);
if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y); if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y);
else if ((x != -1) || (y != -1)) printf(INDENT4 "max: %d %d;\n", x, y); else if ((x != -1) || (y != -1))
printf(INDENT4 "max: %d %d;\n", x, y);
//TODO Support fixed //TODO Support fixed
//TODO Support step //TODO Support step
@ -329,12 +354,14 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
x = edje_edit_state_aspect_pref_get(ed, ppart, state, value); x = edje_edit_state_aspect_pref_get(ed, ppart, state, value);
str = aspect_pref_name_get(x); str = aspect_pref_name_get(x);
if (machine) printf("ASPECT-PREFERENCE: %s\n", str); if (machine) printf("ASPECT-PREFERENCE: %s\n", str);
else if (x) printf(INDENT4 "aspect_preference: %s;\n", str); else if (x)
printf(INDENT4 "aspect_preference: %s;\n", str);
/* do not free this str! */ /* do not free this str! */
str = edje_edit_state_color_class_get(ed, ppart, state, value); str = edje_edit_state_color_class_get(ed, ppart, state, value);
if (machine) printf("COLOR_CLASS: %s\n", str ? str : ""); if (machine) printf("COLOR_CLASS: %s\n", str ? str : "");
else if (str) printf(INDENT4 "color_class: \"%s\";\n", str); else if (str)
printf(INDENT4 "color_class: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
} }
@ -354,7 +381,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
printf(INDENT5 "relative: %g %g;\n", dx, dy); printf(INDENT5 "relative: %g %g;\n", dx, dy);
if (machine) printf("OFFSET-X: %d\nOFFSET-Y: %d\n", x, y); if (machine) printf("OFFSET-X: %d\nOFFSET-Y: %d\n", x, y);
else if ((x) || (y)) printf(INDENT5 "offset: %d %d;\n", x, y); else if ((x) || (y))
printf(INDENT5 "offset: %d %d;\n", x, y);
if (machine) if (machine)
printf("TO-X: %s\nTO-Y: %s\n", str ? str : "", str2 ? str2 : ""); printf("TO-X: %s\nTO-Y: %s\n", str ? str : "", str2 ? str2 : "");
@ -418,7 +446,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
puts(INDENT4 "image {"); puts(INDENT4 "image {");
if (str) printf(INDENT5 "normal: \"%s\";\n", str); if (str) printf(INDENT5 "normal: \"%s\";\n", str);
} }
else if (str) printf(INDENT4 "image.normal: \"%s\";\n", str); else if (str)
printf(INDENT4 "image.normal: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
@ -448,7 +477,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
x = edje_edit_state_image_border_fill_get(ed, ppart, state, value); x = edje_edit_state_image_border_fill_get(ed, ppart, state, value);
str = border_fill_name_get(x); str = border_fill_name_get(x);
if (machine) printf("BORDER-FILL: %s\n", str); if (machine) printf("BORDER-FILL: %s\n", str);
else if (x != 1) printf(INDENT5 "middle: %s;\n", str); else if (x != 1)
printf(INDENT5 "middle: %s;\n", str);
/* do not free str! */ /* do not free str! */
// TODO support image.fill.smooth // TODO support image.fill.smooth
@ -517,7 +547,8 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
} }
if (machine) puts("IMAGE-END"); if (machine) puts("IMAGE-END");
else if (detail > 1) puts(INDENT4 "}"); else if (detail > 1)
puts(INDENT4 "}");
} }
else if (t == EDJE_PART_TYPE_PROXY) else if (t == EDJE_PART_TYPE_PROXY)
{ {
@ -602,17 +633,20 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
str = edje_edit_state_text_get(ed, ppart, state, value); str = edje_edit_state_text_get(ed, ppart, state, value);
if (machine) printf("TEXT: %s\n", str ? str : ""); if (machine) printf("TEXT: %s\n", str ? str : "");
else if (str) printf(INDENT5 "text: \"%s\";\n", str); else if (str)
printf(INDENT5 "text: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
str = edje_edit_state_font_get(ed, ppart, state, value); str = edje_edit_state_font_get(ed, ppart, state, value);
if (machine) printf("FONT: %s\n", str ? str : ""); if (machine) printf("FONT: %s\n", str ? str : "");
else if (str) printf(INDENT5 "font: \"%s\";\n", str); else if (str)
printf(INDENT5 "font: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
x = edje_edit_state_text_size_get(ed, ppart, state, value); x = edje_edit_state_text_size_get(ed, ppart, state, value);
if (machine) printf("SIZE: %d\n", x); if (machine) printf("SIZE: %d\n", x);
else if (x > 0) printf(INDENT5 "size: %d;\n", x); else if (x > 0)
printf(INDENT5 "size: %d;\n", x);
// TODO text_class // TODO text_class
@ -625,11 +659,13 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
x = edje_edit_state_text_fit_x_get(ed, ppart, state, value); x = edje_edit_state_text_fit_x_get(ed, ppart, state, value);
y = edje_edit_state_text_fit_y_get(ed, ppart, state, value); y = edje_edit_state_text_fit_y_get(ed, ppart, state, value);
if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y); if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y);
else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y); else if ((x) || (y))
printf(INDENT5 "fit: %d %d;\n", x, y);
dx = edje_edit_state_text_elipsis_get(ed, ppart, state, value); dx = edje_edit_state_text_elipsis_get(ed, ppart, state, value);
if (machine) printf("TEXT-ELLIPSIS: %g\n", dx); if (machine) printf("TEXT-ELLIPSIS: %g\n", dx);
else if (FDIFF(dx, 0.5)) printf(INDENT5 "ellipsis: %g;\n", dx); else if (FDIFF(dx, 0.5))
printf(INDENT5 "ellipsis: %g;\n", dx);
if (machine) puts("TEXT-END"); if (machine) puts("TEXT-END");
else puts(INDENT4 "}"); else puts(INDENT4 "}");
@ -653,22 +689,27 @@ state_details(Evas_Object *ed, const char *ppart, const char *state, double valu
case EDJE_EXTERNAL_PARAM_TYPE_INT: case EDJE_EXTERNAL_PARAM_TYPE_INT:
printf(INDENT5 "int: \"%s\" \"%d\";\n", p->name, p->i); printf(INDENT5 "int: \"%s\" \"%d\";\n", p->name, p->i);
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
printf(INDENT5 "double: \"%s\" \"%g\";\n", p->name, p->d); printf(INDENT5 "double: \"%s\" \"%g\";\n", p->name, p->d);
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_STRING: case EDJE_EXTERNAL_PARAM_TYPE_STRING:
if (p->s) if (p->s)
printf(INDENT5 "string: \"%s\" \"%s\";\n", printf(INDENT5 "string: \"%s\" \"%s\";\n",
p->name, p->s); p->name, p->s);
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_BOOL: case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
printf(INDENT5 "bool: \"%s\" \"%d\";\n", p->name, p->i); printf(INDENT5 "bool: \"%s\" \"%d\";\n", p->name, p->i);
break; break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE: case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
if (p->s) if (p->s)
printf(INDENT5 "choice: \"%s\" \"%s\";\n", printf(INDENT5 "choice: \"%s\" \"%s\";\n",
p->name, p->s); p->name, p->s);
break; break;
default: default:
break; break;
} }
@ -683,7 +724,8 @@ static void
state_end(void) state_end(void)
{ {
if (machine) puts("PART-STATE-END"); if (machine) puts("PART-STATE-END");
else if (detail > 0) puts(INDENT3 "}"); else if (detail > 0)
puts(INDENT3 "}");
else puts(" }"); else puts(" }");
} }
@ -706,30 +748,41 @@ text_effect_name_get(Edje_Text_Effect effect)
{ {
case EDJE_TEXT_EFFECT_NONE: case EDJE_TEXT_EFFECT_NONE:
return "NONE"; return "NONE";
case EDJE_TEXT_EFFECT_PLAIN: case EDJE_TEXT_EFFECT_PLAIN:
return "PLAIN"; return "PLAIN";
case EDJE_TEXT_EFFECT_OUTLINE: case EDJE_TEXT_EFFECT_OUTLINE:
return "OUTLINE"; return "OUTLINE";
case EDJE_TEXT_EFFECT_SOFT_OUTLINE: case EDJE_TEXT_EFFECT_SOFT_OUTLINE:
return "SOFT_OUTLINE"; return "SOFT_OUTLINE";
case EDJE_TEXT_EFFECT_SHADOW: case EDJE_TEXT_EFFECT_SHADOW:
return "SHADOW"; return "SHADOW";
case EDJE_TEXT_EFFECT_SOFT_SHADOW: case EDJE_TEXT_EFFECT_SOFT_SHADOW:
return "SOFT_SHADOW"; return "SOFT_SHADOW";
case EDJE_TEXT_EFFECT_OUTLINE_SHADOW: case EDJE_TEXT_EFFECT_OUTLINE_SHADOW:
return "OUTLINE_SHADOW"; return "OUTLINE_SHADOW";
case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW:
return "OUTLINE_SOFT_SHADOW"; return "OUTLINE_SOFT_SHADOW";
case EDJE_TEXT_EFFECT_FAR_SHADOW: case EDJE_TEXT_EFFECT_FAR_SHADOW:
return "FAR_SHADOW"; return "FAR_SHADOW";
case EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW: case EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW:
return "FAR_SOFT_SHADOW"; return "FAR_SOFT_SHADOW";
case EDJE_TEXT_EFFECT_GLOW: case EDJE_TEXT_EFFECT_GLOW:
return "GLOW"; return "GLOW";
case EDJE_TEXT_EFFECT_LAST: case EDJE_TEXT_EFFECT_LAST:
ERR("Invalid part type %d", effect); ERR("Invalid part type %d", effect);
return "???"; return "???";
default: default:
ERR("Unknown effect type %d", effect); ERR("Unknown effect type %d", effect);
return "???"; return "???";
@ -800,27 +853,32 @@ part_details(Evas_Object *ed, const char *ppart)
b = edje_edit_part_mouse_events_get(ed, ppart); b = edje_edit_part_mouse_events_get(ed, ppart);
if (machine) printf("MOUSE_EVENTS: %d\n", b); if (machine) printf("MOUSE_EVENTS: %d\n", b);
else if (!b) puts(INDENT3 "mouse_events: 0;"); else if (!b)
puts(INDENT3 "mouse_events: 0;");
if (detail > 1) if (detail > 1)
{ {
b = edje_edit_part_repeat_events_get(ed, ppart); b = edje_edit_part_repeat_events_get(ed, ppart);
if (machine) printf("REPEAT_EVENTS: %d\n", b); if (machine) printf("REPEAT_EVENTS: %d\n", b);
else if (b) puts(INDENT3 "repeat_events: 1;"); else if (b)
puts(INDENT3 "repeat_events: 1;");
b = edje_edit_part_scale_get(ed, ppart); b = edje_edit_part_scale_get(ed, ppart);
if (machine) printf("SCALE: %d\n", b); if (machine) printf("SCALE: %d\n", b);
else if (b) puts(INDENT3 "scale: 1;"); else if (b)
puts(INDENT3 "scale: 1;");
} }
str = edje_edit_part_clip_to_get(ed, ppart); str = edje_edit_part_clip_to_get(ed, ppart);
if (machine) printf("CLIP_TO: %s\n", str ? str : ""); if (machine) printf("CLIP_TO: %s\n", str ? str : "");
else if (str) printf(INDENT3 "clip_to: \"%s\";\n", str); else if (str)
printf(INDENT3 "clip_to: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
str = edje_edit_part_source_get(ed, ppart); str = edje_edit_part_source_get(ed, ppart);
if (machine) printf("SOURCE: %s\n", str ? str : ""); if (machine) printf("SOURCE: %s\n", str ? str : "");
else if (str) printf(INDENT3 "source: \"%s\";\n", str); else if (str)
printf(INDENT3 "source: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
if (detail > 1) if (detail > 1)
@ -829,7 +887,8 @@ part_details(Evas_Object *ed, const char *ppart)
{ {
str = text_effect_name_get(edje_edit_part_effect_get(ed, ppart)); str = text_effect_name_get(edje_edit_part_effect_get(ed, ppart));
if (machine) printf("EFFECT: %s\n", str ? str : ""); if (machine) printf("EFFECT: %s\n", str ? str : "");
else if (str) printf(INDENT3 "effect: %s;\n", str); else if (str)
printf(INDENT3 "effect: %s;\n", str);
/* do not free this str! */ /* do not free this str! */
} }
@ -855,12 +914,14 @@ part_details(Evas_Object *ed, const char *ppart)
str = edje_edit_part_drag_confine_get(ed, ppart); str = edje_edit_part_drag_confine_get(ed, ppart);
if (machine) printf("DRAG-CONFINE: %s\n", str ? str : ""); if (machine) printf("DRAG-CONFINE: %s\n", str ? str : "");
else if (str) printf(INDENT4 "confine: \"%s\";\n", str); else if (str)
printf(INDENT4 "confine: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
str = edje_edit_part_drag_event_get(ed, ppart); str = edje_edit_part_drag_event_get(ed, ppart);
if (machine) printf("DRAG-EVENTS: %s\n", str ? str : ""); if (machine) printf("DRAG-EVENTS: %s\n", str ? str : "");
else if (str) printf(INDENT4 "events: \"%s\";\n", str); else if (str)
printf(INDENT4 "events: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
if (machine) puts("DRAGABLE-END"); if (machine) puts("DRAGABLE-END");
@ -892,7 +953,8 @@ static void
part_end(void) part_end(void)
{ {
if (machine) puts("PART-END"); if (machine) puts("PART-END");
else if (detail > 0) puts(INDENT2 "}"); else if (detail > 0)
puts(INDENT2 "}");
else puts(" }"); else puts(" }");
} }
@ -1046,7 +1108,6 @@ program_end(void)
else puts(INDENT2 "}"); else puts(INDENT2 "}");
} }
static char * static char *
_program_api_name_get(Evas_Object *ed, const char *pprogram) _program_api_name_get(Evas_Object *ed, const char *pprogram)
{ {
@ -1062,10 +1123,15 @@ _transition_name_get(Edje_Tween_Mode mode)
switch (mode) switch (mode)
{ {
case EDJE_TWEEN_MODE_LINEAR: return "LINEAR"; case EDJE_TWEEN_MODE_LINEAR: return "LINEAR";
case EDJE_TWEEN_MODE_ACCELERATE: return "ACCELERATE"; case EDJE_TWEEN_MODE_ACCELERATE: return "ACCELERATE";
case EDJE_TWEEN_MODE_DECELERATE: return "DECELERATE"; case EDJE_TWEEN_MODE_DECELERATE: return "DECELERATE";
case EDJE_TWEEN_MODE_SINUSOIDAL: return "SINUSOIDAL"; case EDJE_TWEEN_MODE_SINUSOIDAL: return "SINUSOIDAL";
case EDJE_TWEEN_MODE_CUBIC_BEZIER: return "CUBIC_BEZIER"; case EDJE_TWEEN_MODE_CUBIC_BEZIER: return "CUBIC_BEZIER";
default: default:
ERR("Unknown transition mode %d", mode); ERR("Unknown transition mode %d", mode);
return "???"; return "???";
@ -1096,12 +1162,14 @@ program_details(Evas_Object *ed, const char *pprogram)
str = edje_edit_program_signal_get(ed, pprogram); str = edje_edit_program_signal_get(ed, pprogram);
if (machine) printf("SIGNAL: %s\n", str ? str : ""); if (machine) printf("SIGNAL: %s\n", str ? str : "");
else if (str) printf(INDENT3 "signal: \"%s\";\n", str); else if (str)
printf(INDENT3 "signal: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
str = edje_edit_program_source_get(ed, pprogram); str = edje_edit_program_source_get(ed, pprogram);
if (machine) printf("SOURCE: %s\n", str ? str : ""); if (machine) printf("SOURCE: %s\n", str ? str : "");
else if (str) printf(INDENT3 "source: \"%s\";\n", str); else if (str)
printf(INDENT3 "source: \"%s\";\n", str);
edje_edit_string_free(str); edje_edit_string_free(str);
if (detail >= 1) if (detail >= 1)
@ -1114,6 +1182,7 @@ program_details(Evas_Object *ed, const char *pprogram)
if (machine) puts("ACTION: ACTION_STOP"); if (machine) puts("ACTION: ACTION_STOP");
else puts(INDENT3 "action: ACTION_STOP;"); else puts(INDENT3 "action: ACTION_STOP;");
break; break;
case EDJE_ACTION_TYPE_STATE_SET: case EDJE_ACTION_TYPE_STATE_SET:
str = edje_edit_program_state_get(ed, pprogram); str = edje_edit_program_state_get(ed, pprogram);
if (machine) if (machine)
@ -1124,6 +1193,7 @@ program_details(Evas_Object *ed, const char *pprogram)
str, edje_edit_program_value_get(ed, pprogram)); str, edje_edit_program_value_get(ed, pprogram));
edje_edit_string_free(str); edje_edit_string_free(str);
break; break;
case EDJE_ACTION_TYPE_SIGNAL_EMIT: case EDJE_ACTION_TYPE_SIGNAL_EMIT:
str = edje_edit_program_state_get(ed, pprogram); str = edje_edit_program_state_get(ed, pprogram);
str2 = edje_edit_program_state2_get(ed, pprogram); str2 = edje_edit_program_state2_get(ed, pprogram);
@ -1137,6 +1207,7 @@ program_details(Evas_Object *ed, const char *pprogram)
edje_edit_string_free(str); edje_edit_string_free(str);
edje_edit_string_free(str2); edje_edit_string_free(str2);
break; break;
//TODO Support Drag //TODO Support Drag
//~ case EDJE_ACTION_TYPE_DRAG_VAL_SET: //~ case EDJE_ACTION_TYPE_DRAG_VAL_SET:
//~ eina_strbuf_append(buf, I4"action: DRAG_VAL_SET TODO;\n"); //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_SET TODO;\n");
@ -1373,22 +1444,28 @@ _comp_str_get(Evas_Object *ed, const char *img)
{ {
case EDJE_EDIT_IMAGE_COMP_RAW: case EDJE_EDIT_IMAGE_COMP_RAW:
return "RAW"; return "RAW";
case EDJE_EDIT_IMAGE_COMP_USER: case EDJE_EDIT_IMAGE_COMP_USER:
return "USER"; return "USER";
case EDJE_EDIT_IMAGE_COMP_COMP: case EDJE_EDIT_IMAGE_COMP_COMP:
return "COMP"; return "COMP";
case EDJE_EDIT_IMAGE_COMP_LOSSY: case EDJE_EDIT_IMAGE_COMP_LOSSY:
rate = edje_edit_image_compression_rate_get(ed, img); rate = edje_edit_image_compression_rate_get(ed, img);
snprintf(buf, sizeof(buf), "LOSSY %d", rate); snprintf(buf, sizeof(buf), "LOSSY %d", rate);
return buf; return buf;
case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1: case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1:
rate = edje_edit_image_compression_rate_get(ed, img); rate = edje_edit_image_compression_rate_get(ed, img);
snprintf(buf, sizeof(buf), "LOSSY_ETC1 %d", rate); snprintf(buf, sizeof(buf), "LOSSY_ETC1 %d", rate);
return buf; return buf;
case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2: case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2:
rate = edje_edit_image_compression_rate_get(ed, img); rate = edje_edit_image_compression_rate_get(ed, img);
snprintf(buf, sizeof(buf), "LOSSY_ETC2 %d", rate); snprintf(buf, sizeof(buf), "LOSSY_ETC2 %d", rate);
return buf; return buf;
default: default:
ERR("Unknown compression type %d", type); ERR("Unknown compression type %d", type);
return "???"; return "???";
@ -1521,7 +1598,6 @@ _externals_list(void)
return EINA_TRUE; return EINA_TRUE;
} }
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@ -1570,7 +1646,8 @@ main(int argc, char **argv)
ret = 1; ret = 1;
goto error_getopt; goto error_getopt;
} }
else if (quit_option) goto error_getopt; else if (quit_option)
goto error_getopt;
else if (arg_index != argc - 1) else if (arg_index != argc - 1)
{ {
ERR("incorrect number of parameters. Requires one single file."); ERR("incorrect number of parameters. Requires one single file.");
@ -1583,8 +1660,10 @@ main(int argc, char **argv)
if (detail_name) if (detail_name)
{ {
if (!strcmp(detail_name, "none")) detail = 0; if (!strcmp(detail_name, "none")) detail = 0;
else if (!strcmp(detail_name, "terse")) detail = 1; else if (!strcmp(detail_name, "terse"))
else if (!strcmp(detail_name, "all")) detail = 2; detail = 1;
else if (!strcmp(detail_name, "all"))
detail = 2;
else ERR("Unknown detail level: '%s'", detail_name); else ERR("Unknown detail level: '%s'", detail_name);
} }
@ -1608,7 +1687,6 @@ main(int argc, char **argv)
program ? program : "", program ? program : "",
api_only, api_fix, machine, file); api_only, api_fix, machine, file);
groups = edje_file_collection_list(file); groups = edje_file_collection_list(file);
if (!groups) if (!groups)
{ {
@ -1629,10 +1707,14 @@ main(int argc, char **argv)
else else
{ {
if (!strcmp(mode, "parts-names")) ret = _parts_names_list(); if (!strcmp(mode, "parts-names")) ret = _parts_names_list();
else if (!strcmp(mode, "global-data")) ret = _gdata_list(); else if (!strcmp(mode, "global-data"))
else if (!strcmp(mode, "images")) ret = _images_list(); ret = _gdata_list();
else if (!strcmp(mode, "fonts")) ret = _fonts_list(); else if (!strcmp(mode, "images"))
else if (!strcmp(mode, "externals")) ret = _externals_list(); ret = _images_list();
else if (!strcmp(mode, "fonts"))
ret = _fonts_list();
else if (!strcmp(mode, "externals"))
ret = _externals_list();
else ret = _list(mode); else ret = _list(mode);
ecore_evas_free(ee); ecore_evas_free(ee);
} }
@ -1649,3 +1731,4 @@ main(int argc, char **argv)
return ret; return ret;
} }

4
src/bin/edje/edje_multisense_convert.c
View File

@ -187,8 +187,9 @@ _edje_multisense_encode_to_flac(char *snd_path, SF_INFO sfinfo)
FLAC__stream_encoder_delete(encoder); FLAC__stream_encoder_delete(encoder);
sf_close(sfile); sf_close(sfile);
return (snd_path); return snd_path;
} }
#endif #endif
#ifdef HAVE_VORBIS #ifdef HAVE_VORBIS
@ -325,5 +326,6 @@ _edje_multisense_encode_to_ogg_vorbis(char *snd_path, double quality, SF_INFO sf
fclose(fout); fclose(fout);
return snd_path; return snd_path;
} }
#endif #endif
#endif #endif

61
src/bin/edje/edje_pick.c
View File

@ -275,24 +275,31 @@ _edje_pick_cleanup(Eina_List *ifs, Edje_File *out_file, Edje_Pick_Status s)
case EDJE_PICK_OUT_FILENAME_MISSING: case EDJE_PICK_OUT_FILENAME_MISSING:
EINA_LOG_ERR("Output file name missing.\n"); EINA_LOG_ERR("Output file name missing.\n");
break; break;
case EDJE_PICK_FAILED_OPEN_INP: case EDJE_PICK_FAILED_OPEN_INP:
EINA_LOG_ERR("Failed to open input file.\n"); EINA_LOG_ERR("Failed to open input file.\n");
break; break;
case EDJE_PICK_FAILED_READ_INP: case EDJE_PICK_FAILED_READ_INP:
EINA_LOG_ERR("Failed to read input file.\n"); EINA_LOG_ERR("Failed to read input file.\n");
break; break;
case EDJE_PICK_DUP_GROUP: case EDJE_PICK_DUP_GROUP:
EINA_LOG_ERR("Can't fetch groups with identical name from various files.\n"); EINA_LOG_ERR("Can't fetch groups with identical name from various files.\n");
break; break;
case EDJE_PICK_INCLUDE_MISSING: case EDJE_PICK_INCLUDE_MISSING:
EINA_LOG_ERR("Cannot select groups when no input file included.\n"); EINA_LOG_ERR("Cannot select groups when no input file included.\n");
break; break;
case EDJE_PICK_GROUP_MISSING: case EDJE_PICK_GROUP_MISSING:
EINA_LOG_ERR("Group name missing for include file.\n"); EINA_LOG_ERR("Group name missing for include file.\n");
break; break;
case EDJE_PICK_PARSE_FAILED: case EDJE_PICK_PARSE_FAILED:
EINA_LOG_ERR("Command parsing failed.\n"); EINA_LOG_ERR("Command parsing failed.\n");
break; break;
default: default:
return s; return s;
} }
@ -458,7 +465,6 @@ _edje_pick_command_line_parse(int argc, char **argv,
EDJE_PICK_GROUP_MISSING); EDJE_PICK_GROUP_MISSING);
} }
g_name = eina_list_data_get(cg); g_name = eina_list_data_get(cg);
if (_group_name_in_other_file(files, current_inp, g_name)) if (_group_name_in_other_file(files, current_inp, g_name))
return _edje_pick_cleanup(files, NULL, EDJE_PICK_DUP_GROUP); return _edje_pick_cleanup(files, NULL, EDJE_PICK_DUP_GROUP);
@ -481,7 +487,6 @@ _edje_pick_command_line_parse(int argc, char **argv,
ecore_getopt_list_free(i_files); ecore_getopt_list_free(i_files);
ecore_getopt_list_free(groups); ecore_getopt_list_free(groups);
if (!output_filename) if (!output_filename)
return _edje_pick_cleanup(files, NULL, EDJE_PICK_OUT_FILENAME_MISSING); return _edje_pick_cleanup(files, NULL, EDJE_PICK_OUT_FILENAME_MISSING);
/* END - Read command line args */ /* END - Read command line args */
@ -804,14 +809,14 @@ static int
_old_id_cmp(const void *d1, const void *d2) _old_id_cmp(const void *d1, const void *d2)
{ {
/* Find currect ID struct */ /* Find currect ID struct */
return (((Edje_Pick_Data *) d1)->id.old_id - ((intptr_t) d2)); return ((Edje_Pick_Data *)d1)->id.old_id - ((intptr_t)d2);
} }
static int static int
_new_id_cmp(const void *d1, const void *d2) _new_id_cmp(const void *d1, const void *d2)
{ {
/* Find currect ID struct */ /* Find currect ID struct */
return (((Edje_Pick_Data *) d1)->id.new_id - ((intptr_t) d2)); return ((Edje_Pick_Data *)d1)->id.new_id - ((intptr_t)d2);
} }
static int static int
@ -823,7 +828,6 @@ _edje_pick_new_id_get(Eina_List *id_list, int id, Eina_Bool set_used)
_old_id_cmp, _old_id_cmp,
(void *)(intptr_t)id); (void *)(intptr_t)id);
if (p_id) if (p_id)
{ {
if (set_used) if (set_used)
@ -874,8 +878,8 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
if (edf->image_dir) if (edf->image_dir)
{ {
if (edf->image_dir->entries) if (edf->image_dir->entries) /* Copy image dir entries of current file */
{ /* Copy image dir entries of current file */ {
Edje_Image_Directory_Entry *entries = NULL; Edje_Image_Directory_Entry *entries = NULL;
EINA_LIST_FOREACH(context.current_file->imagelist, l, image) EINA_LIST_FOREACH(context.current_file->imagelist, l, image)
@ -906,8 +910,8 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
} }
} }
if (edf->image_dir->sets) if (edf->image_dir->sets) /* Copy image dir sets of current file */
{ /* Copy image dir sets of current file */ {
Edje_Image_Directory_Set *sets; Edje_Image_Directory_Set *sets;
EINA_LIST_FOREACH(context.current_file->imagesetlist, l, set) EINA_LIST_FOREACH(context.current_file->imagesetlist, l, set)
@ -944,8 +948,8 @@ _edje_pick_images_copy(Edje_File *edf, Edje_File *o)
} }
} }
if (edf->image_dir->vectors) if (edf->image_dir->vectors) /* Copy vector dir entries of current file */
{ /* Copy vector dir entries of current file */ {
Edje_Vector_Directory_Entry *vectors = NULL; Edje_Vector_Directory_Entry *vectors = NULL;
EINA_LIST_FOREACH(context.current_file->vectorlist, l, vector) EINA_LIST_FOREACH(context.current_file->vectorlist, l, vector)
@ -1103,8 +1107,8 @@ _font_cmp(const void *d1, const void *d2)
const Edje_Font *f2 = d2; const Edje_Font *f2 = d2;
/* Same font if (d1->name == d2->name) AND (d1->file == d2->file) */ /* Same font if (d1->name == d2->name) AND (d1->file == d2->file) */
return (strcmp(f1->name, f2->name) | return strcmp(f1->name, f2->name) |
strcmp(f1->file, f2->file)); strcmp(f1->file, f2->file);
} }
static int static int
@ -1148,7 +1152,7 @@ _Edje_Pick_Fonts_add(Edje_File *out_file, Edje_File *edf)
ft->used = EINA_TRUE; /* TODO: Fix this later */ ft->used = EINA_TRUE; /* TODO: Fix this later */
context.current_file->fontlist = eina_list_append(context.current_file->fontlist, ft); context.current_file->fontlist = eina_list_append(context.current_file->fontlist, ft);
eina_hash_direct_add(out_file->fonts, st->name, st); eina_hash_direct_add(out_file->fonts, st->name, st);
}; }
eina_iterator_free(it); eina_iterator_free(it);
@ -1237,15 +1241,15 @@ _edje_pick_image_entry_add(int id, Edje_File *edf, Edje_File *o)
if (!o->image_dir) /* First time only */ if (!o->image_dir) /* First time only */
o->image_dir = calloc(1, sizeof(*(o->image_dir))); o->image_dir = calloc(1, sizeof(*(o->image_dir)));
if (edf->image_dir->entries) if (edf->image_dir->entries) /* Copy Images */
{ /* Copy Images */ {
Edje_Image_Directory_Entry *img = &edf->image_dir->entries[id]; Edje_Image_Directory_Entry *img = &edf->image_dir->entries[id];
snprintf(buf, sizeof(buf), "edje/images/%i", img->id); snprintf(buf, sizeof(buf), "edje/images/%i", img->id);
VERBOSE(EINA_LOG_INFO("Trying to read <%s>\n", img->entry)); VERBOSE(EINA_LOG_INFO("Trying to read <%s>\n", img->entry));
data = eet_read(edf->ef, buf, &size); data = eet_read(edf->ef, buf, &size);
if (size) if (size) /* Advance image ID and register this in imagelist */
{ /* Advance image ID and register this in imagelist */ {
current_img_id++; current_img_id++;
Edje_Pick_Data *image = malloc(sizeof(*image)); Edje_Pick_Data *image = malloc(sizeof(*image));
@ -1298,8 +1302,8 @@ _edje_pick_image_set_add(int id, Edje_File *edf, Edje_File *o)
if (!o->image_dir) /* First time only */ if (!o->image_dir) /* First time only */
o->image_dir = calloc(1, sizeof(*(o->image_dir))); o->image_dir = calloc(1, sizeof(*(o->image_dir)));
if (edf->image_dir->sets) if (edf->image_dir->sets) /* Fix IDs in sets to new assigned IDs of entries */
{ /* Fix IDs in sets to new assigned IDs of entries */ {
current_set_id++; current_set_id++;
Edje_Pick_Data *set = calloc(1, sizeof(*set)); Edje_Pick_Data *set = calloc(1, sizeof(*set));
set->id.old_id = edf->image_dir->sets[id].id; set->id.old_id = edf->image_dir->sets[id].id;
@ -1335,15 +1339,15 @@ _edje_pick_vector_entry_add(int id, Edje_File *edf, Edje_File *o)
if (!o->image_dir) /* First time only */ if (!o->image_dir) /* First time only */
o->image_dir = calloc(1, sizeof(*(o->image_dir))); o->image_dir = calloc(1, sizeof(*(o->image_dir)));
if (edf->image_dir->vectors) if (edf->image_dir->vectors) /* Copy Vectors */
{ /* Copy Vectors */ {
Edje_Vector_Directory_Entry *vg = &edf->image_dir->vectors[id]; Edje_Vector_Directory_Entry *vg = &edf->image_dir->vectors[id];
snprintf(buf, sizeof(buf), "edje/vectors/%i", vg->id); snprintf(buf, sizeof(buf), "edje/vectors/%i", vg->id);
VERBOSE(EINA_LOG_INFO("Trying to read <%s>\n", vg->entry)); VERBOSE(EINA_LOG_INFO("Trying to read <%s>\n", vg->entry));
data = eet_read(edf->ef, buf, &size); data = eet_read(edf->ef, buf, &size);
if (size) if (size) /* Advance vector ID and register this in vectorlist */
{ /* Advance vector ID and register this in vectorlist */ {
current_vg_id++; current_vg_id++;
Edje_Pick_Data *vector = malloc(sizeof(*vector)); Edje_Pick_Data *vector = malloc(sizeof(*vector));
@ -1852,8 +1856,8 @@ main(int argc, char **argv)
EINA_LIST_FOREACH(context.current_file->samplelist, l, s) EINA_LIST_FOREACH(context.current_file->samplelist, l, s)
{ {
if (context.current_file->append || s->id.used) if (context.current_file->append || s->id.used) /* Write only used samples */
{ /* Write only used samples */ {
samples = eina_list_append(samples, s->entry); samples = eina_list_append(samples, s->entry);
snprintf(buf, sizeof(buf), "edje/sounds/%i", snprintf(buf, sizeof(buf), "edje/sounds/%i",
@ -1873,8 +1877,8 @@ main(int argc, char **argv)
EINA_LIST_FOREACH(context.current_file->vibrationlist, l, s) EINA_LIST_FOREACH(context.current_file->vibrationlist, l, s)
{ {
if (context.current_file->append || s->id.used) if (context.current_file->append || s->id.used) /* Write only used vibrations */
{ /* Write only used vibrations */ {
vibrations = eina_list_append(vibrations, s->entry); vibrations = eina_list_append(vibrations, s->entry);
snprintf(buf, sizeof(buf), "edje/vibrations/%i", snprintf(buf, sizeof(buf), "edje/vibrations/%i",
@ -1907,3 +1911,4 @@ main(int argc, char **argv)
return _edje_pick_cleanup(inp_files, out_file, EDJE_PICK_NO_ERROR); return _edje_pick_cleanup(inp_files, out_file, EDJE_PICK_NO_ERROR);
} }

1
src/bin/edje/edje_player.c
View File

@ -590,6 +590,7 @@ _slave_mode(void *data, Ecore_Fd_Handler *fd_handler)
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }
#endif #endif
static void static void

1
src/bin/edje/edje_watch.c
View File

@ -150,3 +150,4 @@ main(int argc, char **argv)
return 1; return 1;
} }