diff -ur tkdesk-1.2.orig/Makefile.in tkdesk-1.2/Makefile.in --- tkdesk-1.2.orig/Makefile.in Mon Nov 15 07:07:45 1999 +++ tkdesk-1.2/Makefile.in Fri Nov 19 20:49:18 1999 @@ -34,13 +34,13 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TKDESK_LIBRARY) # Directory where tkdesksh will look for its library scripts: -SCRIPT_SEARCH_DIR = $(SCRIPT_INSTALL_DIR) +SCRIPT_SEARCH_DIR = $(TKDESK_LIBRARY) # Directory in which to install the program tkdesksh: BIN_INSTALL_DIR = $(INSTALL_ROOT)@bindir@ # Directory where tkdesksh will look for the tkdesk script: -BIN_SEARCH_DIR = $(BIN_INSTALL_DIR) +BIN_SEARCH_DIR = @bindir@ # Top-level directory in which to install manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)@mandir@ diff -ur tkdesk-1.2.orig/configure tkdesk-1.2/configure --- tkdesk-1.2.orig/configure Mon Nov 15 07:07:45 1999 +++ tkdesk-1.2/configure Fri Nov 19 20:47:58 1999 @@ -653,7 +653,7 @@ echo $ac_n "checking version of Tcl/Tk""... $ac_c" 1>&6 echo "configure:655: checking version of Tcl/Tk" >&5 echo "$ac_t""$TCL_VERSION/$TK_VERSION" 1>&6 -TCL_VERSIONS_ALLOWED="7.5 7.6 8.0 8.1 8.2" +TCL_VERSIONS_ALLOWED="7.5 7.6 8.0 8.1 8.2 7.5jp 7.6jp" if test -z "`echo $TCL_VERSIONS_ALLOWED | grep $TCL_VERSION`"; then echo echo TkDesk requires Tcl/Tk versions 7.5/4.1, 7.6/4.2., or 8.0. @@ -661,7 +661,7 @@ echo yet supported \(but hopefully will be soon\). exit 1 fi -TK_VERSIONS_ALLOWED="4.1 4.2 8.0 8.1 8.2" +TK_VERSIONS_ALLOWED="4.1 4.2 8.0 8.1 8.2 4.1jp 4.2jp" if test -z "`echo $TK_VERSIONS_ALLOWED | grep $TK_VERSION`"; then echo echo TkDesk requires Tcl/Tk versions 7.5/4.1, 7.6/4.2, or 8.0. diff -ur tkdesk-1.2.orig/tcldesk/Editor.tcl tkdesk-1.2/tcldesk/Editor.tcl --- tkdesk-1.2.orig/tcldesk/Editor.tcl Mon Nov 15 07:07:47 1999 +++ tkdesk-1.2/tcldesk/Editor.tcl Fri Nov 19 20:47:58 1999 @@ -396,6 +396,7 @@ -pad $tkdesk(pad) -height 5 \ -bd 2 -relief sunken -lborder 1 -setgrid 1 \ -wrap char -font [cb_font $tkdesk(editor,font)] \ + -kanjifont [cb_font $tkdesk(editor,kanjiFont)] \ -exportselection 1 -bg [cb_col $tkdesk(color,text)] \ -insertbackground [cb_col $tkdesk(color,insert)] pack $top.ft -in $top.f1 -fill both -expand yes -pady $tkdesk(pad) @@ -1676,7 +1677,8 @@ $menu add command -label $ent \ -command "$entry delete 0 end ;\ $entry insert end \[list $ent\]" \ - -font [cb_font $tkdesk(font,entries)] + -font [cb_font $tkdesk(font,entries)] \ + -kanjifont [cb_font $tkdesk(kanjiFont,entries)] } } @@ -1909,6 +1911,7 @@ cb_listbox $t.flb -vscroll 1 -hscroll 1 -lborder 0 -uborder 1 \ -width 10 -height 4 \ -font [cb_font $tkdesk(editor,font)] -setgrid 1 \ + -kanjifont [cb_font $tkdesk(editor,kanjiFont)] \ -selectmode single # $t.flb config -bd 1 -relief raised pack $t.flb -in $t.fmf -fill both -expand yes @@ -2036,12 +2039,15 @@ global tkdesk if {$what == "default"} { - $top.ft.text config -font [cb_font $tkdesk(editor,font)] + $top.ft.text config -font [cb_font $tkdesk(editor,font)] \ + -kanjifont [cb_font $tkdesk(editor,kanjiFont)] } else { set font [cb_fontSel] + set kfont [cb_kfontSel] if {$font != ""} { if [winfo exists $top.ft.text] { - $top.ft.text config -font [cb_font $font] + $top.ft.text config -font [cb_font $font] \ + -kanjifont [cb_font $kfont] } } } diff -ur tkdesk-1.2.orig/tcldesk/cb_tools/bindings.tcl tkdesk-1.2/tcldesk/cb_tools/bindings.tcl --- tkdesk-1.2.orig/tcldesk/cb_tools/bindings.tcl Mon Nov 15 07:07:47 1999 +++ tkdesk-1.2/tcldesk/cb_tools/bindings.tcl Fri Nov 19 20:47:58 1999 @@ -112,30 +112,13 @@ catch {bind Entry {tkEntryInsert %W \]}} catch {bind Entry {tkEntryInsert %W \\}} catch {bind Entry {tkEntryInsert %W @}} -catch {bind Entry {tkEntryInsert %W µ}} catch {bind Entry {tkEntryInsert %W |}} -catch {bind Entry {tkEntryInsert %W ä}} -catch {bind Entry {tkEntryInsert %W ö}} -catch {bind Entry {tkEntryInsert %W ü}} -catch {bind Entry {tkEntryInsert %W Ä}} -catch {bind Entry {tkEntryInsert %W Ö}} -catch {bind Entry {tkEntryInsert %W Ü}} -catch { - bind Entry { - if {%s == 0} { - tkEntryInsert %W ß - } else { - tkEntryInsert %W \\ - } - } -} # These might need to be commented out when using XKB: catch {bind Entry {tkEntryInsert %W ~}} catch {bind Entry {tkEntryInsert %W `}} catch {bind Entry {tkEntryInsert %W ~}} catch {bind Entry {tkEntryInsert %W `}} -catch {bind Entry {tkEntryInsert %W ´}} catch {bind Entry {tkEntryInsert %W ^}} @@ -153,33 +136,8 @@ tkTextInsert %W \\}} catch {bind Text {cb_Text_change_callback %W insert @; \ tkTextInsert %W @}} -catch {bind Text {cb_Text_change_callback %W insert µ; \ - tkTextInsert %W µ}} catch {bind Text {cb_Text_change_callback %W insert |; \ tkTextInsert %W |}} -catch {bind Text {cb_Text_change_callback %W insert ä; \ - tkTextInsert %W ä}} -catch {bind Text {cb_Text_change_callback %W insert ö; \ - tkTextInsert %W ö}} -catch {bind Text {cb_Text_change_callback %W insert ü; \ - tkTextInsert %W ü}} -catch {bind Text {cb_Text_change_callback %W insert Ä; \ - tkTextInsert %W Ä}} -catch {bind Text {cb_Text_change_callback %W insert Ö; \ - tkTextInsert %W Ö}} -catch {bind Text {cb_Text_change_callback %W insert Ü; \ - tkTextInsert %W Ü}} -catch { - bind Text { - if {%s == 0} { - cb_Text_change_callback %W insert ß - tkTextInsert %W ß - } else { - cb_Text_change_callback %W insert \\ - tkTextInsert %W \\ - } - } -} # These might need to be commented out when using XKB: catch {bind Text {cb_Text_change_callback %W insert ~; \ @@ -190,8 +148,6 @@ tkTextInsert %W ~}} catch {bind Text {cb_Text_change_callback %W insert `; \ tkTextInsert %W `}} -catch {bind Text {cb_Text_change_callback %W insert ´; \ - tkTextInsert %W ´}} catch {bind Text {cb_Text_change_callback %W insert ^; \ tkTextInsert %W ^}} @@ -279,7 +235,6 @@ [bind Text ]" bind Text "cb_Text_change_callback %W insert ; \ [bind Text ]" -bind Text "cb_Text_change_callback %W insert µ; [bind Text ]" bind Text "cb_Text_change_callback %W delete backchar; \ [bind Text ]" bind Text "cb_Text_change_callback %W delete char; \ diff -ur tkdesk-1.2.orig/tcldesk/cb_tools/tools.tcl tkdesk-1.2/tcldesk/cb_tools/tools.tcl --- tkdesk-1.2.orig/tcldesk/cb_tools/tools.tcl Mon Nov 15 07:07:47 1999 +++ tkdesk-1.2/tcldesk/cb_tools/tools.tcl Fri Nov 19 20:47:58 1999 @@ -37,6 +37,7 @@ # proc file_executable {file} # proc string_replace {string what with} # proc cb_fontSel {} +# proc cb_kfontSel {} # proc cb_geometry {w} # # ============================================================================= @@ -471,6 +472,21 @@ cb_error "Couldn't execute xfontsel." } return $font +} + +# ----------------------------------------------------------------------------- +# cb_kfontSel - Executes xfontsel and returns the selected kanji font. +# + +proc cb_kfontSel {} { + cb_info "Select a kanji font in the following window, press the \"select\" button, and then select \"quit\"." + update + set kfont k14 + set err [catch {set kfont [exec xfontsel -print]}] + if $err { + cb_error "Couldn't execute xfontsel." + } + return $kfont } # ----------------------------------------------------------------------------- diff -ur tkdesk-1.2.orig/tcldesk/config.tcl tkdesk-1.2/tcldesk/config.tcl --- tkdesk-1.2.orig/tcldesk/config.tcl Mon Nov 15 07:07:47 1999 +++ tkdesk-1.2/tcldesk/config.tcl Fri Nov 19 20:47:58 1999 @@ -295,8 +295,12 @@ set tkdesk(font,buttons) -*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-* set tkdesk(font,menubuttons) $tkdesk(font,labels) set tkdesk(font,menus) $tkdesk(font,menubuttons) -set tkdesk(font,entries) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* -set tkdesk(font,text) $tkdesk(font,entries) +#set tkdesk(font,entries) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* +set tkdesk(font,entries) a14 +set tkdesk(kanjiFont,entries) k14 +#set tkdesk(font,text) $tkdesk(font,entries) +set tkdesk(font,text) a14 +set tkdesk(kanjiFont,text) k14 set tkdesk(font,mono) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* set tkdesk(num_lbs) 3 set tkdesk(path,images) "$tkdesk(library)/images" @@ -466,7 +470,9 @@ option add *Checkbutton.font [cb_font $tkdesk(font,labels)] option add *Radiobutton.font [cb_font $tkdesk(font,labels)] option add *Entry.font [cb_font $tkdesk(font,entries)] + option add *Entry.KanjiFont [cb_font $tkdesk(kanjiFont,entries)] option add *Text.font [cb_font $tkdesk(font,entries)] + option add *Text.kanjiFont [cb_font $tkdesk(kanjiFont,entries)] option add *Button.font [cb_font $tkdesk(font,buttons)] option add *Menubutton.font [cb_font $tkdesk(font,menubuttons)] option add *Menu.font [cb_font $tkdesk(font,menus)] diff -ur tkdesk-1.2.orig/tcldesk/configs/System tkdesk-1.2/tcldesk/configs/System --- tkdesk-1.2.orig/tcldesk/configs/System Mon Nov 15 07:07:53 1999 +++ tkdesk-1.2/tcldesk/configs/System Fri Nov 19 20:47:58 1999 @@ -67,8 +67,11 @@ set tkdesk(font,menus) $tkdesk(font,menubuttons) ### Fonts for entries and text widgets (preferrably mono-spaced): -set tkdesk(font,entries) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* +#set tkdesk(font,entries) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* +set tkdesk(font,entries) a14 set tkdesk(font,text) $tkdesk(font,entries) +set tkdesk(kanjiFont,entries) k14 +set tkdesk(kanjiFont,text) $tkdesk(kanjiFont,entries) ### A mono-spaced font for table-like output (disk usage etc.): set tkdesk(font,mono) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* @@ -187,6 +190,7 @@ ### The following settings are only for the built-in editor: set tkdesk(editor,font) $tkdesk(font,text) +set tkdesk(editor,kanjiFont) $tkdesk(kanjiFont,text) set tkdesk(editor,default_geometry) "80x25" set tkdesk(editor,auto_indent) 1 set tkdesk(editor,brace_indent) 1