Merge lp:~apinheiro/nux/fix-event-inspector into lp:nux

[Alejandro Piñeiro]

Recently I started to work on bug 702672, and for that I need to use the EventInspector support on WindowThread.

So my idea was make something like this:

static int
unity_key_snooper (nux::Area *area, nux::Event *event, void *data)
{
 //do something
}

wt->InstallEventInspector (unity_key_snooper, NULL);

But this launches a casting error while compiling. So I tried to use a casting with (EventInspector *). But then it crashes while executing the code (I also tried with &unity_key_snooper).

Then I realized something on the install method:

    int InstallEventInspector (EventInspector *function, void* data);

EventInspector is already defined as a pointer, so this *function is not required. So I modified those, and things works now.

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'Nux/WindowThread.cpp'
--- Nux/WindowThread.cpp	2011-03-09 22:50:06 +0000
+++ Nux/WindowThread.cpp	2011-03-15 12:10:52 +0000
@@ -1839,7 +1839,7 @@
     GetGpuDevice()->DeactivateFrameBuffer();
   }
 
-  int WindowThread::InstallEventInspector (EventInspector* function, void* data)
+  int WindowThread::InstallEventInspector (EventInspector function, void* data)
   {
     NUX_RETURN_VALUE_IF_NULL (function, 0);
 
@@ -1881,7 +1881,7 @@
     return false;
   }
 
-  bool WindowThread::RemoveEventInspector (EventInspector* function)
+  bool WindowThread::RemoveEventInspector (EventInspector function)
   {
     NUX_RETURN_VALUE_IF_NULL (function, false);
 
@@ -1912,12 +1912,13 @@
 
     for (it = _event_inspectors_map.begin (); it != _event_inspectors_map.end (); it++)
     {
-      EventInspector *callback = (*it).second._function;
+      EventInspector callback = (*it).second._function;
 
       if (callback == 0)
         continue;
 
-      int ret = (*callback) (0, event, (*it).second._data);
+      int ret = callback (0, event, (*it).second._data);
+
       if (ret)
       {
         discard_event = true;
 
=== modified file 'Nux/WindowThread.h'
--- Nux/WindowThread.h	2011-03-09 22:50:06 +0000
+++ Nux/WindowThread.h	2011-03-15 12:10:52 +0000
@@ -383,7 +383,7 @@
        @param data     User defined data.
        @return         Unique id for the event inspector callback.
     */
-    int InstallEventInspector (EventInspector* function, void* data);
+    int InstallEventInspector (EventInspector function, void* data);
 
     //! Remove an event inspector.
     /*!
@@ -401,7 +401,7 @@
        @param function Event inspector function callback.
        @return True    If the event inspector exists and has been removed.
     */
-    bool RemoveEventInspector (EventInspector* function);
+    bool RemoveEventInspector (EventInspector function);
 
     //! Call event inspectors.
     /*!
@@ -555,7 +555,7 @@
         _data = 0;
         _uid = 0;
       }
-      EventInspector* _function;
+      EventInspector  _function;
       void*           _data;
       int             _uid;
     } EventInspectorStorage;