From da7d596f3ad1a17641215fa1945580900fb91ea1 Mon Sep 17 00:00:00 2001 From: caro Date: Sat, 11 Apr 2009 10:31:42 +0000 Subject: [PATCH] * unused parameters -- * llvm report -- git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@39977 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_evas/ecore_evas.c | 10 +- src/lib/ecore_evas/ecore_evas_buffer.c | 1 + src/lib/ecore_evas/ecore_evas_directfb.c | 36 +++--- src/lib/ecore_evas/ecore_evas_fb.c | 12 +- src/lib/ecore_evas/ecore_evas_sdl.c | 26 ++-- src/lib/ecore_evas/ecore_evas_util.c | 26 ++-- src/lib/ecore_evas/ecore_evas_win32.c | 12 +- src/lib/ecore_evas/ecore_evas_x.c | 207 ++++++++++++++++++++++--------- 8 files changed, 220 insertions(+), 110 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 5316588..dafcb13 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -343,7 +343,7 @@ _ecore_evas_constructor_software_16_x11(int x, int y, int w, int h, const char * #ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL static Ecore_Evas * -_ecore_evas_constructor_sdl(int x, int y, int w, int h, const char *extra_options) +_ecore_evas_constructor_sdl(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options) { Ecore_Evas *ee; unsigned int fullscreen = 0, hwsurface = 0, noframe = 0, alpha = 0; @@ -361,7 +361,7 @@ _ecore_evas_constructor_sdl(int x, int y, int w, int h, const char *extra_option } static Ecore_Evas * -_ecore_evas_constructor_sdl16(int x, int y, int w, int h, const char *extra_options) +_ecore_evas_constructor_sdl16(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options) { Ecore_Evas *ee; unsigned int fullscreen = 0, hwsurface = 0, noframe = 0, alpha = 0; @@ -399,7 +399,7 @@ _ecore_evas_constructor_directfb(int x, int y, int w, int h, const char *extra_o #ifdef BUILD_ECORE_EVAS_FB static Ecore_Evas * -_ecore_evas_constructor_fb(int x, int y, int w, int h, const char *extra_options) +_ecore_evas_constructor_fb(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options) { Ecore_Evas *ee; char *disp_name = NULL; @@ -475,7 +475,7 @@ _ecore_evas_constructor_software_16_wince_gdi(int x, int y, int w, int h, const #ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER static Ecore_Evas * -_ecore_evas_constructor_buffer(int x, int y, int w, int h, const char *extra_options) +_ecore_evas_constructor_buffer(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options __UNUSED__) { return ecore_evas_buffer_new(w, h); } @@ -2468,7 +2468,7 @@ _ecore_evas_cb_idle_flush(void *data) } static int -_ecore_evas_async_events_fd_handler(void *data, Ecore_Fd_Handler *fd_handler) +_ecore_evas_async_events_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__) { evas_async_events_process(); diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c index efa6b65..3c6be1b 100644 --- a/src/lib/ecore_evas/ecore_evas_buffer.c +++ b/src/lib/ecore_evas/ecore_evas_buffer.c @@ -414,6 +414,7 @@ static const Ecore_Evas_Engine_Func _ecore_buffer_engine_func = NULL, NULL, NULL, + NULL, NULL }; #endif diff --git a/src/lib/ecore_evas/ecore_evas_directfb.c b/src/lib/ecore_evas/ecore_evas_directfb.c index 9aeb650..355abeb 100644 --- a/src/lib/ecore_evas/ecore_evas_directfb.c +++ b/src/lib/ecore_evas/ecore_evas_directfb.c @@ -348,7 +348,7 @@ _ecore_evas_directfb_shaped_set(Ecore_Evas *ee, int shaped) } static void -_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_object_cursor_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Ecore_Evas *ee; @@ -437,17 +437,13 @@ _ecore_evas_directfb_fullscreen_set(Ecore_Evas *ee, int on) if(ee->func.fn_resize) ee->func.fn_resize(ee); } } -#endif static void * _ecore_evas_directfb_window_get(const Ecore_Evas *ee) { -#ifdef BUILD_ECORE_EVAS_DIRECTFB return ee->engine.directfb.window; -#else - return 0; -#endif } +#endif #ifdef BUILD_ECORE_EVAS_DIRECTFB static const Ecore_Evas_Engine_Func _ecore_directfb_engine_func = @@ -503,16 +499,10 @@ static const Ecore_Evas_Engine_Func _ecore_directfb_engine_func = /* api */ /*******/ -Ecore_DirectFB_Window * -ecore_evas_directfb_window_get(const Ecore_Evas *ee) -{ - return (Ecore_DirectFB_Window *) _ecore_evas_directfb_window_get(ee); -} - +#ifdef BUILD_ECORE_EVAS_DIRECTFB EAPI Ecore_Evas * ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w, int h) { -#ifdef BUILD_ECORE_EVAS_DIRECTFB Evas_Engine_Info_DirectFB *einfo; Ecore_Evas *ee; Ecore_DirectFB_Window *window; @@ -565,9 +555,25 @@ ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w eina_hash_add(ecore_evases_hash, _ecore_evas_directfb_winid_str_get(ee->engine.directfb.window->id), ee); return ee; +} #else - disp_name = NULL; - windowed = x = y = w = h = 0; +EAPI Ecore_Evas * +ecore_evas_directfb_new(const char *disp_name __UNUSED__, int windowed __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +{ return NULL; +} #endif + +#ifdef BUILD_ECORE_EVAS_DIRECTFB +EAPI Ecore_DirectFB_Window * +ecore_evas_directfb_window_get(const Ecore_Evas *ee) +{ + return (Ecore_DirectFB_Window *) _ecore_evas_directfb_window_get(ee); +} +#else +EAPI Ecore_DirectFB_Window * +ecore_evas_directfb_window_get(const Ecore_Evas *ee __UNUSED__) +{ + return NULL; } +#endif diff --git a/src/lib/ecore_evas/ecore_evas_fb.c b/src/lib/ecore_evas/ecore_evas_fb.c index 074f2ed..6c13ea5 100644 --- a/src/lib/ecore_evas/ecore_evas_fb.c +++ b/src/lib/ecore_evas/ecore_evas_fb.c @@ -441,7 +441,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation) } static void -_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_object_cursor_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Ecore_Evas *ee; @@ -610,10 +610,10 @@ static const Ecore_Evas_Engine_Func _ecore_fb_engine_func = * * FIXME: To be fixed. */ +#ifdef BUILD_ECORE_EVAS_FB EAPI Ecore_Evas * ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h) { -#ifdef BUILD_ECORE_EVAS_FB Evas_Engine_Info_FB *einfo; Ecore_Evas *ee; @@ -698,9 +698,11 @@ ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h) ecore_evases = _ecore_list2_prepend(ecore_evases, ee); return ee; +} #else - disp_name = NULL; - rotation = w = h = 0; +EAPI Ecore_Evas * +ecore_evas_fb_new(const char *disp_name __UNUSED__, int rotation __UNUSED__, int w __UNUSED__, int h __UNUSED__) +{ return NULL; -#endif } +#endif diff --git a/src/lib/ecore_evas/ecore_evas_sdl.c b/src/lib/ecore_evas/ecore_evas_sdl.c index 85436de..7b39e06 100644 --- a/src/lib/ecore_evas/ecore_evas_sdl.c +++ b/src/lib/ecore_evas/ecore_evas_sdl.c @@ -41,7 +41,7 @@ _ecore_evas_sdl_match(void) } static int -_ecore_evas_sdl_event_got_focus(void *data __UNUSED__, int type __UNUSED__, void *event) +_ecore_evas_sdl_event_got_focus(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { Ecore_Evas *ee; @@ -55,7 +55,7 @@ _ecore_evas_sdl_event_got_focus(void *data __UNUSED__, int type __UNUSED__, void } static int -_ecore_evas_sdl_event_lost_focus(void *data __UNUSED__, int type __UNUSED__, void *event) +_ecore_evas_sdl_event_lost_focus(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) { Ecore_Evas *ee; @@ -168,7 +168,7 @@ _ecore_evas_idle_enter(void *data __UNUSED__) } static int -_ecore_evas_sdl_event(void *data) +_ecore_evas_sdl_event(void *data __UNUSED__) { ecore_sdl_feed_events(); @@ -176,7 +176,7 @@ _ecore_evas_sdl_event(void *data) } static int -_ecore_evas_sdl_init(int w, int h) +_ecore_evas_sdl_init(int w __UNUSED__, int h __UNUSED__) { _ecore_evas_init_count++; if (_ecore_evas_init_count > 1) return _ecore_evas_init_count; @@ -264,7 +264,7 @@ _ecore_evas_move_resize(Ecore_Evas *ee, int x __UNUSED__, int y __UNUSED__, int } static void -_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_object_cursor_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Ecore_Evas *ee; @@ -433,10 +433,10 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu } #endif +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL EAPI Ecore_Evas* ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL Ecore_Evas *ee; int rmethod; @@ -446,16 +446,20 @@ ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface ee = _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha); ee->driver = "sdl"; return ee; +} #else +EAPI Ecore_Evas* +ecore_evas_sdl_new(const char* name __UNUSED__, int w __UNUSED__, int h __UNUSED__, int fullscreen __UNUSED__, int hwsurface __UNUSED__, int noframe __UNUSED__, int alpha __UNUSED__) +{ fprintf(stderr, "OUTCH !\n"); return NULL; -#endif } +#endif +#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL EAPI Ecore_Evas* ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha) { -#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL Ecore_Evas *ee; int rmethod; @@ -465,8 +469,12 @@ ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurfa ee = _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha); ee->driver = "software_16_sdl"; return ee; +} #else +EAPI Ecore_Evas* +ecore_evas_sdl16_new(const char* name __UNUSED__, int w __UNUSED__, int h __UNUSED__, int fullscreen __UNUSED__, int hwsurface __UNUSED__, int noframe __UNUSED__, int alpha __UNUSED__) +{ fprintf(stderr, "OUTCH !\n"); return NULL; -#endif } +#endif diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c index 7880585..bc7dc57 100644 --- a/src/lib/ecore_evas/ecore_evas_util.c +++ b/src/lib/ecore_evas/ecore_evas_util.c @@ -61,7 +61,7 @@ _evas_object_associate_del(Evas_Object *obj) /* Interceptors Callbacks */ static void -_ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y) +_ecore_evas_obj_intercept_move(void *data, Evas_Object *obj __UNUSED__, Evas_Coord x, Evas_Coord y) { Ecore_Evas *ee = data; // FIXME: account for frame @@ -69,33 +69,33 @@ _ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_ } static void -_ecore_evas_obj_intercept_raise(void *data, Evas_Object *obj) +_ecore_evas_obj_intercept_raise(void *data, Evas_Object *obj __UNUSED__) { Ecore_Evas *ee = data; ecore_evas_raise(ee); } static void -_ecore_evas_obj_intercept_lower(void *data, Evas_Object *obj) +_ecore_evas_obj_intercept_lower(void *data, Evas_Object *obj __UNUSED__) { Ecore_Evas *ee = data; ecore_evas_lower(ee); } static void -_ecore_evas_obj_intercept_stack_above(void *data, Evas_Object *obj, Evas_Object *above) +_ecore_evas_obj_intercept_stack_above(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Object *above __UNUSED__) { fprintf(stderr, "TODO: %s\n", __FUNCTION__); } static void -_ecore_evas_obj_intercept_stack_below(void *data, Evas_Object *obj, Evas_Object *below) +_ecore_evas_obj_intercept_stack_below(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Object *below __UNUSED__) { fprintf(stderr, "TODO: %s\n", __FUNCTION__); } static void -_ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj, int l) +_ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj __UNUSED__, int l) { Ecore_Evas *ee = data; ecore_evas_layer_set(ee, l); @@ -104,21 +104,21 @@ _ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj, int l) /* Event Callbacks */ static void -_ecore_evas_obj_callback_show(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_obj_callback_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Ecore_Evas *ee = data; ecore_evas_show(ee); } static void -_ecore_evas_obj_callback_hide(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Ecore_Evas *ee = data; ecore_evas_hide(ee); } static void -_ecore_evas_obj_callback_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_obj_callback_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Ecore_Evas *ee = data; Evas_Coord ow, oh, w, h; @@ -130,7 +130,7 @@ _ecore_evas_obj_callback_resize(void *data, Evas *e, Evas_Object *obj, void *eve } static void -_ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Ecore_Evas *ee = data; Evas_Coord w, h; @@ -145,7 +145,7 @@ _ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e, Evas_Object *ob } static void -_ecore_evas_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_obj_callback_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Ecore_Evas *ee = data; _ecore_evas_object_dissociate(ee, obj); @@ -153,7 +153,7 @@ _ecore_evas_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_ } static void -_ecore_evas_obj_callback_del_dissociate(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_obj_callback_del_dissociate(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Ecore_Evas *ee = data; _ecore_evas_object_dissociate(ee, obj); @@ -463,7 +463,7 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj) * when this option is executed. */ unsigned char -ecore_getopt_callback_ecore_evas_list_engines(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage) +ecore_getopt_callback_ecore_evas_list_engines(const Ecore_Getopt *parser __UNUSED__, const Ecore_Getopt_Desc *desc __UNUSED__, const char *str __UNUSED__, void *data, Ecore_Getopt_Value *storage) { Eina_List *lst, *n; const char *engine; diff --git a/src/lib/ecore_evas/ecore_evas_win32.c b/src/lib/ecore_evas/ecore_evas_win32.c index 5be7dc4..1679aa4 100644 --- a/src/lib/ecore_evas/ecore_evas_win32.c +++ b/src/lib/ecore_evas/ecore_evas_win32.c @@ -1352,11 +1352,11 @@ ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, #else EAPI Ecore_Evas * -ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, - int x, - int y, - int width, - int height) +ecore_evas_gl_glew_new(Ecore_Win32_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) { return NULL; } @@ -1375,7 +1375,7 @@ ecore_evas_win32_window_get(const Ecore_Evas *ee) #else EAPI Ecore_Win32_Window * -ecore_evas_win32_window_get(const Ecore_Evas *ee) +ecore_evas_win32_window_get(const Ecore_Evas *ee __UNUSED__) { return NULL; } diff --git a/src/lib/ecore_evas/ecore_evas_x.c b/src/lib/ecore_evas/ecore_evas_x.c index a2f8f04..8f418ec 100644 --- a/src/lib/ecore_evas/ecore_evas_x.c +++ b/src/lib/ecore_evas/ecore_evas_x.c @@ -1858,7 +1858,7 @@ _ecore_evas_x_size_step_set(Ecore_Evas *ee, int w, int h) } static void -_ecore_evas_object_cursor_del(void *data, Evas *e, Evas_Object *obj, void *event_info) +_ecore_evas_object_cursor_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Ecore_Evas *ee; @@ -2296,11 +2296,11 @@ static const Ecore_Evas_Engine_Func _ecore_x_engine_func = * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) EAPI Ecore_Evas * ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) { -#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) Evas_Engine_Info_Software_X11 *einfo; Ecore_Evas *ee; int argb = 0; @@ -2522,50 +2522,63 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, ecore_evases = _ecore_list2_prepend(ecore_evases, ee); ecore_event_window_register(ee->prop.window, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb) _ecore_evas_mouse_move_process); return ee; +} #else +EAPI Ecore_Evas * +ecore_evas_software_x11_new(const char *disp_name __UNUSED__, Ecore_X_Window parent __UNUSED__, + int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +{ return NULL; -#endif } +#endif /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) EAPI Ecore_X_Window ecore_evas_software_x11_window_get(const Ecore_Evas *ee) { -#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_software_x11_window_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif } +#endif /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) EAPI Ecore_X_Window ecore_evas_software_x11_subwindow_get(const Ecore_Evas *ee) { -#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_software_x11_subwindow_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif } +#endif /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) EAPI void ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on) { -#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) ee->engine.x.direct_resize = on; if (ee->prop.avoid_damage) { @@ -2585,35 +2598,42 @@ ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on) */ } } +} #else - return; -#endif +EAPI void +ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +{ } +#endif /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) EAPI int ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee) { -#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) return ee->engine.x.direct_resize; +} #else +EAPI int +ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif } +#endif /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) EAPI void ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) { -#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB) Ecore_X_Window *winp; winp = malloc(sizeof(Ecore_X_Window)); @@ -2623,20 +2643,24 @@ ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window wi ee->engine.x.win_extra = eina_list_append(ee->engine.x.win_extra, winp); ecore_event_window_register(win, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb) _ecore_evas_mouse_move_process); } +} #else -#endif +EAPI void +ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee __UNUSED__, Ecore_X_Window win __UNUSED__) +{ } +#endif /** * To be documented. * * FIXME: To be fixed. */ +#ifdef BUILD_ECORE_EVAS_OPENGL_X11 EAPI Ecore_Evas * ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) { -#ifdef BUILD_ECORE_EVAS_OPENGL_X11 # ifdef HAVE_ECORE_X_XCB Ecore_Evas *ee = NULL; # else @@ -2703,97 +2727,119 @@ ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, # endif /* HAVE_ECORE_X_XCB */ return ee; +} #else - disp_name = NULL; - parent = 0; - x = y = w = h = 0; +EAPI Ecore_Evas * +ecore_evas_gl_x11_new(const char *disp_name __UNUSED__, Ecore_X_Window parent __UNUSED__, + int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +{ return NULL; -#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#ifdef BUILD_ECORE_EVAS_OPENGL_X11 EAPI Ecore_X_Window ecore_evas_gl_x11_window_get(const Ecore_Evas *ee) { -#ifdef BUILD_ECORE_EVAS_OPENGL_X11 return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_gl_x11_window_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#ifdef BUILD_ECORE_EVAS_OPENGL_X11 EAPI Ecore_X_Window ecore_evas_gl_x11_subwindow_get(const Ecore_Evas *ee) { -#ifdef BUILD_ECORE_EVAS_OPENGL_X11 return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_gl_x11_subwindow_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#ifdef BUILD_ECORE_EVAS_OPENGL_X11 EAPI void ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on) { -#ifdef BUILD_ECORE_EVAS_OPENGL_X11 ee->engine.x.direct_resize = on; +} #else - return; -#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ +EAPI void +ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +{ } +#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#ifdef BUILD_ECORE_EVAS_OPENGL_X11 EAPI int ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee) { -#ifdef BUILD_ECORE_EVAS_OPENGL_X11 return ee->engine.x.direct_resize; +} #else +EAPI int +ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#ifdef BUILD_ECORE_EVAS_OPENGL_X11 EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) { -#ifdef BUILD_ECORE_EVAS_OPENGL_X11 ecore_evas_software_x11_extra_event_window_add(ee, win); -#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ } +#else +EAPI void +ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee __UNUSED__, Ecore_X_Window win __UNUSED__) +{ +} +#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) EAPI Ecore_Evas * ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) { -#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) Evas_Engine_Info_XRender_X11 *einfo; Ecore_Evas *ee; int rmethod; @@ -2937,96 +2983,119 @@ ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, ecore_evases = _ecore_list2_prepend(ecore_evases, ee); ecore_event_window_register(ee->prop.window, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb) _ecore_evas_mouse_move_process); return ee; +} #else +EAPI Ecore_Evas * +ecore_evas_xrender_x11_new(const char *disp_name __UNUSED__, Ecore_X_Window parent __UNUSED__, + int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +{ return NULL; -#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ } +#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee) { -#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ } +#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) EAPI Ecore_X_Window ecore_evas_xrender_x11_subwindow_get(const Ecore_Evas *ee) { -#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_xrender_x11_subwindow_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ } +#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, int on) { -#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) ee->engine.x.direct_resize = on; +} #else - return; -#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ +EAPI void +ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +{ } +#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) EAPI int ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee) { -#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) return ee->engine.x.direct_resize; +} #else +EAPI int +ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ } +#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ /** * To be documented. * * FIXME: To be fixed. */ +#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) { -#if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB) ecore_evas_software_x11_extra_event_window_add(ee, win); +} #else - return; -#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ +EAPI void +ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee __UNUSED__, Ecore_X_Window win __UNUSED__) +{ } +#endif /* ! BUILD_ECORE_EVAS_XRENDER_X11 && ! BUILD_ECORE_EVAS_XRENDER_XCB */ /** * To be documented. * * FIXME: To be fixed. */ +#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 EAPI Ecore_Evas * ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 Evas_Engine_Info_Software_16_X11 *einfo; Ecore_Evas *ee; int argb = 0; @@ -3142,50 +3211,63 @@ ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, ecore_evases = _ecore_list2_prepend(ecore_evases, ee); ecore_event_window_register(ee->prop.window, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb) _ecore_evas_mouse_move_process); return ee; +} #else +EAPI Ecore_Evas * +ecore_evas_software_x11_16_new(const char *disp_name __UNUSED__, Ecore_X_Window parent __UNUSED__, + int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) +{ return NULL; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee) { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 EAPI Ecore_X_Window ecore_evas_software_x11_16_subwindow_get(const Ecore_Evas *ee) { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 return (Ecore_X_Window) ecore_evas_window_get(ee); +} #else +EAPI Ecore_X_Window +ecore_evas_software_x11_16_subwindow_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on) { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 ee->engine.x.direct_resize = on; if (ee->prop.avoid_damage) { @@ -3205,35 +3287,42 @@ ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on) */ } } +} #else - return; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ +EAPI void +ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee __UNUSED__, int on __UNUSED__) +{ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 EAPI int ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee) { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 return ee->engine.x.direct_resize; +} #else +EAPI int +ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee __UNUSED__) +{ return 0; -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ /** * To be documented. * * FIXME: To be fixed. */ +#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 Ecore_X_Window *winp; winp = malloc(sizeof(Ecore_X_Window)); @@ -3243,6 +3332,10 @@ ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window ee->engine.x.win_extra = eina_list_append(ee->engine.x.win_extra, winp); ecore_event_window_register(win, ee, ee->evas, (Ecore_Event_Mouse_Move_Cb) _ecore_evas_mouse_move_process); } +} #else -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ +EAPI void +ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee __UNUSED__, Ecore_X_Window win __UNUSED__) +{ } +#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ -- 2.7.4