ok. that definitely ain't the right way to do those. back it out...

SVN revision: 9803

diff --git a/legacy/edje/data/include/edje.inc b/legacy/edje/data/include/edje.inc
index 036c3c1..fcf6c0b 100644 (file)
--- a/legacy/edje/data/include/edje.inc
+++ b/legacy/edje/data/include/edje.inc
@@ -70,16 +70,10 @@ native       stop_program   (program_id);
 native       stop_programs_on(part_id);
 
 native       set_drag(part_id, Float:dx, Float:dy);
-native       get_drag(part_id, &Float:dx, &Float:dy);
 native       set_drag_step(part_id, Float:dx, Float:dy);
-native       get_drag_step(part_id, &Float:dx, &Float:dy);
 native       set_drag_page(part_id, Float:dx, Float:dy);
-native       get_drag_page(part_id, &Float:dx, &Float:dy);
 
 native       text_set(part_id, text[]);
 
-native       set_min_size(part_id, float:w, float:h);
-native       get_min_size(part_id, &float:w, &float:h);
-native       set_max_size(part_id, float:w, float:h);
-native       get_max_size(part_id, &float:w, &float:h);
-native       get_size(part_id, &float:w, &float:h);
+native       set_min_size(part_id, Float:w, Float:h);
+native       set_max_size(part_id, Float:w, Float:h);

diff --git a/legacy/edje/data/src/e_logo.edc b/legacy/edje/data/src/e_logo.edc
index 626b47a..3d93741 100644 (file)
--- a/legacy/edje/data/src/e_logo.edc
+++ b/legacy/edje/data/src/e_logo.edc
@@ -156,8 +156,9 @@ collections {
           {
              new buf[100];
              
-             snprintf(buf, 100, "val = %i, pos = %f", val, pos);
               set_drag(PART:"dragable", sin(3.14*pos), cos(1.57*pos));
+             
+             snprintf(buf, 100, "val = %i, pos = %f", val, pos);
              emit("PR AAAAAAAAANIM", buf);
           }
       }

diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c
index ad53271..3126210 100644 (file)
--- a/legacy/edje/src/bin/edje_cc_parse.c
+++ b/legacy/edje/src/bin/edje_cc_parse.c
@@ -507,7 +507,7 @@ compile(void)
        clean_file = tmpn;
        close(fd);
        atexit(clean_tmp_file);
-       snprintf(buf, sizeof(buf), "cpp -E -o %s %s", tmpn, file_in);
+       snprintf(buf, sizeof(buf), "cpp -E %s > %s", file_in, tmpn);
        ret = system(buf);
        if (ret < 0)
          {

diff --git a/legacy/edje/src/lib/edje_embryo.c b/legacy/edje/src/lib/edje_embryo.c
index add155f..1a4a8ea 100644 (file)
--- a/legacy/edje/src/lib/edje_embryo.c
+++ b/legacy/edje/src/lib/edje_embryo.c
@@ -251,17 +251,11 @@ _edje_embryo_fn_cancel_anim(Embryo_Program *ep, Embryo_Cell *params)
  * stop_program(program_id)
  * stop_programs_on(part_id)
  * set_drag(part_id, Float:dx, Float:dy)
- * get_drag(part_id, &Float:dx, &Float:&dy)
  * set_drag_step(part_id, Float:dx, Float:dy)
- * get_drag_step(part_id, &Float:dx, &Float:&dy)
  * set_drag_page(part_id, Float:dx, Float:dy)
- * get_drag_page(part_id, &Float:dx, &Float:&dy)
  * text_set(part_id, str[])
  * set_min_size(Float:w, Float:h)
- * get_min_size(&Float:w, &Float:h)
  * set_max_size(Float:w, Float:h)
- * get_max_size(&Float:w, &Float:h)
- * get_size(&Float:w, &Float:h)
  *
  * still need to implement this:
  * 
@@ -270,7 +264,12 @@ _edje_embryo_fn_cancel_anim(Embryo_Program *ep, Embryo_Cell *params)
  * set_drag_count(part_id, Float:dx, Float:dy)
  * set_drag_confine(part_id, confine_part_id)
  * text_get(part_id, dst[], maxlen)
- *
+ * get_drag(part_id, &Float:dx, &Float:&dy)
+ * get_drag_step(part_id, &Float:dx, &Float:&dy)
+ * get_drag_page(part_id, &Float:dx, &Float:&dy)
+ * get_min_size(&Float:w, &Float:h)
+ * get_max_size(&Float:w, &Float:h)
+ * get_size(&Float:w, &Float:h)
  * resize_request(w, h)
  * get_mouse(&x, &y)
  * get_mouse_buttons()
@@ -541,78 +540,6 @@ _edje_embryo_fn_set_drag_page(Embryo_Program *ep, Embryo_Cell *params)
    return 0;
 }
 
-/* get_drag(part_id, &Float:dx, &Float:&dy) */
-static Embryo_Cell
-_edje_embryo_fn_get_drag(Embryo_Program *ep, Embryo_Cell *params)
-{
-   Edje *ed;
-   int part_id = 0;
-   float *dx = NULL, *dy = NULL;
-   Edje_Real_Part *rp;
-   
-   CHKPARAM(3);
-   ed = embryo_program_data_get(ep);
-   part_id = params[1];
-   if (part_id < 0) return 0;
-   dx = (float *)params[2];
-   dy = (float *)params[3];
-   rp = ed->table_parts[part_id % ed->table_parts_size];
-   if (rp)
-     {
-       if (dx) *dx = (float)rp->drag.val.x;
-       if (dy) *dy = (float)rp->drag.val.y;
-     }
-   return 0;
-}
-
-/* get_drag_step(part_id, &Float:dx, &Float:&dy) */
-static Embryo_Cell
-_edje_embryo_fn_get_drag_step(Embryo_Program *ep, Embryo_Cell *params)
-{
-   Edje *ed;
-   int part_id = 0;
-   float *dx = NULL, *dy = NULL;
-   Edje_Real_Part *rp;
-   
-   CHKPARAM(3);
-   ed = embryo_program_data_get(ep);
-   part_id = params[1];
-   if (part_id < 0) return 0;
-   dx = (float *)params[2];
-   dy = (float *)params[3];
-   rp = ed->table_parts[part_id % ed->table_parts_size];
-   if (rp)
-     {
-       if (dx) *dx = (float)rp->drag.step.x;
-       if (dy) *dy = (float)rp->drag.step.y;
-     }
-   return 0;
-}
-
-/* get_drag_page(part_id, &Float:dx, &Float:&dy) */
-static Embryo_Cell
-_edje_embryo_fn_get_drag_page(Embryo_Program *ep, Embryo_Cell *params)
-{
-   Edje *ed;
-   int part_id = 0;
-   float *dx = NULL, *dy = NULL;
-   Edje_Real_Part *rp;
-   
-   CHKPARAM(3);
-   ed = embryo_program_data_get(ep);
-   part_id = params[1];
-   if (part_id < 0) return 0;
-   dx = (float *)params[2];
-   dy = (float *)params[3];
-   rp = ed->table_parts[part_id % ed->table_parts_size];
-   if (rp)
-     {
-       if (dx) *dx = (float)rp->drag.page.x;
-       if (dy) *dy = (float)rp->drag.page.y;
-     }
-   return 0;
-}
-
 /* text_set(part_id, str[]) */
 static Embryo_Cell
 _edje_embryo_fn_text_set(Embryo_Program *ep, Embryo_Cell *params)
@@ -671,23 +598,6 @@ _edje_embryo_fn_set_min_size(Embryo_Program *ep, Embryo_Cell *params)
    return 0;
 }
 
-/* get_min_size(&Float:w, &Float:h) */
-static Embryo_Cell
-_edje_embryo_fn_get_min_size(Embryo_Program *ep, Embryo_Cell *params)
-{
-   Edje *ed;
-   int part_id = 0;
-   float *w = NULL, *h = NULL;
-   
-   CHKPARAM(2);
-   ed = embryo_program_data_get(ep);
-   w = (float *)params[1];
-   h = (float *)params[2];
-   if (w) *w = (float)ed->collection->prop.min.w;
-   if (h) *h = (float)ed->collection->prop.min.h;
-   return 0;
-}
-
 /* set_max_size(Float:w, Float:h) */
 static Embryo_Cell
 _edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params)
@@ -714,43 +624,6 @@ _edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params)
    return 0;
 }
 
-/* get_max_size(&Float:w, &Float:h) */
-static Embryo_Cell
-_edje_embryo_fn_get_max_size(Embryo_Program *ep, Embryo_Cell *params)
-{
-   Edje *ed;
-   int part_id = 0;
-   float *w = NULL, *h = NULL;
-   
-   CHKPARAM(2);
-   ed = embryo_program_data_get(ep);
-   w = (float *)params[1];
-   h = (float *)params[2];
-   if (w) *w = (float)ed->collection->prop.max.w;
-   if (h) *h = (float)ed->collection->prop.max.h;
-   return 0;
-}
-
-/* get_size(&Float:w, &Float:h) */
-static Embryo_Cell
-_edje_embryo_fn_get_size(Embryo_Program *ep, Embryo_Cell *params)
-{
-   Edje *ed;
-   int part_id = 0;
-   float *w = NULL, *h = NULL;
-   Evas_Coord ww, hh;
-   
-   CHKPARAM(2);
-   ed = embryo_program_data_get(ep);
-   w = (float *)params[1];
-   h = (float *)params[2];
-
-   evas_object_geometry_get(ed->obj, NULL, NULL, &ww, &hh);
-   if (w) *w = (float)ww;
-   if (h) *h = (float)hh;
-   return 0;
-}
-
 /* MODIFY STATE VALUES
  * 
  * set_state_val(part_id, state[], Float:state_val, Param:param, ...)
@@ -822,17 +695,11 @@ _edje_embryo_script_init(Edje *ed)
    embryo_program_native_call_add(ep, "stop_program", _edje_embryo_fn_stop_program);
    embryo_program_native_call_add(ep, "stop_programs_on", _edje_embryo_fn_stop_programs_on);
    embryo_program_native_call_add(ep, "set_drag", _edje_embryo_fn_set_drag);
-   embryo_program_native_call_add(ep, "get_drag", _edje_embryo_fn_get_drag);
    embryo_program_native_call_add(ep, "set_drag_step", _edje_embryo_fn_set_drag_step);
-   embryo_program_native_call_add(ep, "get_drag_step", _edje_embryo_fn_get_drag_step);
    embryo_program_native_call_add(ep, "set_drag_page", _edje_embryo_fn_set_drag_page);
-   embryo_program_native_call_add(ep, "get_drag_page", _edje_embryo_fn_get_drag_page);
    embryo_program_native_call_add(ep, "text_set", _edje_embryo_fn_text_set);
    embryo_program_native_call_add(ep, "set_min_size", _edje_embryo_fn_set_min_size);
-   embryo_program_native_call_add(ep, "get_min_size", _edje_embryo_fn_get_min_size);
    embryo_program_native_call_add(ep, "set_max_size", _edje_embryo_fn_set_max_size);
-   embryo_program_native_call_add(ep, "get_max_size", _edje_embryo_fn_get_max_size);
-   embryo_program_native_call_add(ep, "get_size", _edje_embryo_fn_get_size);
    
    embryo_program_vm_push(ep); /* need a new vm to run in */
    _edje_embryo_globals_init(ed);