summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-02-29 11:38:38 +0000
committerTom Hacohen <tom@stosb.com>2016-02-29 11:38:38 +0000
commit1c72554acc7b7390e65b487d2a428b6faea068b8 (patch)
tree857ba44eddf6efd5c32fa677a322df6e63f4de2a
parent58857a657c6e5303bcd36d9d83d29bc5d28efaa7 (diff)
Eo events: Migrate to the new eo event cb signature.
-rw-r--r--src/bin/ui.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/bin/ui.c b/src/bin/ui.c
index be5185f..e36fdaf 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -256,10 +256,9 @@ _ui_select(void)
256} 256}
257 257
258static Eina_Bool 258static Eina_Bool
259_ui_key(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, 259_ui_key(void *data EINA_UNUSED, const Eo_Event *event)
260 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
261{ 260{
262 Evas_Event_Key_Down *ev = event_info; 261 Evas_Event_Key_Down *ev = event->event_info;
263 262
264 if (key_func) 263 if (key_func)
265 { 264 {
@@ -290,10 +289,9 @@ static Evas_Coord down_x, down_y;
290static int down_menu_sel = 0; 289static int down_menu_sel = 0;
291 290
292static Eina_Bool 291static Eina_Bool
293_ui_mouse_down(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, 292_ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event)
294 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
295{ 293{
296 Evas_Event_Mouse_Down *ev = event_info; 294 Evas_Event_Mouse_Down *ev = event->event_info;
297 295
298 if (ev->button != 1) return EINA_TRUE; 296 if (ev->button != 1) return EINA_TRUE;
299 if (menu_active) 297 if (menu_active)
@@ -307,10 +305,9 @@ _ui_mouse_down(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
307} 305}
308 306
309static Eina_Bool 307static Eina_Bool
310_ui_mouse_up(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, 308_ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
311 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
312{ 309{
313 Evas_Event_Mouse_Up *ev = event_info; 310 Evas_Event_Mouse_Up *ev = event->event_info;
314 311
315 if (ev->button != 1) return EINA_TRUE; 312 if (ev->button != 1) return EINA_TRUE;
316 if (menu_active) 313 if (menu_active)
@@ -333,10 +330,9 @@ _ui_mouse_up(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
333} 330}
334 331
335static Eina_Bool 332static Eina_Bool
336_ui_mouse_move(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, 333_ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event)
337 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
338{ 334{
339 Evas_Event_Mouse_Move *ev = event_info; 335 Evas_Event_Mouse_Move *ev = event->event_info;
340 336
341 if (ev->buttons != 1) return EINA_TRUE; 337 if (ev->buttons != 1) return EINA_TRUE;
342 if (menu_active) 338 if (menu_active)