From 121a166047e4e5aa7b979e51a5fff83eda0e7eef Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Thu, 21 Mar 2024 21:51:55 -0700 Subject: [PATCH] TEDIT.NORMALIZECARET moves line with left-most selection to the top --- library/tedit/TEDIT-WINDOW | 78 ++++++++++++++++---------------- library/tedit/TEDIT-WINDOW.LCOM | Bin 57922 -> 57998 bytes 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/library/tedit/TEDIT-WINDOW b/library/tedit/TEDIT-WINDOW index 1b2e779a..742cbb7c 100644 --- a/library/tedit/TEDIT-WINDOW +++ b/library/tedit/TEDIT-WINDOW @@ -1,12 +1,14 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "17-Mar-2024 23:43:56" {DSK}frank>il>ncmedley>library>tedit>TEDIT-WINDOW.;7 195743 +(FILECREATED "21-Mar-2024 21:48:49"  +{DSK}kaplan>Local>medley3.5>git-medley>library>tedit>TEDIT-WINDOW.;69 195813 - :CHANGES-TO (VARS TEDIT-WINDOWCOMS) - (FNS TEDIT.PROMPTWINDOW) + :EDIT-BY rmk - :PREVIOUS-DATE " 4-Mar-2024 15:15:31" {DSK}frank>il>ncmedley>library>tedit>TEDIT-WINDOW.;6 -) + :CHANGES-TO (FNS TEDIT.NORMALIZECARET) + + :PREVIOUS-DATE "17-Mar-2024 23:43:56" +{DSK}kaplan>Local>medley3.5>git-medley>library>tedit>TEDIT-WINDOW.;68) (PRETTYCOMPRINT TEDIT-WINDOWCOMS) @@ -2773,7 +2775,8 @@ (DSPYPOSITION Y (ffetch (TEDITCARET TCCARETDS) of CARET)))]) (TEDIT.NORMALIZECARET - [LAMBDA (TEXTOBJ SEL EVEN.IF.VISIBLE) (* ; "Edited 21-Feb-2024 20:43 by rmk") + [LAMBDA (TEXTOBJ SEL EVEN.IF.VISIBLE) (* ; "Edited 21-Mar-2024 21:48 by rmk") + (* ; "Edited 21-Feb-2024 20:43 by rmk") (* ; "Edited 18-Feb-2024 23:35 by rmk") (* ; "Edited 2-Jan-2024 11:09 by rmk") (* ; "Edited 20-Nov-2023 14:22 by rmk") @@ -2828,8 +2831,7 @@ (* ;; "Not visible, work to do: Make sure the line containing CH# is linked in and scrolled to the top of the pane. This should be replaceable by \TEDIT.SCROLLFN, with the appropriate DY.") (\SHOWSEL SEL NIL SELPANE) - (SETQ TOPLINE (CADR (\FORMATBLOCK TEXTOBJ (SUB1 CH#) - PHEIGHT))) + (SETQ TOPLINE (CADR (\FORMATBLOCK TEXTOBJ CH# PHEIGHT))) (SETYPOS TOPLINE (IDIFFERENCE PHEIGHT (GETLD TOPLINE LHEIGHT))) (LINKLD (fetch (TEXTWINDOW PLINES) of SELPANE) TOPLINE) @@ -3173,34 +3175,34 @@ (RPAQ? TEDIT.TITLED.ICON.TEMPLATE (create TITLEDICON ICON _ TEDITICON MASK _ TEDITMASK TITLEREG _ TEDIT.ICON.TITLE.REGION)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (13015 32591 (\TEDIT.CREATEW 13025 . 19400) (\TEDIT.WINDOW.SETUP 19402 . 22091) ( -\TEDIT.MINIMAL.WINDOW.SETUP 22093 . 30514) (\TEDIT.ADD.CARET 30516 . 31980) (\TEDIT.CLEARPANE 31982 . -32589)) (32592 53648 (\TEDIT.CURSORMOVEDFN 32602 . 36410) (\TEDIT.CURSOROUTFN 36412 . 36857) ( -\TEDIT.ACTIVE.WINDOWP 36859 . 37985) (\TEDIT.EXPANDFN 37987 . 38550) (\TEDIT.MAINW 38552 . 40692) ( -\TEDIT.PRIMARYW 40694 . 41334) (\TEDIT.NEWREGIONFN 41336 . 43852) (\TEDIT.SET.WINDOW.EXTENT 43854 . -48717) (\TEDIT.SHRINK.ICONCREATE 48719 . 51142) (\TEDIT.SHRINKFN 51144 . 51553) (\TEDIT.PANEREGION -51555 . 53646)) (53649 77414 (\TEDIT.BUTTONEVENTFN 53659 . 68714) (\TEDIT.DO.SELOPERATION 68716 . -70998) (\TEDIT.TTY.TEXTOBJP 71000 . 71424) (\TEDIT.BUTTONEVENTFN.SELOPERATION 71426 . 72815) ( -\TEDIT.BUTTONEVENTFN.INACTIVE 72817 . 74843) (\TEDIT.BUTTONEVENTFN.INTITLE 74845 . 76364) ( -\TEDIT.COPYINSERT 76366 . 77412)) (77449 92178 (\TEDIT.PANE.SPLIT 77459 . 81679) (\TEDIT.SPLITW 81681 - . 88014) (\TEDIT.UNSPLITW 88016 . 92176)) (93534 94319 (TEDITWINDOWP 93544 . 94317)) (94356 97344 ( -TEDIT.GETINPUT 94366 . 96809) (\TEDIT.MAKEFILENAME 96811 . 97342)) (97393 105382 (TEDIT.PROMPTWINDOW -97403 . 97740) (TEDIT.PROMPTPRINT 97742 . 100178) (TEDIT.PROMPTCLEAR 100180 . 101899) ( -TEDIT.PROMPTFLASH 101901 . 103810) (\TEDIT.PROMPT.PAGEFULLFN 103812 . 105380)) (105620 113499 ( -\TEXTSTREAM.TITLE 105630 . 106320) (\TEDIT.DEFAULT.TITLE 106322 . 108701) (\TEDIT.WINDOW.TITLE 108703 - . 110760) (\TEXTSTREAM.FILENAME 110762 . 112432) (\TEDIT.UPDATE.TITLE 112434 . 113497)) (113542 -128583 (TEDIT.DEACTIVATE.WINDOW 113552 . 119974) (\TEDIT.REPAINTFN 119976 . 121551) ( -\TEDIT.AFTERMOVEFN 121553 . 122307) (OFFSCREENP 122309 . 123514) (\TEDIT.RESHAPEFN 123516 . 127405) ( -\TEDIT.PANEWITHINSCREEN? 127407 . 128581)) (128584 156217 (\TEDIT.SCROLLFN 128594 . 130281) ( -\TEDIT.SCROLLFLOAT 130283 . 134869) (\TEDIT.SCROLLUP 134871 . 142247) (\TEDIT.SCROLL.SHOWSEL 142249 . -144873) (\TEDIT.SCROLLDOWN 144875 . 150091) (\TEDIT.OFFSCREEN.SCROLL 150093 . 152208) ( -\TEDIT.WHERE.SEL 152210 . 153430) (\TEDIT.WHERE.SEL1 153432 . 156215)) (156218 161340 (\TEDIT.ONSCREEN - 156228 . 157683) (\TEDIT.ONSCREEN? 157685 . 159998) (\TEDIT.PANE.SCREENREGION 160000 . 161338)) ( -161382 163627 (\TEDIT.PROCIDLEFN 161392 . 162801) (\TEDIT.PROCENTRYFN 162803 . 163248) ( -\TEDIT.PROCEXITFN 163250 . 163625)) (163706 176433 (\TEDIT.DOWNCARET 163716 . 164509) ( -\TEDIT.FLASHCARET 164511 . 166328) (\TEDIT.UPCARET 166330 . 167434) (TEDIT.NORMALIZECARET 167436 . -172164) (\TEDIT.SETCARET 172166 . 176006) (\TEDIT.CARET 176008 . 176431)) (176467 189713 ( -TEDIT.ADD.MENUITEM 176477 . 178768) (TEDIT.DEFAULT.MENUFN 178770 . 187053) (TEDIT.REMOVE.MENUITEM -187055 . 188052) (\TEDIT.CREATEMENU 188054 . 188491) (\TEDIT.MENU.WHENHELDFN 188493 . 189398) ( -\TEDIT.MENU.WHENSELECTEDFN 189400 . 189711))))) + (FILEMAP (NIL (13032 32608 (\TEDIT.CREATEW 13042 . 19417) (\TEDIT.WINDOW.SETUP 19419 . 22108) ( +\TEDIT.MINIMAL.WINDOW.SETUP 22110 . 30531) (\TEDIT.ADD.CARET 30533 . 31997) (\TEDIT.CLEARPANE 31999 . +32606)) (32609 53665 (\TEDIT.CURSORMOVEDFN 32619 . 36427) (\TEDIT.CURSOROUTFN 36429 . 36874) ( +\TEDIT.ACTIVE.WINDOWP 36876 . 38002) (\TEDIT.EXPANDFN 38004 . 38567) (\TEDIT.MAINW 38569 . 40709) ( +\TEDIT.PRIMARYW 40711 . 41351) (\TEDIT.NEWREGIONFN 41353 . 43869) (\TEDIT.SET.WINDOW.EXTENT 43871 . +48734) (\TEDIT.SHRINK.ICONCREATE 48736 . 51159) (\TEDIT.SHRINKFN 51161 . 51570) (\TEDIT.PANEREGION +51572 . 53663)) (53666 77431 (\TEDIT.BUTTONEVENTFN 53676 . 68731) (\TEDIT.DO.SELOPERATION 68733 . +71015) (\TEDIT.TTY.TEXTOBJP 71017 . 71441) (\TEDIT.BUTTONEVENTFN.SELOPERATION 71443 . 72832) ( +\TEDIT.BUTTONEVENTFN.INACTIVE 72834 . 74860) (\TEDIT.BUTTONEVENTFN.INTITLE 74862 . 76381) ( +\TEDIT.COPYINSERT 76383 . 77429)) (77466 92195 (\TEDIT.PANE.SPLIT 77476 . 81696) (\TEDIT.SPLITW 81698 + . 88031) (\TEDIT.UNSPLITW 88033 . 92193)) (93551 94336 (TEDITWINDOWP 93561 . 94334)) (94373 97361 ( +TEDIT.GETINPUT 94383 . 96826) (\TEDIT.MAKEFILENAME 96828 . 97359)) (97410 105399 (TEDIT.PROMPTWINDOW +97420 . 97757) (TEDIT.PROMPTPRINT 97759 . 100195) (TEDIT.PROMPTCLEAR 100197 . 101916) ( +TEDIT.PROMPTFLASH 101918 . 103827) (\TEDIT.PROMPT.PAGEFULLFN 103829 . 105397)) (105637 113516 ( +\TEXTSTREAM.TITLE 105647 . 106337) (\TEDIT.DEFAULT.TITLE 106339 . 108718) (\TEDIT.WINDOW.TITLE 108720 + . 110777) (\TEXTSTREAM.FILENAME 110779 . 112449) (\TEDIT.UPDATE.TITLE 112451 . 113514)) (113559 +128600 (TEDIT.DEACTIVATE.WINDOW 113569 . 119991) (\TEDIT.REPAINTFN 119993 . 121568) ( +\TEDIT.AFTERMOVEFN 121570 . 122324) (OFFSCREENP 122326 . 123531) (\TEDIT.RESHAPEFN 123533 . 127422) ( +\TEDIT.PANEWITHINSCREEN? 127424 . 128598)) (128601 156234 (\TEDIT.SCROLLFN 128611 . 130298) ( +\TEDIT.SCROLLFLOAT 130300 . 134886) (\TEDIT.SCROLLUP 134888 . 142264) (\TEDIT.SCROLL.SHOWSEL 142266 . +144890) (\TEDIT.SCROLLDOWN 144892 . 150108) (\TEDIT.OFFSCREEN.SCROLL 150110 . 152225) ( +\TEDIT.WHERE.SEL 152227 . 153447) (\TEDIT.WHERE.SEL1 153449 . 156232)) (156235 161357 (\TEDIT.ONSCREEN + 156245 . 157700) (\TEDIT.ONSCREEN? 157702 . 160015) (\TEDIT.PANE.SCREENREGION 160017 . 161355)) ( +161399 163644 (\TEDIT.PROCIDLEFN 161409 . 162818) (\TEDIT.PROCENTRYFN 162820 . 163265) ( +\TEDIT.PROCEXITFN 163267 . 163642)) (163723 176503 (\TEDIT.DOWNCARET 163733 . 164526) ( +\TEDIT.FLASHCARET 164528 . 166345) (\TEDIT.UPCARET 166347 . 167451) (TEDIT.NORMALIZECARET 167453 . +172234) (\TEDIT.SETCARET 172236 . 176076) (\TEDIT.CARET 176078 . 176501)) (176537 189783 ( +TEDIT.ADD.MENUITEM 176547 . 178838) (TEDIT.DEFAULT.MENUFN 178840 . 187123) (TEDIT.REMOVE.MENUITEM +187125 . 188122) (\TEDIT.CREATEMENU 188124 . 188561) (\TEDIT.MENU.WHENHELDFN 188563 . 189468) ( +\TEDIT.MENU.WHENSELECTEDFN 189470 . 189781))))) STOP diff --git a/library/tedit/TEDIT-WINDOW.LCOM b/library/tedit/TEDIT-WINDOW.LCOM index 39303aa083cacc03a26c88cfb090874dffbebcab..55cf3883487bd5c7bfa477602792e02908293628 100644 GIT binary patch delta 756 zcmX?fgt_l1^Mr6=BST%^#3EfI10xd!BSR|_3oDa}SyGCj#i>QbcG-yqIf;38KKaRs zId-|JDLJW?#(Ji9>6s&+}R6_gAukxVeMGBvO=GF4LGN-9cC&d)8#%t=jA zNUbO+Dps{p2yu1s4AJxR5At>N@r-hHb_{Y2QOL|wP;v|P@lilFNKa2sNg*Y%1gIIC z1(r&hTpDg(o<6S5L9UKKV-=LJc*GLujB1x)?^+w8yyI(T33P+0g`u&67098wPLT>l zx!DR_R?Z%de(tWpx*`4w8g72USpA`?U=Xz^s+}y!ae<5{KEr+`~wt>4U8u{&W(35R{-g9aSe73@(c*^4^l8O bGDR0MHZ=qb1uGaE8(>Hpnr(hEH_inBBBI&A delta 666 zcmeA>%6#Yu^Mr6=Lvvl<#3EfI10xd!BV#KQ3oGM^SyBQS`MIffX+?>7*>;&Zc6rH@ zCo(E$m}@F1p{O^sGBUI>G*wb4NzTtL$Wc#G$jnpVQgRFR@lillsHdl=q>z$WlA40m z081rJE)6$NA6MrfSH}=nm&uGw5@OXZ!QQnt*xXTXu3%_sYHnhzz-8s^;ppe?8mt@Q zub>g;7!<4k)b1Ig8}8}n;veqp?;EVCpyB2R71j#~^7jo0fkp=(3S1ZtVTFZ=%H}kt+cOMK3NbJ+J8&`pK@vmCsR)Lw4_la< zHZpE=+{&JEQYwjw4J74wN(3k|X(Qvj$%V5OoXRo;m=}BQ$!PIp+~di#(`zg1M#fC$ zrC#x3`!m|S7=e@*(=Kn2XfX3q?|2EIs5c{!@@CrY3#NmYXXRY@`t5<{1GJF}4J=eS88O z{ah7{Er2{1&)@(b$4DPfkbpT*034Ef&OWY=K@e4@77FgJ(9i>hWPpOPf$8Mlx$!QR v3LsrBuEEYho&h2LK?){D=IBDkrp92QU