forked from enlightenment/efl
parent
2bd060ad29
commit
79460141a5
|
@ -31,7 +31,7 @@ _xre_font_surface_new(XCBimage_Info *xcbinf, RGBA_Font_Glyph *fg)
|
||||||
if ((fs->xcbinf->conn == xcbinf->conn) &&
|
if ((fs->xcbinf->conn == xcbinf->conn) &&
|
||||||
(fs->xcbinf->root.window.xid == xcbinf->root.window.xid))
|
(fs->xcbinf->root.window.xid == xcbinf->root.window.xid))
|
||||||
return fs;
|
return fs;
|
||||||
snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xcbinf->conn, fs->xcbinf->root.window.xid);
|
snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid);
|
||||||
pool = evas_hash_find(_xr_fg_pool, buf);
|
pool = evas_hash_find(_xr_fg_pool, buf);
|
||||||
if (pool)
|
if (pool)
|
||||||
{
|
{
|
||||||
|
@ -50,7 +50,7 @@ _xre_font_surface_new(XCBimage_Info *xcbinf, RGBA_Font_Glyph *fg)
|
||||||
fs->w = w;
|
fs->w = w;
|
||||||
fs->h = h;
|
fs->h = h;
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xcbinf->conn, fs->xcbinf->root.window.xid);
|
snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid);
|
||||||
pool = evas_hash_find(_xr_fg_pool, buf);
|
pool = evas_hash_find(_xr_fg_pool, buf);
|
||||||
snprintf(buf2, sizeof(buf2), "%p", fg);
|
snprintf(buf2, sizeof(buf2), "%p", fg);
|
||||||
pool = evas_hash_add(pool, buf2, fs);
|
pool = evas_hash_add(pool, buf2, fs);
|
||||||
|
@ -137,7 +137,7 @@ _xre_font_pool_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||||
|
|
||||||
fs = fdata;
|
fs = fdata;
|
||||||
pool = data;
|
pool = data;
|
||||||
snprintf(buf, sizeof(buf), "@%p@/@%lx@", fs->xcbinf->conn, fs->xcbinf->root.window.xid);
|
snprintf(buf, sizeof(buf), "@%p@/@%x@", fs->xcbinf->conn, fs->xcbinf->root.window.xid);
|
||||||
pool = evas_hash_del(pool, buf, fs);
|
pool = evas_hash_del(pool, buf, fs);
|
||||||
hash = evas_hash_modify(hash, key, pool);
|
hash = evas_hash_modify(hash, key, pool);
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -73,9 +73,9 @@ _xre_image_load(XCBimage_Info *xcbinf, char *file, char *key)
|
||||||
|
|
||||||
if (!file) return NULL;
|
if (!file) return NULL;
|
||||||
if (key)
|
if (key)
|
||||||
snprintf(buf, sizeof(buf), "/@%p@%lx@/%s//://%s", xcbinf->conn, xcbinf->root.window.xid, file, key);
|
snprintf(buf, sizeof(buf), "/@%p@%x@/%s//://%s", xcbinf->conn, xcbinf->root.window.xid, file, key);
|
||||||
else
|
else
|
||||||
snprintf(buf, sizeof(buf), "/@%p@%lx@/%s", xcbinf->conn, xcbinf->root.window.xid, file);
|
snprintf(buf, sizeof(buf), "/@%p@%x@/%s", xcbinf->conn, xcbinf->root.window.xid, file);
|
||||||
im = __xre_image_find(buf);
|
im = __xre_image_find(buf);
|
||||||
if (im)
|
if (im)
|
||||||
{
|
{
|
||||||
|
|
|
@ -312,7 +312,7 @@ _xr_image_info_get(XCBConnection *conn, XCBDRAWABLE draw, XCBVISUALID vis)
|
||||||
XCBConnSetupSuccessRep *rep;
|
XCBConnSetupSuccessRep *rep;
|
||||||
XCBSCREENIter iter_screen;
|
XCBSCREENIter iter_screen;
|
||||||
|
|
||||||
rep = XCBGetSetup(xcbinf->conn);
|
rep = (XCBConnSetupSuccessRep *)XCBGetSetup(xcbinf->conn);
|
||||||
iter_screen = XCBConnSetupSuccessRepRootsIter(rep);
|
iter_screen = XCBConnSetupSuccessRepRootsIter(rep);
|
||||||
for (; iter_screen.rem ; XCBSCREENNext (&iter_screen)) {
|
for (; iter_screen.rem ; XCBSCREENNext (&iter_screen)) {
|
||||||
XCBDEPTHIter iter_depth;
|
XCBDEPTHIter iter_depth;
|
||||||
|
|
Loading…
Reference in New Issue