diff --git a/equates.inc b/equates.inc index b436eaf..a97520d 100644 --- a/equates.inc +++ b/equates.inc @@ -18,22 +18,21 @@ ASCII_FF EQU 0x0C ; Set cursor to top left positi ASCII_CR EQU 0x0D ; 13 - CR, move cursor to first column ASCII_CAN EQU 0x18 ; Move cursor right ASCII_EOM EQU 0x19 ; Move cursor up +ASCII_ESC EQU 0x1B ; Escape +ASCII_SP EQU 0x20 ; Space ASCII_SUB EQU 0x1A ; Move cursor down ASCII_US EQU 0x1F ; Clear screen and move cursor to top left position -ASCII_DEL EQU 0x7F ; Inverser output - - -ASCII_ESC EQU 0x1B ; AP2 key -ASCII_SP EQU 0x20 ; Space +INVERSE EQU 0x7F ; Inverser output ASCII_CUR EQU 0x24 ; $ ASCII_SQ EQU 0x27 ; ' ASCII_BKSL EQU 0x5C ; \ +AP2_KEY EQU 0x1B ; AP2 key CTRL_C EQU 0x03 -CURS_LEFT EQU 0x19 -CURS_RIGHT EQU 0x18 -CURS_UP EQU 0x19 +KEY_LEFT EQU 0x19 +KEY_RIGHT EQU 0x18 +KEY_UP EQU 0x19 @@ -97,22 +96,22 @@ _NOT EQU 0xAC _STEP EQU 0xAD ; Simple operation tokens -_PLUSTK EQU 0xAE -_MINUTK EQU 0xAF -_MULTK EQU 0xB0 -_DIVTK EQU 0xB1 -_EXPTK EQU 0xB2 +PLUSTK EQU 0xAE ; + +MINUTK EQU 0xAF ; - +MULTK EQU 0xB0 ; * +DIVTK EQU 0xB1 ; / +EXPTK EQU 0xB2 ; ^ ; Other tokens _AND EQU 0xB3 _OR EQU 0xB4 -_GREATK EQU 0xB5 -_EQUTK EQU 0xB6 ; +1 -_LESSTK EQU 0xB7 ; +2 +GREATK EQU 0xB5 ; > +EQUTK EQU 0xB6 ; = +LESSTK EQU 0xB7 ; < -NMREL EQU _LESSTK - _GREATK + 1 -ONEFUN EQU 0xB8 ; first function number +NMREL EQU LESSTK - GREATK + 1 +ONEFUN EQU 0xB8 ; first function number ; Function tokens _SGN EQU 0xB8 diff --git a/main.asm b/main.asm index 22d4029..2321421 100644 --- a/main.asm +++ b/main.asm @@ -1219,7 +1219,7 @@ REMER: LET: CALL PTRGET ; get ptr to var RST SYNCHK - DB _EQUTK ; check for = + DB EQUTK ; check for = LD A, (VALTYP) PUSH AF PUSH DE @@ -1681,7 +1681,7 @@ TSTOP: LD D, 0x0 LOPREL: - SUB _GREATK + SUB GREATK JP C, ENDREL CP NMREL JP NC, ENDREL @@ -1701,7 +1701,7 @@ ENDREL: JP NZ, FINREL LD A, (HL) LD (TEMP3), HL - SUB _PLUSTK + SUB PLUSTK RET C CP LSTOPK RET NC @@ -1746,11 +1746,11 @@ EVAL: JP C, FIN CALL ISLET JP NC, ISVAR - CP _PLUSTK ; ignore "+" + CP PLUSTK ; ignore "+" JP Z, EVAL CP '.' JP Z, FIN - CP _MINUTK + CP MINUTK JP Z, DOMIN CP '&' JP Z, FIN @@ -2338,7 +2338,7 @@ DEF: RST SYNCHK DB ')' RST SYNCHK - DB _EQUTK + DB EQUTK LD B, H LD C, L EX (SP), HL @@ -4120,14 +4120,14 @@ FINC: LD HL, FINCEC EX (SP), HL DEC D - CP _MINUTK + CP MINUTK RET Z CP '-' RET Z INC D CP '+' RET Z - CP _PLUSTK + CP PLUSTK RET Z POP AF DEC HL @@ -4797,7 +4797,7 @@ OUTFLG: DEC A ; current video mode > 0? (color) JP NZ, COLRMOD LD A, C - CP ASCII_DEL + CP INVERSE JP Z, COLRMOD CP ASCII_SP JP NC, OUSYMSP @@ -4905,7 +4905,7 @@ OCURCOL: OCOLEND: LD (OCURCOL), A PUSH BC - LD C, ASCII_DEL ; Inverse output + LD C, INVERSE ; Inverse output CALL MON_TV2 POP BC RET @@ -5454,7 +5454,7 @@ EDIT1: INLED: LD A, ASCII_LF RST OUTDO - LD A, CURS_LEFT + LD A, KEY_LEFT RST OUTDO XOR A LD (BUF_POS+1), A @@ -5467,10 +5467,10 @@ INLED: CP 'A' - 1 JP C, EISALP CP 0x80 - LD A, CURS_LEFT + LD A, KEY_LEFT JP C, EPRNTBL RST OUTDO - LD A, CURS_UP + LD A, KEY_UP EPRNTBL: RST OUTDO EISALP: @@ -5502,7 +5502,7 @@ ED_INPUT_LOOP: CURGHT: DEC C JP Z, CURTDON - LD A, CURS_RIGHT + LD A, KEY_RIGHT RST OUTDO JP CURGHT CURTDON: @@ -5595,7 +5595,7 @@ ED_KEYRT: ; -------------------------------------------------- OUTCRRT: INC E - LD A, CURS_RIGHT + LD A, KEY_RIGHT RST OUTDO RET @@ -5741,21 +5741,19 @@ BUF_PUT_STORE: ; -------------------------------------------------- EDIT_GET_KEY: - DB LD_A_n - -APFLAG: - DB 0 +APFLAG EQU $+1 + LD A, 0 DEC A - JP Z, AP2RESFLG + JP Z, AP2_RES PUSH HL PUSH BC INC A - JP NZ, EDIT_KEY_NORMAL + JP NZ, EK_NORMAL LD HL, APFLAG - LD (HL), ASCII_ESC + LD (HL), AP2_KEY CALL MON_KBRD - CP ASCII_ESC - JP Z, ISESC1 + CP AP2_KEY ; First time AP2 key pressed? + JP Z, IS_AP2 ; Yes, "Shortcut" mode ON CALL ISCTLKEY JP Z, DOCTLKEY LD (HL), 0 @@ -5774,16 +5772,18 @@ ISCTLKEY: CP ASCII_FF RET -ISESC1: - LD HL, CTL_ESC_STR +; "Shortcut" mode, out Inversed "K" +IS_AP2: + LD HL, IVERS_K CALL OUTSTRZ -CTLSYM0: +; Wait second key press for get shortcut +GET_SC_KEY: CALL MON_KBRD - CP ASCII_ESC ; AP2 key pressed? + CP AP2_KEY ; AP2 key pressed again? JP NZ, NOAP2 - CALL AP2RESFLG - LD A, ASCII_SP + CALL AP2_RES ; Second time AP2 pressed, turn flag off + LD A, ASCII_SP ; erase Inversed "K" RST OUTDO LD A, ASCII_BS RST OUTDO @@ -5791,12 +5791,8 @@ CTLSYM0: POP HL RET -CTL_ESC_STR: - DB ASCII_DEL - DB 'K' - DB ASCII_DEL - DB ASCII_BS - DB 0 +IVERS_K: + DB INVERSE, 'K', INVERSE, ASCII_BS, 0 NOAP2: CALL ISCTLKEY @@ -5818,12 +5814,12 @@ NOALP1: SUB 0x10 LD C, A LD B, 0x0 - LD HL, CTLTAB1 + LD HL, SHRTCUT ADD HL, BC - LD C, (HL) + LD C, (HL) ; C=reserved word number XOR A OR C - JP Z, CTLSYM0 + JP Z, GET_SC_KEY ; if C=0 - no shortcut LD HL, RESLST - 1 OPSTNXT: @@ -5841,16 +5837,16 @@ OPSTEND: INC HL LD (SAVPOS), HL -EDIT_KEY_NORMAL: +EK_NORMAL: LD HL, (SAVPOS) LD C, (HL) LD A, C AND 0x80 - JP Z, EDIT_KEY_ADV_RESPOS + JP Z, EK_ADV_RESPOS LD A, 1 LD (APFLAG), A -EDIT_KEY_ADV_RESPOS: +EK_ADV_RESPOS: INC HL LD (SAVPOS), HL LD A, C @@ -5859,23 +5855,26 @@ EDIT_KEY_ADV_RESPOS: RET ; -------------------------------------------------- -AP2RESFLG: +AP2_RES: XOR A LD (APFLAG), A RET ; -------------------------------------------------- -CTLTAB1: - DB 0x19, 0x00, 0x0A, 0x00, 0x54, 0x51, 0x52, 0x53 - DB 0x58, 0x57, 0x00, 0x00, 0x1E, 0x55, 0x56, 0x01 - DB 0x28, 0x40, 0x44, 0x47, 0x42, 0x3A, 0x3F, 0x3B - DB 0x3D, 0x4B, 0x4A, 0x34, 0x4E, 0x11, 0x4F, 0x16 - DB 0x2A, 0x41, 0x45, 0x46, 0x43, 0x39, 0x3E, 0x3C - DB 0x49, 0x4C, 0x35, 0x2D, 0x4D, 0x2B, 0x50, 0x16 - DB 0x26, 0x07, 0x20, 0x1F, 0x04, 0x17, 0x02, 0x09 - DB 0x2C, 0x05, 0x0D, 0x27, 0x14, 0x06, 0x03, 0x15 - DB 0x13, 0x48, 0x0E, 0x10, 0x0C, 0x08, 0x1A, 0x21 - DB 0x18, 0x23, 0x22, 0x24, 0x0F, 0x25, 0x2E, 0x1D +; AP2 + [ctrl] key MACRO +; -------------------------------------------------- +SHRTCUT: + DB _LIST-#7f, 0x00, _RUN-#7f, 0x00, _DELETE-#7f, _GET-#7f, _PUT-#7f, _SOUND-#7f + DB _ELSE-#7f, _MERGE-#7f, 0x00, 0x00, _EDIT-#7f, _AUTO-#7f, _RENUM-#7f, _CLS-#7f ; + DB _TAB-#7f, _SQR-#7f, _COS-#7f, _ATN-#7f, _LOG-#7f, _INT-#7f, _POS-#7f, _ABS-#7f ;SP ! " # $ % & ' + DB _FRE-#7f, _VAL-#7f, _STR-#7f, _AND-#7f, _LEFT-#7f, _DPL-#7f, _RIGHT-#7f, _PRINT-#7f ; ( ) * + , - . / + DB _SPC-#7f, _RND-#7f, _SIN-#7f, _TAN-#7f, _EXP-#7f, _SGN-#7f, _INP-#7f, _USR-#7f ; 0 1 2 3 4 5 6 7 + + DB _LEN-#7f, _ASC-#7f, _OR-#7f, _NOT-#7f, _CHR-#7f, _FN-#7f, _MID-#7f, _PRINT-#7f ; 8 9 : ; < = > ? + DB _FILES-#7f, _READ-#7f, _BOX-#7f, _COLOR-#7f, _DATA-#7f, _DEF-#7f, _FOR-#7f, _GOTO-#7f ; @ A B C D E F G + DB _THEN-#7f, _INPUT-#7f, _GOSUB-#7f, _KILL-#7f, _LINE-#7f, _DIM-#7f, _NEXT-#7f, _POKE-#7f ; H I J K L M N O + DB _PSET-#7f, _PEEK-#7f,_RETURN-#7f, _STOP-#7f,_RESTORE-#7f, _CUR-#7f, _CLEAR-#7f,_SCREEN-#7f ; P Q R S T U V W + DB _CONT-#7f,_SYSTEM-#7f, _PAINT-#7f, _SAVE-#7f, _REM-#7f, _LOAD-#7f, _STEP-#7f, _NEW-#7f ; X Y Z [ \ ] ^ BS ; -------------------------------------------------- ; PAINT X, Y C statement