isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

framebuffer: in onscreen_x11_get_xid return foreign xids

Browse Source 
If a foreign xid has been set on a CoglOnscreen then
cogl_onscreen_x11_get_window_xid doesn't need to defer to the winsys to
get the underlying window xid. This also means it's possible to read
back the xid before the framebuffer is allocated which fixes a crash in
the x11-foreign example app.
This commit is contained in:
Robert Bragg 2011-05-05 20:41:01 +01:00
parent ccd0079b57
commit 680c173947
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cogl/cogl-framebuffer.c
View File

@ -1641,9 +1641,14 @@ guint32
cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen) cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen)
{ {
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
const CoglWinsysVtable *winsys = _cogl_framebuffer_get_winsys (framebuffer);
return winsys->onscreen_x11_get_window_xid (onscreen); if (onscreen->foreign_xid)
return onscreen->foreign_xid;
else
{
const CoglWinsysVtable *winsys = _cogl_framebuffer_get_winsys (framebuffer);
return winsys->onscreen_x11_get_window_xid (onscreen);
}
} }
guint32 guint32