o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: x11 working again

Browse source 
Need to think a bit more about locking,
but overall it's a working devdraw.

Multiclient mode may not be working
but nothing is using it yet.
This commit is contained in:
Russ Cox 2020-01-12 14:53:46 -05:00 • committed by Russ Cox
parent 892b3c4687
commit 50923426bf
14 changed files with 1845 additions and 2341 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/devdraw/x11-alloc.c
View file

@ -21,7 +21,7 @@ _xallocmemimage(Rectangle r, u32int chan, int pixmap)
m = _allocmemimage(r, chan);
if(chan != GREY1 && chan != _x.chan)
return m;
if(_x.display == 0)
if(_x.display == 0 || _x.windows == nil)
return m;
/*
@ -49,7 +49,7 @@ _xallocmemimage(Rectangle r, u32int chan, int pixmap)
if(pixmap != PMundef)
xm->pixmap = pixmap;
else
xm->pixmap = XCreatePixmap(_x.display, _x.drawable, Dx(r), Dy(r), d);
xm->pixmap = XCreatePixmap(_x.display, _x.windows->drawable, Dx(r), Dy(r), d);
/*
* We want to align pixels on word boundaries.