diff options
Diffstat (limited to 'appl/grid/lib')
| -rw-r--r-- | appl/grid/lib/announce.b | 8 | ||||
| -rw-r--r-- | appl/grid/lib/browser.b | 12 | ||||
| -rw-r--r-- | appl/grid/lib/fbrowse.b | 5 | ||||
| -rw-r--r-- | appl/grid/lib/srvbrowse.b | 2 |
4 files changed, 9 insertions, 18 deletions
diff --git a/appl/grid/lib/announce.b b/appl/grid/lib/announce.b index b29dfe42..54438b59 100644 --- a/appl/grid/lib/announce.b +++ b/appl/grid/lib/announce.b @@ -1,6 +1,8 @@ implement Announce; include "sys.m"; sys: Sys; +include "dial.m"; + dial: Dial; include "grid/announce.m"; init() @@ -11,8 +13,8 @@ init() announce(): (string, ref Sys->Connection) { sysname := readfile("/dev/sysname"); - (ok, c) := sys->announce("tcp!*!0"); - if(ok == -1) + c := dial->announce("tcp!*!0"); + if(c == nil) return (nil, nil); local := readfile(c.dir + "/local"); if(local == nil) @@ -25,7 +27,7 @@ announce(): (string, ref Sys->Connection) return (nil, nil); if(port[len port - 1] == '\n') port = port[0:len port - 1]; - return ("tcp!" + sysname + "!" + port, ref c); + return ("tcp!" + sysname + "!" + port, c); } diff --git a/appl/grid/lib/browser.b b/appl/grid/lib/browser.b index c6de92cf..4fc0b2bc 100644 --- a/appl/grid/lib/browser.b +++ b/appl/grid/lib/browser.b @@ -62,8 +62,6 @@ Browse.new(top: ref Tk->Toplevel, tkchanname, root, rlabel: string, nopanes: int tkcmds(top, pane1scr); tkcmd(top, "bind .fbrowse.lmov <Button-1> {send "+b.tkchan+" movdiv %X}"); - size := tkcmd(top, "grid size .fbrowse"); - p := isat(size, " "); tkcmd(top, "label .fbrowse.l -text { } -anchor w -width 0" + " -font /fonts/charon/plain.normal.font"); tkcmd(top, ".fbrowse.l configure -height "+tkcmd(top, ".fbrowse.l cget -height")); @@ -179,8 +177,8 @@ Browse.changeview(b: self ref Browse, nopanes: int) { if (b.nopanes == nopanes) return; - w := int tkcmd(b.top, ".fbrowse cget -actwidth"); - ws := int tkcmd(b.top, ".fbrowse.sy1 cget -width"); +# w := int tkcmd(b.top, ".fbrowse cget -actwidth"); +# ws := int tkcmd(b.top, ".fbrowse.sy1 cget -width"); if (nopanes == 1) { b.pane0width = tkcmd(b.top, ".fbrowse.c1 cget -actwidth") + " " + tkcmd(b.top, ".fbrowse.c2 cget -actwidth"); @@ -270,8 +268,6 @@ Browse.gotopath(b: self ref Browse, file: File, openfinal: int): (File, string) trackbacklist : list of (string, list of string, list of string) = nil; trackback := 0; enddir := ""; - endfile := ""; - filetkpath := ""; if (file.path[len file.path - 1] != '/') { # i.e. is not a directory p := isatback(file.path, "/"); @@ -369,7 +365,6 @@ Browse.getpath(b: self ref Browse, f: string): ref File tkpath := ".fbrowse.fl.f0"; path := b.root; lst = tl tl lst; - started := 0; # sys->print("getpath: %s %s\n",tkpath, path); qid := ""; for (; lst != nil; lst = tl lst) { @@ -1041,8 +1036,6 @@ Select.defaultaction(s: self ref Select, lst: list of string) Select.getselected(s: self ref Select, fname: string): string { - retlist : list of (int, list of ref Parameter) = nil; - row := 1; f := getframe(s, fname); return f.selected; } @@ -1058,7 +1051,6 @@ Select.getselection(s: self ref Select, fname: string): list of (string, list of if (slaves == nil || slaves[0] == '!') break; (nil, lst) := sys->tokenize(slaves, " "); - pos := isatback(hd lst, "l"); tkpath := hd lst; lst = tl lst; lp : list of ref Parameter = nil; diff --git a/appl/grid/lib/fbrowse.b b/appl/grid/lib/fbrowse.b index bde88e62..d1310386 100644 --- a/appl/grid/lib/fbrowse.b +++ b/appl/grid/lib/fbrowse.b @@ -89,8 +89,6 @@ init(ctxt : ref Draw->Context, title, root, currdir: string): string released := 1; title = ""; - menudata := ("", ""); - tkclient->onscreen(top, nil); resize(top, ctxt.display.image); tkclient->startinput(top, "kbd"::"ptr"::nil); @@ -272,7 +270,6 @@ openfile(ctxt: ref draw->Context, file, title: string, writeable: int) (w,h) := fopensize; if (w != "" && h != "") tkcmd(top, ". configure -width "+w+" -height "+h); - errors := 0; killpid := -1; fd := sys->open(file, sys->OREAD); if (fd != nil) { @@ -369,7 +366,7 @@ actionbutton(top: ref Tk->Toplevel, path, tkpath: string) getext(file: string): string { - (n, lst) := sys->tokenize(file, "."); + (nil, lst) := sys->tokenize(file, "."); for (; tl lst != nil; lst = tl lst) ; return hd lst; diff --git a/appl/grid/lib/srvbrowse.b b/appl/grid/lib/srvbrowse.b index eec8f56e..943ea18e 100644 --- a/appl/grid/lib/srvbrowse.b +++ b/appl/grid/lib/srvbrowse.b @@ -114,7 +114,7 @@ find(filter: list of list of (string, string)): list of ref Service else { for (; filter != nil; filter = tl filter) { attr := hd filter; - (s, err) := reg.find(attr); + (s, nil) := reg.find(attr); for (; s != nil; s = tl s) lsrv = hd s :: lsrv; } |
