Merge (rebase) Cleanup-character-IO-interfaces with master (#356)
* Cleanup of character IO interface Committing this branch for further testing. I know at least that the TTY output stream somehow is defaulting to :XCCS, which is wrong, but I haven't yet found the interface for that. * Clean out \NSIN etc No top-level calls to the NS specific functions, just to the generic \OUTCHAR etc. Updated full.database * MODERNIZE: added dragging for fixed-menu windows They can be dragged by their title bars * UNICODE: Added Greek to the default set Also made spelling of default-externalformats consistent with FILEIO * FASLOAD: EOL conversion in FASL::READ-TEXT EOL's printed as LF's will be read as EOL * LLREAD: Added meta as a CHARACTERSETNAME meta,a maps to 1,a now. But slowly propagating this to TEDIT, SEDIT, etc will make it easier to change the coding of meta characters, e.g. as part of a Unicode transition. * APRINT FILEIO LLREAD: \OUTCHAR now a closed function Removed the macro * LLKEY: call CHARCODE.DECODE directory in \KEYACTION1 Minor cleanup, avoid typical user entry and APPLY* * WHEELSCROLL: re-enable on AFTERMAKESYS/SYSOUT FORMS Also sets up mappings in the \COMMANDKEYACTIONS, whatever that is * ABASIC: NILL and ZERO change from LAMBDA NOBIND to LAMBDA NIL So that things like Masterscope don't break * MASTERSCOPE: Added WHEREIS as last-resort for CONTAINS Looks at the WHEREIS database, if present, for FNS and FUNCTIONS if it has no other information. . WHO CONTAINS ANY CALLING FOO works, but not the inverse: . WHO DOES FUM CONTAIN. We still need to figure out why the CONTAINS table isn't populated * POSTSCRIPTSTREAM: use standard \OUTCHAR conventions Now uses generic \OUTCHAR to get the proper function from the stream (or default) * Recompile with right EXPORTS.ALL Some of the macros weren't correct. * Fix POSTSCRIPTSTREAM Cleaner separation between external \OUTCHAR and internal BOUT * POSTSCRIPTSTREAM gets its own external format * Minor fix * Compile-time warning about EXPORTS.ALL * MODERNIZE: Modern button fn has same args as the original For Notecards #343 * Fixed another glitch in the MODERNIZE arglist thing \TEDIT.BUTTONEVENTFN actually takes a second STREAM argument. I don't see where it is ever called with that. The modernize replacement binds that argument, but it isn't being passed to the original. * FILEWATCH: added missing record field * Update FILEWATCH.LCOM * Eliminating record/type name conflicts Mostly just qualifying references, more work to get BIGBITMAP stuff out of ADISPLAY and to eliminate ambiguity of LINE record (now XXLINE in XXGEOM) * Compile away open calls to \OUTCHAR, add loadups/full.database Mostly new LCOMS where \OUTCHAR calls were compiled open * Remove garbage library/XCCS Old tools for reading wikipedia XCCS tables, sources/XCCS will deal with XCCS external format * Next step: Remove open input-character calls, factor XCCS to separate file XCCS is the default, but can be swapped out (eventually) by setting a few variables, without recompiling everything * Lots of residual cleanup for XCCS isolation * Delete old file MACINTERFACE (migrated to MODERNIZE) * Eliminate straggling NS calls: LAFITE, READINTERPRESS * Typo * READINTERPRESS: removed CHARSET * MODERNIZE: Interface to control title-bar response (for Notecards) * Many changes for external format name consistency Very close to the end of this * Put :FORMAT in file info, fix TEDIT plaintext hardcopy I distributed :FORMAT :XCCS as the default marking, but somehow one of the variables seems to get revert during the loadup. This is correct, as far as it goes. * Getting the format in the file-info This is all very twisty, different variables set in different places. It now seems to do the right thing, at least for new files. Marks them with :FORMAT :XCCS. * Another fileinfo glitch * CLIPBOARD -UNICODE: Make UTF8 to UTF-8 to match standards * MODERNIZE: fix bug in MODERWINDOW * External format as MAKEFILE option, LOAD applies the file's format (MAKEFILE 'XX '((FORMAT :UTF-8))) will dump XX as a UTF-8 file. LOAD will load it back to XCCS internal. * Compilers respect DEFINE-FILE-INFO format * MODERNIZE: little glitch * Delete old FILEIO.LCOM * More edge cases of external format thru MAKEFILE, PRETTY, PRETTYFILEINDEX etc. * FILEBROWSER: Can SEE UTF-8 Lisp sourcefile * INSPECT: Better macro for inspecting readtables * recompile changed files and do new loadup Co-authored-by: rmkaplan <ron.kaplan@post.harvard.edu>
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
(FILECREATED "29-Apr-2021 09:38:58" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATERM.;4 56766
|
||||
(FILECREATED "23-Jun-2021 12:31:16" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATERM.;2 57229
|
||||
|
||||
changes to%: (FNS \CREATELINEBUFFER)
|
||||
changes to%: (FNS \CHDEL1)
|
||||
|
||||
previous date%: "16-May-90 12:08:04"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATERM.;3)
|
||||
previous date%: "10-May-2021 15:07:31"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATERM.;1)
|
||||
|
||||
|
||||
(* ; "
|
||||
@@ -181,10 +181,10 @@ Copyright (c) 1982-1988, 1990, 2021 by Venue & Xerox Corporation.
|
||||
(SETQ TtyDisplayStream (SETQ \TERM.OFD STREAM])])
|
||||
|
||||
(\CHDEL1
|
||||
[LAMBDA NIL (* rmk%: "28-Mar-85 18:25")
|
||||
[LAMBDA NIL (* ; "Edited 23-Jun-2021 12:29 by rmk:")
|
||||
(COND
|
||||
((\BACKNSCHAR \LINEBUF.OFD (UNFOLD \NORUNCODE 256))
|
||||
(PROG1 (\NSPEEK \LINEBUF.OFD (UNFOLD \NORUNCODE 256))
|
||||
((\BACKCCODE \LINEBUF.OFD)
|
||||
(PROG1 (\PEEKCCODE \LINEBUF.OFD)
|
||||
(\SETEOFPTR \LINEBUF.OFD (GETFILEPTR \LINEBUF.OFD)))])
|
||||
|
||||
(\CLOSELINE
|
||||
@@ -243,7 +243,7 @@ Copyright (c) 1982-1988, 1990, 2021 by Venue & Xerox Corporation.
|
||||
T])
|
||||
|
||||
(\FILLBUFFER
|
||||
[LAMBDA (FILLTYPE) (* ; "Edited 20-Aug-87 17:52 by jds")
|
||||
[LAMBDA (FILLTYPE) (* ; "Edited 5-May-2021 20:45 by rmk:")
|
||||
|
||||
(* ;; "While filling the line, the current file pointer is the end of the line. When the line is closed, this is made the eof. *READTABLE* is used for syntactic delimiters and paren counting on READ and RATOM calls but isn't referenced (or bound) for READC")
|
||||
|
||||
@@ -300,8 +300,10 @@ Copyright (c) 1982-1988, 1990, 2021 by Venue & Xerox Corporation.
|
||||
(\SETFILEPTR \LINEBUF.OFD 0)
|
||||
(replace (LINEBUFFER LINEBUFSTATE) of \LINEBUF.OFD with
|
||||
RETYPING.LBS))
|
||||
[until (\PAGEDEOFP \LINEBUF.OFD)
|
||||
do (\OUTCHAR \TERM.OFD (\NSIN \LINEBUF.OFD (UNFOLD \NORUNCODE 256]
|
||||
(until (\PAGEDEOFP \LINEBUF.OFD) do (\OUTCHAR \TERM.OFD (\INCHAR
|
||||
|
||||
\LINEBUF.OFD
|
||||
)))
|
||||
(replace (LINEBUFFER LINEBUFSTATE) of \LINEBUF.OFD with
|
||||
FILLING.LBS
|
||||
)
|
||||
@@ -424,13 +426,14 @@ Copyright (c) 1982-1988, 1990, 2021 by Venue & Xerox Corporation.
|
||||
(replace (LINEBUFFER LBRKCOUNT) of \LINEBUF.OFD with ILB)
|
||||
(replace (LINEBUFFER INSTRINGP) of \LINEBUF.OFD with ISP)
|
||||
(replace (LINEBUFFER LPARCOUNT) of \LINEBUF.OFD with ILP))
|
||||
[until (\PAGEDEOFP \LINEBUF.OFD)
|
||||
do (SETQ CHAR (\NSIN \LINEBUF.OFD (UNFOLD \NORUNCODE 256)))
|
||||
(COND
|
||||
[(EQ ESCAPE.RC (SETQ RSNX (\SYNCODE RTBLSA CHAR)))
|
||||
(OR (\PAGEDEOFP \LINEBUF.OFD)
|
||||
(\NSIN \LINEBUF.OFD (UNFOLD \NORUNCODE 256]
|
||||
(T (\INCPARENCOUNT RSNX]
|
||||
[until (\PAGEDEOFP \LINEBUF.OFD) do (SETQ CHAR (\INCHAR \LINEBUF.OFD))
|
||||
(COND
|
||||
((EQ ESCAPE.RC (SETQ RSNX
|
||||
(\SYNCODE RTBLSA
|
||||
CHAR)))
|
||||
(OR (\PAGEDEOFP \LINEBUF.OFD)
|
||||
(\INCHAR \LINEBUF.OFD)))
|
||||
(T (\INCPARENCOUNT RSNX]
|
||||
(replace (LINEBUFFER LINEBUFSTATE) of \LINEBUF.OFD with FILLING.LBS
|
||||
)))
|
||||
(GO NEXT)
|
||||
@@ -1136,18 +1139,18 @@ Copyright (c) 1982-1988, 1990, 2021 by Venue & Xerox Corporation.
|
||||
)
|
||||
(PUTPROPS ATERM COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 2021))
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (2982 31202 (BKLINBUF 2992 . 3467) (CLEARBUF 3469 . 4801) (LINBUF 4803 . 4989) (
|
||||
PAGEFULLFN 4991 . 6472) (SETLINELENGTH 6474 . 6670) (SYSBUF 6672 . 6858) (TERMCHARWIDTH 6860 . 7277) (
|
||||
TERMINAL-INPUT 7279 . 7847) (TERMINAL-OUTPUT 7849 . 8435) (\CHDEL1 8437 . 8740) (\CLOSELINE 8742 .
|
||||
9031) (\DECPARENCOUNT 9033 . 10616) (\ECHOCHAR 10618 . 11310) (\FILLBUFFER 11312 . 23532) (
|
||||
\FILLBUFFER.WORDSEPRP 23534 . 23779) (\FILLBUFFER.BACKUP 23781 . 23960) (\GETCHAR 23962 . 24351) (
|
||||
\INCPARENCOUNT 24353 . 26965) (\RESETLINE 26967 . 27291) (\RESETTERMINAL 27293 . 28057) (\SAVELINEBUF
|
||||
28059 . 30030) (\STOPSCROLL? 30032 . 31200)) (31413 35269 (\DSCCOUT 31423 . 34563) (\INITBCPLDISPLAY
|
||||
34565 . 35267)) (35462 36712 (VIDEOCOLOR 35472 . 36710)) (37544 43398 (\PEEKREFILL 37554 . 41665) (
|
||||
\READREFILL 41667 . 42261) (\RATOM/RSTRING-REFILL 42263 . 42841) (\READCREFILL 42843 . 43396)) (43399
|
||||
45228 (DRIBBLE 43409 . 45010) (DRIBBLEFILE 45012 . 45226)) (45229 51904 (\SETUP.DEFAULT.LINEBUF 45239
|
||||
. 47696) (\CREATELINEBUFFER 47698 . 50120) (\LINEBUF.READP 50122 . 50471) (\LINEBUF.EOFP 50473 .
|
||||
50812) (\LINEBUF.PEEKBIN 50814 . 51021) (\OPENLINEBUF 51023 . 51902)) (51979 53218 (LINEBUFFER-EOFP
|
||||
51989 . 52447) (LINEBUFFER-SKIPSEPRS 52449 . 53216)) (53575 53849 (\INTERMP 53585 . 53716) (\OUTTERMP
|
||||
53718 . 53847)))))
|
||||
(FILEMAP (NIL (2974 31665 (BKLINBUF 2984 . 3459) (CLEARBUF 3461 . 4793) (LINBUF 4795 . 4981) (
|
||||
PAGEFULLFN 4983 . 6464) (SETLINELENGTH 6466 . 6662) (SYSBUF 6664 . 6850) (TERMCHARWIDTH 6852 . 7269) (
|
||||
TERMINAL-INPUT 7271 . 7839) (TERMINAL-OUTPUT 7841 . 8427) (\CHDEL1 8429 . 8698) (\CLOSELINE 8700 .
|
||||
8989) (\DECPARENCOUNT 8991 . 10574) (\ECHOCHAR 10576 . 11268) (\FILLBUFFER 11270 . 23995) (
|
||||
\FILLBUFFER.WORDSEPRP 23997 . 24242) (\FILLBUFFER.BACKUP 24244 . 24423) (\GETCHAR 24425 . 24814) (
|
||||
\INCPARENCOUNT 24816 . 27428) (\RESETLINE 27430 . 27754) (\RESETTERMINAL 27756 . 28520) (\SAVELINEBUF
|
||||
28522 . 30493) (\STOPSCROLL? 30495 . 31663)) (31876 35732 (\DSCCOUT 31886 . 35026) (\INITBCPLDISPLAY
|
||||
35028 . 35730)) (35925 37175 (VIDEOCOLOR 35935 . 37173)) (38007 43861 (\PEEKREFILL 38017 . 42128) (
|
||||
\READREFILL 42130 . 42724) (\RATOM/RSTRING-REFILL 42726 . 43304) (\READCREFILL 43306 . 43859)) (43862
|
||||
45691 (DRIBBLE 43872 . 45473) (DRIBBLEFILE 45475 . 45689)) (45692 52367 (\SETUP.DEFAULT.LINEBUF 45702
|
||||
. 48159) (\CREATELINEBUFFER 48161 . 50583) (\LINEBUF.READP 50585 . 50934) (\LINEBUF.EOFP 50936 .
|
||||
51275) (\LINEBUF.PEEKBIN 51277 . 51484) (\OPENLINEBUF 51486 . 52365)) (52442 53681 (LINEBUFFER-EOFP
|
||||
52452 . 52910) (LINEBUFFER-SKIPSEPRS 52912 . 53679)) (54038 54312 (\INTERMP 54048 . 54179) (\OUTTERMP
|
||||
54181 . 54310)))))
|
||||
STOP
|
||||
|
||||
Reference in New Issue
Block a user