summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2013-11-19 10:32:51 +0000
committerChris Michael <cp.michael@samsung.com>2013-11-19 10:38:23 +0000
commite1dc4579fdefd25bb1b10575cc7b74288efc0705 (patch)
tree4e1d80d8ab210fa23b58c2ef9fcc836181a22cb1 /src
parent125576d6a16a89a750700b35a6464d943f158853 (diff)
Add list of touch points to input structure, and a pointer to the
"touch" focused surface. Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wayland/ecore_wl_private.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index 92211172b1..adb9dcd4fc 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -138,6 +138,7 @@ struct _Ecore_Wl_Window
138 138
139 Ecore_Wl_Input *pointer_device; 139 Ecore_Wl_Input *pointer_device;
140 Ecore_Wl_Input *keyboard_device; 140 Ecore_Wl_Input *keyboard_device;
141 Ecore_Wl_Input *touch_device;
141 142
142 Eina_Bool anim_pending : 1; 143 Eina_Bool anim_pending : 1;
143 struct wl_callback *anim_callback; 144 struct wl_callback *anim_callback;
@@ -157,7 +158,10 @@ struct _Ecore_Wl_Input
157 struct wl_seat *seat; 158 struct wl_seat *seat;
158 struct wl_pointer *pointer; 159 struct wl_pointer *pointer;
159 struct wl_keyboard *keyboard; 160 struct wl_keyboard *keyboard;
161
160 struct wl_touch *touch; 162 struct wl_touch *touch;
163 struct wl_list touch_points;
164 int touch_count;
161 165
162 const char *cursor_name; 166 const char *cursor_name;
163 struct wl_cursor *cursor; 167 struct wl_cursor *cursor;
@@ -172,6 +176,7 @@ struct _Ecore_Wl_Input
172 176
173 Ecore_Wl_Window *pointer_focus; 177 Ecore_Wl_Window *pointer_focus;
174 Ecore_Wl_Window *keyboard_focus; 178 Ecore_Wl_Window *keyboard_focus;
179 Ecore_Wl_Window *touch_focus;
175 180
176 unsigned int button; 181 unsigned int button;
177 unsigned int timestamp; 182 unsigned int timestamp;