From aec12b41f0877d4d8b0864bdabc7cc412a313bc9 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 26 Dec 2021 15:50:48 -0800 Subject: [PATCH] TEDIT: adjustments to give caller control of window region --- library/TEDIT | 89 +++++++++---------- library/TEDIT.LCOM | Bin 38924 -> 39035 bytes library/TEDITWINDOW | 184 +++++++++++++++++++++------------------ library/TEDITWINDOW.LCOM | Bin 56489 -> 56552 bytes 4 files changed, 142 insertions(+), 131 deletions(-) diff --git a/library/TEDIT b/library/TEDIT index 3d3ffcc9..1337ced8 100644 --- a/library/TEDIT +++ b/library/TEDIT @@ -1,11 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "16-Dec-2021 12:34:26" {DSK}kaplan>Local>medley3.5>my-medley>library>TEDIT.;21 142324 +(FILECREATED "24-Dec-2021 19:22:58" {DSK}kaplan>Local>medley3.5>my-medley>library>TEDIT.;23 142434 - :CHANGES-TO (FNS TEDIT-SEE) + :CHANGES-TO (FNS TEDIT) - :PREVIOUS-DATE "13-Oct-2021 10:00:40" -{DSK}kaplan>Local>medley3.5>my-medley>library>TEDIT.;20) + :PREVIOUS-DATE "24-Dec-2021 16:14:27" +{DSK}kaplan>Local>medley3.5>my-medley>library>TEDIT.;22) (* ; " @@ -250,20 +250,21 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. NIL]) (TEDIT - [LAMBDA (TEXT WINDOW DONTSPAWN PROPS) (* ; "Edited 11-Jun-99 14:14 by rmk:") - (* ; "Edited 11-Jun-99 14:13 by rmk:") - (* ; "Edited 11-Jun-99 14:08 by rmk:") - (* ; "Edited 3-Jun-88 14:27 by jds") + [LAMBDA (TEXT WINDOW DONTSPAWN PROPS) (* ; "Edited 24-Dec-2021 19:21 by rmk") + (* ; "Edited 11-Jun-99 14:14 by rmk:") + (* ; "Edited 11-Jun-99 14:13 by rmk:") + (* ; "Edited 11-Jun-99 14:08 by rmk:") + (* ; "Edited 3-Jun-88 14:27 by jds") - (* ;; "User entry to the text editor. Takes an optional window to be used for editing") + (* ;; "User entry to the text editor. Takes an optional window to be used for editing") - (* ;; "DONTSPAWN => Don't try to create a new process for this edit.") + (* ;; "DONTSPAWN => Don't try to create a new process for this edit.") - (PROG (PROC TEDITCREATEDWINDOW) (* ; - "Include the default properties in the list.") + (PROG (PROC TEDITCREATEDWINDOW) (* ; + "Include the default properties in the list.") [COND - ((AND TEXT (ATOM TEXT)) (* ; - "Make sure the file exists before trying to open the window.") + ((AND TEXT (ATOM TEXT)) (* ; + "Make sure the file exists before trying to open the window.") (SETQ TEXT (OPENFILE TEXT 'INPUT 'OLD '((TYPE TEXT] (RESETLST [RESETSAVE NIL `(AND ,WINDOW (WINDOWPROP ,WINDOW 'TEXTOBJ NIL] @@ -272,7 +273,8 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. ((NOT WINDOW) (SETQ TEDITCREATEDWINDOW T) (SETQ WINDOW (COND - [(OR (NOT TEDIT.DEFAULT.WINDOW) + [(OR (LISTGET PROPS 'WINDOWREGION) + (NOT TEDIT.DEFAULT.WINDOW) (\TEDIT.ACTIVE.WINDOWP TEDIT.DEFAULT.WINDOW)) (TEDIT.CREATEW (COND ((AND TEXT (ATOM TEXT)) @@ -288,28 +290,27 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. 'REGION) TEXT (APPEND PROPS (COPY TEDIT.DEFAULT.PROPS))) - (* ; "Replace the old title") + (* ; "Replace the old title") TEDIT.DEFAULT.WINDOW))) - (* ;; - "Mark the newly-created window reserved until the OPENTEXTSTREAM has done its work.") + (* ;; + "Mark the newly-created window reserved until the OPENTEXTSTREAM has done its work.") - (* ;; - "mark that we created the window so that we know we can update the title, etc.") + (* ;; + "mark that we created the window so that we know we can update the title, etc.") (WINDOWPROP WINDOW 'TEXTOBJ T))))) [SETQ TEXT (OPENTEXTSTREAM TEXT WINDOW NIL NIL (APPEND PROPS '(BEING-EDITED T] - (* ; - "Connect the editor to the window") + (* ; "Connect the editor to the window") (replace (TEXTOBJ TXTEDITING) of (TEXTOBJ TEXT) with T) - (* ; "For the moment, mark the document as actively in edit. (so caret flashes when the window is first brought up.)") + (* ; "For the moment, mark the document as actively in edit. (so caret flashes when the window is first brought up.)") [COND (TEDITCREATEDWINDOW (TEXTPROP TEXT 'TEDITCREATEDWINDOW 'T] (COND - (DONTSPAWN (* ; - "Either no processes running, or specifically not to spawn one.") + (DONTSPAWN (* ; + "Either no processes running, or specifically not to spawn one.") (RETURN (\TEDIT2 TEXT WINDOW T))) - (T (* ; "Spawn a process to do the edit.") + (T (* ; "Spawn a process to do the edit.") [SETQ PROC (ADD.PROCESS (LIST '\TEDIT2 (KWOTE TEXT) WINDOW NIL) 'NAME @@ -323,8 +324,8 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (PROCESSPROP PROC 'WINDOW WINDOW) (COND ((NOT (LISTGET (APPEND PROPS (COPY TEDIT.DEFAULT.PROPS)) - 'LEAVETTY)) (* ; - "Unless he asked us to leave the tty where it is, TEdit should get it.") + 'LEAVETTY)) (* ; + "Unless he asked us to leave the tty where it is, TEdit should get it.") (TTY.PROCESS PROC))) (RETURN PROC]) @@ -2233,7 +2234,7 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (* ; "TEDIT Support information") -(RPAQQ TEDITSYSTEMDATE "16-Dec-2021 12:34:26") +(RPAQQ TEDITSYSTEMDATE "24-Dec-2021 19:22:59") (RPAQ TEDITSUPPORT "TEditSupport.PA") (DEFINEQ @@ -2259,19 +2260,19 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (PUTPROPS TEDIT COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1995 1999 2018 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4330 117494 (\TEDIT2 4340 . 7091) (COERCETEXTOBJ 7093 . 15869) (TEDIT 15871 . 20840) ( -TEDIT-SEE 20842 . 23170) (TEDIT.CHARWIDTH 23172 . 25196) (TEDIT.COPY 25198 . 33634) (TEDIT.DELETE -33636 . 34326) (TEDIT.DO.BLUEPENDINGDELETE 34328 . 37395) (TEDIT.INSERT 37397 . 42927) (TEDIT.KILL -42929 . 44486) (TEDIT.MAPLINES 44488 . 45887) (TEDIT.MAPPIECES 45889 . 46845) (TEDIT.MOVE 46847 . -56631) (TEDIT.QUIT 56633 . 58633) (TEDIT.STRINGWIDTH 58635 . 59306) (TEDIT.\INSERT 59308 . 61333) ( -TEXTOBJ 61335 . 62460) (TEXTSTREAM 62462 . 64077) (\TEDIT.INCLUDE 64079 . 67979) (\TEDIT.INSERT.PIECES - 67981 . 77896) (\TEDIT.MOVE.PIECEMAPFN 77898 . 79977) (\TEDIT.OBJECT.SHOWSEL 79979 . 83608) ( -\TEDIT.RESTARTFN 83610 . 85605) (\TEDIT.CHARDELETE 85607 . 89569) (\TEDIT.COPY.PIECEMAPFN 89571 . -92796) (\TEDIT.DELETE 92798 . 100316) (\TEDIT.DIFFUSE.PARALOOKS 100318 . 103082) (\TEDIT.FOREIGN.COPY? - 103084 . 106811) (\TEDIT.QUIT 106813 . 109959) (\TEDIT.WORDDELETE 109961 . 114794) (\TEDIT1 114796 . -117492)) (117608 117724 (\CREATE.TEDIT.RESTART.MENU 117618 . 117722)) (117823 121512 (PLCHAIN 117833 - . 118107) (PRINTLINE 118109 . 120873) (SEEFILE 120875 . 121510)) (121553 141196 (TEDIT.INSERT.OBJECT -121563 . 130640) (TEDIT.EDIT.OBJECT 130642 . 132898) (TEDIT.FIND.OBJECT 132900 . 133793) ( -TEDIT.FIND.OBJECT.SUBTREE 133795 . 134601) (TEDIT.PUT.OBJECT 134603 . 136262) (TEDIT.GET.OBJECT 136264 - . 139463) (TEDIT.OBJECT.CHANGED 139465 . 141194)) (141474 141837 (MAKETEDITFORM 141484 . 141835))))) + (FILEMAP (NIL (4326 117604 (\TEDIT2 4336 . 7087) (COERCETEXTOBJ 7089 . 15865) (TEDIT 15867 . 20950) ( +TEDIT-SEE 20952 . 23280) (TEDIT.CHARWIDTH 23282 . 25306) (TEDIT.COPY 25308 . 33744) (TEDIT.DELETE +33746 . 34436) (TEDIT.DO.BLUEPENDINGDELETE 34438 . 37505) (TEDIT.INSERT 37507 . 43037) (TEDIT.KILL +43039 . 44596) (TEDIT.MAPLINES 44598 . 45997) (TEDIT.MAPPIECES 45999 . 46955) (TEDIT.MOVE 46957 . +56741) (TEDIT.QUIT 56743 . 58743) (TEDIT.STRINGWIDTH 58745 . 59416) (TEDIT.\INSERT 59418 . 61443) ( +TEXTOBJ 61445 . 62570) (TEXTSTREAM 62572 . 64187) (\TEDIT.INCLUDE 64189 . 68089) (\TEDIT.INSERT.PIECES + 68091 . 78006) (\TEDIT.MOVE.PIECEMAPFN 78008 . 80087) (\TEDIT.OBJECT.SHOWSEL 80089 . 83718) ( +\TEDIT.RESTARTFN 83720 . 85715) (\TEDIT.CHARDELETE 85717 . 89679) (\TEDIT.COPY.PIECEMAPFN 89681 . +92906) (\TEDIT.DELETE 92908 . 100426) (\TEDIT.DIFFUSE.PARALOOKS 100428 . 103192) (\TEDIT.FOREIGN.COPY? + 103194 . 106921) (\TEDIT.QUIT 106923 . 110069) (\TEDIT.WORDDELETE 110071 . 114904) (\TEDIT1 114906 . +117602)) (117718 117834 (\CREATE.TEDIT.RESTART.MENU 117728 . 117832)) (117933 121622 (PLCHAIN 117943 + . 118217) (PRINTLINE 118219 . 120983) (SEEFILE 120985 . 121620)) (121663 141306 (TEDIT.INSERT.OBJECT +121673 . 130750) (TEDIT.EDIT.OBJECT 130752 . 133008) (TEDIT.FIND.OBJECT 133010 . 133903) ( +TEDIT.FIND.OBJECT.SUBTREE 133905 . 134711) (TEDIT.PUT.OBJECT 134713 . 136372) (TEDIT.GET.OBJECT 136374 + . 139573) (TEDIT.OBJECT.CHANGED 139575 . 141304)) (141584 141947 (MAKETEDITFORM 141594 . 141945))))) STOP diff --git a/library/TEDIT.LCOM b/library/TEDIT.LCOM index dde38748a4b0898768d0540b9c3bc5b7d627c795..45ad8303e9bd4a4b9b539518500948370537274f 100644 GIT binary patch delta 816 zcmZuwO>fgc5RDB~twXAY7K&6MMiHpCP$KU~oY)9eA+cMd#CB|lv{DWcX+$HSt;&U4 zkvJjsKv|Uo`~)tc5oc~l+_)jQA$|f!Bw%f)AXgF8F@-qwTd!TtU^Nc~6KI}fiK5SleRguy1{ ztX91ac>m|TelneqoFd7VT{o+~S>ZXyYVZQsD3+NcEZGDkL@^~4jOt3oSvG@w=z?rH zK~hWs!}HDCw%ZEwHLi6`N;42Oa4828^Mo4$9$ggmsfE=LEI{D-t`~3%L)&(0ZkwBg zsRs+Y7SKd}++PAKkb0RqlM;fByD9#qqs4#zCiQgCn{39R#nD_hioS~1smMGe-rLJt zk>xeJ(H2Lg$chDq*U9AJ*Mty9ho8H)WcQ|MGY&va@S5YnOQdgdA+wFn*C30l56z8jrz z$f;IBC~3*%9O*#`{gu$PNMQ{qW$(}Cvl8!!aQbTK-n<2f6q%F0a0(&HvIplyq_ReO zUer+R5j_G$LZa;oE{?lQcq delta 727 zcmZuvL5tHs6mFs{-MVqRwumT;&w!Y$q+}+OWE&8yZGw?*GELL1!X9+n;udwgtb6ce z1+NO0pnDYmL22+Tc=P1hg9q_v?8Qk^**$a)GjHa7-}k;ZGbdC2-IV{(Eh9r|40;My zF#?1wjab;2JfmYIgNVp!4kL@0mWD*wJsk8#FAj#!2Yo0EUL731ylFvbH{4KZ+cpgM zL3BFJCY)tgDism>PmUO6k*X=m1<7%nc0I6bObW!yi+qVNd3`63pnwS0a5UkrY$PRR zuxMa!yMCvwG#H(g&=kLSG;d0^RMjGC^pm^Gsd167E=NQt-EaUg*AGK*07KXH8h)3B z8qmO}Z5EN}^T%sr2lTABxw8x?LvEZ~%5mY|(;OQYk|~Hs!(M?N)8%A0(^_AzkCLd> zew-}nX(5SH^izjZ)idV5k~U_vs_p#IWOf?M`6N`!xwmc=cKcx|y|E$@=Vq&anUa#LW0u zkG`)cYl4K3k=~tu?*UX1L|@*Q&k>xiWrJO2c)zmcdv53lvLJ!68O;Ql*YxPOpm9RH zb}`R!LUeWY_BzWlDM@N|eD-e1b1+F6Jhv&!LcF{BmuGnA(yau)Uy|77xJ2JB{Iv1O Hr#IX`X_TpH diff --git a/library/TEDITWINDOW b/library/TEDITWINDOW index 3edfdfa4..5a377b58 100644 --- a/library/TEDITWINDOW +++ b/library/TEDITWINDOW @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "16-Oct-2021 18:52:11"  -{DSK}kaplan>Local>medley3.5>git-medley>library>TEDITWINDOW.;18 187780 +(FILECREATED "24-Dec-2021 19:22:59"  +{DSK}kaplan>Local>medley3.5>my-medley>library>TEDITWINDOW.;25 188932 - changes to%: (FNS TEDIT.DEACTIVATE.WINDOW) + :CHANGES-TO (FNS TEDIT.CREATEW) - previous date%: "12-Oct-2021 15:10:06" -{DSK}kaplan>Local>medley3.5>git-medley>library>TEDITWINDOW.;17) + :PREVIOUS-DATE "24-Dec-2021 16:45:08" +{DSK}kaplan>Local>medley3.5>my-medley>library>TEDITWINDOW.;24) (* ; " @@ -34,7 +34,7 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by John Sybalsky & Xerox Corporat (INITVARS (TEDIT.DEFAULT.WINDOW NIL)) (GLOBALVARS TEDIT.DEFAULT.WINDOW) (COMS (* ; - "User-level %"is this a TEdit window?%" function.") + "User-level %"is this a TEdit window?%" function.") (FNS TEDITWINDOWP)) (COMS (* ; "User-typein support") (FNS TEDIT.GETINPUT \TEDIT.MAKEFILENAME)) @@ -51,8 +51,7 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by John Sybalsky & Xerox Corporat (COMS (* ; "Process-world interfaces") (FNS \TEDIT.PROCIDLEFN \TEDIT.PROCENTRYFN \TEDIT.PROCEXITFN)) (COMS (INITVARS (\CARETRATE 333)) - (* ; - "Caret handler; stolen from CHAT.") + (* ; "Caret handler; stolen from CHAT.") (FNS \EDIT.DOWNCARET \EDIT.FLIPCARET TEDIT.FLASHCARET \EDIT.UPCARET TEDIT.NORMALIZECARET \SETCARET \TEDIT.CARET)) [COMS (* ; "Menu interfacing") @@ -89,15 +88,15 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by John Sybalsky & Xerox Corporat (INITVARS (TEDIT.ICON.FONT (FONTCREATE 'HELVETICA 8 'BOLD)) [TEDIT.ICON.TITLE.REGION (CONS 16 (CONS 4 (CONS 64 (CONS 77 NIL] (* ; - "Original was (create REGION BOTTOM _ 4 LEFT _ 16 WIDTH _ 64 HEIGHT _ 77).") + "Original was (create REGION BOTTOM _ 4 LEFT _ 16 WIDTH _ 64 HEIGHT _ 77).") (* ; - "Changed by yabu.fx, for SUNLOADUP without DWIM.") + "Changed by yabu.fx, for SUNLOADUP without DWIM.") [TEDIT.TITLED.ICON.TEMPLATE (CONS TEDITICON (CONS TEDITMASK (CONS TEDIT.ICON.TITLE.REGION NIL] (* ; "Original was (create TITLEDICON ICON _ TEDITICON MASK _ TEDITMASK TITLEREG _ TEDIT.ICON.TITLE.REGION).") (* ; - "Changed by yabu.fx, for SUNLOADUP without DWIM.") + "Changed by yabu.fx, for SUNLOADUP without DWIM.") ]) (FILESLOAD TEDITDCL) @@ -119,27 +118,45 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by John Sybalsky & Xerox Corporat (DEFINEQ (TEDIT.CREATEW - [LAMBDA (PROMPT FILE PROPS) (* jds "23-May-85 15:19") + [LAMBDA (PROMPT FILE PROPS) (* ; "Edited 24-Dec-2021 19:21 by rmk") + (* ; "Edited 27-Oct-2021 12:25 by rmk:") + + (* ;; "RMK: PROPS are passed to CREATEW and \TEDIT.ORIGINAL.WINDOW.TITLE. REGION property is taken to be the region that encloses the window and the promptwindow. Better still would be allowing a REGION to be passed as the window argument.") + + (* ;; + "RMK: If PROMPTWINDOW is in PROPS, I don't see how it gets attached to the new Tedit window.") + + (* ;; + "Also odd: The argument PROMPT gets printed, but then gets replaced by the property PROMPT") + + (* ;; "Don't set the global TEDIT default window if we have a region property, that must be special purpose.") + (* jds "23-May-85 15:19") (CLRPROMPT) (printout PROMPTWINDOW PROMPT T) - (PROG ((PROMPT (LISTGET PROPS 'PROMPTWINDOW)) - (PHEIGHT 0) - PWINDOW REGION) - [COND - ((EQ PROMPT 'DON'T)) - (PROMPT) - (T (SETQ PHEIGHT (HEIGHTIFWINDOW (ITIMES (OR (LISTGET PROPS 'PROMPTWINDOWHEIGHT) - TEDIT.PROMPTWINDOW.HEIGHT 1) - (FONTPROP TEDIT.PROMPT.FONT 'HEIGHT] - (SETQ REGION (GETREGION 32 (IPLUS PHEIGHT 32))) - (add (fetch HEIGHT of REGION) - (IMINUS PHEIGHT)) - (SETQ TEDIT.DEFAULT.WINDOW (CREATEW REGION (\TEDIT.ORIGINAL.WINDOW.TITLE FILE))) - (CLRPROMPT) - (OR PROMPT (GETPROMPTWINDOW TEDIT.DEFAULT.WINDOW (OR (LISTGET PROPS 'PROMPTWINDOWHEIGHT) - TEDIT.PROMPTWINDOW.HEIGHT 1) - TEDIT.PROMPT.FONT))) - TEDIT.DEFAULT.WINDOW]) + (LET ((PROMPT (LISTGET PROPS 'PROMPTWINDOW)) + (PHEIGHT 0) + PWINDOW REGION [REGIONPROP (COPY (REGIONP (LISTGET PROPS 'WINDOWREGION] + WINDOW) + [COND + ((EQ PROMPT 'DON'T)) + [PROMPT (CL:WHEN (WINDOWP PROMPT) (* ; + "RMK: If not a window, PHEIGHT remains 0") + (SETQ PHEIGHT (FETCH (REGION HEIGHT) OF (WINDOWREGION PROMPT))))] + (T (SETQ PHEIGHT (HEIGHTIFWINDOW (ITIMES (OR (LISTGET PROPS 'PROMPTWINDOWHEIGHT) + TEDIT.PROMPTWINDOW.HEIGHT 1) + (FONTPROP TEDIT.PROMPT.FONT 'HEIGHT] + [SETQ REGION (OR REGIONPROP (GETREGION 32 (IPLUS PHEIGHT 32] + (add (fetch HEIGHT of REGION) + (IMINUS PHEIGHT)) (* ; "Leave room for the promptwindow") + (SETQ WINDOW (CREATEW REGION (\TEDIT.ORIGINAL.WINDOW.TITLE FILE NIL PROPS) + NIL NIL PROPS)) + (WINDOWPROP WINDOW 'TEDITCREATED T) + (CLRPROMPT) + (OR PROMPT (GETPROMPTWINDOW WINDOW (OR (LISTGET PROPS 'PROMPTWINDOWHEIGHT) + TEDIT.PROMPTWINDOW.HEIGHT 1) + TEDIT.PROMPT.FONT)) + (CL:UNLESS REGIONPROP (SETQ TEDIT.DEFAULT.WINDOW WINDOW)) + WINDOW]) (\TEDIT.CREATEW.FROM.REGION [LAMBDA (REGION FILE PROPS) (* gbn "15-Nov-84 18:04") @@ -1627,43 +1644,36 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by John Sybalsky & Xerox Corporat ""]) (\TEDIT.ORIGINAL.WINDOW.TITLE - [LAMBDA (FILE DIRTY?) (* ; "Edited 24-Aug-2021 23:25 by rmk:") + [LAMBDA (FILE DIRTY? PROPS) (* ; "Edited 27-Oct-2021 12:25 by rmk:") + (* ; "Edited 24-Aug-2021 23:25 by rmk:") - (* ;; "Given a file name, derive a title for the TEdit window that is editing it.") + (* ;; "Given a file name, derive a title for the TEdit window that is editing it. RMK: Title may be provided in a property") - (PROG (TITLE) - (RETURN (COND - ((NULL FILE) (* ; - "Just calling (TEDIT) should give a 'Text Editor Window'") - (CONCAT (COND - (DIRTY? "* ") - (T "")) + (LET (TITLE) + [SETQ TITLE (COND + ((LISTGET PROPS 'TITLE)) + ((NULL FILE) (* ; + "Just calling (TEDIT) should give a 'Text Editor Window'") + "Text Editor Window") + ((AND (STRINGP FILE) + (ZEROP (NCHARS FILE))) (* ; + "So should editing an empty string") + "Text Editor Window") + ((WINDOWP FILE) (* ; + "if \TEDIT.WINDOW.SETUP has assigned a title, use it") + (OR (WINDOWPROP FILE 'TITLE) "Text Editor Window")) - ((AND (STRINGP FILE) - (ZEROP (NCHARS FILE))) (* ; - "So should editing an empty string") - (CONCAT (COND - (DIRTY? "* ") - (T "")) - "Text Editor Window")) - ((WINDOWP FILE) - (COND - ((SETQ TITLE (WINDOWPROP FILE 'TITLE)) - (* ; - "if \TEDIT.WINDOW.SETUP has assigned a title, use it") - TITLE) - (T "Text Editor Window"))) - (T (* ; - "Strings use the string itself, otherwise grab the full file name.") - (CONCAT (COND - (DIRTY? "* ") - (T "")) - "Edit Window for: " - (CL:TYPECASE FILE - (STRINGP FILE) - (STREAM (fetch (STREAM FULLNAME) of FILE)) - (LITATOM FILE) - (T FILE))]) + (T (* ; + "Strings use the string itself, otherwise grab the full file name.") + (CONCAT "Edit Window for: " (CL:TYPECASE FILE + (STRINGP FILE) + (STREAM (fetch (STREAM FULLNAME) + of FILE)) + (LITATOM FILE) + (T FILE))] + (COND + (DIRTY? (CONCAT "* " TITLE)) + (T TITLE]) (\TEDIT.WINDOW.TITLE [LAMBDA (TEXTSTREAM NEW.TITLE) (* jds "23-May-85 15:20") @@ -2851,30 +2861,30 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by John Sybalsky & Xerox Corporat (RPAQ? TEDIT.ICON.TITLE.REGION [CONS 16 (CONS 4 (CONS 64 (CONS 77 NIL]) -(RPAQ? TEDIT.TITLED.ICON.TEMPLATE (CONS TEDITICON (CONS TEDITMASK (CONS TEDIT.ICON.TITLE.REGION - NIL)))) +(RPAQ? TEDIT.TITLED.ICON.TEMPLATE (CONS TEDITICON (CONS TEDITMASK (CONS TEDIT.ICON.TITLE.REGION NIL)) + )) (PUTPROPS TEDITWINDOW COPYRIGHT ("John Sybalsky & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 1993 1994 1999 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (7291 94107 (TEDIT.CREATEW 7301 . 8437) (\TEDIT.CREATEW.FROM.REGION 8439 . 9423) ( -TEDIT.CURSORMOVEDFN 9425 . 20811) (TEDIT.CURSOROUTFN 20813 . 21348) (TEDIT.WINDOW.SETUP 21350 . 23159) - (TEDIT.MINIMAL.WINDOW.SETUP 23161 . 30950) (\TEDIT.ACTIVE.WINDOWP 30952 . 31933) ( -\TEDIT.BUTTONEVENTFN 31935 . 56925) (\TEDIT.WINDOW.OPS 56927 . 60888) (\TEDIT.EXPANDFN 60890 . 61293) -(\TEDIT.MAINW 61295 . 62584) (\TEDIT.PRIMARYW 62586 . 63798) (\TEDIT.COPYINSERTFN 63800 . 64771) ( -\TEDIT.NEWREGIONFN 64773 . 67240) (\TEDIT.SET.WINDOW.EXTENT 67242 . 73344) (\TEDIT.SHRINK.ICONCREATE -73346 . 75618) (\TEDIT.SHRINKFN 75620 . 76195) (\TEDIT.SPLITW 76197 . 82298) (\TEDIT.UNSPLITW 82300 . -87994) (\TEDIT.WINDOW.SETUP 87996 . 93716) (\SAFE.FIRST 93718 . 94105)) (95437 96344 (TEDITWINDOWP -95447 . 96342)) (96381 98877 (TEDIT.GETINPUT 96391 . 98374) (\TEDIT.MAKEFILENAME 98376 . 98875)) ( -98926 105377 (TEDIT.PROMPTPRINT 98936 . 101840) (TEDIT.PROMPTFLASH 101842 . 103797) ( -\TEDIT.PROMPT.PAGEFULLFN 103799 . 105375)) (105612 109674 (TEXTSTREAM.TITLE 105622 . 106243) ( -\TEDIT.ORIGINAL.WINDOW.TITLE 106245 . 108290) (\TEDIT.WINDOW.TITLE 108292 . 108962) ( -\TEXTSTREAM.FILENAME 108964 . 109672)) (109717 154616 (TEDIT.DEACTIVATE.WINDOW 109727 . 117034) ( -\TEDIT.REPAINTFN 117036 . 119893) (\TEDIT.RESHAPEFN 119895 . 125515) (\TEDIT.SCROLLFN 125517 . 154614) -) (154658 156707 (\TEDIT.PROCIDLEFN 154668 . 156017) (\TEDIT.PROCENTRYFN 156019 . 156312) ( -\TEDIT.PROCEXITFN 156314 . 156705)) (156786 167786 (\EDIT.DOWNCARET 156796 . 157477) (\EDIT.FLIPCARET -157479 . 159014) (TEDIT.FLASHCARET 159016 . 160130) (\EDIT.UPCARET 160132 . 160585) ( -TEDIT.NORMALIZECARET 160587 . 166538) (\SETCARET 166540 . 167460) (\TEDIT.CARET 167462 . 167784)) ( -167820 181575 (TEDIT.ADD.MENUITEM 167830 . 169745) (TEDIT.DEFAULT.MENUFN 169747 . 179014) ( -TEDIT.REMOVE.MENUITEM 179016 . 180017) (\TEDIT.CREATEMENU 180019 . 180472) (\TEDIT.MENU.WHENHELDFN -180474 . 181244) (\TEDIT.MENU.WHENSELECTEDFN 181246 . 181573))))) + (FILEMAP (NIL (7220 95364 (TEDIT.CREATEW 7230 . 9694) (\TEDIT.CREATEW.FROM.REGION 9696 . 10680) ( +TEDIT.CURSORMOVEDFN 10682 . 22068) (TEDIT.CURSOROUTFN 22070 . 22605) (TEDIT.WINDOW.SETUP 22607 . 24416 +) (TEDIT.MINIMAL.WINDOW.SETUP 24418 . 32207) (\TEDIT.ACTIVE.WINDOWP 32209 . 33190) ( +\TEDIT.BUTTONEVENTFN 33192 . 58182) (\TEDIT.WINDOW.OPS 58184 . 62145) (\TEDIT.EXPANDFN 62147 . 62550) +(\TEDIT.MAINW 62552 . 63841) (\TEDIT.PRIMARYW 63843 . 65055) (\TEDIT.COPYINSERTFN 65057 . 66028) ( +\TEDIT.NEWREGIONFN 66030 . 68497) (\TEDIT.SET.WINDOW.EXTENT 68499 . 74601) (\TEDIT.SHRINK.ICONCREATE +74603 . 76875) (\TEDIT.SHRINKFN 76877 . 77452) (\TEDIT.SPLITW 77454 . 83555) (\TEDIT.UNSPLITW 83557 . +89251) (\TEDIT.WINDOW.SETUP 89253 . 94973) (\SAFE.FIRST 94975 . 95362)) (96694 97601 (TEDITWINDOWP +96704 . 97599)) (97638 100134 (TEDIT.GETINPUT 97648 . 99631) (\TEDIT.MAKEFILENAME 99633 . 100132)) ( +100183 106634 (TEDIT.PROMPTPRINT 100193 . 103097) (TEDIT.PROMPTFLASH 103099 . 105054) ( +\TEDIT.PROMPT.PAGEFULLFN 105056 . 106632)) (106869 110862 (TEXTSTREAM.TITLE 106879 . 107500) ( +\TEDIT.ORIGINAL.WINDOW.TITLE 107502 . 109478) (\TEDIT.WINDOW.TITLE 109480 . 110150) ( +\TEXTSTREAM.FILENAME 110152 . 110860)) (110905 155804 (TEDIT.DEACTIVATE.WINDOW 110915 . 118222) ( +\TEDIT.REPAINTFN 118224 . 121081) (\TEDIT.RESHAPEFN 121083 . 126703) (\TEDIT.SCROLLFN 126705 . 155802) +) (155846 157895 (\TEDIT.PROCIDLEFN 155856 . 157205) (\TEDIT.PROCENTRYFN 157207 . 157500) ( +\TEDIT.PROCEXITFN 157502 . 157893)) (157974 168974 (\EDIT.DOWNCARET 157984 . 158665) (\EDIT.FLIPCARET +158667 . 160202) (TEDIT.FLASHCARET 160204 . 161318) (\EDIT.UPCARET 161320 . 161773) ( +TEDIT.NORMALIZECARET 161775 . 167726) (\SETCARET 167728 . 168648) (\TEDIT.CARET 168650 . 168972)) ( +169008 182763 (TEDIT.ADD.MENUITEM 169018 . 170933) (TEDIT.DEFAULT.MENUFN 170935 . 180202) ( +TEDIT.REMOVE.MENUITEM 180204 . 181205) (\TEDIT.CREATEMENU 181207 . 181660) (\TEDIT.MENU.WHENHELDFN +181662 . 182432) (\TEDIT.MENU.WHENSELECTEDFN 182434 . 182761))))) STOP diff --git a/library/TEDITWINDOW.LCOM b/library/TEDITWINDOW.LCOM index 0f4d0b90729144a2d28f58696b1217fc2fbf9249..80a3ff3964d96bd5cee1f4bed68f3bd34b6a7080 100644 GIT binary patch delta 1207 zcmZux%Wl&^6ipLSXey*4mGUTsOF%S1BzVS;INr2rJc*}DY|EK61eFDlLQ|lTN)bgY zir@pF^^!%`>{_BMSRt0|SpZ8G2nmGx35*|!D8iCGcaD$G+&kxv-@J?cco%!s7{^jZ zU%H*a0!D!H8pfKO-@2znA3Sk0(Wz5dPDAnlN7W=wQ@6fO-6}eyz(@nytB@?!D;4;g zn9XLB(7L(4)cT)*C??a1REbtdAfo?6>SyxwQkaQ_Wk9N$7cpo>qhOXvEyFBGmCPC> z7||)qhUuh1vmLTPt$Hn^^Zfo%Ry0Z01a)hmT*gxRpaN*Rnn>9oLxY;S)c_kLa7dY2 zCJ#lh2QUs{+p%odj9(q)LDgnyi2NFM_oA0B&fSghYkI_c`j2B`-0-peZpP@vp6^Ar z-S5$hWWIOwKG6H{IpI+kThVB=!tbFK`sLHfN@00!)Wersb4TM|aHHjmw0-o5hZx;+ zRrhCna`XLs_e}MK2aWkFzI|o*qo=m}qB<5yVXTCeg+*bchJX#c6QE33P)JxP${{FL zoB#u)C}7uF@Xo6okSs#K8DdD1+}Yu?BEo_v6fS`T84NRKgmUO%baE)2?ut@{e1`>N~F?>?uGcqtxXJGxiz4GK&K9C&hStG zuZ_9oJF!S4b_|9>&wX>B&Gtq*o)^21d=qwN{h_(C-<_uMSZ^|zzdav}A5*<*KraQ} zeG6u)Ke%Z5%BJ5R*9xzF#PDZh1~(PS65mdoy*jkFAK|0Kz}BcAR5zY>1!V18WbyCnMy0$S}+@`J=nm#kZ;RW#b0* z2BAqhJ0Hg7A+(_KP%{0HuV&c=rv^xrAYb-EA0R=5%UTe^$18V@oI)}EdNc`^Oslly zTg5(JP{20{+yW#6F*bq$!pvwI;l0EZixe4mV<|>f@nY=`i=-Up<0)cA+)CVHk)TnV zQWYpVwqG!-dCziv#{(4++ytYD6vxOig$+w06dZfb#~X1J8%<|MPrC8LM|ffhW^MQP$*dJ;Pp89m4~6zi`ZN(h!tCCU|B+qs z<5xQiMfLy7K;=1WME+{f=Sax;AGyB@g zDugo^Bm{PT$?&Q``c?Ib&LtNFt