added JIS keyboard support

macssh/source/Screens/vskeys.h

@@ -68,26 +68,32 @@
 #define VSKP    145     /* Keypad . */
 #define VSKE    146     /* Keypad Enter */
 
-#define VSPF1    147     /* Function 1 */			/* Mac Keypad Clear */	
+#define VSPF1   147     /* Function 1 */			/* Mac Keypad Clear */	
-#define VSPF2    148     /* Function 2 */			/* Mac Keypad = */	
+#define VSPF2   148     /* Function 2 */			/* Mac Keypad = */	
-#define VSPF3    149     /* Function 3 */			/* Mac Keypad / */	
+#define VSPF3   149     /* Function 3 */			/* Mac Keypad / */	
-#define VSPF4    150     /* Function 4 */			/* Mac Keypad * */	
+#define VSPF4   150     /* Function 4 */			/* Mac Keypad * */	
+
+#define VSJPBKS 151     /* backslash on japanese keyboard */
+#define VSJPUND 152     /* underscore on japanese keyboard */
 
 
 #ifdef VSMASTER
-char VSIkpxlate[2][23] =
+char VSIkpxlate[2][25] =
-	{	"ABCD0123456789,-.\15PQRS",
+	{
-		"ABCDpqrstuvwxylmnMPQRS"
+		"ABCD0123456789,-.\15PQRS\\_",
+		//"ABCDpqrstuvwxylmnMPQRS\\_"
+		"ABCD0123456789,-.\15PQRS|_"
 	};
-char VSIkpxlate2[] = "222122?2?3?3?2?3?3123425161";		/* BYU 2.4.12 */
+//char VSIkpxlate2[] = "222122?2?3?3?2?3?3123425161";		/* BYU 2.4.12 */
-char VSIkpxlate3[] = "134956?9?2?3?8?1?4~~~~0~8~7";		/* BYU 2.4.12 */
+//char VSIkpxlate3[] = "134956?9?2?3?8?1?4~~~~0~8~7";		/* BYU 2.4.12 */
-unsigned char VSIkplen[] = 								/* BYU 2.4.12 */
+//unsigned char VSIkplen[] = 								/* BYU 2.4.12 */
-	{ 5,5,5,5,5,5,5,5,5,5,								/* BYU 2.4.12 */
+//	{ 5,5,5,5,5,5,5,5,5,5,								/* BYU 2.4.12 */
-	  5,5,5,5,5,5,5,5,4,4,								/* BYU 2.4.12 */
+//	  5,5,5,5,5,5,5,5,4,4,								/* BYU 2.4.12 */
-	  4,4,5,4,5,4,5 };									/* BYU 2.4.12 */
+//	  4,4,5,4,5,4,5 };									/* BYU 2.4.12 */
 #else
-extern char *VSIkpxlate,*VSIkpxlate2,*VSIkpxlate2;		/* BYU 2.4.12 */
+extern char *VSIkpxlate;
-extern unsigned char *VSIkplen;							/* BYU 2.4.12 */
+//extern char *VSIkpxlate2:
+//extern unsigned char *VSIkplen;							/* BYU 2.4.12 */
 #endif
 
 /*
@@ -111,9 +117,8 @@ extern unsigned char *VSIkplen;							/* BYU 2.4.12 */
  *			15	- 0x008000 - use ansi background color
  *			16	- 0x010000 - use 2nd ansi foreground color
  *			17	- 0x020000 - use 2nd ansi background color
- *			18	- 0x040000 - has first character in high byte
+ *			18	- 0x040000 - next character is part of multi-byte
  *
- *          8 higher bits: second character in multibyte mode
  */
 
 /* character attributes */

macssh/source/main/event.c

@@ -54,6 +54,13 @@
 #include "movableModal.h"
 #include <Script.h> // for EMACS meta hack
 #include <Icons.h> //For Notify User Icon Stuff
+
+#include <Gestalt.h>
+#include <OSUtils.h>
+#include <Traps.h>
+#include <LowMem.h>
+
+
 extern short		scrn;
 extern MenuHandle	myMenus[NMENUS];
 extern Boolean		gKeyboardHasControlKey;
@@ -69,6 +76,8 @@ extern void VSdump(char *p, int len);
 static gHaveInstalledNotification = 0;
 NMRec *nRecPtr;
 
+OSType	gKeyboardLayoutType = kKeyboardUnknown;
+
 extern int gMovableModal;
 
 #include "event.proto.h"
@@ -76,6 +85,12 @@ extern int gMovableModal;
 extern void syslog( int priority, const char *format, ...);
 extern long dumpln( long base, char *dest, void *src, long len );
 
+
+Boolean IsKBGetLayoutTypeAvailable(void);
+
+OSType GetKeyboardLayoutType(short deviceID);
+
+
 // BetterTelnet 2.0fc1 - integrated DJ's changes for real blink (if you want it :-)
 /* DJ: Blink global */
 short				gBlink = 0;
@@ -127,8 +142,8 @@ unsigned char kpxlate[2][62] =
 		0,		/* $5A */
 		VSK8,	/* $5B */
 		VSK9,	/* $5C */
-		0,		/* $5D */
+		VSJPBKS,/* $5D */	/* '\' on japanese keyboard */
-		0,		/* $5E */
+		VSJPUND,/* $5E */	/* '_' on japanese keyboard */
 		VSF5,	/* $5F */
 		VSF10,	/* $60 */	/* BYU 2.4.12 */
 		VSF11,	/* $61 */	/* BYU 2.4.12 */
@@ -191,8 +206,8 @@ unsigned char kpxlate[2][62] =
 		0,		/* $5A */
 		VSK8,	/* $5B */
 		VSK9,	/* $5C */
-		0,		/* $5D */
+		VSJPBKS,/* $5D */	/* '\' on japanese keyboard */
-		0,		/* $5E */
+		VSJPUND,/* $5E */	/* '_' on japanese keyboard */
 		VSF5,		/* $5F */
 		VSF10,	/* $60 */	/* BYU 2.4.12 */
 		VSF11,	/* $61 */	/* BYU 2.4.12 */
@@ -434,6 +449,21 @@ void HandleKeyDown(EventRecord theEvent,struct WindRec *tw)
 	else if ( controldown && shifted && ascii == '6' )
 		ascii = 0x1e;					// fix bad KCHR control-^
 
+	if ( controldown && !commanddown && gKeyboardLayoutType == kKeyboardJIS ) {
+		if ( code == 0x5d ) {	// '\'
+			ascii = 0x1c;
+			code = 0;
+		} else if ( code == 0x5e ) {	// '_'
+			ascii = 0x1f;
+			code = 0;
+		} else if ( code == 0x21 )	// '@'
+			ascii = 0;
+		else if ( code == 0x1e )	// '['
+			ascii = 0x1b;
+		else if ( code == 0x2a )	// ']'
+			ascii = 0x1d;
+	}
+
 	if ( commanddown ) {
 		if (gApplicationPrefs->CommandKeys) {
 			//if optioned, retranslate so we can do menu commands
@@ -505,10 +535,10 @@ emacsHack:
 	if ((TelInfo->numwindows < 1) || (tw->active != CNXN_ACTIVE)) 
 		return;
 
+	if ( (ascii == '@' || ascii == 32) && controldown ) //this, along with the fixed KCHR that mapps a Cntl-@ to
+		ascii = 0;	// a @, takes care of Apple not posting NULL key values
+
 
-	if (((ascii == '@') || (ascii == 32))&& controldown) //this, along with the fixed KCHR that mapps a Cntl-@ to
-		ascii = NULL;				 //a @, takes care of Apple not posting NULL key values
-	
 	//	map '`' to ESC if needed
 	if (ascii == '`' && gApplicationPrefs->RemapTilde && !commanddown)
 		ascii = ESC;
@@ -899,12 +929,92 @@ static Boolean haveChangedKCHR;
 //called at startup to figure out the default roman KCHR and the active script
 void scriptKbdInit(void)
 {
+	long	response;
+
 	currentScript = GetScriptManagerVariable(smKeyScript);//get active script
 	defaultKCHR = GetScriptVariable(smRoman, smScriptKeys); //get the smRoman default KCHR
 	mungeCount = GetScriptManagerVariable(smMunged); //Get the mungeCount
 	haveChangedKCHR = FALSE;
+#if GENERATINGPOWERPC
+	gKeyboardLayoutType = GetKeyboardLayoutType(LMGetKbdType());
+#endif
 }
 
+#if GENERATINGPOWERPC
+/*  Returns the keyboard layout type.  */
+
+OSType GetKeyboardLayoutType(short deviceID)
+{
+    OSType keyboardLayoutType;
+
+    switch (deviceID) {
+        case 0x01:
+        case 0x02:
+        case 0x03:
+        case 0x06:
+        case 0x08:
+        case 0x0C:
+        case 0x10:
+        case 0x18:
+        case 0x1B:
+        case 0x1C:
+        case 0xC0:
+        case 0xC3:
+        case 0xC6:
+            keyboardLayoutType = kKeyboardANSI;
+            break;
+        case 0x12:
+        case 0x15:
+        case 0x16:
+        case 0x17:
+        case 0x1A:
+        case 0x1E:
+        case 0xC2:
+        case 0xC5:
+        case 0xC8:
+        case 0xC9:
+        case 0xCE:
+            keyboardLayoutType = kKeyboardJIS;
+            break;
+        case 0x04:
+        case 0x05:
+        case 0x07:
+        case 0x09:
+        case 0x0D:
+        case 0x11:
+        case 0x14:
+        case 0x19:
+        case 0x1D:
+        case 0xC1:
+        case 0xC4:
+        case 0xC7:
+            keyboardLayoutType = kKeyboardISO;
+            break;
+        default:
+            if (IsKBGetLayoutTypeAvailable ())
+                keyboardLayoutType = KBGetLayoutType (deviceID);
+            else
+                keyboardLayoutType = kKeyboardUnknown;
+            break;
+    }
+    return keyboardLayoutType;
+}
+
+/*  Returns true if KBGetLayoutType is available.  */
+
+Boolean IsKBGetLayoutTypeAvailable(void)
+{
+    long response;
+
+    if (Gestalt (gestaltKeyboardsLib, &response) == noErr)
+        return true;
+    else
+        return false;
+}
+
+#endif
+
+
 void SetDefaultKCHR(void)
 {
 	if (haveChangedKCHR)

macssh/source/main/event.h

@@ -11,3 +11,43 @@ extern unsigned char kpxlate[2][62];
 
 #define DELchar		0x7f	/* BYU LSC - (DEL is defined in MacLook.h) the delete character */
 #define	KILLCHAR	0x15	/* the character to kill the local line with */
+
+#ifndef __MACTYPES__
+#include <MacTypes.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if ! defined (__KEYBOARDS__)
+
+enum {
+    gestaltKeyboardsLib = FOUR_CHAR_CODE('kbds')     /* Keyboards library */
+};
+
+enum
+{
+    kKeyboardJIS     = 'JIS ',
+    kKeyboardANSI    = 'ANSI',
+    kKeyboardISO     = 'ISO ',
+    kKeyboardUnknown = '????'
+};
+
+enum
+{
+    _KeyboardDispatch = 0xAA7A
+};
+
+#pragma import on
+extern pascal OSType KBGetLayoutType (short deviceID)
+ THREEWORDINLINE(0x303C, 0x0007, _KeyboardDispatch);
+#pragma import off
+
+#endif
+
+OSType GetKeyboardLayoutType (short deviceID);
+
+#ifdef __cplusplus
+}
+#endif