From 156b14851baf7cc19e9558e0d249d2eb3743a3d1 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Fri, 4 Mar 2022 19:49:07 -0800 Subject: [PATCH] Add MAKESYSDATE to logo window title, just delete Venue logo code --- sources/LOADUP-FULL | 8 +-- sources/LOADUP-FULL.LCOM | Bin 4181 -> 4123 bytes sources/LOADUP-LISP | 19 ++++--- sources/LOADUP-LISP.LCOM | Bin 3499 -> 3484 bytes sources/LOGOW | 114 ++++++--------------------------------- sources/LOGOW.DFASL | Bin 6810 -> 0 bytes sources/LOGOW.LCOM | Bin 10487 -> 10384 bytes 7 files changed, 32 insertions(+), 109 deletions(-) delete mode 100644 sources/LOGOW.DFASL diff --git a/sources/LOADUP-FULL b/sources/LOADUP-FULL index 012dd5bb..43ac0b07 100644 --- a/sources/LOADUP-FULL +++ b/sources/LOADUP-FULL @@ -1,10 +1,10 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 2-Mar-2022 13:58:38" {DSK}larry>medley>sources>LOADUP-FULL.;3 4768 +(FILECREATED " 4-Mar-2022 19:17:17" {DSK}larry>medley>sources>LOADUP-FULL.;2 4746 - :CHANGES-TO (FNS LOADUP-FULL LOADFULLFONTS FIXMETA) + :CHANGES-TO (FNS LOADUP-FULL) - :PREVIOUS-DATE "15-Jan-2022 15:49:06" {DSK}larry>medley>sources>LOADUP-FULL.;1) + :PREVIOUS-DATE " 2-Mar-2022 13:58:38" {DSK}larry>medley>sources>LOADUP-FULL.;1) (PRETTYCOMPRINT LOADUP-FULLCOMS) @@ -102,5 +102,5 @@ (FIXMETA) (DECLARE%: DONTCOPY - (FILEMAP (NIL (661 4730 (LOADFULLFONTS 671 . 2112) (LOADUP-FULL 2114 . 4480) (FIXMETA 4482 . 4728))))) + (FILEMAP (NIL (639 4708 (LOADFULLFONTS 649 . 2090) (LOADUP-FULL 2092 . 4458) (FIXMETA 4460 . 4706))))) STOP diff --git a/sources/LOADUP-FULL.LCOM b/sources/LOADUP-FULL.LCOM index d8f6fe7ea079ce185e452a0d66dc4911898a0d54..0a2bfc6beb7796c0429e6261e506960ccd289ece 100644 GIT binary patch delta 890 zcmZWnO>YuW6fLG2i`9)AmnRdAP(z*f-oSh;Gy^C8Yj3^C9cG`lzGctz4>OT}J7=gTUbX5=aJzz3Diy_T z*9W%@)ch!w9dJ{iKbj&8Xyiq1>Uk)~#!qp<0WA znC4^XP+lM-O3%tBs$S?OT~NHh-IJug^lq4Nu0*rq_R~9M>oVHj%*_oH;wV*VE%9QN zDti8)2(DWwG*y6I3bL;jfLH?lKZMytq2djIC=2!)u@;mykO!lA6qM?&DRYxJX>$$G zlnSdct<)K_X(2xz(T1Zx8IOnk8Lj$kLZDry%|0KEFq-rR=chQE^`?trZw4(7YOc{& d;n3a_X?HL^J~$W+HPDo_*~zJf%fX{xxxab5;%@)| delta 895 zcmZuv%Wl&^6m6;kZQ8OyEC2}|Ss*1vi85n5b}XdIi6`n%JGSge(`*n)leQ6QQl&wN zRek~FB^y@!K-YW(3&cmTP8$+|xG+{ZaHpYa194S}- zpWg1y^gOZ}*iy3W=$2!c8oHDI(fI6qFzokmblMr6^e>(}7>%c=gV6~FBWU%e?_;^R zSS)Jjb*5DD->#OH&*tjV7qwWpN_a@WX1u#P46AIX?=w$#;fJm_Z(9!=DnVTy212=c zI8iJPWY|m!9@Rl(X5m$5bS=kpjEYk#Ysg-H%RIifAyI-CN`>_2`s+K!%GydMbv9mX zj#ubepMSFH@y3@-lx}C=%uIN(tX6#iy;MRXlnSE**9W(4)ci0JEpW?1OE$c)6@izn zt0kKhnkD!$QBhNY>-Impb6sB$nPt-u5rhW6`e=(lc)n;;dzcn#VWZ}5 zD3~;mTur;1FWUxWLn`U|2^pYcr?nRreAy5?WCH)|mzJ;A!XP523%T)4vW3XpxYhxHIP7UdUmeSrG*ysd&B+*98bn)kfUjTG8|l-7srzmjE`}dyZ<}$ E2Uj=Vod5s; diff --git a/sources/LOADUP-LISP b/sources/LOADUP-LISP index 1fbb4bad..7e590ddf 100644 --- a/sources/LOADUP-LISP +++ b/sources/LOADUP-LISP @@ -1,10 +1,10 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10) -(FILECREATED " 2-Mar-2022 16:31:39" |{DSK}larry>medley>sources>LOADUP-LISP.;6| 5027 +(FILECREATED " 4-Mar-2022 19:17:17" |{DSK}larry>medley>sources>LOADUP-LISP.;2| 5132 :CHANGES-TO (FNS LOADUP-LISP) - :PREVIOUS-DATE "28-Feb-2022 20:34:55" |{DSK}larry>medley>sources>LOADUP-LISP.;1|) + :PREVIOUS-DATE " 2-Mar-2022 16:31:39" |{DSK}larry>medley>sources>LOADUP-LISP.;1|) (PRETTYCOMPRINT LOADUP-LISPCOMS) @@ -17,7 +17,8 @@ (DEFINEQ (LOADUP-LISP - (LAMBDA NIL (* \; "Edited 2-Mar-2022 16:31 by larry") + (LAMBDA NIL (* \; "Edited 4-Mar-2022 19:13 by larry") + (* \; "Edited 2-Mar-2022 16:31 by larry") (* \; "Edited 28-Feb-2022 15:02 by larry") (* \; "Edited 29-Apr-2021 22:30 by rmk:") (SETQQ COMPILE.EXT LCOM) (* \; "should be set earlier") @@ -85,9 +86,10 @@ (LOADUP '(TIME)) (LOADUP '(BRKDWN)) (LOADUP '(LOGOW IDLER HARDCOPY ICONW FREEMENU SEDIT)) - (LOGOW) - (LOADUP '(XCL-EXTRAS)) (* - "CMLPACKAGE pushes onto INSPECTMACROS") + (LOADUP '(XCL-EXTRAS)) + + (* |;;| "CMLPACKAGE pushes onto INSPECTMACROS") + (LOADUP '(CMLPACKAGE)) (* |;;| "Puts ARGNAME properties on CL and XCL functions that IL:SMARTARGLIST can't hack. Keep this last so everything will be defined when it runs") @@ -98,6 +100,9 @@ (* |;;| "Already enabled, but this time fixes tables that weren't defined in the init") (PACKAGE-ENABLE) + + (* |;;| " networking code -- should make it optional but too many cross dependencies") + (LOADUP '(PUP 10MBDRIVER LEAF LLETHER DPUPFTP LOCALFILE DSKDISPLAY COURIER LLNS TRSERVER SPP NSPRINT AUTHENTICATION BSP CLEARINGHOUSE NSFILING MAIKOETHER)) (DRIBBLE) @@ -112,5 +117,5 @@ (GLOBALVARS LISPMAKESYSDATE MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (642 4805 (LOADUP-LISP 652 . 4803))))) + (FILEMAP (NIL (642 4910 (LOADUP-LISP 652 . 4908))))) STOP diff --git a/sources/LOADUP-LISP.LCOM b/sources/LOADUP-LISP.LCOM index c796cc265f2721166c1c87599c1a9a21a8d993b3..6507ba95dbfbe40e4717a3ddf4529c4005c8cde5 100644 GIT binary patch delta 353 zcmZ22Jx6*%kg$oaZ(@o8W*Sasso)M5D;lxx2DYF_)1ui88LsVIFD-+X+`;CK< zg!T0FloV=G5=&B3YOw1tSJLFtaP#zWbq;cM3~_Z)P*Om%)X>V0gyIGBbsezIC z|mU;*^?=lk&$Ea1ty)zN0^mkEfrjXJe{0; zTosHhO%#0m9bG~L6pSrQ6apNby&c_MbzS`&!LsI-a9J}1(-grpK`@O$On3kA%~mWn zjDnU5zK-6m!I8m!j=ru6CI%*x+gW27Ehj%^oyufxGP#CLMa|4aLBrYCC)n39D8wlarry>medley>sources>LOGOW.;4| 18595 +(FILECREATED " 4-Mar-2022 19:31:19" |{DSK}larry>medley>sources>LOGOW.;2| 13188 - :CHANGES-TO (VARS LOGOWCOMS) + :CHANGES-TO (FNS LOGOW) - :PREVIOUS-DATE "28-Feb-2022 21:48:48" |{DSK}larry>medley>sources>LOGOW.;1|) + :PREVIOUS-DATE " 4-Mar-2022 19:17:17" |{DSK}larry>medley>sources>LOGOW.;1|) ; Copyright (c) 1986-1991, 2022 by Venue. (PRETTYCOMPRINT LOGOWCOMS) -(RPAQQ LOGOWCOMS - ((FNS KOTOLOGOW LOGOW \\DRAWLOGOWINDOWIMAGE) - (VARS LOGOBITMAP) - (INITVARS (LOGOW NIL) - (LOGOTITLEFONT (FONTCREATE '(HELVETICA 6))) - (LOGONAMEFONT (FONTCREATE 'HELVETICA 36 'BOLD))) - (PROP (LOGOW FILETYPE)))) +(RPAQQ LOGOWCOMS ((FNS KOTOLOGOW LOGOW \\DRAWLOGOWINDOWIMAGE) + (VARS LOGOBITMAP) + (INITVARS (LOGOW NIL)) + (ADDVARS (AFTERMAKESYSFORMS (LOGOW))) + (PROP (LOGOW FILETYPE)))) (DEFINEQ (KOTOLOGOW @@ -67,95 +65,17 @@ (RETURN W)))) (LOGOW - (LAMBDA (STRING WHERE TITLE TITLE-LOCATION) (* \; "Edited 28-Feb-2022 20:14 by larry") + (LAMBDA (STRING WHERE TITLE TITLE-LOCATION) (* \; "Edited 4-Mar-2022 19:05 by larry") (* \; "Edited 12-Jul-91 03:12 by jds") (PROG (WINDOW) (CL:WHEN (WINDOWP LOGOW) (CLOSEW LOGOW)) (OR STRING (SETQ STRING (OR "Medley" (CL:STRING-CAPITALIZE MAKESYSNAME)))) - (OR TITLE (SETQ TITLE "https://Interlisp.org")) (* \; "(LOGOW NIL) gives default") + (OR TITLE (SETQ TITLE (CONCAT "https://Interlisp.org" " " MAKESYSDATE))) + + (* |;;| "(LOGOW NIL) gives default") + (SETQ WINDOW (KOTOLOGOW STRING T TITLE)) - (|if| NIL - |then| (OR TITLE-LOCATION (SETQ TITLE-LOCATION :LINE)) - (OR TITLE (SETQ TITLE (CL:FORMAT NIL - "Copyright (c) ~D Venue, Oakland, CA. All Rights Reserved." - (LOADTIMECONSTANT (CL:MULTIPLE-VALUE-BIND - (A B C D E YEAR) - (CL:GET-DECODED-TIME) - YEAR))))) - (LET* ((SHADOWDX 2) - (SHADOWDY 2) - (TITLE-BOTTOM-HEIGHT (COND - ((EQ TITLE-LOCATION :BOTTOM) - (* \; - "Magic 4 again, just a little space above the copyright notice.") - (+ (FONTHEIGHT LOGOTITLEFONT) - 4)) - (T 0))) - (LINE (COND - ((EQ TITLE-LOCATION :LINE) - (FONTHEIGHT LOGOTITLEFONT)) - (T 4))) - (SLEN (STRINGWIDTH STRING LOGONAMEFONT)) - (WLEN (+ (MAX SLEN (+ (BITMAPWIDTH LOGOBITMAP) - 2 2) - (STRINGWIDTH TITLE LOGOTITLEFONT)) - (PROG1 (+ 4 4) (* \; "left and right margin") - ))) - (WHT (+ (FONTHEIGHT LOGONAMEFONT) - (PROG1 (+ 4 LINE 4 4) (* \; - "below line, line, above line, above bitmap") - ) - (BITMAPHEIGHT LOGOBITMAP) - TITLE-BOTTOM-HEIGHT)) - (TEMP (BITMAPCREATE WLEN WHT)) - (IMAGE (BITMAPCREATE WLEN WHT)) - (MASK (BITMAPCREATE WLEN WHT)) - (STREAM (DSPCREATE TEMP)) - WINDOW LINEY LINEX TITLEWIDTH) - (BITBLT LOGOBITMAP NIL NIL STREAM (DIFFERENCE WLEN (+ (BITMAPWIDTH - LOGOBITMAP) - (PROG1 6 - (* \; "right margin")))) - (+ TITLE-BOTTOM-HEIGHT (FONTHEIGHT LOGONAMEFONT) - 4 LINE 4)) - (DSPFONT LOGONAMEFONT STREAM) - (MOVETO (- WLEN 4 (STRINGWIDTH STRING STREAM)) - (+ (FONTDESCENT LOGONAMEFONT) - TITLE-BOTTOM-HEIGHT) - STREAM) - (PRIN3 STRING STREAM) - (BITBLT STREAM 0 0 IMAGE NIL NIL NIL NIL NIL 'ERASE) - (BITBLT STREAM 0 0 IMAGE SHADOWDX (- SHADOWDY) - NIL NIL NIL 'PAINT) - (BITBLT STREAM 0 0 MASK SHADOWDX (- SHADOWDY) - NIL NIL NIL 'PAINT) - (BITBLT STREAM 0 0 MASK NIL NIL NIL NIL NIL 'PAINT) - (SETQ TITLEWIDTH (STRINGWIDTH TITLE LOGOTITLEFONT)) - (BITBLT NIL NIL NIL IMAGE (SETQ LINEX 6) - (SETQ LINEY (+ TITLE-BOTTOM-HEIGHT (FONTHEIGHT LOGONAMEFONT) - 4)) - (IMAX TITLEWIDTH (BITMAPWIDTH LOGOBITMAP)) - LINE - 'TEXTURE - 'PAINT BLACKSHADE) - (BITBLT NIL NIL NIL MASK LINEX LINEY TITLEWIDTH LINE 'TEXTURE 'PAINT - BLACKSHADE) - (SETQ STREAM (DSPCREATE IMAGE)) - (DSPFONT LOGOTITLEFONT STREAM) - (DSPOPERATION 'ERASE STREAM) - (DSPTEXTURE BLACKSHADE STREAM) - (MOVETO (ADD1 LINEX) - (+ (FONTDESCENT LOGOTITLEFONT) - (COND - ((EQ TITLE-LOCATION :BOTTOM) - 0) - (T LINEY))) - STREAM) - (PRIN3 TITLE STREAM) - (SETQ WINDOW (ICONW IMAGE MASK (OR WHERE (CREATEPOSITION (- SCREENWIDTH - WLEN) - (- SCREENHEIGHT WHT))))))) (WINDOWPROP WINDOW 'BUTTONEVENTFN 'MOVEW) (WINDOWPROP WINDOW 'TYPE 'LOGOW) (WINDOWPROP WINDOW 'CLOSEFN (FUNCTION (LAMBDA NIL @@ -184,11 +104,9 @@ (RPAQ? LOGOW NIL) -(RPAQ? LOGOTITLEFONT (FONTCREATE '(HELVETICA 6))) - -(RPAQ? LOGONAMEFONT (FONTCREATE 'HELVETICA 36 'BOLD)) +(ADDTOVAR AFTERMAKESYSFORMS (LOGOW)) (PUTPROPS LOGOW COPYRIGHT ("Venue" 1986 1987 1988 1989 1990 1991 2022)) (DECLARE\: DONTCOPY - (FILEMAP (NIL (644 10406 (KOTOLOGOW 654 . 3448) (LOGOW 3450 . 9697) (\\DRAWLOGOWINDOWIMAGE 9699 . -10404))))) + (FILEMAP (NIL (596 5071 (KOTOLOGOW 606 . 3400) (LOGOW 3402 . 4362) (\\DRAWLOGOWINDOWIMAGE 4364 . 5069) +)))) STOP diff --git a/sources/LOGOW.DFASL b/sources/LOGOW.DFASL deleted file mode 100644 index e9cc693817f005f41a6881f27e80d21c7cf8e112..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6810 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 H(`xm9hBjM{ diff --git a/sources/LOGOW.LCOM b/sources/LOGOW.LCOM index 190150629af00e4d2eb73b5b12df1b04a70da8f2..4863954adad74b3f36a6f4d5cb7a057345b9e535 100644 GIT binary patch delta 559 zcmZ{g&1%~~6oso2;#S!NLt8=vIZ-HR3N{)^RF)tM#Tun1vPPE1HpwdfBMsz_I7>la z!A1K(cisC1`WAhZKvo%9UG#Sr!=1TvzB%_i^cKBEx@kAMquYjQm?o&}S@g?z|FfAB zs2YB6$*xH?Z%&@Y)~!_>g4{!J&t726g3vz)Mm# z=l6NK|wA{kglQ%!|i$)R$Y=&*WNdr)9NKY}dj%HC!ZpG3>+vA0{bJ zP>gGPuM8YZcQ<>U-4*+$kzU*w=Fl`jUEj9vFOSytN{6a} zzLBhvZ#x>akf(W^Fe8%BLc{9&j}^42N)o&_3(Im4YDaK4Z%U`peR)&e9GrCQ>nwx3s%RxDvgOG zLNh%hT3&X$nbfyEd7EF#psD)HHB_>-idZBp;+X*1zFioQS;ZxRoU){5A`Sz%x;$tt zS&;tM@z