mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2024-12-17 17:12:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

centralized stat creation

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-01-29 03:06:07 +02:00
parent 76f6c8b6b3
commit 32583743a9
1 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
cmd/wmiibar2.c
View File

@ -360,6 +360,49 @@ mkstat(Stat *stat, Qid *dir, char *name, unsigned long long length, unsigned int
return ixp_sizeof_stat(stat); return ixp_sizeof_stat(stat);
} }
static unsigned int
type_to_stat(Stat *stat, char *name, unsigned short i)
{
int type = name_to_type(name);
Qid dir = {IXP_QTDIR, 0, mkqpath(Ditem, i)};
switch (type) {
case Droot:
case Ditem:
return mkstat(stat, &root_qid, name, 0, DMDIR | DMREAD | DMEXEC);
break;
case Fctl:
return mkstat(stat, &root_qid, name, 0, DMWRITE);
break;
case Fdisplay:
if(align == SOUTH || align == NORTH)
return mkstat(stat, &root_qid, name, 6, DMREAD | DMWRITE);
else
return mkstat(stat, &root_qid, name, 5, DMREAD | DMWRITE);
break;
case Fevent:
return mkstat(stat, &root_qid, name, 0, DMREAD);
break;
case Ffont:
return mkstat(stat, &root_qid, name, strlen(font), DMREAD | DMWRITE);
break;
case Fdata:
if(i == nitem)
i = 0;
return mkstat(stat, &dir, name, strlen(item[i]->data), DMREAD | DMWRITE);
break;
case Fcolor:
if(i == nitem)
i = 0;
return mkstat(stat, &dir, name, strlen(item[i]->color), DMREAD | DMWRITE);
break;
default:
errstr = "invalid stat";
break;
}
return 0;
}
static int static int
xremove(IXPReq *r) xremove(IXPReq *r)
{ {
@ -400,24 +443,21 @@ xread(IXPReq *r)
if(!r->fcall->offset) { if(!r->fcall->offset) {
switch (qpath_type(m->qid.path)) { switch (qpath_type(m->qid.path)) {
case Droot: case Droot:
r->fcall->count = mkstat(&stat, &root_qid, "ctl", 0, DMWRITE); r->fcall->count = type_to_stat(&stat, "ctl", 0);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
if(align == SOUTH || align == NORTH) r->fcall->count += type_to_stat(&stat, "display", 0);
r->fcall->count += mkstat(&stat, &root_qid, "display", 6, DMREAD | DMWRITE);
else
r->fcall->count += mkstat(&stat, &root_qid, "display", 5, DMREAD | DMWRITE); /* none */
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
r->fcall->count += mkstat(&stat, &root_qid, "font", strlen(font), DMREAD | DMWRITE); r->fcall->count += type_to_stat(&stat, "font", 0);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
r->fcall->count += mkstat(&stat, &root_qid, "new", 0, DMDIR | DMREAD | DMEXEC); r->fcall->count += type_to_stat(&stat, "new", 0);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
r->fcall->count += mkstat(&stat, &root_qid, "event", 0, DMREAD); r->fcall->count += type_to_stat(&stat, "event", 0);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
r->fcall->count += mkstat(&stat, &root_qid, "default", 0, DMDIR | DMREAD | DMEXEC); r->fcall->count += type_to_stat(&stat, "default", 0);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
for(i = 1; i < nitem; i++) { for(i = 1; i < nitem; i++) {
snprintf(buf, sizeof(buf), "%u", i); snprintf(buf, sizeof(buf), "%u", i);
r->fcall->count += mkstat(&stat, &root_qid, buf, 0, DMDIR | DMREAD | DMEXEC); r->fcall->count += type_to_stat(&stat, buf, i);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
} }
break; break;
@ -425,19 +465,16 @@ xread(IXPReq *r)
if(i > nitem) if(i > nitem)
goto error_xread; goto error_xread;
if(!i) { if(!i) {
r->fcall->count = mkstat(&stat, &root_qid, "color", strlen(item[0]->color), DMREAD | DMWRITE); r->fcall->count = type_to_stat(&stat, "color", i);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
break; break;
} }
{
if(i == nitem) if(i == nitem)
new_item(); new_item();
Qid dir = {IXP_QTDIR, 0, mkqpath(Ditem, i)}; r->fcall->count = type_to_stat(&stat, "color", i);
r->fcall->count = mkstat(&stat, &dir, "color", strlen(item[i]->color), DMREAD | DMWRITE);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
r->fcall->count += mkstat(&stat, &dir, "data", strlen(item[i]->data), DMREAD | DMWRITE); r->fcall->count += type_to_stat(&stat, "data", i);
p = ixp_enc_stat(p, &stat); p = ixp_enc_stat(p, &stat);
}
break; break;
case Fctl: case Fctl:
errstr = Enoperm; errstr = Enoperm;
@ -498,50 +535,18 @@ static int
xstat(IXPReq *r) xstat(IXPReq *r)
{ {
IXPMap *m = ixp_server_fid2map(r, r->fcall->fid); IXPMap *m = ixp_server_fid2map(r, r->fcall->fid);
unsigned short i; char *name;
Qid dir;
if(!m) { if(!m) {
errstr = Enofid; errstr = Enofid;
return -1; return -1;
} }
i = qpath_item(m->qid.path);
dir.version = 0;
dir.type = IXP_QTDIR;
dir.path = mkqpath(Ditem, i);
switch (qpath_type(m->qid.path)) { name = qid_to_name(&m->qid);
case Droot: if(!type_to_stat(&r->fcall->stat, name, qpath_item(m->qid.path))) {
case Ditem:
mkstat(&r->fcall->stat, &root_qid, qid_to_name(&m->qid), 0, DMDIR | DMREAD | DMEXEC);
break;
case Fdisplay:
if(align == SOUTH || align == NORTH)
mkstat(&r->fcall->stat, &root_qid, qid_to_name(&m->qid), 6, DMREAD | DMWRITE);
else
mkstat(&r->fcall->stat, &root_qid, qid_to_name(&m->qid), 5, DMREAD | DMWRITE);
break;
case Fevent:
mkstat(&r->fcall->stat, &root_qid, qid_to_name(&m->qid), 0, DMREAD);
break;
case Ffont:
mkstat(&r->fcall->stat, &root_qid, qid_to_name(&m->qid), strlen(font), DMREAD | DMWRITE);
break;
case Fdata:
if(i == nitem)
i = 0;
mkstat(&r->fcall->stat, &dir, qid_to_name(&m->qid), strlen(item[i]->data), DMREAD | DMWRITE);
break;
case Fcolor:
if(i == nitem)
i = 0;
mkstat(&r->fcall->stat, &dir, qid_to_name(&m->qid), strlen(item[i]->color), DMREAD | DMWRITE);
break;
default:
if(!errstr) if(!errstr)
errstr = "invalid stat"; errstr = "invalid stat";
return -1; return -1;
break;
} }
r->fcall->id = RSTAT; r->fcall->id = RSTAT;
return 0; return 0;