diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am index 98b2e802c9..c96c3432fe 100644 --- a/legacy/evas/Makefile.am +++ b/legacy/evas/Makefile.am @@ -22,7 +22,6 @@ README \ evas-cairo-x11.pc \ evas-directfb.pc \ evas-fb.pc \ -evas-glitz-x11.pc \ evas-opengl-x11.pc \ evas-opengl-glew.pc \ evas-quartz.pc \ @@ -62,7 +61,6 @@ evas.pc.in \ evas-cairo-x11.pc.in \ evas-directfb.pc.in \ evas-fb.pc.in \ -evas-glitz-x11.pc.in \ evas-opengl-x11.pc.in \ evas-opengl-glew.pc.in \ evas-software-buffer.pc.in \ @@ -99,10 +97,6 @@ if BUILD_ENGINE_FB pfb = evas-fb.pc endif -if BUILD_ENGINE_GLITZ_X11 -pglitzx11 = evas-glitz-x11.pc -endif - if BUILD_ENGINE_BUFFER psoftwarebuffer = evas-software-buffer.pc endif @@ -159,7 +153,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ evas.pc $(psoftwarex11) $(psoftwarexcb) $(pdirectfb) $(pfb) \ $(psoftwarebuffer) $(psoftwareqtopia) $(popenglx11) $(pquartz) $(pcairox11) \ - $(pxrenderx11) $(pxrenderxcb) $(pglitzx11) $(psoftwareddraw) $(psoftwaresdl) \ + $(pxrenderx11) $(pxrenderxcb) $(psoftwareddraw) $(psoftwaresdl) \ $(psoftware16x11) $(pdirect3d) $(psoftware16ddraw) $(psoftware16wince) $(popenglglew) .PHONY: doc diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index 6b3197e0a0..998772ab61 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -37,7 +37,6 @@ want_evas_engine_buffer="yes" want_evas_engine_software_x11="no" want_evas_engine_xrender_x11="no" want_evas_engine_gl_x11="no" -want_evas_engine_glitz_x11="no" want_evas_engine_cairo_x11="no" want_evas_engine_software_xcb="no" want_evas_engine_xrender_xcb="no" @@ -233,8 +232,6 @@ EVAS_CHECK_ENGINE([xrender-x11], [${want_evas_engine_xrender_x11}], [yes], [XRen EVAS_CHECK_ENGINE([gl-x11], [${want_evas_engine_gl_x11}], [yes], [OpenGL X11]) -EVAS_CHECK_ENGINE([glitz-x11], [${want_evas_engine_glitz_x11}], [yes], [Glitz X11]) - EVAS_CHECK_ENGINE([cairo-x11], [${want_evas_engine_cairo_x11}], [yes], [Cairo X11]) EVAS_CHECK_ENGINE([software-xcb], [${want_evas_engine_software_xcb}], [no], [Software XCB]) @@ -953,7 +950,6 @@ Makefile evas-cairo-x11.pc evas-directfb.pc evas-fb.pc -evas-glitz-x11.pc evas-opengl-glew.pc evas-opengl-x11.pc evas-quartz.pc @@ -1008,7 +1004,6 @@ src/modules/engines/cairo_common/Makefile src/modules/engines/cairo_x11/Makefile src/modules/engines/xrender_x11/Makefile src/modules/engines/software_sdl/Makefile -src/modules/engines/glitz_x11/Makefile src/modules/engines/software_16/Makefile src/modules/engines/software_16_x11/Makefile src/modules/engines/software_16_ddraw/Makefile @@ -1051,7 +1046,6 @@ echo " Software Memory Buffer.....: $have_evas_engine_buffer" echo " Software X11...............: $have_evas_engine_software_x11 (XCB: $have_evas_engine_software_xcb)" echo " XRender X11................: $have_evas_engine_xrender_x11 (XCB: $have_evas_engine_xrender_xcb)" echo " OpenGL X11.................: $have_evas_engine_gl_x11" -echo " Glitz X11..................: $have_evas_engine_glitz_x11" echo " Cairo X11..................: $have_evas_engine_cairo_x11" echo " XRender XCB................: $have_evas_engine_xrender_xcb" echo " Software DirectDraw........: $have_evas_engine_software_ddraw" diff --git a/legacy/evas/evas-glitz-x11.pc.in b/legacy/evas/evas-glitz-x11.pc.in deleted file mode 100644 index dbf1ac5f77..0000000000 --- a/legacy/evas/evas-glitz-x11.pc.in +++ /dev/null @@ -1,3 +0,0 @@ -Name: evas-glitz-x11 -Description: Evas Glitz X11 engine -Version: @VERSION@ diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4 index 5fba04c31a..367c281a28 100644 --- a/legacy/evas/m4/evas_check_engine.m4 +++ b/legacy/evas/m4/evas_check_engine.m4 @@ -132,48 +132,6 @@ fi ]) -dnl use: EVAS_CHECK_ENGINE_DEP_GLITZ_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) - -AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GLITZ_X11], -[ - -have_dep="no" -evas_engine_[]$1[]_cflags="" -evas_engine_[]$1[]_libs="" - -AC_PATH_X -AC_PATH_XTRA - -AC_CHECK_HEADER([X11/X.h], - [PKG_CHECK_MODULES([GLITZ], - [glitz glitz-glx], - [have_dep="yes"] - )] -) - -if test "x${have_dep}" = "xyes" ; then - if test "x$2" = "xyes" ; then - x_libs="${x_libs} -lX11 -lXext" - else - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - fi - evas_engine_[]$1[]_cflags="${GLITZ_CFLAGS} ${x_cflags}" - evas_engine_[]$1[]_libs="${GLITZ_LIBS} ${x_libs}" -fi - -AC_SUBST([evas_engine_$1_cflags]) -AC_SUBST([evas_engine_$1_libs]) - -if test "x${have_dep}" = "xyes" ; then - m4_default([$3], [:]) -else - m4_default([$4], [:]) -fi - -]) - dnl use: EVAS_CHECK_ENGINE_DEP_CAIRO_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) AC_DEFUN([EVAS_CHECK_ENGINE_DEP_CAIRO_X11], diff --git a/legacy/evas/src/modules/engines/Makefile.am b/legacy/evas/src/modules/engines/Makefile.am index d4cff3f03a..d049e158dc 100644 --- a/legacy/evas/src/modules/engines/Makefile.am +++ b/legacy/evas/src/modules/engines/Makefile.am @@ -16,7 +16,6 @@ software_ddraw \ software_x11 \ xrender_x11 \ software_sdl \ -glitz_x11 \ software_16 \ software_16_x11 \ direct3d \ @@ -24,4 +23,3 @@ software_16_ddraw \ software_16_wince \ software_16_sdl \ quartz - diff --git a/legacy/evas/src/modules/engines/glitz_x11/.cvsignore b/legacy/evas/src/modules/engines/glitz_x11/.cvsignore deleted file mode 100644 index a51c9665e0..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la \ No newline at end of file diff --git a/legacy/evas/src/modules/engines/glitz_x11/Evas_Engine_Glitz_X11.h b/legacy/evas/src/modules/engines/glitz_x11/Evas_Engine_Glitz_X11.h deleted file mode 100644 index 1593f8e29e..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/Evas_Engine_Glitz_X11.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _EVAS_ENGINE_GLITZ_X11_H -#define _EVAS_ENGINE_GLITZ_X11_H - -#include - -typedef struct _Evas_Engine_Info_Glitz_X11 Evas_Engine_Info_Glitz_X11; - -struct _Evas_Engine_Info_Glitz_X11 -{ - /* PRIVATE - don't mess with this baby or evas will poke its tongue out */ - /* at you and make nasty noises */ - Evas_Engine_Info magic; - - /* engine specific data & parameters it needs to set up */ - struct { - Display *display; - Drawable drawable; - Pixmap mask; - Visual *visual; - unsigned char destination_alpha : 1; - } info; -}; -#endif - - diff --git a/legacy/evas/src/modules/engines/glitz_x11/Makefile.am b/legacy/evas/src/modules/engines/glitz_x11/Makefile.am deleted file mode 100644 index 60d947943a..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = \ --I. \ --I$(top_srcdir)/src/lib \ --I$(top_srcdir)/src/lib/include \ --I$(top_srcdir)/src/modules/engines \ -@FREETYPE_CFLAGS@ \ -@EINA_CFLAGS@ \ -@evas_engine_glitz_x11_cflags@ - -if BUILD_ENGINE_GLITZ_X11 - -pkgdir = $(libdir)/evas/modules/engines/glitz_x11/$(MODULE_ARCH) - -pkg_LTLIBRARIES = module.la -module_la_SOURCES = \ -evas_engine.c \ -evas_engine_ximage.c \ -evas_engine_glitz.c \ -evas_engine_image.c \ -evas_engine_font.c \ -evas_engine_gradient.c - -module_la_LIBADD = @EINA_LIBS@ @evas_engine_glitz_x11_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = -module -avoid-version -module_la_LIBTOOLFLAGS = --tag=disable-static - -include_HEADERS = Evas_Engine_Glitz_X11.h - -endif - -EXTRA_DIST = evas_engine.h diff --git a/legacy/evas/src/modules/engines/glitz_x11/evas_engine.c b/legacy/evas/src/modules/engines/glitz_x11/evas_engine.c deleted file mode 100644 index 61e8d0a05a..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/evas_engine.c +++ /dev/null @@ -1,675 +0,0 @@ -#include "evas_common.h" -#include "evas_private.h" -#include "evas_engine.h" -#include "Evas_Engine_Glitz_X11.h" - -/* function tables - filled in later (func and parent func) */ -static Evas_Func func, pfunc; - -/* engine struct data */ -typedef struct _Render_Engine Render_Engine; -typedef struct _Render_Engine_Update Render_Engine_Update; - -struct _Render_Engine_Update -{ - int x, y, w, h; -// void *surface; -}; - -struct _Render_Engine -{ - Display *disp; - Visual *vis; - Drawable win; - Pixmap mask; - unsigned char destination_alpha : 1; - - Tilebuf *tb; - Tilebuf_Rect *rects; - Eina_Inlist *cur_rect; - int end : 1; - - Eina_List *updates; -}; - -/* prototypes we will use here */ -static void *eng_info(Evas *e); -static void eng_info_free(Evas *e, void *info); -static int eng_setup(Evas *e, void *info); -static void eng_output_free(void *data); -static void eng_output_resize(void *data, int w, int h); -static void eng_output_tile_size_set(void *data, int w, int h); -static void eng_output_redraws_rect_add(void *data, int x, int y, int w, int h); -static void eng_output_redraws_rect_del(void *data, int x, int y, int w, int h); -static void eng_output_redraws_clear(void *data); -static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch); -static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h); -static void eng_output_flush(void *data); -static void eng_output_idle_flush(void *data); - -static void eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h); - -static void eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2); - -static void eng_polygon_draw(void *data, void *context, void *surface, void *polygon); - -static void *eng_gradient_new(void *data); -static void eng_gradient_free(void *data, void *gradient); -static void eng_gradient_color_stop_add(void *data, void *gradient, int r, int g, int b, int a, int delta); -static void eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int delta); -static void eng_gradient_color_data_set(void *data, void *gradient, void *map, int len, int has_alpha); -static void eng_gradient_alpha_data_set(void *data, void *gradient, void *alpha_map, int len); -static void eng_gradient_clear(void *data, void *gradient); -static void eng_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h); -static void eng_gradient_fill_angle_set(void *data, void *gradient, double angle); -static void eng_gradient_fill_spread_set(void *data, void *gradient, int spread); -static void eng_gradient_angle_set(void *data, void *gradient, double angle); -static void eng_gradient_offset_set(void *data, void *gradient, float offset); -static void eng_gradient_direction_set(void *data, void *gradient, int direction); -static void eng_gradient_type_set(void *data, void *gradient, char *name, char *params); -static int eng_gradient_is_opaque(void *data, void *context, void *gradient, int x, int y, int w, int h); -static int eng_gradient_is_visible(void *data, void *context, void *gradient, int x, int y, int w, int h); -static void eng_gradient_render_pre(void *data, void *context, void *gradient); -static void eng_gradient_render_post(void *data, void *gradient); -static void eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h); - -static void *eng_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo); -static void *eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data); -static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data); -static void eng_image_free(void *data, void *image); -static void eng_image_size_get(void *data, void *image, int *w, int *h); -static void *eng_image_size_set(void *data, void *image, int w, int h); -static void *eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h); -static void *eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data); -static void *eng_image_data_put(void *data, void *image, DATA32 *image_data); -static void *eng_image_alpha_set(void *data, void *image, int has_alpha); -static int eng_image_alpha_get(void *data, void *image); -static void *eng_image_border_set(void *data, void *image, int l, int r, int t, int b); -static void eng_image_border_get(void *data, void *image, int *l, int *r, int *t, int *b); -static void eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth); -static const char *eng_image_comment_get(void *data, void *image, char *key); -static char *eng_image_format_get(void *data, void *image); -static void eng_image_cache_flush(void *data); -static void eng_image_cache_set(void *data, int bytes); -static int eng_image_cache_get(void *data); - -static void eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const char *text); - -/* internal engine routines */ - -/* engine api this module provides */ -static void * -eng_info(Evas *e) -{ - Evas_Engine_Info_Glitz_X11 *info; - - info = calloc(1, sizeof(Evas_Engine_Info_Glitz_X11)); - if (!info) return NULL; - info->magic.magic = rand(); - return info; - e = NULL; -} - -static void -eng_info_free(Evas *e, void *info) -{ - Evas_Engine_Info_Glitz_X11 *in; - - in = (Evas_Engine_Info_Glitz_X11 *)info; - free(in); -} - -static int -eng_setup(Evas *e, void *in) -{ - Render_Engine *re; - Evas_Engine_Info_Glitz_X11 *info; - int resize = 1; - - info = (Evas_Engine_Info_Glitz_X11 *)in; - if (!e->engine.data.output) - { - re = calloc(1, sizeof(Render_Engine)); - if (!re) - return 0; - evas_common_cpu_init(); - evas_common_blend_init(); - evas_common_image_init(); - evas_common_convert_init(); - evas_common_scale_init(); - evas_common_rectangle_init(); - evas_common_gradient_init(); - evas_common_polygon_init(); - evas_common_line_init(); - evas_common_font_init(); - evas_common_draw_init(); - evas_common_tilebuf_init(); - re->tb = evas_common_tilebuf_new(e->output.w, e->output.h); - if (re->tb) - evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); - e->engine.data.output = re; - resize = 0; - } - re = e->engine.data.output; - if (!re) return 0; - - if (!e->engine.data.context) e->engine.data.context = e->engine.func->context_new(e->engine.data.output); - - re->disp = info->info.display; - re->vis = info->info.visual; - re->win = info->info.drawable; - re->mask = info->info.mask; - re->destination_alpha = info->info.destination_alpha; - - if (resize) - { - if (re->tb) evas_common_tilebuf_free(re->tb); - if ((e->output.w > 0) && (e->output.h > 0)) - re->tb = evas_common_tilebuf_new(e->output.w, e->output.h); - else - re->tb = evas_common_tilebuf_new(1, 1); - if (re->tb) - evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); - } - - return 1; -} - -static void -eng_output_free(void *data) -{ - Render_Engine *re; - - re = (Render_Engine *)data; - evas_common_font_shutdown(); - evas_common_image_shutdown(); - while (re->updates) - { - Render_Engine_Update *reu; - - reu = re->updates->data; - re->updates = eina_list_remove_list(re->updates, re->updates); -// surface_free(reu->surface); - free(reu); - } - if (re->tb) evas_common_tilebuf_free(re->tb); - if (re->rects) evas_common_tilebuf_free_render_rects(re->rects); - free(re); -} - -static void -eng_output_resize(void *data, int w, int h) -{ - Render_Engine *re; - - re = (Render_Engine *)data; - evas_common_tilebuf_free(re->tb); - re->tb = evas_common_tilebuf_new(w, h); - if (re->tb) evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); -} - -static void -eng_output_tile_size_set(void *data, int w, int h) -{ - Render_Engine *re; - - re = (Render_Engine *)data; - evas_common_tilebuf_set_tile_size(re->tb, w, h); -} - -static void -eng_output_redraws_rect_add(void *data, int x, int y, int w, int h) -{ - Render_Engine *re; - - re = (Render_Engine *)data; - evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); -} - -static void -eng_output_redraws_rect_del(void *data, int x, int y, int w, int h) -{ - Render_Engine *re; - - re = (Render_Engine *)data; - evas_common_tilebuf_del_redraw(re->tb, x, y, w, h); -} - -static void -eng_output_redraws_clear(void *data) -{ - Render_Engine *re; - - re = (Render_Engine *)data; - evas_common_tilebuf_clear(re->tb); -} - -static void * -eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch) -{ - Render_Engine *re; - Tilebuf_Rect *rect; - int ux, uy, uw, uh; - - re = (Render_Engine *)data; - if (re->end) - { - re->end = 0; - return NULL; - } - if (!re->rects) - { - re->rects = evas_common_tilebuf_get_render_rects(re->tb); - re->cur_rect = EINA_INLIST_GET(re->rects); - } - if (!re->cur_rect) return NULL; - rect = (Tilebuf_Rect *)re->cur_rect; - ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h; - re->cur_rect = re->cur_rect->next; - if (!re->cur_rect) - { - evas_common_tilebuf_free_render_rects(re->rects); - re->rects = NULL; - re->end = 1; - } - - *x = ux; *y = uy; *w = uw; *h = uh; - *cx = 0; *cy = 0; *cw = uw; *ch = uh; - return NULL; - if ((re->destination_alpha) || (re->mask)) - { -// Xrender_Surface *surface; -// -// surface = _xr_render_surface_new(re->xinf, uw, uh, re->xinf->fmt32, 1); -// _xr_render_surface_solid_rectangle_set(surface, 0, 0, 0, 0, 0, 0, uw, uh); -// return surface; - } -// return _xr_render_surface_new(re->xinf, uw, uh, re->xinf->fmt24, 0); -} - -static void -eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h) -{ - Render_Engine *re; - Render_Engine_Update *reu; - - re = (Render_Engine *)data; - reu = malloc(sizeof(Render_Engine_Update)); - if (!reu) return; - reu->x = x; - reu->y = y; - reu->w = w; - reu->h = h; -// reu->surface = surface; - re->updates = eina_list_append(re->updates, reu); -} - -static void -eng_output_flush(void *data) -{ - Render_Engine *re; - - re = (Render_Engine *)data; - while (re->updates) - { - Render_Engine_Update *reu; - - reu = re->updates->data; - re->updates = eina_list_remove_list(re->updates, re->updates); -// if (re->mask_output) -// { -// Xrender_Surface *tsurf; -// -// _xr_render_surface_copy(reu->surface, re->output, 0, 0, -// reu->x, reu->y, reu->w, reu->h); -// tsurf = _xr_render_surface_new(re->xinf, reu->w, reu->h, re->xinf->fmt1, 1); -// if (tsurf) -// { -// _xr_render_surface_copy(reu->surface, tsurf, 0, 0, -// 0, 0, reu->w, reu->h); -// _xr_render_surface_copy(tsurf, re->mask_output, 0, 0, -// reu->x, reu->y, reu->w, reu->h); -// _xr_render_surface_free(tsurf); -// } -// } -// else -// { -// _xr_render_surface_copy(reu->surface, re->output, 0, 0, -// reu->x, reu->y, reu->w, reu->h); -// } -// _xr_render_surface_free(reu->surface); - free(reu); - } - XSync(re->disp, False); -// _xr_image_info_pool_flush(re->xinf, 0, 0); -} - -static void -eng_output_idle_flush(void *data) -{ - Render_Engine *re; - - re = (Render_Engine *)data; -} - -static void -eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h) -{ -} - -static void -eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2) -{ -} - -static void -eng_polygon_draw(void *data, void *context, void *surface, void *polygon) -{ -} - -static void * -eng_gradient_new(void *data) -{ - Render_Engine *re = (Render_Engine *)data; - - return NULL; -} - -static void -eng_gradient_free(void *data, void *gradient) -{ -} - -static void -eng_gradient_color_stop_add(void *data, void *gradient, int r, int g, int b, int a, int delta) -{ -} - -static void -eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int delta) -{ -} - -static void -eng_gradient_color_data_set(void *data, void *gradient, void *map, int len, int has_alpha) -{ -} - -static void -eng_gradient_alpha_data_set(void *data, void *gradient, void *alpha_map, int len) -{ -} - -static void -eng_gradient_clear(void *data, void *gradient) -{ -} - -static void -eng_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h) -{ -} - -static void -eng_gradient_fill_angle_set(void *data, void *gradient, double angle) -{ -} - -static void -eng_gradient_fill_spread_set(void *data, void *gradient, int spread) -{ -} - -static void -eng_gradient_angle_set(void *data, void *gradient, double angle) -{ -} - -static void -eng_gradient_offset_set(void *data, void *gradient, float offset) -{ -} - -static void -eng_gradient_direction_set(void *data, void *gradient, int direction) -{ -} - -static void -eng_gradient_type_set(void *data, void *gradient, char *name, char *params) -{ -} - -static int -eng_gradient_is_opaque(void *data, void *context, void *gradient, int x, int y, int w, int h) -{ - return 0; -} - -static int -eng_gradient_is_visible(void *data, void *context, void *gradient, int x, int y, int w, int h) -{ - if (!context || !gradient) return 0; - return 1; -} - -static void -eng_gradient_render_pre(void *data, void *context, void *gradient) -{ -} - -static void -eng_gradient_render_post(void *data, void *gradient) -{ -} - -static void -eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h) -{ -} - -static void * -eng_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo) -{ - return NULL; -} - -static void * -eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data) -{ - return NULL; -} - -static void * -eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data) -{ - return NULL; -} - -static void -eng_image_free(void *data, void *image) -{ -} - -static void -eng_image_size_get(void *data, void *image, int *w, int *h) -{ -} - -static void * -eng_image_size_set(void *data, void *image, int w, int h) -{ - return image; -} - -static void * -eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h) -{ - return image; -} - -static void * -eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data) -{ - return image; -} - -static void * -eng_image_data_put(void *data, void *image, DATA32 *image_data) -{ - return image; -} - -static void * -eng_image_alpha_set(void *data, void *image, int has_alpha) -{ - return image; -} - -static int -eng_image_alpha_get(void *data, void *image) -{ - return 0; -} - -static void * -eng_image_border_set(void *data, void *image, int l, int r, int t, int b) -{ - return image; -} - -static void -eng_image_border_get(void *data, void *image, int *l, int *r, int *t, int *b) -{ -} - -static void -eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth) -{ -} - -static const char * -eng_image_comment_get(void *data, void *image, char *key) -{ - return NULL; -} - -static char * -eng_image_format_get(void *data, void *image) -{ - return NULL; -} - -static void -eng_image_cache_flush(void *data) -{ - int tmp_size; - -// tmp_size = _xre_image_cache_get(); - pfunc.image_cache_flush(data); -// _xre_image_cache_set(0); -// _xre_image_cache_set(tmp_size); -} - -static void -eng_image_cache_set(void *data, int bytes) -{ - pfunc.image_cache_set(data, bytes); -// _xre_image_cache_set(bytes); -} - -static int -eng_image_cache_get(void *data) -{ - return pfunc.image_cache_get(data); -} - -static void -eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w, int h, int ow, int oh, const char *text) -{ -} - -/* module advertising code */ -EAPI int -module_open(Evas_Module *em) -{ - if (!em) return 0; - /* get whatever engine module we inherit from */ - if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0; - /* store it for later use */ - func = pfunc; - /* now to override methods */ -#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_) - ORD(info); - ORD(info_free); - ORD(setup); - ORD(output_free); - ORD(output_resize); - ORD(output_tile_size_set); - ORD(output_redraws_rect_add); - ORD(output_redraws_rect_del); - ORD(output_redraws_clear); - ORD(output_redraws_next_update_get); - ORD(output_redraws_next_update_push); - ORD(output_flush); - ORD(output_idle_flush); - ORD(rectangle_draw); - ORD(line_draw); - ORD(polygon_draw); - ORD(gradient_new); - ORD(gradient_free); - ORD(gradient_color_stop_add); - ORD(gradient_alpha_stop_add); - ORD(gradient_color_data_set); - ORD(gradient_alpha_data_set); - ORD(gradient_clear); - ORD(gradient_fill_set); - ORD(gradient_fill_angle_set); - ORD(gradient_fill_spread_set); - ORD(gradient_angle_set); - ORD(gradient_offset_set); - ORD(gradient_direction_set); - ORD(gradient_type_set); - ORD(gradient_is_opaque); - ORD(gradient_is_visible); - ORD(gradient_render_pre); - ORD(gradient_render_post); - ORD(gradient_draw); - ORD(image_load); - ORD(image_new_from_data); - ORD(image_new_from_copied_data); - ORD(image_free); - ORD(image_size_get); - ORD(image_size_set); - ORD(image_dirty_region); - ORD(image_data_get); - ORD(image_data_put); - ORD(image_alpha_set); - ORD(image_alpha_get); - ORD(image_border_set); - ORD(image_border_get); - ORD(image_draw); - ORD(image_comment_get); - ORD(image_format_get); - ORD(image_cache_flush); - ORD(image_cache_set); - ORD(image_cache_get); - ORD(font_draw); - /* now advertise out own api */ - em->functions = (void *)(&func); - return 1; -} - -EAPI void -module_close(void) -{ -} - -EAPI Evas_Module_Api evas_modapi = -{ - EVAS_MODULE_API_VERSION, - EVAS_MODULE_TYPE_ENGINE, - "glitz_x11", - "none" -}; - diff --git a/legacy/evas/src/modules/engines/glitz_x11/evas_engine.h b/legacy/evas/src/modules/engines/glitz_x11/evas_engine.h deleted file mode 100644 index b0a08bb41c..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/evas_engine.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef EVAS_ENGINE_H -#define EVAS_ENGINE_H - -#include -#include -#include -#include - -#include -#include - -#endif diff --git a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_font.c b/legacy/evas/src/modules/engines/glitz_x11/evas_engine_font.c deleted file mode 100644 index 12b0c14b14..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_font.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "evas_common.h" -#include "evas_private.h" -#include "evas_engine.h" -#include "Evas_Engine_Glitz_X11.h" diff --git a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_glitz.c b/legacy/evas/src/modules/engines/glitz_x11/evas_engine_glitz.c deleted file mode 100644 index 9e4c8522c6..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_glitz.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 - */ -#include "evas_common.h" -//#include "evas_macros.h" -#include "evas_private.h" -#include "evas_engine.h" -#include "Evas_Engine_Glitz_X11.h" -#include diff --git a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_gradient.c b/legacy/evas/src/modules/engines/glitz_x11/evas_engine_gradient.c deleted file mode 100644 index 2d579cd085..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_gradient.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "evas_common.h" -#include "evas_private.h" -#include "evas_engine.h" -#include "Evas_Engine_Glitz_X11.h" -#include diff --git a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_image.c b/legacy/evas/src/modules/engines/glitz_x11/evas_engine_image.c deleted file mode 100644 index 12b0c14b14..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_image.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "evas_common.h" -#include "evas_private.h" -#include "evas_engine.h" -#include "Evas_Engine_Glitz_X11.h" diff --git a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_ximage.c b/legacy/evas/src/modules/engines/glitz_x11/evas_engine_ximage.c deleted file mode 100644 index 12b0c14b14..0000000000 --- a/legacy/evas/src/modules/engines/glitz_x11/evas_engine_ximage.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "evas_common.h" -#include "evas_private.h" -#include "evas_engine.h" -#include "Evas_Engine_Glitz_X11.h"