Use (CHARCODE Meta,0) instead of \KEYBOARD.META in LLKEY (#2094)
This commit is contained in:
parent
6f44e39101
commit
3f5496f593
@ -1,12 +1,13 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
(FILECREATED "13-Feb-2025 08:22:19" {WMEDLEY}<sources>LLKEY.;8 199508
|
||||
(FILECREATED " 4-Apr-2025 17:10:10" {WMEDLEY}<sources>LLKEY.;11 199518
|
||||
|
||||
:EDIT-BY rmk
|
||||
|
||||
:CHANGES-TO (VARS \KEYNAMES \MAIKOKEYACTIONS)
|
||||
:CHANGES-TO (VARS LLKEYCOMS)
|
||||
(FNS \DECODETRANSITION)
|
||||
|
||||
:PREVIOUS-DATE "12-Feb-2025 22:40:39" {WMEDLEY}<sources>LLKEY.;7)
|
||||
:PREVIOUS-DATE "13-Feb-2025 08:22:19" {WMEDLEY}<sources>LLKEY.;8)
|
||||
|
||||
|
||||
(PRETTYCOMPRINT LLKEYCOMS)
|
||||
@ -36,7 +37,7 @@
|
||||
(SHIFTXORLOCKFLG NIL))
|
||||
(DECLARE%: DONTEVAL@LOAD DOCOPY (P (\KEYBOARDINIT)))
|
||||
[DECLARE%: DONTCOPY (MACROS .NOTELASTUSERACTION)
|
||||
(CONSTANTS ALLUP \CTRLMASK \METABIT)
|
||||
(CONSTANTS ALLUP \CTRLMASK)
|
||||
(CONSTANTS * DLMOUSEBITS)
|
||||
(CONSTANTS * DLMOUSESTATES)
|
||||
(CONSTANTS * TRANSITIONFLAGS)
|
||||
@ -60,15 +61,14 @@
|
||||
\DOVEKEYACTIONS \DOVEOSDKEYACTIONS \MAIKOKEYACTIONS \MAIKOKEYACTIONST4
|
||||
\MAIKO-JLE-KEYACTIONS \TOSHIBA-KEYACTIONS)
|
||||
(VARS (KEYBOARD.APPLICATION-SPECIFIC-KEYACTIONS NIL))
|
||||
(INITVARS (\KEYBOARD.META 256)
|
||||
(\MODIFIED.KEYACTIONS))
|
||||
(INITVARS (\MODIFIED.KEYACTIONS))
|
||||
(DECLARE%: EVAL@COMPILE (ADDVARS (GLOBALVARS \RCLKSECOND \LASTUSERACTION \LASTKEYSTATE)
|
||||
))
|
||||
(GLOBALVARS \SYSBUFFER \LONGSYSBUF \INTERRUPTSTATE \MODIFIED.KEYACTIONS
|
||||
\MOUSECHORDTICKS \KEYBOARDEVENTQUEUE \KEYBUFFERING \CURRENTKEYACTION
|
||||
\COMMANDKEYACTION \DEFAULTKEYACTION \TIMER.INTERRUPT.PENDING \ORIGKEYACTIONS
|
||||
\KEYBOARD.META \MOUSECHORDMILLISECONDS \DORADOKEYACTIONS \DLIONKEYACTIONS
|
||||
\DLIONOSDKEYACTIONS \DOVEKEYACTIONS \DOVEOSDKEYACTIONS SHIFTXORLOCKFLG))
|
||||
\MOUSECHORDMILLISECONDS \DORADOKEYACTIONS \DLIONKEYACTIONS \DLIONOSDKEYACTIONS
|
||||
\DOVEKEYACTIONS \DOVEOSDKEYACTIONS SHIFTXORLOCKFLG))
|
||||
(COMS (* ; "Key interpretation")
|
||||
(FNS KEYACTION KEYACTIONTABLE KEYBOARDTYPE RESETKEYACTION
|
||||
\KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS \KEYACTION1 KEYDOWNP KEYNUMBERP
|
||||
@ -852,7 +852,8 @@
|
||||
T])
|
||||
|
||||
(\DECODETRANSITION
|
||||
[LAMBDA (KEYNUMBER DOWNFLG) (* ; "Edited 3-Jan-2024 16:04 by mth")
|
||||
[LAMBDA (KEYNUMBER DOWNFLG) (* ; "Edited 4-Apr-2025 17:08 by rmk")
|
||||
(* ; "Edited 3-Jan-2024 16:04 by mth")
|
||||
(* ; "Edited 19-Nov-87 16:29 by Snow")
|
||||
|
||||
(* ;; "KEYNUMBER is the key number in the hardware keyboard layout, DOWNFLG is T if the key just went down. PENDINGINTERRUPT, bound in \KEYHANDLER, is set to the decoded character if it is an interrupt.")
|
||||
@ -964,8 +965,9 @@
|
||||
(COND
|
||||
((AND (OR (fetch (KEYBOARDEVENT META) of KEYSTATE)
|
||||
(fetch (KEYBOARDEVENT FONT) of KEYSTATE))
|
||||
(ILESSP ASCIICODE \KEYBOARD.META))
|
||||
(SETQ ASCIICODE (LOGOR ASCIICODE \KEYBOARD.META]
|
||||
(ILEQ ASCIICODE 255))
|
||||
(SETQ ASCIICODE (LOGOR (CHARCODE Meta,0)
|
||||
ASCIICODE]
|
||||
(COND
|
||||
((ASSOC ASCIICODE (fetch INTERRUPTLIST of \CURRENTKEYACTION))
|
||||
(SETQ PENDINGINTERRUPT T)
|
||||
@ -1097,10 +1099,8 @@
|
||||
|
||||
(RPAQQ \CTRLMASK 159)
|
||||
|
||||
(RPAQQ \METABIT 128)
|
||||
|
||||
|
||||
(CONSTANTS ALLUP \CTRLMASK \METABIT)
|
||||
(CONSTANTS ALLUP \CTRLMASK)
|
||||
)
|
||||
|
||||
|
||||
@ -1950,8 +1950,6 @@
|
||||
|
||||
(RPAQQ KEYBOARD.APPLICATION-SPECIFIC-KEYACTIONS NIL)
|
||||
|
||||
(RPAQ? \KEYBOARD.META 256)
|
||||
|
||||
(RPAQ? \MODIFIED.KEYACTIONS )
|
||||
(DECLARE%: EVAL@COMPILE
|
||||
|
||||
@ -1961,9 +1959,8 @@
|
||||
|
||||
(GLOBALVARS \SYSBUFFER \LONGSYSBUF \INTERRUPTSTATE \MODIFIED.KEYACTIONS \MOUSECHORDTICKS
|
||||
\KEYBOARDEVENTQUEUE \KEYBUFFERING \CURRENTKEYACTION \COMMANDKEYACTION \DEFAULTKEYACTION
|
||||
\TIMER.INTERRUPT.PENDING \ORIGKEYACTIONS \KEYBOARD.META \MOUSECHORDMILLISECONDS
|
||||
\DORADOKEYACTIONS \DLIONKEYACTIONS \DLIONOSDKEYACTIONS \DOVEKEYACTIONS \DOVEOSDKEYACTIONS
|
||||
SHIFTXORLOCKFLG)
|
||||
\TIMER.INTERRUPT.PENDING \ORIGKEYACTIONS \MOUSECHORDMILLISECONDS \DORADOKEYACTIONS
|
||||
\DLIONKEYACTIONS \DLIONOSDKEYACTIONS \DOVEKEYACTIONS \DOVEOSDKEYACTIONS SHIFTXORLOCKFLG)
|
||||
)
|
||||
|
||||
|
||||
@ -3919,33 +3916,33 @@
|
||||
(ADDTOVAR LAMA CURSORPROP METASHIFT MOUSECHORDWAIT)
|
||||
)
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (14666 21982 (BKSYSCHARCODE 14676 . 15025) (\CLEARSYSBUF 15027 . 15585) (\GETKEY 15587
|
||||
. 16762) (\NSYSBUFCHARS 16764 . 17506) (\SAVESYSBUF 17508 . 19117) (\SYSBUFP 19119 . 19423) (
|
||||
\GETSYSBUF 19425 . 19605) (\PUTSYSBUF 19607 . 20820) (\PEEKSYSBUF 20822 . 21980)) (23267 60685 (
|
||||
\KEYBOARDINIT 23277 . 24997) (\KEYBOARDEVENTFN 24999 . 29699) (\ALLOCLOCKED 29701 . 30291) (
|
||||
\SETIOPOINTERS 30293 . 34829) (\KEYBOARDOFF 34831 . 35245) (\KEYBOARDON 35247 . 35626) (\KEYHANDLER
|
||||
35628 . 35759) (\KEYHANDLER1 35761 . 43207) (\RESETKEYBOARD 43209 . 44857) (\DOMOUSECHORDING 44859 .
|
||||
48679) (\DOTRANSITIONS 48681 . 49358) (\DECODETRANSITION 49360 . 56633) (MOUSECHORDWAIT 56635 . 57299)
|
||||
(\TRACKCURSOR 57301 . 60683)) (95227 117100 (KEYACTION 95237 . 96090) (KEYACTIONTABLE 96092 . 97274)
|
||||
(KEYBOARDTYPE 97276 . 98378) (RESETKEYACTION 98380 . 100139) (\KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS
|
||||
100141 . 102043) (\KEYACTION1 102045 . 112161) (KEYDOWNP 112163 . 112498) (KEYNUMBERP 112500 . 112698)
|
||||
(\KEYNAMETONUMBER 112700 . 113394) (\KEYNUMBERTONAME 113396 . 113586) (MODIFY.KEYACTIONS 113588 .
|
||||
114449) (METASHIFT 114451 . 115395) (SHIFTDOWNP 115397 . 117098)) (117163 117459 (
|
||||
SETUP.OFFICE.KEYBOARD 117173 . 117457)) (120438 122150 (\INIT.KEYBOARD.STREAM 120448 . 122148)) (
|
||||
122415 138792 (\DOBUFFEREDTRANSITIONS 122425 . 137855) (\TIMER.INTERRUPTFRAME 137857 . 138582) (
|
||||
\PERIODIC.INTERRUPTFRAME 138584 . 138790)) (139046 143123 (\HARDCURSORUP 139056 . 140938) (
|
||||
\HARDCURSORPOSITION 140940 . 142976) (\HARDCURSORDOWN 142978 . 143121)) (143124 167184 (CURSOR.INIT
|
||||
143134 . 146834) (\CURSORDESTINATION 146836 . 149154) (\SOFTCURSORUP 149156 . 154410) (
|
||||
\SOFTCURSORUPCURRENT 154412 . 161448) (\SOFTCURSORPOSITION 161450 . 162215) (\SOFTCURSORDOWN 162217 .
|
||||
162925) (CURSORPROP 162927 . 163269) (GETCURSORPROP 163271 . 163459) (PUTCURSORPROP 163461 . 164616) (
|
||||
\CURSORBITSPERPIXEL 164618 . 166734) (\CURSORIMAGEPROPNAME 166736 . 166960) (\CURSORMASKPROPNAME
|
||||
166962 . 167182)) (167185 185135 (CURSORCREATE 167195 . 169870) (CURSOR 169872 . 171684) (
|
||||
\CURSOR-VALID-P 171686 . 172773) (\CURSORUP 172775 . 174490) (\CURSORPOSITION 174492 . 177020) (
|
||||
\CURSORDOWN 177022 . 177255) (ADJUSTCURSORPOSITION 177257 . 177835) (CURSORPOSITION 177837 . 179379) (
|
||||
CURSORSCREEN 179381 . 180037) (CURSOREXIT 180039 . 181430) (FLIPCURSOR 181432 . 182558) (FLIPCURSORBAR
|
||||
182560 . 183540) (LASTMOUSEX 183542 . 183796) (LASTMOUSEY 183798 . 184052) (CREATEPOSITION 184054 .
|
||||
184260) (POSITIONP 184262 . 184546) (CURSORHOTSPOT 184548 . 185133)) (186373 187921 (GETMOUSESTATE
|
||||
186383 . 187042) (\EVENTKEYS 187044 . 187919)) (194120 194916 (MACHINETYPE 194130 . 194530) (
|
||||
SETMAINTPANEL 194532 . 194914)) (194946 196085 (BEEPON 194956 . 195609) (BEEPOFF 195611 . 196083)) (
|
||||
196536 196799 (WITHOUT-INTERRUPTS 196546 . 196797)))))
|
||||
(FILEMAP (NIL (14626 21942 (BKSYSCHARCODE 14636 . 14985) (\CLEARSYSBUF 14987 . 15545) (\GETKEY 15547
|
||||
. 16722) (\NSYSBUFCHARS 16724 . 17466) (\SAVESYSBUF 17468 . 19077) (\SYSBUFP 19079 . 19383) (
|
||||
\GETSYSBUF 19385 . 19565) (\PUTSYSBUF 19567 . 20780) (\PEEKSYSBUF 20782 . 21940)) (23227 60785 (
|
||||
\KEYBOARDINIT 23237 . 24957) (\KEYBOARDEVENTFN 24959 . 29659) (\ALLOCLOCKED 29661 . 30251) (
|
||||
\SETIOPOINTERS 30253 . 34789) (\KEYBOARDOFF 34791 . 35205) (\KEYBOARDON 35207 . 35586) (\KEYHANDLER
|
||||
35588 . 35719) (\KEYHANDLER1 35721 . 43167) (\RESETKEYBOARD 43169 . 44817) (\DOMOUSECHORDING 44819 .
|
||||
48639) (\DOTRANSITIONS 48641 . 49318) (\DECODETRANSITION 49320 . 56733) (MOUSECHORDWAIT 56735 . 57399)
|
||||
(\TRACKCURSOR 57401 . 60783)) (95237 117110 (KEYACTION 95247 . 96100) (KEYACTIONTABLE 96102 . 97284)
|
||||
(KEYBOARDTYPE 97286 . 98388) (RESETKEYACTION 98390 . 100149) (\KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS
|
||||
100151 . 102053) (\KEYACTION1 102055 . 112171) (KEYDOWNP 112173 . 112508) (KEYNUMBERP 112510 . 112708)
|
||||
(\KEYNAMETONUMBER 112710 . 113404) (\KEYNUMBERTONAME 113406 . 113596) (MODIFY.KEYACTIONS 113598 .
|
||||
114459) (METASHIFT 114461 . 115405) (SHIFTDOWNP 115407 . 117108)) (117173 117469 (
|
||||
SETUP.OFFICE.KEYBOARD 117183 . 117467)) (120448 122160 (\INIT.KEYBOARD.STREAM 120458 . 122158)) (
|
||||
122425 138802 (\DOBUFFEREDTRANSITIONS 122435 . 137865) (\TIMER.INTERRUPTFRAME 137867 . 138592) (
|
||||
\PERIODIC.INTERRUPTFRAME 138594 . 138800)) (139056 143133 (\HARDCURSORUP 139066 . 140948) (
|
||||
\HARDCURSORPOSITION 140950 . 142986) (\HARDCURSORDOWN 142988 . 143131)) (143134 167194 (CURSOR.INIT
|
||||
143144 . 146844) (\CURSORDESTINATION 146846 . 149164) (\SOFTCURSORUP 149166 . 154420) (
|
||||
\SOFTCURSORUPCURRENT 154422 . 161458) (\SOFTCURSORPOSITION 161460 . 162225) (\SOFTCURSORDOWN 162227 .
|
||||
162935) (CURSORPROP 162937 . 163279) (GETCURSORPROP 163281 . 163469) (PUTCURSORPROP 163471 . 164626) (
|
||||
\CURSORBITSPERPIXEL 164628 . 166744) (\CURSORIMAGEPROPNAME 166746 . 166970) (\CURSORMASKPROPNAME
|
||||
166972 . 167192)) (167195 185145 (CURSORCREATE 167205 . 169880) (CURSOR 169882 . 171694) (
|
||||
\CURSOR-VALID-P 171696 . 172783) (\CURSORUP 172785 . 174500) (\CURSORPOSITION 174502 . 177030) (
|
||||
\CURSORDOWN 177032 . 177265) (ADJUSTCURSORPOSITION 177267 . 177845) (CURSORPOSITION 177847 . 179389) (
|
||||
CURSORSCREEN 179391 . 180047) (CURSOREXIT 180049 . 181440) (FLIPCURSOR 181442 . 182568) (FLIPCURSORBAR
|
||||
182570 . 183550) (LASTMOUSEX 183552 . 183806) (LASTMOUSEY 183808 . 184062) (CREATEPOSITION 184064 .
|
||||
184270) (POSITIONP 184272 . 184556) (CURSORHOTSPOT 184558 . 185143)) (186383 187931 (GETMOUSESTATE
|
||||
186393 . 187052) (\EVENTKEYS 187054 . 187929)) (194130 194926 (MACHINETYPE 194140 . 194540) (
|
||||
SETMAINTPANEL 194542 . 194924)) (194956 196095 (BEEPON 194966 . 195619) (BEEPOFF 195621 . 196093)) (
|
||||
196546 196809 (WITHOUT-INTERRUPTS 196556 . 196807)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user