Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/lib Modified Files: ewl_engines.c ewl_engines.h ewl_text.c Log Message: - formatting =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ewl_engines.c 7 Jul 2006 21:06:26 -0000 1.5 +++ ewl_engines.c 10 Jul 2006 02:57:08 -0000 1.6 @@ -98,7 +98,8 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("embed", embed, NULL); - DCHECK_PARAM_PTR_RET("valid type", (type >= 0 && type < EWL_ENGINE_MAX), NULL); + DCHECK_PARAM_PTR_RET("valid type", + (type >= 0 && type < EWL_ENGINE_MAX), NULL); DCHECK_TYPE_RET("embed", embed, EWL_EMBED_TYPE, NULL); caller = EWL_ENGINE(embed->engine); @@ -135,7 +136,8 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("embed", embed, NULL); - DCHECK_PARAM_PTR_RET("valid type", (type >= 0 && type < EWL_ENGINE_MAX), NULL); + DCHECK_PARAM_PTR_RET("valid type", + (type >= 0 && type < EWL_ENGINE_MAX), NULL); DCHECK_TYPE_RET("embed", embed, EWL_EMBED_TYPE, NULL); matches = ecore_list_new(); @@ -154,14 +156,15 @@ { if (caller->functions->engine_hooks[type]) ecore_list_append(matches, - caller->functions->engine_hooks[type]); + caller->functions->engine_hooks[type]); } } /* * Free and return NULL if no matching hooks are found */ - if (ecore_list_nodes(matches) <= 0) { + if (ecore_list_nodes(matches) <= 0) + { ecore_list_destroy(matches); matches = NULL; } @@ -274,7 +277,8 @@ DCHECK_PARAM_PTR("win", win); DCHECK_TYPE("win", win, EWL_WINDOW_TYPE); - window_new = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_NEW); + window_new = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_NEW); if (window_new) window_new(win); @@ -298,7 +302,8 @@ if (!REALIZED(win)) DRETURN(DLEVEL_STABLE); - window_destroy = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_DESTROY); + window_destroy = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_DESTROY); if (window_destroy) window_destroy(win); @@ -322,7 +327,8 @@ if (!REALIZED(win)) DRETURN(DLEVEL_STABLE); - window_move = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_MOVE); + window_move = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_MOVE); if (window_move) window_move(win); @@ -346,7 +352,8 @@ if (!REALIZED(win)) DRETURN(DLEVEL_STABLE); - window_resize = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_RESIZE); + window_resize = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_RESIZE); if (window_resize) window_resize(win); @@ -389,7 +396,8 @@ DCHECK_PARAM_PTR("win", win); DCHECK_TYPE("win", win, EWL_WINDOW_TYPE); - window_show = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_SHOW); + window_show = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_SHOW); if (window_show) window_show(win); @@ -410,7 +418,8 @@ DCHECK_PARAM_PTR("win", win); DCHECK_TYPE("win", win, EWL_WINDOW_TYPE); - window_hide = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_HIDE); + window_hide = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_HIDE); if (window_hide) window_hide(win); @@ -609,7 +618,8 @@ if (!REALIZED(win)) DRETURN(DLEVEL_STABLE); - window_raise = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_RAISE); + window_raise = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_RAISE); if (window_raise) window_raise(win); @@ -633,7 +643,8 @@ if (!REALIZED(win)) DRETURN(DLEVEL_STABLE); - window_lower = ewl_engine_hook_get(EWL_EMBED(win), EWL_ENGINE_WINDOW_LOWER); + window_lower = ewl_engine_hook_get(EWL_EMBED(win), + EWL_ENGINE_WINDOW_LOWER); if (window_lower) window_lower(win); @@ -982,3 +993,4 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } + =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ewl_engines.h 7 Jul 2006 21:06:26 -0000 1.4 +++ ewl_engines.h 10 Jul 2006 02:57:08 -0000 1.5 @@ -70,7 +70,6 @@ EWL_ENGINE_THEME_OBJECT_PART_TEXT_SET, EWL_ENGINE_THEME_OBJECT_COLOR_CLASS_SET, - EWL_ENGINE_THEME_CLIP_ADD, EWL_ENGINE_THEME_CLIP_DEL, EWL_ENGINE_THEME_CLIP_CLIPEES_GET, @@ -185,13 +184,12 @@ typedef void (*Ewl_Engine_Cb_Keyboard_Ungrab)(Ewl_Window *win); /**< Set the keyboard ungrab */ typedef int (*Ewl_Engine_Cb_Pointer_Grab)(Ewl_Window *win); /**< Set the pointer grab */ -typedef void (*Ewl_Engine_Cb_Pointer_Ungrab)(Ewl_Window *win); /**< Set the pointer - ungrab */ +typedef void (*Ewl_Engine_Cb_Pointer_Ungrab)(Ewl_Window *win); /**< Set the pointer ungrab */ typedef void (*Ewl_Engine_Cb_Window_Selection_Text_Set)(Ewl_Window *win, - const char *txt); /**< Set the - selection text */ + const char *txt); /**< Set the + selection text */ typedef void (*Ewl_Engine_Cb_Window_Geometry_Get)(Ewl_Window *win, - int *width, int *height); /**< Get the window + int *width, int *height); /**< Get the window geometry */ typedef void (*Ewl_Engine_Cb_Window_Dnd_Aware_Set)(Ewl_Window *win); /**< Set the window dnd aware */ @@ -213,17 +211,24 @@ typedef void *(*Ewl_Engine_Cb_Theme_Object_Clip_Unset)(void *obj); typedef void (*Ewl_Engine_Cb_Theme_Object_Stack_Add)(Ewl_Widget *w); typedef void (*Ewl_Engine_Cb_Theme_Object_Layer_Update)(Ewl_Widget *w); -typedef void (*Ewl_Engine_Cb_Theme_Object_File_Set)(void *obj, char *path, char *group); +typedef void (*Ewl_Engine_Cb_Theme_Object_File_Set)(void *obj, char *path, + char *group); typedef void *(*Ewl_Engine_Cb_Theme_Object_Load_Error)(void *obj); typedef void (*Ewl_Engine_Cb_Theme_Object_Min_Size_Get)(void *obj, int *w, int *h); typedef void (*Ewl_Engine_Cb_Theme_Object_Max_Size_Get)(void *obj, int *w, int *h); -typedef void (*Ewl_Engine_Cb_Theme_Object_Signal_Send)(void *obj, char *state, char *source); -typedef void (*Ewl_Engine_Cb_Theme_Object_Part_Text_Set)(void *obj, char *part, char *text); -typedef void (*Ewl_Engine_Cb_Theme_Object_Color_Class_Set)(char *name, int r, int g, int b, int r2, int g2, int b2, int r3, int g3, int b3); +typedef void (*Ewl_Engine_Cb_Theme_Object_Signal_Send)(void *obj, + char *state, char *source); +typedef void (*Ewl_Engine_Cb_Theme_Object_Part_Text_Set)(void *obj, + char *part, char *text); +typedef void (*Ewl_Engine_Cb_Theme_Object_Color_Class_Set)(char *name, int r, + int g, int b, int r2, + int g2, int b2, int r3, + int g3, int b3); typedef void *(*Ewl_Engine_Cb_Theme_Clip_Add)(Ewl_Embed *embed); typedef void (*Ewl_Engine_Cb_Theme_Clip_Del)(void *clip); typedef void *(*Ewl_Engine_Cb_Theme_Clip_Clipees_Get)(void *clip); -typedef void (*Ewl_Engine_Cb_Theme_Clip_Color_Set)(void *clip, int r, int g, int b, int a); +typedef void (*Ewl_Engine_Cb_Theme_Clip_Color_Set)(void *clip, int r, int g, + int b, int a); #endif =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v retrieving revision 1.109 retrieving revision 1.110 diff -u -3 -r1.109 -r1.110 --- ewl_text.c 8 Jul 2006 01:26:45 -0000 1.109 +++ ewl_text.c 10 Jul 2006 02:57:08 -0000 1.110 @@ -503,7 +503,9 @@ } if (idx < t->length) - memmove(t->text + idx + len, t->text + idx, t->length - idx); + memmove(t->text + idx + len, t->text + idx, + t->length - idx); + memcpy(t->text + idx, text, len); t->length += len; t->text[t->length] = '\0'; ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs