summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile_Efl.am1
-rw-r--r--src/lib/efl/CMakeLists.txt1
-rw-r--r--src/lib/efl/Efl.h1
-rw-r--r--src/lib/efl/interfaces/efl_canvas.eo25
-rw-r--r--src/lib/efl/interfaces/efl_canvas_pointer.eo32
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c1
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/efl_ui_win.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo4
-rw-r--r--src/lib/evas/canvas/evas_main.c6
10 files changed, 44 insertions, 33 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 0584602894..d623743d77 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -14,6 +14,7 @@ efl_eolian_legacy_files = \
14 14
15efl_eolian_files = \ 15efl_eolian_files = \
16 lib/efl/interfaces/efl_canvas.eo \ 16 lib/efl/interfaces/efl_canvas.eo \
17 lib/efl/interfaces/efl_canvas_pointer.eo \
17 lib/efl/interfaces/efl_config.eo \ 18 lib/efl/interfaces/efl_config.eo \
18 lib/efl/interfaces/efl_control.eo \ 19 lib/efl/interfaces/efl_control.eo \
19 lib/efl/interfaces/efl_dup.eo \ 20 lib/efl/interfaces/efl_dup.eo \
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)
5set(PUBLIC_EO_FILES 5set(PUBLIC_EO_FILES
6 interfaces/efl_animator.eo 6 interfaces/efl_animator.eo
7 interfaces/efl_canvas.eo 7 interfaces/efl_canvas.eo
8 interfaces/efl_canvas_pointer.eo
8 interfaces/efl_config.eo 9 interfaces/efl_config.eo
9 interfaces/efl_container.eo 10 interfaces/efl_container.eo
10 interfaces/efl_content.eo 11 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;
134 134
135/* Canvas & UI */ 135/* Canvas & UI */
136#include "interfaces/efl_canvas.eo.h" 136#include "interfaces/efl_canvas.eo.h"
137#include "interfaces/efl_canvas_pointer.eo.h"
137#include "interfaces/efl_ui_view.eo.h" 138#include "interfaces/efl_ui_view.eo.h"
138#include "interfaces/efl_ui_model_connect.eo.h" 139#include "interfaces/efl_ui_model_connect.eo.h"
139#include "interfaces/efl_ui_factory.eo.h" 140#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 ()
193 pos: Eina.Position2D; [[The pointer position in pixels.]] 193 pos: Eina.Position2D; [[The pointer position in pixels.]]
194 } 194 }
195 } 195 }
196 @property pointer_inside {
197 get {
198 [[Returns whether the mouse pointer is logically inside the
199 canvas.
200
201 When this function is called it will return a value of either
202 $false or $true, depending on whether a pointer,in or pointer,out
203 event has been called previously.
204
205 A return value of $true indicates the mouse is logically
206 inside the canvas, and $false implies it is logically
207 outside the canvas.
208
209 A canvas begins with the mouse being assumed outside ($false).
210 ]]
211 }
212 keys {
213 seat: Efl.Input.Device @optional; [[The seat to consider, if $null
214 then the default seat will be used.]]
215 }
216 values {
217 inside: bool; [[$true if the mouse pointer is inside the canvas,
218 $false otherwise]]
219 }
220 }
221 /* FIXME: maybe not necessary if gesture supports this */ 196 /* FIXME: maybe not necessary if gesture supports this */
222 pointer_iterate @const { 197 pointer_iterate @const {
223 [[Returns an iterator over the current known pointer positions. 198 [[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 @@
1import efl_input_device;
2
3interface Efl.Canvas.Pointer ()
4{
5 methods {
6 @property pointer_inside {
7 get {
8 [[Returns whether the mouse pointer is logically inside the
9 canvas.
10
11 When this function is called it will return a value of either
12 $false or $true, depending on whether a pointer,in or pointer,out
13 event has been called previously.
14
15 A return value of $true indicates the mouse is logically
16 inside the canvas, and $false implies it is logically
17 outside the canvas.
18
19 A canvas begins with the mouse being assumed outside ($false).
20 ]]
21 }
22 keys {
23 seat: Efl.Input.Device @optional; [[The seat to consider, if $null
24 then the default seat will be used.]]
25 }
26 values {
27 inside: bool; [[$true if the mouse pointer is inside the canvas,
28 $false otherwise]]
29 }
30 }
31 }
32}
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 @@
39 39
40#include "interfaces/efl_gfx_size_hint.eo.c" 40#include "interfaces/efl_gfx_size_hint.eo.c"
41#include "interfaces/efl_canvas.eo.c" 41#include "interfaces/efl_canvas.eo.c"
42#include "interfaces/efl_canvas_pointer.eo.c"
42 43
43#include "interfaces/efl_vpath.eo.c" 44#include "interfaces/efl_vpath.eo.c"
44 45
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index f608b75ffd..b238f66297 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2383,7 +2383,7 @@ _efl_ui_win_efl_canvas_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data
2383} 2383}
2384 2384
2385EOLIAN static Eina_Bool 2385EOLIAN static Eina_Bool
2386_efl_ui_win_efl_canvas_pointer_inside_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eo *dev) 2386_efl_ui_win_efl_canvas_pointer_pointer_inside_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eo *dev)
2387{ 2387{
2388 return efl_canvas_pointer_inside_get(sd->evas, dev); 2388 return efl_canvas_pointer_inside_get(sd->evas, dev);
2389} 2389}
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 989a3ca16f..766913bf34 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -157,7 +157,7 @@ enum Efl.Ui.Win.Move_Resize_Mode
157 right = (1 << 4) [[Start resizing window to the right]] 157 right = (1 << 4) [[Start resizing window to the right]]
158} 158}
159 159
160class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, 160class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window,
161 Efl.Access.Component, Efl.Access.Widget.Action, 161 Efl.Access.Component, Efl.Access.Widget.Action,
162 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, 162 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
163 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, 163 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part,
@@ -825,7 +825,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window,
825 Efl.Gfx.Size.Hint.hint_max { set; } 825 Efl.Gfx.Size.Hint.hint_max { set; }
826 Efl.Text.text { get; set; } 826 Efl.Text.text { get; set; }
827 Efl.Canvas.pointer_position { get; } 827 Efl.Canvas.pointer_position { get; }
828 Efl.Canvas.pointer_inside { get; } 828 Efl.Canvas.Pointer.pointer_inside { get; }
829 Efl.Canvas.pointer_iterate; 829 Efl.Canvas.pointer_iterate;
830 Efl.Canvas.image_max_size { get; } 830 Efl.Canvas.image_max_size { get; }
831 Efl.Canvas.smart_objects_calculate; 831 Efl.Canvas.smart_objects_calculate;
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 6da7eef058..72292a86c8 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,7 +1,7 @@
1import efl_input_types; 1import efl_input_types;
2 2
3class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, 3class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
4 Efl.Loop_User) 4 Efl.Loop_User, Efl.Canvas.Pointer)
5{ 5{
6 [[Evas canvas class]] 6 [[Evas canvas class]]
7 legacy_prefix: evas; 7 legacy_prefix: evas;
@@ -1129,7 +1129,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
1129 Efl.Object.provider_find; 1129 Efl.Object.provider_find;
1130 Efl.Loop_User.loop { get; } 1130 Efl.Loop_User.loop { get; }
1131 //Efl.Canvas.seats; 1131 //Efl.Canvas.seats;
1132 Efl.Canvas.pointer_inside { get; } 1132 Efl.Canvas.Pointer.pointer_inside { get; }
1133 Efl.Canvas.device { get; } 1133 Efl.Canvas.device { get; }
1134 Efl.Canvas.seat { get; } 1134 Efl.Canvas.seat { get; }
1135 } 1135 }
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 60d2b7b4a1..28c0da1829 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -634,9 +634,9 @@ _evas_canvas_pointer_button_down_mask_by_device_get(Eo *eo_e EINA_UNUSED,
634} 634}
635 635
636EOLIAN static Eina_Bool 636EOLIAN static Eina_Bool
637_evas_canvas_efl_canvas_pointer_inside_get(Eo *eo_e EINA_UNUSED, 637_evas_canvas_efl_canvas_pointer_pointer_inside_get(Eo *eo_e EINA_UNUSED,
638 Evas_Public_Data *e, 638 Evas_Public_Data *e,
639 Eo *dev) 639 Efl_Input_Device *dev)
640{ 640{
641 Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev); 641 Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, dev);
642 if (!pdata) return EINA_FALSE; 642 if (!pdata) return EINA_FALSE;