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: - change tabs to spaces (Ewl uses an 8 space indent now instead of a tab) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_buffer/Ewl_Engine_Evas_Buffer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Ewl_Engine_Evas_Buffer.h 12 Feb 2007 13:16:04 -0000 1.4 +++ Ewl_Engine_Evas_Buffer.h 6 May 2008 20:20:36 -0000 1.5 @@ -1,4 +1,4 @@ -/* vim: set sw=8 ts=8 sts=8 noexpandtab: */ +/* vim: set sw=8 ts=8 sts=8 expandtab: */ #ifndef EWL_ENGINE_EVAS_BUFFER_H #define EWL_ENGINE_EVAS_BUFFER_H @@ -7,12 +7,12 @@ #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 { - Ewl_Engine engine; + Ewl_Engine engine; }; #endif =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_buffer/ewl_engine_evas_buffer.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ewl_engine_evas_buffer.c 12 Nov 2007 22:42:20 -0000 1.16 +++ ewl_engine_evas_buffer.c 6 May 2008 20:20:36 -0000 1.17 @@ -1,4 +1,4 @@ -/* vim: set sw=8 ts=8 sts=8 noexpandtab: */ +/* vim: set sw=8 ts=8 sts=8 expandtab: */ #include "Ewl_Engine_Evas_Buffer.h" #include "ewl_macros.h" #include "ewl_private.h" @@ -6,180 +6,180 @@ 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 * ewl_engine_dependancies(void) { - Ecore_DList *d; + Ecore_DList *d; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - d = ecore_dlist_new(); - ecore_dlist_append(d, strdup("evas")); + d = ecore_dlist_new(); + ecore_dlist_append(d, strdup("evas")); - DRETURN_PTR(d, DLEVEL_STABLE); + DRETURN_PTR(d, DLEVEL_STABLE); } Ewl_Engine * ewl_engine_create(int *argv __UNUSED__, char ** argc __UNUSED__) { - Ewl_Engine_Evas_Buffer *engine; + Ewl_Engine_Evas_Buffer *engine; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - engine = NEW(Ewl_Engine_Evas_Buffer, 1); - if (!engine) - DRETURN_PTR(NULL, DLEVEL_STABLE); + engine = NEW(Ewl_Engine_Evas_Buffer, 1); + if (!engine) + DRETURN_PTR(NULL, DLEVEL_STABLE); - if (!ee_init(EWL_ENGINE(engine))) - { - FREE(engine); - DRETURN_PTR(NULL, DLEVEL_STABLE); - } + if (!ee_init(EWL_ENGINE(engine))) + { + FREE(engine); + DRETURN_PTR(NULL, DLEVEL_STABLE); + } - DRETURN_PTR(EWL_ENGINE(engine), DLEVEL_STABLE); + DRETURN_PTR(EWL_ENGINE(engine), DLEVEL_STABLE); } static int ee_init(Ewl_Engine *engine) { - Ewl_Engine_Info *info; + Ewl_Engine_Info *info; - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET(engine, TRUE); + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR_RET(engine, TRUE); - info = NEW(Ewl_Engine_Info, 1); - info->shutdown = ee_shutdown; - info->hooks.canvas = canvas_funcs; + info = NEW(Ewl_Engine_Info, 1); + info->shutdown = ee_shutdown; + info->hooks.canvas = canvas_funcs; - engine->functions = info; + engine->functions = info; - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); } static void ee_shutdown(Ewl_Engine *engine) { - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR(engine); + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR(engine); - IF_FREE(engine->functions); + IF_FREE(engine->functions); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DLEAVE_FUNCTION(DLEVEL_STABLE); } static void ee_canvas_setup(Ewl_Window *win, int debug __UNUSED__) { - Evas *evas; - Evas_Engine_Info *info = NULL; - Evas_Engine_Info_Buffer *bufinfo; - Ewl_Object *o; - - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR(win); - DCHECK_TYPE(win, EWL_WINDOW_TYPE); - - evas = evas_new(); - evas_output_method_set(evas, evas_render_method_lookup("buffer")); - - info = evas_engine_info_get(evas); - if (!info) - { - fprintf(stderr, "Unable to use buffer engine for rendering.\n"); - exit(-1); - } - - win->window = bufinfo = (Evas_Engine_Info_Buffer *)info; - - bufinfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_ARGB32; - bufinfo->info.dest_buffer = NULL; - bufinfo->info.dest_buffer_row_bytes = 0; - bufinfo->info.use_color_key = 0; - bufinfo->info.alpha_threshold = 0; - bufinfo->info.func.new_update_region = NULL; - bufinfo->info.func.free_update_region = NULL; - evas_engine_info_set(evas, (Evas_Engine_Info *)bufinfo); - - 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)); - 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_embed_canvas_set(EWL_EMBED(win), evas, win->window); + Evas *evas; + Evas_Engine_Info *info = NULL; + Evas_Engine_Info_Buffer *bufinfo; + Ewl_Object *o; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR(win); + DCHECK_TYPE(win, EWL_WINDOW_TYPE); + + evas = evas_new(); + evas_output_method_set(evas, evas_render_method_lookup("buffer")); + + info = evas_engine_info_get(evas); + if (!info) + { + fprintf(stderr, "Unable to use buffer engine for rendering.\n"); + exit(-1); + } + + win->window = bufinfo = (Evas_Engine_Info_Buffer *)info; + + bufinfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_ARGB32; + bufinfo->info.dest_buffer = NULL; + bufinfo->info.dest_buffer_row_bytes = 0; + bufinfo->info.use_color_key = 0; + bufinfo->info.alpha_threshold = 0; + bufinfo->info.func.new_update_region = NULL; + bufinfo->info.func.free_update_region = NULL; + evas_engine_info_set(evas, (Evas_Engine_Info *)bufinfo); + + 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)); + 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_embed_canvas_set(EWL_EMBED(win), evas, win->window); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DLEAVE_FUNCTION(DLEVEL_STABLE); } static void ee_canvas_output_set(Ewl_Embed *emb, int x, int y, int width, int height) { - Evas *evas; - Evas_Engine_Info *info = NULL; - Evas_Engine_Info_Buffer *bufinfo; - Ewl_Object *o; - - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR(emb); - DCHECK_TYPE(emb, EWL_EMBED_TYPE); - - evas = emb->canvas; - - evas_output_size_set(evas, width, height); - evas_output_viewport_set(evas, x, y, width, height); - evas_damage_rectangle_add(evas, 0, 0, width, height); - - info = evas_engine_info_get(evas); - if (!info) - { - 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); + Evas *evas; + Evas_Engine_Info *info = NULL; + Evas_Engine_Info_Buffer *bufinfo; + Ewl_Object *o; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR(emb); + DCHECK_TYPE(emb, EWL_EMBED_TYPE); + + evas = emb->canvas; + + evas_output_size_set(evas, width, height); + evas_output_viewport_set(evas, x, y, width, height); + evas_damage_rectangle_add(evas, 0, 0, width, height); + + info = evas_engine_info_get(evas); + if (!info) + { + 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); - evas_engine_info_set(evas, info); + evas_engine_info_set(evas, info); - emb->canvas_window = bufinfo->info.dest_buffer; + emb->canvas_window = bufinfo->info.dest_buffer; - DLEAVE_FUNCTION(DLEVEL_STABLE); + DLEAVE_FUNCTION(DLEVEL_STABLE); } static void ee_canvas_render(Ewl_Embed *embed) { - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR(embed); + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR(embed); - if (embed->canvas) { - Evas_List *updates; + if (embed->canvas) { + 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); + DRETURN(DLEVEL_STABLE); } ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs