diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index 2f8652e6..c41b593f 100644 Binary files a/A2OSX.BOOT.po and b/A2OSX.BOOT.po differ diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index fd5508ca..27ddd430 100644 Binary files a/A2OSX.SRC.po and b/A2OSX.SRC.po differ diff --git a/A2osX.STARTUP.txt b/A2osX.STARTUP.txt index 7fa3e415..cca2b627 100644 --- a/A2osX.STARTUP.txt +++ b/A2osX.STARTUP.txt @@ -31,7 +31,7 @@ STARTPROC DHCPCLNT # GUI Section INSDRV DHGR.DRV INSDRV MOUSE.DRV -STARTPROC DESKTOP +#STARTPROC DESKTOP # End GUI Section ECHO *** End A2osX Startup file *** MAN diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index 51732d05..53bb0239 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -261,7 +261,7 @@ SETPIXEL >STYA ZPBase lda ZPCtrlBlk+4 bit #%00000100 bne .7 - +*-----B&W ----------------------------- ldx ZPCtrlBlk+1 X.HI lda DIV7.hi,x sta .2+2 @@ -274,13 +274,12 @@ SETPIXEL >STYA ZPBase ldx ZPCtrlBlk X.LO .2 lda DIV7.0,x A=Col*2+AuxBit + eor #1 toggle last bit : 0=Aux, 1=Main lsr .3+1 reset CLRPAGE2 address lsr CS=Aux rol .3+1 if CS, -> SETPAGE2 - .3 sta CLRPAGE2 - ldy ZPCtrlBlk+2 Y.LO adc BASEL,y setup line Base Ptr (A=Col) sta ZPBase lda BASEH,y @@ -310,9 +309,9 @@ SETPIXEL >STYA ZPBase .6 and #$7F switch back this byte to mono ora Mono.Masks,y sta (ZPBase) - sta CLR80STORE + sta CLR80STORE rts - +*-----16 Colors ----------------------- .7 lda ZPCtrlBlk X.LO lsr ZPCtrlBlk+1 divide by 4 ror diff --git a/DRV/DHGR.DRV.T.txt b/DRV/DHGR.DRV.T.txt index f2817bb8..b1bc6acf 100644 --- a/DRV/DHGR.DRV.T.txt +++ b/DRV/DHGR.DRV.T.txt @@ -68,48 +68,48 @@ Color.Pixels .DA #%00000000,#%00000000,#%00000000,#%00000000 black (color bit di *-------------------------------------- * COL*2+AUX Bit *-------------------------------------- -DIV7.0 .HS 0101010101010100000000000000 - .HS 0303030303030302020202020202 - .HS 0505050505050504040404040404 - .HS 0707070707070706060606060606 - .HS 0909090909090908080808080808 - .HS 0B0B0B0B0B0B0B0A0A0A0A0A0A0A - .HS 0D0D0D0D0D0D0D0C0C0C0C0C0C0C - .HS 0F0F0F0F0F0F0F0E0E0E0E0E0E0E - .HS 1111111111111110101010101010 - .HS 1313131313131312121212121212 - .HS 1515151515151514141414141414 - .HS 1717171717171716161616161616 - .HS 1919191919191918181818181818 - .HS 1B1B1B1B1B1B1B1A1A1A1A1A1A1A - .HS 1D1D1D1D1D1D1D1C1C1C1C1C1C1C - .HS 1F1F1F1F1F1F1F1E1E1E1E1E1E1E - .HS 2121212121212120202020202020 - .HS 2323232323232322222222222222 - .HS 25252525 -DIV7.256 .HS 25252524242424242424 - .HS 2727272727272726262626262626 - .HS 2929292929292928282828282828 - .HS 2B2B2B2B2B2B2B2A2A2A2A2A2A2A - .HS 2D2D2D2D2D2D2D2C2C2C2C2C2C2C - .HS 2F2F2F2F2F2F2F2E2E2E2E2E2E2E - .HS 3131313131313130303030303030 - .HS 3333333333333332323232323232 - .HS 3535353535353534343434343434 - .HS 3737373737373736363636363636 - .HS 3939393939393938383838383838 - .HS 3B3B3B3B3B3B3B3A3A3A3A3A3A3A - .HS 3D3D3D3D3D3D3D3C3C3C3C3C3C3C - .HS 3F3F3F3F3F3F3F3E3E3E3E3E3E3E - .HS 4141414141414140404040404040 - .HS 4343434343434342424242424242 - .HS 4545454545454544444444444444 - .HS 4747474747474746464646464646 - .HS 4949494949494948 -DIV7.512 .HS 484848484848 - .HS 4B4B4B4B4B4B4B4A4A4A4A4A4A4A - .HS 4D4D4D4D4D4D4D4C4C4C4C4C4C4C - .HS 4F4F4F4F4F4F4F4E4E4E4E4E4E4E +DIV7.0 .HS 0000000000000001010101010101 + .HS 0202020202020203030303030303 + .HS 0404040404040405050505050505 + .HS 0606060606060607070707070707 + .HS 0808080808080809090909090909 + .HS 0A0A0A0A0A0A0A0B0B0B0B0B0B0B + .HS 0C0C0C0C0C0C0C0D0D0D0D0D0D0D + .HS 0E0E0E0E0E0E0E0F0F0F0F0F0F0F + .HS 1010101010101011111111111111 + .HS 1212121212121213131313131313 + .HS 1414141414141415151515151515 + .HS 1616161616161617171717171717 + .HS 1818181818181819191919191919 + .HS 1A1A1A1A1A1A1A1B1B1B1B1B1B1B + .HS 1C1C1C1C1C1C1C1D1D1D1D1D1D1D + .HS 1E1E1E1E1E1E1E1F1F1F1F1F1F1F + .HS 2020202020202021212121212121 + .HS 2222222222222223232323232323 + .HS 24242424 +DIV7.256 .HS 24242425252525252525 + .HS 2626262626262627272727272727 + .HS 2828282828282829292929292929 + .HS 2A2A2A2A2A2A2A2B2B2B2B2B2B2B + .HS 2C2C2C2C2C2C2C2D2D2D2D2D2D2D + .HS 2E2E2E2E2E2E2E2F2F2F2F2F2F2F + .HS 3030303030303031313131313131 + .HS 3232323232323233333333333333 + .HS 3434343434343435353535353535 + .HS 3636363636363637373737373737 + .HS 3838383838383839393939393939 + .HS 3A3A3A3A3A3A3A3B3B3B3B3B3B3B + .HS 3C3C3C3C3C3C3C3D3D3D3D3D3D3D + .HS 3E3E3E3E3E3E3E3F3F3F3F3F3F3F + .HS 4040404040404041414141414141 + .HS 4242424242424243434343434343 + .HS 4444444444444445454545454545 + .HS 4646464646464647474747474747 + .HS 4848484848484849 +DIV7.512 .HS 494949494949 + .HS 4A4A4A4A4A4A4A4B4B4B4B4B4B4B + .HS 4C4C4C4C4C4C4C4D4D4D4D4D4D4D + .HS 4E4E4E4E4E4E4E4F4F4F4F4F4F4F *-------------------------------------- MOD7.0 .HS 00 MOD7.512 .HS 010203 diff --git a/SBIN/DESKTOP.S.txt b/SBIN/DESKTOP.S.txt index c0ab6118..abe76ec0 100644 --- a/SBIN/DESKTOP.S.txt +++ b/SBIN/DESKTOP.S.txt @@ -8,6 +8,7 @@ AUTO 6 .OR $2000 .TF /A2OSX.BOOT/SBIN/DESKTOP *-------------------------------------- + .INB INC/IO.I .INB INC/MACROS.I .INB INC/A2OSX.I .INB INC/LIBGFX.I @@ -104,8 +105,14 @@ CS.INIT >LDYA L.MSG.INIT CS.RUN clc rts *-------------------------------------- -CS.DOEVENT lda hDevMouse Mouse is active ? - beq .1 go check KB +CS.DOEVENT lda KBD + bpl .1 + sta KBDSTROBE + + jsr Destop.Paint + +.1 lda hDevMouse Mouse is active ? + beq .99 go check KB ldy #S.EVT.hDEV cmp (pEvent),y Event coming from Mouse ? @@ -145,22 +152,6 @@ CS.DOEVENT lda hDevMouse Mouse is active ? .98 clc rts -.1 lda (pEvent) - cmp #S.EVT.F.KEY - bne .99 - - ldy #S.EVT.DATAHI - lda (pEvent),y - bne .99 Open Apple ? - - lda A2osX.ASCREEN - cmp #3 - bne .98 - - jsr Destop.Paint - clc - rts - .99 sec rts *--------------------------------------