History

replymsg in attach, remove parameter from runmsg

yiyus committed 15 years ago

Commit c4e9fa51 parent 325bd143 files · +24 −14Browse files

Unified · Split

3 files
  1. devwsys/drawfcall.c +8 −4
  2. devwsys/drawfcall.h +1 −1
  3. devwsys/ixp_fsys.c +15 −9
devwsys/drawfcall.c+8−4
@@ -11,7 +11,7 @@ · 10 unmodified lines
11int lookupwin(Window*);11int lookupwin(Window*);
12 12
13void13void
14runmsg(Window *w, Wsysmsg *m, void *v)14runmsg(Window *w, Wsysmsg *m)
15{15{
16 int i;16 int i;
17 Kbdbuf *kbd;17 Kbdbuf *kbd;
@@ -29,14 +29,14 @@ runmsg(Window *w, Wsysmsg *m, void *v) · 11 unmodified lines
29 w->x = xcreatewin(m->label, m->winsize, w->r);29 w->x = xcreatewin(m->label, m->winsize, w->r);
30 w->r = xmapwin(w->x, havemin, w->r);30 w->r = xmapwin(w->x, havemin, w->r);
31 w->img = xallocmemimage(w->x);31 w->img = xallocmemimage(w->x);
32// replymsg(w, m);32 replymsg(w, m);
33 break;33 break;
34 34
35 case Trdmouse:35 case Trdmouse:
36 mouse = &w->mouse;36 mouse = &w->mouse;
37 mousetags = &w->mousetags;37 mousetags = &w->mousetags;
38 mousetags->t[mousetags->wi] = m->tag;38 mousetags->t[mousetags->wi] = m->tag;
39 mousetags->r[mousetags->wi] = v;39 mousetags->r[mousetags->wi] = m->v;
40 mousetags->wi++;40 mousetags->wi++;
41 if(mousetags->wi == nelem(mousetags->t))41 if(mousetags->wi == nelem(mousetags->t))
42 mousetags->wi = 0;42 mousetags->wi = 0;
@@ -51,7 +51,7 @@ runmsg(Window *w, Wsysmsg *m, void *v) · 8 unmodified lines
51 kbd = &w->kbd;51 kbd = &w->kbd;
52 kbdtags = &w->kbdtags;52 kbdtags = &w->kbdtags;
53 kbdtags->t[kbdtags->wi] = m->tag;53 kbdtags->t[kbdtags->wi] = m->tag;
54 kbdtags->r[kbdtags->wi] = v;54 kbdtags->r[kbdtags->wi] = m->v;
55 kbdtags->wi++;55 kbdtags->wi++;
56 if(kbdtags->wi == nelem(kbdtags->t))56 if(kbdtags->wi == nelem(kbdtags->t))
57 kbdtags->wi = 0;57 kbdtags->wi = 0;
@@ -134,6 +134,10 @@ runmsg(Window *w, Wsysmsg *m, void *v) · 76 unmodified lines
134void134void
135replymsg(Window *w, Wsysmsg *m)135replymsg(Window *w, Wsysmsg *m)
136{136{
137 /* T -> R msg */
138 if(m->type%2 == 0)
139 m->type++;
140
137 fs_reply(w, m);141 fs_reply(w, m);
138}142}
139 143
devwsys/drawfcall.h+1−1
@@ -115,7 +115,7 @@ struct Wsysmsg · 114 unmodified lines
115};115};
116 116
117void replymsg(Window*, Wsysmsg*);117void replymsg(Window*, Wsysmsg*);
118void runmsg(Window*, Wsysmsg*, void*);118void runmsg(Window*, Wsysmsg*);
119 119
120void fs_reply(Window*, Wsysmsg*);120void fs_reply(Window*, Wsysmsg*);
121 121
devwsys/ixp_fsys.c+15−9
@@ -44,16 +44,11 @@ fs_attach(Ixp9Req *r) · 43 unmodified lines
44 m.type = Tinit;44 m.type = Tinit;
45 m.label = nil; // pjw face45 m.label = nil; // pjw face
46 m.winsize = nil; // full screen46 m.winsize = nil; // full screen
47 m.v = r;
47 if(!(w = newwin())) {48 if(!(w = newwin())) {
48 return;49 return;
49 }50 }
50 runmsg(w, &m, nil);51 runmsg(w, &m);
51 if(w == nil) {
52 ixp_respond(r, Enomem);
53 return;
54 }
55 r->fid->aux = w;
56 ixp_respond(r, NULL);
57}52}
58 53
59void54void
@@ -208,7 +203,8 @@ fs_read(Ixp9Req *r) · 148 unmodified lines
208 switch(r->fid->qid.path){203 switch(r->fid->qid.path){
209 case QCONS: {204 case QCONS: {
210 m.type = Trdkbd;205 m.type = Trdkbd;
211 runmsg(w, &m, r);206 m.v = r;
207 runmsg(w, &m);
212 return;208 return;
213 }209 }
214 case QLABEL: {210 case QLABEL: {
@@ -217,7 +213,8 @@ fs_read(Ixp9Req *r) · 2 unmodified lines
217 }213 }
218 case QMOUSE: {214 case QMOUSE: {
219 m.type = Trdmouse;215 m.type = Trdmouse;
220 runmsg(w, &m, r);216 m.v = r;
217 runmsg(w, &m);
221 return;218 return;
222 }219 }
223 case QWINID: {220 case QWINID: {
@@ -303,6 +300,15 @@ fs_reply(Window *w, Wsysmsg *m) · 79 unmodified lines
303 300
304 r = m->v;301 r = m->v;
305 switch(m->type){302 switch(m->type){
303 case Rinit:
304 if(w == nil) {
305 ixp_respond(r, Enomem);
306 return;
307 }
308 r->fid->aux = w;
309 ixp_respond(r, NULL);
310 return;
311
306 case Rrdkbd:312 case Rrdkbd:
307 rune = m->rune;313 rune = m->rune;
308 sprint(buf, "%C", rune);314 sprint(buf, "%C", rune);

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