From b80171403eb2d9ef3d69dc35af7ccf13226e9f99 Mon Sep 17 00:00:00 2001 From: raster Date: Sat, 21 Mar 2009 00:39:02 +0000 Subject: [PATCH] fix build problem.. how did this get in - 2 funcs of the same name, one static.. one not? git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@39604 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_evas/ecore_evas.c | 4 +--- src/lib/ecore_evas/ecore_evas_fb.c | 12 ++++++------ src/lib/ecore_evas/ecore_evas_private.h | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 54380ea..5316588 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -2486,10 +2486,8 @@ _ecore_evas_idle_timeout_update(Ecore_Evas *ee) } void -_ecore_evas_mouse_move_process(void *ecore_evas, int x, int y, unsigned int timestamp) +_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp) { - Ecore_Evas *ee = ecore_evas; - ee->mouse.x = x; ee->mouse.y = y; if (ee->prop.cursor.object) diff --git a/src/lib/ecore_evas/ecore_evas_fb.c b/src/lib/ecore_evas/ecore_evas_fb.c index e429968..074f2ed 100644 --- a/src/lib/ecore_evas/ecore_evas_fb.c +++ b/src/lib/ecore_evas/ecore_evas_fb.c @@ -30,7 +30,7 @@ static Ecore_Event_Handler *ecore_evas_event_handlers[6] = {NULL, NULL, NULL, NU static Ecore_Idle_Enterer *ecore_evas_idle_enterer = NULL; static void -_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp) +_ecore_evas_mouse_move_process_fb(Ecore_Evas *ee, int x, int y, unsigned int timestamp) { int fbw, fbh; @@ -155,7 +155,7 @@ _ecore_evas_event_mouse_button_down(void *data __UNUSED__, int type __UNUSED__, e = event; ee = _ecore_evas_fb_match(); if (!ee) return 1; /* pass on event */ - _ecore_evas_mouse_move_process(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); + _ecore_evas_mouse_move_process_fb(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK; if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK; evas_event_feed_mouse_down(ee->evas, e->button, flags, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL); @@ -171,7 +171,7 @@ _ecore_evas_event_mouse_button_up(void *data __UNUSED__, int type __UNUSED__, vo e = event; ee = _ecore_evas_fb_match(); if (!ee) return 1; /* pass on event */ - _ecore_evas_mouse_move_process(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); + _ecore_evas_mouse_move_process_fb(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); evas_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL); return 0; /* dont pass it on */ } @@ -185,7 +185,7 @@ _ecore_evas_event_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *e e = event; ee = _ecore_evas_fb_match(); if (!ee) return 1; /* pass on event */ - _ecore_evas_mouse_move_process(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); + _ecore_evas_mouse_move_process_fb(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); return 0; /* dont pass it on */ } @@ -198,7 +198,7 @@ _ecore_evas_event_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void * e = event; ee = _ecore_evas_fb_match(); if (!ee) return 1; /* pass on event */ - _ecore_evas_mouse_move_process(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); + _ecore_evas_mouse_move_process_fb(ee, e->x, e->y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); return 0; /* dont pass it on */ } @@ -436,7 +436,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation) evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w); else evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); - _ecore_evas_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); + _ecore_evas_mouse_move_process_fb(ee, ee->mouse.x, ee->mouse.y, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff)); if (ee->func.fn_resize) ee->func.fn_resize(ee); } diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h index 1deae1a..7ffe5fa 100644 --- a/src/lib/ecore_evas/ecore_evas_private.h +++ b/src/lib/ecore_evas/ecore_evas_private.h @@ -327,6 +327,6 @@ void _ecore_evas_fps_debug_shutdown(void); void _ecore_evas_fps_debug_rendertime_add(double t); void _ecore_evas_free(Ecore_Evas *ee); void _ecore_evas_idle_timeout_update(Ecore_Evas *ee); -void _ecore_evas_mouse_move_process(void *ecore_evas, int x, int y, unsigned int timestamp); +void _ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timestamp); #endif -- 2.7.4