Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_callbacks.c
Log Message:
cleanup. formatting and stuff
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- edje_callbacks.c 26 Jul 2005 13:59:02 -0000 1.19
+++ edje_callbacks.c 26 Jul 2005 19:27:02 -0000 1.20
@@ -1,8 +1,7 @@
/*
- * vim: ts=8
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-
#include "Edje.h"
#include "edje_private.h"
@@ -61,64 +60,55 @@
_edje_emit(ed, buf, rp->part->name);
if (rp->events_to)
- {
- int x, y;
- Edje_Real_Part* events;
- events = rp->events_to;
-
- //fprintf(stderr,"rp = %s, events = %s\n", rp->part->name,
events->part->name);
-
- evas_object_geometry_get(rp->object, &x, &y, NULL, NULL);
- /*
- fprintf(stderr,"x = %d, y = %d\n", x, y);
- fprintf(stderr,"ev->canvas.x = %d\n", ev->canvas.x);
- *
- x = ed->x;
- y = ed->y;
- */
- if ((events->part->dragable.x) || (events->part->dragable.y))
- {
- if (events->part->dragable.x)
+ {
+ int x = 0, y = 0;
+ Edje_Real_Part *events = rp->events_to;
+
+ evas_object_geometry_get(rp->object, &x, &y, NULL, NULL);
+
+ if ((events->part->dragable.x) || (events->part->dragable.y))
+ {
+ if (events->part->dragable.x)
{
- events->drag.tmp.x = ev->canvas.x - x - (events->x +
events->w/2);
- events->drag.down.x = ev->canvas.x - x;
- events->x = ev->canvas.x - x - events->w/2;
+ events->drag.tmp.x = ev->canvas.x - x - (events->x +
events->w / 2);
+ events->drag.down.x = ev->canvas.x - x;
+ events->x = ev->canvas.x - x - events->w / 2;
}
- if (events->part->dragable.y)
+ if (events->part->dragable.y)
{
- events->drag.tmp.y = ev->canvas.y - y - (events->y +
events->h/2);
- events->drag.down.y = ev->canvas.y - y;
- events->y = ev->canvas.y - y - events->h/2;
+ events->drag.tmp.y = ev->canvas.y - y - (events->y +
events->h / 2);
+ events->drag.down.y = ev->canvas.y - y;
+ events->y = ev->canvas.y - y - events->h / 2;
}
- snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
- _edje_emit(ed, buf, events->part->name);
- ed->dirty = 1;
- }
- _edje_recalc(ed);
- _edje_thaw(ed);
- _edje_unref(ed);
- _edje_ref(ed);
- _edje_freeze(ed);
-
- rp = events;
- {
- double dx, dy;
- int dir;
-
- dir = _edje_part_dragable_calc(ed, rp, &dx, &dy);
-// fprintf(stderr,"dx = %f, dy = %f\n", dx, dy);
- if ((dx != rp->drag.val.x) || (dy != rp->drag.val.y))
- {
- rp->drag.val.x = dx;
- rp->drag.val.y = dy;
- _edje_emit(ed, "drag", rp->part->name);
- ed->dirty = 1;
- rp->drag.need_reset = 1;
- _edje_recalc(ed);
- }
- }
- }
+ snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
+ _edje_emit(ed, buf, events->part->name);
+ ed->dirty = 1;
+ }
+ _edje_recalc(ed);
+ _edje_thaw(ed);
+ _edje_unref(ed);
+ _edje_ref(ed);
+ _edje_freeze(ed);
+
+ rp = events;
+ {
+ double dx = 0.0, dy = 0.0;
+ int dir;
+
+ dir = _edje_part_dragable_calc(ed, rp, &dx, &dy);
+
+ if ((dx != rp->drag.val.x) || (dy != rp->drag.val.y))
+ {
+ rp->drag.val.x = dx;
+ rp->drag.val.y = dy;
+ _edje_emit(ed, "drag", rp->part->name);
+ ed->dirty = 1;
+ rp->drag.need_reset = 1;
+ _edje_recalc(ed);
+ }
+ }
+ }
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
@@ -161,11 +151,11 @@
_edje_ref(ed);
_edje_emit(ed, buf, rp->part->name);
- if(rp->events_to)
- {
- rp = rp->events_to;
- snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
- _edje_emit(ed, buf, rp->part->name);
+ if (rp->events_to)
+ {
+ rp = rp->events_to;
+ snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
+ _edje_emit(ed, buf, rp->part->name);
}
if ((rp->part->dragable.x) || (rp->part->dragable.y))
@@ -208,7 +198,9 @@
rp = evas_object_data_get(obj, "real_part");
if (!rp) return;
if (rp->events_to)
- rp = rp->events_to;
+ {
+ rp = rp->events_to;
+ }
if (rp->still_in)
{
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
