Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_xcb
Modified Files:
evas_engine.c evas_engine.h evas_outbuf.c evas_xcb_buffer.c
Log Message:
automated tools can not be perfect
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_engine.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_engine.c 10 Oct 2006 19:15:13 -0000 1.14
+++ evas_engine.c 10 Oct 2006 19:32:36 -0000 1.15
@@ -186,7 +186,7 @@
static Evas_Performance *
_output_perf_new(Evas *e, xcb_connection_t *conn, xcb_visualtype_t *vis,
xcb_colormap_t cmap, xcb_drawable_t draw, int depth)
{
- return evas_software_xcb_generate_id_x(conn, draw, vis, cmap, depth);
+ return evas_software_xcb_outbuf_perf_x(conn, draw, vis, cmap, depth);
e = NULL;
}
@@ -414,7 +414,7 @@
re->end = 1;
}
- surface = evas_software_xcb_generate_id_region_for_update(re->ob,
+ surface = evas_software_xcb_outbuf_new_region_for_update(re->ob,
ux, uy, uw, uh,
cx, cy, cw, ch);
*x = ux; *y = uy; *w = uw; *h = uh;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_engine.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_engine.h 10 Oct 2006 19:15:13 -0000 1.6
+++ evas_engine.h 10 Oct 2006 19:32:36 -0000 1.7
@@ -118,7 +118,7 @@
int
w,
int
y);
int evas_software_xcb_x_can_do_shm
(xcb_connection_t *c);
-Xcb_Output_Buffer *evas_software_xcb_generate_id (xcb_connection_t *c,
+Xcb_Output_Buffer *evas_software_xcb_x_output_buffer_new
(xcb_connection_t *c,
int
depth,
int
w,
int
h,
@@ -172,7 +172,7 @@
char *evas_software_xcb_outbuf_perf_serialize_x (Outbuf_Perf
*perf);
void evas_software_xcb_outbuf_perf_deserialize_x (Outbuf_Perf
*perf,
const char *data);
-Outbuf_Perf *evas_software_xcb_generate_id_x (xcb_connection_t
*conn,
+Outbuf_Perf *evas_software_xcb_outbuf_perf_new_x (xcb_connection_t
*conn,
xcb_drawable_t
draw,
xcb_visualtype_t
*vis,
xcb_colormap_t
cmap,
@@ -204,7 +204,7 @@
int y,
int w,
int h);
-RGBA_Image *evas_software_xcb_generate_id_region_for_update (Outbuf *buf,
+RGBA_Image *evas_software_xcb_outbuf_new_region_for_update (Outbuf *buf,
int x,
int y,
int w,
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_outbuf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_outbuf.c 10 Oct 2006 19:15:13 -0000 1.11
+++ evas_outbuf.c 10 Oct 2006 19:32:36 -0000 1.12
@@ -75,7 +75,7 @@
Xcb_Output_Buffer *xcbob;
buf->priv.x.shm = evas_software_xcb_x_can_do_shm(buf->priv.x.conn);
- xcbob = evas_software_xcb_generate_id(buf->priv.x.conn,
+ xcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn,
buf->priv.x.depth,
1, 1,
buf->priv.x.shm, NULL);
@@ -258,7 +258,7 @@
}
RGBA_Image *
-evas_software_xcb_generate_id_region_for_update(Outbuf *buf,
+evas_software_xcb_outbuf_new_region_for_update(Outbuf *buf,
int x,
int y,
int w,
@@ -305,7 +305,7 @@
im->image->data = NULL;
im->image->no_free = 1;
im->extended_info = obr;
- obr->xcbob = evas_software_xcb_generate_id(buf->priv.x.conn,
+ obr->xcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn,
buf->priv.x.depth,
w,
h,
@@ -313,7 +313,7 @@
NULL);
im->image->data = (DATA32
*)evas_software_xcb_x_output_buffer_data(obr->xcbob, &bpl);
if (buf->priv.x.mask)
- obr->mxcbob = evas_software_xcb_generate_id(buf->priv.x.conn,
+ obr->mxcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn,
1,
w,
h,
@@ -325,21 +325,21 @@
im = evas_common_image_create(w, h);
im->extended_info = obr;
if ((buf->rot == 0) || (buf->rot == 180))
- obr->xcbob = evas_software_xcb_generate_id(buf->priv.x.conn,
+ obr->xcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn,
buf->priv.x.depth,
w,
h,
use_shm,
NULL);
else if ((buf->rot == 90) || (buf->rot == 270))
- obr->xcbob = evas_software_xcb_generate_id(buf->priv.x.conn,
+ obr->xcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn,
buf->priv.x.depth,
h,
w,
use_shm,
NULL);
if (buf->priv.x.mask)
- obr->mxcbob = evas_software_xcb_generate_id(buf->priv.x.conn,
+ obr->mxcbob = evas_software_xcb_x_output_buffer_new(buf->priv.x.conn,
1,
w,
h,
@@ -763,7 +763,7 @@
}
Outbuf_Perf *
-evas_software_xcb_generate_id_x(xcb_connection_t *conn,
+evas_software_xcb_outbuf_perf_new_x(xcb_connection_t *conn,
xcb_drawable_t draw,
xcb_visualtype_t *vis,
xcb_colormap_t cmap,
@@ -967,7 +967,7 @@
xcb_atom_t type, format;
Outbuf_Perf *perf;
- perf = evas_software_xcb_generate_id_x(conn, draw, vis, cmap, x_depth);
+ perf = evas_software_xcb_outbuf_perf_new_x(conn, draw, vis, cmap, x_depth);
type_str = "__EVAS_PERF_ENGINE_SOFTWARE";
type_rep = xcb_intern_atom_reply(conn,
@@ -1036,7 +1036,7 @@
int w, h;
int do_shm = 0;
- perf = evas_software_xcb_generate_id_x(conn, draw, vis, cmap, x_depth);
+ perf = evas_software_xcb_outbuf_perf_new_x(conn, draw, vis, cmap, x_depth);
mask = XCB_CW_BACK_PIXMAP | XCB_CW_BORDER_PIXEL |
XCB_CW_BIT_GRAVITY | XCB_CW_BACKING_STORE |
@@ -1100,7 +1100,7 @@
t0 = _evas_get_time();
for (l = 0; l < loops; l++)
{
- xcbob = evas_software_xcb_generate_id(conn,
+ xcbob = evas_software_xcb_x_output_buffer_new(conn,
x_depth,
i, i,
do_shm,
@@ -1126,7 +1126,7 @@
t0 = _evas_get_time();
for (l = 0; l < loops; l++)
{
- xcbob = evas_software_xcb_generate_id(conn,
+ xcbob = evas_software_xcb_x_output_buffer_new(conn,
x_depth,
i, i,
0,
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_xcb_buffer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_xcb_buffer.c 10 Oct 2006 19:15:13 -0000 1.8
+++ evas_xcb_buffer.c 10 Oct 2006 19:32:36 -0000 1.9
@@ -79,7 +79,7 @@
{
Xcb_Output_Buffer *xcbob;
- xcbob = evas_software_xcb_generate_id(c,
+ xcbob = evas_software_xcb_x_output_buffer_new(c,
depth,
16,
16,
@@ -104,7 +104,7 @@
/* } */
Xcb_Output_Buffer *
-evas_software_xcb_generate_id(xcb_connection_t *c,
+evas_software_xcb_x_output_buffer_new(xcb_connection_t *c,
int depth,
int w,
int h,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
