enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl/evas: add ecore-evas dependent examples. 

nice feature of single tree efl is that evas examples can use ecore-evas :-)



SVN revision: 81919
This commit is contained in:
Gustavo Sverzut Barbieri 2012-12-31 01:40:50 +00:00
parent 209347f148
commit 4e6ce9277f
19 changed files with 193 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1898,7 +1898,7 @@ elif test "${have_ps3}" = "yes"; then
want_ecore_con_local_sockets="no"
want_ecore_con_abstract_sockets="no"
else
want_cares="no" # TODO: REVIEW
want_cares="no"
fi
AC_DEFINE_IF([HAVE_LOCAL_SOCKETS],

1
src/examples/ecore/Makefile.am
View File

@ -17,7 +17,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/ecore_con \
-I$(top_builddir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/ecore_audio \
-DPACKAGE_EXAMPLES_DIR=\"$(datadir)/ecore/examples\" \
@ECORE_CFLAGS@
EXTRA_PROGRAMS = \

35
src/examples/eina/Makefile.am
View File

@ -41,8 +41,8 @@ eina_value_01.c \
eina_value_02.c \
eina_value_03.c \
eina_inarray_01.c \
eina_inarray_02.c
#eina_magic_01.c \
eina_inarray_02.c \
eina_magic_01.c
#eina_model_01.c \
#eina_model_02.c \
#eina_model_03.c
@ -100,12 +100,31 @@ eina_inarray_02
#eina_model_04_parrot.h \
#eina_model_04_whistler.h
# TODO: use ecore_evas from single tree
#if BUILD_TILER_EXAMPLE
#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
#EXTRA_PROGRAMS += eina_tiler_01
#eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LDFLAGS@
#endif
EXTRA_PROGRAMS += eina_tiler_01
eina_tiler_01_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \
-I$(top_builddir)/src/lib/evas \
-I$(top_builddir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore_evas \
@EINA_CFLAGS@
eina_tiler_01_LDADD = \
$(top_builddir)/src/lib/eina/libeina.la \
$(top_builddir)/src/lib/eo/libeo.la \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_input/libecore_input.la \
$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
$(top_builddir)/src/lib/evas/libevas.la \
@EINA_LDFLAGS@
examples: $(EXTRA_PROGRAMS)

110
src/examples/evas/Makefile.am
View File

@ -26,56 +26,90 @@ EXTRA_PROGRAMS += evas_init_shutdown
evas_init_shutdown_SOURCES = evas-init-shutdown.c
evas_init_shutdown_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@
#the ones using ecore_evas follow
#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
ECORE_EVAS_COMMON_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \
-I$(top_builddir)/src/lib/evas \
-I$(top_builddir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore_evas \
-DPACKAGE_EXAMPLES_DIR=\".\" \
@EVAS_CFLAGS@
#EXTRA_PROGRAMS += evas_images
#evas_images_SOURCES = evas-images.c
#evas_images_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
ECORE_EVAS_COMMON_LDADD = \
$(top_builddir)/src/lib/eina/libeina.la \
$(top_builddir)/src/lib/eo/libeo.la \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_input/libecore_input.la \
$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
$(top_builddir)/src/lib/evas/libevas.la \
@EVAS_LDFLAGS@
#EXTRA_PROGRAMS += evas_events
#evas_events_SOURCES = evas-events.c
#evas_events_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_images
evas_images_SOURCES = evas-images.c
evas_images_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_images_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_object_manipulation
#evas_object_manipulation_SOURCES = evas-object-manipulation.c
#evas_object_manipulation_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_events
evas_events_SOURCES = evas-events.c
evas_events_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_events_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_object_manipulation-eo
#evas_object_manipulation_SOURCES = evas-object-manipulation-eo.c
#evas_object_manipulation_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_object_manipulation
evas_object_manipulation_SOURCES = evas-object-manipulation.c
evas_object_manipulation_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_object_manipulation_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_hints
#evas_hints_SOURCES = evas-hints.c
#evas_hints_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_object_manipulation-eo
evas_object_manipulation_eo_SOURCES = evas-object-manipulation-eo.c
evas_object_manipulation_eo_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_object_manipulation_eo_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_stacking
#evas_stacking_SOURCES = evas-stacking.c
#evas_stacking_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_hints
evas_hints_SOURCES = evas-hints.c
evas_hints_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_hints_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_images2
#evas_images2_SOURCES = evas-images2.c
#evas_images2_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_stacking
evas_stacking_SOURCES = evas-stacking.c
evas_stacking_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_stacking_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_images3
#evas_images3_SOURCES = evas-images3.c
#evas_images3_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_images2
evas_images2_SOURCES = evas-images2.c
evas_images2_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_images2_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_text
#evas_text_SOURCES = evas-text.c
#evas_text_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_images3
evas_images3_SOURCES = evas-images3.c
evas_images3_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_images3_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_smart_object
#evas_smart_object_SOURCES = evas-smart-object.c
#evas_smart_object_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_text
evas_text_SOURCES = evas-text.c
evas_text_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_text_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_smart_interface
#evas_smart_interface_SOURCES = evas-smart-interface.c
#evas_smart_interface_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
EXTRA_PROGRAMS += evas_smart_object
evas_smart_object_SOURCES = evas-smart-object.c
evas_smart_object_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_smart_object_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#EXTRA_PROGRAMS += evas_box
#evas_box_SOURCES = evas-box.c
#evas_box_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@ @EVAS_GENERAL_LIBS@
EXTRA_PROGRAMS += evas_smart_interface
evas_smart_interface_SOURCES = evas-smart-interface.c
evas_smart_interface_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_smart_interface_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
EXTRA_PROGRAMS += evas_box
evas_box_SOURCES = evas-box.c
evas_box_LDADD = $(ECORE_EVAS_COMMON_LDADD)
evas_box_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
#the ones using ecore_evas and edje follow
#AM_CPPFLAGS += @EDJE_CFLAGS@

7
src/examples/evas/evas-aspect-hints.c
View File

@ -14,8 +14,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#endif
#include <Ecore.h>
@ -76,8 +77,8 @@ _get_aspect_name(Evas_Aspect_Control aspect)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o,
void *einfo)
{

12
src/examples/evas/evas-box.c
View File

@ -10,11 +10,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -59,7 +57,7 @@ static struct exemple_data d;
static void /* custom 'diagonal' layout */
_custom_layout(Evas_Object *o,
Evas_Object_Box_Data *p,
void *data __UNUSED__)
void *data EINA_UNUSED)
{
int x, y, w, h;
int xx, yy, ww, hh;
@ -100,9 +98,9 @@ _new_rectangle_add(Evas *e)
/* use the following commands to interact with this example - 'h' is
* the key for help */
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;
@ -284,7 +282,7 @@ list_free:
}
static void
_on_delete(Ecore_Evas *ee __UNUSED__)
_on_delete(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}

35
src/examples/evas/evas-events.c
View File

@ -15,10 +15,7 @@
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -65,7 +62,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
/* called when our rectangle gets focus */
static void
_object_focus_in_cb(void *data __UNUSED__,
_object_focus_in_cb(void *data EINA_UNUSED,
Evas *e,
void *event_info)
{
@ -81,16 +78,16 @@ _object_focus_in_cb(void *data __UNUSED__,
/* render flush callback */
static void
_render_flush_cb(void *data __UNUSED__,
Evas *e __UNUSED__,
void *event_info __UNUSED__)
_render_flush_cb(void *data EINA_UNUSED,
Evas *e EINA_UNUSED,
void *event_info EINA_UNUSED)
{
fprintf(stdout, "Canvas is about to flush its rendering pipeline!\n");
}
/* put some action in the canvas */
static Eina_Bool
_resize_cb(void *data __UNUSED__)
_resize_cb(void *data EINA_UNUSED)
{
int w, h, cw, ch;
@ -107,7 +104,7 @@ _resize_cb(void *data __UNUSED__)
/* let's have our events back */
static Eina_Bool
_thaw_cb(void *data __UNUSED__)
_thaw_cb(void *data EINA_UNUSED)
{
fprintf(stdout, "Canvas was frozen %d times, now thawing.\n",
evas_event_freeze_get(d.canvas));
@ -117,28 +114,28 @@ _thaw_cb(void *data __UNUSED__)
/* mouse enters the object's area */
static void
_on_mouse_in(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
void *einfo __UNUSED__)
_on_mouse_in(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo EINA_UNUSED)
{
fprintf(stdout, "Enlightenment logo has had the mouse in.\n");
}
static void
_on_mouse_out(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
void *einfo __UNUSED__)
_on_mouse_out(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo EINA_UNUSED)
{
fprintf(stdout, "Enlightenment logo has had the mouse out.\n");
} /* mouse exits the object's area */
/* examine the keys pressed */
static void
_on_keydown(void *data __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas,
Evas_Object *o __UNUSED__,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
const Evas_Modifier *mods;

11
src/examples/evas/evas-hints.c
View File

@ -17,7 +17,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define __UNUSED__
#define PACKAGE_EXAMPLES_DIR "."
#endif
#include <Ecore.h>
@ -29,7 +29,6 @@
#define WIDTH 320
#define HEIGHT 480
#define PACKAGE_EXAMPLES_DIR "."
static const char commands[] = \
"commands are:\n"
@ -134,9 +133,9 @@ _print_rect_stats(Evas_Object *rect)
/* use the following commands to interact with this example - 'h' is
* the key for help */
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;
@ -271,7 +270,7 @@ _on_keydown(void *data __UNUSED__,
}
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}

12
src/examples/evas/evas-images.c
View File

@ -11,13 +11,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -56,7 +52,7 @@ struct test_data
static struct test_data d = {0};
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -92,9 +88,9 @@ _border_fill_mode_to_str(Evas_Border_Fill_Mode mode)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;

38
src/examples/evas/evas-images2.c
View File

@ -11,13 +11,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -51,7 +47,7 @@ struct test_data
static struct test_data d = {0};
static void
_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Mouse_Down *ev = event_info;
@ -60,7 +56,7 @@ _mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_mouse_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_mouse_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Mouse_Move *ev = event_info;
@ -69,7 +65,7 @@ _mouse_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Mouse_Up *ev = event_info;
@ -78,7 +74,7 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_multi_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_multi_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Multi_Down *ev = event_info;
@ -87,7 +83,7 @@ _multi_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_multi_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_multi_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Multi_Move *ev = event_info;
@ -96,7 +92,7 @@ _multi_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_multi_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_multi_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Multi_Up *ev = event_info;
@ -105,7 +101,7 @@ _multi_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_mouse_in(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_mouse_in(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Mouse_In *ev = event_info;
@ -114,7 +110,7 @@ _mouse_in(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_mouse_out(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_mouse_out(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Mouse_Out *ev = event_info;
@ -123,7 +119,7 @@ _mouse_out(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_hold(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_hold(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info)
{
Evas_Event_Hold *ev = event_info;
@ -131,16 +127,16 @@ _hold(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
}
static void
_on_preloaded(void *data __UNUSED__,
Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
_on_preloaded(void *data EINA_UNUSED,
Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
fprintf(stdout, "Image has been pre-loaded!\n");
}
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -157,9 +153,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;

12
src/examples/evas/evas-images3.c
View File

@ -11,13 +11,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -50,7 +46,7 @@ struct test_data
static struct test_data d = {0};
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -70,9 +66,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;

6
src/examples/evas/evas-map-utils.c
View File

@ -4,7 +4,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define __UNUSED__
#define PACKAGE_EXAMPLES_DIR "."
#endif
#include <Ecore.h>
@ -222,13 +222,13 @@ _objs_fit(Evas *e)
}
static void
_on_resize(void *data __UNUSED__, Evas *e, Evas_Object *o __UNUSED__, void *event __UNUSED__)
_on_resize(void *data EINA_UNUSED, Evas *e, Evas_Object *o EINA_UNUSED, void *event EINA_UNUSED)
{
_objs_fit(e);
}
static void
_on_free(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event __UNUSED__)
_on_free(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event EINA_UNUSED)
{
ecore_main_loop_quit();
}

10
src/examples/evas/evas-object-manipulation-eo.c
View File

@ -14,13 +14,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -63,9 +59,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;

10
src/examples/evas/evas-object-manipulation.c
View File

@ -11,13 +11,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -52,9 +48,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;

20
src/examples/evas/evas-smart-interface.c
View File

@ -10,13 +10,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -183,7 +179,7 @@ EVAS_SMART_SUBCLASS_IFACE_NEW
_smart_interfaces);
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -201,9 +197,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
static void
_on_child_del(void *data,
Evas *evas __UNUSED__,
Evas *evas EINA_UNUSED,
Evas_Object *o,
void *einfo __UNUSED__)
void *einfo EINA_UNUSED)
{
Evas_Object *example_smart = data;
long idx;
@ -488,9 +484,9 @@ evas_smart_example_set_right(Evas_Object *o,
/* END OF example smart object's own interface */
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;
@ -666,8 +662,8 @@ _on_keydown(void *data __UNUSED__,
static void
/* callback on number of member objects changed */
_on_example_smart_object_child_num_change(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
_on_example_smart_object_child_num_change(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info)
{
fprintf(stdout, "Number of child members on our example smart"

19
src/examples/evas/evas-smart-object.c
View File

@ -13,10 +13,7 @@
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -141,7 +138,7 @@ EVAS_SMART_SUBCLASS_NEW(_evas_smart_example_type, _evas_smart_example,
evas_object_smart_clipped_class_get, _smart_callbacks);
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -159,9 +156,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
static void
_on_child_del(void *data,
Evas *evas __UNUSED__,
Evas *evas EINA_UNUSED,
Evas_Object *o,
void *einfo __UNUSED__)
void *einfo EINA_UNUSED)
{
Evas_Object *example_smart = data;
long idx;
@ -461,9 +458,9 @@ _map_update(void)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;
@ -659,8 +656,8 @@ _on_keydown(void *data __UNUSED__,
static void
/* callback on number of member objects changed */
_on_example_smart_object_child_num_change(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
_on_example_smart_object_child_num_change(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info)
{
fprintf(stdout, "Number of child members on our example smart"

18
src/examples/evas/evas-stacking.c
View File

@ -14,9 +14,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define __UNUSED__
#define PACKAGE_EXAMPLES_DIR "."
#endif
#include <Ecore.h>
@ -55,10 +53,10 @@ static const char *commands = \
"\th - print help\n";
static void
_on_mouse_down(void *data __UNUSED__,
Evas *evas __UNUSED__,
_on_mouse_down(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o,
void *einfo __UNUSED__)
void *einfo EINA_UNUSED)
{
fprintf(stdout, "Mouse down on rectangle %s!\n", evas_object_name_get(o));
}
@ -77,9 +75,9 @@ _canvas_resize_cb(Ecore_Evas *ee)
/* use the following commands to interact with this example - 'h' is
* the key for help */
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;
@ -241,7 +239,7 @@ _on_keydown(void *data __UNUSED__,
}
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}

4
src/examples/evas/evas-table.c
View File

@ -11,8 +11,6 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define __UNUSED__
#endif
#include <Ecore.h>
@ -33,7 +31,7 @@ struct test_data
static struct test_data d = {0};
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}

12
src/examples/evas/evas-text.c
View File

@ -10,13 +10,9 @@
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#else
#define PACKAGE_EXAMPLES_DIR "."
#define __UNUSED__
#endif
#include <Ecore.h>
@ -94,7 +90,7 @@ struct test_data
static struct test_data d = {0};
static void
_on_destroy(Ecore_Evas *ee __UNUSED__)
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}
@ -151,9 +147,9 @@ _text_style_type_to_str(Evas_Text_Style_Type mode)
}
static void
_on_keydown(void *data __UNUSED__,
Evas *evas __UNUSED__,
Evas_Object *o __UNUSED__,
_on_keydown(void *data EINA_UNUSED,
Evas *evas EINA_UNUSED,
Evas_Object *o EINA_UNUSED,
void *einfo)
{
Evas_Event_Key_Down *ev = einfo;