Kernel 0.9.1 : GUI, debugging....

DRV/DHGR.DRV.S.BLT.txt

@@ -58,13 +58,18 @@ BITBLT			>LDYA CB.CACHE+S.CB.SrcPtr
 				sta ZPBMMaskPtr+1
 				
 				lda CB.Cache+S.CB.X1
+				pha
 				and #7					we have to shift right!!!
 				tax
+				pla
+				
+				lsr CB.Cache+S.CB.X1+1
+				ror
+				lsr CB.Cache+S.CB.X1+1
+				ror
+				lsr CB.Cache+S.CB.X1+1
+				ror
 				
-				lda CB.Cache+S.CB.X1+1
-				lsr
-				lsr
-				lsr
 				pha
 				clc
 				adc ZPBMDataPtr

DRV/DHGR.DRV.S.PIX.txt

@@ -51,7 +51,8 @@ SETPIXEL.MONO	ldx CB.Cache+S.CB.X1+1	Get X Hi byte....
 .2				ldy $ffff,x				MOD7 : x = X.LO, y = X MOD 7		
 
 				lda CB.Cache+S.CB.OP
-				beq .5
+				
+				bne .5
 				
 				lda (ZPBasePtr)			XOR
 				eor Mono.Masks,y		y = mod 7
@@ -83,8 +84,9 @@ SETPIXEL.C16	lda CB.Cache+S.CB.X1
 				asl						times 2  (range 0->38)
 				
 				ldx CB.Cache+S.CB.Y1
+*				clc				
 				adc BASEL,x				setup line Base Ptr (cc by asl)
-				sta ZPBasePtr				ZPBasePtr now point to first of...
+				sta ZPBasePtr			ZPBasePtr now point to first of...
 				lda BASEH,x
 				sta ZPBasePtr+1			...the 4 columns
 

DRV/MOUSE.DRV.S.txt

@@ -88,21 +88,8 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				bne .3
 				dex
 				bpl .2
-				bra .4
 				
-.3				inc ZPTmpPtr1+1			no match, try next slot....
 				lda ZPTmpPtr1+1
-				cmp #$C8
-				bne .1	
-				
-				>LDYA L.MSG.DETECT.KO
-				>SYSCALL PrintF.YA
-
-				lda #MLI.E.NODEV
-				sec
-				rts	
-				
-.4				lda ZPTmpPtr1+1
 				sta DEVSLOTCn
 				and #$0F
 				sta DEVSLOT0n
@@ -119,9 +106,22 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				>SYSCALL PrintF.YA
 				clc
 				rts
+				
+.3				inc ZPTmpPtr1+1			no match, try next slot....
+				lda ZPTmpPtr1+1
+				cmp #$C8
+				bne .1	
+				
+				>LDYA L.MSG.DETECT.KO
+				>SYSCALL PrintF.YA
+
+				lda #MLI.E.NODEV
+				sec
+				rts	
+				
 *--------------------------------------
 CS.END
-MSG.DETECT		>CSTR "Apple Mouse Card/IIc Mouse Driver.\r\n"
+MSG.DETECT		>CSTR "Apple Mouse Driver.\r\n"
 MSG.DETECT.OK	>CSTR "Mouse Installed As Device : %s\r\n"
 MSG.DETECT.KO	>CSTR "No Mouse Found.\r\n"
 DEVSIG.Offset	.HS 05070B0CFB
@@ -202,7 +202,7 @@ READBLOCK		>STYA ZPTmpPtr1
 				
 				iny
 				lda MOUSEYLOx,x
-				sta  (ZPTmpPtr1),y
+				sta (ZPTmpPtr1),y
 				
 				iny
 				lda MOUSEYHIx,x

INC/LIBGUI.I.txt

@@ -15,9 +15,9 @@ S.CB.CMD.FILLRECT		.EQ 8
 S.CB.CMD.BITBLT			.EQ 10
 S.CB.CMD.DRAWLINE		.EQ 12
 S.CB.OP				.EQ 1
+S.CB.OP.XOR				.EQ	%00000000	screen EOR bitmap -> Screen
 S.CB.OP.SET				.EQ %00000001	replace screen with bitmap
 S.CB.OP.ORA				.EQ	%00000010	combine screen & bitmap -> Screen
-S.CB.OP.XOR				.EQ	%00000011	screen EOR bitmap -> Screen
 S.CB.OP.SAVE			.EQ	%00010000	Save Screen to DstPtr before painting
 S.CB.OP.AND				.EQ %00100000	Apply BitMap mask before painting
 S.CB.OP.COLOR			.EQ %01000000	Assume BitMap is COLOR

SBIN/GUI.S.txt

@@ -310,7 +310,7 @@ DrawLines.CB	.DA	#S.CB.CMD.DRAWLINE
 				.DA 191+191
 
 				.DA	#S.CB.CMD.DRAWLINE
-				.DA #S.CB.OP.ORA	
+				.DA #S.CB.OP.XOR	
 				.DA #S.CB.MODE.MONO
 				.DA #1
 				.DA 90
@@ -329,8 +329,8 @@ DrawLines.CB	.DA	#S.CB.CMD.DRAWLINE
 
 				.DA	#S.CB.CMD.DRAWLINE
 				.DA #S.CB.OP.ORA	
-				.DA #S.CB.MODE.MONO
-				.DA #1
+				.DA #S.CB.MODE.C16
+				.DA #15
 				.DA 110
 				.DA 0
 				.DA 559