diff --git a/images/apple/PLEIADES-2.21.po b/images/apple/PLEIADES-2.21.po index ecbc5aab..e6f31bbb 100644 Binary files a/images/apple/PLEIADES-2.21.po and b/images/apple/PLEIADES-2.21.po differ diff --git a/src/inc/mouse.plh b/src/inc/mouse.plh index defda2ca..0df8f2fb 100644 --- a/src/inc/mouse.plh +++ b/src/inc/mouse.plh @@ -2,19 +2,23 @@ import mouse // // Status bits // - const BUTTON_DOWN = $80 - const BUTTON_LAST_DOWN = $40 - const MOUSE_MOVED = $20 - const VBL_INT = $08 - const BUTTON_INT = $04 - const MOVE_INT = $02 + const BUTTON_DOWN = $80 + const BUTTON0_DOWN = $80 + const BUTTON_LAST_DOWN = $40 + const BUTTON0_LAST_DOWN = $40 + const MOUSE_MOVED = $20 + const BUTTON1_DOWN = $10 + const VBL_INT = $08 + const BUTTON_INT = $04 + const MOVE_INT = $02 + const BUTTON1_LAST_DOWN = $01 // // Mode bits // - const VBL_INT_ENABLE = $08 - const BUTTON_INT_ENABLE= $04 - const MOVE_INT_ENABLE = $02 - const MOUSE_ENABLE = $01 + const VBL_INT_ENABLE = $08 + const BUTTON_INT_ENABLE = $04 + const MOVE_INT_ENABLE = $02 + const MOUSE_ENABLE = $01 // // Mouse API // diff --git a/src/libsrc/apple/mouse.pla b/src/libsrc/apple/mouse.pla index fe539080..2d906c32 100644 --- a/src/libsrc/apple/mouse.pla +++ b/src/libsrc/apple/mouse.pla @@ -31,7 +31,7 @@ end asm vblEvent INC VBLINT ; INC VBL EVENT + TYA ; MOUSE MOVE OR BUTTON ACTIVE - AND #$82 + AND #$92 end asm bttnEvent EOR LASTBTTN @@ -40,7 +40,7 @@ end asm mouseEvent INC MOUINT ; INC MOUSE EVENT + TYA - AND #$80 + AND #$90 end asm updateBttn STA LASTBTTN