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: - 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_fb/Ewl_Engine_Evas_Fb.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Ewl_Engine_Evas_Fb.h 23 Aug 2007 05:26:49 -0000 1.7 +++ Ewl_Engine_Evas_Fb.h 6 May 2008 20:20:36 -0000 1.8 @@ -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_FB_H #define EWL_ENGINE_EVAS_FB_H @@ -8,15 +8,15 @@ #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 { - Ewl_Engine engine; + Ewl_Engine engine; - /* There can be only one window in fb land */ - Ewl_Window *window; + /* There can be only one window in fb land */ + Ewl_Window *window; }; #endif =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_fb/ewl_engine_evas_fb.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ewl_engine_evas_fb.c 12 Nov 2007 22:42:20 -0000 1.20 +++ ewl_engine_evas_fb.c 6 May 2008 20:20:36 -0000 1.21 @@ -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_Fb.h" #include "ewl_macros.h" #include "ewl_private.h" @@ -21,290 +21,290 @@ static void ee_shutdown(Ewl_Engine *engine); static void *canvas_funcs[EWL_ENGINE_CANVAS_MAX] = - { - ee_canvas_setup, - NULL, NULL, NULL, NULL - }; + { + ee_canvas_setup, + NULL, NULL, 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 *argc __UNUSED__, char ** argv __UNUSED__) { - Ewl_Engine_Evas_Fb *engine; + Ewl_Engine_Evas_Fb *engine; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - engine = NEW(Ewl_Engine_Evas_Fb, 1); - if (!engine) - DRETURN_PTR(NULL, DLEVEL_STABLE); + engine = NEW(Ewl_Engine_Evas_Fb, 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); - if (ee_key_down_handler) - DRETURN_INT(TRUE, DLEVEL_STABLE); + if (ee_key_down_handler) + DRETURN_INT(TRUE, DLEVEL_STABLE); - if (!ecore_fb_init(NULL)) - DRETURN_INT(TRUE, DLEVEL_STABLE); - - ee_key_down_handler = ecore_event_handler_add( - 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); - ee_mouse_down_handler = ecore_event_handler_add( - 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); - ee_mouse_move_handler = ecore_event_handler_add( - 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_shutdown(engine); - DRETURN_INT(FALSE, DLEVEL_STABLE); - } - - info = NEW(Ewl_Engine_Info, 1); - info->shutdown = ee_shutdown; - info->hooks.canvas = canvas_funcs; + if (!ecore_fb_init(NULL)) + DRETURN_INT(TRUE, DLEVEL_STABLE); + + ee_key_down_handler = ecore_event_handler_add( + 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); + ee_mouse_down_handler = ecore_event_handler_add( + 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); + ee_mouse_move_handler = ecore_event_handler_add( + 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_shutdown(engine); + DRETURN_INT(FALSE, DLEVEL_STABLE); + } + + 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 (ee_key_down_handler) - ecore_event_handler_del(ee_key_down_handler); - ee_key_down_handler = NULL; + if (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); - ee_key_up_handler = NULL; + if (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); - ee_mouse_down_handler = NULL; + if (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); - ee_mouse_up_handler = NULL; + if (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); - ee_mouse_move_handler = NULL; + if (ee_mouse_move_handler) + ecore_event_handler_del(ee_mouse_move_handler); + ee_mouse_move_handler = NULL; - ecore_fb_shutdown(); + ecore_fb_shutdown(); - 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_FB *fbinfo; - 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("fb")); - - info = evas_engine_info_get(evas); - if (!info) - { - fprintf(stderr, "Unable to use evas_fb engine for rendering, "); - exit(-1); - } - - win->window = fbinfo = (Evas_Engine_Info_FB *)info; - - fbinfo->info.virtual_terminal = 0; - fbinfo->info.device_number = 0; - fbinfo->info.refresh = 0; - fbinfo->info.rotation = 0; - evas_engine_info_set(evas, (Evas_Engine_Info *)fbinfo); - ewl_object_geometry_request(EWL_OBJECT(win), 0, 0, 240, 320); - - 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_FB *fbinfo; + 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("fb")); + + info = evas_engine_info_get(evas); + if (!info) + { + fprintf(stderr, "Unable to use evas_fb engine for rendering, "); + exit(-1); + } + + win->window = fbinfo = (Evas_Engine_Info_FB *)info; + + fbinfo->info.virtual_terminal = 0; + fbinfo->info.device_number = 0; + fbinfo->info.refresh = 0; + fbinfo->info.rotation = 0; + evas_engine_info_set(evas, (Evas_Engine_Info *)fbinfo); + ewl_object_geometry_request(EWL_OBJECT(win), 0, 0, 240, 320); + + 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); - EWL_ENGINE_EVAS_FB(EWL_EMBED(win)->engine)->window = win; + EWL_ENGINE_EVAS_FB(EWL_EMBED(win)->engine)->window = win; - DLEAVE_FUNCTION(DLEVEL_STABLE); + DLEAVE_FUNCTION(DLEVEL_STABLE); } static int ewl_ev_fb_key_down(void *data, int type __UNUSED__, void *e) { - Ewl_Embed *embed; - Ewl_Engine_Evas_Fb *engine; - Ecore_Fb_Event_Key_Down *ev; + Ewl_Embed *embed; + Ewl_Engine_Evas_Fb *engine; + Ecore_Fb_Event_Key_Down *ev; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - ev = e; - engine = data; + ev = e; + engine = data; - embed = EWL_EMBED(engine->window); - if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + embed = EWL_EMBED(engine->window); + if (!embed) + DRETURN_INT(TRUE, DLEVEL_STABLE); - ewl_embed_key_down_feed(embed, ev->keyname, ewl_ev_modifiers_get()); + ewl_embed_key_down_feed(embed, ev->keyname, ewl_ev_modifiers_get()); - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); } static int ewl_ev_fb_key_up(void *data, int type __UNUSED__, void *e) { - Ewl_Embed *embed; - Ewl_Engine_Evas_Fb *engine; - Ecore_Fb_Event_Key_Up *ev; + Ewl_Embed *embed; + Ewl_Engine_Evas_Fb *engine; + Ecore_Fb_Event_Key_Up *ev; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - ev = e; - engine = data; + ev = e; + engine = data; - embed = EWL_EMBED(engine->window); - if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + embed = EWL_EMBED(engine->window); + if (!embed) + DRETURN_INT(TRUE, DLEVEL_STABLE); - ewl_embed_key_down_feed(embed, ev->keyname, ewl_ev_modifiers_get()); + ewl_embed_key_down_feed(embed, ev->keyname, ewl_ev_modifiers_get()); - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); } static int ewl_ev_fb_mouse_down(void *data, int type __UNUSED__, void *e) { - int clicks = 1; - Ewl_Embed *embed; - Ewl_Engine_Evas_Fb *engine; - Ecore_Fb_Event_Mouse_Button_Down *ev; - unsigned int key_modifiers; + int clicks = 1; + Ewl_Embed *embed; + Ewl_Engine_Evas_Fb *engine; + Ecore_Fb_Event_Mouse_Button_Down *ev; + unsigned int key_modifiers; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - ev = e; - engine = data; + ev = e; + engine = data; - embed = EWL_EMBED(engine->window); - if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + embed = EWL_EMBED(engine->window); + if (!embed) + DRETURN_INT(TRUE, DLEVEL_STABLE); - if (ev->double_click) - clicks = 2; - if (ev->triple_click) - clicks = 3; + if (ev->double_click) + clicks = 2; + if (ev->triple_click) + clicks = 3; - key_modifiers = ewl_ev_modifiers_get(); + key_modifiers = ewl_ev_modifiers_get(); - /* Feed a mouse move, since they don't occur prior to mouse down on a - * touchscreen */ - ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers); + /* Feed a mouse move, since they don't occur prior to mouse down on a + * touchscreen */ + 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); + ewl_embed_mouse_down_feed(embed, ev->button, clicks, ev->x, ev->y, + key_modifiers); - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); } static int ewl_ev_fb_mouse_up(void *data, int type __UNUSED__, void *e) { - Ewl_Embed *embed; - Ewl_Engine_Evas_Fb *engine; - Ecore_Fb_Event_Mouse_Button_Up *ev; - unsigned int key_modifiers; + Ewl_Embed *embed; + Ewl_Engine_Evas_Fb *engine; + Ecore_Fb_Event_Mouse_Button_Up *ev; + unsigned int key_modifiers; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - ev = e; - engine = data; + ev = e; + engine = data; - embed = EWL_EMBED(engine->window); - if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + embed = EWL_EMBED(engine->window); + if (!embed) + DRETURN_INT(TRUE, DLEVEL_STABLE); - key_modifiers = ewl_ev_modifiers_get(); - ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers); - ewl_embed_mouse_up_feed(embed, ev->button, ev->x, ev->y, key_modifiers); + key_modifiers = ewl_ev_modifiers_get(); + ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers); + ewl_embed_mouse_up_feed(embed, ev->button, ev->x, ev->y, key_modifiers); - DRETURN_INT(TRUE, DLEVEL_STABLE); + DRETURN_INT(TRUE, DLEVEL_STABLE); } static int ewl_ev_fb_mouse_move(void *data, int type __UNUSED__, void *e) { - Ewl_Embed *embed; - Ewl_Engine_Evas_Fb *engine; - Ecore_Fb_Event_Mouse_Move *ev; + Ewl_Embed *embed; + Ewl_Engine_Evas_Fb *engine; + Ecore_Fb_Event_Mouse_Move *ev; - DENTER_FUNCTION(DLEVEL_STABLE); + DENTER_FUNCTION(DLEVEL_STABLE); - ev = e; - engine = data; + ev = e; + engine = data; - embed = EWL_EMBED(engine->window); - if (!embed) - DRETURN_INT(TRUE, DLEVEL_STABLE); + embed = EWL_EMBED(engine->window); + if (!embed) + DRETURN_INT(TRUE, DLEVEL_STABLE); - ewl_embed_mouse_move_feed(embed, ev->x, ev->y, - ewl_ev_modifiers_get()); + ewl_embed_mouse_move_feed(embed, ev->x, ev->y, + ewl_ev_modifiers_get()); - DRETURN_INT(TRUE, DLEVEL_STABLE); + 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