Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

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


Modified Files:
        evas_events.c 


Log Message:


sorry formie - we want these in! you have to find the extra thaw!

if u want help:

export EVAS_DEBUG_SHOW=1
export EVAS_DEBUG_ABORT=1

and evas will call abort() (and thus gdb will trap it) on errors.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- evas_events.c       28 Jan 2004 02:43:13 -0000      1.16
+++ evas_events.c       28 Jan 2004 04:30:55 -0000      1.17
@@ -152,6 +152,8 @@
    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)
@@ -212,7 +214,8 @@
        ev.data = (void *)data;
        ev.modifiers = &(e->modifiers);
        ev.locks = &(e->locks); 
-       evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
+       if (!e->events_frozen)
+         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
      }
    if (copy) copy = evas_list_free(copy);
    if (!e->pointer.button) 
@@ -244,7 +247,8 @@
                  ev.data = (void *)data;
                  ev.modifiers = &(e->modifiers);
                  ev.locks = &(e->locks);                 
-                 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
+                 if (!e->events_frozen)
+                   evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
               }
          }
        if (copy) copy = evas_list_free(copy);
@@ -267,7 +271,8 @@
                  ev.data = (void *)data;
                  ev.modifiers = &(e->modifiers);
                  ev.locks = &(e->locks);
-                 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
+                 if (!e->events_frozen)
+                   evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
               }
          }
        /* free our old list of ins */
@@ -340,7 +345,8 @@
                       ev.data = (void *)data;
                       ev.modifiers = &(e->modifiers);
                       ev.locks = &(e->locks);                 
-                      evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, 
&ev);
+                      if (!e->events_frozen)
+                        evas_object_event_callback_call(obj, 
EVAS_CALLBACK_MOUSE_MOVE, &ev);
                    }
               }
             else
@@ -366,7 +372,8 @@
                  ev.data = (void *)data;
                  ev.modifiers = &(e->modifiers);
                  ev.locks = &(e->locks);
-                 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
+                 if (!e->events_frozen)
+                   evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
               }             
          }
      }
@@ -411,7 +418,8 @@
                       ev.data = (void *)data;
                       ev.modifiers = &(e->modifiers);
                       ev.locks = &(e->locks);                 
-                      evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, 
&ev);
+                      if (!e->events_frozen)
+                        evas_object_event_callback_call(obj, 
EVAS_CALLBACK_MOUSE_MOVE, &ev);
                    }
               }
             /* otherwise it has left the object */
@@ -428,7 +436,8 @@
                  ev.data = (void *)data;
                  ev.modifiers = &(e->modifiers);
                  ev.locks = &(e->locks);                 
-                 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
+                 if (!e->events_frozen)
+                   evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
               }
          }
        if (copy) copy = evas_list_free(copy);
@@ -452,7 +461,8 @@
                  ev.data = (void *)data;
                  ev.modifiers = &(e->modifiers);
                  ev.locks = &(e->locks);                 
-                 evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
+                 if (!e->events_frozen)
+                   evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
               }
          }
        /* free our old list of ins */
@@ -541,7 +551,8 @@
                         (g->not_modifiers == ~e->modifiers.mask))) &&
                      (!strcmp(keyname, g->keyname)))
                    {
-                      evas_object_event_callback_call(g->object, 
EVAS_CALLBACK_KEY_DOWN, &ev);
+                      if (!e->events_frozen)
+                        evas_object_event_callback_call(g->object, 
EVAS_CALLBACK_KEY_DOWN, &ev);
                       if (g->exclusive) exclusive = 1;
                    }
               }
@@ -567,7 +578,8 @@
          }
        if ((e->focused) && (!exclusive))
          {
-            evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_DOWN, &ev);
+            if (!e->events_frozen)
+              evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_DOWN, 
&ev);
          }
      }
 }
@@ -617,7 +629,8 @@
                         (g->not_modifiers == ~e->modifiers.mask))) &&
                      (!strcmp(keyname, g->keyname)))
                    {
-                      evas_object_event_callback_call(g->object, 
EVAS_CALLBACK_KEY_UP, &ev);
+                      if (!e->events_frozen)
+                        evas_object_event_callback_call(g->object, 
EVAS_CALLBACK_KEY_UP, &ev);
                       if (g->exclusive) exclusive = 1;
                    }                 
               }
@@ -643,7 +656,8 @@
          }
        if ((e->focused) && (!exclusive))
          {
-            evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_UP, &ev);
+            if (!e->events_frozen)
+              evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_UP, &ev);
          }
      }
 }




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to