Unified · Split
| @@ -204,3 +204,30 @@ xdraw(Memdrawparam *par) · 203 unmodified lines | |||
| 204 | return 0; | 204 | return 0; |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | int | ||
| 208 | xloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) | ||
| 209 | { | ||
| 210 | int n; | ||
| 211 | |||
| 212 | n = _loadmemimage(i, r, data, ndata); | ||
| 213 | if(n > 0 && i->X) | ||
| 214 | xputxdata(i, r); | ||
| 215 | return n; | ||
| 216 | } | ||
| 217 | |||
| 218 | int | ||
| 219 | xunloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) | ||
| 220 | { | ||
| 221 | if(i->X) | ||
| 222 | xgetxdata(i, r); | ||
| 223 | return _unloadmemimage(i, r, data, ndata); | ||
| 224 | } | ||
| 225 | |||
| 226 | ulong | ||
| 227 | xpixelbits(Memimage *m, Point p) | ||
| 228 | { | ||
| 229 | if(m->X) | ||
| 230 | xgetxdata(m, Rect(p.x, p.y, p.x+1, p.y+1)); | ||
| 231 | return _pixelbits(m, p); | ||
| 232 | } | ||
| 233 | |||
| @@ -50,11 +50,9 @@ xfillcolor(Memimage *m, Rectangle r, ulong v) · 49 unmodified lines | |||
| 50 | void | 50 | void |
| 51 | xmemfillcolor(Memimage *m, ulong val) | 51 | xmemfillcolor(Memimage *m, ulong val) |
| 52 | { | 52 | { |
| 53 | memfillcolor(m, val); | 53 | _memfillcolor(m, val); |
| 54 | if(m->X == nil) { | 54 | if(m->X == nil) |
| 55 | _memfillcolor(m, val); | ||
| 56 | return; | 55 | return; |
| 57 | } | ||
| 58 | if((val & 0xFF) == 0xFF) /* full alpha */ | 56 | if((val & 0xFF) == 0xFF) /* full alpha */ |
| 59 | xfillcolor(m, m->r, rgbatoimg(m, val)); | 57 | xfillcolor(m, m->r, rgbatoimg(m, val)); |
| 60 | else | 58 | else |
| @@ -45,13 +45,13 @@ memimagedraw(Memimage *dst, Rectangle r, Memimage *src, Point sp, Memimage *mask · 44 unmodified lines | |||
| 45 | void | 45 | void |
| 46 | memfillcolor(Memimage *m, ulong val) | 46 | memfillcolor(Memimage *m, ulong val) |
| 47 | { | 47 | { |
| 48 | _memfillcolor(m, val); | 48 | xmemfillcolor(m, val); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | ulong | 51 | ulong |
| 52 | pixelbits(Memimage *m, Point p) | 52 | pixelbits(Memimage *m, Point p) |
| 53 | { | 53 | { |
| 54 | return _pixelbits(m, p); | 54 | return xpixelbits(m, p); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | /* load.c */ | 57 | /* load.c */ |
| @@ -59,7 +59,7 @@ pixelbits(Memimage *m, Point p) · 1 unmodified line | |||
| 59 | int | 59 | int |
| 60 | loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) | 60 | loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) |
| 61 | { | 61 | { |
| 62 | return _loadmemimage(i, r, data, ndata); | 62 | return xloadmemimage(i, r, data, ndata); |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | /* unload.c */ | 65 | /* unload.c */ |
| @@ -67,6 +67,6 @@ loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) · 1 unmodified line | |||
| 67 | int | 67 | int |
| 68 | unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) | 68 | unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) |
| 69 | { | 69 | { |
| 70 | return _unloadmemimage(i, r, data, ndata); | 70 | return xunloadmemimage(i, r, data, ndata); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| @@ -73,3 +73,8 @@ void xmemimagedraw(Memimage*, Rectangle, Memimage*, Point, · 72 unmodified lines | |||
| 73 | void xinitclipboard(void); | 73 | void xinitclipboard(void); |
| 74 | void xsetsnarfowner(Window*); | 74 | void xsetsnarfowner(Window*); |
| 75 | void xselect(XEvent*); | 75 | void xselect(XEvent*); |
| 76 | void xmemfillcolor(Memimage*, ulong); | ||
| 77 | int xloadmemimage(Memimage*, Rectangle, uchar*, int); | ||
| 78 | int xunloadmemimage(Memimage*, Rectangle, uchar*, int); | ||
| 79 | ulong xpixelbits(Memimage*, Point); | ||
| 80 | |||