Menu
▾
▴
E SVN: raster IN trunk/ecore: . src/lib/ecore_evas
|
From: Enlightenment S. <no-...@en...> - 2012-10-15 13:02:53
|
Log: 16bpp ecore-evas support gone now its gone in evas. Author: raster Date: 2012-10-15 06:02:39 -0700 (Mon, 15 Oct 2012) New Revision: 77998 Trac: http://trac.enlightenment.org/e/changeset/77998 Modified: trunk/ecore/ChangeLog trunk/ecore/NEWS trunk/ecore/configure.ac trunk/ecore/src/lib/ecore_evas/Ecore_Evas.h trunk/ecore/src/lib/ecore_evas/ecore_evas.c trunk/ecore/src/lib/ecore_evas/ecore_evas_private.h trunk/ecore/src/lib/ecore_evas/ecore_evas_win32.c trunk/ecore/src/lib/ecore_evas/ecore_evas_wince.c trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c Modified: trunk/ecore/ChangeLog =================================================================== --- trunk/ecore/ChangeLog 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/ChangeLog 2012-10-15 13:02:39 UTC (rev 77998) @@ -1002,3 +1002,8 @@ 2012-10-10 Michal Pakula vel Rutka * Fix: Send ECORE_X_EVENT_SELECTION_NOTIFY even if there is no data. + +2012-10-15 Carsten Haitzler (The Rasterman) + + * Since evas has 16bit engines removed, remove support from ecore-evas. + Modified: trunk/ecore/NEWS =================================================================== --- trunk/ecore/NEWS 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/NEWS 2012-10-15 13:02:39 UTC (rev 77998) @@ -39,6 +39,9 @@ - ecore_x_randr to actually return crtcs outputs properly. - send ECORE_X_EVENT_SELECTION_NOTIFY even if there is no data. +Removal: + * 16bpp evas engine support removed (API still there, but inactive). + Improvements: Ecore 1.7.0 Modified: trunk/ecore/configure.ac =================================================================== --- trunk/ecore/configure.ac 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/configure.ac 2012-10-15 13:02:39 UTC (rev 77998) @@ -157,21 +157,18 @@ want_ecore_evas_software_buffer="yes" want_ecore_evas_software_x11="no" want_ecore_evas_opengl_x11="no" -want_ecore_evas_software_16_x11="no" want_ecore_evas_software_8_x11="no" want_ecore_evas_software_xcb="no" want_ecore_evas_software_gdi="no" want_ecore_evas_software_ddraw="no" want_ecore_evas_direct3d="no" want_ecore_evas_opengl_glew="no" -want_ecore_evas_software_16_ddraw="no" want_ecore_evas_software_sdl="no" want_ecore_evas_gl_sdl="no" want_ecore_evas_gl_cocoa="no" want_ecore_evas_psl1ght="no" want_ecore_evas_directfb="no" want_ecore_evas_fb="no" -want_ecore_evas_software_16_wince="no" want_ecore_evas_ews="yes" want_ecore_evas_extn="yes" want_ecore_evas_wayland_shm="no" @@ -188,7 +185,6 @@ want_ecore_con_eet="no" want_ecore_ipc="no" want_ecore_wince="yes" - want_ecore_evas_software_16_wince="yes" want_ecore_evas_extn="no" ;; mingw*) @@ -203,7 +199,6 @@ want_ecore_evas_software_ddraw="yes" want_ecore_evas_direct3d="yes" want_ecore_evas_opengl_glew="yes" - want_ecore_evas_software_16_ddraw="auto" want_ecore_evas_software_sdl="yes" want_ecore_evas_gl_sdl="yes" ;; @@ -234,7 +229,6 @@ want_ecore_wayland="yes" want_ecore_evas_software_x11="yes" want_ecore_evas_opengl_x11="yes" - want_ecore_evas_software_16_x11="yes" want_ecore_evas_software_8_x11="yes" want_ecore_evas_software_xcb="no" want_ecore_evas_software_sdl="yes" @@ -1826,13 +1820,8 @@ fi fi -# ecore_evas_software_x11 16 bits +# ecore_evas_software_x11 8 bits -ECORE_EVAS_CHECK_MODULE([software-16-x11], - [${want_ecore_evas_software_16_x11}], - [Software Xlib 16 bits], - [${have_ecore_x_xlib}]) - ECORE_EVAS_CHECK_MODULE([software-8-x11], [$want_ecore_evas_software_8_x11], [Software 8bit X11], @@ -1842,7 +1831,6 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \ "x$have_ecore_evas_opengl_x11" = "xyes" -o \ "x$have_ecore_evas_software_8_x11" = "xyes" -o \ - "x$have_ecore_evas_software_16_x11" = "xyes" -o \ "x$have_ecore_evas_software_xcb" = "xyes"; then AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) requirements_ecore_evas="ecore-x >= 1.6.99 ${requirements_ecore_evas}" @@ -1870,16 +1858,10 @@ [Glew OpenGL], [${have_ecore_win32}]) -ECORE_EVAS_CHECK_MODULE([software-16-ddraw], - [${want_ecore_evas_software_16_ddraw}], - [16 bpp Software DirectDraw], - [${have_ecore_win32}]) - if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ "x${have_ecore_evas_software_ddraw}" = "xyes" -o \ "x${have_ecore_evas_direct3d}" = "xyes" -o \ - "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ - "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then + "x${have_ecore_evas_opengl_glew}" = "xyes" ; then AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) requirements_ecore_evas="ecore-win32 >= 1.6.99 ${requirements_ecore_evas}" fi @@ -1926,14 +1908,6 @@ [${have_ecore_fb}], [requirements_ecore_evas="ecore-fb >= 1.6.99 ${requirements_ecore_evas}"]) -# ecore_evas_wince - -ECORE_EVAS_CHECK_MODULE([software-16-wince], - [${want_ecore_evas_software_16_wince}], - [16 bpp Software Windows CE], - [${have_ecore_wince}], - [requirements_ecore_evas="ecore-wince >= 1.6.99 ${requirements_ecore_evas}"]) - # ecore_evas_ews ECORE_EVAS_CHECK_MODULE_FULL([ews], [software-buffer], @@ -2249,9 +2223,6 @@ echo " PSL1GHT....................: $have_ecore_evas_psl1ght" echo " Software Framebuffer.......: $have_ecore_evas_fb" echo " Software 8bit grayscale XCB: $have_ecore_evas_software_8_x11" - echo " Software 16bit X11.........: $have_ecore_evas_software_16_x11" - echo " Software 16bit DirectDraw..: $have_ecore_evas_software_16_ddraw" - echo " Software 16bit WinCE.......: $have_ecore_evas_software_16_wince" echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" echo " Wayland Shm................: $have_ecore_evas_wayland_shm" echo " Wayland Egl................: $have_ecore_evas_wayland_egl" Modified: trunk/ecore/src/lib/ecore_evas/Ecore_Evas.h =================================================================== --- trunk/ecore/src/lib/ecore_evas/Ecore_Evas.h 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/src/lib/ecore_evas/Ecore_Evas.h 2012-10-15 13:02:39 UTC (rev 77998) @@ -92,12 +92,12 @@ #define HAVE_ECORE_EVAS_X 1 #define HAVE_ECORE_EVAS_FB 1 #define HAVE_ECORE_EVAS_X11_GL 1 -#define HAVE_ECORE_EVAS_X11_16 1 +//#define HAVE_ECORE_EVAS_X11_16 1 #define HAVE_ECORE_EVAS_DIRECTFB 1 #define HAVE_ECORE_EVAS_WIN32 1 #define HAVE_ECORE_EVAS_COCOA 1 #define HAVE_ECORE_EVAS_SDL 1 -#define HAVE_ECORE_EVAS_WINCE 1 +//#define HAVE_ECORE_EVAS_WINCE 1 #define HAVE_ECORE_EVAS_EWS 1 #define HAVE_ECORE_EVAS_PSL1GHT 1 #define HAVE_ECORE_EVAS_WAYLAND_SHM 1 Modified: trunk/ecore/src/lib/ecore_evas/ecore_evas.c =================================================================== --- trunk/ecore/src/lib/ecore_evas/ecore_evas.c 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/src/lib/ecore_evas/ecore_evas.c 2012-10-15 13:02:39 UTC (rev 77998) @@ -166,23 +166,12 @@ #endif case ECORE_EVAS_ENGINE_SOFTWARE_16_X11: -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11 - return EINA_TRUE; -#else return EINA_FALSE; -#endif case ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW: -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW - return EINA_TRUE; -#else return EINA_FALSE; -#endif case ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE: -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE - return EINA_TRUE; -#else return EINA_FALSE; -#endif + case ECORE_EVAS_ENGINE_OPENGL_COCOA: #ifdef BUILD_ECORE_EVAS_OPENGL_COCOA return EINA_TRUE; @@ -318,9 +307,6 @@ #ifdef BUILD_ECORE_EVAS_DIRECTFB while (_ecore_evas_directfb_shutdown()); #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE - while (_ecore_evas_wince_shutdown()); -#endif if (_ecore_evas_async_events_fd) ecore_main_fd_handler_del(_ecore_evas_async_events_fd); @@ -492,22 +478,6 @@ } #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11 -static Ecore_Evas * -_ecore_evas_constructor_software_16_x11(int x, int y, int w, int h, const char *extra_options) -{ - Ecore_X_Window parent = 0; - char *disp_name = NULL; - Ecore_Evas *ee; - - _ecore_evas_parse_extra_options_x(extra_options, &disp_name, &parent); - ee = ecore_evas_software_x11_16_new(disp_name, parent, x, y, w, h); - free(disp_name); - - return ee; -} -#endif - #ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL static Ecore_Evas * _ecore_evas_constructor_sdl(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options) @@ -669,40 +639,6 @@ } #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW -static Ecore_Evas * -_ecore_evas_constructor_software_16_ddraw(int x, int y, int w, int h, const char *extra_options) -{ - return ecore_evas_software_16_ddraw_new(NULL, x, y, w, h); -} -#endif - -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE -static Ecore_Evas * -_ecore_evas_constructor_software_16_wince(int x, int y, int w, int h, const char *extra_options __UNUSED__) -{ - return ecore_evas_software_wince_new(NULL, x, y, w, h); -} - -static Ecore_Evas * -_ecore_evas_constructor_software_16_wince_fb(int x, int y, int w, int h, const char *extra_options __UNUSED__) -{ - return ecore_evas_software_wince_fb_new(NULL, x, y, w, h); -} - -static Ecore_Evas * -_ecore_evas_constructor_software_16_wince_gapi(int x, int y, int w, int h, const char *extra_options __UNUSED__) -{ - return ecore_evas_software_wince_gapi_new(NULL, x, y, w, h); -} - -static Ecore_Evas * -_ecore_evas_constructor_software_16_wince_gdi(int x, int y, int w, int h, const char *extra_options __UNUSED__) -{ - return ecore_evas_software_wince_gdi_new(NULL, x, y, w, h); -} -#endif - #ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER static Ecore_Evas * _ecore_evas_constructor_buffer(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options __UNUSED__) @@ -731,9 +667,6 @@ #ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11 {"software_8_x11", _ecore_evas_constructor_software_8_x11}, #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11 - {"software_16_x11", _ecore_evas_constructor_software_16_x11}, -#endif #ifdef BUILD_ECORE_EVAS_DIRECTFB {"directfb", _ecore_evas_constructor_directfb}, #endif @@ -754,15 +687,6 @@ #ifdef BUILD_ECORE_EVAS_OPENGL_GLEW {"opengl_glew", _ecore_evas_constructor_opengl_glew}, #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW - {"software_16_ddraw", _ecore_evas_constructor_software_16_ddraw}, -#endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE - {"software_16_wince", _ecore_evas_constructor_software_16_wince}, - {"software_16_wince_fb", _ecore_evas_constructor_software_16_wince_fb}, - {"software_16_wince_gapi", _ecore_evas_constructor_software_16_wince_gapi}, - {"software_16_wince_gdi", _ecore_evas_constructor_software_16_wince_gdi}, -#endif /* Apple */ #ifdef BUILD_ECORE_EVAS_OPENGL_COCOA Modified: trunk/ecore/src/lib/ecore_evas/ecore_evas_private.h =================================================================== --- trunk/ecore/src/lib/ecore_evas/ecore_evas_private.h 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/src/lib/ecore_evas/ecore_evas_private.h 2012-10-15 13:02:39 UTC (rev 77998) @@ -33,10 +33,6 @@ # include <Evas_Engine_Software_8_X11.h> #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11 -# include <Evas_Engine_Software_16_X11.h> -#endif - #ifdef BUILD_ECORE_EVAS_FB # include <Evas_Engine_FB.h> #endif @@ -64,16 +60,8 @@ # ifdef BUILD_ECORE_EVAS_OPENGL_GLEW # include <Evas_Engine_GL_Glew.h> # endif -# ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW -# include <Evas_Engine_Software_16_DDraw.h> -# endif #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE -# include "Ecore_WinCE.h" -# include <Evas_Engine_Software_16_WinCE.h> -#endif - #ifdef BUILD_ECORE_EVAS_GL_COCOA # include "Ecore_Cocoa.h" # include <Evas_Engine_Gl_Cocoa.h> @@ -266,14 +254,6 @@ } state; } win32; #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE - struct { - Ecore_WinCE_Window *window; - struct { - unsigned char fullscreen : 1; - } state; - } wince; -#endif #ifdef BUILD_ECORE_EVAS_EWS struct { Evas_Object *image; @@ -423,9 +403,6 @@ #ifdef BUILD_ECORE_EVAS_WIN32 int _ecore_evas_win32_shutdown(void); #endif -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE -int _ecore_evas_wince_shutdown(void); -#endif #ifdef BUILD_ECORE_EVAS_EWS void _ecore_evas_ews_events_init(void); int _ecore_evas_ews_shutdown(void); Modified: trunk/ecore/src/lib/ecore_evas/ecore_evas_win32.c =================================================================== --- trunk/ecore/src/lib/ecore_evas/ecore_evas_win32.c 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/src/lib/ecore_evas/ecore_evas_win32.c 2012-10-15 13:02:39 UTC (rev 77998) @@ -1290,49 +1290,6 @@ } #endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */ -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW -static int -_ecore_evas_engine_software_16_ddraw_init(Ecore_Evas *ee) -{ - Evas_Engine_Info_Software_DDraw *einfo; - const char *driver; - int rmethod; - - driver = "software_16_ddraw"; - - rmethod = evas_render_method_lookup(driver); - if (!rmethod) - return 0; - - ee->driver = driver; - evas_output_method_set(ee->evas, rmethod); - - if (ecore_win32_screen_depth_get() != 16) - return 0; - - einfo = (Evas_Engine_Info_Software_16_DDraw *)evas_engine_info_get(ee->evas); - if (einfo) - { - /* FIXME: REDRAW_DEBUG missing for now */ - einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window; - einfo->info.depth = ecore_win32_screen_depth_get(); - einfo->info.rotation = 0; - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - { - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - return 0; - } - } - else - { - ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver); - return 0; - } - - return 1; -} -#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW */ - #ifdef BUILD_ECORE_EVAS_WIN32 static Ecore_Evas * _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_init)(Ecore_Evas *ee), @@ -1474,26 +1431,7 @@ #endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW - EAPI Ecore_Evas * -ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent, - int x, - int y, - int width, - int height) -{ - return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_16_ddraw_init, - parent, - x, - y, - width, - height); -} - -#else - -EAPI Ecore_Evas * ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent __UNUSED__, int x __UNUSED__, int y __UNUSED__, @@ -1503,9 +1441,6 @@ return NULL; } -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW */ - - #ifdef BUILD_ECORE_EVAS_DIRECT3D EAPI Ecore_Evas * Modified: trunk/ecore/src/lib/ecore_evas/ecore_evas_wince.c =================================================================== --- trunk/ecore/src/lib/ecore_evas/ecore_evas_wince.c 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/src/lib/ecore_evas/ecore_evas_wince.c 2012-10-15 13:02:39 UTC (rev 77998) @@ -6,1008 +6,62 @@ #include <Ecore.h> #include "ecore_private.h" -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE -# define WIN32_LEAN_AND_MEAN -# include <windows.h> -# undef WIN32_LEAN_AND_MEAN -# include <Ecore_WinCE.h> -# include <ecore_wince_private.h> -#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ #include "ecore_evas_private.h" #include "Ecore_Evas.h" -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE - -#define ECORE_EVAS_EVENT_COUNT 9 - -static int _ecore_evas_init_count = 0; - -static Ecore_Event_Handler *ecore_evas_event_handlers[ECORE_EVAS_EVENT_COUNT]; - -static Eina_Bool _ecore_evas_wince_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event); - -static Eina_Bool _ecore_evas_wince_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event); - -/* Private functions */ - -static int -_ecore_evas_wince_render(Ecore_Evas *ee) +EAPI Ecore_Evas * +ecore_evas_software_wince_new(Ecore_WinCE_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) { - int rend = 0; - Eina_List *updates = NULL; - Eina_List *ll; - Ecore_Evas *ee2; - - EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2) - { - if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2); - if (ee2->engine.func->fn_render) - rend |= ee2->engine.func->fn_render(ee2); - if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2); - } - - if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee); - if (ee->prop.avoid_damage) - { - updates = evas_render_updates(ee->evas); - if (updates) evas_render_updates_free(updates); - } - else if ((ee->visible) || - ((ee->should_be_visible) && (ee->prop.fullscreen)) || - ((ee->should_be_visible) && (ee->prop.override))) - { - if (ee->shaped) - { - updates = evas_render_updates(ee->evas); - if (updates) evas_render_updates_free(updates); - } - else - { - updates = evas_render_updates(ee->evas); - if (updates) evas_render_updates_free(updates); - } - } - else - evas_norender(ee->evas); - if (updates) rend = 1; - if (ee->func.fn_post_render) ee->func.fn_post_render(ee); - return rend; -} - -static int -_ecore_evas_wince_init(void) -{ - _ecore_evas_init_count++; - if (_ecore_evas_init_count > 1) - return _ecore_evas_init_count; - - ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_WINCE_EVENT_MOUSE_IN, _ecore_evas_wince_event_mouse_in, NULL); - ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_WINCE_EVENT_MOUSE_OUT, _ecore_evas_wince_event_mouse_out, NULL); - ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_FOCUS_IN, _ecore_evas_wince_event_window_focus_in, NULL); - ecore_evas_event_handlers[3] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_FOCUS_OUT, _ecore_evas_wince_event_window_focus_out, NULL); - ecore_evas_event_handlers[4] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_DAMAGE, _ecore_evas_wince_event_window_damage, NULL); - ecore_evas_event_handlers[5] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_DESTROY, _ecore_evas_wince_event_window_destroy, NULL); - ecore_evas_event_handlers[6] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_SHOW, _ecore_evas_wince_event_window_show, NULL); - ecore_evas_event_handlers[7] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_HIDE, _ecore_evas_wince_event_window_hide, NULL); - ecore_evas_event_handlers[8] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_DELETE_REQUEST, _ecore_evas_wince_event_window_delete_request, NULL); - - ecore_event_evas_init(); - return _ecore_evas_init_count; -} - -int -_ecore_evas_wince_shutdown(void) -{ - _ecore_evas_init_count--; - if (_ecore_evas_init_count == 0) - { - int i; - - for (i = 0; i < ECORE_EVAS_EVENT_COUNT; i++) - ecore_event_handler_del(ecore_evas_event_handlers[i]); - ecore_event_evas_shutdown(); - } - - if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0; - - return _ecore_evas_init_count; -} - -static Eina_Bool -_ecore_evas_wince_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Mouse_In *e; - - INF("mouse in"); - - e = event; - ee = ecore_event_window_match((Ecore_Window)e->window); - if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ - if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1; - - if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee); - /* FIXME to do */ -/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */ - evas_event_feed_mouse_in(ee->evas, e->time, NULL); - _ecore_evas_mouse_move_process(ee, e->x, e->y, e->time); - - return 1; -} - -static Eina_Bool -_ecore_evas_wince_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Mouse_Out *e; - - INF("mouse out"); - - e = event; - ee = ecore_event_window_match((Ecore_Window)e->window); - if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */ - if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1; - - /* FIXME to do */ -/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */ - _ecore_evas_mouse_move_process(ee, e->x, e->y, e->time); - - evas_event_feed_mouse_out(ee->evas, e->time, NULL); - if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee); - if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object); - - return 1; -} - -static Eina_Bool -_ecore_evas_wince_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Window_Focus_In *e; - - e = event; - ee = ecore_event_window_match(e->window); - if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; - if (e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON; - - ee->prop.focused = 1; - evas_focus_in(ee->evas); - if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee); - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_ecore_evas_wince_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Window_Focus_Out *e; - - e = event; - ee = ecore_event_window_match(e->window); - if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; - if (e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON; - - evas_focus_out(ee->evas); - ee->prop.focused = 0; - if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee); - return ECORE_CALLBACK_PASS_ON; -} - -static Eina_Bool -_ecore_evas_wince_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Window_Damage *e; - - INF("window damage"); - - e = event; - ee = ecore_event_window_match((Ecore_Window)e->window); - if (!ee) return 1; /* pass on event */ - if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1; - - if (ee->prop.avoid_damage) - { -#warning [ECORE] [WINCE] No Region code - } - else - { - if (ee->rotation == 0) - evas_damage_rectangle_add(ee->evas, - e->x, - e->y, - e->width, - e->height); - else if (ee->rotation == 90) - evas_damage_rectangle_add(ee->evas, - ee->h - e->y - e->height, - e->x, - e->height, - e->width); - else if (ee->rotation == 180) - evas_damage_rectangle_add(ee->evas, - ee->w - e->x - e->width, - ee->h - e->y - e->height, - e->width, - e->height); - else if (ee->rotation == 270) - evas_damage_rectangle_add(ee->evas, - e->y, - ee->w - e->x - e->width, - e->height, - e->width); - } - - return 1; -} - -static Eina_Bool -_ecore_evas_wince_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Window_Destroy *e; - - INF("window destroy"); - - e = event; - ee = ecore_event_window_match((Ecore_Window)e->window); - if (!ee) return 1; /* pass on event */ - if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1; - if (ee->func.fn_destroy) ee->func.fn_destroy(ee); - ecore_evas_free(ee); - - return 1; -} - -static Eina_Bool -_ecore_evas_wince_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Window_Show *e; - - INF("window show"); - - e = event; - ee = ecore_event_window_match((Ecore_Window)e->window); - if (!ee) return 1; /* pass on event */ - if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1; - if (ee->visible) return 0; /* dont pass it on */ - ee->visible = 1; - if (ee->func.fn_show) ee->func.fn_show(ee); - - return 1; -} - -static Eina_Bool -_ecore_evas_wince_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Window_Hide *e; - - INF("window hide"); - - e = event; - ee = ecore_event_window_match((Ecore_Window)e->window); - if (!ee) return 1; /* pass on event */ - if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1; - if (!ee->visible) return 0; /* dont pass it on */ - ee->visible = 0; - if (ee->func.fn_hide) ee->func.fn_hide(ee); - - return 1; -} - -static Eina_Bool -_ecore_evas_wince_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event) -{ - Ecore_Evas *ee; - Ecore_WinCE_Event_Window_Delete_Request *e; - - INF("window delete request"); - - e = event; - ee = ecore_event_window_match((Ecore_Window)e->window); - if (!ee) return 1; /* pass on event */ - if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1; - if (ee->func.fn_delete_request) ee->func.fn_delete_request(ee); - - return 1; -} - - -/* Ecore_Evas interface */ - -static void -_ecore_evas_wince_free(Ecore_Evas *ee) -{ - INF("ecore evas free"); - - ecore_wince_window_free((Ecore_WinCE_Window *)ee->prop.window); - ecore_event_window_unregister(ee->prop.window); - _ecore_evas_wince_shutdown(); - ecore_wince_shutdown(); -} - -static void -_ecore_evas_wince_callback_delete_request_set(Ecore_Evas *ee, - Ecore_Evas_Event_Cb func) -{ - ee->func.fn_delete_request = func; -} - -static void -_ecore_evas_wince_move(Ecore_Evas *ee, int x, int y) -{ - INF("ecore evas move (%dx%d)", x, y); - ee->req.x = x; - ee->req.y = y; - - if ((x != ee->x) || (y != ee->y)) - { - ee->x = x; - ee->y = y; - ecore_wince_window_move((Ecore_WinCE_Window *)ee->prop.window, x, y); - if (ee->func.fn_move) ee->func.fn_move(ee); - } -} - -static void -_ecore_evas_wince_resize(Ecore_Evas *ee, int width, int height) -{ - INF("ecore evas resize (%dx%d)", width, height); - ee->req.w = width; - ee->req.h = height; - - if ((ee->w != width) || (ee->h != height)) - { - ee->w = width; - ee->h = height; - ecore_wince_window_resize((Ecore_WinCE_Window *)ee->prop.window, width, height); - if ((ee->rotation == 90) || (ee->rotation == 270)) - { - evas_output_size_set(ee->evas, ee->h, ee->w); - evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w); - } - else - { - evas_output_size_set(ee->evas, ee->w, ee->h); - evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); - } - /* FIXME: damage and shape */ - - if (ee->func.fn_resize) ee->func.fn_resize(ee); - } -} - -static void -_ecore_evas_wince_move_resize(Ecore_Evas *ee, int x, int y, int width, int height) -{ - INF("ecore evas resize (%dx%d %dx%d)", x, y, width, height); - ee->req.x = x; - ee->req.y = y; - ee->req.w = width; - ee->req.h = height; - - if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y)) - { - int change_size = 0; - int change_pos = 0; - - if ((ee->w != width) || (ee->h != height)) change_size = 1; - if ((x != ee->x) || (y != ee->y)) change_pos = 1; - - ee->x = x; - ee->y = y; - ee->w = width; - ee->h = height; - ecore_wince_window_move_resize((Ecore_WinCE_Window *)ee->prop.window, x, y, width, height); - if ((ee->rotation == 90) || (ee->rotation == 270)) - { - evas_output_size_set(ee->evas, ee->h, ee->w); - evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w); - } - else - { - evas_output_size_set(ee->evas, ee->w, ee->h); - evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); - } - /* FIXME: damage and shape */ - if (change_pos) - { - if (ee->func.fn_move) ee->func.fn_move(ee); - } - if (change_size) - { - if (ee->func.fn_resize) ee->func.fn_resize(ee); - } - } -} - -/* static void */ -/* _ecore_evas_wince_rotation_set(Ecore_Evas *ee, int rotation) */ -/* { */ -/* int rot_dif; */ - -/* if (ee->rotation == rotation) return; */ -/* rot_dif = ee->rotation - rotation; */ -/* if (rot_dif < 0) rot_dif = -rot_dif; */ -/* if (!strcmp(ee->driver, "software_ddraw")) */ -/* { */ -/* Evas_Engine_Info_Software_16_WinCE *einfo; */ - -/* einfo = (Evas_Engine_Info_Software_16_WinCE *)evas_engine_info_get(ee->evas); */ -/* if (!einfo) return; */ -/* if (rot_dif != 180) */ -/* { */ -/* int minw, minh, maxw, maxh, basew, baseh, stepw, steph; */ - -/* einfo->info.rotation = rotation; */ -/* evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); */ -/* if (!ee->prop.fullscreen) */ -/* { */ -/* ecore_wince_window_resize(ee->prop.window, ee->h, ee->w); */ -/* ee->expecting_resize.w = ee->h; */ -/* ee->expecting_resize.h = ee->w; */ -/* } */ -/* else */ -/* { */ -/* int w, h; */ - -/* ecore_wince_window_size_get(ee->prop.window, &w, &h); */ -/* ecore_wince_window_resize(ee->prop.window, h, w); */ -/* if ((rotation == 0) || (rotation == 180)) */ -/* { */ -/* evas_output_size_set(ee->evas, ee->w, ee->h); */ -/* evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); */ -/* } */ -/* else */ -/* { */ -/* evas_output_size_set(ee->evas, ee->h, ee->w); */ -/* evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w); */ -/* } */ -/* if (ee->func.fn_resize) ee->func.fn_resize(ee); */ -/* } */ -/* ecore_evas_size_min_get(ee, &minw, &minh); */ -/* ecore_evas_size_max_get(ee, &maxw, &maxh); */ -/* ecore_evas_size_base_get(ee, &basew, &baseh); */ -/* ecore_evas_size_step_get(ee, &stepw, &steph); */ -/* ee->rotation = rotation; */ -/* ecore_evas_size_min_set(ee, minh, minw); */ -/* ecore_evas_size_max_set(ee, maxh, maxw); */ -/* ecore_evas_size_base_set(ee, baseh, basew); */ -/* ecore_evas_size_step_set(ee, steph, stepw); */ -/* _ecore_evas_wince_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, */ -/* ecore_wince_current_time_get()); */ -/* } */ -/* else */ -/* { */ -/* einfo->info.rotation = rotation; */ -/* evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); */ -/* ee->rotation = rotation; */ -/* _ecore_evas_wince_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, */ -/* ecore_wince_current_time_get()); */ -/* if (ee->func.fn_resize) ee->func.fn_resize(ee); */ -/* } */ -/* if ((ee->rotation == 90) || (ee->rotation == 270)) */ -/* evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w); */ -/* else */ -/* evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); */ -/* } */ -/* } */ - -static void -_ecore_evas_wince_show(Ecore_Evas *ee) -{ - INF("ecore evas show"); - - ee->should_be_visible = 1; - if (ee->prop.avoid_damage) - _ecore_evas_wince_render(ee); - ecore_wince_window_show((Ecore_WinCE_Window *)ee->prop.window); -/* if (ee->prop.fullscreen) */ -/* ecore_wince_window_focus(ee->prop.window); */ -} - -static void -_ecore_evas_wince_hide(Ecore_Evas *ee) -{ - INF("ecore evas hide"); - - ecore_wince_window_hide((Ecore_WinCE_Window *)ee->prop.window); - ee->should_be_visible = 0; -} - -/* static void */ -/* _ecore_evas_wince_raise(Ecore_Evas *ee) */ -/* { */ -/* if (!ee->prop.fullscreen) */ -/* ecore_wince_window_raise(ee->prop.window); */ -/* else */ -/* ecore_wince_window_raise(ee->prop.window); */ -/* } */ - -/* static void */ -/* _ecore_evas_wince_lower(Ecore_Evas *ee) */ -/* { */ -/* if (!ee->prop.fullscreen) */ -/* ecore_wince_window_lower(ee->prop.window); */ -/* else */ -/* ecore_wince_window_lower(ee->prop.window); */ -/* } */ - -static void -_ecore_evas_wince_title_set(Ecore_Evas *ee, const char *title) -{ - INF("ecore evas title set"); - - if (ee->prop.title) free(ee->prop.title); - ee->prop.title = NULL; - if (title) ee->prop.title = strdup(title); - ecore_wince_window_title_set((Ecore_WinCE_Window *)ee->prop.window, ee->prop.title); -} - -/* static void */ -/* _ecore_evas_wince_size_min_set(Ecore_Evas *ee, int width, int height) */ -/* { */ -/* if (width < 0) width = 0; */ -/* if (height < 0) height = 0; */ -/* if ((ee->prop.min.w == width) && (ee->prop.min.h == height)) return; */ -/* ee->prop.min.w = width; */ -/* ee->prop.min.h = height; */ -/* ecore_wince_window_size_min_set(ee->prop.window, width, height); */ -/* } */ - -/* static void */ -/* _ecore_evas_wince_size_max_set(Ecore_Evas *ee, int width, int height) */ -/* { */ -/* if (width < 0) width = 0; */ -/* if (height < 0) height = 0; */ -/* if ((ee->prop.max.w == width) && (ee->prop.max.h == height)) return; */ -/* ee->prop.max.w = width; */ -/* ee->prop.max.h = height; */ -/* ecore_wince_window_size_max_set(ee->prop.window, width, height); */ -/* } */ - -/* static void */ -/* _ecore_evas_wince_size_base_set(Ecore_Evas *ee, int width, int height) */ -/* { */ -/* if (width < 0) width = 0; */ -/* if (height < 0) height = 0; */ -/* if ((ee->prop.base.w == width) && (ee->prop.base.h == height)) return; */ -/* ee->prop.base.w = width; */ -/* ee->prop.base.h = height; */ -/* ecore_wince_window_size_base_set(ee->prop.window, width, height); */ -/* } */ - -/* static void */ -/* _ecore_evas_wince_size_step_set(Ecore_Evas *ee, int width, int height) */ -/* { */ -/* if (width < 1) width = 1; */ -/* if (height < 1) height = 1; */ -/* if ((ee->prop.step.w == width) && (ee->prop.step.h == height)) return; */ -/* ee->prop.step.w = width; */ -/* ee->prop.step.h = height; */ -/* ecore_wince_window_size_step_set(ee->prop.window, width, height); */ -/* } */ - -static void -_ecore_evas_wince_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y) -{ -#if 0 - int x, y; - - if (ee->prop.cursor.object) evas_object_del(ee->prop.cursor.object); - - if (obj == NULL) - { - ee->prop.cursor.object = NULL; - ee->prop.cursor.layer = 0; - ee->prop.cursor.hot.x = 0; - ee->prop.cursor.hot.y = 0; - ecore_wince_window_cursor_show(ee->prop.window, 1); - return; - } - - ee->prop.cursor.object = obj; - ee->prop.cursor.layer = layer; - ee->prop.cursor.hot.x = hot_x; - ee->prop.cursor.hot.y = hot_y; - - ecore_wince_window_cursor_show(ee->prop.window, 0); - - evas_pointer_output_xy_get(ee->evas, &x, &y); - evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer); - evas_object_move(ee->prop.cursor.object, - x - ee->prop.cursor.hot.x, - y - ee->prop.cursor.hot.y); - evas_object_pass_events_set(ee->prop.cursor.object, 1); - if (evas_pointer_inside_get(ee->evas)) - evas_object_show(ee->prop.cursor.object); -#endif -} - -static void -_ecore_evas_wince_focus_set(Ecore_Evas *ee, int on __UNUSED__) -{ - ecore_wince_window_focus(ee->prop.window); -} - -/* static void */ -/* _ecore_evas_wince_iconified_set(Ecore_Evas *ee, int on) */ -/* { */ -/* /\* if (((ee->prop.borderless) && (on)) || *\/ */ -/* /\* ((!ee->prop.borderless) && (!on))) return; *\/ */ -/* ee->prop.iconified = on; */ -/* ecore_wince_window_iconified_set(ee->prop.window, ee->prop.iconified); */ -/* } */ - -/* static void */ -/* _ecore_evas_wince_borderless_set(Ecore_Evas *ee, int on) */ -/* { */ -/* if (((ee->prop.borderless) && (on)) || */ -/* ((!ee->prop.borderless) && (!on))) return; */ -/* ee->prop.borderless = on; */ -/* ecore_wince_window_borderless_set(ee->prop.window, ee->prop.borderless); */ -/* } */ - -static void -_ecore_evas_wince_fullscreen_set(Ecore_Evas *ee, int on) -{ - Evas_Engine_Info_Software_16_WinCE *einfo; - struct _Ecore_WinCE_Window *window; - - INF("ecore evas fullscreen set"); - - if ((ee->engine.wince.state.fullscreen && on) || - (!ee->engine.wince.state.fullscreen && !on)) - return; - - ee->engine.wince.state.fullscreen = on; - ee->prop.fullscreen = on; - - window = (struct _Ecore_WinCE_Window *)ee->prop.window; - - if (on != 0) - { -/* ecore_win32_window_shape_set(ee->engine.win32.window, 0, 0, NULL); */ - ecore_wince_window_fullscreen_set((Ecore_WinCE_Window *)ee->prop.window, on); - ee->w = GetSystemMetrics(SM_CXSCREEN); - ee->h = GetSystemMetrics(SM_CYSCREEN); - ee->req.w = ee->w; - ee->req.h = ee->h; - evas_output_size_set(ee->evas, ee->w, ee->h); - evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); - } - else - { - int w; - int h; - - ecore_wince_window_fullscreen_set((Ecore_WinCE_Window *)ee->prop.window, on); - ecore_wince_window_size_get((Ecore_WinCE_Window *)ee->prop.window, &w, &h); - ee->w = w; - ee->h = h; - ee->req.w = ee->w; - ee->req.h = ee->h; - evas_output_size_set(ee->evas, ee->w, ee->h); - evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); -/* ecore_win32_window_shape_set(window, */ -/* window->shape.width, */ -/* window->shape.height, */ -/* window->shape.mask); */ - } - - einfo = (Evas_Engine_Info_Software_16_WinCE *)evas_engine_info_get(ecore_evas_get(ee)); - if (einfo) - { - einfo->info.fullscreen = !!on; -/* einfo->info.layered = window->shape.layered; */ - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - { - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - } - } -} - -static void -_ecore_evas_wince_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi) -{ - HDC dc; - - dc = GetDC(NULL); - if (!dc) - { - if (xdpi) *xdpi = 0; - if (ydpi) *ydpi = 0; - return; - } - - if (xdpi) *xdpi = GetDeviceCaps(dc, LOGPIXELSX); - if (ydpi) *ydpi = GetDeviceCaps(dc, LOGPIXELSY); - - ReleaseDC(NULL, dc); -} - -static Ecore_Evas_Engine_Func _ecore_wince_engine_func = -{ - _ecore_evas_wince_free, - NULL, - NULL, - NULL, - NULL, - _ecore_evas_wince_callback_delete_request_set, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - _ecore_evas_wince_move, - NULL, - _ecore_evas_wince_resize, - _ecore_evas_wince_move_resize, - NULL, //_ecore_evas_wince_rotation_set, - NULL, /* _ecore_evas_x_shaped_set */ - _ecore_evas_wince_show, - _ecore_evas_wince_hide, - NULL, //_ecore_evas_wince_raise, - NULL, //_ecore_evas_wince_lower, - NULL, //_ecore_evas_wince_activate, - _ecore_evas_wince_title_set, - NULL, /* _ecore_evas_x_name_class_set */ - NULL, //_ecore_evas_wince_size_min_set, - NULL, //_ecore_evas_wince_size_max_set, - NULL, //_ecore_evas_wince_size_base_set, - NULL, //_ecore_evas_wince_size_step_set, - _ecore_evas_wince_cursor_set, - NULL, /* _ecore_evas_x_layer_set */ - _ecore_evas_wince_focus_set, - NULL, //_ecore_evas_wince_iconified_set, - NULL, //_ecore_evas_wince_borderless_set, - NULL, /* _ecore_evas_x_override_set */ - NULL, - _ecore_evas_wince_fullscreen_set, - NULL, /* _ecore_evas_x_avoid_damage_set */ - NULL, /* _ecore_evas_x_withdrawn_set */ - NULL, /* _ecore_evas_x_sticky_set */ - NULL, /* _ecore_evas_x_ignore_events_set */ - NULL, /* _ecore_evas_x_alpha_set */ - NULL, //transparent - NULL, // profiles_set - - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - - NULL, // render - NULL, // screen_geometry_get - _ecore_evas_wince_screen_dpi_get -}; - -/* API */ - -static Ecore_Evas * -ecore_evas_software_wince_new_internal(int backend, - Ecore_WinCE_Window *parent, - int x, - int y, - int width, - int height, - int fullscreen) -{ - Evas_Engine_Info_Software_16_WinCE *einfo; - Ecore_Evas *ee; - int rmethod; - - rmethod = evas_render_method_lookup("software_16_wince"); - if (!rmethod) - return NULL; - - if (!ecore_wince_init()) - return NULL; - - ee = calloc(1, sizeof(Ecore_Evas)); - if (!ee) - { - ecore_wince_shutdown(); - return NULL; - } - - ECORE_MAGIC_SET(ee, ECORE_MAGIC_EVAS); - - if (!_ecore_evas_wince_init()) - { - free(ee); - ecore_wince_shutdown(); - return NULL; - } - - ee->engine.func = (Ecore_Evas_Engine_Func *)&_ecore_wince_engine_func; - - ee->driver = "software_16_wince"; - - if (width < 1) width = 1; - if (height < 1) height = 1; - ee->x = x; - ee->y = y; - ee->w = width; - ee->h = height; - ee->req.x = ee->x; - ee->req.y = ee->y; - ee->req.w = ee->w; - ee->req.h = ee->h; - - ee->prop.max.w = 32767; - ee->prop.max.h = 32767; - ee->prop.layer = 4; - ee->prop.request_pos = 0; - ee->prop.sticky = 0; - /* FIXME: sticky to add */ - - ee->prop.window = (Ecore_Window)ecore_wince_window_new((Ecore_WinCE_Window *)parent, x, y, width, height); - if (!ee->prop.window) - { - _ecore_evas_wince_shutdown(); - free(ee); - ecore_wince_shutdown(); - return NULL; - } - - ecore_wince_window_fullscreen_set((Ecore_WinCE_Window *)ee->prop.window, fullscreen); - - /* init evas here */ - ee->evas = evas_new(); - evas_data_attach_set(ee->evas, ee); - evas_output_method_set(ee->evas, rmethod); - evas_output_size_set(ee->evas, width, height); - evas_output_viewport_set(ee->evas, 0, 0, width, height); - - einfo = (Evas_Engine_Info_Software_16_WinCE *)evas_engine_info_get(ee->evas); - if (einfo) - { - /* FIXME: REDRAW_DEBUG missing for now */ - einfo->info.window = ((struct _Ecore_WinCE_Window *)ee->prop.window)->window; - einfo->info.width = width; - einfo->info.height = height; - einfo->info.backend = backend; - einfo->info.rotation = 0; - einfo->info.fullscreen = fullscreen; - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - { - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - _ecore_evas_wince_shutdown(); - free(ee); - ecore_wince_shutdown(); - return NULL; - } - - ecore_wince_window_backend_set((Ecore_WinCE_Window *)ee->prop.window, backend); - ecore_wince_window_suspend_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.suspend); - ecore_wince_window_resume_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.resume); - } - else - { - ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver); - _ecore_evas_wince_shutdown(); - free(ee); - ecore_wince_shutdown(); - return NULL; - } - - ee->engine.func->fn_render = _ecore_evas_wince_render; - _ecore_evas_register(ee); - ecore_event_window_register(ee->prop.window, ee, ee->evas, - (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, - (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, - (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process, - (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); - evas_focus_in(ee->evas); - - return ee; -} - -#else - -static Ecore_Evas * -ecore_evas_software_wince_new_internal(int backend __UNUSED__, - Ecore_WinCE_Window *parent __UNUSED__, - int x __UNUSED__, - int y __UNUSED__, - int width __UNUSED__, - int height __UNUSED__, - int fullscreen __UNUSED__) -{ return NULL; } -#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ - - EAPI Ecore_Evas * -ecore_evas_software_wince_new(Ecore_WinCE_Window *parent, - int x, - int y, - int width, - int height) +ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) { - return ecore_evas_software_wince_new_internal(0, parent, x, y, width, height, 1); + return NULL; } EAPI Ecore_Evas * -ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent, - int x, - int y, - int width, - int height) +ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) { - return ecore_evas_software_wince_new_internal(1, parent, x, y, width, height, 1); + return NULL; } EAPI Ecore_Evas * -ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent, - int x, - int y, - int width, - int height) +ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) { - return ecore_evas_software_wince_new_internal(2, parent, x, y, width, height, 1); + return NULL; } EAPI Ecore_Evas * -ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent, - int x, - int y, - int width, - int height) +ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent __UNUSED__, + int x __UNUSED__, + int y __UNUSED__, + int width __UNUSED__, + int height __UNUSED__) { - return ecore_evas_software_wince_new_internal(3, parent, x, y, width, height, 1); + return NULL; } -EAPI Ecore_Evas * -ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent, - int x, - int y, - int width, - int height) -{ - return ecore_evas_software_wince_new_internal(4, parent, x, y, width, height, 0); -} - -#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE - EAPI Ecore_WinCE_Window * -ecore_evas_software_wince_window_get(const Ecore_Evas *ee) -{ - return (Ecore_WinCE_Window *) ecore_evas_window_get(ee); -} - -#else - -EAPI Ecore_WinCE_Window * ecore_evas_software_wince_window_get(const Ecore_Evas *ee __UNUSED__) { return NULL; } - -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */ Modified: trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c =================================================================== --- trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c 2012-10-15 12:12:36 UTC (rev 77997) +++ trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c 2012-10-15 13:02:39 UTC (rev 77998) @@ -472,27 +472,6 @@ } #endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ } - else if (!strcmp(ee->driver, "software_16_x11")) - { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 -# if 0 /* XXX no shaped window support for software_16_x11 */ - Evas_Engine_Info_Software_16_X11 *einfo; - - einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas); - if (einfo) - { - if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask); - ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1); - einfo->info.mask = ee->engine.x.mask; - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - { - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - } - evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); - } -# endif /* XXX no shaped window support for software_16_x11 */ -#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ - } if (!strcmp(ee->driver, "software_8_x11")) { #if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) @@ -1780,27 +1759,6 @@ # endif #endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ } - else if (!strcmp(ee->driver, "software_16_x11")) - { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 - Evas_Engine_Info_Software_16_X11 *einfo; - - einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas); - if (!einfo) return; - einfo->info.rotation = rotation; - _ecore_evas_x_rotation_set_internal(ee, rotation, resize, - (Evas_Engine_Info *)einfo); -# if _USE_WIN_ROT_EFFECT - ecore_x_window_prop_property_set(ee->prop.window, - ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE, - ECORE_X_ATOM_CARDINAL, 32, &angles, 2); -# else - ecore_x_window_prop_property_set(ee->prop.window, - ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE, - ECORE_X_ATOM_CARDINAL, 32, &rotation, 1); -# endif -#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ - } else if (!strcmp(ee->driver, "software_8_x11")) { #if BUILD_ECORE_EVAS_SOFTWARE_8_X11 @@ -1887,42 +1845,6 @@ } #endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ } - else if (!strcmp(ee->driver, "software_16_x11")) - { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 -# if 0 /* XXX no shaped window support for software_16_x11 */ - Evas_Engine_Info_Software_16_X11 *einfo; - - einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas); - ee->shaped = shaped; - if (einfo) - { - if (ee->shaped) - { - ee->engine.x.mask = - ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1); - einfo->info.mask = ee->engine.x.mask; - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - { - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - } - evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); - } - else - { - if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask); - ee->engine.x.mask = 0; - einfo->info.mask = 0; - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - { - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - } - ecore_x_window_shape_mask_set(ee->prop.window, 0); - } - } -# endif /* XXX no shaped window support for software_16_x11 */ -#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ - } if (!strcmp(ee->driver, "software_8_x11")) { #if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) @@ -2185,89 +2107,6 @@ // putenv((char*)"DESKTOP_STARTUP_ID="); } } - else if (!strcmp(ee->driver, "software_16_x11")) - { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 - Evas_Engine_Info_Software_16_X11 *einfo; - - einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas); - if (!einfo) return; - - ee->shaped = 0; - ee->alpha = alpha; - ecore_x_window_free(ee->prop.window); - ecore_event_window_unregister(ee->prop.window); - if (ee->alpha) - { - if (ee->prop.override) - ee->prop.window = ecore_x_window_override_argb_new(ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h); - else - ee->prop.window = ecore_x_window_argb_new(ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h); - if (!ee->engine.x.mask) - ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->req.w, ee->req.h, 1); - } - else - { - if (ee->prop.override) - ee->prop.window = ecore_x_window_override_new(ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h); - else - ee->prop.window = ecore_x_window_new(ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h); - if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask); - ee->engine.x.mask = 0; - ecore_x_window_shape_input_mask_set(ee->prop.window, 0); - } - -# if 0 /* XXX no alpha window support for software_16_x11 */ - einfo->info.destination_alpha = alpha; -# endif /* XXX no alpha window support for software_16_x11 */ - -# if 0 /* XXX no shaped window support for software_16_x11 */ -// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask); -// ee->engine.x.mask = 0; - einfo->info.mask = ee->engine.x.mask; -# endif /* XXX no shaped window support for software_16_x11 */ - - einfo->info.drawable = ee->prop.window; - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - { - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - } - evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h); - ecore_x_window_shape_mask_set(ee->prop.window, 0); - ecore_x_input_multi_select(ee->prop.window); - ecore_event_window_register(ee->prop.window, ee, ee->evas, - (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, - (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, - (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process, - (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); - if (ee->prop.borderless) - ecore_x_mwm_borderless_set(ee->prop.window, ee->prop.borderless); - if (ee->visible) ecore_x_window_show(ee->prop.window); - if (ee->prop.focused) ecore_x_window_focus(ee->prop.window); - if (ee->prop.title) - { - ecore_x_icccm_title_set(ee->prop.window, ee->prop.title); - ecore_x_netwm_name_set(ee->prop.window, ee->prop.title); - } - if (ee->prop.name) - ecore_x_icccm_name_class_set(ee->prop.window, - ee->prop.name, ee->prop.clas); - _ecore_evas_x_hints_update(ee); - _ecore_evas_x_group_leader_update(ee); - ecore_x_window_defaults_set(ee->prop.window); - _ecore_evas_x_protocols_set(ee); - _ecore_evas_x_sync_set(ee); - _ecore_evas_x_size_pos_hints_update(ee); -#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */ - if ((id = getenv("DESKTOP_STARTUP_ID"))) - { - ecore_x_netwm_startup_id_set(ee->prop.window, id); - /* NB: on linux this may simply empty the env as opposed to completely - * unset it to being empty - unsure as solartis libc crashes looking - * for the '=' char */ - // putenv((char*)"DESKTOP_STARTUP_ID="); - } - } else if (!strcmp(ee->driver, "software_8_x11")) { #if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) @@ -2846,56 +2685,6 @@ } #endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ } - else if (!strcmp(ee->driver, "software_16_x11")) - { -#if BUILD_ECORE_EVAS_SOFTWARE_16_X11 - Evas_Engine_Info_Software_16_X11 *einfo; - - ee->prop.avoid_damage = on; - einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas); - if (einfo) - { - if (ee->prop.avoid_damage) - { - ee->engin... [truncated message content] |