aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--NEWS3
-rw-r--r--src/lib/ecore_evas/Ecore_Evas.h36
-rw-r--r--src/lib/ecore_evas/ecore_evas.c26
-rw-r--r--src/lib/ecore_evas/ecore_evas_deprecated.c102
-rw-r--r--src/lib/ecore_evas/ecore_evas_x.c94
6 files changed, 124 insertions, 138 deletions
diff --git a/ChangeLog b/ChangeLog
index 92d4e0e01..6da5eb6bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2012-12-05 Gustavo Sverzut Barbieri (k-s)
* Removed DirectFB support (both ecore_directfb, evas and ecore_evas).
+ * Removed XRender, WinCE, X11-16 and X11-8 ecore_evas support.
2012-12-04 Gwanglim Lee
diff --git a/NEWS b/NEWS
index 660948df7..676b7fa50 100644
--- a/NEWS
+++ b/NEWS
@@ -46,10 +46,11 @@ Deprecations:
ECORE_X_ATOM_E_PROFILE_LIST
ecore_x_e_window_profile_list_set()
ecore_x_e_window_profile_list_get()
- * ecore_evas: deprecate directfb engine.
+ * ecore_evas: deprecate DirectFB, XRender, WinCE, X11-16 and X11-8.
Removed:
* directfb support: ecore_directfb and evas directfb engine.
+ * Removed XRender, WinCE, X11-16 and X11-8 ecore_evas support.
Improvements:
* Single EFL tree covering all EFL library components.
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 20e7ba37f..5c5702574 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -914,24 +914,24 @@ EAPI Eina_Bool ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee);
EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
-EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee);
-EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee);
-EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-
-EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee);
-EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee);
-EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee);
-EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-
-EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee);
-EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee);
-EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
+EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) EINA_DEPRECATED;
+EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee) EINA_DEPRECATED;
+EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) EINA_DEPRECATED;
+EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee) EINA_DEPRECATED;
+EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) EINA_DEPRECATED;
+
+EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) EINA_DEPRECATED;
+EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee) EINA_DEPRECATED;
+EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee) EINA_DEPRECATED;
+EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) EINA_DEPRECATED;
+EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee) EINA_DEPRECATED;
+EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) EINA_DEPRECATED;
+
+EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h) EINA_DEPRECATED;
+EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee) EINA_DEPRECATED;
+EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on) EINA_DEPRECATED;
+EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee) EINA_DEPRECATED;
+EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win) EINA_DEPRECATED;
EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h);
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 49d90fb60..db35a7837 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -154,13 +154,8 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
return EINA_FALSE;
#endif
- case ECORE_EVAS_ENGINE_SOFTWARE_8_X11:
-#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11
- return EINA_TRUE;
-#else
+ case ECORE_EVAS_ENGINE_SOFTWARE_8_X11:
return EINA_FALSE;
-#endif
-
case ECORE_EVAS_ENGINE_SOFTWARE_16_X11:
return EINA_FALSE;
case ECORE_EVAS_ENGINE_SOFTWARE_16_DDRAW:
@@ -455,22 +450,6 @@ _ecore_evas_constructor_opengl_x11(int x, int y, int w, int h, const char *extra
}
#endif
-#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11
-static Ecore_Evas *
-_ecore_evas_constructor_software_8_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_8_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 EINA_UNUSED, int y EINA_UNUSED, int w, int h, const char *extra_options)
@@ -639,9 +618,6 @@ static const struct ecore_evas_engine _engines[] = {
#ifdef BUILD_ECORE_EVAS_OPENGL_X11
{"opengl_x11", _ecore_evas_constructor_opengl_x11},
#endif
-#ifdef BUILD_ECORE_EVAS_SOFTWARE_8_X11
- {"software_8_x11", _ecore_evas_constructor_software_8_x11},
-#endif
#ifdef BUILD_ECORE_EVAS_FB
{"fb", _ecore_evas_constructor_fb},
#endif
diff --git a/src/lib/ecore_evas/ecore_evas_deprecated.c b/src/lib/ecore_evas/ecore_evas_deprecated.c
index 6e0621fa1..20a57ebf8 100644
--- a/src/lib/ecore_evas/ecore_evas_deprecated.c
+++ b/src/lib/ecore_evas/ecore_evas_deprecated.c
@@ -86,3 +86,105 @@ ecore_evas_directfb_window_get(const Ecore_Evas *ee EINA_UNUSED)
{
return NULL;
}
+
+/* Ecore_Evas X11 16 bits support was removed. However we keep the functions
+ * to not break ABI.
+ */
+EAPI Ecore_Evas *
+ecore_evas_software_x11_16_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
+ int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
+{
+ return NULL;
+}
+
+EAPI Ecore_X_Window
+ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+ return 0;
+}
+
+EAPI void
+ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
+{
+}
+
+EAPI Eina_Bool
+ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+ return EINA_FALSE;
+}
+
+EAPI void
+ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
+{
+}
+
+/* Ecore_Evas X11 8 bits support was removed. However we keep the functions
+ * to not break ABI.
+ */
+EAPI Ecore_Evas *
+ecore_evas_software_x11_8_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
+{
+ return NULL;
+}
+
+EAPI Ecore_X_Window
+ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+ return 0;
+}
+
+EAPI Ecore_X_Window
+ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+ return 0;
+}
+
+EAPI void
+ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
+{
+}
+
+EAPI Eina_Bool
+ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+ return EINA_FALSE;
+}
+
+EAPI void
+ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
+{
+ return;
+}
+
+/* Ecore_Evas XRender support was removed. However we keep the functions
+ * to not break ABI.
+ */
+EAPI Ecore_Evas *
+ecore_evas_xrender_x11_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
+ int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
+{
+ return NULL;
+}
+
+EAPI Ecore_X_Window
+ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+ return 0;
+}
+
+EAPI void
+ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
+{
+}
+
+EAPI Eina_Bool
+ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
+{
+ return 0;
+}
+
+EAPI void
+ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
+{
+}
diff --git a/src/lib/ecore_evas/ecore_evas_x.c b/src/lib/ecore_evas/ecore_evas_x.c
index 4608d5686..ec8e923ae 100644
--- a/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c
@@ -1732,7 +1732,6 @@ static void
_ecore_evas_x_rotation_set(Ecore_Evas *ee, int rotation, int resize)
{
if (ee->rotation == rotation) return;
- if (!strcmp(ee->driver, "xrender_x11")) return;
#if _USE_WIN_ROT_EFFECT
int angles[2];
@@ -3382,99 +3381,6 @@ ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee EINA_UNUSED, v
}
#endif /* ! BUILD_ECORE_EVAS_OPENGL_X11 */
-EAPI Ecore_Evas *
-ecore_evas_xrender_x11_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
- int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
-{
- return NULL;
-}
-
-EAPI Ecore_X_Window
-ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee EINA_UNUSED)
-{
- return 0;
-}
-
-EAPI void
-ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
-{
-}
-
-EAPI Eina_Bool
-ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
-{
- return 0;
-}
-
-EAPI void
-ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
-{
-}
-
-EAPI Ecore_Evas *
-ecore_evas_software_x11_16_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED,
- int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
-{
- return NULL;
-}
-
-EAPI Ecore_X_Window
-ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee EINA_UNUSED)
-{
- return 0;
-}
-
-EAPI void
-ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
-{
-}
-
-EAPI Eina_Bool
-ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
-{
- return 0;
-}
-
-EAPI void
-ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
-{
-}
-
-EAPI Ecore_Evas *
-ecore_evas_software_x11_8_new(const char *disp_name EINA_UNUSED, Ecore_X_Window parent EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
-{
- return NULL;
-}
-
-EAPI Ecore_X_Window
-ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee EINA_UNUSED)
-{
- return 0;
-}
-
-EAPI Ecore_X_Window
-ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee EINA_UNUSED)
-{
- return 0;
-}
-
-EAPI void
-ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool on EINA_UNUSED)
-{
-}
-
-EAPI Eina_Bool
-ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee EINA_UNUSED)
-{
- return 0;
-}
-
-EAPI void
-ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee EINA_UNUSED, Ecore_X_Window win EINA_UNUSED)
-{
- return;
-}
-
EAPI void
ecore_evas_x11_leader_set(Ecore_Evas *ee, Ecore_X_Window win)
{