Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/canvas


Modified Files:
        evas_clip.c evas_events.c evas_layer.c evas_object_line.c 
        evas_object_main.c evas_object_polygon.c evas_object_text.c 
        evas_stack.c 


Log Message:


extend key and mouse events

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_clip.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_clip.c 22 Sep 2004 04:37:51 -0000      1.9
+++ evas_clip.c 14 Dec 2004 03:21:32 -0000      1.10
@@ -186,9 +186,10 @@
        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, 
+         evas_event_feed_mouse_move(obj->layer->evas,
                                     obj->layer->evas->pointer.x, 
-                                    obj->layer->evas->pointer.y);
+                                    obj->layer->evas->pointer.y,
+                                    NULL);
      }
 }
 
@@ -273,7 +274,8 @@
                                          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,
+                                    NULL);
      }
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- evas_events.c       21 Sep 2004 12:00:31 -0000      1.28
+++ evas_events.c       14 Dec 2004 03:21:32 -0000      1.29
@@ -153,7 +153,7 @@
  * 
  */
 void
-evas_event_feed_mouse_down_data(Evas *e, int b, const void *data)
+evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, const void 
*data)
 {
    Evas_List *l, *copy;
    
@@ -185,6 +185,7 @@
        ev.data = (void *)data;
        ev.modifiers = &(e->modifiers);
        ev.locks = &(e->locks);
+       ev.flags = flags;
        if (!e->events_frozen)
          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_DOWN, &ev);
      }
@@ -198,47 +199,7 @@
  * 
  */
 void
-evas_event_feed_mouse_wheel_data(Evas *e, int direction, int z, const void 
*data)
-{
-   Evas_List *l, *copy;
-   
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (e->events_frozen > 0) return;
-   
-   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);  
-      if (!e->events_frozen)   
-         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev);
-   }
-
-   return;
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
-evas_event_feed_mouse_up_data(Evas *e, int b, const void *data)
+evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, const void 
*data)
 {
    Evas_List *l, *copy;
    
@@ -269,6 +230,7 @@
        ev.data = (void *)data;
        ev.modifiers = &(e->modifiers);
        ev.locks = &(e->locks);
+       ev.flags = flags;
        if (!e->events_frozen)
          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
      }
@@ -341,7 +303,7 @@
        /* and set up the new one */
        e->pointer.object.in = ins;
        if (e->pointer.inside)
-         evas_event_feed_mouse_move_data(e, e->pointer.x, e->pointer.y, data);
+         evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, data);
      }
 }
 
@@ -352,7 +314,47 @@
  * 
  */
 void
-evas_event_feed_mouse_move_data(Evas *e, int x, int y, const void *data)
+evas_event_feed_mouse_wheel(Evas *e, int direction, int z, const void *data)
+{
+   Evas_List *l, *copy;
+   
+   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
+   return;
+   MAGIC_CHECK_END();
+
+   if (e->events_frozen > 0) return;
+   
+   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);  
+      if (!e->events_frozen)   
+         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev);
+   }
+
+   return;
+}
+
+/**
+ * To be documented.
+ *
+ * FIXME: To be fixed.
+ * 
+ */
+void
+evas_event_feed_mouse_move(Evas *e, int x, int y, const void *data)
 {
    int px, py;
    Evas_Coord pcx, pcy;
@@ -542,7 +544,7 @@
  * 
  */
 void
-evas_event_feed_mouse_in_data(Evas *e, const void *data)
+evas_event_feed_mouse_in(Evas *e, const void *data)
 {
    Evas_List *ins;     
    Evas_List *l;
@@ -585,7 +587,7 @@
    e->pointer.object.in = evas_list_free(e->pointer.object.in);
    /* and set up the new one */
    e->pointer.object.in = ins;
-   evas_event_feed_mouse_move_data(e, e->pointer.x, e->pointer.y, data);
+   evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, data);
 }
 
 /**
@@ -595,7 +597,7 @@
  * 
  */
 void
-evas_event_feed_mouse_out_data(Evas *e, const void *data)
+evas_event_feed_mouse_out(Evas *e, const void *data)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -644,7 +646,7 @@
  * 
  */
 void
-evas_event_feed_key_down_data(Evas *e, const char *keyname, const void *data)
+evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const 
char *string, const char *compose, const void *data)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -660,6 +662,9 @@
        ev.data = (void *)data;
        ev.modifiers = &(e->modifiers);
        ev.locks = &(e->locks);
+       ev.key = key;
+       ev.string = string;
+       ev.compose = compose;
        if (e->grabs)
          {
             Evas_List *l;
@@ -722,7 +727,7 @@
  * 
  */
 void
-evas_event_feed_key_up_data(Evas *e, const char *keyname, const void *data)
+evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const 
char *string, const char *compose, const void *data)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -738,6 +743,9 @@
        ev.data = (void *)data;
        ev.modifiers = &(e->modifiers);
        ev.locks = &(e->locks);
+       ev.key = key;
+       ev.string = string;
+       ev.compose = compose;
        if (e->grabs)
          {
             Evas_List *l;
@@ -800,102 +808,6 @@
  * 
  */
 void
-evas_event_feed_mouse_down(Evas *e, int b)
-{
-   evas_event_feed_mouse_down_data(e, b, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
-evas_event_feed_mouse_up(Evas *e, int b)
-{
-   evas_event_feed_mouse_up_data(e, b, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
-evas_event_feed_mouse_move(Evas *e, int x, int y)
-{
-   evas_event_feed_mouse_move_data(e, x, y, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
-evas_event_feed_mouse_in(Evas *e)
-{
-   evas_event_feed_mouse_in_data(e, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
-evas_event_feed_mouse_out(Evas *e)
-{
-   evas_event_feed_mouse_out_data(e, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- *
- */
-void
-evas_event_feed_mouse_wheel(Evas *e, int direction, int z)
-{
-   evas_event_feed_mouse_wheel_data(e, direction, z, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
-evas_event_feed_key_down(Evas *e, const char *keyname)
-{
-   evas_event_feed_key_down_data(e, keyname, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
-evas_event_feed_key_up(Evas *e, const char *keyname)
-{
-   evas_event_feed_key_up_data(e, keyname, NULL);
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- * 
- */
-void
 evas_object_pass_events_set(Evas_Object *obj, Evas_Bool pass)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -907,7 +819,8 @@
                                     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,
+                               NULL);
 }
 
 /**
@@ -942,8 +855,9 @@
                                     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.x,
+                               obj->layer->evas->pointer.y,
+                               NULL);
 }
 
 /**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_layer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_layer.c        23 Aug 2004 23:04:33 -0000      1.8
+++ evas_layer.c        14 Dec 2004 03:21:32 -0000      1.9
@@ -169,7 +169,7 @@
                                          obj->layer->evas->pointer.y, 1, 1) &&
            obj->cur.visible)
          if (evas_list_find(obj->layer->evas->pointer.object.in, obj))
-           evas_event_feed_mouse_move(obj->layer->evas, 
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y);   
+           evas_event_feed_mouse_move(obj->layer->evas, 
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
      }
    evas_object_inform_call_restack(obj);
 }
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_line.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_object_line.c  16 Aug 2004 05:13:25 -0000      1.9
+++ evas_object_line.c  14 Dec 2004 03:21:32 -0000      1.10
@@ -156,7 +156,8 @@
        if ((is ^ was) && obj->cur.visible)
          evas_event_feed_mouse_move(obj->layer->evas,
                                     obj->layer->evas->pointer.x,
-                                    obj->layer->evas->pointer.y);
+                                    obj->layer->evas->pointer.y,
+                                    NULL);
      }
    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.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- evas_object_main.c  20 Nov 2004 07:41:14 -0000      1.23
+++ evas_object_main.c  14 Dec 2004 03:21:32 -0000      1.24
@@ -487,7 +487,8 @@
             if ((is ^ was) && obj->cur.visible)
               evas_event_feed_mouse_move(obj->layer->evas, 
                                          obj->layer->evas->pointer.x, 
-                                         obj->layer->evas->pointer.y);
+                                         obj->layer->evas->pointer.y,
+                                         NULL);
          }
      }
    evas_object_inform_call_move(obj);
@@ -539,9 +540,10 @@
                                                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, 
+              evas_event_feed_mouse_move(obj->layer->evas,
                                          obj->layer->evas->pointer.x, 
-                                         obj->layer->evas->pointer.y);
+                                         obj->layer->evas->pointer.y,
+                                         NULL);
          }
      }
    evas_object_inform_call_resize(obj);
@@ -623,7 +625,8 @@
                                               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,
+                                         NULL);
          }
      }
    evas_object_inform_call_show(obj);
@@ -664,7 +667,8 @@
                                               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,
+                                         NULL);
             if (obj->mouse_grabbed > 0)
               {
                  if (obj->layer->evas->pointer.mouse_grabbed > 0)
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_polygon.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_object_polygon.c       16 Aug 2004 05:13:25 -0000      1.9
+++ evas_object_polygon.c       14 Dec 2004 03:21:32 -0000      1.10
@@ -151,7 +151,8 @@
        if ((is ^ was) && obj->cur.visible)
          evas_event_feed_mouse_move(obj->layer->evas,
                                     obj->layer->evas->pointer.x,
-                                    obj->layer->evas->pointer.y);
+                                    obj->layer->evas->pointer.y,
+                                    NULL);
      }
    evas_object_inform_call_move(obj);
    evas_object_inform_call_resize(obj);
@@ -195,7 +196,8 @@
    if ((is || was) && obj->cur.visible)
      evas_event_feed_mouse_move(obj->layer->evas,
                                obj->layer->evas->pointer.x,
-                               obj->layer->evas->pointer.y);   
+                               obj->layer->evas->pointer.y,
+                               NULL);
    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.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- evas_object_text.c  28 Aug 2004 01:38:31 -0000      1.29
+++ evas_object_text.c  14 Dec 2004 03:21:32 -0000      1.30
@@ -715,7 +715,8 @@
        if ((is ^ was) && obj->cur.visible)
          evas_event_feed_mouse_move(obj->layer->evas,
                                     obj->layer->evas->pointer.x,
-                                    obj->layer->evas->pointer.y);
+                                    obj->layer->evas->pointer.y,
+                                    NULL);
      }
    evas_object_inform_call_resize(obj);
 }
@@ -801,7 +802,8 @@
    if ((is || was) && obj->cur.visible)
      evas_event_feed_mouse_move(obj->layer->evas,
                                obj->layer->evas->pointer.x,
-                               obj->layer->evas->pointer.y);   
+                               obj->layer->evas->pointer.y,
+                               NULL);
    evas_object_inform_call_resize(obj);
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_stack.c        14 Jun 2004 06:04:22 -0000      1.9
+++ evas_stack.c        14 Dec 2004 03:21:32 -0000      1.10
@@ -81,7 +81,7 @@
                                               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_event_feed_mouse_move(obj->layer->evas, 
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
          }
      }
    evas_object_inform_call_restack(obj);
@@ -127,7 +127,7 @@
                                               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_event_feed_mouse_move(obj->layer->evas, 
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
          }
      }
    evas_object_inform_call_restack(obj);
@@ -181,7 +181,7 @@
                                               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_event_feed_mouse_move(obj->layer->evas, 
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
          }
      }
    evas_object_inform_call_restack(obj);
@@ -235,7 +235,7 @@
                                               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_event_feed_mouse_move(obj->layer->evas, 
obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, NULL);
          }
      }
    evas_object_inform_call_restack(obj);




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to