Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_events.c evas_object_line.c evas_object_main.c
evas_object_text.c evas_stack.c
Log Message:
oops - fix freeze stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- evas_events.c 30 Jul 2005 09:52:53 -0000 1.38
+++ evas_events.c 22 Sep 2005 02:52:53 -0000 1.39
@@ -218,7 +218,7 @@
ev.locks = &(e->locks);
ev.flags = flags;
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_DOWN, &ev);
}
if (copy) copy = evas_list_free(copy);
@@ -265,7 +265,7 @@
ev.locks = &(e->locks);
ev.flags = flags;
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
}
if (copy) copy = evas_list_free(copy);
@@ -298,7 +298,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
}
@@ -325,7 +325,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_IN, &ev);
}
}
@@ -362,25 +362,25 @@
e->last_timestamp = timestamp;
copy = evas_event_list_copy(e->pointer.object.in);
-
+
for (l = copy; l; l = l->next)
- {
- Evas_Event_Mouse_Wheel ev;
- Evas_Object *obj = l->data;
-
- ev.direction = direction;
- ev.z = z;
- ev.output.x = e->pointer.x;
- ev.output.y = e->pointer.y;
- ev.canvas.x = e->pointer.canvas_x;
- ev.canvas.y = e->pointer.canvas_y;
- ev.data = (void *) data;
- ev.modifiers = &(e->modifiers);
- ev.locks = &(e->locks);
- ev.timestamp = timestamp;
- if (!e->events_frozen)
+ {
+ Evas_Event_Mouse_Wheel ev;
+ Evas_Object *obj = l->data;
+
+ ev.direction = direction;
+ ev.z = z;
+ ev.output.x = e->pointer.x;
+ ev.output.y = e->pointer.y;
+ ev.canvas.x = e->pointer.canvas_x;
+ ev.canvas.y = e->pointer.canvas_y;
+ ev.data = (void *) data;
+ ev.modifiers = &(e->modifiers);
+ ev.locks = &(e->locks);
+ ev.timestamp = timestamp;
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev);
- }
+ }
if (copy) copy = evas_list_free(copy);
return;
@@ -451,7 +451,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_MOVE, &ev);
}
}
@@ -481,7 +481,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
}
@@ -530,7 +530,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_MOVE, &ev);
}
}
@@ -549,7 +549,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
}
@@ -575,7 +575,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_IN, &ev);
}
}
@@ -630,7 +630,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN,
&ev);
}
}
@@ -683,7 +683,7 @@
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
ev.timestamp = timestamp;
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(obj,
EVAS_CALLBACK_MOUSE_OUT, &ev);
}
}
@@ -743,7 +743,7 @@
(g->not_modifiers == ~e->modifiers.mask))) &&
(!strcmp(keyname, g->keyname)))
{
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(g->object,
EVAS_CALLBACK_KEY_DOWN, &ev);
if (g->exclusive) exclusive = 1;
}
@@ -770,7 +770,7 @@
}
if ((e->focused) && (!exclusive))
{
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(e->focused,
EVAS_CALLBACK_KEY_DOWN, &ev);
}
}
@@ -826,7 +826,7 @@
(g->not_modifiers == ~e->modifiers.mask))) &&
(!strcmp(keyname, g->keyname)))
{
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(g->object,
EVAS_CALLBACK_KEY_UP, &ev);
if (g->exclusive) exclusive = 1;
}
@@ -853,7 +853,7 @@
}
if ((e->focused) && (!exclusive))
{
- if (!e->events_frozen)
+ if (e->events_frozen <= 0)
evas_object_event_callback_call(e->focused,
EVAS_CALLBACK_KEY_UP, &ev);
}
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_line.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_object_line.c 25 Jul 2005 09:55:47 -0000 1.15
+++ evas_object_line.c 22 Sep 2005 02:52:53 -0000 1.16
@@ -111,7 +111,7 @@
MAGIC_CHECK_END();
if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
(x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
if (!evas_event_passes_through(obj))
was = evas_object_is_in_output_rect(obj,
@@ -150,7 +150,7 @@
o->changed = 1;
evas_object_change(obj);
evas_object_coords_recalc(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
is = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- evas_object_main.c 1 Aug 2005 13:52:55 -0000 1.34
+++ evas_object_main.c 22 Sep 2005 02:52:53 -0000 1.35
@@ -467,7 +467,7 @@
evas_object_inform_call_move(obj);
return;
}
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
pass = evas_event_passes_through(obj);
if (pass)
@@ -480,7 +480,7 @@
obj->cur.cache.geometry.validity = 0;
evas_object_change(obj);
evas_object_clip_dirty(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
evas_object_recalc_clippees(obj);
if (!pass)
@@ -531,7 +531,7 @@
evas_object_inform_call_resize(obj);
return;
}
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
pass = evas_event_passes_through(obj);
if (!pass)
@@ -545,7 +545,7 @@
evas_object_change(obj);
evas_object_clip_dirty(obj);
evas_object_recalc_clippees(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
// if (obj->func->coords_recalc) obj->func->coords_recalc(obj);
if (!pass)
@@ -634,7 +634,7 @@
obj->cur.visible = 1;
evas_object_change(obj);
evas_object_clip_dirty(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
evas_object_recalc_clippees(obj);
if (!evas_event_passes_through(obj))
@@ -681,7 +681,7 @@
obj->cur.visible = 0;
evas_object_change(obj);
evas_object_clip_dirty(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
evas_object_recalc_clippees(obj);
if (!evas_event_passes_through(obj))
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- evas_object_text.c 25 Jul 2005 09:55:47 -0000 1.41
+++ evas_object_text.c 22 Sep 2005 02:52:53 -0000 1.42
@@ -152,7 +152,7 @@
same_font = 1;
if (size == o->cur.size) return;
}
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
pass = evas_event_passes_through(obj);
if (!pass)
@@ -222,7 +222,7 @@
o->changed = 1;
evas_object_change(obj);
evas_object_coords_recalc(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
if (!pass)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evas_stack.c 3 Sep 2005 04:47:32 -0000 1.17
+++ evas_stack.c 22 Sep 2005 02:52:53 -0000 1.18
@@ -72,7 +72,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
if (!evas_event_passes_through(obj))
{
@@ -125,7 +125,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
if (!evas_event_passes_through(obj))
{
@@ -191,7 +191,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
if (!evas_event_passes_through(obj))
{
@@ -257,7 +257,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (obj->layer->evas->events_frozen != 0)
+ if (obj->layer->evas->events_frozen <= 0)
{
if (!evas_event_passes_through(obj))
{
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
