enlightenment
/
examples
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples: Removed compilation warnings.

This commit is contained in:
Savio Sena 2014-07-11 20:17:04 -03:00 committed by Felipe Magno de Almeida
parent 073f711ce1
commit 159eaea005
14 changed files with 89 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unsorted/ecore/ecore_compose_get_example.c
View File

@ -45,7 +45,7 @@ _is_modifier(const char *key)
/******* end 1 : Ecore compose stuff *******/
static void
_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
{
Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event;
int alt;
@ -57,7 +57,7 @@ _key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
ctrl = evas_key_modifier_is_set(ev->modifiers, "Control");
printf("down : keyname: %s key: %s compose: **%s** string: **%s** [%zu] %d (%d:%d:%d)\n",
ev->keyname, ev->key, ev->string, ev->compose, (ev->compose) ? strlen(ev->compose) : -1, (ev->compose) ? *(ev->compose) : -1,
ev->keyname, ev->key, ev->string, ev->compose, (ev->compose) ? strlen(ev->compose) : (size_t)-1, (ev->compose) ? *(ev->compose) : -1,
alt, shift, ctrl);
}
@ -138,7 +138,7 @@ _key_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
}
static void
_del(Ecore_Evas *ee)
_del(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}

2
unsorted/ecore/ecore_evas_buffer_example_02.c
View File

@ -31,7 +31,7 @@ static Ecore_Evas *ee;
static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png";
static void
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
_on_destroy(Ecore_Evas *ee_ EINA_UNUSED)
{
ecore_main_loop_quit();
}

6
unsorted/ecore/ecore_evas_window_sizes_example.c
View File

@ -41,12 +41,12 @@ static const char commands[] = \
/* to inform current window's size */
static void
_canvas_resize_cb(Ecore_Evas *ee)
_canvas_resize_cb(Ecore_Evas *ee_)
{
int w, h;
char buf[1024];
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
ecore_evas_geometry_get(ee_, NULL, NULL, &w, &h);
snprintf(buf, sizeof(buf), "%d x %d", w, h);
evas_object_text_text_set(text, buf);
evas_object_move(text, (w - 150) / 2, (h - 50) / 2);
@ -55,7 +55,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
}
static void
_on_destroy(Ecore_Evas *ee EINA_UNUSED)
_on_destroy(Ecore_Evas *ee_ EINA_UNUSED)
{
ecore_main_loop_quit();
}

2
unsorted/ecore/ecore_imf_example.c
View File

@ -365,6 +365,8 @@ _key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *
control = evas_key_modifier_is_set(ev->modifiers, "Control");
alt = evas_key_modifier_is_set(ev->modifiers, "Alt");
shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
(void)alt;
(void)shift;
if (!strcmp(ev->key, "BackSpace"))
{

5
unsorted/ecore/ecore_job_example.c
View File

@ -37,6 +37,11 @@ main(void)
job3 = ecore_job_add(_job_print_cb, str3);
job_quit = ecore_job_add(_job_quit_cb, NULL);
(void)job1;
(void)job3;
(void)job_quit;
printf("Created jobs 1, 2, 3 and quit.\n");
if (job2)

2
unsorted/edje/edje-multisense.c
View File

@ -51,7 +51,7 @@ static Evas_Object *create_my_group(Evas *canvas)
return edje;
}
int main(int argc, char *argv[])
int main()
{
Ecore_Evas *window;
Evas *canvas;

20
unsorted/eet/eet-data-file_descriptor_01.c
View File

@ -405,11 +405,11 @@ main(int argc,
{
if (argc == 5)
{
My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
if (!acc)
My_Account *acc_ = _my_cache_account_find(my_cache, argv[4]);
if (!acc_)
{
acc = _my_account_new(argv[4]);
eina_hash_direct_add(my_cache->accounts, acc->name, acc);
acc_ = _my_account_new(argv[4]);
eina_hash_direct_add(my_cache->accounts, acc_->name, acc);
}
else
fprintf(stderr, "ERROR: account '%s' already exists.\n",
@ -424,10 +424,10 @@ main(int argc,
{
if (argc == 6)
{
My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
if (acc)
My_Account *acc_ = _my_cache_account_find(my_cache, argv[4]);
if (acc_)
{
_my_post_add(acc, argv[5]);
_my_post_add(acc_, argv[5]);
}
else
fprintf(stderr, "ERROR: unknown account: '%s'\n", argv[4]);
@ -441,11 +441,11 @@ main(int argc,
{
if (argc == 6)
{
My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
if (acc)
My_Account *acc_ = _my_cache_account_find(my_cache, argv[4]);
if (acc_)
{
My_Message *msg = _my_message_new(argv[5]);
acc->messages = eina_list_append(acc->messages, msg);
acc_->messages = eina_list_append(acc_->messages, msg);
}
else
fprintf(stderr, "ERROR: unknown account: '%s'\n", argv[4]);

2
unsorted/eina/eina_hash_02.c
View File

@ -46,7 +46,7 @@ _phone_book_stringshared_free_cb(void *data)
}
static Eina_Bool
_phone_book_stringshared_foreach_cb(const Eina_Hash *phone_book,
_phone_book_stringshared_foreach_cb(const Eina_Hash *phone_book EINA_UNUSED,
const void *key EINA_UNUSED,
void *data,
void *fdata EINA_UNUSED)

2
unsorted/eina/eina_hash_03.c
View File

@ -37,7 +37,7 @@ _phone_entry_free_cb(void *data)
}
static Eina_Bool
_phone_book_foreach_cb(const Eina_Hash *phone_book, const void *key,
_phone_book_foreach_cb(const Eina_Hash *phone_book EINA_UNUSED, const void *key,
void *data, void *fdata EINA_UNUSED)
{
const char *name = key;

2
unsorted/eina/eina_hash_04.c
View File

@ -37,7 +37,7 @@ _phone_entry_free_cb(void *data)
}
static Eina_Bool
_phone_book_foreach_cb(const Eina_Hash *phone_book, const void *key,
_phone_book_foreach_cb(const Eina_Hash *phone_book EINA_UNUSED, const void *key,
void *data, void *fdata EINA_UNUSED)
{
const char *name = key;

2
unsorted/eina/eina_hash_05.c
View File

@ -37,7 +37,7 @@ _phone_entry_free_cb(void *data)
}
static Eina_Bool
_phone_book_foreach_cb(const Eina_Hash *phone_book, const void *key,
_phone_book_foreach_cb(const Eina_Hash *phone_book EINA_UNUSED, const void *key,
void *data, void *fdata EINA_UNUSED)
{
const int32_t *id = key;

2
unsorted/eina/eina_hash_06.c
View File

@ -37,7 +37,7 @@ _phone_entry_free_cb(void *data)
}
static Eina_Bool
_phone_book_foreach_cb(const Eina_Hash *phone_book, const void *key,
_phone_book_foreach_cb(const Eina_Hash *phone_book EINA_UNUSED, const void *key,
void *data, void *fdata EINA_UNUSED)
{
const int64_t *id = key;

8
unsorted/evas/evas-box.c
View File

@ -135,12 +135,12 @@ list_free:
if (evas_key_modifier_is_set(mods, "Control"))
{
Evas_Object *o;
Evas_Object *o_;
int pos;
pos = atoi(ev->key);
o = _new_rectangle_add(d.evas);
if (!evas_object_box_insert_at(d.box, o, pos))
evas_object_box_append(d.box, o);
o_ = _new_rectangle_add(d.evas);
if (!evas_object_box_insert_at(d.box, o_, pos))
evas_object_box_append(d.box, o_);
return;
}

110
unsorted/evas/evas-gl.c
View File

@ -214,29 +214,29 @@ view_set_ortho(float result[16], const float left, const float right,
}
static void
init_shaders(GLData *gldata)
init_shaders(GLData *gl_data)
{
Evas_GL_API *gl = gldata->glapi;
Evas_GL_API *gl = gl_data->glapi;
const char *p;
p = vertex_shader;
gldata->vtx_shader = gl->glCreateShader(GL_VERTEX_SHADER);
gl->glShaderSource(gldata->vtx_shader, 1, &p, NULL);
gl->glCompileShader(gldata->vtx_shader);
gl_data->vtx_shader = gl->glCreateShader(GL_VERTEX_SHADER);
gl->glShaderSource(gl_data->vtx_shader, 1, &p, NULL);
gl->glCompileShader(gl_data->vtx_shader);
p = fragment_shader;
gldata->fgmt_shader = gl->glCreateShader(GL_FRAGMENT_SHADER);
gl->glShaderSource(gldata->fgmt_shader, 1, &p, NULL);
gl->glCompileShader(gldata->fgmt_shader);
gl_data->fgmt_shader = gl->glCreateShader(GL_FRAGMENT_SHADER);
gl->glShaderSource(gl_data->fgmt_shader, 1, &p, NULL);
gl->glCompileShader(gl_data->fgmt_shader);
gldata->program = gl->glCreateProgram();
gl->glAttachShader(gldata->program, gldata->vtx_shader);
gl->glAttachShader(gldata->program, gldata->fgmt_shader);
gl->glBindAttribLocation(gldata->program, 0, "vPosition");
gl->glBindAttribLocation(gldata->program, 1, "inColor");
gl_data->program = gl->glCreateProgram();
gl->glAttachShader(gl_data->program, gl_data->vtx_shader);
gl->glAttachShader(gl_data->program, gl_data->fgmt_shader);
gl->glBindAttribLocation(gl_data->program, 0, "vPosition");
gl->glBindAttribLocation(gl_data->program, 1, "inColor");
gl->glLinkProgram(gldata->program);
gl->glUseProgram(gldata->program);
gl->glLinkProgram(gl_data->program);
gl->glUseProgram(gl_data->program);
gl->glEnable(GL_DEPTH_TEST);
}
@ -245,35 +245,35 @@ img_pixel_cb(void *data, Evas_Object *obj)
{
//Define the model view projection matrix
float model[16], mvp[16];
GLData *gldata = data;
Evas_GL_API *glapi = gldata->glapi;
GLData *gl_data = data;
Evas_GL_API *glapi = gl_data->glapi;
Evas_Coord w, h;
evas_object_image_size_get(obj, &w, &h);
//Set up the context and surface as the current one
evas_gl_make_current(gldata->evasgl, gldata->sfc, gldata->ctx);
evas_gl_make_current(gl_data->evasgl, gl_data->sfc, gl_data->ctx);
//Initialize gl stuff just one time.
if (!gldata->initialized)
if (!gl_data->initialized)
{
float aspect;
init_shaders(gldata);
glapi->glGenBuffers(1, &gldata->vbo);
glapi->glBindBuffer(GL_ARRAY_BUFFER, gldata->vbo);
init_shaders(gl_data);
glapi->glGenBuffers(1, &gl_data->vbo);
glapi->glBindBuffer(GL_ARRAY_BUFFER, gl_data->vbo);
glapi->glBufferData(GL_ARRAY_BUFFER, 3 * 72 * 4, cube_vertices,GL_STATIC_DRAW);
init_matrix(gldata->view);
init_matrix(gl_data->view);
if(w > h)
{
aspect = (float)w/h;
view_set_ortho(gldata->view, -1.0 * aspect, 1.0 * aspect, -1.0, 1.0, -1.0, 1.0);
view_set_ortho(gl_data->view, -1.0 * aspect, 1.0 * aspect, -1.0, 1.0, -1.0, 1.0);
}
else
{
aspect = (float)h/w;
view_set_ortho(gldata->view, -1.0, 1.0, -1.0 * aspect, 1.0 * aspect, -1.0, 1.0);
view_set_ortho(gl_data->view, -1.0, 1.0, -1.0 * aspect, 1.0 * aspect, -1.0, 1.0);
}
gldata->initialized = EINA_TRUE;
gl_data->initialized = EINA_TRUE;
}
glapi->glViewport(0, 0, w, h);
@ -281,19 +281,19 @@ img_pixel_cb(void *data, Evas_Object *obj)
glapi->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
init_matrix(model);
rotate_xyz(model, gldata->xangle, gldata->yangle, 0.0f);
multiply_matrix(mvp, gldata->view, model);
rotate_xyz(model, gl_data->xangle, gl_data->yangle, 0.0f);
multiply_matrix(mvp, gl_data->view, model);
glapi->glUseProgram(gldata->program);
glapi->glBindBuffer(GL_ARRAY_BUFFER, gldata->vbo);
glapi->glUseProgram(gl_data->program);
glapi->glBindBuffer(GL_ARRAY_BUFFER, gl_data->vbo);
glapi->glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, 0);
glapi->glEnableVertexAttribArray(0);
glapi->glBindBuffer(GL_ARRAY_BUFFER, gldata->vbo);
glapi->glBindBuffer(GL_ARRAY_BUFFER, gl_data->vbo);
glapi->glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(sizeof(float)*3));
glapi->glEnableVertexAttribArray(1);
glapi->glUniformMatrix4fv( glapi->glGetUniformLocation(gldata->program, "mvpMatrix"), 1, GL_FALSE, mvp);
glapi->glUniformMatrix4fv( glapi->glGetUniformLocation(gl_data->program, "mvpMatrix"), 1, GL_FALSE, mvp);
glapi->glDrawArrays(GL_TRIANGLES, 0, 36);
glapi->glFinish();
@ -302,21 +302,21 @@ img_pixel_cb(void *data, Evas_Object *obj)
static void
img_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
GLData *gldata = data;
Evas_GL_API *glapi = gldata->glapi;
GLData *gl_data = data;
Evas_GL_API *glapi = gl_data->glapi;
//Free the gl resources when image object is deleted.
evas_gl_make_current(gldata->evasgl, gldata->sfc, gldata->ctx);
evas_gl_make_current(gl_data->evasgl, gl_data->sfc, gl_data->ctx);
glapi->glDeleteShader(gldata->vtx_shader);
glapi->glDeleteShader(gldata->fgmt_shader);
glapi->glDeleteProgram(gldata->program);
glapi->glDeleteBuffers(1, &gldata->vbo);
glapi->glDeleteShader(gl_data->vtx_shader);
glapi->glDeleteShader(gl_data->fgmt_shader);
glapi->glDeleteProgram(gl_data->program);
glapi->glDeleteBuffers(1, &gl_data->vbo);
evas_gl_surface_destroy(gldata->evasgl, gldata->sfc);
evas_gl_context_destroy(gldata->evasgl, gldata->ctx);
evas_gl_surface_destroy(gl_data->evasgl, gl_data->sfc);
evas_gl_context_destroy(gl_data->evasgl, gl_data->ctx);
evas_gl_free(gldata->evasgl);
evas_gl_free(gl_data->evasgl);
}
static Eina_Bool
@ -335,8 +335,8 @@ _animator_cb(void *data)
static void
_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
GLData *gldata = data;
gldata->mouse_down = EINA_TRUE;
GLData *gl_data = data;
gl_data->mouse_down = EINA_TRUE;
}
static void
@ -344,23 +344,23 @@ _mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
{
Evas_Event_Mouse_Move *ev;
ev = (Evas_Event_Mouse_Move *)event_info;
GLData *gldata = data;
GLData *gl_data = data;
float dx = 0, dy = 0;
if( gldata->mouse_down)
if( gl_data->mouse_down)
{
dx = (ev->cur.canvas.x - ev->prev.canvas.x);
dy = (ev->cur.canvas.y - ev->prev.canvas.y);
gldata->xangle += dy;
gldata->yangle += dx;
gl_data->xangle += dy;
gl_data->yangle += dx;
}
}
static void
_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
GLData *gldata = data;
gldata->mouse_down = EINA_FALSE;
GLData *gl_data = data;
gl_data->mouse_down = EINA_FALSE;
}
static void
@ -370,19 +370,19 @@ _win_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_in
Evas_Coord w,h;
evas_object_geometry_get( obj, NULL, NULL, &w, &h);
GLData *gldata = data;
evas_object_resize(gldata->img, w, h);
GLData *gl_data = data;
evas_object_resize(gl_data->img, w, h);
init_matrix(gldata->view);
init_matrix(gl_data->view);
if(w > h)
{
aspect = (float)w/h;
view_set_ortho(gldata->view, (-1.0 * aspect), (1.0 * aspect), -1.0, 1.0, -1.0, 1.0);
view_set_ortho(gl_data->view, (-1.0 * aspect), (1.0 * aspect), -1.0, 1.0, -1.0, 1.0);
}
else
{
aspect = (float)h/w;
view_set_ortho(gldata->view, -1.0, 1.0, (-1.0 * aspect), (1.0 * aspect), -1.0, 1.0);
view_set_ortho(gl_data->view, -1.0, 1.0, (-1.0 * aspect), (1.0 * aspect), -1.0, 1.0);
}
}