summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-10-15 13:02:39 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-10-15 13:02:39 +0000
commit890e35cb11e8a9e0e130f302925c50207c726c65 (patch)
tree10bbc382e8b44740dbbb671c56ab02e8142ff8de /legacy
parent27ae7e7cdb6e5470e4213be634dcc78d04f4f041 (diff)
16bpp ecore-evas support gone now its gone in evas.
SVN revision: 77998
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/ChangeLog5
-rw-r--r--legacy/ecore/NEWS3
-rw-r--r--legacy/ecore/configure.ac33
-rw-r--r--legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h4
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas.c78
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h23
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c65
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c1006
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c458
9 files changed, 44 insertions, 1631 deletions
diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog
index 3a94577a0a..54a2df36c4 100644
--- a/legacy/ecore/ChangeLog
+++ b/legacy/ecore/ChangeLog
@@ -1002,3 +1002,8 @@
10022012-10-10 Michal Pakula vel Rutka 10022012-10-10 Michal Pakula vel Rutka
1003 1003
1004 * Fix: Send ECORE_X_EVENT_SELECTION_NOTIFY even if there is no data. 1004 * Fix: Send ECORE_X_EVENT_SELECTION_NOTIFY even if there is no data.
1005
10062012-10-15 Carsten Haitzler (The Rasterman)
1007
1008 * Since evas has 16bit engines removed, remove support from ecore-evas.
1009
diff --git a/legacy/ecore/NEWS b/legacy/ecore/NEWS
index b98676bb85..c13c44c77a 100644
--- a/legacy/ecore/NEWS
+++ b/legacy/ecore/NEWS
@@ -39,6 +39,9 @@ Fixes:
39 - ecore_x_randr to actually return crtcs outputs properly. 39 - ecore_x_randr to actually return crtcs outputs properly.
40 - send ECORE_X_EVENT_SELECTION_NOTIFY even if there is no data. 40 - send ECORE_X_EVENT_SELECTION_NOTIFY even if there is no data.
41 41
42Removal:
43 * 16bpp evas engine support removed (API still there, but inactive).
44
42Improvements: 45Improvements:
43 46
44Ecore 1.7.0 47Ecore 1.7.0
diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index 6b14164b88..59605bb810 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -157,21 +157,18 @@ want_ecore_evas="yes"
157want_ecore_evas_software_buffer="yes" 157want_ecore_evas_software_buffer="yes"
158want_ecore_evas_software_x11="no" 158want_ecore_evas_software_x11="no"
159want_ecore_evas_opengl_x11="no" 159want_ecore_evas_opengl_x11="no"
160want_ecore_evas_software_16_x11="no"
161want_ecore_evas_software_8_x11="no" 160want_ecore_evas_software_8_x11="no"
162want_ecore_evas_software_xcb="no" 161want_ecore_evas_software_xcb="no"
163want_ecore_evas_software_gdi="no" 162want_ecore_evas_software_gdi="no"
164want_ecore_evas_software_ddraw="no" 163want_ecore_evas_software_ddraw="no"
165want_ecore_evas_direct3d="no" 164want_ecore_evas_direct3d="no"
166want_ecore_evas_opengl_glew="no" 165want_ecore_evas_opengl_glew="no"
167want_ecore_evas_software_16_ddraw="no"
168want_ecore_evas_software_sdl="no" 166want_ecore_evas_software_sdl="no"
169want_ecore_evas_gl_sdl="no" 167want_ecore_evas_gl_sdl="no"
170want_ecore_evas_gl_cocoa="no" 168want_ecore_evas_gl_cocoa="no"
171want_ecore_evas_psl1ght="no" 169want_ecore_evas_psl1ght="no"
172want_ecore_evas_directfb="no" 170want_ecore_evas_directfb="no"
173want_ecore_evas_fb="no" 171want_ecore_evas_fb="no"
174want_ecore_evas_software_16_wince="no"
175want_ecore_evas_ews="yes" 172want_ecore_evas_ews="yes"
176want_ecore_evas_extn="yes" 173want_ecore_evas_extn="yes"
177want_ecore_evas_wayland_shm="no" 174want_ecore_evas_wayland_shm="no"
@@ -188,7 +185,6 @@ case "$host_os" in
188 want_ecore_con_eet="no" 185 want_ecore_con_eet="no"
189 want_ecore_ipc="no" 186 want_ecore_ipc="no"
190 want_ecore_wince="yes" 187 want_ecore_wince="yes"
191 want_ecore_evas_software_16_wince="yes"
192 want_ecore_evas_extn="no" 188 want_ecore_evas_extn="no"
193 ;; 189 ;;
194 mingw*) 190 mingw*)
@@ -203,7 +199,6 @@ case "$host_os" in
203 want_ecore_evas_software_ddraw="yes" 199 want_ecore_evas_software_ddraw="yes"
204 want_ecore_evas_direct3d="yes" 200 want_ecore_evas_direct3d="yes"
205 want_ecore_evas_opengl_glew="yes" 201 want_ecore_evas_opengl_glew="yes"
206 want_ecore_evas_software_16_ddraw="auto"
207 want_ecore_evas_software_sdl="yes" 202 want_ecore_evas_software_sdl="yes"
208 want_ecore_evas_gl_sdl="yes" 203 want_ecore_evas_gl_sdl="yes"
209 ;; 204 ;;
@@ -234,7 +229,6 @@ case "$host_os" in
234 want_ecore_wayland="yes" 229 want_ecore_wayland="yes"
235 want_ecore_evas_software_x11="yes" 230 want_ecore_evas_software_x11="yes"
236 want_ecore_evas_opengl_x11="yes" 231 want_ecore_evas_opengl_x11="yes"
237 want_ecore_evas_software_16_x11="yes"
238 want_ecore_evas_software_8_x11="yes" 232 want_ecore_evas_software_8_x11="yes"
239 want_ecore_evas_software_xcb="no" 233 want_ecore_evas_software_xcb="no"
240 want_ecore_evas_software_sdl="yes" 234 want_ecore_evas_software_sdl="yes"
@@ -1826,12 +1820,7 @@ if test "x${have_ecore_evas_opengl_x11}" = "xyes" -o "x${have_ecore_evas_opengl_
1826 fi 1820 fi
1827fi 1821fi
1828 1822
1829# ecore_evas_software_x11 16 bits 1823# ecore_evas_software_x11 8 bits
1830
1831ECORE_EVAS_CHECK_MODULE([software-16-x11],
1832 [${want_ecore_evas_software_16_x11}],
1833 [Software Xlib 16 bits],
1834 [${have_ecore_x_xlib}])
1835 1824
1836ECORE_EVAS_CHECK_MODULE([software-8-x11], 1825ECORE_EVAS_CHECK_MODULE([software-8-x11],
1837 [$want_ecore_evas_software_8_x11], 1826 [$want_ecore_evas_software_8_x11],
@@ -1842,7 +1831,6 @@ ECORE_EVAS_CHECK_MODULE([software-8-x11],
1842if test "x$have_ecore_evas_software_x11" = "xyes" -o \ 1831if test "x$have_ecore_evas_software_x11" = "xyes" -o \
1843 "x$have_ecore_evas_opengl_x11" = "xyes" -o \ 1832 "x$have_ecore_evas_opengl_x11" = "xyes" -o \
1844 "x$have_ecore_evas_software_8_x11" = "xyes" -o \ 1833 "x$have_ecore_evas_software_8_x11" = "xyes" -o \
1845 "x$have_ecore_evas_software_16_x11" = "xyes" -o \
1846 "x$have_ecore_evas_software_xcb" = "xyes"; then 1834 "x$have_ecore_evas_software_xcb" = "xyes"; then
1847 AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) 1835 AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas])
1848 requirements_ecore_evas="ecore-x >= 1.6.99 ${requirements_ecore_evas}" 1836 requirements_ecore_evas="ecore-x >= 1.6.99 ${requirements_ecore_evas}"
@@ -1870,16 +1858,10 @@ ECORE_EVAS_CHECK_MODULE([opengl-glew],
1870 [Glew OpenGL], 1858 [Glew OpenGL],
1871 [${have_ecore_win32}]) 1859 [${have_ecore_win32}])
1872 1860
1873ECORE_EVAS_CHECK_MODULE([software-16-ddraw],
1874 [${want_ecore_evas_software_16_ddraw}],
1875 [16 bpp Software DirectDraw],
1876 [${have_ecore_win32}])
1877
1878if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ 1861if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \
1879 "x${have_ecore_evas_software_ddraw}" = "xyes" -o \ 1862 "x${have_ecore_evas_software_ddraw}" = "xyes" -o \
1880 "x${have_ecore_evas_direct3d}" = "xyes" -o \ 1863 "x${have_ecore_evas_direct3d}" = "xyes" -o \
1881 "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ 1864 "x${have_ecore_evas_opengl_glew}" = "xyes" ; then
1882 "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then
1883 AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) 1865 AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
1884 requirements_ecore_evas="ecore-win32 >= 1.6.99 ${requirements_ecore_evas}" 1866 requirements_ecore_evas="ecore-win32 >= 1.6.99 ${requirements_ecore_evas}"
1885fi 1867fi
@@ -1926,14 +1908,6 @@ ECORE_EVAS_CHECK_MODULE([fb],
1926 [${have_ecore_fb}], 1908 [${have_ecore_fb}],
1927 [requirements_ecore_evas="ecore-fb >= 1.6.99 ${requirements_ecore_evas}"]) 1909 [requirements_ecore_evas="ecore-fb >= 1.6.99 ${requirements_ecore_evas}"])
1928 1910
1929# ecore_evas_wince
1930
1931ECORE_EVAS_CHECK_MODULE([software-16-wince],
1932 [${want_ecore_evas_software_16_wince}],
1933 [16 bpp Software Windows CE],
1934 [${have_ecore_wince}],
1935 [requirements_ecore_evas="ecore-wince >= 1.6.99 ${requirements_ecore_evas}"])
1936
1937# ecore_evas_ews 1911# ecore_evas_ews
1938 1912
1939ECORE_EVAS_CHECK_MODULE_FULL([ews], [software-buffer], 1913ECORE_EVAS_CHECK_MODULE_FULL([ews], [software-buffer],
@@ -2249,9 +2223,6 @@ if test "x${have_ecore_evas}" = "xyes" ; then
2249 echo " PSL1GHT....................: $have_ecore_evas_psl1ght" 2223 echo " PSL1GHT....................: $have_ecore_evas_psl1ght"
2250 echo " Software Framebuffer.......: $have_ecore_evas_fb" 2224 echo " Software Framebuffer.......: $have_ecore_evas_fb"
2251 echo " Software 8bit grayscale XCB: $have_ecore_evas_software_8_x11" 2225 echo " Software 8bit grayscale XCB: $have_ecore_evas_software_8_x11"
2252 echo " Software 16bit X11.........: $have_ecore_evas_software_16_x11"
2253 echo " Software 16bit DirectDraw..: $have_ecore_evas_software_16_ddraw"
2254 echo " Software 16bit WinCE.......: $have_ecore_evas_software_16_wince"
2255 echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" 2226 echo " Sing.Proc. Windowing System: $have_ecore_evas_ews"
2256 echo " Wayland Shm................: $have_ecore_evas_wayland_shm" 2227 echo " Wayland Shm................: $have_ecore_evas_wayland_shm"
2257 echo " Wayland Egl................: $have_ecore_evas_wayland_egl" 2228 echo " Wayland Egl................: $have_ecore_evas_wayland_egl"
diff --git a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
index 8a93180782..c358579af6 100644
--- a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
+++ b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
@@ -92,12 +92,12 @@ extern "C" {
92#define HAVE_ECORE_EVAS_X 1 92#define HAVE_ECORE_EVAS_X 1
93#define HAVE_ECORE_EVAS_FB 1 93#define HAVE_ECORE_EVAS_FB 1
94#define HAVE_ECORE_EVAS_X11_GL 1 94#define HAVE_ECORE_EVAS_X11_GL 1
95#define HAVE_ECORE_EVAS_X11_16 1 95//#define HAVE_ECORE_EVAS_X11_16 1
96#define HAVE_ECORE_EVAS_DIRECTFB 1 96#define HAVE_ECORE_EVAS_DIRECTFB 1
97#define HAVE_ECORE_EVAS_WIN32 1 97#define HAVE_ECORE_EVAS_WIN32 1
98#define HAVE_ECORE_EVAS_COCOA 1 98#define HAVE_ECORE_EVAS_COCOA 1
99#define HAVE_ECORE_EVAS_SDL 1 99#define HAVE_ECORE_EVAS_SDL 1
100#define HAVE_ECORE_EVAS_WINCE 1 100//#define HAVE_ECORE_EVAS_WINCE 1
101#define HAVE_ECORE_EVAS_EWS 1 101#define HAVE_ECORE_EVAS_EWS 1
102#define HAVE_ECORE_EVAS_PSL1GHT 1 102#define HAVE_ECORE_EVAS_PSL1GHT 1
103#define HAVE_ECORE_EVAS_WAYLAND_SHM 1 103#define HAVE_ECORE_EVAS_WAYLAND_SHM 1
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
index 794352093a..cee3d8a58a 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
@@ -166,23 +166,12 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
166#endif 166#endif
167 167
168 case ECORE_EVAS_ENGINE_SOFTWARE_16_X11: 168 case ECORE_EVAS_ENGINE_SOFTWARE_16_X11:
169#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11
170 return EINA_TRUE;
171#else
172 return EINA_FALSE; 169 return EINA_FALSE;
173#endif
174 case ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW: 170 case ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW:
175#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
176 return EINA_TRUE;
177#else
178 return EINA_FALSE; 171 return EINA_FALSE;
179#endif
180 case ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE: 172 case ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE:
181#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
182 return EINA_TRUE;
183#else
184 return EINA_FALSE; 173 return EINA_FALSE;
185#endif 174
186 case ECORE_EVAS_ENGINE_OPENGL_COCOA: 175 case ECORE_EVAS_ENGINE_OPENGL_COCOA:
187#ifdef BUILD_ECORE_EVAS_OPENGL_COCOA 176#ifdef BUILD_ECORE_EVAS_OPENGL_COCOA
188 return EINA_TRUE; 177 return EINA_TRUE;
@@ -318,9 +307,6 @@ ecore_evas_shutdown(void)
318#ifdef BUILD_ECORE_EVAS_DIRECTFB 307#ifdef BUILD_ECORE_EVAS_DIRECTFB
319 while (_ecore_evas_directfb_shutdown()); 308 while (_ecore_evas_directfb_shutdown());
320#endif 309#endif
321#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
322 while (_ecore_evas_wince_shutdown());
323#endif
324 310
325 if (_ecore_evas_async_events_fd) 311 if (_ecore_evas_async_events_fd)
326 ecore_main_fd_handler_del(_ecore_evas_async_events_fd); 312 ecore_main_fd_handler_del(_ecore_evas_async_events_fd);
@@ -492,22 +478,6 @@ _ecore_evas_constructor_software_8_x11(int x, int y, int w, int h, const char *e
492} 478}
493#endif 479#endif
494 480
495#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11
496static Ecore_Evas *
497_ecore_evas_constructor_software_16_x11(int x, int y, int w, int h, const char *extra_options)
498{
499 Ecore_X_Window parent = 0;
500 char *disp_name = NULL;
501 Ecore_Evas *ee;
502
503 _ecore_evas_parse_extra_options_x(extra_options, &disp_name, &parent);
504 ee = ecore_evas_software_x11_16_new(disp_name, parent, x, y, w, h);
505 free(disp_name);
506
507 return ee;
508}
509#endif
510
511#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL 481#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
512static Ecore_Evas * 482static Ecore_Evas *
513_ecore_evas_constructor_sdl(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options) 483_ecore_evas_constructor_sdl(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options)
@@ -669,40 +639,6 @@ _ecore_evas_constructor_opengl_glew(int x, int y, int w, int h, const char *extr
669} 639}
670#endif 640#endif
671 641
672#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
673static Ecore_Evas *
674_ecore_evas_constructor_software_16_ddraw(int x, int y, int w, int h, const char *extra_options)
675{
676 return ecore_evas_software_16_ddraw_new(NULL, x, y, w, h);
677}
678#endif
679
680#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
681static Ecore_Evas *
682_ecore_evas_constructor_software_16_wince(int x, int y, int w, int h, const char *extra_options __UNUSED__)
683{
684 return ecore_evas_software_wince_new(NULL, x, y, w, h);
685}
686
687static Ecore_Evas *
688_ecore_evas_constructor_software_16_wince_fb(int x, int y, int w, int h, const char *extra_options __UNUSED__)
689{
690 return ecore_evas_software_wince_fb_new(NULL, x, y, w, h);
691}
692
693static Ecore_Evas *
694_ecore_evas_constructor_software_16_wince_gapi(int x, int y, int w, int h, const char *extra_options __UNUSED__)
695{
696 return ecore_evas_software_wince_gapi_new(NULL, x, y, w, h);
697}
698
699static Ecore_Evas *
700_ecore_evas_constructor_software_16_wince_gdi(int x, int y, int w, int h, const char *extra_options __UNUSED__)
701{
702 return ecore_evas_software_wince_gdi_new(NULL, x, y, w, h);
703}
704#endif
705
706#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER 642#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
707static Ecore_Evas * 643static Ecore_Evas *
708_ecore_evas_constructor_buffer(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options __UNUSED__) 644_ecore_evas_constructor_buffer(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options __UNUSED__)
@@ -731,9 +667,6 @@ static const struct ecore_evas_engine _engines[] = {
731#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11 667#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11
732 {"software_8_x11", _ecore_evas_constructor_software_8_x11}, 668 {"software_8_x11", _ecore_evas_constructor_software_8_x11},
733#endif 669#endif
734#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11
735 {"software_16_x11", _ecore_evas_constructor_software_16_x11},
736#endif
737#ifdef BUILD_ECORE_EVAS_DIRECTFB 670#ifdef BUILD_ECORE_EVAS_DIRECTFB
738 {"directfb", _ecore_evas_constructor_directfb}, 671 {"directfb", _ecore_evas_constructor_directfb},
739#endif 672#endif
@@ -754,15 +687,6 @@ static const struct ecore_evas_engine _engines[] = {
754#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW 687#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
755 {"opengl_glew", _ecore_evas_constructor_opengl_glew}, 688 {"opengl_glew", _ecore_evas_constructor_opengl_glew},
756#endif 689#endif
757#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
758 {"software_16_ddraw", _ecore_evas_constructor_software_16_ddraw},
759#endif
760#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
761 {"software_16_wince", _ecore_evas_constructor_software_16_wince},
762 {"software_16_wince_fb", _ecore_evas_constructor_software_16_wince_fb},
763 {"software_16_wince_gapi", _ecore_evas_constructor_software_16_wince_gapi},
764 {"software_16_wince_gdi", _ecore_evas_constructor_software_16_wince_gdi},
765#endif
766 690
767 /* Apple */ 691 /* Apple */
768#ifdef BUILD_ECORE_EVAS_OPENGL_COCOA 692#ifdef BUILD_ECORE_EVAS_OPENGL_COCOA
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
index 664748cdc8..96346bcc3b 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
@@ -33,10 +33,6 @@
33# include <Evas_Engine_Software_8_X11.h> 33# include <Evas_Engine_Software_8_X11.h>
34#endif 34#endif
35 35
36#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11
37# include <Evas_Engine_Software_16_X11.h>
38#endif
39
40#ifdef BUILD_ECORE_EVAS_FB 36#ifdef BUILD_ECORE_EVAS_FB
41# include <Evas_Engine_FB.h> 37# include <Evas_Engine_FB.h>
42#endif 38#endif
@@ -64,14 +60,6 @@
64# ifdef BUILD_ECORE_EVAS_OPENGL_GLEW 60# ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
65# include <Evas_Engine_GL_Glew.h> 61# include <Evas_Engine_GL_Glew.h>
66# endif 62# endif
67# ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
68# include <Evas_Engine_Software_16_DDraw.h>
69# endif
70#endif
71
72#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
73# include "Ecore_WinCE.h"
74# include <Evas_Engine_Software_16_WinCE.h>
75#endif 63#endif
76 64
77#ifdef BUILD_ECORE_EVAS_GL_COCOA 65#ifdef BUILD_ECORE_EVAS_GL_COCOA
@@ -266,14 +254,6 @@ struct _Ecore_Evas_Engine
266 } state; 254 } state;
267 } win32; 255 } win32;
268#endif 256#endif
269#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
270 struct {
271 Ecore_WinCE_Window *window;
272 struct {
273 unsigned char fullscreen : 1;
274 } state;
275 } wince;
276#endif
277#ifdef BUILD_ECORE_EVAS_EWS 257#ifdef BUILD_ECORE_EVAS_EWS
278 struct { 258 struct {
279 Evas_Object *image; 259 Evas_Object *image;
@@ -423,9 +403,6 @@ int _ecore_evas_directfb_shutdown(void);
423#ifdef BUILD_ECORE_EVAS_WIN32 403#ifdef BUILD_ECORE_EVAS_WIN32
424int _ecore_evas_win32_shutdown(void); 404int _ecore_evas_win32_shutdown(void);
425#endif 405#endif
426#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
427int _ecore_evas_wince_shutdown(void);
428#endif
429#ifdef BUILD_ECORE_EVAS_EWS 406#ifdef BUILD_ECORE_EVAS_EWS
430void _ecore_evas_ews_events_init(void); 407void _ecore_evas_ews_events_init(void);
431int _ecore_evas_ews_shutdown(void); 408int _ecore_evas_ews_shutdown(void);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
index 59d6ed81f3..c40f9c4167 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
@@ -1290,49 +1290,6 @@ _ecore_evas_engine_opengl_glew_init(Ecore_Evas *ee)
1290} 1290}
1291#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */ 1291#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
1292 1292
1293#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
1294static int
1295_ecore_evas_engine_software_16_ddraw_init(Ecore_Evas *ee)
1296{
1297 Evas_Engine_Info_Software_DDraw *einfo;
1298 const char *driver;
1299 int rmethod;
1300
1301 driver = "software_16_ddraw";
1302
1303 rmethod = evas_render_method_lookup(driver);
1304 if (!rmethod)
1305 return 0;
1306
1307 ee->driver = driver;
1308 evas_output_method_set(ee->evas, rmethod);
1309
1310 if (ecore_win32_screen_depth_get() != 16)
1311 return 0;
1312
1313 einfo = (Evas_Engine_Info_Software_16_DDraw *)evas_engine_info_get(ee->evas);
1314 if (einfo)
1315 {
1316 /* FIXME: REDRAW_DEBUG missing for now */
1317 einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
1318 einfo->info.depth = ecore_win32_screen_depth_get();
1319 einfo->info.rotation = 0;
1320 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
1321 {
1322 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
1323 return 0;
1324 }
1325 }
1326 else
1327 {
1328 ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
1329 return 0;
1330 }
1331
1332 return 1;
1333}
1334#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW */
1335
1336#ifdef BUILD_ECORE_EVAS_WIN32 1293#ifdef BUILD_ECORE_EVAS_WIN32
1337static Ecore_Evas * 1294static Ecore_Evas *
1338_ecore_evas_win32_new_internal(int (*_ecore_evas_engine_init)(Ecore_Evas *ee), 1295_ecore_evas_win32_new_internal(int (*_ecore_evas_engine_init)(Ecore_Evas *ee),
@@ -1474,25 +1431,6 @@ ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent __UNUSED__,
1474#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ 1431#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
1475 1432
1476 1433
1477#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW
1478
1479EAPI Ecore_Evas *
1480ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent,
1481 int x,
1482 int y,
1483 int width,
1484 int height)
1485{
1486 return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_16_ddraw_init,
1487 parent,
1488 x,
1489 y,
1490 width,
1491 height);
1492}
1493
1494#else
1495
1496EAPI Ecore_Evas * 1434EAPI Ecore_Evas *
1497ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent __UNUSED__, 1435ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent __UNUSED__,
1498 int x __UNUSED__, 1436 int x __UNUSED__,
@@ -1503,9 +1441,6 @@ ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent __UNUSED__,
1503 return NULL; 1441 return NULL;
1504} 1442}
1505 1443
1506#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW */
1507
1508
1509#ifdef BUILD_ECORE_EVAS_DIRECT3D 1444#ifdef BUILD_ECORE_EVAS_DIRECT3D
1510 1445
1511EAPI Ecore_Evas * 1446EAPI Ecore_Evas *
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
index fe0054af40..c2499c7f10 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
@@ -6,1008 +6,62 @@
6 6
7#include <Ecore.h> 7#include <Ecore.h>
8#include "ecore_private.h" 8#include "ecore_private.h"
9#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
10# define WIN32_LEAN_AND_MEAN
11# include <windows.h>
12# undef WIN32_LEAN_AND_MEAN
13# include <Ecore_WinCE.h>
14# include <ecore_wince_private.h>
15#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
16 9
17#include "ecore_evas_private.h" 10#include "ecore_evas_private.h"
18#include "Ecore_Evas.h" 11#include "Ecore_Evas.h"
19 12
20#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
21
22#define ECORE_EVAS_EVENT_COUNT 9
23
24static int _ecore_evas_init_count = 0;
25
26static Ecore_Event_Handler *ecore_evas_event_handlers[ECORE_EVAS_EVENT_COUNT];
27
28static Eina_Bool _ecore_evas_wince_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event);
29
30static Eina_Bool _ecore_evas_wince_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event);
31
32static Eina_Bool _ecore_evas_wince_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event);
33
34static Eina_Bool _ecore_evas_wince_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
35
36static Eina_Bool _ecore_evas_wince_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event);
37
38static Eina_Bool _ecore_evas_wince_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event);
39
40static Eina_Bool _ecore_evas_wince_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event);
41
42static Eina_Bool _ecore_evas_wince_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event);
43
44static Eina_Bool _ecore_evas_wince_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event);
45
46/* Private functions */
47
48static int
49_ecore_evas_wince_render(Ecore_Evas *ee)
50{
51 int rend = 0;
52 Eina_List *updates = NULL;
53 Eina_List *ll;
54 Ecore_Evas *ee2;
55
56 EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
57 {
58 if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
59 if (ee2->engine.func->fn_render)
60 rend |= ee2->engine.func->fn_render(ee2);
61 if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
62 }
63
64 if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
65 if (ee->prop.avoid_damage)
66 {
67 updates = evas_render_updates(ee->evas);
68 if (updates) evas_render_updates_free(updates);
69 }
70 else if ((ee->visible) ||
71 ((ee->should_be_visible) && (ee->prop.fullscreen)) ||
72 ((ee->should_be_visible) && (ee->prop.override)))
73 {
74 if (ee->shaped)
75 {
76 updates = evas_render_updates(ee->evas);
77 if (updates) evas_render_updates_free(updates);
78 }
79 else
80 {
81 updates = evas_render_updates(ee->evas);
82 if (updates) evas_render_updates_free(updates);
83 }
84 }
85 else
86 evas_norender(ee->evas);
87 if (updates) rend = 1;
88 if (ee->func.fn_post_render) ee->func.fn_post_render(ee);
89 return rend;
90}
91
92static int
93_ecore_evas_wince_init(void)
94{
95 _ecore_evas_init_count++;
96 if (_ecore_evas_init_count > 1)
97 return _ecore_evas_init_count;
98
99 ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_WINCE_EVENT_MOUSE_IN, _ecore_evas_wince_event_mouse_in, NULL);
100 ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_WINCE_EVENT_MOUSE_OUT, _ecore_evas_wince_event_mouse_out, NULL);
101 ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_FOCUS_IN, _ecore_evas_wince_event_window_focus_in, NULL);
102 ecore_evas_event_handlers[3] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_FOCUS_OUT, _ecore_evas_wince_event_window_focus_out, NULL);
103 ecore_evas_event_handlers[4] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_DAMAGE, _ecore_evas_wince_event_window_damage, NULL);
104 ecore_evas_event_handlers[5] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_DESTROY, _ecore_evas_wince_event_window_destroy, NULL);
105 ecore_evas_event_handlers[6] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_SHOW, _ecore_evas_wince_event_window_show, NULL);
106 ecore_evas_event_handlers[7] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_HIDE, _ecore_evas_wince_event_window_hide, NULL);
107 ecore_evas_event_handlers[8] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_DELETE_REQUEST, _ecore_evas_wince_event_window_delete_request, NULL);
108
109 ecore_event_evas_init();
110 return _ecore_evas_init_count;
111}
112
113int
114_ecore_evas_wince_shutdown(void)
115{
116 _ecore_evas_init_count--;
117 if (_ecore_evas_init_count == 0)
118 {
119 int i;
120
121 for (i = 0; i < ECORE_EVAS_EVENT_COUNT; i++)
122 ecore_event_handler_del(ecore_evas_event_handlers[i]);
123 ecore_event_evas_shutdown();
124 }
125
126 if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0;
127
128 return _ecore_evas_init_count;
129}
130
131static Eina_Bool
132_ecore_evas_wince_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
133{
134 Ecore_Evas *ee;
135 Ecore_WinCE_Event_Mouse_In *e;
136
137 INF("mouse in");
138
139 e = event;
140 ee = ecore_event_window_match((Ecore_Window)e->window);
141 if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
142 if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1;
143
144 if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
145 /* FIXME to do */
146/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
147 evas_event_feed_mouse_in(ee->evas, e->time, NULL);
148 _ecore_evas_mouse_move_process(ee, e->x, e->y, e->time);
149
150 return 1;
151}
152
153static Eina_Bool
154_ecore_evas_wince_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
155{
156 Ecore_Evas *ee;
157 Ecore_WinCE_Event_Mouse_Out *e;
158
159 INF("mouse out");
160
161 e = event;
162 ee = ecore_event_window_match((Ecore_Window)e->window);
163 if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
164 if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1;
165
166 /* FIXME to do */
167/* _ecore_evas_x_modifier_locks_update(ee, e->modifiers); */
168 _ecore_evas_mouse_move_process(ee, e->x, e->y, e->time);
169
170 evas_event_feed_mouse_out(ee->evas, e->time, NULL);
171 if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee);
172 if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object);
173
174 return 1;
175}
176
177static Eina_Bool
178_ecore_evas_wince_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
179{
180 Ecore_Evas *ee;
181 Ecore_WinCE_Event_Window_Focus_In *e;
182
183 e = event;
184 ee = ecore_event_window_match(e->window);
185 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
186 if (e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
187
188 ee->prop.focused = 1;
189 evas_focus_in(ee->evas);
190 if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
191 return ECORE_CALLBACK_PASS_ON;
192}
193
194static Eina_Bool
195_ecore_evas_wince_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
196{
197 Ecore_Evas *ee;
198 Ecore_WinCE_Event_Window_Focus_Out *e;
199
200 e = event;
201 ee = ecore_event_window_match(e->window);
202 if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
203 if (e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
204
205 evas_focus_out(ee->evas);
206 ee->prop.focused = 0;
207 if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
208 return ECORE_CALLBACK_PASS_ON;
209}
210
211static Eina_Bool
212_ecore_evas_wince_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event)
213{
214 Ecore_Evas *ee;
215 Ecore_WinCE_Event_Window_Damage *e;
216
217 INF("window damage");
218
219 e = event;
220 ee = ecore_event_window_match((Ecore_Window)e->window);
221 if (!ee) return 1; /* pass on event */
222 if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1;
223
224 if (ee->prop.avoid_damage)
225 {
226#warning [ECORE] [WINCE] No Region code
227 }
228 else
229 {
230 if (ee->rotation == 0)
231 evas_damage_rectangle_add(ee->evas,
232 e->x,
233 e->y,
234 e->width,
235 e->height);
236 else if (ee->rotation == 90)
237 evas_damage_rectangle_add(ee->evas,
238 ee->h - e->y - e->height,
239 e->x,
240 e->height,
241 e->width);
242 else if (ee->rotation == 180)
243 evas_damage_rectangle_add(ee->evas,
244 ee->w - e->x - e->width,
245 ee->h - e->y - e->height,
246 e->width,
247 e->height);
248 else if (ee->rotation == 270)
249 evas_damage_rectangle_add(ee->evas,
250 e->y,
251 ee->w - e->x - e->width,
252 e->height,
253 e->width);
254 }
255
256 return 1;
257}
258
259static Eina_Bool
260_ecore_evas_wince_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event)
261{
262 Ecore_Evas *ee;
263 Ecore_WinCE_Event_Window_Destroy *e;
264
265 INF("window destroy");
266
267 e = event;
268 ee = ecore_event_window_match((Ecore_Window)e->window);
269 if (!ee) return 1; /* pass on event */
270 if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1;
271 if (ee->func.fn_destroy) ee->func.fn_destroy(ee);
272 ecore_evas_free(ee);
273
274 return 1;
275}
276
277static Eina_Bool
278_ecore_evas_wince_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event)
279{
280 Ecore_Evas *ee;
281 Ecore_WinCE_Event_Window_Show *e;
282
283 INF("window show");
284
285 e = event;
286 ee = ecore_event_window_match((Ecore_Window)e->window);
287 if (!ee) return 1; /* pass on event */
288 if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1;
289 if (ee->visible) return 0; /* dont pass it on */
290 ee->visible = 1;
291 if (ee->func.fn_show) ee->func.fn_show(ee);
292
293 return 1;
294}
295
296static Eina_Bool
297_ecore_evas_wince_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
298{
299 Ecore_Evas *ee;
300 Ecore_WinCE_Event_Window_Hide *e;
301
302 INF("window hide");
303
304 e = event;
305 ee = ecore_event_window_match((Ecore_Window)e->window);
306 if (!ee) return 1; /* pass on event */
307 if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1;
308 if (!ee->visible) return 0; /* dont pass it on */
309 ee->visible = 0;
310 if (ee->func.fn_hide) ee->func.fn_hide(ee);
311
312 return 1;
313}
314
315static Eina_Bool
316_ecore_evas_wince_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event)
317{
318 Ecore_Evas *ee;
319 Ecore_WinCE_Event_Window_Delete_Request *e;
320
321 INF("window delete request");
322
323 e = event;
324 ee = ecore_event_window_match((Ecore_Window)e->window);
325 if (!ee) return 1; /* pass on event */
326 if (e->window != (Ecore_WinCE_Window *)ee->prop.window) return 1;
327 if (ee->func.fn_delete_request) ee->func.fn_delete_request(ee);
328
329 return 1;
330}
331
332
333/* Ecore_Evas interface */
334
335static void
336_ecore_evas_wince_free(Ecore_Evas *ee)
337{
338 INF("ecore evas free");
339
340 ecore_wince_window_free((Ecore_WinCE_Window *)ee->prop.window);
341 ecore_event_window_unregister(ee->prop.window);
342 _ecore_evas_wince_shutdown();
343 ecore_wince_shutdown();
344}
345
346static void
347_ecore_evas_wince_callback_delete_request_set(Ecore_Evas *ee,
348 Ecore_Evas_Event_Cb func)
349{
350 ee->func.fn_delete_request = func;
351}
352
353static void
354_ecore_evas_wince_move(Ecore_Evas *ee, int x, int y)
355{
356 INF("ecore evas move (%dx%d)", x, y);
357 ee->req.x = x;
358 ee->req.y = y;
359
360 if ((x != ee->x) || (y != ee->y))
361 {
362 ee->x = x;
363 ee->y = y;
364 ecore_wince_window_move((Ecore_WinCE_Window *)ee->prop.window, x, y);
365 if (ee->func.fn_move) ee->func.fn_move(ee);
366 }
367}
368
369static void
370_ecore_evas_wince_resize(Ecore_Evas *ee, int width, int height)
371{
372 INF("ecore evas resize (%dx%d)", width, height);
373 ee->req.w = width;
374 ee->req.h = height;
375
376 if ((ee->w != width) || (ee->h != height))
377 {
378 ee->w = width;
379 ee->h = height;
380 ecore_wince_window_resize((Ecore_WinCE_Window *)ee->prop.window, width, height);
381 if ((ee->rotation == 90) || (ee->rotation == 270))
382 {
383 evas_output_size_set(ee->evas, ee->h, ee->w);
384 evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
385 }
386 else
387 {
388 evas_output_size_set(ee->evas, ee->w, ee->h);
389 evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
390 }
391 /* FIXME: damage and shape */
392
393 if (ee->func.fn_resize) ee->func.fn_resize(ee);
394 }
395}
396
397static void
398_ecore_evas_wince_move_resize(Ecore_Evas *ee, int x, int y, int width, int height)
399{
400 INF("ecore evas resize (%dx%d %dx%d)", x, y, width, height);
401 ee->req.x = x;
402 ee->req.y = y;
403 ee->req.w = width;
404 ee->req.h = height;
405
406 if ((ee->w != width) || (ee->h != height) || (x != ee->x) || (y != ee->y))
407 {
408 int change_size = 0;
409 int change_pos = 0;
410
411 if ((ee->w != width) || (ee->h != height)) change_size = 1;
412 if ((x != ee->x) || (y != ee->y)) change_pos = 1;
413
414 ee->x = x;
415 ee->y = y;
416 ee->w = width;
417 ee->h = height;
418 ecore_wince_window_move_resize((Ecore_WinCE_Window *)ee->prop.window, x, y, width, height);
419 if ((ee->rotation == 90) || (ee->rotation == 270))
420 {
421 evas_output_size_set(ee->evas, ee->h, ee->w);
422 evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
423 }
424 else
425 {
426 evas_output_size_set(ee->evas, ee->w, ee->h);
427 evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
428 }
429 /* FIXME: damage and shape */
430 if (change_pos)
431 {
432 if (ee->func.fn_move) ee->func.fn_move(ee);
433 }
434 if (change_size)
435 {
436 if (ee->func.fn_resize) ee->func.fn_resize(ee);
437 }
438 }
439}
440
441/* static void */
442/* _ecore_evas_wince_rotation_set(Ecore_Evas *ee, int rotation) */
443/* { */
444/* int rot_dif; */
445
446/* if (ee->rotation == rotation) return; */
447/* rot_dif = ee->rotation - rotation; */
448/* if (rot_dif < 0) rot_dif = -rot_dif; */
449/* if (!strcmp(ee->driver, "software_ddraw")) */
450/* { */
451/* Evas_Engine_Info_Software_16_WinCE *einfo; */
452
453/* einfo = (Evas_Engine_Info_Software_16_WinCE *)evas_engine_info_get(ee->evas); */
454/* if (!einfo) return; */
455/* if (rot_dif != 180) */
456/* { */
457/* int minw, minh, maxw, maxh, basew, baseh, stepw, steph; */
458
459/* einfo->info.rotation = rotation; */
460/* evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); */
461/* if (!ee->prop.fullscreen) */
462/* { */
463/* ecore_wince_window_resize(ee->prop.window, ee->h, ee->w); */
464/* ee->expecting_resize.w = ee->h; */
465/* ee->expecting_resize.h = ee->w; */
466/* } */
467/* else */
468/* { */
469/* int w, h; */
470
471/* ecore_wince_window_size_get(ee->prop.window, &w, &h); */
472/* ecore_wince_window_resize(ee->prop.window, h, w); */
473/* if ((rotation == 0) || (rotation == 180)) */
474/* { */
475/* evas_output_size_set(ee->evas, ee->w, ee->h); */
476/* evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h); */
477/* } */
478/* else */
479/* { */
480/* evas_output_size_set(ee->evas, ee->h, ee->w); */
481/* evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w); */
482/* } */
483/* if (ee->func.fn_resize) ee->func.fn_resize(ee); */
484/* } */
485/* ecore_evas_size_min_get(ee, &minw, &minh); */
486/* ecore_evas_size_max_get(ee, &maxw, &maxh); */
487/* ecore_evas_size_base_get(ee, &basew, &baseh); */
488/* ecore_evas_size_step_get(ee, &stepw, &steph); */
489/* ee->rotation = rotation; */
490/* ecore_evas_size_min_set(ee, minh, minw); */
491/* ecore_evas_size_max_set(ee, maxh, maxw); */
492/* ecore_evas_size_base_set(ee, baseh, basew); */
493/* ecore_evas_size_step_set(ee, steph, stepw); */
494/* _ecore_evas_wince_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, */
495/* ecore_wince_current_time_get()); */
496/* } */
497/* else */
498/* { */
499/* einfo->info.rotation = rotation; */
500/* evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); */
501/* ee->rotation = rotation; */
502/* _ecore_evas_wince_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, */
503/* ecore_wince_current_time_get()); */
504/* if (ee->func.fn_resize) ee->func.fn_resize(ee); */
505/* } */
506/* if ((ee->rotation == 90) || (ee->rotation == 270)) */
507/* evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w); */
508/* else */
509/* evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); */
510/* } */
511/* } */
512
513static void
514_ecore_evas_wince_show(Ecore_Evas *ee)
515{
516 INF("ecore evas show");
517
518 ee->should_be_visible = 1;
519 if (ee->prop.avoid_damage)
520 _ecore_evas_wince_render(ee);
521 ecore_wince_window_show((Ecore_WinCE_Window *)ee->prop.window);
522/* if (ee->prop.fullscreen) */
523/* ecore_wince_window_focus(ee->prop.window); */
524}
525
526static void
527_ecore_evas_wince_hide(Ecore_Evas *ee)
528{
529 INF("ecore evas hide");
530
531 ecore_wince_window_hide((Ecore_WinCE_Window *)ee->prop.window);
532 ee->should_be_visible = 0;
533}
534
535/* static void */
536/* _ecore_evas_wince_raise(Ecore_Evas *ee) */
537/* { */
538/* if (!ee->prop.fullscreen) */
539/* ecore_wince_window_raise(ee->prop.window); */
540/* else */
541/* ecore_wince_window_raise(ee->prop.window); */
542/* } */
543
544/* static void */
545/* _ecore_evas_wince_lower(Ecore_Evas *ee) */
546/* { */
547/* if (!ee->prop.fullscreen) */
548/* ecore_wince_window_lower(ee->prop.window); */
549/* else */
550/* ecore_wince_window_lower(ee->prop.window); */
551/* } */
552
553static void
554_ecore_evas_wince_title_set(Ecore_Evas *ee, const char *title)
555{
556 INF("ecore evas title set");
557
558 if (ee->prop.title) free(ee->prop.title);
559 ee->prop.title = NULL;
560 if (title) ee->prop.title = strdup(title);
561 ecore_wince_window_title_set((Ecore_WinCE_Window *)ee->prop.window, ee->prop.title);
562}
563
564/* static void */
565/* _ecore_evas_wince_size_min_set(Ecore_Evas *ee, int width, int height) */
566/* { */
567/* if (width < 0) width = 0; */
568/* if (height < 0) height = 0; */
569/* if ((ee->prop.min.w == width) && (ee->prop.min.h == height)) return; */
570/* ee->prop.min.w = width; */
571/* ee->prop.min.h = height; */
572/* ecore_wince_window_size_min_set(ee->prop.window, width, height); */
573/* } */
574
575/* static void */
576/* _ecore_evas_wince_size_max_set(Ecore_Evas *ee, int width, int height) */
577/* { */
578/* if (width < 0) width = 0; */
579/* if (height < 0) height = 0; */
580/* if ((ee->prop.max.w == width) && (ee->prop.max.h == height)) return; */
581/* ee->prop.max.w = width; */
582/* ee->prop.max.h = height; */
583/* ecore_wince_window_size_max_set(ee->prop.window, width, height); */
584/* } */
585
586/* static void */
587/* _ecore_evas_wince_size_base_set(Ecore_Evas *ee, int width, int height) */
588/* { */
589/* if (width < 0) width = 0; */
590/* if (height < 0) height = 0; */
591/* if ((ee->prop.base.w == width) && (ee->prop.base.h == height)) return; */
592/* ee->prop.base.w = width; */
593/* ee->prop.base.h = height; */
594/* ecore_wince_window_size_base_set(ee->prop.window, width, height); */
595/* } */
596
597/* static void */
598/* _ecore_evas_wince_size_step_set(Ecore_Evas *ee, int width, int height) */
599/* { */
600/* if (width < 1) width = 1; */
601/* if (height < 1) height = 1; */
602/* if ((ee->prop.step.w == width) && (ee->prop.step.h == height)) return; */
603/* ee->prop.step.w = width; */
604/* ee->prop.step.h = height; */
605/* ecore_wince_window_size_step_set(ee->prop.window, width, height); */
606/* } */
607
608static void
609_ecore_evas_wince_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y)
610{
611#if 0
612 int x, y;
613
614 if (ee->prop.cursor.object) evas_object_del(ee->prop.cursor.object);
615
616 if (obj == NULL)
617 {
618 ee->prop.cursor.object = NULL;
619 ee->prop.cursor.layer = 0;
620 ee->prop.cursor.hot.x = 0;
621 ee->prop.cursor.hot.y = 0;
622 ecore_wince_window_cursor_show(ee->prop.window, 1);
623 return;
624 }
625
626 ee->prop.cursor.object = obj;
627 ee->prop.cursor.layer = layer;
628 ee->prop.cursor.hot.x = hot_x;
629 ee->prop.cursor.hot.y = hot_y;
630
631 ecore_wince_window_cursor_show(ee->prop.window, 0);
632
633 evas_pointer_output_xy_get(ee->evas, &x, &y);
634 evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
635 evas_object_move(ee->prop.cursor.object,
636 x - ee->prop.cursor.hot.x,
637 y - ee->prop.cursor.hot.y);
638 evas_object_pass_events_set(ee->prop.cursor.object, 1);
639 if (evas_pointer_inside_get(ee->evas))
640 evas_object_show(ee->prop.cursor.object);
641#endif
642}
643
644static void
645_ecore_evas_wince_focus_set(Ecore_Evas *ee, int on __UNUSED__)
646{
647 ecore_wince_window_focus(ee->prop.window);
648}
649
650/* static void */
651/* _ecore_evas_wince_iconified_set(Ecore_Evas *ee, int on) */
652/* { */
653/* /\* if (((ee->prop.borderless) && (on)) || *\/ */
654/* /\* ((!ee->prop.borderless) && (!on))) return; *\/ */
655/* ee->prop.iconified = on; */
656/* ecore_wince_window_iconified_set(ee->prop.window, ee->prop.iconified); */
657/* } */
658
659/* static void */
660/* _ecore_evas_wince_borderless_set(Ecore_Evas *ee, int on) */
661/* { */
662/* if (((ee->prop.borderless) && (on)) || */
663/* ((!ee->prop.borderless) && (!on))) return; */
664/* ee->prop.borderless = on; */
665/* ecore_wince_window_borderless_set(ee->prop.window, ee->prop.borderless); */
666/* } */
667
668static void
669_ecore_evas_wince_fullscreen_set(Ecore_Evas *ee, int on)
670{
671 Evas_Engine_Info_Software_16_WinCE *einfo;
672 struct _Ecore_WinCE_Window *window;
673
674 INF("ecore evas fullscreen set");
675
676 if ((ee->engine.wince.state.fullscreen && on) ||
677 (!ee->engine.wince.state.fullscreen && !on))
678 return;
679
680 ee->engine.wince.state.fullscreen = on;
681 ee->prop.fullscreen = on;
682
683 window = (struct _Ecore_WinCE_Window *)ee->prop.window;
684
685 if (on != 0)
686 {
687/* ecore_win32_window_shape_set(ee->engine.win32.window, 0, 0, NULL); */
688 ecore_wince_window_fullscreen_set((Ecore_WinCE_Window *)ee->prop.window, on);
689 ee->w = GetSystemMetrics(SM_CXSCREEN);
690 ee->h = GetSystemMetrics(SM_CYSCREEN);
691 ee->req.w = ee->w;
692 ee->req.h = ee->h;
693 evas_output_size_set(ee->evas, ee->w, ee->h);
694 evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
695 }
696 else
697 {
698 int w;
699 int h;
700
701 ecore_wince_window_fullscreen_set((Ecore_WinCE_Window *)ee->prop.window, on);
702 ecore_wince_window_size_get((Ecore_WinCE_Window *)ee->prop.window, &w, &h);
703 ee->w = w;
704 ee->h = h;
705 ee->req.w = ee->w;
706 ee->req.h = ee->h;
707 evas_output_size_set(ee->evas, ee->w, ee->h);
708 evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
709/* ecore_win32_window_shape_set(window, */
710/* window->shape.width, */
711/* window->shape.height, */
712/* window->shape.mask); */
713 }
714
715 einfo = (Evas_Engine_Info_Software_16_WinCE *)evas_engine_info_get(ecore_evas_get(ee));
716 if (einfo)
717 {
718 einfo->info.fullscreen = !!on;
719/* einfo->info.layered = window->shape.layered; */
720 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
721 {
722 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
723 }
724 }
725}
726
727static void
728_ecore_evas_wince_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
729{
730 HDC dc;
731
732 dc = GetDC(NULL);
733 if (!dc)
734 {
735 if (xdpi) *xdpi = 0;
736 if (ydpi) *ydpi = 0;
737 return;
738 }
739
740 if (xdpi) *xdpi = GetDeviceCaps(dc, LOGPIXELSX);
741 if (ydpi) *ydpi = GetDeviceCaps(dc, LOGPIXELSY);
742
743 ReleaseDC(NULL, dc);
744}
745
746static Ecore_Evas_Engine_Func _ecore_wince_engine_func =
747{
748 _ecore_evas_wince_free,
749 NULL,
750 NULL,
751 NULL,
752 NULL,
753 _ecore_evas_wince_callback_delete_request_set,
754 NULL,
755 NULL,
756 NULL,
757 NULL,
758 NULL,
759 NULL,
760 NULL,
761 NULL,
762 NULL,
763 _ecore_evas_wince_move,
764 NULL,
765 _ecore_evas_wince_resize,
766 _ecore_evas_wince_move_resize,
767 NULL, //_ecore_evas_wince_rotation_set,
768 NULL, /* _ecore_evas_x_shaped_set */
769 _ecore_evas_wince_show,
770 _ecore_evas_wince_hide,
771 NULL, //_ecore_evas_wince_raise,
772 NULL, //_ecore_evas_wince_lower,
773 NULL, //_ecore_evas_wince_activate,
774 _ecore_evas_wince_title_set,
775 NULL, /* _ecore_evas_x_name_class_set */
776 NULL, //_ecore_evas_wince_size_min_set,
777 NULL, //_ecore_evas_wince_size_max_set,
778 NULL, //_ecore_evas_wince_size_base_set,
779 NULL, //_ecore_evas_wince_size_step_set,
780 _ecore_evas_wince_cursor_set,
781 NULL, /* _ecore_evas_x_layer_set */
782 _ecore_evas_wince_focus_set,
783 NULL, //_ecore_evas_wince_iconified_set,
784 NULL, //_ecore_evas_wince_borderless_set,
785 NULL, /* _ecore_evas_x_override_set */
786 NULL,
787 _ecore_evas_wince_fullscreen_set,
788 NULL, /* _ecore_evas_x_avoid_damage_set */
789 NULL, /* _ecore_evas_x_withdrawn_set */
790 NULL, /* _ecore_evas_x_sticky_set */
791 NULL, /* _ecore_evas_x_ignore_events_set */
792 NULL, /* _ecore_evas_x_alpha_set */
793 NULL, //transparent
794 NULL, // profiles_set
795
796 NULL,
797 NULL,
798 NULL,
799 NULL,
800 NULL,
801 NULL,
802
803 NULL, // render
804 NULL, // screen_geometry_get
805 _ecore_evas_wince_screen_dpi_get
806};
807
808/* API */
809
810static Ecore_Evas *
811ecore_evas_software_wince_new_internal(int backend,
812 Ecore_WinCE_Window *parent,
813 int x,
814 int y,
815 int width,
816 int height,
817 int fullscreen)
818{
819 Evas_Engine_Info_Software_16_WinCE *einfo;
820 Ecore_Evas *ee;
821 int rmethod;
822
823 rmethod = evas_render_method_lookup("software_16_wince");
824 if (!rmethod)
825 return NULL;
826
827 if (!ecore_wince_init())
828 return NULL;
829
830 ee = calloc(1, sizeof(Ecore_Evas));
831 if (!ee)
832 {
833 ecore_wince_shutdown();
834 return NULL;
835 }
836
837 ECORE_MAGIC_SET(ee, ECORE_MAGIC_EVAS);
838
839 if (!_ecore_evas_wince_init())
840 {
841 free(ee);
842 ecore_wince_shutdown();
843 return NULL;
844 }
845
846 ee->engine.func = (Ecore_Evas_Engine_Func *)&_ecore_wince_engine_func;
847
848 ee->driver = "software_16_wince";
849
850 if (width < 1) width = 1;
851 if (height < 1) height = 1;
852 ee->x = x;
853 ee->y = y;
854 ee->w = width;
855 ee->h = height;
856 ee->req.x = ee->x;
857 ee->req.y = ee->y;
858 ee->req.w = ee->w;
859 ee->req.h = ee->h;
860
861 ee->prop.max.w = 32767;
862 ee->prop.max.h = 32767;
863 ee->prop.layer = 4;
864 ee->prop.request_pos = 0;
865 ee->prop.sticky = 0;
866 /* FIXME: sticky to add */
867
868 ee->prop.window = (Ecore_Window)ecore_wince_window_new((Ecore_WinCE_Window *)parent, x, y, width, height);
869 if (!ee->prop.window)
870 {
871 _ecore_evas_wince_shutdown();
872 free(ee);
873 ecore_wince_shutdown();
874 return NULL;
875 }
876
877 ecore_wince_window_fullscreen_set((Ecore_WinCE_Window *)ee->prop.window, fullscreen);
878
879 /* init evas here */
880 ee->evas = evas_new();
881 evas_data_attach_set(ee->evas, ee);
882 evas_output_method_set(ee->evas, rmethod);
883 evas_output_size_set(ee->evas, width, height);
884 evas_output_viewport_set(ee->evas, 0, 0, width, height);
885
886 einfo = (Evas_Engine_Info_Software_16_WinCE *)evas_engine_info_get(ee->evas);
887 if (einfo)
888 {
889 /* FIXME: REDRAW_DEBUG missing for now */
890 einfo->info.window = ((struct _Ecore_WinCE_Window *)ee->prop.window)->window;
891 einfo->info.width = width;
892 einfo->info.height = height;
893 einfo->info.backend = backend;
894 einfo->info.rotation = 0;
895 einfo->info.fullscreen = fullscreen;
896 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
897 {
898 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
899 _ecore_evas_wince_shutdown();
900 free(ee);
901 ecore_wince_shutdown();
902 return NULL;
903 }
904
905 ecore_wince_window_backend_set((Ecore_WinCE_Window *)ee->prop.window, backend);
906 ecore_wince_window_suspend_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.suspend);
907 ecore_wince_window_resume_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.resume);
908 }
909 else
910 {
911 ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
912 _ecore_evas_wince_shutdown();
913 free(ee);
914 ecore_wince_shutdown();
915 return NULL;
916 }
917
918 ee->engine.func->fn_render = _ecore_evas_wince_render;
919 _ecore_evas_register(ee);
920 ecore_event_window_register(ee->prop.window, ee, ee->evas,
921 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process,
922 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
923 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
924 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
925 evas_focus_in(ee->evas);
926
927 return ee;
928}
929
930#else
931
932static Ecore_Evas *
933ecore_evas_software_wince_new_internal(int backend __UNUSED__,
934 Ecore_WinCE_Window *parent __UNUSED__,
935 int x __UNUSED__,
936 int y __UNUSED__,
937 int width __UNUSED__,
938 int height __UNUSED__,
939 int fullscreen __UNUSED__)
940{
941 return NULL;
942}
943
944#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
945
946
947EAPI Ecore_Evas * 13EAPI Ecore_Evas *
948ecore_evas_software_wince_new(Ecore_WinCE_Window *parent, 14ecore_evas_software_wince_new(Ecore_WinCE_Window *parent __UNUSED__,
949 int x, 15 int x __UNUSED__,
950 int y, 16 int y __UNUSED__,
951 int width, 17 int width __UNUSED__,
952 int height) 18 int height __UNUSED__)
953{ 19{
954 return ecore_evas_software_wince_new_internal(0, parent, x, y, width, height, 1); 20 return NULL;
955} 21}
956 22
957EAPI Ecore_Evas * 23EAPI Ecore_Evas *
958ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent, 24ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent __UNUSED__,
959 int x, 25 int x __UNUSED__,
960 int y, 26 int y __UNUSED__,
961 int width, 27 int width __UNUSED__,
962 int height) 28 int height __UNUSED__)
963{ 29{
964 return ecore_evas_software_wince_new_internal(1, parent, x, y, width, height, 1); 30 return NULL;
965} 31}
966 32
967EAPI Ecore_Evas * 33EAPI Ecore_Evas *
968ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent, 34ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent __UNUSED__,
969 int x, 35 int x __UNUSED__,
970 int y, 36 int y __UNUSED__,
971 int width, 37 int width __UNUSED__,
972 int height) 38 int height __UNUSED__)
973{ 39{
974 return ecore_evas_software_wince_new_internal(2, parent, x, y, width, height, 1); 40 return NULL;
975} 41}
976 42
977EAPI Ecore_Evas * 43EAPI Ecore_Evas *
978ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent, 44ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent __UNUSED__,
979 int x, 45 int x __UNUSED__,
980 int y, 46 int y __UNUSED__,
981 int width, 47 int width __UNUSED__,
982 int height) 48 int height __UNUSED__)
983{ 49{
984 return ecore_evas_software_wince_new_internal(3, parent, x, y, width, height, 1); 50 return NULL;
985} 51}
986 52
987EAPI Ecore_Evas * 53EAPI Ecore_Evas *
988ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent, 54ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent __UNUSED__,
989 int x, 55 int x __UNUSED__,
990 int y, 56 int y __UNUSED__,
991 int width, 57 int width __UNUSED__,
992 int height) 58 int height __UNUSED__)
993{
994 return ecore_evas_software_wince_new_internal(4, parent, x, y, width, height, 0);
995}
996
997#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
998
999EAPI Ecore_WinCE_Window *
1000ecore_evas_software_wince_window_get(const Ecore_Evas *ee)
1001{ 59{
1002 return (Ecore_WinCE_Window *) ecore_evas_window_get(ee); 60 return NULL;
1003} 61}
1004 62
1005#else
1006
1007EAPI Ecore_WinCE_Window * 63EAPI Ecore_WinCE_Window *
1008ecore_evas_software_wince_window_get(const Ecore_Evas *ee __UNUSED__) 64ecore_evas_software_wince_window_get(const Ecore_Evas *ee __UNUSED__)
1009{ 65{
1010 return NULL; 66 return NULL;
1011} 67}
1012
1013#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
index 4678b83695..f9c8800981 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
@@ -472,27 +472,6 @@ _ecore_evas_x_resize_shape(Ecore_Evas *ee)
472 } 472 }
473#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ 473#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */
474 } 474 }
475 else if (!strcmp(ee->driver, "software_16_x11"))
476 {
477#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
478# if 0 /* XXX no shaped window support for software_16_x11 */
479 Evas_Engine_Info_Software_16_X11 *einfo;
480
481 einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
482 if (einfo)
483 {
484 if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
485 ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
486 einfo->info.mask = ee->engine.x.mask;
487 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
488 {
489 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
490 }
491 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
492 }
493# endif /* XXX no shaped window support for software_16_x11 */
494#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
495 }
496 if (!strcmp(ee->driver, "software_8_x11")) 475 if (!strcmp(ee->driver, "software_8_x11"))
497 { 476 {
498#if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) 477#if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11)
@@ -1780,27 +1759,6 @@ _ecore_evas_x_rotation_set(Ecore_Evas *ee, int rotation, int resize)
1780# endif 1759# endif
1781#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ 1760#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */
1782 } 1761 }
1783 else if (!strcmp(ee->driver, "software_16_x11"))
1784 {
1785#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
1786 Evas_Engine_Info_Software_16_X11 *einfo;
1787
1788 einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
1789 if (!einfo) return;
1790 einfo->info.rotation = rotation;
1791 _ecore_evas_x_rotation_set_internal(ee, rotation, resize,
1792 (Evas_Engine_Info *)einfo);
1793# if _USE_WIN_ROT_EFFECT
1794 ecore_x_window_prop_property_set(ee->prop.window,
1795 ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
1796 ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
1797# else
1798 ecore_x_window_prop_property_set(ee->prop.window,
1799 ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
1800 ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
1801# endif
1802#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
1803 }
1804 else if (!strcmp(ee->driver, "software_8_x11")) 1762 else if (!strcmp(ee->driver, "software_8_x11"))
1805 { 1763 {
1806#if BUILD_ECORE_EVAS_SOFTWARE_8_X11 1764#if BUILD_ECORE_EVAS_SOFTWARE_8_X11
@@ -1887,42 +1845,6 @@ _ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped)
1887 } 1845 }
1888#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ 1846#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */
1889 } 1847 }
1890 else if (!strcmp(ee->driver, "software_16_x11"))
1891 {
1892#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
1893# if 0 /* XXX no shaped window support for software_16_x11 */
1894 Evas_Engine_Info_Software_16_X11 *einfo;
1895
1896 einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
1897 ee->shaped = shaped;
1898 if (einfo)
1899 {
1900 if (ee->shaped)
1901 {
1902 ee->engine.x.mask =
1903 ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 1);
1904 einfo->info.mask = ee->engine.x.mask;
1905 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
1906 {
1907 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
1908 }
1909 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
1910 }
1911 else
1912 {
1913 if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
1914 ee->engine.x.mask = 0;
1915 einfo->info.mask = 0;
1916 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
1917 {
1918 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
1919 }
1920 ecore_x_window_shape_mask_set(ee->prop.window, 0);
1921 }
1922 }
1923# endif /* XXX no shaped window support for software_16_x11 */
1924#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
1925 }
1926 if (!strcmp(ee->driver, "software_8_x11")) 1848 if (!strcmp(ee->driver, "software_8_x11"))
1927 { 1849 {
1928#if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) 1850#if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11)
@@ -2185,89 +2107,6 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
2185 // putenv((char*)"DESKTOP_STARTUP_ID="); 2107 // putenv((char*)"DESKTOP_STARTUP_ID=");
2186 } 2108 }
2187 } 2109 }
2188 else if (!strcmp(ee->driver, "software_16_x11"))
2189 {
2190#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
2191 Evas_Engine_Info_Software_16_X11 *einfo;
2192
2193 einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
2194 if (!einfo) return;
2195
2196 ee->shaped = 0;
2197 ee->alpha = alpha;
2198 ecore_x_window_free(ee->prop.window);
2199 ecore_event_window_unregister(ee->prop.window);
2200 if (ee->alpha)
2201 {
2202 if (ee->prop.override)
2203 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);
2204 else
2205 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);
2206 if (!ee->engine.x.mask)
2207 ee->engine.x.mask = ecore_x_pixmap_new(ee->prop.window, ee->req.w, ee->req.h, 1);
2208 }
2209 else
2210 {
2211 if (ee->prop.override)
2212 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);
2213 else
2214 ee->prop.window = ecore_x_window_new(ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h);
2215 if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
2216 ee->engine.x.mask = 0;
2217 ecore_x_window_shape_input_mask_set(ee->prop.window, 0);
2218 }
2219
2220# if 0 /* XXX no alpha window support for software_16_x11 */
2221 einfo->info.destination_alpha = alpha;
2222# endif /* XXX no alpha window support for software_16_x11 */
2223
2224# if 0 /* XXX no shaped window support for software_16_x11 */
2225// if (ee->engine.x.mask) ecore_x_pixmap_free(ee->engine.x.mask);
2226// ee->engine.x.mask = 0;
2227 einfo->info.mask = ee->engine.x.mask;
2228# endif /* XXX no shaped window support for software_16_x11 */
2229
2230 einfo->info.drawable = ee->prop.window;
2231 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
2232 {
2233 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
2234 }
2235 evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h);
2236 ecore_x_window_shape_mask_set(ee->prop.window, 0);
2237 ecore_x_input_multi_select(ee->prop.window);
2238 ecore_event_window_register(ee->prop.window, ee, ee->evas,
2239 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process,
2240 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
2241 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
2242 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
2243 if (ee->prop.borderless)
2244 ecore_x_mwm_borderless_set(ee->prop.window, ee->prop.borderless);
2245 if (ee->visible) ecore_x_window_show(ee->prop.window);
2246 if (ee->prop.focused) ecore_x_window_focus(ee->prop.window);
2247 if (ee->prop.title)
2248 {
2249 ecore_x_icccm_title_set(ee->prop.window, ee->prop.title);
2250 ecore_x_netwm_name_set(ee->prop.window, ee->prop.title);
2251 }
2252 if (ee->prop.name)
2253 ecore_x_icccm_name_class_set(ee->prop.window,
2254 ee->prop.name, ee->prop.clas);
2255 _ecore_evas_x_hints_update(ee);
2256 _ecore_evas_x_group_leader_update(ee);
2257 ecore_x_window_defaults_set(ee->prop.window);
2258 _ecore_evas_x_protocols_set(ee);
2259 _ecore_evas_x_sync_set(ee);
2260 _ecore_evas_x_size_pos_hints_update(ee);
2261#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
2262 if ((id = getenv("DESKTOP_STARTUP_ID")))
2263 {
2264 ecore_x_netwm_startup_id_set(ee->prop.window, id);
2265 /* NB: on linux this may simply empty the env as opposed to completely
2266 * unset it to being empty - unsure as solartis libc crashes looking
2267 * for the '=' char */
2268 // putenv((char*)"DESKTOP_STARTUP_ID=");
2269 }
2270 }
2271 else if (!strcmp(ee->driver, "software_8_x11")) 2110 else if (!strcmp(ee->driver, "software_8_x11"))
2272 { 2111 {
2273#if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) 2112#if defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11)
@@ -2846,56 +2685,6 @@ _ecore_evas_x_avoid_damage_set(Ecore_Evas *ee, int on)
2846 } 2685 }
2847#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */ 2686#endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */
2848 } 2687 }
2849 else if (!strcmp(ee->driver, "software_16_x11"))
2850 {
2851#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
2852 Evas_Engine_Info_Software_16_X11 *einfo;
2853
2854 ee->prop.avoid_damage = on;
2855 einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
2856 if (einfo)
2857 {
2858 if (ee->prop.avoid_damage)
2859 {
2860 ee->engine.x.pmap = ecore_x_pixmap_new(ee->prop.window, ee->w, ee->h, 16);
2861 ee->engine.x.gc = ecore_x_gc_new(ee->engine.x.pmap, 0, NULL);
2862 einfo->info.drawable = ee->engine.x.pmap;
2863 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
2864 {
2865 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
2866 }
2867 if ((ee->rotation == 90) || (ee->rotation == 270))
2868 evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
2869 else
2870 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
2871 if (ee->engine.x.direct_resize)
2872 {
2873 /* Turn this off for now
2874 ee->engine.x.using_bg_pixmap = 1;
2875 ecore_x_window_pixmap_set(ee->prop.window, ee->engine.x.pmap);
2876 */
2877 }
2878 }
2879 else
2880 {
2881 if (ee->engine.x.pmap) ecore_x_pixmap_free(ee->engine.x.pmap);
2882 if (ee->engine.x.gc) ecore_x_gc_free(ee->engine.x.gc);
2883 if (ee->engine.x.using_bg_pixmap)
2884 {
2885 ecore_x_window_pixmap_set(ee->prop.window, 0);
2886 ee->engine.x.using_bg_pixmap = 0;
2887 }
2888 ee->engine.x.pmap = 0;
2889 ee->engine.x.gc = 0;
2890 einfo->info.drawable = ee->prop.window;
2891 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
2892 {
2893 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
2894 }
2895 }
2896 }
2897#endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
2898 }
2899 else if (!strcmp(ee->driver, "software_8_x11")) 2688 else if (!strcmp(ee->driver, "software_8_x11"))
2900 { 2689 {
2901#if BUILD_ECORE_EVAS_SOFTWARE_8_X11 2690#if BUILD_ECORE_EVAS_SOFTWARE_8_X11
@@ -3115,7 +2904,7 @@ static Ecore_Evas_Engine_Func _ecore_x_engine_func =
3115 * ecore_x_init in 2 functions and suppress some round trips. 2904 * ecore_x_init in 2 functions and suppress some round trips.
3116 */ 2905 */
3117 2906
3118#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_OPENGL_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_16_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11) 2907#if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_OPENGL_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_8_X11)
3119static void 2908static void
3120_ecore_evas_x_flush_pre(void *data, Evas *e __UNUSED__, void *event_info __UNUSED__) 2909_ecore_evas_x_flush_pre(void *data, Evas *e __UNUSED__, void *event_info __UNUSED__)
3121{ 2910{
@@ -3769,279 +3558,34 @@ ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee __UNUSED__, Ecore_X
3769{ 3558{
3770} 3559}
3771 3560
3772/**
3773 * @brief Create Ecore_Evas using software 16 x11.
3774 * @note If ecore is not compiled with support to x11 then nothing is done and NULL is returned.
3775 * @param disp_name The name of the display of the Ecore_Evas to be created.
3776 * @param parent The parent of the Ecore_Evas to be created.
3777 * @param x The X coordinate to be used.
3778 * @param y The Y coordinate to be used.
3779 * @param w The width of the Ecore_Evas to be created.
3780 * @param h The height of the Ecore_Evas to be created.
3781 * @return The new Ecore_Evas.
3782 */
3783#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
3784EAPI Ecore_Evas *
3785ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent,
3786 int x, int y, int w, int h)
3787{
3788 Evas_Engine_Info_Software_16_X11 *einfo;
3789 Ecore_Evas *ee;
3790 int rmethod;
3791 static int redraw_debug = -1;
3792
3793 rmethod = evas_render_method_lookup("software_16_x11");
3794 if (!rmethod) return NULL;
3795 if (!ecore_x_init(disp_name)) return NULL;
3796 ee = calloc(1, sizeof(Ecore_Evas));
3797 if (!ee) return NULL;
3798
3799 ECORE_MAGIC_SET(ee, ECORE_MAGIC_EVAS);
3800
3801 _ecore_evas_x_init();
3802
3803 ee->engine.func = (Ecore_Evas_Engine_Func *)&_ecore_x_engine_func;
3804
3805 ee->driver = "software_16_x11";
3806 if (disp_name) ee->name = strdup(disp_name);
3807
3808 if (w < 1) w = 1;
3809 if (h < 1) h = 1;
3810 ee->x = x;
3811 ee->y = y;
3812 ee->w = w;
3813 ee->h = h;
3814 ee->req.x = ee->x;
3815 ee->req.y = ee->y;
3816 ee->req.w = ee->w;
3817 ee->req.h = ee->h;
3818
3819 ee->prop.max.w = 32767;
3820 ee->prop.max.h = 32767;
3821 ee->prop.layer = 4;
3822 ee->prop.request_pos = 0;
3823 ee->prop.sticky = 0;
3824 ee->engine.x.state.sticky = 0;
3825
3826 /* init evas here */
3827 ee->evas = evas_new();
3828 evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE, _ecore_evas_x_flush_pre, ee);
3829 evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_POST, _ecore_evas_x_flush_post, ee);
3830 evas_data_attach_set(ee->evas, ee);
3831 evas_output_method_set(ee->evas, rmethod);
3832 evas_output_size_set(ee->evas, w, h);
3833 evas_output_viewport_set(ee->evas, 0, 0, w, h);
3834
3835 ee->engine.x.win_root = parent;
3836 if (parent != 0)
3837 {
3838 /* FIXME: round trip in ecore_x_window_argb_get */
3839 if (ecore_x_window_argb_get(parent))
3840 {
3841 ee->prop.window = ecore_x_window_argb_new(parent, x, y, w, h);
3842 }
3843 else
3844 ee->prop.window = ecore_x_window_new(parent, x, y, w, h);
3845 }
3846 else
3847 ee->prop.window = ecore_x_window_new(parent, x, y, w, h);
3848 if (getenv("DESKTOP_STARTUP_ID"))
3849 {
3850 ecore_x_netwm_startup_id_set(ee->prop.window,
3851 getenv("DESKTOP_STARTUP_ID"));
3852 /* NB: on linux this may simply empty the env as opposed to completely
3853 * unset it to being empty - unsure as solartis libc crashes looking
3854 * for the '=' char */
3855// putenv((char*)"DESKTOP_STARTUP_ID=");
3856 }
3857 einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
3858
3859 if (einfo)
3860 {
3861 if (ScreenCount(ecore_x_display_get()) > 1)
3862 {
3863 Ecore_X_Window *roots;
3864 int num, i;
3865
3866 num = 0;
3867 roots = ecore_x_window_root_list(&num);
3868 if (roots)
3869 {
3870 XWindowAttributes at;
3871
3872 if (XGetWindowAttributes(ecore_x_display_get(),
3873 parent, &at))
3874 {
3875 for (i = 0; i < num; i++)
3876 {
3877 if (at.root == roots[i])
3878 break;
3879 }
3880 }
3881 free(roots);
3882 }
3883 }
3884
3885 if (redraw_debug < 0)
3886 {
3887 if (getenv("REDRAW_DEBUG"))
3888 redraw_debug = atoi(getenv("REDRAW_DEBUG"));
3889 else
3890 redraw_debug = 0;
3891 }
3892 einfo->info.display = ecore_x_display_get();
3893 einfo->info.drawable = ee->prop.window;
3894
3895 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
3896 {
3897 ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
3898 ecore_evas_free(ee);
3899 return NULL;
3900 }
3901 }
3902 else
3903 {
3904 ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
3905 ecore_evas_free(ee);
3906 return NULL;
3907 }
3908
3909 _ecore_evas_x_hints_update(ee);
3910 _ecore_evas_x_group_leader_set(ee);
3911 ecore_x_window_defaults_set(ee->prop.window);
3912 _ecore_evas_x_protocols_set(ee);
3913 _ecore_evas_x_sync_set(ee);
3914
3915 ee->engine.func->fn_render = _ecore_evas_x_render;
3916 _ecore_evas_register(ee);
3917 ecore_x_input_multi_select(ee->prop.window);
3918 ecore_event_window_register(ee->prop.window, ee, ee->evas,
3919 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process,
3920 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
3921 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
3922 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
3923 return ee;
3924}
3925#else
3926EAPI Ecore_Evas * 3561EAPI Ecore_Evas *
3927ecore_evas_software_x11_16_new(const char *disp_name __UNUSED__, Ecore_X_Window parent __UNUSED__, 3562ecore_evas_software_x11_16_new(const char *disp_name __UNUSED__, Ecore_X_Window parent __UNUSED__,
3928 int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) 3563 int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
3929{ 3564{
3930 return NULL; 3565 return NULL;
3931} 3566}
3932#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
3933 3567
3934/**
3935 * @brief Get the window from Ecore_Evas using software 16 x11.
3936 * @note If ecore is not compiled with support for x11 or if @p ee was not
3937 * created with ecore_evas_software_x11_16_new() then nothing is done and
3938 * 0 is returned.
3939 * @param ee The Ecore_Evas from which to get the window.
3940 * @return The window of type Ecore_X_Window of Ecore_Evas.
3941 */
3942#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
3943EAPI Ecore_X_Window
3944ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee)
3945{
3946 if (!(!strcmp(ee->driver, "software_16_x11"))) return 0;
3947 return (Ecore_X_Window) ecore_evas_window_get(ee);
3948}
3949#else
3950EAPI Ecore_X_Window 3568EAPI Ecore_X_Window
3951ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee __UNUSED__) 3569ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee __UNUSED__)
3952{ 3570{
3953 return 0; 3571 return 0;
3954} 3572}
3955#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
3956 3573
3957/**
3958 * @brief Set direct_resize for Ecore_Evas using software 16 x11.
3959 * @note If ecore is not compiled with support to x11 then nothing is done.
3960 * @param ee The Ecore_Evas in which to set direct resize.
3961 * @param on Enables the resize of Ecore_Evas if equals EINA_TRUE, disables if equals EINA_FALSE.
3962 */
3963#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
3964EAPI void
3965ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on)
3966{
3967 ee->engine.x.direct_resize = on;
3968 if (ee->prop.avoid_damage)
3969 {
3970 if (ee->engine.x.direct_resize)
3971 {
3972/* turn this off for now
3973 ee->engine.x.using_bg_pixmap = 1;
3974 ecore_x_window_pixmap_set(ee->prop.window, ee->engine.x.pmap);
3975 */
3976 }
3977 else
3978 {
3979/* turn this off too- bg pixmap is controlled by avoid damage directly
3980 ee->engine.x.using_bg_pixmap = 0;
3981 ecore_x_window_pixmap_set(ee->prop.window, 0);
3982 ecore_x_window_area_expose(ee->prop.window, 0, 0, ee->w, ee->h);
3983 */
3984 }
3985 }
3986}
3987#else
3988EAPI void 3574EAPI void
3989ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee __UNUSED__, Eina_Bool on __UNUSED__) 3575ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee __UNUSED__, Eina_Bool on __UNUSED__)
3990{ 3576{
3991} 3577}
3992#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
3993 3578
3994/**
3995 * @brief Gets if the Ecore_Evas is being directly resized using software 16 x11.
3996 * @note If ecore is not compiled with support to x11 then nothing is done and 0 is returned.
3997 * @param ee The Ecore_Evas from which to get direct resize.
3998 * @return EINA_TRUE if the resize was managed directly, otherwise return EINA_FALSE.
3999 */
4000#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
4001EAPI Eina_Bool
4002ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee)
4003{
4004 return ee->engine.x.direct_resize;
4005}
4006#else
4007EAPI Eina_Bool 3579EAPI Eina_Bool
4008ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee __UNUSED__) 3580ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee __UNUSED__)
4009{ 3581{
4010 return 0; 3582 return 0;
4011} 3583}
4012#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
4013
4014/**
4015 * @brief Add extra window on Ecore_Evas using software 16 x11.
4016 * @note If ecore is not compiled with support to x11 then nothing is done.
4017 * @param ee The Ecore_Evas on which to add the window.
4018 * @param win The window to be added at the Ecore_Evas.
4019 */
4020#if BUILD_ECORE_EVAS_SOFTWARE_16_X11
4021EAPI void
4022ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
4023{
4024 Ecore_X_Window *winp;
4025 3584
4026 winp = malloc(sizeof(Ecore_X_Window));
4027 if (winp)
4028 {
4029 *winp = win;
4030 ee->engine.x.win_extra = eina_list_append(ee->engine.x.win_extra, winp);
4031 ecore_x_input_multi_select(win);
4032 ecore_event_window_register(win, ee, ee->evas,
4033 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process,
4034 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
4035 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
4036 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
4037 }
4038}
4039#else
4040EAPI void 3585EAPI void
4041ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee __UNUSED__, Ecore_X_Window win __UNUSED__) 3586ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee __UNUSED__, Ecore_X_Window win __UNUSED__)
4042{ 3587{
4043} 3588}
4044#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
4045 3589
4046 3590
4047/** 3591/**