Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/engines/evas_fb Modified Files: Ewl_Engine_Evas_Fb.h ewl_engine_evas_fb.c Log Message: - tabs are a tricky beast. looks like I missed some. =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_fb/Ewl_Engine_Evas_Fb.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Ewl_Engine_Evas_Fb.h 6 May 2008 20:20:36 -0000 1.8 +++ Ewl_Engine_Evas_Fb.h 7 May 2008 13:38:21 -0000 1.9 @@ -8,7 +8,7 @@ #include <Evas_Engine_FB.h> #define EWL_ENGINE_EVAS_FB(engine) \ - ((Ewl_Engine_Evas_Fb *)engine) + ((Ewl_Engine_Evas_Fb *)engine) typedef struct Ewl_Engine_Evas_Fb Ewl_Engine_Evas_Fb; struct Ewl_Engine_Evas_Fb =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_fb/ewl_engine_evas_fb.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ewl_engine_evas_fb.c 6 May 2008 20:20:36 -0000 1.21 +++ ewl_engine_evas_fb.c 7 May 2008 13:38:21 -0000 1.22 @@ -22,8 +22,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 * @@ -48,12 +48,12 @@ engine = NEW(Ewl_Engine_Evas_Fb, 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); @@ -68,33 +68,33 @@ DCHECK_PARAM_PTR_RET(engine, TRUE); if (ee_key_down_handler) - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); if (!ecore_fb_init(NULL)) - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); ee_key_down_handler = ecore_event_handler_add( - ECORE_FB_EVENT_KEY_DOWN, - ewl_ev_fb_key_down, engine); + ECORE_FB_EVENT_KEY_DOWN, + ewl_ev_fb_key_down, engine); ee_key_up_handler = ecore_event_handler_add( - ECORE_FB_EVENT_KEY_UP, - ewl_ev_fb_key_up, engine); + ECORE_FB_EVENT_KEY_UP, + ewl_ev_fb_key_up, engine); ee_mouse_down_handler = ecore_event_handler_add( - ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, - ewl_ev_fb_mouse_down, engine); + ECORE_FB_EVENT_MOUSE_BUTTON_DOWN, + ewl_ev_fb_mouse_down, engine); ee_mouse_up_handler = ecore_event_handler_add( - ECORE_FB_EVENT_MOUSE_BUTTON_UP, - ewl_ev_fb_mouse_up, engine); + ECORE_FB_EVENT_MOUSE_BUTTON_UP, + ewl_ev_fb_mouse_up, engine); ee_mouse_move_handler = ecore_event_handler_add( - ECORE_FB_EVENT_MOUSE_MOVE, - ewl_ev_fb_mouse_move, engine); + ECORE_FB_EVENT_MOUSE_MOVE, + ewl_ev_fb_mouse_move, engine); if (!ee_key_down_handler || !ee_key_up_handler - || !ee_mouse_down_handler || !ee_mouse_up_handler - || !ee_mouse_move_handler) + || !ee_mouse_down_handler || !ee_mouse_up_handler + || !ee_mouse_move_handler) { - ee_shutdown(engine); - DRETURN_INT(FALSE, DLEVEL_STABLE); + ee_shutdown(engine); + DRETURN_INT(FALSE, DLEVEL_STABLE); } info = NEW(Ewl_Engine_Info, 1); @@ -113,23 +113,23 @@ DCHECK_PARAM_PTR(engine); if (ee_key_down_handler) - ecore_event_handler_del(ee_key_down_handler); + ecore_event_handler_del(ee_key_down_handler); ee_key_down_handler = NULL; if (ee_key_up_handler) - ecore_event_handler_del(ee_key_up_handler); + ecore_event_handler_del(ee_key_up_handler); ee_key_up_handler = NULL; if (ee_mouse_down_handler) - ecore_event_handler_del(ee_mouse_down_handler); + ecore_event_handler_del(ee_mouse_down_handler); ee_mouse_down_handler = NULL; if (ee_mouse_up_handler) - ecore_event_handler_del(ee_mouse_up_handler); + ecore_event_handler_del(ee_mouse_up_handler); ee_mouse_up_handler = NULL; if (ee_mouse_move_handler) - ecore_event_handler_del(ee_mouse_move_handler); + ecore_event_handler_del(ee_mouse_move_handler); ee_mouse_move_handler = NULL; ecore_fb_shutdown(); @@ -157,8 +157,8 @@ info = evas_engine_info_get(evas); if (!info) { - fprintf(stderr, "Unable to use evas_fb engine for rendering, "); - exit(-1); + fprintf(stderr, "Unable to use evas_fb engine for rendering, "); + exit(-1); } win->window = fbinfo = (Evas_Engine_Info_FB *)info; @@ -173,11 +173,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); EWL_ENGINE_EVAS_FB(EWL_EMBED(win)->engine)->window = win; @@ -199,7 +199,7 @@ embed = EWL_EMBED(engine->window); if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); ewl_embed_key_down_feed(embed, ev->keyname, ewl_ev_modifiers_get()); @@ -220,7 +220,7 @@ embed = EWL_EMBED(engine->window); if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); ewl_embed_key_down_feed(embed, ev->keyname, ewl_ev_modifiers_get()); @@ -243,12 +243,12 @@ embed = EWL_EMBED(engine->window); if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); if (ev->double_click) - clicks = 2; + clicks = 2; if (ev->triple_click) - clicks = 3; + clicks = 3; key_modifiers = ewl_ev_modifiers_get(); @@ -257,7 +257,7 @@ ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers); ewl_embed_mouse_down_feed(embed, ev->button, clicks, ev->x, ev->y, - key_modifiers); + key_modifiers); DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -277,7 +277,7 @@ embed = EWL_EMBED(engine->window); if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); key_modifiers = ewl_ev_modifiers_get(); ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers); @@ -300,10 +300,10 @@ embed = EWL_EMBED(engine->window); if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); ewl_embed_mouse_move_feed(embed, ev->x, ev->y, - ewl_ev_modifiers_get()); + ewl_ev_modifiers_get()); DRETURN_INT(TRUE, 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