History

20090403-1415

Charles.Forsyth committed 17 years ago

Commit b7dcf9e1 parent 00a667b5 files · +30 −12Browse files

Unified · Split

5 files
  1. CHANGES +1 −0
  2. appl/wm/brutus.b +27 −9
  3. dis/wm/brutus.dis +0 −0
  4. lib9/getuser-Nt.c +2 −3
  5. man/9/text +1 −1
CHANGES+1−0
@@ -1,5 +1,6 @@
120090403120090403
2 change ,2 to ,#function in Solaris sparc assembler files (apparently works in gcc and sun's)2 change ,2 to ,#function in Solaris sparc assembler files (apparently works in gcc and sun's)
3 make appl/wm/brutus.b pass input to its widgets (issue 105)
320090402420090402
4 add missing emu/Linux/segflush-*.c files and remove ARM segflush from os.c5 add missing emu/Linux/segflush-*.c files and remove ARM segflush from os.c
520090402620090402
appl/wm/brutus.b+27−9
@@ -1718,7 +1718,7 @@ widget(parent: ref Tk->Toplevel, ctxt: ref Draw->Context, cfg: array of string): · 1717 unmodified lines
1718tkcmds(top: ref Tk->Toplevel, a: array of string)1718tkcmds(top: ref Tk->Toplevel, a: array of string)
1719{1719{
1720 for(i := 0; i < len a; i++)1720 for(i := 0; i < len a; i++)
1721 v := tk->cmd(top, a[i]);1721 v := tkcmd(top, a[i]);
1722}1722}
1723 1723
1724confirm(ctxt: ref Draw->Context, parent: ref Tk->Toplevel, message: string, write: int): string1724confirm(ctxt: ref Draw->Context, parent: ref Tk->Toplevel, message: string, write: int): string
@@ -1735,8 +1735,17 @@ confirm1(ctxt: ref Draw->Context, parent: ref Tk->Toplevel, message: string, wri · 10 unmodified lines
1735 if(write == 0)1735 if(write == 0)
1736 tkcmd(t, "destroy .f.exitclean");1736 tkcmd(t, "destroy .f.exitclean");
1737 tkcmd(t, UPDATE);1737 tkcmd(t, UPDATE);
1738 tkclient->onscreen(t, "onscreen");
1738 cmd := chan of string;1739 cmd := chan of string;
1739 tk->namechan(t, cmd, "cmd");1740 tk->namechan(t, cmd, "cmd");
1741 tkclient->onscreen(t, "exact");
1742 tkclient->startinput(t, "ptr"::nil);
1743 for(;;) alt {
1744 s := <-t.ctxt.ptr =>
1745 tk->pointer(t, *s);
1746 c := <-cmd =>
1747 return c;
1748 }
1740 return <-cmd;1749 return <-cmd;
1741}1750}
1742 1751
@@ -1843,17 +1852,26 @@ tageditor(ctxt: ref Draw->Context, f: ref File) · 100 unmodified lines
1843 t := widget(f.tk, ctxt, cfg[0:i]);1852 t := widget(f.tk, ctxt, cfg[0:i]);
1844 cmd := chan of string;1853 cmd := chan of string;
1845 tk->namechan(t, cmd, "cmd");1854 tk->namechan(t, cmd, "cmd");
1855 tkclient->onscreen(t, "exact");
1856 tkclient->startinput(t, "kbd"::"ptr"::nil);
1846 1857
1847 loop:1858 loop:
1848 for(;;){1859 for(;;){
1849 case c := <-cmd {1860 alt{
1850 "ok" =>1861 s := <-t.ctxt.kbd =>
1851 break loop;1862 tk->keyboard(t, s);
1852 "cancel" =>1863 s := <-t.ctxt.ptr =>
1853 return;1864 tk->pointer(t, *s);
1854 * =>1865 c := <-cmd =>
1855 j = int c;1866 case c {
1856 set[j] = (tkcmd(t, "variable c"+c) == "1");1867 "ok" =>
1868 break loop;
1869 "cancel" =>
1870 return;
1871 * =>
1872 j = int c;
1873 set[j] = (tkcmd(t, "variable c"+c) == "1");
1874 }
1857 }1875 }
1858 }1876 }
1859 for(j=0; j<NEXTRA; j++){1877 for(j=0; j<NEXTRA; j++){
dis/wm/brutus.dis+0−0

Binary file not shown.

lib9/getuser-Nt.c+2−3
@@ -3,7 +3,6 @@ · 2 unmodified lines
3char*3char*
4getuser(void)4getuser(void)
5{5{
6 static char *user = 0;6 /* could do better, but result isn't really used */
7 user = "unknown";7 return "unknown";
8 return user;
9}8}
man/9/text+1−1
@@ -376,7 +376,7 @@ first character on that display line. · 375 unmodified lines
376If this option is specified as an empty string, it cancels376If this option is specified as an empty string, it cancels
377the option, leaving it unspecified for the tag (the default).377the option, leaving it unspecified for the tag (the default).
378If the option is specified as a non-empty string that is378If the option is specified as a non-empty string that is
379an empty list, such as \f5-tags\0{\0}\fR, then it requests379an empty list, such as \f5-tabs\0{\0}\fR, then it requests
380default 8-character tabs as described for the \f5tabs\fR380default 8-character tabs as described for the \f5tabs\fR
381widget option.381widget option.
382.TP382.TP