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 @@
11 20070608
22 update /lib9 functions to use silly va_copy (and then va_end) instead of just assigning, to account for silly C implementations
33 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))
45 20070607
56 /appl/wm/man.b /appl/lib/man.b to allow 10.1 etc as section references
67 20070605
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
44 include "draw.m";
55 include "workdir.m";
66 include "sh.m";
7+include "env.m";
78
89 sys : Sys;
910 workdir : Workdir;
11+env: Env;
1012
1113 OREAD, OWRITE, ORDWR, FORKNS, FORKENV, FORKFD, NEWPGRP, MREPL, FD, UTFmax, pctl, open, read, write, fprint, sprint, fildes, bind, dup, byte2char, utfbytes : import sys;
1214
@@ -35,6 +37,7 @@ init(ctxt : ref Draw->Context, argl : list of string) · 22 unmodified lines
3537 {
3638 sys = load Sys Sys->PATH;
3739 workdir = load Workdir Workdir->PATH;
40+ env = load Env Env->PATH;
3841 drawctxt = ctxt;
3942 stdout = fildes(1);
4043 stderr = fildes(2);
@@ -222,6 +225,7 @@ main(argv : list of string) · 181 unmodified lines
222225 error("ctl");
223226 id = int string buf;
224227 buf = nil;
228+ env->setenv("acmewin", string id);
225229 b := sprint("/chan/%d/tag", id);
226230 fd = open(b, OWRITE);
227231 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
11641164 pipechar := 0;
11651165 if (t < len s && (s[t] == '<' || s[t] == '|' || s[t] == '>')){
11661166 pipechar = s[t++];
1167− s = s[1: ];
1167+ s = s[t:];
11681168 }
11691169 c.pid = sys->pctl(0, nil);
11701170 c.iseditcmd = iseditcmd;
appl/acme/row.b+1−1
@@ -446,7 +446,7 @@ Row.dump(row : self ref Row, file : string) · 445 unmodified lines
446446 w.body.file.buf.nc, fontname));
447447 }
448448 a = nil;
449− buf = w.ctlprint();
449+ buf = w.ctlprint(0);
450450 b.puts(buf);
451451 m = min(BUFSIZE, w.tag.file.buf.nc);
452452 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
527527 return TRUE;
528528 }
529529
530−Window.ctlprint(w : self ref Window) : string
530+Window.ctlprint(w : self ref Window, fonts : int) : string
531531 {
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,
533533 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;
534538 }
535539
536540 Window.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
374374 QWbody =>
375375 x.utfread(w.body, 0, w.body.file.buf.nc, QWbody);
376376 QWctl =>
377− sbuf = w.ctlprint();
377+ sbuf = w.ctlprint(1);
378378 QWevent =>
379379 x.eventread(w);
380380 QWdata =>
@@ -1052,7 +1052,7 @@ Xfid.indexread(x : self ref Xfid) · 671 unmodified lines
10521052 # only show the currently active window of a set
10531053 if(w.body.file.curtext != w.body)
10541054 continue;
1055− ctls := w.ctlprint();
1055+ ctls := w.ctlprint(0);
10561056 ctlb := array of byte ctls;
10571057 if (len ctls != Ctlsize || len ctlb != Ctlsize)
10581058 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
154154 .B ctl
155155 may be read to recover the five numbers as held in the
156156 .B index
157−file, described above.
157+file, described above, plus three more fields: the width of the
158+window in pixels, the name of the font used in the window,
159+and the width of a tab character in pixels.
158160 Text messages may be written to
159161 .B ctl
160162 to affect the window.