Menu
▾
▴
enlightenment-cvs
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:05:50
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/evas_gl_glew
Modified Files:
Ewl_Engine_Evas_Gl_Glew.h ewl_engine_evas_gl_glew.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_gl_glew/Ewl_Engine_Evas_Gl_Glew.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Ewl_Engine_Evas_Gl_Glew.h 6 May 2008 20:20:36 -0000 1.2
+++ Ewl_Engine_Evas_Gl_Glew.h 7 May 2008 13:38:21 -0000 1.3
@@ -8,7 +8,7 @@
#include <Ecore_Win32.h>
#define EWL_ENGINE_EVAS_GL_GLEW(engine) \
- ((Ewl_Engine_Evas_Gl_Glew *)engine)
+ ((Ewl_Engine_Evas_Gl_Glew *)engine)
typedef struct Ewl_Engine_Evas_Gl_Glew Ewl_Engine_Evas_Gl_Glew;
struct Ewl_Engine_Evas_Gl_Glew
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_gl_glew/ewl_engine_evas_gl_glew.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_engine_evas_gl_glew.c 6 May 2008 20:20:36 -0000 1.2
+++ ewl_engine_evas_gl_glew.c 7 May 2008 13:38:21 -0000 1.3
@@ -11,8 +11,8 @@
static void *canvas_funcs[EWL_ENGINE_CANVAS_MAX] =
{
- ee_canvas_setup,
- NULL, NULL, NULL, NULL
+ ee_canvas_setup,
+ NULL, NULL, NULL, NULL
};
Ecore_DList *
@@ -38,12 +38,12 @@
engine = NEW(Ewl_Engine_Evas_Gl_Glew, 1);
if (!engine)
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
if (!ee_init(EWL_ENGINE(engine)))
{
- FREE(engine);
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ FREE(engine);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
}
DRETURN_PTR(EWL_ENGINE(engine), DLEVEL_STABLE);
@@ -91,9 +91,9 @@
if (!ecore_win32_glew_init(win->window))
{
- fprintf(stderr, "[Ewl] Unable to set OpenGL Glew data "
- "for rendering, ");
- exit(-1);
+ fprintf(stderr, "[Ewl] Unable to set OpenGL Glew data "
+ "for rendering, ");
+ exit(-1);
}
evas = evas_new();
@@ -102,8 +102,8 @@
info = evas_engine_info_get(evas);
if (!info)
{
- fprintf(stderr, "Unable to use gl_glew engine for rendering, ");
- exit(-1);
+ fprintf(stderr, "Unable to use gl_glew engine for rendering, ");
+ exit(-1);
}
glinfo = (Evas_Engine_Info_GL_Glew *)info;
@@ -115,11 +115,11 @@
evas_engine_info_set(evas, info);
evas_output_size_set(evas, ewl_object_current_w_get(o),
- ewl_object_current_h_get(o));
+ ewl_object_current_h_get(o));
evas_output_viewport_set(evas, ewl_object_current_x_get(o),
- ewl_object_current_y_get(o),
- ewl_object_current_w_get(o),
- ewl_object_current_h_get(o));
+ ewl_object_current_y_get(o),
+ ewl_object_current_w_get(o),
+ ewl_object_current_h_get(o));
ewl_embed_canvas_set(EWL_EMBED(win), evas, win->window);
DLEAVE_FUNCTION(DLEVEL_STABLE);
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:06:18
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/evas_buffer
Modified Files:
Ewl_Engine_Evas_Buffer.h ewl_engine_evas_buffer.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_buffer/Ewl_Engine_Evas_Buffer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Ewl_Engine_Evas_Buffer.h 6 May 2008 20:20:36 -0000 1.5
+++ Ewl_Engine_Evas_Buffer.h 7 May 2008 13:38:21 -0000 1.6
@@ -7,7 +7,7 @@
#include <Evas_Engine_Buffer.h>
#define EWL_ENGINE_EVAS_BUFFER(engine) \
- ((Ewl_Engine_Evas_Buffer *)engine)
+ ((Ewl_Engine_Evas_Buffer *)engine)
typedef struct Ewl_Engine_Evas_Buffer Ewl_Engine_Evas_Buffer;
struct Ewl_Engine_Evas_Buffer
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_buffer/ewl_engine_evas_buffer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_engine_evas_buffer.c 6 May 2008 20:20:36 -0000 1.17
+++ ewl_engine_evas_buffer.c 7 May 2008 13:38:21 -0000 1.18
@@ -6,16 +6,16 @@
static void ee_canvas_setup(Ewl_Window *win, int debug);
static void ee_canvas_output_set(Ewl_Embed *embed, int x, int y, int width,
- int height);
+ int height);
static void ee_canvas_render(Ewl_Embed *emb);
static int ee_init(Ewl_Engine *engine);
static void ee_shutdown(Ewl_Engine *engine);
static void *canvas_funcs[EWL_ENGINE_CANVAS_MAX] =
{
- ee_canvas_setup,
- ee_canvas_output_set,
- ee_canvas_render, NULL, NULL
+ ee_canvas_setup,
+ ee_canvas_output_set,
+ ee_canvas_render, NULL, NULL
};
Ecore_DList *
@@ -40,12 +40,12 @@
engine = NEW(Ewl_Engine_Evas_Buffer, 1);
if (!engine)
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
if (!ee_init(EWL_ENGINE(engine)))
{
- FREE(engine);
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ FREE(engine);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
}
DRETURN_PTR(EWL_ENGINE(engine), DLEVEL_STABLE);
@@ -97,8 +97,8 @@
info = evas_engine_info_get(evas);
if (!info)
{
- fprintf(stderr, "Unable to use buffer engine for rendering.\n");
- exit(-1);
+ fprintf(stderr, "Unable to use buffer engine for rendering.\n");
+ exit(-1);
}
win->window = bufinfo = (Evas_Engine_Info_Buffer *)info;
@@ -115,11 +115,11 @@
o = EWL_OBJECT(win);
evas_engine_info_set(evas, info);
evas_output_size_set(evas, ewl_object_current_w_get(o),
- ewl_object_current_h_get(o));
+ ewl_object_current_h_get(o));
evas_output_viewport_set(evas, ewl_object_current_x_get(o),
- ewl_object_current_y_get(o),
- ewl_object_current_w_get(o),
- ewl_object_current_h_get(o));
+ ewl_object_current_y_get(o),
+ ewl_object_current_w_get(o),
+ ewl_object_current_h_get(o));
ewl_embed_canvas_set(EWL_EMBED(win), evas, win->window);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -146,15 +146,15 @@
info = evas_engine_info_get(evas);
if (!info)
{
- fprintf(stderr, "Unable to use buffer engine for rendering.\n");
- exit(-1);
+ fprintf(stderr, "Unable to use buffer engine for rendering.\n");
+ exit(-1);
}
o = EWL_OBJECT(emb);
bufinfo = (Evas_Engine_Info_Buffer *)info;
bufinfo->info.dest_buffer_row_bytes = sizeof(int) * width;
bufinfo->info.dest_buffer = realloc(bufinfo->info.dest_buffer,
- bufinfo->info.dest_buffer_row_bytes * height);
+ bufinfo->info.dest_buffer_row_bytes * height);
evas_engine_info_set(evas, info);
@@ -170,14 +170,14 @@
DCHECK_PARAM_PTR(embed);
if (embed->canvas) {
- Evas_List *updates;
+ Evas_List *updates;
- updates = evas_render_updates(embed->canvas);
- if (updates) {
- ewl_callback_call(EWL_WIDGET(embed),
- EWL_CALLBACK_VALUE_CHANGED);
- evas_render_updates_free(updates);
- }
+ updates = evas_render_updates(embed->canvas);
+ if (updates) {
+ ewl_callback_call(EWL_WIDGET(embed),
+ EWL_CALLBACK_VALUE_CHANGED);
+ evas_render_updates_free(updates);
+ }
}
DRETURN(DLEVEL_STABLE);
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:06:22
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/window
Modified Files:
ewl_window_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/window/ewl_window_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_window_test.c 6 May 2008 20:18:57 -0000 1.6
+++ ewl_window_test.c 7 May 2008 13:38:21 -0000 1.7
@@ -33,20 +33,20 @@
*/
static Ewl_Unit_Test window_unit_tests[] = {
- {"title set/get", title_set_get, NULL, -1, 0},
- {"name set/get", name_set_get, NULL, -1, 0},
- {"class set/get", class_set_get, NULL, -1, 0},
- {"borderless set/get", borderless_set_get, NULL, -1, 0},
- {"dialog set/get", dialog_set_get, NULL, -1, 0},
- {"fullscreen set/get", fullscreen_set_get, NULL, -1, 0},
- {"skip_taskbar set/get", skip_taskbar_set_get, NULL, -1, 0},
- {"skip_pager set/get", skip_pager_set_get, NULL, -1, 0},
- {"urgent set/get", urgent_set_get, NULL, -1, 0},
- {"modal set/get", modal_set_get, NULL, -1, 0},
- {"keyboard_grab set/get", keyboard_grab_set_get, NULL, -1, 0},
- {"pointer_grab set/get", pointer_grab_set_get, NULL, -1, 0},
- {"override set/get", override_set_get, NULL, -1, 0},
- {NULL, NULL, NULL, -1, 0}
+ {"title set/get", title_set_get, NULL, -1, 0},
+ {"name set/get", name_set_get, NULL, -1, 0},
+ {"class set/get", class_set_get, NULL, -1, 0},
+ {"borderless set/get", borderless_set_get, NULL, -1, 0},
+ {"dialog set/get", dialog_set_get, NULL, -1, 0},
+ {"fullscreen set/get", fullscreen_set_get, NULL, -1, 0},
+ {"skip_taskbar set/get", skip_taskbar_set_get, NULL, -1, 0},
+ {"skip_pager set/get", skip_pager_set_get, NULL, -1, 0},
+ {"urgent set/get", urgent_set_get, NULL, -1, 0},
+ {"modal set/get", modal_set_get, NULL, -1, 0},
+ {"keyboard_grab set/get", keyboard_grab_set_get, NULL, -1, 0},
+ {"pointer_grab set/get", pointer_grab_set_get, NULL, -1, 0},
+ {"override set/get", override_set_get, NULL, -1, 0},
+ {NULL, NULL, NULL, -1, 0}
};
void
@@ -105,7 +105,7 @@
flip_border_cb(Ewl_Widget *w, void *ev, void *data)
{
ewl_window_borderless_set(EWL_WINDOW(data),
- !ewl_window_borderless_get(EWL_WINDOW(data)));
+ !ewl_window_borderless_get(EWL_WINDOW(data)));
}
/*
@@ -122,21 +122,21 @@
title = ewl_window_title_get(EWL_WINDOW(win));
if (title)
- snprintf(buf, len, "default title set to '%s'", title);
+ snprintf(buf, len, "default title set to '%s'", title);
else {
- ewl_window_title_set(EWL_WINDOW(win), "A title");
- title = ewl_window_title_get(EWL_WINDOW(win));
+ ewl_window_title_set(EWL_WINDOW(win), "A title");
+ title = ewl_window_title_get(EWL_WINDOW(win));
- if (strcmp(title, "A title"))
- snprintf(buf, len, "incorrect title set");
- else {
- ewl_window_title_set(EWL_WINDOW(win), "");
- title = ewl_window_title_get(EWL_WINDOW(win));
- if (title)
- snprintf(buf, len, "non-empty title set");
- else
- ret = 1;
- }
+ if (strcmp(title, "A title"))
+ snprintf(buf, len, "incorrect title set");
+ else {
+ ewl_window_title_set(EWL_WINDOW(win), "");
+ title = ewl_window_title_get(EWL_WINDOW(win));
+ if (title)
+ snprintf(buf, len, "non-empty title set");
+ else
+ ret = 1;
+ }
}
ewl_widget_destroy(win);
@@ -158,21 +158,21 @@
name = ewl_window_name_get(EWL_WINDOW(win));
if (name)
- snprintf(buf, len, "default name set to '%s'", name);
+ snprintf(buf, len, "default name set to '%s'", name);
else {
- ewl_window_name_set(EWL_WINDOW(win), "A name");
- name = ewl_window_name_get(EWL_WINDOW(win));
+ ewl_window_name_set(EWL_WINDOW(win), "A name");
+ name = ewl_window_name_get(EWL_WINDOW(win));
- if (strcmp(name, "A name"))
- snprintf(buf, len, "incorrect name set");
- else {
- ewl_window_name_set(EWL_WINDOW(win), "");
- name = ewl_window_name_get(EWL_WINDOW(win));
- if (name)
- snprintf(buf, len, "non-empty name set");
- else
- ret = 1;
- }
+ if (strcmp(name, "A name"))
+ snprintf(buf, len, "incorrect name set");
+ else {
+ ewl_window_name_set(EWL_WINDOW(win), "");
+ name = ewl_window_name_get(EWL_WINDOW(win));
+ if (name)
+ snprintf(buf, len, "non-empty name set");
+ else
+ ret = 1;
+ }
}
ewl_widget_destroy(win);
@@ -194,21 +194,21 @@
class = ewl_window_class_get(EWL_WINDOW(win));
if (class)
- snprintf(buf, len, "default class set to '%s'", class);
+ snprintf(buf, len, "default class set to '%s'", class);
else {
- ewl_window_class_set(EWL_WINDOW(win), "A class");
- class = ewl_window_class_get(EWL_WINDOW(win));
+ ewl_window_class_set(EWL_WINDOW(win), "A class");
+ class = ewl_window_class_get(EWL_WINDOW(win));
- if (strcmp(class, "A class"))
- snprintf(buf, len, "incorrect class set");
- else {
- ewl_window_class_set(EWL_WINDOW(win), "");
- class = ewl_window_class_get(EWL_WINDOW(win));
- if (class)
- snprintf(buf, len, "non-empty class set");
- else
- ret = 1;
- }
+ if (strcmp(class, "A class"))
+ snprintf(buf, len, "incorrect class set");
+ else {
+ ewl_window_class_set(EWL_WINDOW(win), "");
+ class = ewl_window_class_get(EWL_WINDOW(win));
+ if (class)
+ snprintf(buf, len, "non-empty class set");
+ else
+ ret = 1;
+ }
}
ewl_widget_destroy(win);
@@ -228,13 +228,13 @@
win = ewl_window_new();
ewl_window_borderless_set(EWL_WINDOW(win), TRUE);
if (ewl_window_borderless_get(EWL_WINDOW(win)))
- ret = 1;
+ ret = 1;
else
- snprintf(buf, len, "setting borderless TRUE failed");
+ snprintf(buf, len, "setting borderless TRUE failed");
ewl_window_borderless_set(EWL_WINDOW(win), FALSE);
if (ewl_window_borderless_get(EWL_WINDOW(win)))
- snprintf(buf, len, "setting borderless FALSE failed");
+ snprintf(buf, len, "setting borderless FALSE failed");
ewl_widget_destroy(win);
@@ -254,20 +254,20 @@
if (!ewl_window_dialog_get(EWL_WINDOW(win))) {
- ewl_window_dialog_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_dialog_get(EWL_WINDOW(win))) {
+ ewl_window_dialog_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_dialog_get(EWL_WINDOW(win))) {
- ewl_window_dialog_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_dialog_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "dialog unset failed");
- }
- else
- snprintf(buf, len, "dialog set failed");
+ ewl_window_dialog_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_dialog_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "dialog unset failed");
+ }
+ else
+ snprintf(buf, len, "dialog set failed");
}
else
- snprintf(buf, len, "default dialog set");
+ snprintf(buf, len, "default dialog set");
ewl_widget_destroy(win);
@@ -287,20 +287,20 @@
if (!ewl_window_fullscreen_get(EWL_WINDOW(win))) {
- ewl_window_fullscreen_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_fullscreen_get(EWL_WINDOW(win))) {
+ ewl_window_fullscreen_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_fullscreen_get(EWL_WINDOW(win))) {
- ewl_window_fullscreen_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_fullscreen_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "fullscreen unset failed");
- }
- else
- snprintf(buf, len, "fullscreen set failed");
+ ewl_window_fullscreen_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_fullscreen_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "fullscreen unset failed");
+ }
+ else
+ snprintf(buf, len, "fullscreen set failed");
}
else
- snprintf(buf, len, "default fullscreen set");
+ snprintf(buf, len, "default fullscreen set");
ewl_widget_destroy(win);
@@ -320,20 +320,20 @@
if (!ewl_window_skip_taskbar_get(EWL_WINDOW(win))) {
- ewl_window_skip_taskbar_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_skip_taskbar_get(EWL_WINDOW(win))) {
+ ewl_window_skip_taskbar_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_skip_taskbar_get(EWL_WINDOW(win))) {
- ewl_window_skip_taskbar_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_skip_taskbar_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "skip_taskbar unset failed");
- }
- else
- snprintf(buf, len, "skip_taskbar set failed");
+ ewl_window_skip_taskbar_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_skip_taskbar_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "skip_taskbar unset failed");
+ }
+ else
+ snprintf(buf, len, "skip_taskbar set failed");
}
else
- snprintf(buf, len, "default skip_taskbar set");
+ snprintf(buf, len, "default skip_taskbar set");
ewl_widget_destroy(win);
@@ -353,20 +353,20 @@
if (!ewl_window_skip_pager_get(EWL_WINDOW(win))) {
- ewl_window_skip_pager_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_skip_pager_get(EWL_WINDOW(win))) {
+ ewl_window_skip_pager_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_skip_pager_get(EWL_WINDOW(win))) {
- ewl_window_skip_pager_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_skip_pager_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "skip_pager unset failed");
- }
- else
- snprintf(buf, len, "skip_pager set failed");
+ ewl_window_skip_pager_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_skip_pager_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "skip_pager unset failed");
+ }
+ else
+ snprintf(buf, len, "skip_pager set failed");
}
else
- snprintf(buf, len, "default skip_pager set");
+ snprintf(buf, len, "default skip_pager set");
ewl_widget_destroy(win);
@@ -386,20 +386,20 @@
if (!ewl_window_urgent_get(EWL_WINDOW(win))) {
- ewl_window_urgent_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_urgent_get(EWL_WINDOW(win))) {
+ ewl_window_urgent_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_urgent_get(EWL_WINDOW(win))) {
- ewl_window_urgent_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_urgent_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "urgent unset failed");
- }
- else
- snprintf(buf, len, "urgent set failed");
+ ewl_window_urgent_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_urgent_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "urgent unset failed");
+ }
+ else
+ snprintf(buf, len, "urgent set failed");
}
else
- snprintf(buf, len, "default urgent set");
+ snprintf(buf, len, "default urgent set");
ewl_widget_destroy(win);
@@ -419,20 +419,20 @@
if (!ewl_window_modal_get(EWL_WINDOW(win))) {
- ewl_window_modal_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_modal_get(EWL_WINDOW(win))) {
+ ewl_window_modal_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_modal_get(EWL_WINDOW(win))) {
- ewl_window_modal_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_modal_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "modal unset failed");
- }
- else
- snprintf(buf, len, "modal set failed");
+ ewl_window_modal_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_modal_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "modal unset failed");
+ }
+ else
+ snprintf(buf, len, "modal set failed");
}
else
- snprintf(buf, len, "default modal set");
+ snprintf(buf, len, "default modal set");
ewl_widget_destroy(win);
@@ -452,20 +452,20 @@
if (!ewl_window_keyboard_grab_get(EWL_WINDOW(win))) {
- ewl_window_keyboard_grab_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_keyboard_grab_get(EWL_WINDOW(win))) {
+ ewl_window_keyboard_grab_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_keyboard_grab_get(EWL_WINDOW(win))) {
- ewl_window_keyboard_grab_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_keyboard_grab_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "keyboard_grab unset failed");
- }
- else
- snprintf(buf, len, "keyboard_grab set failed");
+ ewl_window_keyboard_grab_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_keyboard_grab_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "keyboard_grab unset failed");
+ }
+ else
+ snprintf(buf, len, "keyboard_grab set failed");
}
else
- snprintf(buf, len, "default keyboard_grab set");
+ snprintf(buf, len, "default keyboard_grab set");
ewl_widget_destroy(win);
@@ -485,20 +485,20 @@
if (!ewl_window_pointer_grab_get(EWL_WINDOW(win))) {
- ewl_window_pointer_grab_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_pointer_grab_get(EWL_WINDOW(win))) {
+ ewl_window_pointer_grab_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_pointer_grab_get(EWL_WINDOW(win))) {
- ewl_window_pointer_grab_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_pointer_grab_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "pointer_grab unset failed");
- }
- else
- snprintf(buf, len, "pointer_grab set failed");
+ ewl_window_pointer_grab_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_pointer_grab_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "pointer_grab unset failed");
+ }
+ else
+ snprintf(buf, len, "pointer_grab set failed");
}
else
- snprintf(buf, len, "default pointer_grab set");
+ snprintf(buf, len, "default pointer_grab set");
ewl_widget_destroy(win);
@@ -518,20 +518,20 @@
if (!ewl_window_override_get(EWL_WINDOW(win))) {
- ewl_window_override_set(EWL_WINDOW(win), TRUE);
- if (ewl_window_override_get(EWL_WINDOW(win))) {
+ ewl_window_override_set(EWL_WINDOW(win), TRUE);
+ if (ewl_window_override_get(EWL_WINDOW(win))) {
- ewl_window_override_set(EWL_WINDOW(win), FALSE);
- if (!ewl_window_override_get(EWL_WINDOW(win)))
- ret = 1;
- else
- snprintf(buf, len, "override unset failed");
- }
- else
- snprintf(buf, len, "override set failed");
+ ewl_window_override_set(EWL_WINDOW(win), FALSE);
+ if (!ewl_window_override_get(EWL_WINDOW(win)))
+ ret = 1;
+ else
+ snprintf(buf, len, "override unset failed");
+ }
+ else
+ snprintf(buf, len, "override set failed");
}
else
- snprintf(buf, len, "default override set");
+ snprintf(buf, len, "default override set");
ewl_widget_destroy(win);
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:06:29
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/freebox
Modified Files:
ewl_freebox_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/freebox/ewl_freebox_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_freebox_test.c 6 May 2008 20:09:03 -0000 1.2
+++ ewl_freebox_test.c 7 May 2008 13:38:16 -0000 1.3
@@ -33,7 +33,7 @@
{
test->name = "Freebox";
test->tip = "The freebox is used for a more free layout system\n"
- "then the other containers",
+ "then the other containers",
test->filename = __FILE__;
test->func = create_test;
test->type = EWL_TEST_TYPE_CONTAINER;
@@ -44,22 +44,22 @@
{
int i;
const Freebox_Test fbtests[] = {
- {
- "Manual Placement",
- EWL_FREEBOX_LAYOUT_MANUAL,
- NULL
- },
- {
- "Auto Placement",
- EWL_FREEBOX_LAYOUT_AUTO,
- NULL
- },
- {
- "Comparator Placement (by name)",
- EWL_FREEBOX_LAYOUT_COMPARATOR,
- ewl_freebox_cb_compare
- },
- { NULL, EWL_FREEBOX_LAYOUT_AUTO, NULL }
+ {
+ "Manual Placement",
+ EWL_FREEBOX_LAYOUT_MANUAL,
+ NULL
+ },
+ {
+ "Auto Placement",
+ EWL_FREEBOX_LAYOUT_AUTO,
+ NULL
+ },
+ {
+ "Comparator Placement (by name)",
+ EWL_FREEBOX_LAYOUT_COMPARATOR,
+ ewl_freebox_cb_compare
+ },
+ { NULL, EWL_FREEBOX_LAYOUT_AUTO, NULL }
};
srand(time(NULL));
@@ -67,56 +67,56 @@
ewl_object_fill_policy_set(EWL_OBJECT(box), EWL_FLAG_FILL_ALL);
for (i = 0; fbtests[i].name != NULL; i++) {
- Ewl_Widget *border, *hbox, *fb, *pane, *o;
+ Ewl_Widget *border, *hbox, *fb, *pane, *o;
- border = ewl_border_new();
- ewl_border_label_set(EWL_BORDER(border),
- (char *)fbtests[i].name);
- ewl_object_fill_policy_set(EWL_OBJECT(border), EWL_FLAG_FILL_FILL);
- ewl_container_child_append(EWL_CONTAINER(box), border);
- ewl_widget_show(border);
-
- /* nest the freebox in a scrollpane */
- pane = ewl_scrollpane_new();
- ewl_container_child_append(EWL_CONTAINER(border), pane);
- ewl_widget_show(pane);
-
- /* create a freebox of the type for this test */
- fb = ewl_freebox_new();
- ewl_freebox_layout_type_set(EWL_FREEBOX(fb), fbtests[i].type);
- if (fbtests[i].compare) {
- ewl_freebox_comparator_set(EWL_FREEBOX(fb),
- fbtests[i].compare);
- sort_fb = fb;
- }
- ewl_container_child_append(EWL_CONTAINER(pane), fb);
- ewl_widget_show(fb);
-
- /* pack controls for the freebox */
- hbox = ewl_hbox_new();
- ewl_container_child_append(EWL_CONTAINER(border), hbox);
- ewl_object_fill_policy_set(EWL_OBJECT(hbox),
- EWL_FLAG_FILL_NONE);
- ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_TOP);
- ewl_widget_show(hbox);
-
- o = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(o), "Add items");
- ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
- ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_TOP);
- ewl_container_child_append(EWL_CONTAINER(hbox), o);
- ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_freebox_cb_add, fb);
- ewl_widget_show(o);
-
- o = ewl_button_new();
- ewl_button_label_set(EWL_BUTTON(o), "Clear items");
- ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
- ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_TOP);
- ewl_container_child_append(EWL_CONTAINER(hbox), o);
- ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_freebox_cb_clear, fb);
- ewl_widget_show(o);
+ border = ewl_border_new();
+ ewl_border_label_set(EWL_BORDER(border),
+ (char *)fbtests[i].name);
+ ewl_object_fill_policy_set(EWL_OBJECT(border), EWL_FLAG_FILL_FILL);
+ ewl_container_child_append(EWL_CONTAINER(box), border);
+ ewl_widget_show(border);
+
+ /* nest the freebox in a scrollpane */
+ pane = ewl_scrollpane_new();
+ ewl_container_child_append(EWL_CONTAINER(border), pane);
+ ewl_widget_show(pane);
+
+ /* create a freebox of the type for this test */
+ fb = ewl_freebox_new();
+ ewl_freebox_layout_type_set(EWL_FREEBOX(fb), fbtests[i].type);
+ if (fbtests[i].compare) {
+ ewl_freebox_comparator_set(EWL_FREEBOX(fb),
+ fbtests[i].compare);
+ sort_fb = fb;
+ }
+ ewl_container_child_append(EWL_CONTAINER(pane), fb);
+ ewl_widget_show(fb);
+
+ /* pack controls for the freebox */
+ hbox = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(border), hbox);
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox),
+ EWL_FLAG_FILL_NONE);
+ ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_TOP);
+ ewl_widget_show(hbox);
+
+ o = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Add items");
+ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_TOP);
+ ewl_container_child_append(EWL_CONTAINER(hbox), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_freebox_cb_add, fb);
+ ewl_widget_show(o);
+
+ o = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Clear items");
+ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_TOP);
+ ewl_container_child_append(EWL_CONTAINER(hbox), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_freebox_cb_clear, fb);
+ ewl_widget_show(o);
}
return 1;
@@ -124,7 +124,7 @@
static void
ewl_freebox_cb_icon_change(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data)
+ void *data)
{
Ewl_Freebox *fb;
@@ -145,7 +145,7 @@
static void
ewl_freebox_cb_add(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data)
+ void *data)
{
Ewl_Freebox *fb;
Ewl_Widget *i;
@@ -153,48 +153,48 @@
struct
{
- char *name;
- char *path;
+ char *name;
+ char *path;
} files[] = {
- {"Draw", PACKAGE_DATA_DIR "/ewl/images/Draw.png"},
- {"End", PACKAGE_DATA_DIR "/ewl/images/End.png"},
- {"Card", PACKAGE_DATA_DIR "/ewl/images/NewBCard.png"},
- {"Open", PACKAGE_DATA_DIR "/ewl/images/Open.png"},
- {"Package", PACKAGE_DATA_DIR "/ewl/images/Package.png"},
- {"World", PACKAGE_DATA_DIR "/ewl/images/World.png"},
- {NULL, NULL}
+ {"Draw", PACKAGE_DATA_DIR "/ewl/images/Draw.png"},
+ {"End", PACKAGE_DATA_DIR "/ewl/images/End.png"},
+ {"Card", PACKAGE_DATA_DIR "/ewl/images/NewBCard.png"},
+ {"Open", PACKAGE_DATA_DIR "/ewl/images/Open.png"},
+ {"Package", PACKAGE_DATA_DIR "/ewl/images/Package.png"},
+ {"World", PACKAGE_DATA_DIR "/ewl/images/World.png"},
+ {NULL, NULL}
};
fb = data;
for (t = 0; files[t].name != NULL; t++)
{
- long width, height;
+ long width, height;
- width = (rand() % 30) + 30;
- height = (rand() % 30) + 30;
+ width = (rand() % 30) + 30;
+ height = (rand() % 30) + 30;
- i = ewl_icon_new();
- ewl_container_child_append(EWL_CONTAINER(fb), i);
- ewl_icon_label_set(EWL_ICON(i), files[t].name);
- ewl_icon_image_set(EWL_ICON(i), files[t].path, NULL);
- ewl_object_fill_policy_set(EWL_OBJECT(i),
- EWL_FLAG_FILL_FILL);
- ewl_object_minimum_size_set(EWL_OBJECT(i), (int)width,
- (int)height);
- if (fb == EWL_FREEBOX(sort_fb))
- {
- ewl_icon_editable_set(EWL_ICON(i), TRUE);
- ewl_callback_append(i, EWL_CALLBACK_VALUE_CHANGED,
- ewl_freebox_cb_icon_change, fb);
- }
- ewl_widget_show(i);
+ i = ewl_icon_new();
+ ewl_container_child_append(EWL_CONTAINER(fb), i);
+ ewl_icon_label_set(EWL_ICON(i), files[t].name);
+ ewl_icon_image_set(EWL_ICON(i), files[t].path, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(i),
+ EWL_FLAG_FILL_FILL);
+ ewl_object_minimum_size_set(EWL_OBJECT(i), (int)width,
+ (int)height);
+ if (fb == EWL_FREEBOX(sort_fb))
+ {
+ ewl_icon_editable_set(EWL_ICON(i), TRUE);
+ ewl_callback_append(i, EWL_CALLBACK_VALUE_CHANGED,
+ ewl_freebox_cb_icon_change, fb);
+ }
+ ewl_widget_show(i);
}
}
static void
ewl_freebox_cb_clear(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data)
+ void *data)
{
Ewl_Freebox *fb;
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:27:12
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/mvc
Modified Files:
ewl_mvc_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/mvc/ewl_mvc_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_mvc_test.c 6 May 2008 20:18:55 -0000 1.4
+++ ewl_mvc_test.c 7 May 2008 13:38:18 -0000 1.5
@@ -48,72 +48,72 @@
static int insert_range_overlap_old_covers_new(char *buf, int len);
static int ewl_mvc_is_index(char *buf, int len, Ewl_Selection *sel,
- int row, int column);
+ int row, int column);
static int ewl_mvc_is_range(char *buf, int len, Ewl_Selection *sel,
- int srow, int scolumn,
- int erow, int ecolumn);
+ int srow, int scolumn,
+ int erow, int ecolumn);
static Ewl_Unit_Test mvc_unit_tests[] = {
- {"Set selected", selected_set, NULL, -1, 0},
- {"Get selected", selected_get, NULL, -1, 0},
- {"Range (single select) add", selected_range_single_add, NULL, -1, 0},
- {"Range (multi select) add", selected_range_multi_add, NULL, -1, 0},
- {"Count get", selected_count_get, NULL, -1, 0},
- {"Is selected (index)", selected_is_index, NULL, -1, 0},
- {"Is not selected (index)", selected_is_not_index, NULL, -1, 0},
- {"Is selected (range)", selected_is_range, NULL, -1, 0},
- {"Is not selected (range)", selected_is_not_range, NULL, -1, 0},
- {"Selected clear", selected_clear, NULL, -1, 0},
-
- {"Remove index", selected_rm_idx, NULL, -1, 0},
- {"Remove non-selected index", selected_rm_unselected_idx, NULL, -1, 0},
- {"Remove bottom from 2x1", selected_rm_2x1_bottom, NULL, -1, 0},
- {"Remove top from 2x1", selected_rm_2x1_top, NULL, -1, 0},
- {"Remove left from 1x2", selected_rm_1x2_left, NULL, -1, 0},
- {"Remove right from 1x2", selected_rm_1x2_right, NULL, -1, 0},
- {"Remove from range, top left point",
- selected_rm_from_range_top_left_point, NULL, -1, 0},
- {"Remove from range, bottom right point",
- selected_rm_from_range_bottom_right_point, NULL, -1, 0},
- {"Remove from range, middle point",
- selected_rm_from_range_middle_point, NULL, -1, 0},
- {"Remove from range, left edge",
- selected_rm_from_range_left_edge_point, NULL, -1, 0},
- {"Remove from range, right edge",
- selected_rm_from_range_right_edge_point, NULL, -1, 0},
- {"Remove from range, top edge",
- selected_rm_from_range_top_edge_point, NULL, -1, 0},
- {"Remove from range, bottom edge",
- selected_rm_from_range_bottom_edge_point, NULL, -1, 0},
-
- {"Insert range no intersection",
- insert_range_no_intersection, NULL, -1, 0},
- {"Insert range top intersection",
- insert_range_top_intersection, NULL, -1, 0},
- {"Insert range bottom intersection",
- insert_range_bottom_intersection, NULL, -1, 0},
- {"Insert range left intersection",
- insert_range_left_intersection, NULL, -1, 0},
- {"Insert range right intersection",
- insert_range_right_intersection, NULL, -1, 0},
- {"Insert range intersect, top left corner",
- insert_range_top_left_intersection, NULL, -1, 0},
- {"Insert range intersect, top right corner",
- insert_range_top_right_intersection, NULL, -1, 0},
- {"Insert range intersect, bottom left corner",
- insert_range_bottom_left_intersection, NULL, -1, 0},
- {"Insert range intersect, bottom right corner",
- insert_range_bottom_right_intersection, NULL, -1, 0},
- {"Insert range intersect, overlap horizontal",
- insert_range_overlap_horizontal, NULL, -1, 0},
- {"Insert range intersect, overlap vertical",
- insert_range_overlap_vertical, NULL, -1, 0},
- {"Insert range intersect, new covers old",
- insert_range_overlap_new_covers_old, NULL, -1, 0},
- {"Insert range intersect, old covers new",
- insert_range_overlap_old_covers_new, NULL, -1, 0},
+ {"Set selected", selected_set, NULL, -1, 0},
+ {"Get selected", selected_get, NULL, -1, 0},
+ {"Range (single select) add", selected_range_single_add, NULL, -1, 0},
+ {"Range (multi select) add", selected_range_multi_add, NULL, -1, 0},
+ {"Count get", selected_count_get, NULL, -1, 0},
+ {"Is selected (index)", selected_is_index, NULL, -1, 0},
+ {"Is not selected (index)", selected_is_not_index, NULL, -1, 0},
+ {"Is selected (range)", selected_is_range, NULL, -1, 0},
+ {"Is not selected (range)", selected_is_not_range, NULL, -1, 0},
+ {"Selected clear", selected_clear, NULL, -1, 0},
+
+ {"Remove index", selected_rm_idx, NULL, -1, 0},
+ {"Remove non-selected index", selected_rm_unselected_idx, NULL, -1, 0},
+ {"Remove bottom from 2x1", selected_rm_2x1_bottom, NULL, -1, 0},
+ {"Remove top from 2x1", selected_rm_2x1_top, NULL, -1, 0},
+ {"Remove left from 1x2", selected_rm_1x2_left, NULL, -1, 0},
+ {"Remove right from 1x2", selected_rm_1x2_right, NULL, -1, 0},
+ {"Remove from range, top left point",
+ selected_rm_from_range_top_left_point, NULL, -1, 0},
+ {"Remove from range, bottom right point",
+ selected_rm_from_range_bottom_right_point, NULL, -1, 0},
+ {"Remove from range, middle point",
+ selected_rm_from_range_middle_point, NULL, -1, 0},
+ {"Remove from range, left edge",
+ selected_rm_from_range_left_edge_point, NULL, -1, 0},
+ {"Remove from range, right edge",
+ selected_rm_from_range_right_edge_point, NULL, -1, 0},
+ {"Remove from range, top edge",
+ selected_rm_from_range_top_edge_point, NULL, -1, 0},
+ {"Remove from range, bottom edge",
+ selected_rm_from_range_bottom_edge_point, NULL, -1, 0},
+
+ {"Insert range no intersection",
+ insert_range_no_intersection, NULL, -1, 0},
+ {"Insert range top intersection",
+ insert_range_top_intersection, NULL, -1, 0},
+ {"Insert range bottom intersection",
+ insert_range_bottom_intersection, NULL, -1, 0},
+ {"Insert range left intersection",
+ insert_range_left_intersection, NULL, -1, 0},
+ {"Insert range right intersection",
+ insert_range_right_intersection, NULL, -1, 0},
+ {"Insert range intersect, top left corner",
+ insert_range_top_left_intersection, NULL, -1, 0},
+ {"Insert range intersect, top right corner",
+ insert_range_top_right_intersection, NULL, -1, 0},
+ {"Insert range intersect, bottom left corner",
+ insert_range_bottom_left_intersection, NULL, -1, 0},
+ {"Insert range intersect, bottom right corner",
+ insert_range_bottom_right_intersection, NULL, -1, 0},
+ {"Insert range intersect, overlap horizontal",
+ insert_range_overlap_horizontal, NULL, -1, 0},
+ {"Insert range intersect, overlap vertical",
+ insert_range_overlap_vertical, NULL, -1, 0},
+ {"Insert range intersect, new covers old",
+ insert_range_overlap_new_covers_old, NULL, -1, 0},
+ {"Insert range intersect, old covers new",
+ insert_range_overlap_old_covers_new, NULL, -1, 0},
- {NULL, NULL, NULL, -1, 0}
+ {NULL, NULL, NULL, -1, 0}
};
void
@@ -141,15 +141,15 @@
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
{
- LOG_FAILURE(buf, len, "Incorrect selection type");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect selection type");
+ return FALSE;
}
if ((idx->row != 1) || (idx->column != 2))
{
- LOG_FAILURE(buf, len, "Incorrect row/column setting: "
- "(%d %d) vs (1, 2)", idx->row, idx->column);
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect row/column setting: "
+ "(%d %d) vs (1, 2)", idx->row, idx->column);
+ return FALSE;
}
return TRUE;
@@ -173,15 +173,15 @@
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
{
- LOG_FAILURE(buf, len, "Incorrect selection type");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect selection type");
+ return FALSE;
}
if ((idx->row != 1) || (idx->column != 2))
{
- LOG_FAILURE(buf, len, "Incorrect row/column setting "
- "(%d %d) instead of (1, 2)", idx->row, idx->column);
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect row/column setting "
+ "(%d %d) instead of (1, 2)", idx->row, idx->column);
+ return FALSE;
}
return TRUE;
@@ -202,14 +202,14 @@
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
{
- LOG_FAILURE(buf, len, "Incorrect selection type");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect selection type");
+ return FALSE;
}
if ((idx->row != 1) || (idx->column != 2))
{
- LOG_FAILURE(buf, len, "Incorrect start row/column setting");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect start row/column setting");
+ return FALSE;
}
return TRUE;
@@ -231,26 +231,26 @@
if (!idx)
{
- LOG_FAILURE(buf, len, "Returned idx is NULL");
- return FALSE;
+ LOG_FAILURE(buf, len, "Returned idx is NULL");
+ return FALSE;
}
if (idx->sel.type != EWL_SELECTION_TYPE_RANGE)
{
- LOG_FAILURE(buf, len, "Incorrect selection type");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect selection type");
+ return FALSE;
}
if ((idx->start.row != 1) || (idx->start.column != 2))
{
- LOG_FAILURE(buf, len, "Incorrect start row/column setting");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect start row/column setting");
+ return FALSE;
}
if ((idx->end.row != 6) || (idx->end.column != 8))
{
- LOG_FAILURE(buf, len, "Incorrect end row/column setting");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect end row/column setting");
+ return FALSE;
}
return TRUE;
@@ -276,9 +276,9 @@
count = ewl_mvc_selected_count_get(m);
if (count != expected)
{
- LOG_FAILURE(buf, len, "Incorrect count (%d instead of %d)",
- count, expected);
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect count (%d instead of %d)",
+ count, expected);
+ return FALSE;
}
return TRUE;
@@ -297,8 +297,8 @@
if (!ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 8))
{
- LOG_FAILURE(buf, len, "Not selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Not selected");
+ return FALSE;
}
return TRUE;
@@ -317,8 +317,8 @@
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 7, 7))
{
- LOG_FAILURE(buf, len, "Item selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Item selected");
+ return FALSE;
}
return TRUE;
@@ -338,8 +338,8 @@
if (!ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 5))
{
- LOG_FAILURE(buf, len, "Not selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Not selected");
+ return FALSE;
}
return TRUE;
@@ -359,8 +359,8 @@
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
{
- LOG_FAILURE(buf, len, "Item selected selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Item selected selected");
+ return FALSE;
}
return TRUE;
@@ -385,8 +385,8 @@
if (ewl_mvc_selected_count_get(m) != 0)
{
- LOG_FAILURE(buf, len, "Selected list not empty.");
- return FALSE;
+ LOG_FAILURE(buf, len, "Selected list not empty.");
+ return FALSE;
}
return TRUE;
@@ -411,8 +411,8 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 9, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 9, 1))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
return TRUE;
@@ -437,8 +437,8 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 10, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 10, 2))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
return TRUE;
@@ -473,21 +473,21 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 2, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 2, 1))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
count = ewl_mvc_selected_count_get(m);
if (count != 1)
{
- LOG_FAILURE(buf, len, "Selected items is %d instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "Selected items is %d instead of 1", count);
+ return FALSE;
}
sel = ecore_list_first_goto(m->selected);
if (!ewl_mvc_is_index(buf, len, sel, 1, 1))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -516,21 +516,21 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
count = ewl_mvc_selected_count_get(m);
if (count != 1)
{
- LOG_FAILURE(buf, len, "Selected items is %d instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "Selected items is %d instead of 1", count);
+ return FALSE;
}
sel = ecore_list_first_goto(m->selected);
if (!ewl_mvc_is_index(buf, len, sel, 2, 1))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -556,20 +556,20 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 1);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 1)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items");
+ return FALSE;
}
sel = ecore_list_first_goto(m->selected);
if (!ewl_mvc_is_index(buf, len, sel, 1, 2))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -595,20 +595,20 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 2))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 1)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items");
+ return FALSE;
}
sel = ecore_list_first_goto(m->selected);
if (!ewl_mvc_is_index(buf, len, sel, 1, 1))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -635,24 +635,24 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 2))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 41)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
- ewl_mvc_selected_count_get(m));
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
+ ewl_mvc_selected_count_get(m));
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 2, 2, 6, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 1, 3, 1, 8))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -679,24 +679,24 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 6, 8);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 8))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 41)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
- ewl_mvc_selected_count_get(m));
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
+ ewl_mvc_selected_count_get(m));
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 5, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 6, 2, 6, 7))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -724,32 +724,32 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 4, 5);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 5))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 41)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
- ewl_mvc_selected_count_get(m));
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
+ ewl_mvc_selected_count_get(m));
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 3, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 4, 2, 6, 4))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 5, 5, 6, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 3);
if (!ewl_mvc_is_range(buf, len, sel, 4, 6, 4, 8))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -777,28 +777,28 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 4, 2);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 2))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 41)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
- ewl_mvc_selected_count_get(m));
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
+ ewl_mvc_selected_count_get(m));
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 3, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 5, 2, 6, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 4, 3, 4, 8))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -826,28 +826,28 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 3, 8);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 3, 8))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 41)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
- ewl_mvc_selected_count_get(m));
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
+ ewl_mvc_selected_count_get(m));
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 2, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 3, 2, 6, 7))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 4, 8, 6, 8))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -875,28 +875,28 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 5);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 5))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 41)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
- ewl_mvc_selected_count_get(m));
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
+ ewl_mvc_selected_count_get(m));
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 6, 4))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 2, 5, 6, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 1, 6, 1, 8))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -924,31 +924,31 @@
ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 6, 3);
if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 3))
{
- LOG_FAILURE(buf, len, "Index still selected");
- return FALSE;
+ LOG_FAILURE(buf, len, "Index still selected");
+ return FALSE;
}
if (ewl_mvc_selected_count_get(m) != 41)
{
- LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
- ewl_mvc_selected_count_get(m));
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect number of selected items: %d",
+ ewl_mvc_selected_count_get(m));
+ return FALSE;
}
/* should have 3 ranges: [(1,2)(5,8)]
- [(2,6)]
- [(6,4)(6,8)] */
+ [(2,6)]
+ [(6,4)(6,8)] */
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 5, 8))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_index(buf, len, sel, 6, 2))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 6, 4, 6, 8))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -980,11 +980,11 @@
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 3, 3))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 4, 4, 6, 6))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1014,13 +1014,13 @@
count = ecore_list_count(m->selected);
if (count != 1)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 7, 3))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1050,13 +1050,13 @@
count = ecore_list_count(m->selected);
if (count != 1)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 7, 3))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1084,13 +1084,13 @@
count = ecore_list_count(m->selected);
if (count != 1)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 3, 5))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1118,13 +1118,13 @@
count = ecore_list_count(m->selected);
if (count != 1)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 3, 5))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1155,21 +1155,21 @@
count = ecore_list_count(m->selected);
if (count != 3)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 6, 3, 7, 7))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 3, 6, 5, 7))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 5, 5))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1200,21 +1200,21 @@
count = ecore_list_count(m->selected);
if (count != 3)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 3, 1, 5, 1))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 5, 2, 5, 3))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 4, 5))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1245,21 +1245,21 @@
count = ecore_list_count(m->selected);
if (count != 3)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 2, 2, 5))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 3, 4, 4, 5))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 3, 1, 5, 3))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1290,21 +1290,21 @@
count = ecore_list_count(m->selected);
if (count != 3)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 2, 5))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 3, 1, 5, 2))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 3, 3, 7, 7))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1337,21 +1337,21 @@
count = ecore_list_count(m->selected);
if (count != 3)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 3, 1, 5, 2))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 3, 6, 5, 9))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 1, 3, 7, 5))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1384,21 +1384,21 @@
count = ecore_list_count(m->selected);
if (count != 3)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 3", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 3, 2, 5))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 1);
if (!ewl_mvc_is_range(buf, len, sel, 6, 3, 7, 5))
- return FALSE;
+ return FALSE;
sel = ecore_list_index_goto(m->selected, 2);
if (!ewl_mvc_is_range(buf, len, sel, 3, 1, 5, 9))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1429,13 +1429,13 @@
count = ecore_list_count(m->selected);
if (count != 1)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 9, 9))
- return FALSE;
+ return FALSE;
return TRUE;
}
@@ -1466,37 +1466,37 @@
count = ecore_list_count(m->selected);
if (count != 1)
{
- LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
- return FALSE;
+ LOG_FAILURE(buf, len, "%d items in list instead of 1", count);
+ return FALSE;
}
sel = ecore_list_index_goto(m->selected, 0);
if (!ewl_mvc_is_range(buf, len, sel, 1, 1, 9, 9))
- return FALSE;
+ return FALSE;
return TRUE;
}
static int
ewl_mvc_is_index(char *buf, int len, Ewl_Selection *sel,
- int row, int column)
+ int row, int column)
{
Ewl_Selection_Idx *idx;
if (sel->type != EWL_SELECTION_TYPE_INDEX)
{
- LOG_FAILURE(buf, len, "Incorrect selection type");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect selection type");
+ return FALSE;
}
idx = EWL_SELECTION_IDX(sel);
if (((int)idx->row != row) || ((int)idx->column != column))
{
- LOG_FAILURE(buf, len, "Incorrect indices in index "
- "([%d %d] vs [%d %d])",
- idx->row, idx->column,
- row, column);
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect indices in index "
+ "([%d %d] vs [%d %d])",
+ idx->row, idx->column,
+ row, column);
+ return FALSE;
}
return TRUE;
@@ -1504,34 +1504,34 @@
static int
ewl_mvc_is_range(char *buf, int len, Ewl_Selection *sel,
- int srow, int scolumn,
- int erow, int ecolumn)
+ int srow, int scolumn,
+ int erow, int ecolumn)
{
Ewl_Selection_Range *rng;
if (sel->type != EWL_SELECTION_TYPE_RANGE)
{
- LOG_FAILURE(buf, len, "Incorrect selection type");
- return FALSE;
+ LOG_FAILURE(buf, len, "Incorrect selection type");
+ return FALSE;
}
rng = EWL_SELECTION_RANGE(sel);
if (((int)rng->start.row != srow) || ((int)rng->start.column != scolumn))
{
- LOG_FAILURE(buf, len, "Start row/column incorrect "
- "([%d %d] vs [%d %d])",
- rng->start.row, rng->start.column,
- srow, scolumn);
- return FALSE;
+ LOG_FAILURE(buf, len, "Start row/column incorrect "
+ "([%d %d] vs [%d %d])",
+ rng->start.row, rng->start.column,
+ srow, scolumn);
+ return FALSE;
}
if (((int)rng->end.row != erow) || ((int)rng->end.column != ecolumn))
{
- LOG_FAILURE(buf, len, "End row/column incorrect "
- "([%d %d] vs [%d %d])",
- rng->end.row, rng->end.column,
- erow, ecolumn);
- return FALSE;
+ LOG_FAILURE(buf, len, "End row/column incorrect "
+ "([%d %d] vs [%d %d])",
+ rng->end.row, rng->end.column,
+ erow, ecolumn);
+ return FALSE;
}
return TRUE;
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:28:10
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/password
Modified Files:
ewl_password_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/password/ewl_password_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_password_test.c 6 May 2008 20:18:55 -0000 1.6
+++ ewl_password_test.c 7 May 2008 13:38:19 -0000 1.7
@@ -18,7 +18,7 @@
{
test->name = "Password";
test->tip = "Defines the Ewl_Password class to allow\n"
- "for single line obscured text.";
+ "for single line obscured text.";
test->filename = __FILE__;
test->func = create_test;
test->type = EWL_TEST_TYPE_SIMPLE;
@@ -34,9 +34,9 @@
ewl_object_padding_set(EWL_OBJECT(password[0]), 5, 5, 5, 0);
ewl_container_child_append(box, password[0]);
ewl_callback_append(password[0], EWL_CALLBACK_VALUE_CHANGED,
- cb_fetch_password_text, NULL);
+ cb_fetch_password_text, NULL);
ewl_object_fill_policy_set(EWL_OBJECT(password[0]),
- EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
+ EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
ewl_widget_show(password[0]);
password[1] = ewl_password_new();
@@ -46,9 +46,9 @@
ewl_object_padding_set(EWL_OBJECT(password[1]), 5, 5, 0, 0);
ewl_container_child_append(box, password[1]);
ewl_callback_append(password[1], EWL_CALLBACK_VALUE_CHANGED,
- cb_fetch_password_text, NULL);
+ cb_fetch_password_text, NULL);
ewl_object_fill_policy_set(EWL_OBJECT(password[1]),
- EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
+ EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
ewl_widget_show(password[1]);
password[2] = ewl_password_new();
@@ -57,9 +57,9 @@
ewl_object_padding_set(EWL_OBJECT(password[2]), 5, 5, 0, 0);
ewl_container_child_append(box, password[2]);
ewl_callback_append(password[2], EWL_CALLBACK_VALUE_CHANGED,
- cb_fetch_password_text, NULL);
+ cb_fetch_password_text, NULL);
ewl_object_fill_policy_set(EWL_OBJECT(password[2]),
- EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
+ EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
ewl_widget_show(password[2]);
button_hbox = ewl_hbox_new();
@@ -73,7 +73,7 @@
ewl_button_label_set(EWL_BUTTON(button[0]), "Fetch text");
ewl_container_child_append(EWL_CONTAINER(button_hbox), button[0]);
ewl_callback_append(button[0], EWL_CALLBACK_CLICKED,
- cb_fetch_password_text, NULL);
+ cb_fetch_password_text, NULL);
ewl_object_fill_policy_set(EWL_OBJECT(button[0]), EWL_FLAG_FILL_NONE);
ewl_object_alignment_set(EWL_OBJECT(button[0]), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(button[0]);
@@ -82,7 +82,7 @@
ewl_button_label_set(EWL_BUTTON(button[1]), "Set Text");
ewl_container_child_append(EWL_CONTAINER(button_hbox), button[1]);
ewl_callback_append(button[1], EWL_CALLBACK_CLICKED,
- cb_set_password_text, NULL);
+ cb_set_password_text, NULL);
ewl_object_fill_policy_set(EWL_OBJECT(button[1]), EWL_FLAG_FILL_NONE);
ewl_object_alignment_set(EWL_OBJECT(button[1]), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(button[1]);
@@ -92,7 +92,7 @@
static void
cb_fetch_password_text(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
char *s;
@@ -111,7 +111,7 @@
static void
cb_set_password_text(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
ewl_text_text_set(EWL_TEXT(password[0]), "Play with me ?");
ewl_text_text_set(EWL_TEXT(password[1]), "E W L ! ! !");
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:28:43
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/paned
Modified Files:
ewl_paned_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/paned/ewl_paned_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_paned_test.c 6 May 2008 20:18:55 -0000 1.6
+++ ewl_paned_test.c 7 May 2008 13:38:18 -0000 1.7
@@ -8,7 +8,7 @@
static int create_test(Ewl_Container *box);
static void ewl_paned_test_cb_clicked_destroy(Ewl_Widget *w, void *ev,
- void *data);
+ void *data);
static void ewl_paned_test_cb_clicked(Ewl_Widget *w, void *ev, void *data);
static void ewl_paned_test_cb_add(Ewl_Widget *w, void *ev, void *data);
@@ -21,13 +21,13 @@
static int fixed_size_unset_get(char *buf, int len);
static Ewl_Unit_Test paned_unit_tests[] = {
- {"get initial size", initial_size_get, NULL, -1, 0},
- {"get unset initial size", initial_size_unset_get, NULL, -1, 0},
- {"get initial size after remove", initial_size_after_remove_get, NULL, -1, 0},
- {"get initial size for many widgets", initial_size_many_get, NULL, -1, 0},
- {"get the fixed size flag", fixed_size_get, NULL, -1, 0},
- {"get the unset fixed size flag", fixed_size_unset_get, NULL, -1, 0},
- {NULL, NULL, NULL, -1, 0}
+ {"get initial size", initial_size_get, NULL, -1, 0},
+ {"get unset initial size", initial_size_unset_get, NULL, -1, 0},
+ {"get initial size after remove", initial_size_after_remove_get, NULL, -1, 0},
+ {"get initial size for many widgets", initial_size_many_get, NULL, -1, 0},
+ {"get the fixed size flag", fixed_size_get, NULL, -1, 0},
+ {"get the unset fixed size flag", fixed_size_unset_get, NULL, -1, 0},
+ {NULL, NULL, NULL, -1, 0}
};
void
@@ -59,25 +59,25 @@
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_FILL);
ewl_container_child_append(EWL_CONTAINER(pane2), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked, "Fill");
+ ewl_paned_test_cb_clicked, "Fill");
ewl_widget_show(o);
o = ewl_button_new();
ewl_button_label_set(EWL_BUTTON(o), "HFill | VShrink");
ewl_object_fill_policy_set(EWL_OBJECT(o),
- EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
+ EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
ewl_container_child_append(EWL_CONTAINER(pane2), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked, "HFill | VShrink");
+ ewl_paned_test_cb_clicked, "HFill | VShrink");
ewl_widget_show(o);
o = ewl_button_new();
ewl_button_label_set(EWL_BUTTON(o), "HShrink | VFill");
ewl_object_fill_policy_set(EWL_OBJECT(o),
- EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_VFILL);
+ EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_VFILL);
ewl_container_child_append(EWL_CONTAINER(pane2), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked, "HShrink | VFill");
+ ewl_paned_test_cb_clicked, "HShrink | VFill");
ewl_widget_show(o);
o = ewl_button_new();
@@ -85,7 +85,7 @@
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
ewl_container_child_append(EWL_CONTAINER(pane2), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked, "Shrink");
+ ewl_paned_test_cb_clicked, "Shrink");
ewl_widget_show(o);
pane3 = ewl_hpaned_new();
@@ -96,10 +96,10 @@
ewl_button_label_set(EWL_BUTTON(o), "Left Top");
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
ewl_object_alignment_set(EWL_OBJECT(o),
- EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP);
+ EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP);
ewl_container_child_append(EWL_CONTAINER(pane3), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked, "Left Top");
+ ewl_paned_test_cb_clicked, "Left Top");
ewl_widget_show(o);
o = ewl_button_new();
@@ -108,23 +108,23 @@
ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(pane3), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked, "Center");
+ ewl_paned_test_cb_clicked, "Center");
ewl_widget_show(o);
o = ewl_button_new();
ewl_button_label_set(EWL_BUTTON(o), "Right Bottom");
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
ewl_object_alignment_set(EWL_OBJECT(o),
- EWL_FLAG_ALIGN_RIGHT | EWL_FLAG_ALIGN_BOTTOM);
+ EWL_FLAG_ALIGN_RIGHT | EWL_FLAG_ALIGN_BOTTOM);
ewl_container_child_append(EWL_CONTAINER(pane3), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked, "Right Bottom");
+ ewl_paned_test_cb_clicked, "Right Bottom");
ewl_widget_show(o);
pbox = ewl_hbox_new();
ewl_container_child_append(EWL_CONTAINER(pane1), pbox);
ewl_object_fill_policy_set(EWL_OBJECT(pbox),
- EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_NONE);
+ EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_NONE);
ewl_widget_show(pbox);
o = ewl_button_new();
@@ -144,7 +144,7 @@
static void
ewl_paned_test_cb_clicked(Ewl_Widget *w, void *ev __UNUSED__,
- void *data)
+ void *data)
{
printf("Clicked %s\n", (char *)data);
ewl_widget_hide(w);
@@ -152,7 +152,7 @@
static void
ewl_paned_test_cb_clicked_destroy(Ewl_Widget *w, void *ev __UNUSED__,
- void *data)
+ void *data)
{
printf("Destroy Clicked %s\n", (char *)data);
ewl_widget_destroy(w);
@@ -160,7 +160,7 @@
static void
ewl_paned_test_cb_add(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data)
+ void *data)
{
Ewl_Widget *o;
Ewl_Paned *p;
@@ -172,7 +172,7 @@
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
ewl_container_child_append(EWL_CONTAINER(p), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_paned_test_cb_clicked_destroy, "New Button");
+ ewl_paned_test_cb_clicked_destroy, "New Button");
ewl_widget_show(o);
}
@@ -192,8 +192,8 @@
val = ewl_paned_initial_size_get(EWL_PANED(paned), child);
if (val != 240) {
- LOG_FAILURE(buf, len, "get value is different from the set one");
- ret = 0;
+ LOG_FAILURE(buf, len, "get value is different from the set one");
+ ret = 0;
}
ewl_widget_destroy(paned);
@@ -216,8 +216,8 @@
val = ewl_paned_initial_size_get(EWL_PANED(paned), child);
if (val != 0) {
- LOG_FAILURE(buf, len, "get value is not 0");
- ret = 0;
+ LOG_FAILURE(buf, len, "get value is not 0");
+ ret = 0;
}
ewl_widget_destroy(paned);
@@ -243,8 +243,8 @@
val = ewl_paned_initial_size_get(EWL_PANED(paned), child);
if (val != 0) {
- LOG_FAILURE(buf, len, "get value is not zero");
- ret = 0;
+ LOG_FAILURE(buf, len, "get value is not zero");
+ ret = 0;
}
ewl_widget_destroy(child);
@@ -265,20 +265,20 @@
/* build the children and set the initial size for them */
for (i = 0; i < 4; i++) {
- w[i] = ewl_cell_new();
- ewl_container_child_append(EWL_CONTAINER(paned), w[i]);
- ewl_paned_initial_size_set(EWL_PANED(paned), w[i], 240 + i);
+ w[i] = ewl_cell_new();
+ ewl_container_child_append(EWL_CONTAINER(paned), w[i]);
+ ewl_paned_initial_size_set(EWL_PANED(paned), w[i], 240 + i);
}
/* now check the set values */
for (i = 0; i < 4; i++) {
- int val = ewl_paned_initial_size_get(EWL_PANED(paned), w[i]);
+ int val = ewl_paned_initial_size_get(EWL_PANED(paned), w[i]);
- if (val != 240 + i) {
- LOG_FAILURE(buf, len, "get value is not zero");
- ret = 0;
- break;
- }
+ if (val != 240 + i) {
+ LOG_FAILURE(buf, len, "get value is not zero");
+ ret = 0;
+ break;
+ }
}
ewl_widget_destroy(paned);
@@ -302,8 +302,8 @@
val = ewl_paned_fixed_size_get(EWL_PANED(paned), child);
if (!val) {
- LOG_FAILURE(buf, len, "get value is different from the set one");
- ret = 0;
+ LOG_FAILURE(buf, len, "get value is different from the set one");
+ ret = 0;
}
ewl_widget_destroy(paned);
@@ -326,8 +326,8 @@
val = ewl_paned_fixed_size_get(EWL_PANED(paned), child);
if (val) {
- LOG_FAILURE(buf, len, "get value is not FALSE");
- ret = 0;
+ LOG_FAILURE(buf, len, "get value is not FALSE");
+ ret = 0;
}
ewl_widget_destroy(paned);
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:28:54
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/media
Modified Files:
ewl_media_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/media/ewl_media_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_media_test.c 6 May 2008 20:18:54 -0000 1.4
+++ ewl_media_test.c 7 May 2008 13:38:17 -0000 1.5
@@ -57,22 +57,22 @@
if (!ewl_media_is_available())
{
- o = ewl_label_new();
- ewl_label_text_set(EWL_LABEL(o),
- "Ewl_Media is not available. "
- "Please install Emotion "
- "and rebuild Ewl.");
- ewl_container_child_append(box, o);
- ewl_widget_show(o);
+ o = ewl_label_new();
+ ewl_label_text_set(EWL_LABEL(o),
+ "Ewl_Media is not available. "
+ "Please install Emotion "
+ "and rebuild Ewl.");
+ ewl_container_child_append(box, o);
+ ewl_widget_show(o);
- return 1;
+ return 1;
}
o = ewl_radiobutton_new();
ewl_button_label_set(EWL_BUTTON(o), "Gstreamer");
ewl_container_child_append(box, o);
ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED,
- cb_gstreamer_change, NULL);
+ cb_gstreamer_change, NULL);
ewl_widget_show(o);
o2 = ewl_radiobutton_new();
@@ -81,7 +81,7 @@
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(o2), TRUE);
ewl_container_child_append(box, o2);
ewl_callback_append(o2, EWL_CALLBACK_VALUE_CHANGED,
- cb_xine_change, NULL);
+ cb_xine_change, NULL);
ewl_widget_show(o2);
module_type = EWL_MEDIA_MODULE_XINE;
@@ -97,14 +97,14 @@
static void
cb_gstreamer_change(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
module_type = EWL_MEDIA_MODULE_GSTREAMER;
}
static void
cb_xine_change(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
module_type = EWL_MEDIA_MODULE_XINE;
}
@@ -123,21 +123,21 @@
static void
play_cb(Ewl_Widget *w __UNUSED__, void *event __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
ewl_media_play_set(EWL_MEDIA(video), 1);
}
static void
stop_cb(Ewl_Widget *w __UNUSED__, void *event __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
ewl_media_play_set(EWL_MEDIA(video), 0);
}
static void
ff_cb(Ewl_Widget *w __UNUSED__, void *event __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
double p;
@@ -147,7 +147,7 @@
static void
rew_cb(Ewl_Widget *w __UNUSED__, void *event __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
double p;
@@ -175,13 +175,13 @@
static void
seeker_move_cb(Ewl_Widget *w __UNUSED__, void *event __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
double val;
val = ewl_range_value_get(EWL_RANGE(seeker));
if (ewl_media_seekable_get(EWL_MEDIA(video)))
- ewl_media_position_set(EWL_MEDIA(video), val);
+ ewl_media_position_set(EWL_MEDIA(video), val);
}
static void
@@ -194,26 +194,26 @@
e = event;
if (e->response == EWL_STOCK_OK)
{
- int len;
- char *file = NULL;
+ int len;
+ char *file = NULL;
- file = ewl_filedialog_selected_file_get(EWL_FILEDIALOG(w));
- ewl_media_media_set(EWL_MEDIA(video), file);
- if (file) free(file);
+ file = ewl_filedialog_selected_file_get(EWL_FILEDIALOG(w));
+ ewl_media_media_set(EWL_MEDIA(video), file);
+ if (file) free(file);
- len = ewl_media_length_get(EWL_MEDIA(video));
- ewl_range_maximum_value_set(EWL_RANGE(seeker), len);
+ len = ewl_media_length_get(EWL_MEDIA(video));
+ ewl_range_maximum_value_set(EWL_RANGE(seeker), len);
}
}
static void
open_cb(Ewl_Widget *w __UNUSED__, void *event __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
if (!fd_win)
{
- fd_win = ewl_filedialog_new();
- ewl_callback_append(fd_win, EWL_CALLBACK_VALUE_CHANGED, open_file_cb, NULL);
+ fd_win = ewl_filedialog_new();
+ ewl_callback_append(fd_win, EWL_CALLBACK_VALUE_CHANGED, open_file_cb, NULL);
}
ewl_widget_show(fd_win);
@@ -225,13 +225,13 @@
Ewl_Event_Key *e = event;
if (!strcmp(e->keyname, "p"))
- ewl_media_play_set(EWL_MEDIA(video), 1);
+ ewl_media_play_set(EWL_MEDIA(video), 1);
else if (!strcmp(e->keyname, "s"))
- ewl_media_play_set(EWL_MEDIA(video), 0);
+ ewl_media_play_set(EWL_MEDIA(video), 0);
else if (!strcmp(e->keyname, "q"))
- del_cb(w, event, data);
+ del_cb(w, event, data);
}
static void
@@ -271,7 +271,7 @@
/* box to contain contols and scrollers */
controls = ewl_vbox_new();
ewl_object_fill_policy_set(EWL_OBJECT(controls),
- EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HFILL);
+ EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HFILL);
ewl_container_child_append(EWL_CONTAINER(b), controls);
ewl_widget_show(controls);
@@ -281,24 +281,24 @@
ewl_widget_show(b);
{
- Ewl_Media_Test_Control controls [] = {
- { EWL_STOCK_PLAY, play_cb },
- { EWL_STOCK_STOP, stop_cb },
- { EWL_STOCK_REWIND, rew_cb },
- { EWL_STOCK_FASTFORWARD, ff_cb },
- { EWL_STOCK_OPEN, open_cb },
- { EWL_STOCK_NONE, NULL }
- };
- int i;
-
- for(i = 0; controls[i].name != EWL_STOCK_NONE; i++) {
- o = ewl_button_new();
- ewl_stock_type_set(EWL_STOCK(o), controls[i].name);
- ewl_container_child_append(EWL_CONTAINER(b), o);
- ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- controls[i].func, NULL);
- ewl_widget_show(o);
- }
+ Ewl_Media_Test_Control controls [] = {
+ { EWL_STOCK_PLAY, play_cb },
+ { EWL_STOCK_STOP, stop_cb },
+ { EWL_STOCK_REWIND, rew_cb },
+ { EWL_STOCK_FASTFORWARD, ff_cb },
+ { EWL_STOCK_OPEN, open_cb },
+ { EWL_STOCK_NONE, NULL }
+ };
+ int i;
+
+ for(i = 0; controls[i].name != EWL_STOCK_NONE; i++) {
+ o = ewl_button_new();
+ ewl_stock_type_set(EWL_STOCK(o), controls[i].name);
+ ewl_container_child_append(EWL_CONTAINER(b), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ controls[i].func, NULL);
+ ewl_widget_show(o);
+ }
}
b = ewl_hbox_new();
@@ -309,7 +309,7 @@
seeker = ewl_hseeker_new();
ewl_container_child_append(EWL_CONTAINER(b), seeker);
ewl_object_fill_policy_set(EWL_OBJECT(seeker),
- EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HFILL);
+ EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HFILL);
ewl_range_value_set(EWL_RANGE(seeker), 0.0);
ewl_range_maximum_value_set(EWL_RANGE(seeker), 0.0);
ewl_range_step_set(EWL_RANGE(seeker), 1.0);
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:28:57
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/list
Modified Files:
ewl_list_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/list/ewl_list_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_list_test.c 6 May 2008 20:09:05 -0000 1.5
+++ ewl_list_test.c 7 May 2008 13:38:17 -0000 1.6
@@ -31,9 +31,9 @@
static void list_cb_multi_value_changed(Ewl_Widget *w, void *ev, void *data);
static Ewl_Widget *list_test_cb_widget_fetch(void *data, unsigned int row,
- unsigned int col);
+ unsigned int col);
static void *list_test_data_fetch(void *data, unsigned int row,
- unsigned int column);
+ unsigned int column);
static unsigned int list_test_data_count_get(void *data);
static void list_cb_select_none(Ewl_Widget *w, void *ev, void *data);
@@ -42,7 +42,7 @@
{
test->name = "List";
test->tip = "Defines a widget for laying out other\n"
- "widgets in a list like manner.";
+ "widgets in a list like manner.";
test->filename = __FILE__;
test->func = create_test;
test->type = EWL_TEST_TYPE_CONTAINER;
@@ -80,7 +80,7 @@
ewl_mvc_view_set(EWL_MVC(list), view);
ewl_mvc_data_set(EWL_MVC(list), str_data);
ewl_callback_append(list, EWL_CALLBACK_VALUE_CHANGED,
- list_cb_value_changed, NULL);
+ list_cb_value_changed, NULL);
ewl_widget_show(list);
/* create a list using an ecore_list of strings of labels */
@@ -98,7 +98,7 @@
ewl_mvc_data_set(EWL_MVC(list), str_data);
ewl_mvc_selection_mode_set(EWL_MVC(list), EWL_SELECTION_MODE_MULTI);
ewl_callback_append(list, EWL_CALLBACK_VALUE_CHANGED,
- list_cb_multi_value_changed, NULL);
+ list_cb_multi_value_changed, NULL);
ewl_widget_show(list);
/* Create a list from a custom array with a custom assign on the
@@ -125,7 +125,7 @@
ewl_mvc_data_set(EWL_MVC(list), data);
ewl_mvc_selection_mode_set(EWL_MVC(list), EWL_SELECTION_MODE_NONE);
ewl_callback_append(list, EWL_CALLBACK_VALUE_CHANGED,
- list_cb_select_none, NULL);
+ list_cb_select_none, NULL);
ewl_widget_show(list);
@@ -159,7 +159,7 @@
static Ewl_Widget *
list_test_cb_widget_fetch(void *data, unsigned int row __UNUSED__,
- unsigned int col __UNUSED__)
+ unsigned int col __UNUSED__)
{
Ewl_Widget *w;
List_Test_Row_Data *d;
@@ -177,7 +177,7 @@
static void *
list_test_data_fetch(void *data, unsigned int row,
- unsigned int column __UNUSED__)
+ unsigned int column __UNUSED__)
{
List_Test_Data *d;
@@ -187,8 +187,8 @@
* normal app */
if (row >= d->count)
{
- printf("Asking for too many rows\n");
- return NULL;
+ printf("Asking for too many rows\n");
+ return NULL;
}
return d->rows[row];
@@ -206,7 +206,7 @@
static void
list_cb_value_changed(Ewl_Widget *w, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
Ewl_List *list;
Ecore_List *el;
@@ -218,12 +218,12 @@
ecore_list_index_goto(el, idx->row);
printf("Selected (%d) (%s)\n", idx->row,
- (char *)ecore_list_current(el));
+ (char *)ecore_list_current(el));
}
static void
list_cb_multi_value_changed(Ewl_Widget *w, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
Ecore_List *selected, *el;
Ewl_Selection *sel;
@@ -236,34 +236,34 @@
ecore_list_first_goto(selected);
while ((sel = ecore_list_next(selected)))
{
- if (sel->type == EWL_SELECTION_TYPE_INDEX)
- {
- Ewl_Selection_Idx *idx;
-
- idx = EWL_SELECTION_IDX(sel);
- ecore_list_index_goto(el, idx->row);
- printf(" %d (%s)\n", idx->row,
- (char *)ecore_list_current(el));
- }
- else
- {
- Ewl_Selection_Range *idx;
- unsigned int i;
-
- idx = EWL_SELECTION_RANGE(sel);
- for (i = idx->start.row; i <= idx->end.row; i++)
- {
- ecore_list_index_goto(el, i);
- printf(" %d (%s)\n", i,
- (char *)ecore_list_current(el));
- }
- }
+ if (sel->type == EWL_SELECTION_TYPE_INDEX)
+ {
+ Ewl_Selection_Idx *idx;
+
+ idx = EWL_SELECTION_IDX(sel);
+ ecore_list_index_goto(el, idx->row);
+ printf(" %d (%s)\n", idx->row,
+ (char *)ecore_list_current(el));
+ }
+ else
+ {
+ Ewl_Selection_Range *idx;
+ unsigned int i;
+
+ idx = EWL_SELECTION_RANGE(sel);
+ for (i = idx->start.row; i <= idx->end.row; i++)
+ {
+ ecore_list_index_goto(el, i);
+ printf(" %d (%s)\n", i,
+ (char *)ecore_list_current(el));
+ }
+ }
}
}
static void
list_cb_select_none(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
printf("ERROR, shouldn't get selection changed callbacks.\n");
}
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 16:42:41
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/tooltip
Modified Files:
ewl_tooltip_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/tooltip/ewl_tooltip_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_tooltip_test.c 6 May 2008 20:18:57 -0000 1.2
+++ ewl_tooltip_test.c 7 May 2008 13:38:21 -0000 1.3
@@ -12,7 +12,7 @@
{
test->name = "Tooltip";
test->tip = "Defines a widget for displaying short\n"
- "messages after a delay.";
+ "messages after a delay.";
test->filename = __FILE__;
test->func = create_test;
test->type = EWL_TEST_TYPE_SIMPLE;
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 17:20:45
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/object
Modified Files:
ewl_object_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/object/ewl_object_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_object_test.c 6 May 2008 20:18:55 -0000 1.10
+++ ewl_object_test.c 7 May 2008 13:38:18 -0000 1.11
@@ -40,28 +40,28 @@
static int alignment_test_set_get(char *buf, int len);
static Ewl_Unit_Test object_unit_tests[] = {
- {"default properties", default_property_test, NULL, -1, 0},
- {"place center/get", place_test_center_get, NULL, -1, 0},
- {"place top/get", place_test_top_get, NULL, -1, 0},
- {"place bottom/get", place_test_bottom_get, NULL, -1, 0},
- {"place left/get", place_test_left_get, NULL, -1, 0},
- {"place right/get", place_test_right_get, NULL, -1, 0},
- {"position set/get", position_test_set_get, NULL, -1, 0},
- {"position size set/get", position_size_test_set_get, NULL, -1, 0},
- {"preferred inner size set/get", preferred_inner_size_test_set_get, NULL, -1, 0},
- {"preferred size set/get", preferred_size_test_set_get, NULL, -1, 0},
- {"minimum size set/get", minimum_size_test_set_get, NULL, -1, 0},
- {"maximum size set/get", maximum_size_test_set_get, NULL, -1, 0},
- {"minimum size set/request", minimum_size_test_set_request, NULL, -1, 0},
- {"maximum size set/request", maximum_size_test_set_request, NULL, -1, 0},
- {"padding set/get", padding_test_set_get, NULL, -1, 0},
- {"insets set/get", insets_test_set_get, NULL, -1, 0},
- {"padding set/size get", padding_test_set_size_get, NULL, -1, 0},
- {"insets set/size get", insets_test_set_size_get, NULL, -1, 0},
- {"insets padding set/size get", insets_padding_test_set_size_get, NULL, -1, 0},
- {"fill policy set/get", fill_policy_test_set_get, NULL, -1, 0},
- {"alignment set/get", alignment_test_set_get, NULL, -1, 0},
- {NULL, NULL, NULL, -1, 0}
+ {"default properties", default_property_test, NULL, -1, 0},
+ {"place center/get", place_test_center_get, NULL, -1, 0},
+ {"place top/get", place_test_top_get, NULL, -1, 0},
+ {"place bottom/get", place_test_bottom_get, NULL, -1, 0},
+ {"place left/get", place_test_left_get, NULL, -1, 0},
+ {"place right/get", place_test_right_get, NULL, -1, 0},
+ {"position set/get", position_test_set_get, NULL, -1, 0},
+ {"position size set/get", position_size_test_set_get, NULL, -1, 0},
+ {"preferred inner size set/get", preferred_inner_size_test_set_get, NULL, -1, 0},
+ {"preferred size set/get", preferred_size_test_set_get, NULL, -1, 0},
+ {"minimum size set/get", minimum_size_test_set_get, NULL, -1, 0},
+ {"maximum size set/get", maximum_size_test_set_get, NULL, -1, 0},
+ {"minimum size set/request", minimum_size_test_set_request, NULL, -1, 0},
+ {"maximum size set/request", maximum_size_test_set_request, NULL, -1, 0},
+ {"padding set/get", padding_test_set_get, NULL, -1, 0},
+ {"insets set/get", insets_test_set_get, NULL, -1, 0},
+ {"padding set/size get", padding_test_set_size_get, NULL, -1, 0},
+ {"insets set/size get", insets_test_set_size_get, NULL, -1, 0},
+ {"insets padding set/size get", insets_padding_test_set_size_get, NULL, -1, 0},
+ {"fill policy set/get", fill_policy_test_set_get, NULL, -1, 0},
+ {"alignment set/get", alignment_test_set_get, NULL, -1, 0},
+ {NULL, NULL, NULL, -1, 0}
};
void
@@ -87,85 +87,85 @@
w = ewl_widget_new();
if (ewl_object_current_x_get(EWL_OBJECT(w))) {
- LOG_FAILURE(buf, len, "x coordinate incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "x coordinate incorrect");
+ goto DONE;
}
if (ewl_object_current_y_get(EWL_OBJECT(w))) {
- LOG_FAILURE(buf, len, "y coordinate incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "y coordinate incorrect");
+ goto DONE;
}
if (ewl_object_current_w_get(EWL_OBJECT(w)) != EWL_OBJECT_MIN_SIZE) {
- LOG_FAILURE(buf, len, "current width incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "current width incorrect");
+ goto DONE;
}
if (ewl_object_current_h_get(EWL_OBJECT(w)) != EWL_OBJECT_MIN_SIZE) {
- LOG_FAILURE(buf, len, "current height incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "current height incorrect");
+ goto DONE;
}
if (ewl_object_minimum_w_get(EWL_OBJECT(w)) != EWL_OBJECT_MIN_SIZE) {
- LOG_FAILURE(buf, len, "minimum width incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "minimum width incorrect");
+ goto DONE;
}
if (ewl_object_minimum_h_get(EWL_OBJECT(w)) != EWL_OBJECT_MIN_SIZE) {
- LOG_FAILURE(buf, len, "minimum height incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "minimum height incorrect");
+ goto DONE;
}
if (ewl_object_maximum_w_get(EWL_OBJECT(w)) != EWL_OBJECT_MAX_SIZE) {
- LOG_FAILURE(buf, len, "maximum width incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "maximum width incorrect");
+ goto DONE;
}
if (ewl_object_maximum_h_get(EWL_OBJECT(w)) != EWL_OBJECT_MAX_SIZE) {
- LOG_FAILURE(buf, len, "maximum height incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "maximum height incorrect");
+ goto DONE;
}
if (ewl_object_preferred_inner_w_get(EWL_OBJECT(w))) {
- LOG_FAILURE(buf, len, "preferred inner width incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "preferred inner width incorrect");
+ goto DONE;
}
if (ewl_object_preferred_inner_h_get(EWL_OBJECT(w))) {
- LOG_FAILURE(buf, len, "preferred inner height incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "preferred inner height incorrect");
+ goto DONE;
}
if (ewl_object_preferred_w_get(EWL_OBJECT(w)) != EWL_OBJECT_MIN_SIZE) {
- LOG_FAILURE(buf, len, "preferred width incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "preferred width incorrect");
+ goto DONE;
}
if (ewl_object_preferred_h_get(EWL_OBJECT(w)) != EWL_OBJECT_MIN_SIZE) {
- LOG_FAILURE(buf, len, "preferred height incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "preferred height incorrect");
+ goto DONE;
}
ewl_object_insets_get(EWL_OBJECT(w), &l, &r, &t, &b);
if (l || r || t || b) {
- LOG_FAILURE(buf, len, "insets incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "insets incorrect");
+ goto DONE;
}
ewl_object_padding_get(EWL_OBJECT(w), &l, &r, &t, &b);
if (l || r || t || b) {
- LOG_FAILURE(buf, len, "padding incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "padding incorrect");
+ goto DONE;
}
if (ewl_object_fill_policy_get(EWL_OBJECT(w)) != EWL_FLAG_FILL_NORMAL) {
- LOG_FAILURE(buf, len, "fill policy incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "fill policy incorrect");
+ goto DONE;
}
if (ewl_object_alignment_get(EWL_OBJECT(w)) != EWL_FLAG_ALIGN_CENTER) {
- LOG_FAILURE(buf, len, "alignment incorrect");
- goto DONE;
+ LOG_FAILURE(buf, len, "alignment incorrect");
+ goto DONE;
}
ret = 1;
@@ -195,9 +195,9 @@
ewl_object_current_geometry_get(EWL_OBJECT(w), &x, &y, &width, &height);
if (x == 5 && y == 10 && width == 10 && height == 20)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect center align placement");
+ LOG_FAILURE(buf, len, "incorrect center align placement");
ewl_widget_destroy(w);
@@ -225,9 +225,9 @@
ewl_object_current_geometry_get(EWL_OBJECT(w), &x, &y, &width, &height);
if (x == 5 && y == 0 && width == 10 && height == 20)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect top align placement");
+ LOG_FAILURE(buf, len, "incorrect top align placement");
ewl_widget_destroy(w);
@@ -255,9 +255,9 @@
ewl_object_current_geometry_get(EWL_OBJECT(w), &x, &y, &width, &height);
if (x == 5 && y == 20 && width == 10 && height == 20)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect bottom align placement");
+ LOG_FAILURE(buf, len, "incorrect bottom align placement");
ewl_widget_destroy(w);
@@ -285,9 +285,9 @@
ewl_object_current_geometry_get(EWL_OBJECT(w), &x, &y, &width, &height);
if (x == 0 && y == 10 && width == 10 && height == 20)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect left align placement");
+ LOG_FAILURE(buf, len, "incorrect left align placement");
ewl_widget_destroy(w);
@@ -315,9 +315,9 @@
ewl_object_current_geometry_get(EWL_OBJECT(w), &x, &y, &width, &height);
if (x == 10 && y == 10 && width == 10 && height == 20)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect right align placement");
+ LOG_FAILURE(buf, len, "incorrect right align placement");
ewl_widget_destroy(w);
@@ -342,9 +342,9 @@
y = ewl_object_current_y_get(EWL_OBJECT(w));
if (x == 11 && y == 23)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect positions returned");
+ LOG_FAILURE(buf, len, "incorrect positions returned");
ewl_widget_destroy(w);
@@ -368,9 +368,9 @@
ewl_object_current_geometry_get(EWL_OBJECT(w), &x, &y, &width, &height);
if (x == 11 && y == 23 && width == 58 && height == 13)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect position or size returned");
+ LOG_FAILURE(buf, len, "incorrect position or size returned");
ewl_widget_destroy(w);
@@ -392,28 +392,28 @@
ewl_object_preferred_inner_size_get(EWL_OBJECT(w), &width, &height);
if (width == 0 && height == 0) {
- ewl_object_preferred_inner_size_set(EWL_OBJECT(w), MATCH_SIZE,
- MATCH_SIZE);
- ewl_object_preferred_inner_size_get(EWL_OBJECT(w), &width,
- &height);
- if (width == MATCH_SIZE && height == MATCH_SIZE) {
- ewl_object_preferred_inner_size_set(EWL_OBJECT(w),
- DIFFER_WIDTH,
- DIFFER_HEIGHT);
- ewl_object_preferred_inner_size_get(EWL_OBJECT(w),
- &width,
- &height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "preferred inner sizes match");
- }
- else
- LOG_FAILURE(buf, len, "preferred inner sizes differ");
+ ewl_object_preferred_inner_size_set(EWL_OBJECT(w), MATCH_SIZE,
+ MATCH_SIZE);
+ ewl_object_preferred_inner_size_get(EWL_OBJECT(w), &width,
+ &height);
+ if (width == MATCH_SIZE && height == MATCH_SIZE) {
+ ewl_object_preferred_inner_size_set(EWL_OBJECT(w),
+ DIFFER_WIDTH,
+ DIFFER_HEIGHT);
+ ewl_object_preferred_inner_size_get(EWL_OBJECT(w),
+ &width,
+ &height);
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "preferred inner sizes match");
+ }
+ else
+ LOG_FAILURE(buf, len, "preferred inner sizes differ");
}
else
- LOG_FAILURE(buf, len, "default preferred inner size %dx%d",
- width, height);
+ LOG_FAILURE(buf, len, "default preferred inner size %dx%d",
+ width, height);
ewl_widget_destroy(w);
@@ -435,28 +435,28 @@
ewl_object_preferred_size_get(EWL_OBJECT(w), &width, &height);
if (width == EWL_OBJECT_MIN_SIZE && height == EWL_OBJECT_MIN_SIZE) {
- ewl_object_preferred_inner_size_set(EWL_OBJECT(w), MATCH_SIZE,
- MATCH_SIZE);
- ewl_object_preferred_inner_size_get(EWL_OBJECT(w), &width,
- &height);
- if (width == MATCH_SIZE && height == MATCH_SIZE) {
- ewl_object_preferred_inner_size_set(EWL_OBJECT(w),
- DIFFER_WIDTH,
- DIFFER_HEIGHT);
- ewl_object_preferred_inner_size_get(EWL_OBJECT(w),
- &width,
- &height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "preferred sizes match");
- }
- else
- LOG_FAILURE(buf, len, "preferred sizes differ");
+ ewl_object_preferred_inner_size_set(EWL_OBJECT(w), MATCH_SIZE,
+ MATCH_SIZE);
+ ewl_object_preferred_inner_size_get(EWL_OBJECT(w), &width,
+ &height);
+ if (width == MATCH_SIZE && height == MATCH_SIZE) {
+ ewl_object_preferred_inner_size_set(EWL_OBJECT(w),
+ DIFFER_WIDTH,
+ DIFFER_HEIGHT);
+ ewl_object_preferred_inner_size_get(EWL_OBJECT(w),
+ &width,
+ &height);
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "preferred sizes match");
+ }
+ else
+ LOG_FAILURE(buf, len, "preferred sizes differ");
}
else
- LOG_FAILURE(buf, len, "default preferred size %dx%d",
- width, height);
+ LOG_FAILURE(buf, len, "default preferred size %dx%d",
+ width, height);
ewl_widget_destroy(w);
@@ -476,37 +476,37 @@
w = ewl_widget_new();
ewl_object_size_request(EWL_OBJECT(w), MATCH_SIZE - 1,
- MATCH_SIZE - 1);
+ MATCH_SIZE - 1);
ewl_object_minimum_size_get(EWL_OBJECT(w), &width, &height);
if (width == EWL_OBJECT_MIN_SIZE && height == EWL_OBJECT_MIN_SIZE) {
- ewl_object_minimum_size_set(EWL_OBJECT(w), DIFFER_WIDTH,
- DIFFER_HEIGHT);
- ewl_object_minimum_size_get(EWL_OBJECT(w), &width, &height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
- ewl_object_minimum_size_set(EWL_OBJECT(w),
- MATCH_SIZE,
- MATCH_SIZE);
- ewl_object_minimum_size_get(EWL_OBJECT(w), &width,
- &height);
- if (width == MATCH_SIZE && height == MATCH_SIZE) {
- ewl_object_current_size_get(EWL_OBJECT(w),
- &width, &height);
- if (width == MATCH_SIZE && height == MATCH_SIZE)
- ret = 1;
- else
- LOG_FAILURE(buf, len,
- "current size wrong");
- }
- else
- LOG_FAILURE(buf, len, "minimum sizes match");
- }
- else
- LOG_FAILURE(buf, len, "minimum sizes differ");
+ ewl_object_minimum_size_set(EWL_OBJECT(w), DIFFER_WIDTH,
+ DIFFER_HEIGHT);
+ ewl_object_minimum_size_get(EWL_OBJECT(w), &width, &height);
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
+ ewl_object_minimum_size_set(EWL_OBJECT(w),
+ MATCH_SIZE,
+ MATCH_SIZE);
+ ewl_object_minimum_size_get(EWL_OBJECT(w), &width,
+ &height);
+ if (width == MATCH_SIZE && height == MATCH_SIZE) {
+ ewl_object_current_size_get(EWL_OBJECT(w),
+ &width, &height);
+ if (width == MATCH_SIZE && height == MATCH_SIZE)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len,
+ "current size wrong");
+ }
+ else
+ LOG_FAILURE(buf, len, "minimum sizes match");
+ }
+ else
+ LOG_FAILURE(buf, len, "minimum sizes differ");
}
else
- LOG_FAILURE(buf, len, "default minimum size %dx%d",
- width, height);
+ LOG_FAILURE(buf, len, "default minimum size %dx%d",
+ width, height);
ewl_widget_destroy(w);
@@ -526,38 +526,38 @@
w = ewl_widget_new();
ewl_object_size_request(EWL_OBJECT(w), DIFFER_WIDTH + 1,
- DIFFER_HEIGHT + 1);
+ DIFFER_HEIGHT + 1);
ewl_object_maximum_size_get(EWL_OBJECT(w), &width, &height);
if (width == EWL_OBJECT_MAX_SIZE && height == EWL_OBJECT_MAX_SIZE) {
- ewl_object_maximum_size_set(EWL_OBJECT(w), MATCH_SIZE,
- MATCH_SIZE);
- ewl_object_maximum_size_get(EWL_OBJECT(w), &width, &height);
- if (width == MATCH_SIZE && height == MATCH_SIZE) {
- ewl_object_maximum_size_set(EWL_OBJECT(w),
- DIFFER_WIDTH,
- DIFFER_HEIGHT);
- ewl_object_maximum_size_get(EWL_OBJECT(w), &width,
- &height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
- ewl_object_current_size_get(EWL_OBJECT(w),
- &width, &height);
- if (width == DIFFER_WIDTH &&
- height == DIFFER_HEIGHT)
- ret = 1;
- else
- LOG_FAILURE(buf, len,
- "current size wrong");
- }
- else
- LOG_FAILURE(buf, len, "maximum sizes match");
- }
- else
- LOG_FAILURE(buf, len, "maximum sizes differ");
+ ewl_object_maximum_size_set(EWL_OBJECT(w), MATCH_SIZE,
+ MATCH_SIZE);
+ ewl_object_maximum_size_get(EWL_OBJECT(w), &width, &height);
+ if (width == MATCH_SIZE && height == MATCH_SIZE) {
+ ewl_object_maximum_size_set(EWL_OBJECT(w),
+ DIFFER_WIDTH,
+ DIFFER_HEIGHT);
+ ewl_object_maximum_size_get(EWL_OBJECT(w), &width,
+ &height);
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
+ ewl_object_current_size_get(EWL_OBJECT(w),
+ &width, &height);
+ if (width == DIFFER_WIDTH &&
+ height == DIFFER_HEIGHT)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len,
+ "current size wrong");
+ }
+ else
+ LOG_FAILURE(buf, len, "maximum sizes match");
+ }
+ else
+ LOG_FAILURE(buf, len, "maximum sizes differ");
}
else
- LOG_FAILURE(buf, len, "default maximum size %dx%d",
- width, height);
+ LOG_FAILURE(buf, len, "default maximum size %dx%d",
+ width, height);
ewl_widget_destroy(w);
@@ -586,35 +586,35 @@
if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
- /*
- * Verify a valid size not equal to the boundary.
- */
- ewl_object_size_request(EWL_OBJECT(w), DIFFER_WIDTH + 1,
- DIFFER_HEIGHT + 1);
- ewl_object_current_size_get(EWL_OBJECT(w), &width, &height);
-
- if (width == DIFFER_WIDTH + 1 && height == DIFFER_HEIGHT + 1) {
-
- /*
- * Verify an invalid size is forced to the boundary.
- */
- ewl_object_size_request(EWL_OBJECT(w),
- DIFFER_WIDTH - 1,
- DIFFER_HEIGHT - 1);
- ewl_object_current_size_get(EWL_OBJECT(w), &width,
- &height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "min size ignored %dx%d",
- width, height);
- }
- else
- LOG_FAILURE(buf, len, "differing sizes wrong %dx%d",
- width, height);
+ /*
+ * Verify a valid size not equal to the boundary.
+ */
+ ewl_object_size_request(EWL_OBJECT(w), DIFFER_WIDTH + 1,
+ DIFFER_HEIGHT + 1);
+ ewl_object_current_size_get(EWL_OBJECT(w), &width, &height);
+
+ if (width == DIFFER_WIDTH + 1 && height == DIFFER_HEIGHT + 1) {
+
+ /*
+ * Verify an invalid size is forced to the boundary.
+ */
+ ewl_object_size_request(EWL_OBJECT(w),
+ DIFFER_WIDTH - 1,
+ DIFFER_HEIGHT - 1);
+ ewl_object_current_size_get(EWL_OBJECT(w), &width,
+ &height);
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "min size ignored %dx%d",
+ width, height);
+ }
+ else
+ LOG_FAILURE(buf, len, "differing sizes wrong %dx%d",
+ width, height);
}
else
- LOG_FAILURE(buf, len, "same sizes wrong %dx%d", width, height);
+ LOG_FAILURE(buf, len, "same sizes wrong %dx%d", width, height);
ewl_widget_destroy(w);
@@ -643,35 +643,35 @@
if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT) {
- /*
- * Verify a valid size not equal to the boundary.
- */
- ewl_object_size_request(EWL_OBJECT(w), DIFFER_WIDTH - 1,
- DIFFER_HEIGHT - 1);
- ewl_object_current_size_get(EWL_OBJECT(w), &width, &height);
-
- if (width == DIFFER_WIDTH - 1 && height == DIFFER_HEIGHT - 1) {
-
- /*
- * Verify an invalid size is forced to the boundary.
- */
- ewl_object_size_request(EWL_OBJECT(w),
- DIFFER_WIDTH + 1,
- DIFFER_HEIGHT + 1);
- ewl_object_current_size_get(EWL_OBJECT(w), &width,
- &height);
- if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "max size ignored %dx%d",
- width, height);
- }
- else
- LOG_FAILURE(buf, len, "differing sizes wrong %dx%d",
- width, height);
+ /*
+ * Verify a valid size not equal to the boundary.
+ */
+ ewl_object_size_request(EWL_OBJECT(w), DIFFER_WIDTH - 1,
+ DIFFER_HEIGHT - 1);
+ ewl_object_current_size_get(EWL_OBJECT(w), &width, &height);
+
+ if (width == DIFFER_WIDTH - 1 && height == DIFFER_HEIGHT - 1) {
+
+ /*
+ * Verify an invalid size is forced to the boundary.
+ */
+ ewl_object_size_request(EWL_OBJECT(w),
+ DIFFER_WIDTH + 1,
+ DIFFER_HEIGHT + 1);
+ ewl_object_current_size_get(EWL_OBJECT(w), &width,
+ &height);
+ if (width == DIFFER_WIDTH && height == DIFFER_HEIGHT)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "max size ignored %dx%d",
+ width, height);
+ }
+ else
+ LOG_FAILURE(buf, len, "differing sizes wrong %dx%d",
+ width, height);
}
else
- LOG_FAILURE(buf, len, "same sizes wrong %dx%d", width, height);
+ LOG_FAILURE(buf, len, "same sizes wrong %dx%d", width, height);
ewl_widget_destroy(w);
@@ -692,22 +692,22 @@
ewl_object_padding_get(EWL_OBJECT(w), &l, &r, &t, &b);
if (l || r || t || b)
- LOG_FAILURE(buf, len, "initial padding not 0");
+ LOG_FAILURE(buf, len, "initial padding not 0");
else {
- ewl_object_padding_set(EWL_OBJECT(w), 1, 2, 3, 4);
- ewl_object_padding_get(EWL_OBJECT(w), &l, &r, &t, &b);
- if (l == 1 && r == 2 && t == 3 && b == 4) {
- l = ewl_object_padding_left_get(EWL_OBJECT(w));
- r = ewl_object_padding_right_get(EWL_OBJECT(w));
- t = ewl_object_padding_top_get(EWL_OBJECT(w));
- b = ewl_object_padding_bottom_get(EWL_OBJECT(w));
- if (l == 1 && r == 2 && t == 3 && b == 4)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "incorrect individual");
- }
- else
- LOG_FAILURE(buf, len, "incorrect returned padding");
+ ewl_object_padding_set(EWL_OBJECT(w), 1, 2, 3, 4);
+ ewl_object_padding_get(EWL_OBJECT(w), &l, &r, &t, &b);
+ if (l == 1 && r == 2 && t == 3 && b == 4) {
+ l = ewl_object_padding_left_get(EWL_OBJECT(w));
+ r = ewl_object_padding_right_get(EWL_OBJECT(w));
+ t = ewl_object_padding_top_get(EWL_OBJECT(w));
+ b = ewl_object_padding_bottom_get(EWL_OBJECT(w));
+ if (l == 1 && r == 2 && t == 3 && b == 4)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "incorrect individual");
+ }
+ else
+ LOG_FAILURE(buf, len, "incorrect returned padding");
}
ewl_widget_destroy(w);
@@ -729,22 +729,22 @@
ewl_object_insets_get(EWL_OBJECT(w), &l, &r, &t, &b);
if (l || r || t || b)
- LOG_FAILURE(buf, len, "initial insets not 0");
+ LOG_FAILURE(buf, len, "initial insets not 0");
else {
- ewl_object_insets_set(EWL_OBJECT(w), 1, 2, 3, 4);
- ewl_object_insets_get(EWL_OBJECT(w), &l, &r, &t, &b);
- if (l == 1 && r == 2 && t == 3 && b == 4) {
- l = ewl_object_insets_left_get(EWL_OBJECT(w));
- r = ewl_object_insets_right_get(EWL_OBJECT(w));
- t = ewl_object_insets_top_get(EWL_OBJECT(w));
- b = ewl_object_insets_bottom_get(EWL_OBJECT(w));
- if (l == 1 && r == 2 && t == 3 && b == 4)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "incorrect individual");
- }
- else
- LOG_FAILURE(buf, len, "incorrect returned insets");
+ ewl_object_insets_set(EWL_OBJECT(w), 1, 2, 3, 4);
+ ewl_object_insets_get(EWL_OBJECT(w), &l, &r, &t, &b);
+ if (l == 1 && r == 2 && t == 3 && b == 4) {
+ l = ewl_object_insets_left_get(EWL_OBJECT(w));
+ r = ewl_object_insets_right_get(EWL_OBJECT(w));
+ t = ewl_object_insets_top_get(EWL_OBJECT(w));
+ b = ewl_object_insets_bottom_get(EWL_OBJECT(w));
+ if (l == 1 && r == 2 && t == 3 && b == 4)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "incorrect individual");
+ }
+ else
+ LOG_FAILURE(buf, len, "incorrect returned insets");
}
ewl_widget_destroy(w);
@@ -769,11 +769,11 @@
ewl_object_current_size_get(EWL_OBJECT(w), &width, &height);
if (width == (3 + EWL_OBJECT_MIN_SIZE) &&
- height == (7 + EWL_OBJECT_MIN_SIZE))
- ret = 1;
+ height == (7 + EWL_OBJECT_MIN_SIZE))
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect returned size %dx%d", width,
- height);
+ LOG_FAILURE(buf, len, "incorrect returned size %dx%d", width,
+ height);
ewl_widget_destroy(w);
@@ -797,10 +797,10 @@
ewl_object_current_size_get(EWL_OBJECT(w), &width, &height);
if (width == 4 && height == 8)
- ret = 1;
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect returned size %dx%d", width,
- height);
+ LOG_FAILURE(buf, len, "incorrect returned size %dx%d", width,
+ height);
ewl_widget_destroy(w);
@@ -825,11 +825,11 @@
ewl_object_current_size_get(EWL_OBJECT(w), &width, &height);
if (width == (10 + EWL_OBJECT_MIN_SIZE) &&
- height == (10 + EWL_OBJECT_MIN_SIZE))
- ret = 1;
+ height == (10 + EWL_OBJECT_MIN_SIZE))
+ ret = 1;
else
- LOG_FAILURE(buf, len, "incorrect returned size %dx%d", width,
- height);
+ LOG_FAILURE(buf, len, "incorrect returned size %dx%d", width,
+ height);
ewl_widget_destroy(w);
@@ -858,15 +858,15 @@
if ((fill & EWL_FLAG_FILL_HSHRINK) && (fill & EWL_FLAG_FILL_VSHRINK) &&
(fill & EWL_FLAG_FILL_HFILL) && (fill & EWL_FLAG_FILL_VFILL)) {
- ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
- fill = ewl_object_fill_policy_get(EWL_OBJECT(w));
- if (!fill)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "fill none incorrect");
+ ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
+ fill = ewl_object_fill_policy_get(EWL_OBJECT(w));
+ if (!fill)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "fill none incorrect");
}
else
- LOG_FAILURE(buf, len, "fill all missing flags");
+ LOG_FAILURE(buf, len, "fill all missing flags");
ewl_widget_destroy(w);
@@ -887,21 +887,21 @@
w = ewl_widget_new();
ewl_object_alignment_set(EWL_OBJECT(w), EWL_FLAG_ALIGN_LEFT |
- EWL_FLAG_ALIGN_RIGHT | EWL_FLAG_ALIGN_TOP |
- EWL_FLAG_ALIGN_BOTTOM);
+ EWL_FLAG_ALIGN_RIGHT | EWL_FLAG_ALIGN_TOP |
+ EWL_FLAG_ALIGN_BOTTOM);
align = ewl_object_alignment_get(EWL_OBJECT(w));
if ((align & EWL_FLAG_ALIGN_LEFT) && (align & EWL_FLAG_ALIGN_RIGHT) &&
(align & EWL_FLAG_ALIGN_TOP) && (align & EWL_FLAG_ALIGN_BOTTOM)) {
- ewl_object_alignment_set(EWL_OBJECT(w), EWL_FLAG_ALIGN_CENTER);
- align = ewl_object_alignment_get(EWL_OBJECT(w));
- if (!align)
- ret = 1;
- else
- LOG_FAILURE(buf, len, "align none incorrect");
+ ewl_object_alignment_set(EWL_OBJECT(w), EWL_FLAG_ALIGN_CENTER);
+ align = ewl_object_alignment_get(EWL_OBJECT(w));
+ if (!align)
+ ret = 1;
+ else
+ LOG_FAILURE(buf, len, "align none incorrect");
}
else
- LOG_FAILURE(buf, len, "alignment missing flags");
+ LOG_FAILURE(buf, len, "alignment missing flags");
ewl_widget_destroy(w);
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 17:21:09
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/range
Modified Files:
ewl_range_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/range/ewl_range_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_range_test.c 6 May 2008 20:18:56 -0000 1.2
+++ ewl_range_test.c 7 May 2008 13:38:19 -0000 1.3
@@ -15,8 +15,8 @@
static int range_new(char *buf, int len);
static Ewl_Unit_Test range_unit_tests[] = {
- {"range new", range_new, NULL, -1, 0},
- {NULL, NULL, NULL, -1, 0}
+ {"range new", range_new, NULL, -1, 0},
+ {NULL, NULL, NULL, -1, 0}
};
void
@@ -42,21 +42,21 @@
/* if we don't get a valid pointer we are out of space or something
* went wrong */
if (!ewl_range_init(EWL_RANGE(range)))
- LOG_FAILURE(buf, len, "Fail to init a new range widget");
+ LOG_FAILURE(buf, len, "Fail to init a new range widget");
else if (ewl_range_value_get(EWL_RANGE(range)) != 0.0)
- LOG_FAILURE(buf, len, "Range value != 0.0");
+ LOG_FAILURE(buf, len, "Range value != 0.0");
else if (ewl_range_minimum_value_get(EWL_RANGE(range)) != 0.0)
- LOG_FAILURE(buf, len, "Range minimum != 0.0");
+ LOG_FAILURE(buf, len, "Range minimum != 0.0");
else if (ewl_range_maximum_value_get(EWL_RANGE(range)) != 100.0)
- LOG_FAILURE(buf, len, "Range maximum != 100.0");
+ LOG_FAILURE(buf, len, "Range maximum != 100.0");
else if (ewl_range_step_get(EWL_RANGE(range)) != 10.0)
- LOG_FAILURE(buf, len, "Range step != 10.0");
+ LOG_FAILURE(buf, len, "Range step != 10.0");
else if (ewl_range_invert_get(EWL_RANGE(range)))
- LOG_FAILURE(buf, len, "Range is inverted by default");
+ LOG_FAILURE(buf, len, "Range is inverted by default");
else if (ewl_range_unknown_get(EWL_RANGE(range)))
- LOG_FAILURE(buf, len, "Range's range is unknown by default");
+ LOG_FAILURE(buf, len, "Range's range is unknown by default");
else
- ret = 1;
+ ret = 1;
ewl_widget_destroy(range);
|
|
From: Enlightenment C. <no...@cv...> - 2008-05-07 17:27:46
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/notebook
Modified Files:
ewl_notebook_test.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/notebook/ewl_notebook_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_notebook_test.c 6 May 2008 20:18:55 -0000 1.2
+++ ewl_notebook_test.c 7 May 2008 13:38:18 -0000 1.3
@@ -26,8 +26,8 @@
{
test->name = "Notebook";
test->tip = "Provides a container whose children\n"
- "are pages that can be switched\n"
- "between using tab labels along one\nedge";
+ "are pages that can be switched\n"
+ "between using tab labels along one\nedge";
test->filename = __FILE__;
test->func = create_test;
test->type = EWL_TEST_TYPE_CONTAINER;
@@ -47,15 +47,15 @@
/* append 3 pages */
for (count = 1; count < 4; count++)
{
- o2 = ewl_label_new();
- snprintf(buf, sizeof(buf), "Page %d", count);
- ewl_label_text_set(EWL_LABEL(o2), buf);
- ewl_widget_show(o2);
-
- o = create_page(buf);
- ewl_container_child_append(EWL_CONTAINER(n), o);
- ewl_notebook_page_tab_widget_set(EWL_NOTEBOOK(n), o, o2);
- ewl_widget_show(o);
+ o2 = ewl_label_new();
+ snprintf(buf, sizeof(buf), "Page %d", count);
+ ewl_label_text_set(EWL_LABEL(o2), buf);
+ ewl_widget_show(o2);
+
+ o = create_page(buf);
+ ewl_container_child_append(EWL_CONTAINER(n), o);
+ ewl_notebook_page_tab_widget_set(EWL_NOTEBOOK(n), o, o2);
+ ewl_widget_show(o);
}
/* insert a page after the first */
@@ -81,29 +81,29 @@
static void
notebook_cb_toggle_clicked(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
Ewl_Widget *n;
n = ewl_widget_name_find("notebook");
ewl_notebook_tabbar_visible_set(EWL_NOTEBOOK(n),
- !ewl_notebook_tabbar_visible_get(EWL_NOTEBOOK(n)));
+ !ewl_notebook_tabbar_visible_get(EWL_NOTEBOOK(n)));
}
static void
notebook_cb_homogeneous_toggle_clicked(Ewl_Widget *w __UNUSED__,
- void *ev __UNUSED__, void *data __UNUSED__)
+ void *ev __UNUSED__, void *data __UNUSED__)
{
Ewl_Widget *n;
n = ewl_widget_name_find("notebook");
ewl_notebook_tabbar_homogeneous_set(EWL_NOTEBOOK(n),
- !ewl_notebook_tabbar_homogeneous_get(EWL_NOTEBOOK(n)));
+ !ewl_notebook_tabbar_homogeneous_get(EWL_NOTEBOOK(n)));
}
static void
notebook_change_align(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data)
+ void *data)
{
Ewl_Widget *n;
unsigned int align = EWL_FLAG_ALIGN_CENTER;
@@ -111,15 +111,15 @@
pos = data;
if (!strcmp(pos, "Top"))
- align = EWL_FLAG_ALIGN_TOP;
+ align = EWL_FLAG_ALIGN_TOP;
else if (!strcmp(pos, "Bottom"))
- align = EWL_FLAG_ALIGN_BOTTOM;
+ align = EWL_FLAG_ALIGN_BOTTOM;
else if (!strcmp(pos, "Left"))
- align = EWL_FLAG_ALIGN_LEFT;
+ align = EWL_FLAG_ALIGN_LEFT;
else if (!strcmp(pos, "Right"))
- align = EWL_FLAG_ALIGN_RIGHT;
+ align = EWL_FLAG_ALIGN_RIGHT;
else if (!strcmp(pos, "Center"))
- align = EWL_FLAG_ALIGN_CENTER;
+ align = EWL_FLAG_ALIGN_CENTER;
n = ewl_widget_name_find("notebook");
ewl_notebook_tabbar_alignment_set(EWL_NOTEBOOK(n), align);
@@ -127,7 +127,7 @@
static void
notebook_change_position(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data)
+ void *data)
{
Ewl_Widget *n;
unsigned int align = EWL_POSITION_TOP;
@@ -135,13 +135,13 @@
pos = data;
if (!strcmp(pos, "Top"))
- align = EWL_POSITION_TOP;
+ align = EWL_POSITION_TOP;
else if (!strcmp(pos, "Bottom"))
- align = EWL_POSITION_BOTTOM;
+ align = EWL_POSITION_BOTTOM;
else if (!strcmp(pos, "Left"))
- align = EWL_POSITION_LEFT;
+ align = EWL_POSITION_LEFT;
else if (!strcmp(pos, "Right"))
- align = EWL_POSITION_RIGHT;
+ align = EWL_POSITION_RIGHT;
n = ewl_widget_name_find("notebook");
ewl_notebook_tabbar_position_set(EWL_NOTEBOOK(n), align);
@@ -149,7 +149,7 @@
static void
notebook_append_page(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
Ewl_Widget *o2, *o, *vis, *n;
char buf[10];
@@ -173,7 +173,7 @@
static void
notebook_prepend_page(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data __UNUSED__)
+ void *data __UNUSED__)
{
Ewl_Widget *n, *o2, *o, *vis;
char buf[10];
@@ -197,7 +197,7 @@
static void
notebook_delete_page(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
- void *data)
+ void *data)
{
Ewl_Widget *n;
@@ -237,22 +237,22 @@
for (i = 0; i < (sizeof(alignment) / sizeof(char *)); i++)
{
- o = ewl_radiobutton_new();
- ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
- ewl_button_label_set(EWL_BUTTON(o), alignment[i]);
- ewl_container_child_append(EWL_CONTAINER(border), o);
- ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED,
- notebook_change_align, alignment[i]);
-
- if (o2) ewl_radiobutton_chain_set(EWL_RADIOBUTTON(o),
- EWL_RADIOBUTTON(o2));
+ o = ewl_radiobutton_new();
+ ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
+ ewl_button_label_set(EWL_BUTTON(o), alignment[i]);
+ ewl_container_child_append(EWL_CONTAINER(border), o);
+ ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED,
+ notebook_change_align, alignment[i]);
+
+ if (o2) ewl_radiobutton_chain_set(EWL_RADIOBUTTON(o),
+ EWL_RADIOBUTTON(o2));
- if (!strcmp(alignment[i], "Center"))
- ewl_checkbutton_checked_set(EWL_CHECKBUTTON(o), TRUE);
+ if (!strcmp(alignment[i], "Center"))
+ ewl_checkbutton_checked_set(EWL_CHECKBUTTON(o), TRUE);
- ewl_widget_show(o);
+ ewl_widget_show(o);
- o2 = o;
+ o2 = o;
}
/* box to hold position list */
@@ -264,22 +264,22 @@
o2 = NULL;
for (i = 0; i < (sizeof(position) / sizeof(char *)); i++)
{
- o = ewl_radiobutton_new();
- ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
- ewl_button_label_set(EWL_BUTTON(o), position[i]);
- ewl_container_child_append(EWL_CONTAINER(border), o);
- ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED,
- notebook_change_position, position[i]);
-
- if (o2) ewl_radiobutton_chain_set(EWL_RADIOBUTTON(o),
- EWL_RADIOBUTTON(o2));
+ o = ewl_radiobutton_new();
+ ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
+ ewl_button_label_set(EWL_BUTTON(o), position[i]);
+ ewl_container_child_append(EWL_CONTAINER(border), o);
+ ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED,
+ notebook_change_position, position[i]);
+
+ if (o2) ewl_radiobutton_chain_set(EWL_RADIOBUTTON(o),
+ EWL_RADIOBUTTON(o2));
- if (!strcmp(alignment[i], "Top"))
- ewl_checkbutton_checked_set(EWL_CHECKBUTTON(o), TRUE);
+ if (!strcmp(alignment[i], "Top"))
+ ewl_checkbutton_checked_set(EWL_CHECKBUTTON(o), TRUE);
- ewl_widget_show(o);
+ ewl_widget_show(o);
- o2 = o;
+ o2 = o;
}
o = ewl_checkbutton_new();
@@ -289,7 +289,7 @@
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- notebook_cb_toggle_clicked, NULL);
+ notebook_cb_toggle_clicked, NULL);
ewl_widget_show(o);
o = ewl_checkbutton_new();
@@ -297,7 +297,7 @@
ewl_container_child_append(EWL_CONTAINER(body), o);
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- notebook_cb_homogeneous_toggle_clicked, NULL);
+ notebook_cb_homogeneous_toggle_clicked, NULL);
ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(o);
@@ -329,21 +329,21 @@
ewl_button_label_set(EWL_BUTTON(o), "Prepend Page");
ewl_container_child_append(EWL_CONTAINER(box2), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- notebook_prepend_page, box);
+ notebook_prepend_page, box);
ewl_widget_show(o);
o = ewl_button_new();
ewl_button_label_set(EWL_BUTTON(o), "Append Page");
ewl_container_child_append(EWL_CONTAINER(box2), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- notebook_append_page, box);
+ notebook_append_page, box);
ewl_widget_show(o);
o = ewl_button_new();
ewl_button_label_set(EWL_BUTTON(o), "Remove This Page");
ewl_container_child_append(EWL_CONTAINER(box), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- notebook_delete_page, box);
+ notebook_delete_page, box);
ewl_widget_show(o);
return box;
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-24 03:46:18
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/engine
Modified Files:
ewl_engine_test.c
Log Message:
- use a valid engine name in the unit test
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/engine/ewl_engine_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_engine_test.c 10 Jul 2008 21:42:06 -0000 1.6
+++ ewl_engine_test.c 24 Jul 2008 03:46:15 -0000 1.7
@@ -197,7 +197,7 @@
Ewl_Widget *window;
window = ewl_window_new();
- ewl_embed_engine_name_set(EWL_EMBED(window), "ewl_engine_test");
+ ewl_embed_engine_name_set(EWL_EMBED(window), "evas_buffer");
ewl_widget_show(window);
return window;
@@ -215,7 +215,7 @@
window = create_unit_test_window();
engine_name = ewl_embed_engine_name_get(EWL_EMBED(window));
- if (strcmp(engine_name, "ewl_engine_test"))
+ if (strcmp(engine_name, "evas_buffer"))
LOG_FAILURE(buf, len, "engine name doesn't match");
else
ret = 1;
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-24 03:47:13
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_engines.c
Log Message:
- patch from pfritz to fix bug 467. Bail early if we don't have a valid
engine as we won't be able to get any hook information. I'm spitting out
a warning as this seems like it would be a bad thing.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- ewl_engines.c 7 May 2008 13:38:23 -0000 1.58
+++ ewl_engines.c 24 Jul 2008 03:47:11 -0000 1.59
@@ -1550,6 +1550,14 @@
DCHECK_TYPE_RET(embed, EWL_EMBED_TYPE, NULL);
caller = EWL_ENGINE(embed->engine);
+
+ /* bail if we don't have a valid engine */
+ if (!caller)
+ {
+ DWARNING("Calling ewl_engine_hook_get without a valid engine.");
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
+ }
+
hooks = ewl_engine_hooks_get(caller, type);
if ((!hooks || !hooks[hook]) && caller->dependancies)
{
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-24 03:54:03
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/tools/ewl_config
Modified Files:
ewl_config.c
Log Message:
- patch from pfritz to fix part of bug 522. Only close the directory if we
actually opened it in the first place.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/tools/ewl_config/ewl_config.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- ewl_config.c 11 Jun 2008 23:17:33 -0000 1.58
+++ ewl_config.c 24 Jul 2008 03:54:01 -0000 1.59
@@ -357,8 +357,9 @@
ret = ec_themes_get(rep, list, v);
if (ret >= 0)
sel = ret;
+
+ closedir(rep);
}
- closedir(rep);
if (sel >= 0)
ewl_mvc_selected_set(EWL_MVC(o), NULL, list, sel, 0);
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-28 16:41:44
|
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas_software_ddraw Added Files: .cvsignore Log Message: - add ignore file |
|
From: Enlightenment C. <no...@cv...> - 2008-07-29 02:31:51
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_embed.c ewl_filedialog.c ewl_filelist.h ewl_freebox_mvc.h
ewl_paned.c ewl_text.c ewl_tree.c
Log Message:
- fix doxy
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- ewl_embed.c 18 Jul 2008 12:32:02 -0000 1.149
+++ ewl_embed.c 29 Jul 2008 02:31:46 -0000 1.150
@@ -74,7 +74,7 @@
}
/**
- * @param w: the embed to be initialized to default values and callbacks
+ * @param emb: the embed to be initialized to default values and callbacks
* @return Returns TRUE or FALSE depending on if initialization succeeds.
* @brief initialize a embed to default values and callbacks
*
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_filedialog.c 7 May 2008 13:38:23 -0000 1.46
+++ ewl_filedialog.c 29 Jul 2008 02:31:47 -0000 1.47
@@ -581,7 +581,7 @@
/**
* @param fd: The filedialog to work with
- * @t: Non-zero to set the filedialog to a save type
+ * @param t: Non-zero to set the filedialog to a save type
* @return Returns no value
* @brief Sets the type of the filedialog
*/
@@ -630,7 +630,7 @@
}
/**
- * @param fp: The filedialog to work with
+ * @param fd: The filedialog to work with
* @return Returns non-zero if the filedialog can return directories
* @brief Gets the filedialog's policy on returning directories
*/
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_filelist.h 29 Jun 2008 14:01:39 -0000 1.27
+++ ewl_filelist.h 29 Jul 2008 02:31:47 -0000 1.28
@@ -31,23 +31,23 @@
* @{
*/
- /**
- * * @def EWL_FILELIST_FILTER_TYPE
- * * The type name
- * **/
+/**
+ * @def EWL_FILELIST_FILTER_TYPE
+ * The type name
+ */
#define EWL_FILELIST_FILTER_TYPE "filelist_filter"
typedef struct Ewl_Filelist_Filter Ewl_Filelist_Filter;
/**
- * * @def EWL_FILELIST_FILTER(ff)
- * * Typecasts a pointer to an Ewl_Filelist_Filter
- * **/
+ * @def EWL_FILELIST_FILTER(ff)
+ * Typecasts a pointer to an Ewl_Filelist_Filter
+ */
#define EWL_FILELIST_FILTER(ff), ((Ewl_Filelist_Filter *)ff)
/**
- * * @brief The data structure for Ewl_Filelist_Filter
- * **/
+ * @brief The data structure for Ewl_Filelist_Filter
+ */
struct Ewl_Filelist_Filter
{
char *name;
@@ -135,22 +135,22 @@
};
/**
- * * @def EWL_FILELIST_DIRECTORY_TYPE
- * * The type name
- * */
+ * @def EWL_FILELIST_DIRECTORY_TYPE
+ * The type name
+ */
#define EWL_FILELIST_DIRECTORY_TYPE "filelist_directory"
typedef struct Ewl_Filelist_Directory Ewl_Filelist_Directory;
/**
- * * @def EWL_FILELIST_DIRECTORY(fl)
- * * Typecasts a pointer to an Ewl_Filelist_Directory pointer
- * */
+ * @def EWL_FILELIST_DIRECTORY(fl)
+ * Typecasts a pointer to an Ewl_Filelist_Directory pointer
+ */
#define EWL_FILELIST_DIRECTORY(fl) ((Ewl_Filelist_Directory *)fl)
/**
- * * @brief The data structure for Ewl_Filelist_Directory
- * */
+ * @brief The data structure for Ewl_Filelist_Directory
+ */
struct Ewl_Filelist_Directory
{
const char *name;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_freebox_mvc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_freebox_mvc.h 19 May 2008 22:11:09 -0000 1.1
+++ ewl_freebox_mvc.h 29 Jul 2008 02:31:47 -0000 1.2
@@ -37,7 +37,7 @@
typedef struct Ewl_Freebox_MVC Ewl_Freebox_MVC;
/**
- * @breif Inherits from EWL_MVC and extends to provide a free layout widget
+ * @brief Inherits from EWL_MVC and extends to provide a free layout widget
*/
struct Ewl_Freebox_MVC
{
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_paned.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- ewl_paned.c 23 Jul 2008 21:22:44 -0000 1.74
+++ ewl_paned.c 29 Jul 2008 02:31:47 -0000 1.75
@@ -516,7 +516,7 @@
}
/**
- * @param w: The paned to work with
+ * @param p: The paned to work with
* @param pane_num: The number of visible panes
* @return Returns no value
* @brief The arrange the child widgets
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- ewl_text.c 18 Jul 2008 12:32:02 -0000 1.204
+++ ewl_text.c 29 Jul 2008 02:31:47 -0000 1.205
@@ -748,7 +748,7 @@
}
/**
- * @param e: the text to set the obscuring character
+ * @param t: the text to set the obscuring character
* @param o: the character to obscure the password characters. This need to be
* a string, because UTF-8 characters can be longer then one byte.
* If it is not a valid UTF-8 character it will fallback to an
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- ewl_tree.c 18 Jul 2008 12:32:02 -0000 1.74
+++ ewl_tree.c 29 Jul 2008 02:31:47 -0000 1.75
@@ -244,6 +244,7 @@
/**
* @param tree: The tree to work with
* @param col: The number of the column to change the fixed size flag
+ * @param fixed: The fixed size flag to set
* @return Returns no value
* @brief Set the fixed size flag of the give column
*/
@@ -300,6 +301,7 @@
/**
* @param tree: The tree to work with
* @param col: The number of the column to change the initial size
+ * @param size: The initial column size to set
* @return Returns no value
* @brief Set the initial size of the give column
*/
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-29 02:55:01
|
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_engines.c
Log Message:
- these are just error messages not developer messages
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- ewl_engines.c 24 Jul 2008 03:47:11 -0000 1.59
+++ ewl_engines.c 29 Jul 2008 02:54:59 -0000 1.60
@@ -153,15 +153,15 @@
plugin = ecore_plugin_load(ewl_engines_path, name, INTERFACE_CURRENT);
if (!plugin)
{
- DWARNING("Unable to open engine %s.", name);
+ fprintf(stderr, "Unable to open engine %s.\n", name);
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
dependancies = ecore_plugin_symbol_get(plugin, "ewl_engine_dependancies");
if (!dependancies)
{
- DWARNING("Unable to find ewl_engine_dependancies for "
- "the %s engine.", name);
+ fprintf(stderr, "Unable to find ewl_engine_dependancies for "
+ "the %s engine.\n", name);
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
@@ -196,7 +196,7 @@
create_engine = ecore_plugin_symbol_get(plugin, "ewl_engine_create");
if (!create_engine)
{
- DWARNING("Unable to find ewl_engine_create for the %s engine.", name);
+ fprintf(stderr, "Unable to find ewl_engine_create for the %s engine.\n", name);
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
|
Thanks for helping keep SourceForge clean.
X