diff -cr tkdesk-1.0b5.orig/Makefile.in tkdesk-1.0b5/Makefile.in *** tkdesk-1.0b5.orig/Makefile.in Fri Dec 5 19:44:55 1997 --- tkdesk-1.0b5/Makefile.in Sat Dec 6 17:28:55 1997 *************** *** 34,46 **** SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TKDESK_LIBRARY) # Directory where tkdesksh will look for its library scripts: ! SCRIPT_SEARCH_DIR = $(SCRIPT_INSTALL_DIR) # Directory in which to install the program tkdesksh: BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin # Directory where tkdesksh will look for the tkdesk script: ! BIN_SEARCH_DIR = $(BIN_INSTALL_DIR) # Top-level directory in which to install manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man --- 34,46 ---- SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TKDESK_LIBRARY) # Directory where tkdesksh will look for its library scripts: ! SCRIPT_SEARCH_DIR = $(TKDESK_LIBRARY) # Directory in which to install the program tkdesksh: BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin # Directory where tkdesksh will look for the tkdesk script: ! BIN_SEARCH_DIR = $(exec_prefix)/bin # Top-level directory in which to install manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man Only in tkdesk-1.0b5: Makefile.in.orig diff -cr tkdesk-1.0b5.orig/configure tkdesk-1.0b5/configure *** tkdesk-1.0b5.orig/configure Fri Dec 5 19:44:55 1997 --- tkdesk-1.0b5/configure Sat Dec 6 17:26:40 1997 *************** *** 606,619 **** echo $ac_n "checking version of Tcl/Tk""... $ac_c" 1>&6 echo "configure:608: checking version of Tcl/Tk" >&5 echo "$ac_t""$TCL_VERSION/$TK_VERSION" 1>&6 ! if test "$TCL_VERSION" != "7.5" -a "$TCL_VERSION" != "7.6"; then echo echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2. echo Older versions are unlikely to work, while newer ones are not echo yet supported \(but hopefully will be soon\). exit 1 fi ! if test "$TK_VERSION" != "4.1" -a "$TK_VERSION" != "4.2"; then echo echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2. echo Older versions are unlikely to work, while newer ones are not --- 606,621 ---- echo $ac_n "checking version of Tcl/Tk""... $ac_c" 1>&6 echo "configure:608: checking version of Tcl/Tk" >&5 echo "$ac_t""$TCL_VERSION/$TK_VERSION" 1>&6 ! if test "$TCL_VERSION" != "7.5" -a "$TCL_VERSION" != "7.6" \ ! -a "$TCL_VERSION" != "7.5jp" -a "$TCL_VERSION" != "7.6jp" ; then echo echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2. echo Older versions are unlikely to work, while newer ones are not echo yet supported \(but hopefully will be soon\). exit 1 fi ! if test "$TK_VERSION" != "4.1" -a "$TK_VERSION" != "4.2" \ ! -a "$TK_VERSION" != "4.1jp" -a "$TK_VERSION" != "4.2jp"; then echo echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2. echo Older versions are unlikely to work, while newer ones are not Only in tkdesk-1.0b5: configure.orig diff -cr tkdesk-1.0b5.orig/tcldesk/Editor.tcl tkdesk-1.0b5/tcldesk/Editor.tcl *** tkdesk-1.0b5.orig/tcldesk/Editor.tcl Fri Dec 5 19:44:57 1997 --- tkdesk-1.0b5/tcldesk/Editor.tcl Sat Dec 6 17:26:40 1997 *************** *** 266,271 **** --- 266,272 ---- -pad $tkdesk(pad) -width 20 -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 $this.ft -in $this.f1 -fill both -expand yes -pady $tkdesk(pad) *************** *** 1367,1373 **** $menu add command -label $ent \ -command "$entry delete 0 end ;\ $entry insert end \[list $ent\]" \ ! -font [cb_font $tkdesk(font,entries)] } } --- 1368,1375 ---- $menu add command -label $ent \ -command "$entry delete 0 end ;\ $entry insert end \[list $ent\]" \ ! -font [cb_font $tkdesk(font,entries)] \ ! -kanjifont [cb_font $tkdesk(kanjiFont,entries)] } } *************** *** 1578,1583 **** --- 1580,1586 ---- 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 *************** *** 1694,1705 **** global tkdesk if {$what == "default"} { ! $this.ft.text config -font [cb_font $tkdesk(editor,font)] } else { set font [cb_fontSel] if {$font != ""} { if [winfo exists $this.ft.text] { ! $this.ft.text config -font [cb_font $font] } } } --- 1697,1711 ---- global tkdesk if {$what == "default"} { ! $this.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 $this.ft.text] { ! $this.ft.text config -font [cb_font $font] \ ! -kanjifont [cb_font $kfont] } } } diff -cr tkdesk-1.0b5.orig/tcldesk/cb_tools/tools.tcl tkdesk-1.0b5/tcldesk/cb_tools/tools.tcl *** tkdesk-1.0b5.orig/tcldesk/cb_tools/tools.tcl Fri Dec 5 19:44:58 1997 --- tkdesk-1.0b5/tcldesk/cb_tools/tools.tcl Sat Dec 6 17:26:40 1997 *************** *** 37,42 **** --- 37,43 ---- # proc file_executable {file} # proc string_replace {string what with} # proc cb_fontSel {} + # proc cb_kfontSel {} # proc cb_geometry {w} # # ============================================================================= *************** *** 468,473 **** --- 469,489 ---- 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 } # ----------------------------------------------------------------------------- Only in tkdesk-1.0b5/tcldesk/cb_tools: tools.tcl.orig diff -cr tkdesk-1.0b5.orig/tcldesk/config.tcl tkdesk-1.0b5/tcldesk/config.tcl *** tkdesk-1.0b5.orig/tcldesk/config.tcl Fri Dec 5 19:44:57 1997 --- tkdesk-1.0b5/tcldesk/config.tcl Sat Dec 6 17:26:40 1997 *************** *** 257,264 **** 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,mono) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* set tkdesk(num_lbs) 3 set tkdesk(path,images) "$tkdesk(library)/images" --- 257,268 ---- 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,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" *************** *** 413,419 **** --- 417,425 ---- 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)] Only in tkdesk-1.0b5/tcldesk: config.tcl.orig diff -cr tkdesk-1.0b5.orig/tcldesk/configs/System tkdesk-1.0b5/tcldesk/configs/System *** tkdesk-1.0b5.orig/tcldesk/configs/System Fri Dec 5 19:45:03 1997 --- tkdesk-1.0b5/tcldesk/configs/System Sat Dec 6 17:26:40 1997 *************** *** 66,73 **** 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,text) $tkdesk(font,entries) ### A mono-spaced font for table-like output (disk usage etc.): set tkdesk(font,mono) -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* --- 66,76 ---- 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) 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-*-*-*-*-*-*-* *************** *** 175,180 **** --- 178,184 ---- ### 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,print_command) "lpr" set tkdesk(editor,default_geometry) "80x25" set tkdesk(editor,auto_indent) 1 Only in tkdesk-1.0b5/tcldesk/configs: System.orig diff -cr tkdesk-1.0b5.orig/tcldesk/configs/AppBar tkdesk-1.0b5/tcldesk/configs/AppBar *** tkdesk-1.0b5.orig/tcldesk/configs/AppBar Fri Dec 5 19:45:02 1997 --- tkdesk-1.0b5/tcldesk/configs/AppBar Tue Dec 16 23:12:24 1997 *************** *** 95,102 **** ### Command to use for J. Chris Coppick's incoming mail header flasher ### that is brought up by pressing the middle mouse button over the mailbox ### button (set to "" or comment out to disable this feature): ! ! set tkdesk(appbar,mail,headers,cmd) "mailx -H" ### ### Number of seconds to auto-display mail headers when new mail arrives. --- 95,103 ---- ### Command to use for J. Chris Coppick's incoming mail header flasher ### that is brought up by pressing the middle mouse button over the mailbox ### button (set to "" or comment out to disable this feature): ! ### This function is incompatible with Japanese extension:( ! # ! # set tkdesk(appbar,mail,headers,cmd) "mailx -H" ### ### Number of seconds to auto-display mail headers when new mail arrives. diff -cr tkdesk-1.0.orig/tcldesk/cb_tools/bindings.tcl tkdesk-1.0/tcldesk/cb_tools/bindings.tcl *** tkdesk-1.0.orig/tcldesk/cb_tools/bindings.tcl Fri Feb 27 05:21:17 1998 --- tkdesk-1.0/tcldesk/cb_tools/bindings.tcl Fri Feb 27 14:51:00 1998 *************** *** 112,141 **** 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 ^}} --- 112,124 ---- *************** *** 153,185 **** 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 ~; \ --- 136,143 ---- *************** *** 190,197 **** 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 ^}} --- 148,153 ---- *************** *** 279,285 **** [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; \ --- 235,240 ----