From: <enl...@li...> - 2004-05-12 20:14:23
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data/template/images Added Files: .cvsignore Makefile.am Log Message: fixed dist stuff |
From: <enl...@li...> - 2004-05-12 20:14:23
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data/template Added Files: .cvsignore Makefile.am Log Message: fixed dist stuff |
From: <enl...@li...> - 2004-05-12 20:14:23
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data/template/hashes Added Files: .cvsignore Makefile.am Log Message: fixed dist stuff |
From: <enl...@li...> - 2004-05-12 20:14:24
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data/template/programs Added Files: .cvsignore Makefile.am Log Message: fixed dist stuff |
From: <enl...@li...> - 2004-05-12 20:14:24
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data/test Added Files: .cvsignore Makefile.am Log Message: fixed dist stuff |
From: <enl...@li...> - 2004-05-12 20:14:24
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data/test/fonts Added Files: .cvsignore Makefile.am Log Message: fixed dist stuff |
From: <enl...@li...> - 2004-05-12 20:14:26
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data/test/images Added Files: .cvsignore Makefile.am Log Message: fixed dist stuff |
From: <enl...@li...> - 2004-05-12 20:14:50
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: .cvsignore Added Files: Makefile.am Log Message: fixed dist stuff =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/data/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 17 Jan 2004 18:25:55 -0000 1.1 +++ .cvsignore 12 May 2004 20:14:09 -0000 1.2 @@ -1 +1,3 @@ +Makefile +Makefile.in e_logo.eet |
From: <enl...@li...> - 2004-05-12 20:14:51
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje Modified Files: Makefile.am configure.in Log Message: fixed dist stuff =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 16 Apr 2004 02:06:38 -0000 1.9 +++ Makefile.am 12 May 2004 20:14:08 -0000 1.10 @@ -1,21 +1,12 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src +SUBDIRS = data src MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs \ stamp-h.in edje_docs.tar edje_docs.tar.gz edje.c -install-data-local: - @$(NORMAL_INSTALL) - if test -d $(srcdir)/data; then \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \ - for d in $(srcdir)/data/*; do \ - cp -pR $$d $(DESTDIR)$(pkgdatadir)/data; \ - done \ - fi - ### this is all fine and great - ut edje should not be going and installing ### data in another software's data dir - it's just wrong. not to mention this ### also breaks make distcheck... @@ -28,13 +19,7 @@ ./gendoc; \ tar cvf edje_docs.tar doc/html doc/latex doc/man; \ rm -f edje_docs.tar.gz; \ - gzip -9 edje_docs.tar; \ - if test -d data; then \ - mkdir $(distdir)/data; \ - for file in data/*; do \ - cp -pR $$file $(distdir)/data; \ - done \ - fi + gzip -9 edje_docs.tar; bin_SCRIPTS = edje-config =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in 16 Apr 2004 02:06:38 -0000 1.12 +++ configure.in 12 May 2004 20:14:08 -0000 1.13 @@ -266,6 +266,21 @@ AC_OUTPUT([ Makefile +data/Makefile +data/images/Makefile +data/include/Makefile +data/src/Makefile +data/template/Makefile +data/template/embryo/Makefile +data/template/fonts/Makefile +data/template/hashes/Makefile +data/template/images/Makefile +data/template/macros/Makefile +data/template/parts/Makefile +data/template/programs/Makefile +data/test/Makefile +data/test/fonts/Makefile +data/test/images/Makefile src/Makefile src/lib/Makefile src/bin/Makefile |
From: <enl...@li...> - 2004-05-22 19:59:42
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_embryo.c Log Message: this was starting to annoy me :P =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- edje_embryo.c 22 May 2004 03:00:51 -0000 1.14 +++ edje_embryo.c 22 May 2004 19:59:32 -0000 1.15 @@ -939,7 +939,7 @@ fn = embryo_program_function_find(ed->collection->script, fname); if (fn != EMBRYO_FUNCTION_NONE) { - printf("EDJE DEBUG: About to run script from progrqm.\n"); + printf("EDJE DEBUG: About to run script from program.\n"); embryo_parameter_string_push(ed->collection->script, sig); embryo_parameter_string_push(ed->collection->script, src); { |
From: <enl...@li...> - 2004-07-07 19:46:15
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_main.c Log Message: it's called edje, not eet =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- edje_main.c 1 Jul 2004 03:46:05 -0000 1.38 +++ edje_main.c 7 Jul 2004 19:46:06 -0000 1.39 @@ -23,7 +23,7 @@ return initted; } -/** Shutdown the EET library. +/** Shutdown the EDJE library. * * @return The new init count. */ |
From: <enl...@li...> - 2004-08-23 16:41:42
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: edc.vim Log Message: added text to cLabel =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/data/edc.vim,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- edc.vim 18 Aug 2004 03:36:48 -0000 1.3 +++ edc.vim 23 Aug 2004 16:41:28 -0000 1.4 @@ -25,6 +25,7 @@ syn keyword cLabel relative offset to to_x to_y normal tween syn keyword cLabel border color color2 color3 font size fit align syn keyword cLabel signal source action transition in target after +syn keyword cLabel text syn keyword cConditional if else switch syn keyword cRepeat while for do |
From: <enl...@li...> - 2004-08-24 10:06:42
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_parse.c Log Message: warning fixes =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_parse.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- edje_cc_parse.c 25 Apr 2004 04:20:58 -0000 1.20 +++ edje_cc_parse.c 24 Aug 2004 10:06:32 -0000 1.21 @@ -758,7 +758,7 @@ /* int set of function */ -int +static int my_atoi(const char * s) { int res = 0; @@ -793,10 +793,10 @@ return res; } -char * +static char * _deltai(char *s, int * val) { - if (!val) return; + if (!val) return NULL; if ('(' != s[0]) { @@ -815,10 +815,10 @@ return s; } -char * +static char * _gammai(char *s, int * val) { - if (!val) return; + if (!val) return NULL; if (_is_numi(s[0])) { @@ -836,14 +836,14 @@ return s; } -char * +static char * _betai(char *s, int * val) { int a1, a2; char op; if (!val) - return; + return NULL; s = _gammai(s, &a1); @@ -860,14 +860,14 @@ return s; } -char * +static char * _alphai(char *s, int * val) { int a1, a2; char op; if (!val) - return; + return NULL; s = _betai(s, &a1); @@ -1005,10 +1005,10 @@ return res; } -char * +static char * _deltaf(char *s, double * val) { - if (!val) return; + if (!val) return NULL; if ('(' != s[0]) { @@ -1027,10 +1027,10 @@ return s; } -char * +static char * _gammaf(char *s, double * val) { - if (!val) return; + if (!val) return NULL; if (_is_numf(s[0])) { @@ -1048,14 +1048,14 @@ return s; } -char * +static char * _betaf(char *s, double * val) { double a1=0, a2=0; char op; if (!val) - return; + return NULL; s = _gammaf(s, &a1); @@ -1072,14 +1072,14 @@ return s; } -char * +static char * _alphaf(char *s, double * val) { double a1=0, a2=0; char op; if (!val) - return; + return NULL; s = _betaf(s, &a1); @@ -1096,7 +1096,7 @@ return s; } -char * +static char * _get_numf(char *s, double * val) { char buf[4096]; @@ -1120,7 +1120,7 @@ return (s+pos); } -int +static int _is_numf(char c) { if (((c >= '0') && (c <= '9')) @@ -1132,7 +1132,7 @@ return 0; } -int +static int _is_op1f(char c) { switch(c) @@ -1144,7 +1144,7 @@ return 0; } -int +static int _is_op2f(char c) { switch(c) @@ -1156,7 +1156,7 @@ return 0; } -double +static double _calcf(char op, double a, double b) { switch(op) |
From: <enl...@li...> - 2004-08-24 10:06:55
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_container.c edje_edit.c edje_embryo.c edje_message_queue.c edje_private.h edje_util.c edje_var.c Log Message: warning fixes =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_container.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- edje_container.c 24 Aug 2004 01:48:19 -0000 1.6 +++ edje_container.c 24 Aug 2004 10:06:32 -0000 1.7 @@ -6,7 +6,7 @@ _edje_container_relayout(Smart_Data *sd) { Evas_List *l; - Evas_Coord x, y, w, h, sw, sh; + Evas_Coord x, y, w, h, sw; if (sd->freeze > 0) return; if (!sd->need_layout) return; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_edit.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edje_edit.c 1 Jul 2004 03:46:05 -0000 1.2 +++ edje_edit.c 24 Aug 2004 10:06:32 -0000 1.3 @@ -155,37 +155,44 @@ Edje_Part_Collection * edje_edit_part_collection_add(Edje_Edit_File *edf, char *collection_name) { + return NULL; } Edje_Part_Collection * edje_edit_part_collection_del(Edje_Edit_File *edf, char *collection_name) { + return NULL; } Edje_Part * edje_edit_part_add(Edje_Part_Collection *coll, char *part_name, int part_type) { + return NULL; } Edje_Part * edje_edit_part_del(Edje_Part_Collection *coll, char *part_name, int part_type) { + return NULL; } Edje_Program * edje_edit_program_add(Edje_Part_Collection *coll, char *prog_name) { + return NULL; } Edje_Program * edje_edit_program_del(Edje_Part_Collection *coll, char *prog_name) { + return NULL; } Edje_Edit_Image * edje_edit_image_add(Edje_Edit_File *edf, char *filename) { + return NULL; } void @@ -197,6 +204,7 @@ Edje_Edit_Image * edje_edit_iamge_get_by_id(int id) { + return NULL; } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- edje_embryo.c 24 Aug 2004 02:11:38 -0000 1.25 +++ edje_embryo.c 24 Aug 2004 10:06:32 -0000 1.26 @@ -392,7 +392,6 @@ _edje_embryo_fn_set_min_size(Embryo_Program *ep, Embryo_Cell *params) { Edje *ed; - int part_id = 0; float f = 0.0; double w = 0.0, h = 0.0; @@ -417,7 +416,6 @@ _edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params) { Edje *ed; - int part_id = 0; float f = 0.0; double w = 0.0, h = 0.0; @@ -443,7 +441,6 @@ _edje_embryo_fn_stop_program(Embryo_Program *ep, Embryo_Cell *params) { Edje *ed; - char *state1 = NULL, *state2 = NULL; int program_id = 0; Edje_Running_Program *runp; Evas_List *l; @@ -467,7 +464,6 @@ { Edje *ed; - char *state1 = NULL, *state2 = NULL; int part_id = 0; Edje_Real_Part *rp; @@ -585,7 +581,6 @@ _edje_embryo_fn_run_program(Embryo_Program *ep, Embryo_Cell *params) { Edje *ed; - char *state1 = NULL, *state2 = NULL; int program_id = 0; Edje_Program *pr; @@ -1239,7 +1234,6 @@ if (fn != EMBRYO_FUNCTION_NONE) { void *pdata; - int err; printf("EDJE DEBUG: About to run script from program.\n"); embryo_parameter_string_push(ed->collection->script, sig); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_message_queue.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- edje_message_queue.c 12 Aug 2004 18:55:45 -0000 1.7 +++ edje_message_queue.c 24 Aug 2004 10:06:32 -0000 1.8 @@ -83,8 +83,7 @@ { if (em->msg) { - char *ptr; - int i, count; + int i; switch (em->type) { =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- edje_private.h 2 Jul 2004 10:17:25 -0000 1.68 +++ edje_private.h 24 Aug 2004 10:06:32 -0000 1.69 @@ -126,7 +126,7 @@ void _edje_var_list_float_prepend(Edje *ed, int id, double v); void _edje_var_list_float_insert(Edje *ed, int id, int n, double v); -char *_edje_var_list_nth_str_get(Edje *ed, int id, int n); +const char *_edje_var_list_nth_str_get(Edje *ed, int id, int n); void _edje_var_list_nth_str_set(Edje *ed, int id, int n, char *v); void _edje_var_list_str_append(Edje *ed, int id, char *v); void _edje_var_list_str_prepend(Edje *ed, int id, char *v); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- edje_util.c 12 Aug 2004 18:55:45 -0000 1.41 +++ edje_util.c 24 Aug 2004 10:06:33 -0000 1.42 @@ -456,7 +456,6 @@ edje_object_text_change_cb_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, const char *part), void *data) { Edje *ed; - Edje_Real_Part *rp; ed = _edje_fetch(obj); if (!ed) return; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_var.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- edje_var.c 19 Jun 2004 16:24:21 -0000 1.6 +++ edje_var.c 24 Aug 2004 10:06:33 -0000 1.7 @@ -47,7 +47,6 @@ { Edje *ed; Evas_List *tl2; - int delete_me = 0; ed = tl->data; _edje_ref(ed); @@ -808,21 +807,21 @@ } } -char * +const char * _edje_var_list_nth_str_get(Edje *ed, int id, int n) { - if (!ed) return 0; - if (!ed->var_pool) return 0; + if (!ed) return NULL; + if (!ed->var_pool) return NULL; id -= EDJE_VAR_MAGIC_BASE; - if ((id < 0) || (id >= ed->var_pool->size)) return 0; + if ((id < 0) || (id >= ed->var_pool->size)) return NULL; if (ed->var_pool->vars[id].type == EDJE_VAR_NONE) ed->var_pool->vars[id].type = EDJE_VAR_LIST; - else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return 0; + else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return NULL; { Edje_Var *var; var = _edje_var_list_nth(ed, id, n); - if (!var) return 0; + if (!var) return NULL; return _edje_var_var_str_get(ed, var); } } |
From: <enl...@li...> - 2004-08-25 13:22:44
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: edc.vim Log Message: added SWALLOW to constants =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/data/edc.vim,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- edc.vim 23 Aug 2004 16:41:28 -0000 1.4 +++ edc.vim 25 Aug 2004 13:22:28 -0000 1.5 @@ -30,7 +30,7 @@ syn keyword cConditional if else switch syn keyword cRepeat while for do syn keyword cConstant COMP RAW LOSSY -syn keyword cConstant TEXT IMAGE RECT +syn keyword cConstant TEXT IMAGE RECT SWALLOW syn keyword cConstant NONE PLAIN OUTLINE SOFT_OUTLINE SHADOW syn keyword cConstant SOFT_SHADOW OUTLINE_SHADOW OUTLINE_SOFT_SHADOW syn keyword cConstant STATE_SET ACTION_STOP SIGNAL_EMIT |
From: <enl...@li...> - 2004-08-25 15:42:46
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_embryo.c Log Message: i think we can get rid of the script debugging spam now =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- edje_embryo.c 25 Aug 2004 00:53:45 -0000 1.27 +++ edje_embryo.c 25 Aug 2004 15:42:40 -0000 1.28 @@ -1235,7 +1235,6 @@ { void *pdata; - printf("EDJE DEBUG: About to run script from program.\n"); embryo_parameter_string_push(ed->collection->script, sig); embryo_parameter_string_push(ed->collection->script, src); pdata = embryo_program_data_get(ed->collection->script); @@ -1249,7 +1248,6 @@ embryo_error_string_get(embryo_program_error_get(ed->collection->script))); } embryo_program_data_set(ed->collection->script, pdata); - printf("EDJE DEBUG: Done.\n"); } } |
From: <enl...@li...> - 2004-08-29 09:40:09
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_out.c Log Message: fixed a potential NULL pointer deref =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_out.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- edje_cc_out.c 12 Aug 2004 18:55:38 -0000 1.19 +++ edje_cc_out.c 29 Aug 2004 09:40:02 -0000 1.20 @@ -1,3 +1,7 @@ +/* + * vim:ts=8:sw=3:sts=3:noexpandtab + */ + #include "edje_cc.h" typedef struct _Part_Lookup Part_Lookup; @@ -685,17 +689,23 @@ il = image_lookups->data; - for (l = edje_file->image_dir->entries; l; l = l->next) - { - Edje_Image_Directory_Entry *de; - - de = l->data; - if ((de->entry) && (!strcmp(de->entry, il->name))) - { - *(il->dest) = de->id; - break; - } - } + if (!edje_file->image_dir) + l = NULL; + else + { + for (l = edje_file->image_dir->entries; l; l = l->next) + { + Edje_Image_Directory_Entry *de; + + de = l->data; + if ((de->entry) && (!strcmp(de->entry, il->name))) + { + *(il->dest) = de->id; + break; + } + } + } + if (!l) { fprintf(stderr, "%s: Error. unable find image name %s\n", |
From: <enl...@li...> - 2004-08-29 11:31:07
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje Modified Files: configure.in Log Message: add missing AM_CONDITIONAL call =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- configure.in 29 Aug 2004 11:03:19 -0000 1.15 +++ configure.in 29 Aug 2004 11:30:59 -0000 1.16 @@ -124,6 +124,7 @@ EDJE_DECC_PRG="" if test "x$have_edje_cc" = "xyes"; then AM_CONDITIONAL(BUILD_EDJE_CC, true) + AM_CONDITIONAL(BUILD_EDJE_DECC, true) EDJE_CC_PRG="edje_cc" EDJE_DECC_PRG="edje_decc" else |
From: <enl...@li...> - 2004-08-30 16:08:43
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_private.h Log Message: increment EDJE_FILE_VERSION because of the recent font directory additions =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- edje_private.h 30 Aug 2004 05:39:24 -0000 1.70 +++ edje_private.h 30 Aug 2004 16:08:31 -0000 1.71 @@ -25,7 +25,7 @@ /* increment this when the EET data descriptors have changed and old * EETs cannot be loaded/used correctly anymore. */ -#define EDJE_FILE_VERSION 1 +#define EDJE_FILE_VERSION 2 /* FIXME: * |
From: <enl...@li...> - 2004-10-08 17:03:17
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_sources.c Log Message: fixed an endless loop caused by unexpected preprocessor commands. tweaked the code a bit so its more readable, hopefully. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_sources.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- edje_cc_sources.c 31 Aug 2004 04:00:14 -0000 1.4 +++ edje_cc_sources.c 8 Oct 2004 17:03:04 -0000 1.5 @@ -1,3 +1,7 @@ +/* + * vim:ts=8:sw=3:sts=3:noexpandtab + */ + #include "edje_cc.h" static Eet_Data_Descriptor *_srcfile_edd = NULL; @@ -79,26 +83,20 @@ while (fgets(buf, sizeof(buf), f)) { - char *p, *pp; - int notyet; - int forgetit; - int haveinclude; - int havefile; - char *file; + char *p = buf, *pp; + int got_hash = 0; + int forgetit = 0; + int haveinclude = 0; + char *file = NULL; - p = buf; - notyet = 1; - forgetit = 0; - haveinclude = 0; - file = NULL; while ((!forgetit) && (*p)) { - if (notyet) + if (!got_hash) { if (!isspace(*p)) { if (*p == '#') - notyet = 0; + got_hash = 1; else forgetit = 1; } @@ -155,6 +153,8 @@ else p++; } + + got_hash = 0; } } if (file) |
From: <enl...@li...> - 2004-10-09 16:23:42
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_out.c Log Message: when a font cannot be loaded (because -fd was omitted, for example), just print a warning instead of an error message. i.e., fonts are treated the same way images are. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_out.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- edje_cc_out.c 6 Oct 2004 05:25:03 -0000 1.26 +++ edje_cc_out.c 9 Oct 2004 16:23:29 -0000 1.27 @@ -194,9 +194,8 @@ } if (!fdata) { - fprintf(stderr, "%s: Error. unable to write font part \"%s\" entry to %s \n", - progname, fn->file, file_out); - ABORT_WRITE(ef, file_out); + fprintf(stderr, "%s: Warning. unable to open font \"%s\" for inclusion in output\n", + progname, fn->file); } else { @@ -366,7 +365,6 @@ for (ll = pc->parts; ll; ll = ll->next) { Edje_Part *ep; - Evas_List *l3; Edje_Part_Description *epd; ep = ll->data; |
From: <enl...@li...> - 2004-10-10 08:23:04
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: .cvsignore Log Message: added edje_decc to cvsignore =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 17 Jan 2004 16:36:46 -0000 1.1 +++ .cvsignore 10 Oct 2004 08:22:54 -0000 1.2 @@ -5,3 +5,4 @@ edje edje_ls edje_cc +edje_decc |
From: <enl...@li...> - 2004-10-10 10:01:15
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_main.c Log Message: don't print constant data =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_main.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- edje_main.c 6 Oct 2004 00:18:51 -0000 1.49 +++ edje_main.c 10 Oct 2004 10:00:51 -0000 1.50 @@ -511,7 +511,7 @@ static void cb (void *data, Evas_Object *o, const char *sig, const char *src) { - printf("CALLBACK for %p %p \"%s\" \"%s\"\n", data, o, sig, src); + printf("CALLBACK for \"%s\" \"%s\"\n", sig, src); if (!strcmp(sig, "drag")) { double x, y; |
From: <enl...@li...> - 2004-10-10 11:29:08
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: edc.vim Log Message: smooth =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/data/edc.vim,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- edc.vim 25 Aug 2004 13:22:28 -0000 1.5 +++ edc.vim 10 Oct 2004 11:29:00 -0000 1.6 @@ -25,7 +25,7 @@ syn keyword cLabel relative offset to to_x to_y normal tween syn keyword cLabel border color color2 color3 font size fit align syn keyword cLabel signal source action transition in target after -syn keyword cLabel text +syn keyword cLabel text smooth syn keyword cConditional if else switch syn keyword cRepeat while for do |
From: <enl...@li...> - 2004-10-10 15:18:20
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_handlers.c Log Message: part names need to be unique in a collection, too =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- edje_cc_handlers.c 6 Oct 2004 05:25:02 -0000 1.37 +++ edje_cc_handlers.c 10 Oct 2004 15:18:07 -0000 1.38 @@ -1,3 +1,7 @@ +/* + * vim:ts=8:sw=3:sts=3:noexpandtab + */ + #include "edje_cc.h" static void st_images_image(void); @@ -555,6 +559,23 @@ pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); ep->name = parse_str(0); + + { + Evas_List *l; + + for (l = pc->parts; l; l = l->next) + { + Edje_Part *lep; + + lep = l->data; + if ((lep != ep) && (!strcmp(lep->name, ep->name))) + { + fprintf(stderr, "%s: Error. parse error %s:%i. There is already a part of the name %s\n", + progname, file_in, line, ep->name); + exit(-1); + } + } + } } static void |