Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_xcb
Modified Files:
evas_outbuf.c
Log Message:
update to the new xcb api, and a fix
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/modules/engines/software_xcb/evas_outbuf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_outbuf.c 10 Mar 2006 07:44:23 -0000 1.2
+++ evas_outbuf.c 15 Mar 2006 20:58:35 -0000 1.3
@@ -631,15 +631,14 @@
XCBGetGeometryRep *geom;
XCBDRAWABLE root;
XCBSCREENIter i;
- int cur;
geom = XCBGetGeometryReply (buf->priv.x.conn, XCBGetGeometry
(buf->priv.x.conn, draw), 0);
root.window = geom->root;
free (geom);
geom = XCBGetGeometryReply (buf->priv.x.conn, XCBGetGeometry
(buf->priv.x.conn, root), 0);
- i = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(buf->priv.x.conn));
- for (cur = 0; cur < i.rem; XCBSCREENNext(&i), ++cur)
+ i = XCBConnSetupSuccessRepRootsIter((XCBConnSetupSuccessRep
*)XCBGetSetup(buf->priv.x.conn));
+ for (; i.rem; XCBSCREENNext(&i))
if (i.data->root.xid == geom->root.xid)
{
screen = i.data;
@@ -756,7 +755,7 @@
perf->x.conn = conn;
- root.window = XCBConnSetupSuccessRepRootsIter (XCBGetSetup
(conn)).data->root;
+ root.window = XCBConnSetupSuccessRepRootsIter ((XCBConnSetupSuccessRep
*)XCBGetSetup (conn)).data->root;
if (draw.window.xid)
{
XCBGetGeometryRep *geom;
@@ -771,8 +770,8 @@
perf->x.h = (int)geom->height;
perf->x.screen_num = 0;
- i = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(conn));
- for (cur = 0; cur < i.rem; XCBSCREENNext(&i), ++cur)
+ i = XCBConnSetupSuccessRepRootsIter((XCBConnSetupSuccessRep
*)XCBGetSetup(conn));
+ for (cur = 0; i.rem; XCBSCREENNext(&i), ++cur)
if (i.data->root.xid == geom->root.xid)
{
perf->x.screen_num = cur;
@@ -783,11 +782,11 @@
perf->x.root = root;
perf->x.display = strdup (":0"); /* FIXME:
strdup(DisplayString(disp)); in XCB ? */
- perf->x.vendor =
strdup(XCBConnSetupSuccessRepVendor(XCBGetSetup(conn)));
- perf->x.version = (int)XCBGetSetup(conn)->protocol_major_version;
- perf->x.revision = (int)XCBGetSetup(conn)->protocol_minor_version;
- perf->x.release = (int)XCBGetSetup(conn)->release_number;
- perf->x.screen_count =
XCBConnSetupSuccessRepRootsIter(XCBGetSetup(conn)).rem;
+ perf->x.vendor =
strdup(XCBConnSetupSuccessRepVendor((XCBConnSetupSuccessRep
*)XCBGetSetup(conn)));
+ perf->x.version = (int)((XCBConnSetupSuccessRep
*)XCBGetSetup(conn))->protocol_major_version;
+ perf->x.revision = (int)((XCBConnSetupSuccessRep
*)XCBGetSetup(conn))->protocol_minor_version;
+ perf->x.release = (int)((XCBConnSetupSuccessRep
*)XCBGetSetup(conn))->release_number;
+ perf->x.screen_count =
XCBConnSetupSuccessRepRootsIter((XCBConnSetupSuccessRep
*)XCBGetSetup(conn)).rem;
perf->x.depth = x_depth;
perf->min_shm_image_pixel_count = 200 * 200; /* default hard-coded */
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
