History

some missing stubbed functions

yiyus committed 15 years ago

Commit 309c8581 parent 0fd30774 files · +38 −8Browse files

Unified · Split

4 files
  1. devwsys/x11/draw.c +27 −0
  2. devwsys/x11/fill.c +2 −4
  3. devwsys/x11/stub.c +4 −4
  4. devwsys/x11/x.h +5 −0
devwsys/x11/draw.c+27−0
@@ -204,3 +204,30 @@ xdraw(Memdrawparam *par) · 203 unmodified lines
204204 return 0;
205205 }
206206
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+
devwsys/x11/fill.c+2−4
@@ -50,11 +50,9 @@ xfillcolor(Memimage *m, Rectangle r, ulong v) · 49 unmodified lines
5050 void
5151 xmemfillcolor(Memimage *m, ulong val)
5252 {
53− memfillcolor(m, val);
54− if(m->X == nil) {
55− _memfillcolor(m, val);
53+ _memfillcolor(m, val);
54+ if(m->X == nil)
5655 return;
57− }
5856 if((val & 0xFF) == 0xFF) /* full alpha */
5957 xfillcolor(m, m->r, rgbatoimg(m, val));
6058 else
devwsys/x11/stub.c+4−4
@@ -45,13 +45,13 @@ memimagedraw(Memimage *dst, Rectangle r, Memimage *src, Point sp, Memimage *mask · 44 unmodified lines
4545 void
4646 memfillcolor(Memimage *m, ulong val)
4747 {
48− _memfillcolor(m, val);
48+ xmemfillcolor(m, val);
4949 }
5050
5151 ulong
5252 pixelbits(Memimage *m, Point p)
5353 {
54− return _pixelbits(m, p);
54+ return xpixelbits(m, p);
5555 }
5656
5757 /* load.c */
@@ -59,7 +59,7 @@ pixelbits(Memimage *m, Point p) · 1 unmodified line
5959 int
6060 loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata)
6161 {
62− return _loadmemimage(i, r, data, ndata);
62+ return xloadmemimage(i, r, data, ndata);
6363 }
6464
6565 /* unload.c */
@@ -67,6 +67,6 @@ loadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata) · 1 unmodified line
6767 int
6868 unloadmemimage(Memimage *i, Rectangle r, uchar *data, int ndata)
6969 {
70− return _unloadmemimage(i, r, data, ndata);
70+ return xunloadmemimage(i, r, data, ndata);
7171 }
7272
devwsys/x11/x.h+5−0
@@ -73,3 +73,8 @@ void xmemimagedraw(Memimage*, Rectangle, Memimage*, Point, · 72 unmodified lines
7373 void xinitclipboard(void);
7474 void xsetsnarfowner(Window*);
7575 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+

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t