diff -ru FG.orig/FG FG/FG --- FG.orig/FG Wed Dec 10 17:19:42 1997 +++ FG/FG Thu Mar 15 16:00:19 2001 @@ -1 +1,2 @@ -wish4.2 -f fg.tcl +FG_HOMEDIR="/usr/share/FG/" +wish -f ${FG_HOMEDIR}fg.tcl ${FG_HOMEDIR} diff -ru FG.orig/feynmang.cnf FG/feynmang.cnf --- FG.orig/feynmang.cnf Tue Dec 2 07:30:46 1997 +++ FG/feynmang.cnf Thu Mar 15 13:13:54 2001 @@ -1,6 +1,6 @@ global db -set db(LogoFN) "logo.gif" +set db(LogoFN) "${srcDir}logo.gif" set db(StartDelay) 2000 if ![info exists db(LoadConfigAgain)] { @@ -96,7 +96,7 @@ set db(linecolor,Oval) black set db(linecolor,blob) black set db(linecolor,Text) black -set db(filling,blob) "@gray.m.pm" +set db(filling,blob) "@${srcDir}gray.m.pm" set db(linecolor,Bbox) red diff -ru FG.orig/fg.tcl FG/fg.tcl --- FG.orig/fg.tcl Mon Sep 22 06:51:00 1997 +++ FG/fg.tcl Thu Mar 15 16:01:57 2001 @@ -1,18 +1,21 @@ global diag db -source feynmang.cnf -source fg_win.tcl -source fg_edit.tcl -source fg_binding.tcl -source fg_drawl.tcl -source fg_drawa.tcl -source fg_events.tcl -source fg_events.tcl -source fg_dialog.tcl -source fg_regs.tcl -source fg_io.tcl -source fg_wtext.tcl +set srcDir [lindex $argv 0] + +source ${srcDir}feynmang.cnf + +source ${srcDir}fg_win.tcl +source ${srcDir}fg_edit.tcl +source ${srcDir}fg_binding.tcl +source ${srcDir}fg_drawl.tcl +source ${srcDir}fg_drawa.tcl +source ${srcDir}fg_events.tcl +source ${srcDir}fg_events.tcl +source ${srcDir}fg_dialog.tcl +source ${srcDir}fg_regs.tcl +source ${srcDir}fg_io.tcl +source ${srcDir}fg_wtext.tcl wm withdraw . diff -ru FG.orig/fg_binding.tcl FG/fg_binding.tcl --- FG.orig/fg_binding.tcl Mon Sep 22 06:46:32 1997 +++ FG/fg_binding.tcl Fri Mar 16 23:25:28 2001 @@ -4,8 +4,8 @@ foreach ev "[bind $w]" { set bindings($w,$ev) [list $ev [bind $w $ev]] } - bind $w {return} - bind $w {return} +# bind $w {return} +# bind $w {return} } proc FG_BindPrint {w} { @@ -22,8 +22,8 @@ foreach ev "[array names bindings $w,*]" { bind $w [lindex $bindings($ev) 0] [lindex $bindings($ev) 1] } - bind $w {} - bind $w {} +# bind $w {} +# bind $w {} } diff -ru FG.orig/fg_events.tcl FG/fg_events.tcl --- FG.orig/fg_events.tcl Mon Sep 22 06:46:32 1997 +++ FG/fg_events.tcl Fri Mar 16 19:50:23 2001 @@ -180,6 +180,11 @@ foreach id "[$w find withtag movable]" { set conf($id) "[$w itemconfigure $id]" +# + set i [lsearch $conf($id) {-smooth {*} {*} * bezier}] + if {$i >= 0} { + set conf($id) [lreplace $conf($id) $i $i {-smooth {} {} 0 true}] + } #puts $conf($id) set tplace "[lsearch $conf($id) {-tags {*} {*} {*} {*}}]" set n "[lindex [lindex [lindex $conf($id) $tplace] 4] 2]" diff -ru FG.orig/fg_io.tcl FG/fg_io.tcl --- FG.orig/fg_io.tcl Thu Sep 25 07:42:09 1997 +++ FG/fg_io.tcl Fri Mar 16 19:53:13 2001 @@ -1,6 +1,6 @@ proc FG_LoadConfig { } { - global db diag - source feynmang.cnf + global db diag srcDir + source ${srcDir}feynmang.cnf set db(mode) "Configuration Loaded" } @@ -25,6 +25,11 @@ foreach id "[$w.c find withtag $type]" { set coords "[$w.c coords $id]" set conf "[$w.c itemconfigure $id]" +# + set i [lsearch $conf {-smooth {*} {*} * bezier}] + if {$i >= 0} { + set conf [lreplace $conf $i $i {-smooth {} {} 0 true}] + } set tplace "[lsearch $conf {-tags {*} {*} {*} {*}}]" set o "[lindex [lindex [lindex $conf $tplace] 4] 0]" set n "[lindex [lindex [lindex $conf $tplace] 4] 2]" @@ -48,6 +53,11 @@ foreach id "[$w.c find withtag $type]" { set coords "[$w.c coords $id]" set conf "[$w.c itemconfigure $id]" +# + set i [lsearch $conf {-smooth {*} {*} * bezier}] + if {$i >= 0} { + set conf [lreplace $conf $i $i {-smooth {} {} 0 true}] + } set tplace "[lsearch $conf {-tags {*} {*} {*} {*}}]" set o "[lindex [lindex [lindex $conf $tplace] 4] 0]" set n "[lindex [lindex [lindex $conf $tplace] 4] 2]" diff -ru FG.orig/fg_wtext.tcl FG/fg_wtext.tcl --- FG.orig/fg_wtext.tcl Wed Dec 3 11:27:27 1997 +++ FG/fg_wtext.tcl Thu Mar 15 13:43:48 2001 @@ -48,13 +48,13 @@ %W select to editable @%x,%y } } - $w bind $id { - if { [%W select item] != {} } { - %W dchars [%W select item] sel.first sel.last - } elseif { [%W focus] != {} } { - %W dchars [%W focus] insert - } - } +# $w bind $id { +# if { [%W select item] != {} } { +# %W dchars [%W select item] sel.first sel.last +# } elseif { [%W focus] != {} } { +# %W dchars [%W focus] insert +# } +# } bind $w { if {[%W focus] != {}} { @@ -72,6 +72,16 @@ unset _t } } + bind $w { + if { [%W select item] != {} } { + %W dchars [%W select item] sel.first sel.last + } elseif { [%W focus] != {} } { + set _t [%W focus] + %W icursor $_t [expr [%W index $_t insert]-1] + %W dchars $_t insert + unset _t + } + } bind $w { FG_SaveText %W } bind $w { %W focus editable @@ -90,7 +100,7 @@ } bind $w <3> {FG_SaveText %W } - bind $w { [$c bind editable ] } +# bind $w { [$c bind editable ] } set db(mode) "Editing Text" }