projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2af38ed
)
make sure the window's pixmap and glxpixmap worked out before drawing the window
author
Dana Jansens
<danakj@orodu.net>
Thu, 10 Jun 2010 20:00:49 +0000
(16:00 -0400)
committer
Dana Jansens
<danakj@orodu.net>
Sat, 26 Jun 2010 23:30:48 +0000
(
01:30
+0200)
openbox/composite.c
patch
|
blob
|
history
diff --git
a/openbox/composite.c
b/openbox/composite.c
index 76c6c204196668d27bd9834c468d45d280b9f19b..77df36c1ba5c02c67535c717fbfd04665eb8041c 100644
(file)
--- a/
openbox/composite.c
+++ b/
openbox/composite.c
@@
-373,11
+373,15
@@
static gboolean composite(gpointer data)
if (win->pixmap == None)
win->pixmap = XCompositeNameWindowPixmap(obt_display,
window_top(win));
+ if (win->pixmap == None)
+ continue;
if (win->gpixmap == None)
win->gpixmap = obcomp.CreatePixmap(obt_display,
obcomp.PixmapConfig[d].fbc,
win->pixmap, attribs);
+ if (win->gpixmap == None)
+ continue;
glBindTexture(GL_TEXTURE_2D, win->texture);
gettimeofday(&start, NULL);