xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

devdraw: simplify drawgen()

Browse source
This commit is contained in:
cinap_lenrek 2019-01-28 23:29:22 +01:00
parent 8152e9d075
commit 5b5416aa05
2 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sys/src/9/port/devdraw.c
View file

@ -239,40 +239,43 @@ drawgen(Chan *c, char*, Dirtab*, int, int s, Dir *dp)
* Top level directory contains the name of the device.
*/
t = QID(c->qid);
if(t == Qtopdir || t == Qwinname){
if(s == 1 || t == Qwinname){
mkqid(&q, Qwinname, 0, QTFILE);
devdir(c, q, "winname", 0, eve, 0444, dp);
}
else if(s == 0){
switch(t){
case Qtopdir:
if(s == 0){
mkqid(&q, Q2nd, 0, QTDIR);
devdir(c, q, "draw", 0, eve, 0555, dp);
return 1;
}
else
return -1;
return 1;
if(s == 1){
case Qwinname:
mkqid(&q, Qwinname, 0, QTFILE);
devdir(c, q, "winname", 0, eve, 0444, dp);
return 1;
}
return -1;
}
/*
* Second level contains "new" plus all the clients.
*/
if(t == Q2nd || t == Qnew){
switch(t){
case Q2nd:
if(s == 0){
case Qnew:
mkqid(&q, Qnew, 0, QTFILE);
devdir(c, q, "new", 0, eve, 0666, dp);
return 1;
}
else if(s <= sdraw.nclient){
if(s <= sdraw.nclient){
cl = sdraw.client[s-1];
if(cl == 0)
if(cl == nil)
return 0;
sprint(up->genbuf, "%d", cl->clientid);
mkqid(&q, (s<<QSHIFT)|Q3rd, 0, QTDIR);
devdir(c, q, up->genbuf, 0, eve, 0555, dp);
return 1;
}
else
return -1;
return 1;
return -1;
}
/*

33
sys/src/cmd/vnc/devdraw.c
View file

@ -237,40 +237,43 @@ drawgen(Chan *c, Dirtab*, int, int s, Dir *dp)
* Top level directory contains the name of the device.
*/
t = QID(c->qid);
if(t == Qtopdir || t == Qwinname){
if(s == 1 || t == Qwinname){
mkqid(&q, Qwinname, 0, QTFILE);
devdir(c, q, "winname", 0, eve, 0444, dp);
}
else if(s == 0){
switch(t){
case Qtopdir:
if(s == 0){
mkqid(&q, Q2nd, 0, QTDIR);
devdir(c, q, "draw", 0, eve, 0555, dp);
return 1;
}
else
return -1;
return 1;
if(s == 1){
case Qwinname:
mkqid(&q, Qwinname, 0, QTFILE);
devdir(c, q, "winname", 0, eve, 0444, dp);
return 1;
}
return -1;
}
/*
* Second level contains "new" plus all the clients.
*/
if(t == Q2nd || t == Qnew){
switch(t){
case Q2nd:
if(s == 0){
case Qnew:
mkqid(&q, Qnew, 0, QTFILE);
devdir(c, q, "new", 0, eve, 0666, dp);
return 1;
}
else if(s <= sdraw.nclient){
if(s <= sdraw.nclient){
cl = sdraw.client[s-1];
if(cl == 0)
if(cl == nil)
return 0;
sprint(up->genbuf, "%d", cl->clientid);
mkqid(&q, (s<<QSHIFT)|Q3rd, 0, QTDIR);
devdir(c, q, up->genbuf, 0, eve, 0555, dp);
return 1;
}
else
return -1;
return 1;
return -1;
}
/*