remove software_16_x11 - danielz! u added it back. it ewas gone from upstream!
SVN revision: 77687
This commit is contained in:
parent
34fd7793b0
commit
f91826870d
|
|
@ -1,26 +0,0 @@
|
|||
#ifndef _EVAS_ENGINE_SOFTWARE_16_X11_H
|
||||
#define _EVAS_ENGINE_SOFTWARE_16_X11_H
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
typedef struct _Evas_Engine_Info_Software_16_X11 Evas_Engine_Info_Software_16_X11;
|
||||
|
||||
struct _Evas_Engine_Info_Software_16_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;
|
||||
int rotation;
|
||||
} info;
|
||||
|
||||
/* non-blocking or blocking mode */
|
||||
Evas_Engine_Render_Mode render_mode;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
|
|
@ -1,48 +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 \
|
||||
-I$(top_srcdir)/src/modules/engines/software_16 \
|
||||
@FREETYPE_CFLAGS@ \
|
||||
@EVAS_GENERAL_CFLAGS@ \
|
||||
@PIXMAN_CFLAGS@ \
|
||||
@FRIBIDI_CFLAGS@ \
|
||||
@evas_engine_software_16_x11_cflags@
|
||||
|
||||
if BUILD_ENGINE_SOFTWARE_16_X11
|
||||
|
||||
SOFTWARE_16_X11_SOURCES = \
|
||||
evas_engine.c \
|
||||
evas_x_buffer.c
|
||||
|
||||
SOFTWARE_16_X11_LIBADD = @evas_engine_software_16_x11_libs@
|
||||
|
||||
|
||||
includes_HEADERS = Evas_Engine_Software_16_X11.h
|
||||
includesdir = $(includedir)/evas-@VMAJ@
|
||||
|
||||
if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
|
||||
|
||||
pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH)
|
||||
pkg_LTLIBRARIES = module.la
|
||||
|
||||
module_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
|
||||
module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(SOFTWARE_16_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
|
||||
module_la_LDFLAGS = -no-undefined -module -avoid-version
|
||||
module_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
||||
else
|
||||
|
||||
noinst_LTLIBRARIES = libevas_engine_software_16_x11.la
|
||||
|
||||
libevas_engine_software_16_x11_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
|
||||
libevas_engine_software_16_x11_la_LIBADD = $(SOFTWARE_16_X11_LIBADD)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_DIST = evas_engine.h
|
||||
|
|
@ -1,622 +0,0 @@
|
|||
#include "evas_common.h"
|
||||
#include "evas_private.h"
|
||||
#include "evas_engine.h"
|
||||
#include "Evas_Engine_Software_16_X11.h"
|
||||
#include "evas_common_soft16.h"
|
||||
|
||||
int _evas_engine_soft16_x11_log_dom = -1;
|
||||
/* function tables - filled in later (func and parent func) */
|
||||
static Evas_Func func, pfunc;
|
||||
|
||||
/* engine struct data */
|
||||
typedef struct _Render_Engine Render_Engine;
|
||||
|
||||
struct _Render_Engine
|
||||
{
|
||||
Display *disp;
|
||||
Drawable draw;
|
||||
GC gc;
|
||||
int w, h, rot;
|
||||
Tilebuf *tb;
|
||||
Tilebuf_Rect *rects;
|
||||
Tilebuf_Rect *cur_rect;
|
||||
X_Output_Buffer *shbuf;
|
||||
Soft16_Image *tmp_out; /* used by indirect render, like rotation */
|
||||
Region clip_rects;
|
||||
unsigned char end : 1;
|
||||
unsigned char shm : 1;
|
||||
};
|
||||
|
||||
/* 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);
|
||||
|
||||
/* engine api this module provides */
|
||||
static void *
|
||||
eng_info(Evas *e)
|
||||
{
|
||||
Evas_Engine_Info_Software_16_X11 *info;
|
||||
|
||||
info = calloc(1, sizeof(Evas_Engine_Info_Software_16_X11));
|
||||
if (!info) return NULL;
|
||||
info->magic.magic = rand();
|
||||
info->render_mode = EVAS_RENDER_MODE_BLOCKING;
|
||||
return info;
|
||||
e = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
eng_info_free(Evas *e __UNUSED__, void *info)
|
||||
{
|
||||
Evas_Engine_Info_Software_16_X11 *in;
|
||||
in = (Evas_Engine_Info_Software_16_X11 *)info;
|
||||
free(in);
|
||||
}
|
||||
|
||||
static void
|
||||
_tmp_out_alloc(Render_Engine *re)
|
||||
{
|
||||
Tilebuf_Rect *r;
|
||||
unsigned int w = 0, h = 0;
|
||||
|
||||
EINA_INLIST_FOREACH(re->rects, r)
|
||||
{
|
||||
if (r->w > (int)w) w = r->w;
|
||||
if (r->h > (int)h) h = r->h;
|
||||
}
|
||||
|
||||
if (re->tmp_out)
|
||||
{
|
||||
if ((re->tmp_out->cache_entry.w < w) || (re->tmp_out->cache_entry.h < h))
|
||||
{
|
||||
evas_cache_image_drop(&re->tmp_out->cache_entry);
|
||||
re->tmp_out = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (!re->tmp_out)
|
||||
{
|
||||
Soft16_Image *im;
|
||||
|
||||
im = (Soft16_Image *) evas_cache_image_empty(evas_common_soft16_image_cache_get());
|
||||
im->cache_entry.flags.alpha = 0;
|
||||
evas_cache_image_surface_alloc(&im->cache_entry, w, h);
|
||||
|
||||
re->tmp_out = im;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
eng_setup(Evas *eo_e, void *in)
|
||||
{
|
||||
Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
|
||||
Render_Engine *re;
|
||||
Evas_Engine_Info_Software_16_X11 *info;
|
||||
/* X_Output_Buffer *xob; */
|
||||
XGCValues gcv;
|
||||
|
||||
info = (Evas_Engine_Info_Software_16_X11 *)in;
|
||||
if (!e->engine.data.output)
|
||||
{
|
||||
/* the only check - simplistic, i know, but enough for this
|
||||
* "special purpose" engine. Remember it is meant to be used
|
||||
* for limited power devices that have a 16bit display mode
|
||||
* and no real other acceleration, and high resolution so we
|
||||
* can pre-dither into 16bpp. */
|
||||
// if (DefaultDepth(info->info.display,
|
||||
// DefaultScreen(info->info.display)) != 16)
|
||||
// return;
|
||||
/* do common routine init - we wil at least use it for core
|
||||
* image loading and font loading/glyph rendering & placement */
|
||||
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_polygon_init();
|
||||
evas_common_line_init();
|
||||
evas_common_font_init();
|
||||
evas_common_draw_init();
|
||||
evas_common_tilebuf_init();
|
||||
evas_common_soft16_image_init();
|
||||
|
||||
/* render engine specific data */
|
||||
re = calloc(1, sizeof(Render_Engine));
|
||||
if (!re)
|
||||
return 0;
|
||||
e->engine.data.output = re;
|
||||
re->disp = info->info.display;
|
||||
re->draw = info->info.drawable;
|
||||
re->gc = XCreateGC(re->disp, re->draw, 0, &gcv);
|
||||
re->w = e->output.w;
|
||||
re->h = e->output.h;
|
||||
re->rot = info->info.rotation;
|
||||
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);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* we changed the info after first init - do a re-eval where
|
||||
* appropriate */
|
||||
// if (DefaultDepth(info->info.display,
|
||||
// DefaultScreen(info->info.display)) != 16)
|
||||
// return;
|
||||
re = e->engine.data.output;
|
||||
if (re->tb) evas_common_tilebuf_free(re->tb);
|
||||
re->disp = info->info.display;
|
||||
re->draw = info->info.drawable;
|
||||
XFreeGC(re->disp, re->gc);
|
||||
re->gc = XCreateGC(re->disp, re->draw, 0, &gcv);
|
||||
re->w = e->output.w;
|
||||
re->h = e->output.h;
|
||||
re->rot = info->info.rotation;
|
||||
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);
|
||||
if (re->tmp_out)
|
||||
{
|
||||
evas_cache_image_drop(&re->tmp_out->cache_entry);
|
||||
re->tmp_out = NULL;
|
||||
}
|
||||
}
|
||||
if (!e->engine.data.output) return 0;
|
||||
|
||||
/* add a draw context if we dont have one */
|
||||
if (!e->engine.data.context)
|
||||
e->engine.data.context =
|
||||
e->engine.func->context_new(e->engine.data.output);
|
||||
/* check if the display can do shm */
|
||||
re->shm = evas_software_16_x11_x_can_do_shm(re->disp);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
eng_output_free(void *data)
|
||||
{
|
||||
Render_Engine *re;
|
||||
|
||||
re = (Render_Engine *)data;
|
||||
|
||||
if (re->shbuf) evas_software_16_x11_x_output_buffer_free(re->shbuf, 0);
|
||||
if (re->clip_rects) XDestroyRegion(re->clip_rects);
|
||||
if (re->gc) XFreeGC(re->disp, re->gc);
|
||||
if (re->tb) evas_common_tilebuf_free(re->tb);
|
||||
if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
|
||||
if (re->tmp_out) evas_cache_image_drop(&re->tmp_out->cache_entry);
|
||||
free(re);
|
||||
|
||||
evas_common_font_shutdown();
|
||||
evas_common_image_shutdown();
|
||||
evas_common_soft16_image_shutdown();
|
||||
}
|
||||
|
||||
static void
|
||||
eng_output_resize(void *data, int w, int h)
|
||||
{
|
||||
Render_Engine *re;
|
||||
|
||||
re = (Render_Engine *)data;
|
||||
|
||||
if ((re->w == w) && (re->h == h)) return;
|
||||
|
||||
evas_common_tilebuf_free(re->tb);
|
||||
re->w = w;
|
||||
re->h = h;
|
||||
re->tb = evas_common_tilebuf_new(w, h);
|
||||
if (re->tb)
|
||||
evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
|
||||
if (re->shbuf)
|
||||
{
|
||||
evas_software_16_x11_x_output_buffer_free(re->shbuf, 0);
|
||||
re->shbuf = NULL;
|
||||
}
|
||||
if (re->clip_rects)
|
||||
{
|
||||
XDestroyRegion(re->clip_rects);
|
||||
re->clip_rects = NULL;
|
||||
}
|
||||
if (re->tmp_out)
|
||||
{
|
||||
evas_cache_image_drop(&re->tmp_out->cache_entry);
|
||||
re->tmp_out = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
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 inline void
|
||||
_output_buffer_alloc(Render_Engine *re)
|
||||
{
|
||||
int w, h;
|
||||
if (re->shbuf) return;
|
||||
|
||||
if ((re->rot == 0) || (re->rot == 180))
|
||||
{
|
||||
w = re->w;
|
||||
h = re->h;
|
||||
}
|
||||
else
|
||||
{
|
||||
w = re->h;
|
||||
h = re->w;
|
||||
}
|
||||
|
||||
re->shbuf = evas_software_16_x11_x_output_buffer_new
|
||||
(re->disp, DefaultVisual(re->disp, DefaultScreen(re->disp)),
|
||||
DefaultDepth(re->disp, DefaultScreen(re->disp)),
|
||||
w, h, 1, NULL);
|
||||
}
|
||||
|
||||
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);
|
||||
if (!re->rects) return NULL;
|
||||
|
||||
re->cur_rect = re->rects;
|
||||
_output_buffer_alloc(re);
|
||||
if (re->rot != 0) _tmp_out_alloc(re); /* grows if required */
|
||||
}
|
||||
if (!re->cur_rect)
|
||||
{
|
||||
if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
|
||||
re->rects = NULL;
|
||||
return NULL;
|
||||
}
|
||||
rect = re->cur_rect;
|
||||
ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h;
|
||||
re->cur_rect = (Tilebuf_Rect *)((EINA_INLIST_GET(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;
|
||||
if (re->rot == 0)
|
||||
{
|
||||
*cx = ux; *cy = uy; *cw = uw; *ch = uh;
|
||||
return re->shbuf->im;
|
||||
}
|
||||
else
|
||||
{
|
||||
*cx = 0; *cy = 0; *cw = uw; *ch = uh;
|
||||
return re->tmp_out;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_blit_rot_90(Soft16_Image *dst, const Soft16_Image *src,
|
||||
int out_x, int out_y, int w, int h)
|
||||
{
|
||||
DATA16 *dp, *sp;
|
||||
int x, y;
|
||||
|
||||
sp = src->pixels;
|
||||
dp = dst->pixels + (out_x +
|
||||
(w + out_y - 1) * dst->stride);
|
||||
|
||||
for (y = 0; y < h; y++)
|
||||
{
|
||||
DATA16 *dp_itr, *sp_itr;
|
||||
|
||||
sp_itr = sp;
|
||||
dp_itr = dp;
|
||||
|
||||
for (x = 0; x < w; x++)
|
||||
{
|
||||
*dp_itr = *sp_itr;
|
||||
|
||||
sp_itr++;
|
||||
dp_itr -= dst->stride;
|
||||
}
|
||||
sp += src->stride;
|
||||
dp++;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_blit_rot_180(Soft16_Image *dst, const Soft16_Image *src,
|
||||
int out_x, int out_y, int w, int h)
|
||||
{
|
||||
DATA16 *dp, *sp;
|
||||
int x, y;
|
||||
|
||||
sp = src->pixels;
|
||||
dp = dst->pixels + ((w + out_x - 1) +
|
||||
(h + out_y - 1) * dst->stride);
|
||||
|
||||
for (y = 0; y < h; y++)
|
||||
{
|
||||
DATA16 *dp_itr, *sp_itr;
|
||||
|
||||
sp_itr = sp;
|
||||
dp_itr = dp;
|
||||
|
||||
for (x = 0; x < w; x++)
|
||||
{
|
||||
*dp_itr = *sp_itr;
|
||||
|
||||
sp_itr++;
|
||||
dp_itr--;
|
||||
}
|
||||
sp += src->stride;
|
||||
dp -= dst->stride;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_blit_rot_270(Soft16_Image *dst, const Soft16_Image *src,
|
||||
int out_x, int out_y, int w, int h)
|
||||
{
|
||||
DATA16 *dp, *sp;
|
||||
int x, y;
|
||||
|
||||
sp = src->pixels;
|
||||
dp = dst->pixels + ((h + out_x - 1) +
|
||||
out_y * dst->stride);
|
||||
|
||||
for (y = 0; y < h; y++)
|
||||
{
|
||||
DATA16 *dp_itr, *sp_itr;
|
||||
|
||||
sp_itr = sp;
|
||||
dp_itr = dp;
|
||||
|
||||
for (x = 0; x < w; x++)
|
||||
{
|
||||
*dp_itr = *sp_itr;
|
||||
|
||||
sp_itr++;
|
||||
dp_itr += dst->stride;
|
||||
}
|
||||
sp += src->stride;
|
||||
dp--;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_tmp_out_process(Render_Engine *re, int out_x, int out_y, int w, int h)
|
||||
{
|
||||
Soft16_Image *d, *s;
|
||||
|
||||
d = re->shbuf->im;
|
||||
s = re->tmp_out;
|
||||
|
||||
if ((w < 1) || (h < 1) ||
|
||||
(out_x >= (int)d->cache_entry.w) || (out_y >= (int)d->cache_entry.h))
|
||||
return;
|
||||
|
||||
if (re->rot == 90)
|
||||
_blit_rot_90(d, s, out_x, out_y, w, h);
|
||||
else if (re->rot == 180)
|
||||
_blit_rot_180(d, s, out_x, out_y, w, h);
|
||||
else if (re->rot == 270)
|
||||
_blit_rot_270(d, s, out_x, out_y, w, h);
|
||||
}
|
||||
|
||||
static void
|
||||
eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h)
|
||||
{
|
||||
Render_Engine *re;
|
||||
XRectangle r = { 0, 0, 0, 0 };
|
||||
|
||||
re = (Render_Engine *)data;
|
||||
|
||||
if (!re->clip_rects)
|
||||
re->clip_rects = XCreateRegion();
|
||||
|
||||
if (re->rot == 0)
|
||||
{
|
||||
r.x = x;
|
||||
r.y = y;
|
||||
r.width = w;
|
||||
r.height = h;
|
||||
}
|
||||
else if (re->rot == 90)
|
||||
{
|
||||
r.x = y;
|
||||
r.y = re->w - w - x;
|
||||
r.width = h;
|
||||
r.height = w;
|
||||
}
|
||||
else if (re->rot == 180)
|
||||
{
|
||||
r.x = re->w - w - x;
|
||||
r.y = re->h - h - y;
|
||||
r.width = w;
|
||||
r.height = h;
|
||||
}
|
||||
else if (re->rot == 270)
|
||||
{
|
||||
r.x = re->h - h - y;
|
||||
r.y = x;
|
||||
r.width = h;
|
||||
r.height = w;
|
||||
}
|
||||
|
||||
if (re->rot != 0)
|
||||
_tmp_out_process(re, r.x, r.y, w, h);
|
||||
XUnionRectWithRegion(&r, re->clip_rects, re->clip_rects);
|
||||
}
|
||||
|
||||
static void
|
||||
eng_output_flush(void *data)
|
||||
{
|
||||
Render_Engine *re;
|
||||
|
||||
re = (Render_Engine *)data;
|
||||
if (re->clip_rects)
|
||||
{
|
||||
XSetRegion(re->disp, re->gc, re->clip_rects);
|
||||
XDestroyRegion(re->clip_rects);
|
||||
re->clip_rects = NULL;
|
||||
}
|
||||
else return;
|
||||
|
||||
evas_software_16_x11_x_output_buffer_paste
|
||||
(re->shbuf, re->draw, re->gc, 0, 0, re->shbuf->im->cache_entry.w, re->shbuf->im->cache_entry.h, 1);
|
||||
XSetClipMask(re->disp, re->gc, None);
|
||||
}
|
||||
|
||||
static void
|
||||
eng_output_idle_flush(void *data)
|
||||
{
|
||||
Render_Engine *re;
|
||||
|
||||
re = (Render_Engine *)data;
|
||||
if (re->shbuf)
|
||||
{
|
||||
evas_software_16_x11_x_output_buffer_free(re->shbuf, 0);
|
||||
re->shbuf = NULL;
|
||||
}
|
||||
if (re->clip_rects)
|
||||
{
|
||||
XDestroyRegion(re->clip_rects);
|
||||
re->clip_rects = NULL;
|
||||
}
|
||||
if (re->tmp_out)
|
||||
{
|
||||
evas_cache_image_drop(&re->tmp_out->cache_entry);
|
||||
re->tmp_out = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
eng_canvas_alpha_get(void *data __UNUSED__, void *context __UNUSED__)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
/* module advertising code */
|
||||
static int
|
||||
module_open(Evas_Module *em)
|
||||
{
|
||||
static Eina_Bool xrm_inited = EINA_FALSE;
|
||||
if (!xrm_inited)
|
||||
{
|
||||
xrm_inited = EINA_TRUE;
|
||||
XrmInitialize();
|
||||
}
|
||||
|
||||
if (!em) return 0;
|
||||
/* get whatever engine module we inherit from */
|
||||
if (!_evas_module_engine_inherit(&pfunc, "software_16")) return 0;
|
||||
_evas_engine_soft16_x11_log_dom = eina_log_domain_register
|
||||
("evas-software_16_x11", EVAS_DEFAULT_LOG_COLOR);
|
||||
if (_evas_engine_soft16_x11_log_dom < 0)
|
||||
{
|
||||
EINA_LOG_ERR("Can not create a module log domain.");
|
||||
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(canvas_alpha_get);
|
||||
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);
|
||||
/* now advertise out own api */
|
||||
em->functions = (void *)(&func);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
module_close(Evas_Module *em __UNUSED__)
|
||||
{
|
||||
eina_log_domain_unregister(_evas_engine_soft16_x11_log_dom);
|
||||
}
|
||||
|
||||
static Evas_Module_Api evas_modapi =
|
||||
{
|
||||
EVAS_MODULE_API_VERSION,
|
||||
"software_16_x11",
|
||||
"none",
|
||||
{
|
||||
module_open,
|
||||
module_close
|
||||
}
|
||||
};
|
||||
|
||||
EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_x11);
|
||||
|
||||
#ifndef EVAS_STATIC_BUILD_SOFTWARE_16_X11
|
||||
EVAS_EINA_MODULE_DEFINE(engine, software_16_x11);
|
||||
#endif
|
||||
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
#ifndef EVAS_ENGINE_H
|
||||
#define EVAS_ENGINE_H
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/extensions/XShm.h>
|
||||
#include <X11/Xresource.h> // xres - dpi
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/shm.h>
|
||||
#include "evas_common.h"
|
||||
#include "evas_common_soft16.h"
|
||||
|
||||
extern int _evas_engine_soft16_x11_log_dom;
|
||||
#ifdef ERR
|
||||
# undef ERR
|
||||
#endif
|
||||
#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef DBG
|
||||
# undef DBG
|
||||
#endif
|
||||
#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef INF
|
||||
# undef INF
|
||||
#endif
|
||||
#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef WRN
|
||||
# undef WRN
|
||||
#endif
|
||||
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
|
||||
|
||||
#ifdef CRIT
|
||||
# undef CRIT
|
||||
#endif
|
||||
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft16_x11_log_dom, __VA_ARGS__)
|
||||
|
||||
typedef struct _X_Output_Buffer X_Output_Buffer;
|
||||
|
||||
struct _X_Output_Buffer
|
||||
{
|
||||
Soft16_Image *im;
|
||||
Display *display;
|
||||
XImage *xim;
|
||||
XShmSegmentInfo *shm_info;
|
||||
void *data;
|
||||
};
|
||||
|
||||
/****/
|
||||
void evas_software_16_x11_x_init (void);
|
||||
|
||||
int evas_software_16_x11_x_can_do_shm (Display *d);
|
||||
X_Output_Buffer *evas_software_16_x11_x_output_buffer_new (Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data);
|
||||
void evas_software_16_x11_x_output_buffer_free (X_Output_Buffer *xob, int sync);
|
||||
void evas_software_16_x11_x_output_buffer_paste (X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int w, int h, int sync);
|
||||
DATA8 *evas_software_16_x11_x_output_buffer_data (X_Output_Buffer *xob, int *bytes_per_line_ret);
|
||||
int evas_software_16_x11_x_output_buffer_depth (X_Output_Buffer *xob);
|
||||
int evas_software_16_x11_x_output_buffer_byte_order (X_Output_Buffer *xob);
|
||||
int evas_software_16_x11_x_output_buffer_bit_order (X_Output_Buffer *xob);
|
||||
|
||||
#endif
|
||||
|
|
@ -1,186 +0,0 @@
|
|||
#include "evas_common.h"
|
||||
#include "evas_engine.h"
|
||||
|
||||
static int _x_err = 0;
|
||||
|
||||
int
|
||||
evas_software_16_x11_x_can_do_shm(Display *d)
|
||||
{
|
||||
static Display *cached_d = NULL;
|
||||
static int cached_result = 0;
|
||||
|
||||
if (d == cached_d) return cached_result;
|
||||
cached_d = d;
|
||||
if (XShmQueryExtension(d))
|
||||
{
|
||||
X_Output_Buffer *xob;
|
||||
|
||||
xob = evas_software_16_x11_x_output_buffer_new
|
||||
(d, DefaultVisual(d, DefaultScreen(d)),
|
||||
DefaultDepth(d, DefaultScreen(d)), 16, 16, 2, NULL);
|
||||
if (!xob)
|
||||
{
|
||||
cached_result = 0;
|
||||
return 0;
|
||||
}
|
||||
evas_software_16_x11_x_output_buffer_free(xob, 1);
|
||||
cached_result = 1;
|
||||
return 1;
|
||||
}
|
||||
cached_result = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
x_output_tmp_x_err(Display * d __UNUSED__, XErrorEvent * ev __UNUSED__)
|
||||
{
|
||||
_x_err = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
X_Output_Buffer *
|
||||
evas_software_16_x11_x_output_buffer_new(Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data)
|
||||
{
|
||||
X_Output_Buffer *xob;
|
||||
|
||||
xob = calloc(1, sizeof(X_Output_Buffer));
|
||||
if (!xob) return NULL;
|
||||
|
||||
xob->display = d;
|
||||
xob->xim = NULL;
|
||||
xob->shm_info = NULL;
|
||||
|
||||
if (try_shm > 0)
|
||||
{
|
||||
xob->shm_info = malloc(sizeof(XShmSegmentInfo));
|
||||
if (xob->shm_info)
|
||||
{
|
||||
xob->xim = XShmCreateImage(d, v, depth, ZPixmap, NULL,
|
||||
xob->shm_info, w, h);
|
||||
if (xob->xim)
|
||||
{
|
||||
xob->shm_info->shmid = shmget(IPC_PRIVATE,
|
||||
xob->xim->bytes_per_line *
|
||||
xob->xim->height,
|
||||
IPC_CREAT | 0777);
|
||||
if (xob->shm_info->shmid >= 0)
|
||||
{
|
||||
xob->shm_info->readOnly = False;
|
||||
xob->shm_info->shmaddr = xob->xim->data =
|
||||
shmat(xob->shm_info->shmid, 0, 0);
|
||||
if (xob->shm_info->shmaddr)
|
||||
{
|
||||
XErrorHandler ph;
|
||||
|
||||
XSync(d, False);
|
||||
_x_err = 0;
|
||||
ph = XSetErrorHandler((XErrorHandler)
|
||||
x_output_tmp_x_err);
|
||||
XShmAttach(d, xob->shm_info);
|
||||
XSync(d, False);
|
||||
XSetErrorHandler((XErrorHandler)ph);
|
||||
if (!_x_err)
|
||||
{
|
||||
xob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), w, h, (DATA32 *) xob->xim->data, 0, EVAS_COLORSPACE_RGB565_A5P);
|
||||
if (xob->im)
|
||||
xob->im->stride = xob->xim->bytes_per_line / sizeof(DATA16);
|
||||
return xob;
|
||||
}
|
||||
}
|
||||
shmdt(xob->shm_info->shmaddr);
|
||||
shmctl(xob->shm_info->shmid, IPC_RMID, 0);
|
||||
}
|
||||
if (xob->xim) XDestroyImage(xob->xim);
|
||||
xob->xim = NULL;
|
||||
}
|
||||
if (xob->shm_info) free(xob->shm_info);
|
||||
xob->shm_info = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (try_shm > 1) return NULL;
|
||||
|
||||
xob->xim = XCreateImage(d, v, depth, ZPixmap, 0, data, w, h, 32, 0);
|
||||
if (!xob->xim)
|
||||
{
|
||||
free(xob);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
xob->data = data;
|
||||
|
||||
if (!xob->xim->data)
|
||||
{
|
||||
xob->xim->data = malloc(xob->xim->bytes_per_line * xob->xim->height);
|
||||
if (!xob->xim->data)
|
||||
{
|
||||
XDestroyImage(xob->xim);
|
||||
free(xob);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
if (xob->im)
|
||||
evas_cache_image_drop(&xob->im->cache_entry);
|
||||
|
||||
xob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), w, h, (DATA32 *) xob->xim->data, 0, EVAS_COLORSPACE_RGB565_A5P);
|
||||
if (xob->im)
|
||||
xob->im->stride = xob->xim->bytes_per_line / sizeof(DATA16);
|
||||
return xob;
|
||||
}
|
||||
|
||||
void
|
||||
evas_software_16_x11_x_output_buffer_free(X_Output_Buffer *xob, int sync)
|
||||
{
|
||||
if (xob->shm_info)
|
||||
{
|
||||
if (sync) XSync(xob->display, False);
|
||||
XShmDetach(xob->display, xob->shm_info);
|
||||
XDestroyImage(xob->xim);
|
||||
shmdt(xob->shm_info->shmaddr);
|
||||
shmctl(xob->shm_info->shmid, IPC_RMID, 0);
|
||||
free(xob->shm_info);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (xob->data) xob->xim->data = NULL;
|
||||
XDestroyImage(xob->xim);
|
||||
}
|
||||
free(xob);
|
||||
}
|
||||
|
||||
void
|
||||
evas_software_16_x11_x_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int x, int y, int w, int h, int sync)
|
||||
{
|
||||
if (xob->shm_info)
|
||||
{
|
||||
XShmPutImage(xob->display, d, gc, xob->xim, 0, 0, x, y, w, h, False);
|
||||
if (sync) XSync(xob->display, False);
|
||||
}
|
||||
else
|
||||
XPutImage(xob->display, d, gc, xob->xim, 0, 0, x, y, w, h);
|
||||
}
|
||||
|
||||
DATA8 *
|
||||
evas_software_16_x11_x_output_buffer_data(X_Output_Buffer *xob, int *bytes_per_line_ret)
|
||||
{
|
||||
if (bytes_per_line_ret) *bytes_per_line_ret = xob->xim->bytes_per_line;
|
||||
return (DATA8*) xob->xim->data;
|
||||
}
|
||||
|
||||
int
|
||||
evas_software_16_x11_x_output_buffer_depth(X_Output_Buffer *xob)
|
||||
{
|
||||
return xob->xim->bits_per_pixel;
|
||||
}
|
||||
|
||||
int
|
||||
evas_software_16_x11_x_output_buffer_byte_order(X_Output_Buffer *xob)
|
||||
{
|
||||
return xob->xim->byte_order;
|
||||
}
|
||||
|
||||
int
|
||||
evas_software_16_x11_x_output_buffer_bit_order(X_Output_Buffer *xob)
|
||||
{
|
||||
return xob->xim->bitmap_bit_order;
|
||||
}
|
||||
Loading…
Reference in New Issue