History

20070608-1402

Charles.Forsyth committed 19 years ago

Commit fa5d7111 parent 0452db832 files · +-7 −-18Browse files

Unified · Split

32 files
  1. CHANGES +1 −0
  2. acme/dis/win.dis +0 −0
  3. appl/acme/acme/bin/src/win.b +4 −0
  4. appl/acme/exec.b +1 −1
  5. appl/acme/row.b +1 −1
  6. appl/acme/wind.b +6 −2
  7. appl/acme/xfid.b +2 −2
  8. dis/acme.dis +0 −0
  9. dis/acme/acme.dis +0 −0
  10. dis/acme/buff.dis +0 −0
  11. dis/acme/col.dis +0 −0
  12. dis/acme/dat.dis +0 −0
  13. dis/acme/disk.dis +0 −0
  14. dis/acme/ecmd.dis +0 −0
  15. dis/acme/edit.dis +0 −0
  16. dis/acme/elog.dis +0 −0
  17. dis/acme/exec.dis +0 −0
  18. dis/acme/file.dis +0 −0
  19. dis/acme/frame.dis +0 −0
  20. dis/acme/fsys.dis +0 −0
  21. dis/acme/graph.dis +0 −0
  22. dis/acme/gui.dis +0 −0
  23. dis/acme/look.dis +0 −0
  24. dis/acme/regx.dis +0 −0
  25. dis/acme/row.dis +0 −0
  26. dis/acme/scrl.dis +0 −0
  27. dis/acme/text.dis +0 −0
  28. dis/acme/time.dis +0 −0
  29. dis/acme/util.dis +0 −0
  30. dis/acme/wind.dis +0 −0
  31. dis/acme/xfid.dis +0 −0
  32. man/4/acme +3 −1
CHANGES+1−0
@@ -1,6 +1,7 @@
120070608120070608
2 update /lib9 functions to use silly va_copy (and then va_end) instead of just assigning, to account for silly C implementations2 update /lib9 functions to use silly va_copy (and then va_end) instead of just assigning, to account for silly C implementations
3 change /appl/cmd/mc.b not to require Draw or Env (so lc works on smaller systems)3 change /appl/cmd/mc.b not to require Draw or Env (so lc works on smaller systems)
4 update acme to include the font size data (eg, for use by mc(1))
420070607520070607
5 /appl/wm/man.b /appl/lib/man.b to allow 10.1 etc as section references6 /appl/wm/man.b /appl/lib/man.b to allow 10.1 etc as section references
620070605720070605
acme/dis/win.dis+0−0

Binary file not shown.

appl/acme/acme/bin/src/win.b+4−0
@@ -4,9 +4,11 @@ include "sys.m"; · 3 unmodified lines
4include "draw.m";4include "draw.m";
5include "workdir.m";5include "workdir.m";
6include "sh.m";6include "sh.m";
7include "env.m";
7 8
8sys : Sys;9sys : Sys;
9workdir : Workdir;10workdir : Workdir;
11env: Env;
10 12
11OREAD, OWRITE, ORDWR, FORKNS, FORKENV, FORKFD, NEWPGRP, MREPL, FD, UTFmax, pctl, open, read, write, fprint, sprint, fildes, bind, dup, byte2char, utfbytes : import sys;13OREAD, OWRITE, ORDWR, FORKNS, FORKENV, FORKFD, NEWPGRP, MREPL, FD, UTFmax, pctl, open, read, write, fprint, sprint, fildes, bind, dup, byte2char, utfbytes : import sys;
12 14
@@ -35,6 +37,7 @@ init(ctxt : ref Draw->Context, argl : list of string) · 22 unmodified lines
35{37{
36 sys = load Sys Sys->PATH;38 sys = load Sys Sys->PATH;
37 workdir = load Workdir Workdir->PATH;39 workdir = load Workdir Workdir->PATH;
40 env = load Env Env->PATH;
38 drawctxt = ctxt;41 drawctxt = ctxt;
39 stdout = fildes(1);42 stdout = fildes(1);
40 stderr = fildes(2);43 stderr = fildes(2);
@@ -222,6 +225,7 @@ main(argv : list of string) · 181 unmodified lines
222 error("ctl");225 error("ctl");
223 id = int string buf;226 id = int string buf;
224 buf = nil;227 buf = nil;
228 env->setenv("acmewin", string id);
225 b := sprint("/chan/%d/tag", id);229 b := sprint("/chan/%d/tag", id);
226 fd = open(b, OWRITE);230 fd = open(b, OWRITE);
227 write(fd, array of byte " Send Delete", 12);231 write(fd, array of byte " Send Delete", 12);
appl/acme/exec.b+1−1
@@ -1164,7 +1164,7 @@ run(win : ref Window, s : string, rdir : string, ndir : int, newns : int, argadd · 1163 unmodified lines
1164 pipechar := 0;1164 pipechar := 0;
1165 if (t < len s && (s[t] == '<' || s[t] == '|' || s[t] == '>')){1165 if (t < len s && (s[t] == '<' || s[t] == '|' || s[t] == '>')){
1166 pipechar = s[t++];1166 pipechar = s[t++];
1167 s = s[1: ];1167 s = s[t:];
1168 }1168 }
1169 c.pid = sys->pctl(0, nil);1169 c.pid = sys->pctl(0, nil);
1170 c.iseditcmd = iseditcmd;1170 c.iseditcmd = iseditcmd;
appl/acme/row.b+1−1
@@ -446,7 +446,7 @@ Row.dump(row : self ref Row, file : string) · 445 unmodified lines
446 w.body.file.buf.nc, fontname));446 w.body.file.buf.nc, fontname));
447 }447 }
448 a = nil;448 a = nil;
449 buf = w.ctlprint();449 buf = w.ctlprint(0);
450 b.puts(buf);450 b.puts(buf);
451 m = min(BUFSIZE, w.tag.file.buf.nc);451 m = min(BUFSIZE, w.tag.file.buf.nc);
452 w.tag.file.buf.read(0, r, 0, m);452 w.tag.file.buf.read(0, r, 0, m);
appl/acme/wind.b+6−2
@@ -527,10 +527,14 @@ Window.clean(w : self ref Window, conservative : int, exiting : int) : int # as · 526 unmodified lines
527 return TRUE;527 return TRUE;
528}528}
529 529
530Window.ctlprint(w : self ref Window) : string530Window.ctlprint(w : self ref Window, fonts : int) : string
531{531{
532 return sprint("%11d %11d %11d %11d %11d ", w.id, w.tag.file.buf.nc,532 s := sprint("%11d %11d %11d %11d %11d ", w.id, w.tag.file.buf.nc,
533 w.body.file.buf.nc, w.isdir, w.dirty);533 w.body.file.buf.nc, w.isdir, w.dirty);
534 if(fonts)
535 return sprint("%s%11d %q %11d ", s, w.body.frame.r.dx(),
536 w.body.reffont.f.name, w.body.frame.maxtab);
537 return s;
534}538}
535 539
536Window.event(w : self ref Window, fmt : string)540Window.event(w : self ref Window, fmt : string)
appl/acme/xfid.b+2−2
@@ -374,7 +374,7 @@ Xfid.read(x : self ref Xfid) · 373 unmodified lines
374 QWbody =>374 QWbody =>
375 x.utfread(w.body, 0, w.body.file.buf.nc, QWbody);375 x.utfread(w.body, 0, w.body.file.buf.nc, QWbody);
376 QWctl =>376 QWctl =>
377 sbuf = w.ctlprint();377 sbuf = w.ctlprint(1);
378 QWevent =>378 QWevent =>
379 x.eventread(w);379 x.eventread(w);
380 QWdata =>380 QWdata =>
@@ -1052,7 +1052,7 @@ Xfid.indexread(x : self ref Xfid) · 671 unmodified lines
1052 # only show the currently active window of a set1052 # only show the currently active window of a set
1053 if(w.body.file.curtext != w.body)1053 if(w.body.file.curtext != w.body)
1054 continue;1054 continue;
1055 ctls := w.ctlprint();1055 ctls := w.ctlprint(0);
1056 ctlb := array of byte ctls;1056 ctlb := array of byte ctls;
1057 if (len ctls != Ctlsize || len ctlb != Ctlsize)1057 if (len ctls != Ctlsize || len ctlb != Ctlsize)
1058 error("bad length in indexread");1058 error("bad length in indexread");
dis/acme.dis+0−0

Binary file not shown.

dis/acme/acme.dis+0−0

Binary file not shown.

dis/acme/buff.dis+0−0

Binary file not shown.

dis/acme/col.dis+0−0

Binary file not shown.

dis/acme/dat.dis+0−0

Binary file not shown.

dis/acme/disk.dis+0−0

Binary file not shown.

dis/acme/ecmd.dis+0−0

Binary file not shown.

dis/acme/edit.dis+0−0

Binary file not shown.

dis/acme/elog.dis+0−0

Binary file not shown.

dis/acme/exec.dis+0−0

Binary file not shown.

dis/acme/file.dis+0−0

Binary file not shown.

dis/acme/frame.dis+0−0

Binary file not shown.

dis/acme/fsys.dis+0−0

Binary file not shown.

dis/acme/graph.dis+0−0

Binary file not shown.

dis/acme/gui.dis+0−0

Binary file not shown.

dis/acme/look.dis+0−0

Binary file not shown.

dis/acme/regx.dis+0−0

Binary file not shown.

dis/acme/row.dis+0−0

Binary file not shown.

dis/acme/scrl.dis+0−0

Binary file not shown.

dis/acme/text.dis+0−0

Binary file not shown.

dis/acme/time.dis+0−0

Binary file not shown.

dis/acme/util.dis+0−0

Binary file not shown.

dis/acme/wind.dis+0−0

Binary file not shown.

dis/acme/xfid.dis+0−0

Binary file not shown.

man/4/acme+3−1
@@ -154,7 +154,9 @@ is always appended; the file offset is ignored. · 153 unmodified lines
154.B ctl154.B ctl
155may be read to recover the five numbers as held in the155may be read to recover the five numbers as held in the
156.B index156.B index
157file, described above.157file, described above, plus three more fields: the width of the
158window in pixels, the name of the font used in the window,
159and the width of a tab character in pixels.
158Text messages may be written to160Text messages may be written to
159.B ctl161.B ctl
160to affect the window.162to affect the window.