brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[backend-egl] fix clutter_backend_egl_get_visual_info to not use Xalloc

Browse Source 
It looks like the intention was to duplicate an XVisualInfo in such a way
that the pointer could be returned and then later freed using XFree.  But
Xalloc isn't an Xlib counterpart to XFree; Xlib doesn't provide a general
purpose malloc wrapper afik.  By shuffling things about a bit, it was
possible to avoid the need for this hack.
This commit is contained in:
Robert Bragg 2009-08-20 11:53:37 +01:00
parent 6e50e26c86
commit b710ed0eea
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clutter/eglx/clutter-backend-egl.c
View File

@ -266,39 +266,23 @@ static XVisualInfo *
clutter_backend_egl_get_visual_info (ClutterBackendX11 *backend_x11, clutter_backend_egl_get_visual_info (ClutterBackendX11 *backend_x11,
gboolean for_offscreen) gboolean for_offscreen)
{ {
EGLint visualId;
int i,nxvisuals;
XVisualInfo *visual_list, *visinfo = None;
XVisualInfo visual_template;
ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend_x11); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend_x11);
EGLint visualid;
XVisualInfo visinfo_template;
XVisualInfo *visinfo = None;
int visinfos_count;
/* Find all the visuals in the screen */
nxvisuals = 0;
visual_template.screen = backend_x11->xscreen_num;
visual_list = XGetVisualInfo (backend_x11->xdpy, VisualScreenMask,
&visual_template,
&nxvisuals);
if (!visual_list)
return None;
/*get xvisual id*/
eglGetConfigAttrib (backend_egl->edpy, backend_egl->egl_config, eglGetConfigAttrib (backend_egl->edpy, backend_egl->egl_config,
EGL_NATIVE_VISUAL_ID, &visualId); EGL_NATIVE_VISUAL_ID, &visualid);
/* look up the xvisual matching with egl native visual id*/ visinfo_template.screen = backend_x11->xscreen_num;
for( i = 0; i < nxvisuals; i++) visinfo_template.visualid = visualid;
{ visinfo = XGetVisualInfo (backend_x11->xdpy,
if (visual_list[i].visualid == visualId) VisualScreenMask | VisualIDMask,
break; &visinfo_template,
} &visinfos_count);
if (!visinfo)
if (i < nxvisuals) return None;
{
visinfo = (XVisualInfo*) Xalloc (sizeof (XVisualInfo));
*visinfo = visual_list[i];
}
XFree (visual_list);
return visinfo; return visinfo;
} }