diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index 2a6bdcc5..3a359c95 100644 Binary files a/A2OSX.BOOT.po and b/A2OSX.BOOT.po differ diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index a1f22fd4..529757b1 100644 Binary files a/A2OSX.SRC.po and b/A2OSX.SRC.po differ diff --git a/BIN/EDIT.S.SCRN.txt b/BIN/EDIT.S.SCRN.txt index 6bc427a4..b38e4d0e 100644 --- a/BIN/EDIT.S.SCRN.txt +++ b/BIN/EDIT.S.SCRN.txt @@ -44,29 +44,9 @@ SCRN.Init ldy #ScreenH *-------------------------------------- SCRN.UpdateTopBar lda #1 - >PUSHA - >PUSHA - >LDYA L.MSG.GOTOXY - >SYSCALL CPrintFYA + jsr SCRN.InvLineA bcs .9 - >LDYA L.SEQ.INV - >SYSCALL CPrintFYA - bcs .9 - - ldy #ScreenW - lda (pData),y - -.3 pha - - lda #' ' - >SYSCALL PutCA - pla - bcs .9 - - dec - bne .3 - ldy #hFileName lda (pData),y beq .1 @@ -228,6 +208,10 @@ SCRN.UpdateAttrC .9 jmp Ctrl.Q *-------------------------------------- SCRN.UpdateStatusBar + ldy #ScreenH + lda (pData),y + jsr SCRN.InvLineA + ldy #PromptMode lda (pData),y tax @@ -253,20 +237,21 @@ SCRN.UpdateStatusBar dey >PUSHB (pData),y - ldy #ScreenH - lda (pData),y - >PUSHA >LDYA L.MSG.STATUSBAR >SYSCALL CPrintFYA bcs .9 + jmp SCRN.GotoCurXCurY .2 cmp #PromptModeHelp beq .3 >PUSHW pData + .3 ldy #ScreenH lda (pData),y - >PUSHA + jsr SCRN.InvLineA + bcs .9 + >LDYA L.MSG.STATUSBAR,x >SYSCALL CPrintFYA bcs .9 @@ -274,9 +259,14 @@ SCRN.UpdateStatusBar .9 jmp Ctrl.Q *-------------------------------------- SCRN.UpdateStatusBarErrA - >PUSHA + sta .1+1 ldy #ScreenH lda (pData),y + dec + jsr SCRN.InvLineA + bcs .9 + +.1 lda #$ff >PUSHA >LDYA L.MSG.STATUSBAR.E >SYSCALL CPrintFYA @@ -284,6 +274,41 @@ SCRN.UpdateStatusBarErrA rts .9 jmp Ctrl.Q *-------------------------------------- +SCRN.InvLineA sta .2+1 + lda #1 + >PUSHA + lda .2+1 + >PUSHA + >LDYA L.MSG.GOTOXY + >SYSCALL CPrintFYA + bcs .9 + + >LDYA L.SEQ.INV + >SYSCALL CPrintFYA + bcs .9 + + ldy #ScreenW + lda (pData),y + +.1 pha + + lda #' ' + >SYSCALL PutCA + pla + bcs .9 + + dec + bne .1 + + lda #1 + >PUSHA +.2 lda #$ff + >PUSHA + >LDYA L.MSG.GOTOXY + >SYSCALL CPrintFYA + +.9 rts +*-------------------------------------- SCRN.GotoCurXCurY ldy #CurX lda (pData),y diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index 89d0bab9..d22282ee 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -459,13 +459,13 @@ SEQ.SCROLLDN >CSTR "\e[%d;%dH\eM" SEQ.INV >CSTR "\e[7m" SEQ.NORM >CSTR "\e[0m" SEQ.CEOL >CSTR "\e[K" -MSG.TOPBAR >CSTR "\e[1;1HA2osX Edit:%S" -MSG.STATUSBAR >CSTR "\e[%d;1H\e[7mPress Ctrl-A For Help Length:%D Col:%d Line:%D\e[K\e[0m" -MSG.STATUSBAR.H >CSTR "\e[%d;1H\e[7mPress any key to exit this screen:\e[K\e[0m" -MSG.STATUSBAR.F >CSTR "\e[%d;1H\e[7mFind:%S\e[K\e[0m" -MSG.STATUSBAR.R >CSTR "\e[%d;1H\e[7mReplace:%S\e[K\e[0m" -MSG.STATUSBAR.S >CSTR "\e[%d;1H\e[7mSave:%S\e[K\e[0m" -MSG.STATUSBAR.E >CSTR "\e[%d;1H\e[7mError:%h\e[K\e[0m" +MSG.TOPBAR >CSTR "\e[1;1HA2osX Edit:%S\e[0m" +MSG.STATUSBAR >CSTR "Press Ctrl-A For Help Length:%D Col:%d Line:%D\e[0m" +MSG.STATUSBAR.H >CSTR "Press any key to exit this screen:\e[0m" +MSG.STATUSBAR.F >CSTR "Find:%S\e[0m" +MSG.STATUSBAR.R >CSTR "Replace:%S\e[0m" +MSG.STATUSBAR.S >CSTR "Save:%S\e[0m" +MSG.STATUSBAR.E >CSTR "Error:%h\e[0m" MSG.GOTOXY >CSTR "\e[%d;%dH" MSG.HELP >PSTR "All commands: (* = Not yet implemented)" >PSTR "------------" diff --git a/DRV/CONSOLE.DRV.S.txt b/DRV/CONSOLE.DRV.S.txt index 053252ae..d64664b8 100644 --- a/DRV/CONSOLE.DRV.S.txt +++ b/DRV/CONSOLE.DRV.S.txt @@ -189,7 +189,14 @@ WRITE bit bEscMode ldx CH ldy CV jsr SetCharAtXY - jmp FSOUT +*-------------------------------------- +FSOUT ldx CH + cpx #79 + beq .8 + + inc CH +.8 clc + rts *-------------------------------------- COUT.Ctrl ldx #CtrlChars.Cnt-1 @@ -402,17 +409,6 @@ ClrScr stz CH clc rts *-------------------------------------- -FSOUT ldx CH - cpx #79 - bne .1 - - stz CH - bra LF - -.1 inc CH - clc - rts -*-------------------------------------- CROUT jsr CLREOL stz CH clc @@ -454,8 +450,8 @@ CLRSOL ldx #0 ldy CH CLR sty .2+1 -.1 lda #$20 - ora INVFLG +.1 lda #" " + ldy CV jsr SetCharAtXY X,Y unmodified inx diff --git a/PuTTY.png b/PuTTY.png index 1763933b..87c76b6a 100644 Binary files a/PuTTY.png and b/PuTTY.png differ