1.1 commit - Added UNICODE support. Added clear command history butto…

…n. Added AltGr support
jsm174 · Feb 7, 2016 · f80c18d · f80c18d
1 parent de39b86
commit f80c18d
Show file tree

Hide file tree

Showing 24 changed files with 1,172 additions and 916 deletions.
diff --git a/AboutDialog.cpp b/AboutDialog.cpp
@@ -27,7 +27,8 @@
  *
  * REVISION HISTORY:
  *
- * 11/05/2005: Initial version                       J. Millard
+ * 11/07/2005: Initial version                       J. Millard
+ * 11/17/2005: Added UNICODE support                 J. Millard
  */
 
 #include "stdafx.h"
@@ -45,11 +46,11 @@ static char THIS_FILE[] = __FILE__;
  */
 
 CAboutDialog::CAboutDialog(CWnd* pParent /*=NULL*/)
-	: CDialog(CAboutDialog::IDD, pParent)
+   : CDialog(CAboutDialog::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(CAboutDialog)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
+   //{{AFX_DATA_INIT(CAboutDialog)
+      // NOTE: the ClassWizard will add member initialization here
+   //}}AFX_DATA_INIT
 }
 
 /**
@@ -58,17 +59,17 @@ CAboutDialog::CAboutDialog(CWnd* pParent /*=NULL*/)
 
 void CAboutDialog::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDialog)
-		// NOTE: the ClassWizard will add DDX and DDV calls here
-	//}}AFX_DATA_MAP
+   CDialog::DoDataExchange(pDX);
+   //{{AFX_DATA_MAP(CAboutDialog)
+      // NOTE: the ClassWizard will add DDX and DDV calls here
+   //}}AFX_DATA_MAP
 }
 
 BEGIN_MESSAGE_MAP(CAboutDialog, CDialog)
-	//{{AFX_MSG_MAP(CAboutDialog)
+   //{{AFX_MSG_MAP(CAboutDialog)
    ON_BN_CLICKED(IDC_VISITWEBSITE_BUTTON, OnVisitWebSiteButton)
-	ON_BN_CLICKED(IDC_CLOSE_BUTTON, OnOK)	
-	//}}AFX_MSG_MAP
+   ON_BN_CLICKED(IDC_CLOSE_BUTTON, OnOK)   
+   //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /**
@@ -77,15 +78,15 @@ END_MESSAGE_MAP()
 
 BOOL CAboutDialog::OnInitDialog() 
 {
-	CDialog::OnInitDialog();
-	
+   CDialog::OnInitDialog();
+   
    SetDlgItemText(
       IDC_ABOUT_TEXT_LINE1, PUTTYCS_ABOUT_TEXT_LINE1 );
 
    SetDlgItemText(
       IDC_ABOUT_TEXT_LINE2, PUTTYCS_ABOUT_TEXT_LINE2 );
-	
-	return TRUE;  
+   
+   return TRUE;  
 }
 
 /**
@@ -94,10 +95,10 @@ BOOL CAboutDialog::OnInitDialog()
 
 void CAboutDialog::OnVisitWebSiteButton() 
 {
-	ShellExecute( NULL, 
-                 "open", 
+   ShellExecute( NULL, 
+                 PUTTYCS_SHELL_EXECUTE_OPEN, 
                  PUTTYCS_URL_HOMEPAGE, 
                  NULL, 
                  NULL, 
-                 SW_SHOWNORMAL );	
+                 SW_SHOWNORMAL );   
 }
diff --git a/AboutDialog.h b/AboutDialog.h
@@ -27,7 +27,8 @@
  *
  * REVISION HISTORY:
  *
- * 11/05/2005: Initial version                       J. Millard
+ * 11/07/2005: Initial version                       J. Millard
+ * 11/17/2005: Added UNICODE support                 J. Millard
  */
 
 #if !defined(AFX_ABOUTDIALOG_H__F0AE1C5B_A002_4323_855F_204A89B2CD5D__INCLUDED_)
@@ -41,31 +42,31 @@ class CAboutDialog : public CDialog
 {
 // Construction
 public:
-	CAboutDialog(CWnd* pParent = NULL);   // standard constructor
+   CAboutDialog(CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
-	//{{AFX_DATA(CAboutDialog)
-	enum { IDD = IDD_ABOUT_DIALOG };
-		// NOTE: the ClassWizard will add data members here
-	//}}AFX_DATA
+   //{{AFX_DATA(CAboutDialog)
+   enum { IDD = IDD_ABOUT_DIALOG };
+      // NOTE: the ClassWizard will add data members here
+   //}}AFX_DATA
 
 
 // Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAboutDialog)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+   // ClassWizard generated virtual function overrides
+   //{{AFX_VIRTUAL(CAboutDialog)
+   protected:
+   virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+   //}}AFX_VIRTUAL
 
 // Implementation
 protected:
 
-	// Generated message map functions
-	//{{AFX_MSG(CAboutDialog)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnVisitWebSiteButton();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+   // Generated message map functions
+   //{{AFX_MSG(CAboutDialog)
+   virtual BOOL OnInitDialog();
+   afx_msg void OnVisitWebSiteButton();
+   //}}AFX_MSG
+   DECLARE_MESSAGE_MAP()
 };
 
 //{{AFX_INSERT_LOCATION}}

diff --git a/Base64.cpp b/Base64.cpp
@@ -30,7 +30,8 @@
  *
  * REVISION HISTORY:
  *
- * 11/05/2005: Initial version                       J. Millard
+ * 11/07/2005: Initial version                       J. Millard
+ * 11/17/2005: Added UNICODE support                 J. Millard
  */
 
 #include "stdafx.h"
@@ -44,7 +45,7 @@ static char THIS_FILE[]=__FILE__;
 #endif
 
 CString CBase64::BASE64_CHARS =
-   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+   _T( "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" );
 
 /**
  * CBase64::encode()
@@ -54,10 +55,10 @@ CString CBase64::encode( CString csBuffer )
 {
    CString csValue = "";
 
-   unsigned char buffer3[3];
-   unsigned char buffer4[4];
+   TCHAR buffer3[3];
+   TCHAR buffer4[4];
 
-   char* bytes = csBuffer.GetBuffer(0);
+   TCHAR* bytes = csBuffer.GetBuffer(0);
    int pos = csBuffer.GetLength();
 
    int i = 0;
@@ -134,8 +135,8 @@ CString CBase64::decode( CString csBuffer )
 {
    CString csValue = "";
 
-   unsigned char buffer4[4];
-   unsigned char buffer3[3];
+   TCHAR buffer4[4];
+   TCHAR buffer3[3];
 
    int pos = csBuffer.GetLength();
    int offset = 0;

diff --git a/Base64.h b/Base64.h
@@ -30,7 +30,8 @@
  *
  * REVISION HISTORY:
  *
- * 11/05/2005: Initial version                       J. Millard
+ * 11/07/2005: Initial version                       J. Millard
+ * 11/17/2005: Added UNICODE support                 J. Millard
  */
 
 #if !defined(AFX_BASE64_H__8D695A8F_54ED_4819_AA0E_33ADC00CDF60__INCLUDED_)
@@ -43,8 +44,8 @@
 class CBase64  
 {
 public:
-	CBase64();
-	virtual ~CBase64();
+   CBase64();
+   virtual ~CBase64();
 
    static CString encode( CString csBuffer );
    static CString decode( CString csBuffer );

diff --git a/Defines.h b/Defines.h
@@ -27,7 +27,10 @@
  *
  * REVISION HISTORY:
  *
- * 11/05/2005: Initial version                       J. Millard
+ * 11/07/2005: Initial version                       J. Millard
+ * 11/17/2005: Added UNICODE support                 J. Millard
+ *             Added command history clear message
+ *             Added AltGr support
  */
 
 #if !defined(DEFINES_H__INCLUDED_)
@@ -37,18 +40,21 @@
 
 #define PUTTYCS_WINDOW_CLASS_PUTTY          _T( "PuTTY" )
 
-#define PUTTYCS_WINDOW_TITLE_TOOL           _T( "PuTTYCS 1.0 - PuTTY Command Sender")
-#define PUTTYCS_WINDOW_TITLE_APP            _T( "PuTTYCS 1.0")
+#define PUTTYCS_WINDOW_TITLE_TOOL           _T( "PuTTYCS 1.1 - PuTTY Command Sender")
+#define PUTTYCS_WINDOW_TITLE_APP            _T( "PuTTYCS 1.1")
 
-#define PUTTYCS_WINDOW_TITLE_ABOUT          _T( "About PuTTYCS 1.0")
+#define PUTTYCS_WINDOW_TITLE_ABOUT          _T( "About PuTTYCS 1.1")
 
-#define PUTTYCS_ABOUT_TEXT_LINE1            _T( "PuTTY Command Sender 1.0" )
+#define PUTTYCS_ABOUT_TEXT_LINE1            _T( "PuTTY Command Sender 1.1" )
 #define PUTTYCS_ABOUT_TEXT_LINE2            _T( "© 2005  Jason Millard. All rights reserved." )
 
 #define PUTTYCS_WINDOW_TITLE_FILTER_ADD     _T( "Add Filter" )
 #define PUTTYCS_WINDOW_TITLE_FILTER_EDIT    _T( "Edit Filter" )
 #define PUTTYCS_WINDOW_TITLE_FILTER_COPY    _T( "Copy Filter" )
+#define PUTTYCS_WINDOW_TITLE_OPEN_SCRIPT    _T( "Open PuTTYCS Script" )
 
+#define PUTTYCS_MESSAGEBOX_CMDHISTORY       _T( "Are you sure you want to\nclear the command history?" )
+
 #define PUTTYCS_URL_HOMEPAGE                _T( "http://www.millardsoftware.com/puttycs/index.php?app=1" )
 
 #define PUTTYCS_FILTER_ALL                  _T( "All PuTTYs||+*")
@@ -85,6 +91,8 @@
 #define PUTTYCS_PREF_ARRANGE_ON_STARTUP     _T( "arrangeOnStartup" )
 #define PUTTYCS_PREF_UNHIDE_ON_EXIT         _T( "unhideOnExit" )
 
+#define PUTTYCS_PREF_USE_ALTGR              _T( "useAltGr" )
+
 #define PUTTYCS_PREF_SEND_CR                _T( "sendCR" )
 
 #define PUTTYCS_SENDKEY_BUTTON_UP           _T( "{UP}" )
@@ -93,8 +101,7 @@
 #define PUTTYCS_SENDKEY_BUTTON_LEFT         _T( "{LEFT}" )
 #define PUTTYCS_SENDKEY_BUTTON_CAPSLOCK     _T( "{CAPSLOCK}" )
 
-#define PUTTYCS_SENDKEY_BUTTON_CLEAR        _T( "^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m" \
-                                                "^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m" ) 
+#define PUTTYCS_SENDKEY_BUTTON_CLEAR        _T( "^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m^m" ) 
 
 #define PUTTYCS_SENDKEY_BUTTON_BREAK        _T( "^c" )
 #define PUTTYCS_SENDKEY_BUTTON_ENDTELNET    _T( "^]" )
@@ -111,25 +118,35 @@
 #define PUTTYCS_SENDKEY_BUTTON_LEFTPAREN    _T( "{LEFTPAREN}" )
 #define PUTTYCS_SENDKEY_BUTTON_RIGHTPAREN   _T( "{RIGHTPAREN}" )
 #define PUTTYCS_SENDKEY_BUTTON_PERCENT      _T( "{PERCENT}" )
+#define PUTTYCS_SENDKEY_BUTTON_ALTGR        _T( "%^" )
 
 #define PUTTYCS_SENDKEY_DELAY_0             _T( "{DELAY=0}" )
 
-#define PUTTYCS_SENDKEY_CHAR_PLUS           '+'
-#define PUTTYCS_SENDKEY_CHAR_AT             '@'
-#define PUTTYCS_SENDKEY_CHAR_CARET          '^'
-#define PUTTYCS_SENDKEY_CHAR_TILDE          '~'
-#define PUTTYCS_SENDKEY_CHAR_LEFTBRACE      '{'
-#define PUTTYCS_SENDKEY_CHAR_RIGHTBRACE     '}'
-#define PUTTYCS_SENDKEY_CHAR_LEFTPAREN      '('
-#define PUTTYCS_SENDKEY_CHAR_RIGHTPAREN     ')'
-#define PUTTYCS_SENDKEY_CHAR_PERCENT        '%'
+#define PUTTYCS_SENDKEY_CHAR_PLUS           _T( '+' )
+#define PUTTYCS_SENDKEY_CHAR_TILDE          _T( '~' )
+#define PUTTYCS_SENDKEY_CHAR_LEFTBRACE      _T( '{' )
+#define PUTTYCS_SENDKEY_CHAR_CARET          _T( '^' )
+#define PUTTYCS_SENDKEY_CHAR_AT             _T( '@' )
+#define PUTTYCS_SENDKEY_CHAR_RIGHTBRACE     _T( '}' )
+#define PUTTYCS_SENDKEY_CHAR_LEFTPAREN      _T( '(' )
+#define PUTTYCS_SENDKEY_CHAR_RIGHTPAREN     _T( ')' )
+#define PUTTYCS_SENDKEY_CHAR_PERCENT        _T( '%' )
+#define PUTTYCS_SENDKEY_CHAR_RIGHTPAREN     _T( ')' )
 
-#define PUTTYCS_CASCADE_DIMENSION_WIDTH     600
-#define PUTTYCS_CASCADE_DIMENSION_HEIGHT    400
+#define PUTTYCS_ALTGR_KEYS                  _T( "~#{[|`^@]}€" )
 
 #define PUTTYCS_SCRIPT_FILETYPE             _T( "PuTTYCS Scripts (*.pcs)|*.pcs||" )
 
-#define PUTTYCS_WILDCMP_WILDCARD            '*'
-#define PUTTYCS_WILDCMP_ANYCHAR             '?'
+#define PUTTYCS_WILDCMP_WILDCARD            _T( '*' )
+#define PUTTYCS_WILDCMP_ANYCHAR             _T( '?' )
+
+#define PUTTYCS_SHELL_EXECUTE_OPEN          _T( "open" )
+
+#define PUTTYCS_FILE_MODE_READ              _T( "r" )
+
+#define PUTTYCS_EMPTY_STRING                _T( "" )
+
+#define PUTTYCS_CASCADE_DIMENSION_WIDTH     600
+#define PUTTYCS_CASCADE_DIMENSION_HEIGHT    400
 
 #endif // !defined(DEFINES_H__INCLUDED_)