Index: configure.in ================================================================== --- configure.in +++ configure.in @@ -1,8 +1,8 @@ # -*- autoconf -*- -# FILE: "/diska/home/joze/src/tclreadline/configure.in" -# LAST MODIFICATION: "Mon Sep 13 17:51:49 1999 (joze)" +# FILE: "/disk01/home/joze/src/tclreadline/configure.in" +# LAST MODIFICATION: "Tue Sep 14 11:23:46 1999 (joze)" # (C) 1998, 1999 by Johannes Zellner, # $Id$ # --- # # tclreadline -- gnu readline for tcl @@ -284,11 +284,11 @@ readline include files in DIR], rl_includes=$withval, rl_includes=$prefix/include) AC_MSG_CHECKING([where to look for readline.h]) READLINE_INCLUDE_DIR="" -for dir in $rl_includes $prefix/include/readline /usr/include/readline /usr/include; do +for dir in $rl_includes $prefix/include/readline /usr/include/readline /usr/include /usr/local/include/readline /usr/local/include; do if test -r $dir/readline.h; then READLINE_INCLUDE_DIR=$dir break fi done Index: sources ================================================================== --- sources +++ sources @@ -3,11 +3,13 @@ README configure.in pkgIndex.tcl.in sample.tclshrc sources + config.h.in tclreadline.c tclreadline.h.in tclreadline.n.in tclreadlineConfig.sh.in tclreadlineInit.tcl.in tclreadlineSetup.tcl.in + tclreadlineCompleter.tcl Index: tclreadline.c ================================================================== --- tclreadline.c +++ tclreadline.c @@ -1,10 +1,10 @@ /* ================================================================== - FILE: "/home/joze/src/tclreadline/tclreadline.c" - LAST MODIFICATION: "Tue Sep 14 00:57:33 1999 (joze)" + FILE: "/diska/home/joze/src/tclreadline/tclreadline.c" + LAST MODIFICATION: "Tue Sep 14 11:57:42 1999 (joze)" (C) 1998, 1999 by Johannes Zellner, $Id$ --- tclreadline -- gnu readline for tcl @@ -34,13 +34,12 @@ #include #include #include #include -#define READLINE_LIBRARY -#include -#include +#include +#include /** * this prototype is missing * in readline.h */ Index: tclreadlineCompleter.tcl ================================================================== --- tclreadlineCompleter.tcl +++ tclreadlineCompleter.tcl @@ -1,8 +1,8 @@ -#!/usr/locanl/bin/tclsh -# FILE: "/home/joze/src/tclreadline/tclreadlineCompleter.tcl" -# LAST MODIFICATION: "Tue Sep 14 01:55:17 1999 (joze)" +# -*- tclsh -*- +# FILE: "/diska/home/joze/src/tclreadline/tclreadlineCompleter.tcl" +# LAST MODIFICATION: "Tue Sep 14 16:17:25 1999 (joze)" # (C) 1998, 1999 by Johannes Zellner, # $Id$ # --- # # tclreadline -- gnu readline for tcl @@ -961,11 +961,11 @@ # arguments. # if {[string length [uplevel [info level] info proc $alias]]} { set args [uplevel [info level] info args $alias] set arg [lindex $args [expr $pos - 1]] - if {"" != $arg} { + if {"" != $arg && "args" != $arg} { if {[uplevel [info level] info default $alias $arg junk]} { return [DisplayHints ?$arg?] } else { return [DisplayHints <$arg>] } @@ -973,17 +973,29 @@ } # Ok, also no proc. Try to do the same as for widgets now: # try to get at least the first option from an error output. + # if the subcommand is configure or cget, try to get the + # option table. # switch -- $pos { 1 { set cmds [TrySubCmds ${alias}] if {[llength ${cmds}]} { return [TryFromList ${part} ${cmds}] } + } + default { + set sub [Lindex $line 1] + switch -- $sub { + configure - + cget { + if {[OptionTable ${widget} options]} { + } + } + } } } # no specific command completer found. @@ -1847,16 +1859,16 @@ expose - hide - hidden - invokehidden - marktrusted - - target { return [DisplayHints [interp slaves]] } + target { return [CompleteFromList ${text} [interp slaves]] } aliases - delete - issafe - - slaves { return [DisplayHints [interp slaves]] } + slaves { return [CompleteFromList ${text} [interp slaves]] } alias - share - transfer { return [DisplayHints ] } } @@ -1874,11 +1886,11 @@ return [DisplayHints ?path?] } } eval { return [DisplayHints ] } - delete { return [DisplayHints [interp slaves]] } + delete { return [CompleteFromList ${text} [interp slaves]] } expose { return [DisplayHints ] } hide { return [DisplayHints ] } invokehidden { @@ -1920,11 +1932,11 @@ expose { return [DisplayHints ?exposedCmdName?] } hide { return [DisplayHints ?hiddenCmdName?] } share - - transfer { return [DisplayHints [interp slaves]] } + transfer { return [CompleteFromList ${text} [interp slaves]] } } } 5 { switch -- $cmd { @@ -1934,11 +1946,11 @@ expose { return [DisplayHints ?exposedCmdName?] } hide { return [DisplayHints ?hiddenCmdName?] } share - - transfer { return [DisplayHints [interp slaves]] } + transfer { return [CompleteFromList ${text} [interp slaves]] } } } } return "" } @@ -3090,25 +3102,75 @@ append tree " [WidgetDescendants $widget]" } return $tree } -proc complete(WIDGET) {text start end line pos mod} { - set widget [lindex ${line} 0] - set cmd [lindex ${line} 1] +proc ToplevelWindows {} { + set children [WidgetChildren ""] + set toplevels "" + foreach widget $children { + set toplevel [winfo toplevel $widget] + if {-1 == [lsearch $toplevels $toplevel]} { + lappend toplevels $toplevel + } + } + return $toplevels +} +#** +# try to get options for commands which +# allow `configure' (cget). +# @param command. +# @param optionsT where the table will be stored. +# @return number of options +# @date Sep-14-1999 +# +proc OptionTable {cmd optionsT} { + upvar $optionsT options # first we build an option table # if {[catch [list set option_table [${widget} configure]] msg]} { - return "" + return 0 } foreach optline ${option_table} { if {5 != [llength ${optline}]} continue else { lappend options(switches) [lindex ${optline} 0] lappend options(value) [lindex ${optline} 4] } } + return [llength ${option_table} +} + +#** +# :xa +# @param +# @return +# @warning +# @sa +# @author Johannes Zellner +# @date Sep-14-1999 +# +proc CompleteFromOptions {text start line cmd} { + OptionTable ${widget} options + set prev [PreviousWord ${start} ${line}] + #puts \nprev=|$prev| + #puts switches=|$options(switches)| + #puts found=[lsearch -exact ${prev} $options(switches)] + if {-1 != [set found \ + [lsearch -exact $options(switches) ${prev}]] + } { + if {![llength ${text}]} { + return [list "[lindex $options(value) ${found}]"] + } + } else { + return [TryFromList ${text} $options(switches)] + } +} + +proc complete(WIDGET) {text start end line pos mod} { + set widget [lindex ${line} 0] + set cmd [lindex ${line} 1] switch -- $pos { 1 { set cmds [TrySubCmds ${widget}] if {[llength ${cmds}]} { @@ -3117,23 +3179,11 @@ } 2 { if {([string match ${cmd}* cget] || \ [string match ${cmd}* configure]) } { - set prev [PreviousWord ${start} ${line}] - #puts \nprev=|$prev| - #puts switches=|$options(switches)| - #puts found=[lsearch -exact ${prev} $options(switches)] - if {-1 != [set found \ - [lsearch -exact $options(switches) ${prev}]] - } { - if {![llength ${mod}]} { - return [list "[lindex $options(value) ${found}]"] - } - } else { - return [TryFromList ${mod} $options(switches)] - } + return [CompleteFromOptions ${text} ${start} ${line} ${widget}] } } } return "" } @@ -3143,11 +3193,85 @@ proc complete(bell) {text start end line pos mod} { switch -- $pos { 1 { return [CompleteFromList ${text} -displayof] } 2 { if {"-displayof" == [PreviousWord ${start} ${line}]} { - return [CompleteFromList ${text} [WidgetDescendants ${text}]] + return [CompleteFromList ${text} [ToplevelWindows]] + } + } + } +} + +# proc complete(bind) {text start end line pos mod} { +# TODO +# return "" +# } + +proc complete(image) {text start end line pos mod} { + set sub [Lindex $line 1] + switch -- $pos { + 1 { return [CompleteFromList ${text} [TrySubCmds image]] } + 2 { + switch -- $sub { + create { return [CompleteFromList ${text} [image types]] } + delete - + height - + type - + width { return [CompleteFromList ${text} [image names]] } + names {} + types {} + } + } + 3 { + switch -- $sub { + create { + set type [Lindex $line 2] + switch -- $type { + bitmap { + return [CompleteFromList ${text} { + ?name? -background -data -file + -foreground -maskdata -maskfile + }] + } + photo { + # TODO + } + default {} + } + } + default {} + } + } + default { + switch -- $sub { + create { + set type [Lindex $line 2] + set prev [PreviousWord $start $line] + # puts stderr prev=$prev + switch -- $type { + bitmap { + switch -- $prev { + -background - + -foreground { return [DisplayHints ] } + -data - + -maskdata { return [DisplayHints ] } + -file - + -maskfile { return "" } + default { + return [CompleteFromList ${text} \ + [RemoveUsedOptions ${line} { + -background -data -file + -foreground -maskdata -maskfile + }]] + } + } + } + photo { + # TODO + } + } + } } } } }