Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_callbacks.c edje_message_queue.c
Log Message:
remove excess calcs.
add faster missed job reaper timer
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- edje_callbacks.c 26 Jul 2005 19:27:02 -0000 1.20
+++ edje_callbacks.c 1 Nov 2005 04:10:01 -0000 1.21
@@ -62,8 +62,9 @@
if (rp->events_to)
{
int x = 0, y = 0;
- Edje_Real_Part *events = rp->events_to;
-
+ Edje_Real_Part *events;
+
+ events = rp->events_to;
evas_object_geometry_get(rp->object, &x, &y, NULL, NULL);
if ((events->part->dragable.x) || (events->part->dragable.y))
@@ -86,11 +87,12 @@
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;
@@ -127,7 +129,7 @@
rp->clicked_button = ev->button;
rp->still_in = 1;
}
- _edje_recalc(ed);
+// _edje_recalc(ed);
_edje_thaw(ed);
_edje_unref(ed);
return;
@@ -149,6 +151,7 @@
snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
_edje_ref(ed);
+ _edje_freeze(ed);
_edje_emit(ed, buf, rp->part->name);
if (rp->events_to)
@@ -156,7 +159,7 @@
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))
{
@@ -171,7 +174,6 @@
}
}
}
- _edje_freeze(ed);
if ((rp->still_in) && (rp->clicked_button == ev->button))
{
rp->clicked_button = 0;
@@ -179,7 +181,7 @@
snprintf(buf, sizeof(buf), "mouse,clicked,%i", ev->button);
_edje_emit(ed, buf, rp->part->name);
}
- _edje_recalc(ed);
+// _edje_recalc(ed);
_edje_thaw(ed);
_edje_unref(ed);
return;
@@ -197,11 +199,11 @@
ed = data;
rp = evas_object_data_get(obj, "real_part");
if (!rp) return;
- if (rp->events_to)
- {
- rp = rp->events_to;
- }
+ if (rp->events_to) rp = rp->events_to;
+ _edje_ref(ed);
+ _edje_emit(ed, "mouse,move", rp->part->name);
+
if (rp->still_in)
{
Evas_Coord x, y, w, h;
@@ -232,12 +234,7 @@
ed->dirty = 1;
}
}
- _edje_ref(ed);
- _edje_emit(ed, "mouse,move", rp->part->name);
-/* FIXME: this FUCKS up badly!!!! */
-/* ed->calc_only = 1; */
- _edje_recalc(ed);
-/* ed->calc_only = 0; */
+// _edje_recalc(ed);
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
if (rp->drag.down.count > 0)
@@ -252,7 +249,7 @@
rp->drag.val.y = dy;
_edje_emit(ed, "drag", rp->part->name);
ed->dirty = 1;
- _edje_recalc(ed);
+// _edje_recalc(ed);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_message_queue.c 28 Jul 2005 13:39:23 -0000 1.17
+++ edje_message_queue.c 1 Nov 2005 04:10:01 -0000 1.18
@@ -279,7 +279,7 @@
// printf("no job... add\n");
job = ecore_job_add(_edje_job, NULL);
if (job_loss_timer) ecore_timer_del(job_loss_timer);
- job_loss_timer = ecore_timer_add(0.25, _edje_job_loss_timer, NULL);
+ job_loss_timer = ecore_timer_add(0.05, _edje_job_loss_timer, NULL);
}
em = _edje_message_new(ed, queue, type, id);
if (!em) return;
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
