interface: add Efl.Canvas.Pointer intf for pointer related functions.

and remove pointer_inside function from Efl.Canvas{}

5 files changed, 35 insertions, 25 deletions

diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt
index 6637bedfc4..e6efc3b680 100644
--- a/src/lib/efl/CMakeLists.txt
+++ b/src/lib/efl/CMakeLists.txt
@@ -5,6 +5,7 @@ set(LIBRARIES eo eina)
 set(PUBLIC_EO_FILES
   interfaces/efl_animator.eo
   interfaces/efl_canvas.eo
+  interfaces/efl_canvas_pointer.eo
   interfaces/efl_config.eo
   interfaces/efl_container.eo
   interfaces/efl_content.eo
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index fa66d95044..e80e5de9d9 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -134,6 +134,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 
 /* Canvas & UI */
 #include "interfaces/efl_canvas.eo.h"
+#include "interfaces/efl_canvas_pointer.eo.h"
 #include "interfaces/efl_ui_view.eo.h"
 #include "interfaces/efl_ui_model_connect.eo.h"
 #include "interfaces/efl_ui_factory.eo.h"
diff --git a/src/lib/efl/interfaces/efl_canvas.eo b/src/lib/efl/interfaces/efl_canvas.eo
index 98da146f5f..98d70a3851 100644
--- a/src/lib/efl/interfaces/efl_canvas.eo
+++ b/src/lib/efl/interfaces/efl_canvas.eo
@@ -193,31 +193,6 @@ interface Efl.Canvas ()
             pos: Eina.Position2D; [[The pointer position in pixels.]]
          }
       }
-      @property pointer_inside {
-         get {
-            [[Returns whether the mouse pointer is logically inside the
-              canvas.
-
-              When this function is called it will return a value of either
-              $false or $true, depending on whether a pointer,in or pointer,out
-              event has been called previously.
-
-              A return value of $true indicates the mouse is logically
-              inside the canvas, and $false implies it is logically
-              outside the canvas.
-
-              A canvas begins with the mouse being assumed outside ($false).
-            ]]
-         }
-         keys {
-            seat: Efl.Input.Device @optional; [[The seat to consider, if $null
-               then the default seat will be used.]]
-         }
-         values {
-            inside: bool; [[$true if the mouse pointer is inside the canvas,
-                            $false otherwise]]
-         }
-      }
       /* FIXME: maybe not necessary if gesture supports this */
       pointer_iterate @const {
          [[Returns an iterator over the current known pointer positions.
diff --git a/src/lib/efl/interfaces/efl_canvas_pointer.eo b/src/lib/efl/interfaces/efl_canvas_pointer.eo
new file mode 100644
index 0000000000..57111a7896
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_canvas_pointer.eo
@@ -0,0 +1,32 @@
+import efl_input_device;
+
+interface Efl.Canvas.Pointer ()
+{
+   methods {
+      @property pointer_inside {
+         get {
+            [[Returns whether the mouse pointer is logically inside the
+              canvas.
+
+              When this function is called it will return a value of either
+              $false or $true, depending on whether a pointer,in or pointer,out
+              event has been called previously.
+
+              A return value of $true indicates the mouse is logically
+              inside the canvas, and $false implies it is logically
+              outside the canvas.
+
+              A canvas begins with the mouse being assumed outside ($false).
+            ]]
+         }
+         keys {
+            seat: Efl.Input.Device @optional; [[The seat to consider, if $null
+                     then the default seat will be used.]]
+         }
+         values {
+            inside: bool; [[$true if the mouse pointer is inside the canvas,
+                            $false otherwise]]
+         }
+      }
+   }
+}
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 29a021e9c5..930e55ee35 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -39,6 +39,7 @@
 
 #include "interfaces/efl_gfx_size_hint.eo.c"
 #include "interfaces/efl_canvas.eo.c"
+#include "interfaces/efl_canvas_pointer.eo.c"
 
 #include "interfaces/efl_vpath.eo.c"