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
1111 int lookupwin(Window*);
1212
1313 void
14−runmsg(Window *w, Wsysmsg *m, void *v)
14+runmsg(Window *w, Wsysmsg *m)
1515 {
1616 int i;
1717 Kbdbuf *kbd;
@@ -29,14 +29,14 @@ runmsg(Window *w, Wsysmsg *m, void *v) · 11 unmodified lines
2929 w->x = xcreatewin(m->label, m->winsize, w->r);
3030 w->r = xmapwin(w->x, havemin, w->r);
3131 w->img = xallocmemimage(w->x);
32−// replymsg(w, m);
32+ replymsg(w, m);
3333 break;
3434
3535 case Trdmouse:
3636 mouse = &w->mouse;
3737 mousetags = &w->mousetags;
3838 mousetags->t[mousetags->wi] = m->tag;
39− mousetags->r[mousetags->wi] = v;
39+ mousetags->r[mousetags->wi] = m->v;
4040 mousetags->wi++;
4141 if(mousetags->wi == nelem(mousetags->t))
4242 mousetags->wi = 0;
@@ -51,7 +51,7 @@ runmsg(Window *w, Wsysmsg *m, void *v) · 8 unmodified lines
5151 kbd = &w->kbd;
5252 kbdtags = &w->kbdtags;
5353 kbdtags->t[kbdtags->wi] = m->tag;
54− kbdtags->r[kbdtags->wi] = v;
54+ kbdtags->r[kbdtags->wi] = m->v;
5555 kbdtags->wi++;
5656 if(kbdtags->wi == nelem(kbdtags->t))
5757 kbdtags->wi = 0;
@@ -134,6 +134,10 @@ runmsg(Window *w, Wsysmsg *m, void *v) · 76 unmodified lines
134134 void
135135 replymsg(Window *w, Wsysmsg *m)
136136 {
137+ /* T -> R msg */
138+ if(m->type%2 == 0)
139+ m->type++;
140+
137141 fs_reply(w, m);
138142 }
139143
devwsys/drawfcall.h+1−1
@@ -115,7 +115,7 @@ struct Wsysmsg · 114 unmodified lines
115115 };
116116
117117 void replymsg(Window*, Wsysmsg*);
118−void runmsg(Window*, Wsysmsg*, void*);
118+void runmsg(Window*, Wsysmsg*);
119119
120120 void fs_reply(Window*, Wsysmsg*);
121121
devwsys/ixp_fsys.c+15−9
@@ -44,16 +44,11 @@ fs_attach(Ixp9Req *r) · 43 unmodified lines
4444 m.type = Tinit;
4545 m.label = nil; // pjw face
4646 m.winsize = nil; // full screen
47+ m.v = r;
4748 if(!(w = newwin())) {
4849 return;
4950 }
50− runmsg(w, &m, nil);
51− if(w == nil) {
52− ixp_respond(r, Enomem);
53− return;
54− }
55− r->fid->aux = w;
56− ixp_respond(r, NULL);
51+ runmsg(w, &m);
5752 }
5853
5954 void
@@ -208,7 +203,8 @@ fs_read(Ixp9Req *r) · 148 unmodified lines
208203 switch(r->fid->qid.path){
209204 case QCONS: {
210205 m.type = Trdkbd;
211− runmsg(w, &m, r);
206+ m.v = r;
207+ runmsg(w, &m);
212208 return;
213209 }
214210 case QLABEL: {
@@ -217,7 +213,8 @@ fs_read(Ixp9Req *r) · 2 unmodified lines
217213 }
218214 case QMOUSE: {
219215 m.type = Trdmouse;
220− runmsg(w, &m, r);
216+ m.v = r;
217+ runmsg(w, &m);
221218 return;
222219 }
223220 case QWINID: {
@@ -303,6 +300,15 @@ fs_reply(Window *w, Wsysmsg *m) · 79 unmodified lines
303300
304301 r = m->v;
305302 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+
306312 case Rrdkbd:
307313 rune = m->rune;
308314 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