Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_line.c evas_object_main.c evas_object_polygon.c
evas_object_text.c evas_stack.c
Log Message:
ooooops. evas bug1 fix fix fix
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_line.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_object_line.c 5 Mar 2003 02:30:18 -0000 1.4
+++ evas_object_line.c 22 Jul 2003 05:16:47 -0000 1.5
@@ -102,9 +102,10 @@
MAGIC_CHECK_END();
if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
(x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
- was = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
+ if (!obj->pass_events)
+ was = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
if (x1 < x2)
{
min_x = x1;
@@ -140,10 +141,13 @@
is = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
- if ((is ^ was) && obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y);
+ if (!obj->pass_events)
+ {
+ if ((is ^ was) && obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y);
+ }
evas_object_inform_call_move(obj);
evas_object_inform_call_resize(obj);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_object_main.c 26 Jun 2003 07:38:44 -0000 1.13
+++ evas_object_main.c 22 Jul 2003 05:16:47 -0000 1.14
@@ -455,23 +455,27 @@
evas_object_inform_call_move(obj);
return;
}
- was = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
+ if (!obj->pass_events)
+ was = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
obj->cur.geometry.x = x;
obj->cur.geometry.y = y;
obj->cur.cache.geometry.validity = 0;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->smart.smart)
+ if (!obj->pass_events)
{
- is = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
- if ((is ^ was) && obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y);
+ if (!obj->smart.smart)
+ {
+ is = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
+ if ((is ^ was) && obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y);
+ }
}
evas_object_inform_call_move(obj);
}
@@ -503,23 +507,27 @@
evas_object_inform_call_resize(obj);
return;
}
- was = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
+ if (!obj->pass_events)
+ was = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
obj->cur.geometry.w = w;
obj->cur.geometry.h = h;
obj->cur.cache.geometry.validity = 0;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->smart.smart)
+ if (!obj->pass_events)
{
- is = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
- if ((is ^ was) && (obj->cur.visible))
- evas_event_feed_mouse_move(obj->layer->evas,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y);
+ if (!obj->smart.smart)
+ {
+ is = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
+ if ((is ^ was) && (obj->cur.visible))
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y);
+ }
}
}
@@ -568,14 +576,17 @@
obj->cur.visible = 1;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->smart.smart)
+ if (!obj->pass_events)
{
- if (evas_object_is_in_output_rect(obj,
+ if (!obj->smart.smart)
+ {
+ if (evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1))
+ evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1))
- evas_event_feed_mouse_move(obj->layer->evas,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y);
+ obj->layer->evas->pointer.y);
+ }
}
evas_object_inform_call_show(obj);
}
@@ -606,33 +617,36 @@
obj->cur.visible = 0;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->smart.smart)
- {
- if (evas_object_is_in_output_rect(obj,
+ if (!obj->pass_events)
+ {
+ if (!obj->smart.smart)
+ {
+ if (evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1))
+ evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1))
- evas_event_feed_mouse_move(obj->layer->evas,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y);
+ obj->layer->evas->pointer.y);
/* if ((obj->mouse_in) || (obj->mouse_grabbed)) */
- {
- obj->mouse_in = 0;
- obj->mouse_grabbed = 0;
- obj->layer->evas->pointer.object.in =
evas_list_remove(obj->layer->evas->pointer.object.in, obj);
- if (obj->layer->evas->events_frozen > 0) return;
- if (obj->mouse_in)
{
- Evas_Event_Mouse_Out ev;
-
- ev.buttons = obj->layer->evas->pointer.button;
- ev.output.x = obj->layer->evas->pointer.x;
- ev.output.y = obj->layer->evas->pointer.y;
- ev.canvas.x = obj->layer->evas->pointer.canvas_x;
- ev.canvas.y = obj->layer->evas->pointer.canvas_y;
- ev.data = NULL;
- ev.modifiers = &(obj->layer->evas->modifiers);
- ev.locks = &(obj->layer->evas->locks);
- evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
+ obj->mouse_in = 0;
+ obj->mouse_grabbed = 0;
+ obj->layer->evas->pointer.object.in =
evas_list_remove(obj->layer->evas->pointer.object.in, obj);
+ if (obj->layer->evas->events_frozen > 0) return;
+ if (obj->mouse_in)
+ {
+ Evas_Event_Mouse_Out ev;
+
+ ev.buttons = obj->layer->evas->pointer.button;
+ ev.output.x = obj->layer->evas->pointer.x;
+ ev.output.y = obj->layer->evas->pointer.y;
+ ev.canvas.x = obj->layer->evas->pointer.canvas_x;
+ ev.canvas.y = obj->layer->evas->pointer.canvas_y;
+ ev.data = NULL;
+ ev.modifiers = &(obj->layer->evas->modifiers);
+ ev.locks = &(obj->layer->evas->locks);
+ evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT,
&ev);
+ }
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_polygon.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_object_polygon.c 5 Mar 2003 02:30:19 -0000 1.4
+++ evas_object_polygon.c 22 Jul 2003 05:16:47 -0000 1.5
@@ -99,9 +99,10 @@
MAGIC_CHECK(o, Evas_Object_Polygon, MAGIC_OBJ_POLYGON);
return;
MAGIC_CHECK_END();
- was = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
+ if (!obj->pass_events)
+ was = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
p = malloc(sizeof(Evas_Polygon_Point));
if (!p) return;
p->x = x;
@@ -138,10 +139,13 @@
is = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
- if ((is ^ was) && obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y);
+ if (!obj->pass_events)
+ {
+ if ((is ^ was) && obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y);
+ }
evas_object_inform_call_move(obj);
evas_object_inform_call_resize(obj);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- evas_object_text.c 18 Jul 2003 01:46:12 -0000 1.16
+++ evas_object_text.c 22 Jul 2003 05:16:47 -0000 1.17
@@ -502,9 +502,10 @@
same_font = 1;
if (size == o->cur.size) return;
}
- was = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
+ if (!obj->pass_events)
+ was = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
/* DO IT */
if (o->engine_data)
obj->layer->evas->engine.func->font_free(obj->layer->evas->engine.data.output,
@@ -583,13 +584,16 @@
o->changed = 1;
evas_object_change(obj);
evas_object_coords_recalc(obj);
- is = evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1);
- if ((is || was) && obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y);
+ if (!obj->pass_events)
+ {
+ is = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
+ if ((is ^ was) && obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y);
+ }
evas_object_inform_call_resize(obj);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_stack.c 5 Mar 2003 02:30:20 -0000 1.4
+++ evas_stack.c 22 Jul 2003 05:16:47 -0000 1.5
@@ -73,13 +73,16 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->smart.smart)
+ if (!obj->pass_events)
{
- if (evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1) &&
- obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas, obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y);
+ if (!obj->smart.smart)
+ {
+ if (evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1) &&
+ obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y);
+ }
}
evas_object_inform_call_restack(obj);
}
@@ -116,13 +119,16 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->smart.smart)
+ if (!obj->pass_events)
{
- if (evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1) &&
- obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas, obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y);
+ if (!obj->smart.smart)
+ {
+ if (evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1) &&
+ obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y);
+ }
}
evas_object_inform_call_restack(obj);
}
@@ -167,13 +173,16 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->smart.smart)
+ if (!obj->pass_events)
{
- if (evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1) &&
- obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas, obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y);
+ if (!obj->smart.smart)
+ {
+ if (evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1) &&
+ obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y);
+ }
}
evas_object_inform_call_restack(obj);
}
@@ -218,13 +227,16 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->smart.smart)
+ if (!obj->pass_events)
{
- if (evas_object_is_in_output_rect(obj,
- obj->layer->evas->pointer.x,
- obj->layer->evas->pointer.y, 1, 1) &&
- obj->cur.visible)
- evas_event_feed_mouse_move(obj->layer->evas, obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y);
+ if (!obj->smart.smart)
+ {
+ if (evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1) &&
+ obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y);
+ }
}
evas_object_inform_call_restack(obj);
}
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
