From 93af94055d49db993cac13a54c2417c0f1451887 Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Mon, 3 Mar 2025 14:35:11 -0800 Subject: [PATCH] Get VIDEX and //e 80 col to agree on cursor --- images/apple/PLASMA-2.20.po | Bin 33553920 -> 33553920 bytes src/libsrc/apple/conio.pla | 26 +++++++++++++------------- src/toolsrc/ed.pla | 8 +++++--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/images/apple/PLASMA-2.20.po b/images/apple/PLASMA-2.20.po index e76dc183473fe09605a47cc335d59ad8fc8c9da6..73ee8e9837b5683e8619afdc0961c1ce9dc147a8 100644 GIT binary patch delta 4322 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 OWn95kbBkOvSN;c$uA2h@ diff --git a/src/libsrc/apple/conio.pla b/src/libsrc/apple/conio.pla index 56ad4f9..b93dc89 100644 --- a/src/libsrc/apple/conio.pla +++ b/src/libsrc/apple/conio.pla @@ -669,19 +669,19 @@ def a2ctrl80v(code, param)#1 handled = TRUE break is ctrlcursor - if param == OFF - flags = flags & ~showcurs - ^$C0B0 = $0A - ^$C0B1 = $20 - elsif param == INVERSE - flags = flags | showcurs - ^$C0B0 = $0A - ^$C0B1 = $00 - else - flags = flags | showcurs - ^$C0B0 = $0A - ^$C0B1 = $C0 - fin + when param + is OFF + ^$C0B0 = $0A + ^$C0B1 = $20 + break + is INVERSE + ^$C0B0 = $0A + ^$C0B1 = $00 + break + otherwise + ^$C0B0 = $0A + ^$C0B1 = $C0 + wend handled = TRUE break is ctrlscroll diff --git a/src/toolsrc/ed.pla b/src/toolsrc/ed.pla index e5adf79..afbcbff 100755 --- a/src/toolsrc/ed.pla +++ b/src/toolsrc/ed.pla @@ -1072,13 +1072,15 @@ def keyin underchr = curscol >= ^(txtlinbuf=>[cursrow]) ?? ' ' :: txtlinbuf=>[cursrow]->[curscol + 1] curschr = flags & insmode ?? '+' :: '_' + conio:gotoxy(cursx, cursy) repeat - conio:gotoxy(cursx, cursy) + conio:textctrl(ctrlattr, INVERSE) conio:putchars(1, curschr) conio:gotoxy(cursx, cursy) - conio:textctrl(ctrlattr, INVERSE) + conio:textctrl(ctrlcursor, INVERSE) waitkey - conio:textctrl(ctrlattr, OFF) + conio:textctrl(ctrlcursor, OFF) + conio:textctrl(ctrlattr, NORMAL) conio:putchars(1, underchr) conio:gotoxy(cursx, cursy) waitkey