Kernel 0.94

LIB/LIBGUI.S.MOU.txt

@@ -94,7 +94,7 @@ MOU.ReadMouse	>PULLW ZPPtr1
 
 				jsr MOU.CheckOverWND
 				bcc .8
-				rts
+
 				
 .8				clc
 				rts
@@ -145,12 +145,15 @@ MOU.CheckOverSysBut
 				bcs .9
 				jmp SYSBUT.Enter
 				
-.9				jmp SYSBUT.Leave		
+.9				jsr SYSBUT.Leave
+				sec
+				rts
 *--------------------------------------
 MOU.CheckOverWND
 				ldx WND.Stack.Top
 				beq .9
 				
+				lda WND.Stack-1,x
 				>SYSCALL GetMemPtr
 				>STYA ZPWNDPtr
 				
@@ -159,13 +162,102 @@ MOU.CheckOverWND
 				bit #S.WND.F.BORDER
 				beq .1
 				
+				jsr MOU.ChkWNDBorders
+				bcc .99
+				
+.1				lda ZPWNDPtr
+				clc
+				adc #S.OBJ.X1
+				tay
+				lda ZPWNDPtr+1
+				adc #0
+
+				jsr MOU.InRectYA
+				bcs .2
+				
+				lda #CUR.T.WAIT
+				jmp SetCursor
+
+.2				lda #CUR.T.ARROW
+				jmp SetCursor
 				
 				
-				
-.1				
-				
+.8				
 
 .9				sec
+.99				rts
+*--------------------------------------
+MOU.ChkWNDBorders
+				stz IY
+	
+				ldy #S.OBJ.X1
+				lda MouseData+S.MOUSE.X1
+				eor (ZPWNDPtr),y
+				bne .1
+
+				iny
+				lda MouseData+S.MOUSE.X1+1
+				eor (ZPWNDPtr),y
+				bne .1
+
+				lda #CUR.T.RESIZEX
+				sta IY
+				
+.1				ldy #S.OBJ.Y1
+				lda MouseData+S.MOUSE.Y1
+				eor (ZPWNDPtr),y
+				bne .3
+
+				iny
+				lda MouseData+S.MOUSE.Y1+1
+				eor (ZPWNDPtr),y
+				bne .3
+
+				lda IY
+				beq .2
+
+				lda #CUR.T.RESIZEXY1
+				jmp SetCursor
+				
+.2				lda #CUR.T.RESIZEY
+				sta IY
+				
+.3				ldy #S.OBJ.X2
+				lda MouseData+S.MOUSE.X2
+				eor (ZPWNDPtr),y
+				bne .5
+
+				iny
+				lda MouseData+S.MOUSE.X2+1
+				eor (ZPWNDPtr),y
+				bne .5
+				
+				lda IY
+				beq .4
+				
+				lda #CUR.T.RESIZEXY2
+				jmp SetCursor				
+
+.4				lda #CUR.T.RESIZEX
+				sta IY
+
+.5				ldy #S.OBJ.Y2
+				lda MouseData+S.MOUSE.Y2
+				eor (ZPWNDPtr),y
+				bne .7
+
+				iny
+				lda MouseData+S.MOUSE.Y2+1
+				eor (ZPWNDPtr),y
+				bne .7
+
+				lda #CUR.T.RESIZEXY1
+.6				jmp SetCursor
+				
+.7				lda IY
+				bne .6
+
+				sec
 				rts
 *--------------------------------------
 MOU.InRectYA	>STYA ZPRECTPtr

SBIN/GUI.S.txt

@@ -86,17 +86,17 @@ CS.RUN.LOOP		>SLEEP
 .1				bit #S.MOUSE.S.CLK
 				beq .2
 
-				>LDA.G CUR.T
-				inc
-				inc
-				cmp #CUR.T.WAIT+2
-				bne .11
+*				>LDA.G CUR.T
+*				inc
+*				inc
+*				cmp #CUR.T.WAIT+2
+*				bne .11
 
-				lda #CUR.T.ARROW
+*				lda #CUR.T.ARROW
 
-.11				>STA.G CUR.T			
-				>LIBCALL hLIBGUI,LIBGUI.SetCursor
-				jmp CS.RUN.LOOP
+*.11				>STA.G CUR.T			
+*				>LIBCALL hLIBGUI,LIBGUI.SetCursor
+*				jmp CS.RUN.LOOP
 
 .2				bit #S.MOUSE.S.DCLK
 				beq .8