Merge trunk -> dgg

branches/dgg/Source/ansi.asm

@@ -134,7 +134,7 @@ ANSI_LF:
 	LD	E,A		; LINES TO SCROLL -> E
 	LD	B,BF_VDASCR
 	CALL	EMU_VDADISP	; DO THE SCROLLING
-	LD	A,23		; ROW 23
+	LD	A,23		; ROW 24
 	LD	(ANSI_ROW),A	; IS NOW CORRECT
 	JR	ANSI_XY		; RESPOSITION CURSOR AND RETURN
 ;

branches/dgg/Source/kbd.asm

@@ -413,6 +413,13 @@ KBD_DEC1:	; PROCESS NEXT SCANCODE
 	LD	(KBD_SCANCODE),A	; SAVE SCANCODE
 
 KBD_DEC2:	; DETECT AND HANDLE SPECIAL KEYCODES
+;
+; KEYBOARD INSERTION DETECTION HAS BEEN REMOVED BELOW BECAUSE THE SCAN CODE
+; OF $AA IS AMBIGUOUS WHEN SCAN SET 2 IS IN USE.  $AA COULD MEAN EITHER A LEFT
+; SHIFT KEY BREAK EVENT OR A KEYBOARD INSERTION EVENT.  OBVIOUSLY, A SHIFT BREAK
+; EVENT CANNOT BE ALLOWED TO TRIGGER A KEYBOARD RESET, SO WE CANNOT INTERPRET
+; $AA AS A KEYBOARD INSERTION.  UNFORTUNATE, BUT IS SEE NO ALTERNATIVES.
+;
 ;	LD	A,(KBD_SCANCODE)	; GET THE CURRENT SCANCODE
 ;	CP	$AA			; KEYBOARD INSERTION?
 ;	JR	NZ,KBD_DEC3		; NOPE, BYPASS

branches/dgg/Source/util.asm

@@ -393,13 +393,13 @@ MULT8_NOADD:
 ;
 #IF (DSKYENABLE)
 ;
-;    ____C0______C1______C2______C3__
-;B5 |	20 D	60 E	A0 F	E0 BO
-;B4 |	10 A	50 B	90 C	D0 GO
-;B3 |	08 7	48 8	88 9	C8 EX
-;B2 |	04 4	44 5	84 6	C4 DE
-;B1 |	02 1	42 2	82 3	C2 EN
-;B0 |	01 FW	41 0	81 BK	C1 CL
+;    _____C0______C1______C2______C3__
+;B5 |	$20 D	$60 E	$A0 F	$E0 BO
+;B4 |	$10 A	$50 B	$90 C	$D0 GO
+;B3 |	$08 7	$48 8	$88 9	$C8 EX
+;B2 |	$04 4	$44 5	$84 6	$C4 DE
+;B1 |	$02 1	$42 2	$82 3	$C2 EN
+;B0 |	$01 FW	$41 0	$81 BK	$C1 CL
 ;
 KY_0	.EQU	000H
 KY_1	.EQU	001H