First draft of Unicode support in pterm. It's pretty complete: it

[u/mdw/putty] / Recipe

diff --git a/Recipe b/Recipe
index 3e91897..2ec14c7 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -89,23 +89,29 @@
 # line.
 
 # GUI front end and terminal emulator (putty, puttytel).
-GUITERM  = window windlg winctrls terminal sizetip wcwidth unicode
+GUITERM  = window windlg winctrls terminal sizetip wcwidth unicode ldiscucs
          + logging printing winutils
 
 # Non-SSH back ends (putty, puttytel, plink).
 NONSSH   = telnet raw rlogin ldisc
 
 # SSH back end (putty, plink, pscp, psftp).
-SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf noise
-         + sshdh sshcrcda sshpubk pageantc sshzlib sshdss x11fwd portfwd
-         + sshaes sshsh512 sshbn
+SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
+         + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
+         + sshaes sshsh512 sshbn wildcard
+WINSSH   = SSH noise pageantc
+UXSSH    = SSH uxnoise uxagentc
 
 # SFTP implementation (pscp, psftp).
 SFTP     = sftp int64 logging
 
 # Miscellaneous objects appearing in all the network utilities (not
 # Pageant or PuTTYgen).
-MISC     = misc version winstore settings tree234 winnet proxy cmdline
+WINMISC  = misc version winstore settings tree234 winnet proxy cmdline
+UXMISC   = misc version uxstore settings tree234 uxnet proxy cmdline
+
+# Character set library, for use in pterm.
+CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc
 
 # Standard libraries, and the same with WinSocks 1 and 2.
 LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
@@ -116,13 +122,14 @@ LIBS2    = LIBS ws2_32.lib
 # Definitions of actual programs. The program name, followed by a
 # colon, followed by a list of objects. Also in the list may be the
 # keywords [G] for Windows GUI app, [C] for Console app, [X] for
-# X/GTK Unix app.
+# X/GTK Unix app, [U] for command-line Unix app.
 
-putty    : [G] GUITERM NONSSH SSH be_all MISC win_res.res LIBS1
-puttytel : [G] GUITERM NONSSH be_nossh MISC win_res.res LIBS1
-plink    : [C] plink console NONSSH SSH be_all logging MISC plink.res LIBS2
-pscp     : [C] scp console SSH be_none SFTP wildcard MISC scp.res LIBS1
-psftp    : [C] psftp console SSH be_none SFTP MISC scp.res LIBS1
+putty    : [G] GUITERM NONSSH WINSSH be_all WINMISC win_res.res LIBS1
+puttytel : [G] GUITERM NONSSH be_nossh WINMISC win_res.res LIBS1
+plink    : [C] plink console NONSSH WINSSH be_all logging WINMISC
+         + plink.res LIBS2
+pscp     : [C] scp console WINSSH be_none SFTP wildcard WINMISC scp.res LIBS1
+psftp    : [C] psftp console WINSSH be_none SFTP WINMISC scp.res LIBS1
 
 pageant  : [G] pageant sshrsa sshpubk sshdes sshbn sshmd5 version tree234
          + misc sshaes sshsha pageantc sshdss sshsh512 winutils
@@ -132,4 +139,11 @@ puttygen : [G] puttygen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand noise sshsha winstore misc winctrls sshrsa sshdss
          + sshpubk sshaes sshsh512 import winutils puttygen.res LIBS
 
-pterm    : [X] pterm terminal wcwidth unicode uxmisc
+pterm    : [X] pterm terminal wcwidth uxucs uxmisc tree234 misc ldisc ldiscucs
+         + logging uxprint settings pty be_none uxstore signal CHARSET
+
+plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC
+
+PuTTY    : [M] terminal wcwidth tree234 misc ldisc ldiscucs
+         + logging settings be_none mac macdlg macstore macterm macucs
+         + mac_res.rsrc testback