cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-27 11:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

acme: remove -$

Browse source
This commit is contained in:
Russ Cox 2008-03-07 10:46:58 -05:00
parent 5f5dd85d10
commit cb1ac4c41d
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/cmd/acme/acme.c
View file

@ -70,9 +70,6 @@ threadmain(int argc, char *argv[])
loadfile = nil; loadfile = nil;
ARGBEGIN{ ARGBEGIN{
case '$':
dodollarsigns = TRUE;
break;
case 'D': case 'D':
{extern int _threaddebuglevel; {extern int _threaddebuglevel;
_threaddebuglevel = ~0; _threaddebuglevel = ~0;
@ -182,27 +179,27 @@ threadmain(int argc, char *argv[])
cwait = threadwaitchan(); cwait = threadwaitchan();
ccommand = chancreate(sizeof(Command**), 0); ccommand = chancreate(sizeof(Command**), 0);
chansetname(ccommand, "ccommand");
ckill = chancreate(sizeof(Rune*), 0); ckill = chancreate(sizeof(Rune*), 0);
chansetname(ckill, "ckill");
cxfidalloc = chancreate(sizeof(Xfid*), 0); cxfidalloc = chancreate(sizeof(Xfid*), 0);
chansetname(cxfidalloc, "cxfidalloc");
cxfidfree = chancreate(sizeof(Xfid*), 0); cxfidfree = chancreate(sizeof(Xfid*), 0);
chansetname(cxfidfree, "cxfidfree");
cnewwindow = chancreate(sizeof(Channel*), 0); cnewwindow = chancreate(sizeof(Channel*), 0);
chansetname(cnewwindow, "cnewwindow");
cerr = chancreate(sizeof(char*), 0); cerr = chancreate(sizeof(char*), 0);
chansetname(cerr, "cerr");
cedit = chancreate(sizeof(int), 0); cedit = chancreate(sizeof(int), 0);
chansetname(cedit, "cedit");
cexit = chancreate(sizeof(int), 0); cexit = chancreate(sizeof(int), 0);
chansetname(cexit, "cexit");
cwarn = chancreate(sizeof(void*), 1); cwarn = chancreate(sizeof(void*), 1);
chansetname(cwarn, "cwarn");
if(cwait==nil || ccommand==nil || ckill==nil || cxfidalloc==nil || cxfidfree==nil || cerr==nil || cexit==nil || cwarn==nil){ if(cwait==nil || ccommand==nil || ckill==nil || cxfidalloc==nil || cxfidfree==nil || cerr==nil || cexit==nil || cwarn==nil){
fprint(2, "acme: can't create initial channels: %r\n"); fprint(2, "acme: can't create initial channels: %r\n");
threadexitsall("channels"); threadexitsall("channels");
} }
chansetname(ccommand, "ccommand");
chansetname(ckill, "ckill");
chansetname(cxfidalloc, "cxfidalloc");
chansetname(cxfidfree, "cxfidfree");
chansetname(cnewwindow, "cnewwindow");
chansetname(cerr, "cerr");
chansetname(cedit, "cedit");
chansetname(cexit, "cexit");
chansetname(cwarn, "cwarn");
mousectl = initmouse(nil, screen); mousectl = initmouse(nil, screen);
if(mousectl == nil){ if(mousectl == nil){
@ -602,10 +599,6 @@ mousethread(void *v)
goto Continue; goto Continue;
} }
/* scroll buttons, wheels, etc. */ /* scroll buttons, wheels, etc. */
/*
* TAG used to require t->what==Body but now allow
* scroll wheel in tag too.
*/
if(w != nil && (m.buttons & (8|16))){ if(w != nil && (m.buttons & (8|16))){
if(m.buttons & 8) if(m.buttons & 8)
but = Kscrolloneup; but = Kscrolloneup;
@ -890,7 +883,6 @@ rfget(int fix, int save, int setfont, char *name)
} }
f = openfont(display, name); f = openfont(display, name);
if(f == nil){ if(f == nil){
fprint(2, "can't open font file %s: %r\n", name);
warning(nil, "can't open font file %s: %r\n", name); warning(nil, "can't open font file %s: %r\n", name);
return nil; return nil;
} }
@ -905,7 +897,7 @@ rfget(int fix, int save, int setfont, char *name)
if(reffonts[fix]) if(reffonts[fix])
rfclose(reffonts[fix]); rfclose(reffonts[fix]);
reffonts[fix] = r; reffonts[fix] = r;
if(fontnames[fix] != name){ if(name != fontnames[fix]){
free(fontnames[fix]); free(fontnames[fix]);
fontnames[fix] = estrdup(name); fontnames[fix] = estrdup(name);
} }