github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-02-18 21:57:15 +00:00
Code Issues Projects Releases Wiki Activity

Rmk31 Move all TMAX* files to TMAX>TMAX* (#750)

Browse Source 
* MACHINEINDEPENDENT: better searching for foo-fie

FINDFILE-WITH-EXTENSIONS, DOFILESLOAD

* MEDLEY-UTILS, PRINTFN:  WHEREIS/PF know about foo>foo-fie

* WHERE-IS:  Just MAKEFILE-NEW to get FUNCTIONS into the filemap

* ACE does LOADCOMP itself

* MACHINEINDEPENDENT:  FINDFILE-WITH-EXTENSIONS recognized SUBDIRECTORY

* SPELLFILE:  Calls FINDFILE-WITH-EXTENSIONS at the top

So FINDFILE and FILE-NOT-FOUND will consider FOO>FOO-FIE for file FOO-FIE

* WINDOWOBJ:  Missing GETFN does WHEREIS #748

* TMAX*:  Localize IMAGEFNS

The various IMAGEFNS were defined on TMAX itself, not on the file where the functions were (esp GETFN).

Also fixed some dependencies.  With new WINDOWOBJ, TMAX.TEDIT finds its image objects.

* Move TMAX files to TMAX>

Given the WHEREIS change for GETFN and the FINDFILE-WITH-EXTENSIONS in SPELLFILE, TEDIT(TMAX.TEDIT) opens and all of its imageobjects are found and loaded from the TMAX> files.

* Push relocated files again:  (COPYFILES screwed up)

* Delete TMAX.INDEX   garbage file
This commit is contained in:
rmkaplan
2022-04-23 21:36:23 -07:00
committed by GitHub
parent f9f1038efb
commit 1eccc2e59b
37 changed files with 821 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
lispusers/ACE/ACE
View File

@@ -1,33 +1,28 @@
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
(FILECREATED "16-Nov-93 14:13:50" {DSK}<king>export>lispcore>lispusers>ACE.;3 148254
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
changes to%: (VARS ACE.BITMAP.MASK ACE-EDITCOMS ACELOGOMAP)
(FNS ACE ACE.ANIMATE ACE.RUN ACEGETFRAME# ACERUNLOOP ACE.NEW.SEQUENCE
ACE.NEW.FRAME ACE.QUIT.ACE ACE.RESET.SEQ ACE.RUN.CURRENT.SEQ ACE.DELAY
ACE.DELAY.FRAME ACE.DELAY.SEQ ACE.DECREMENT.FRAME ACE.INCREMENT.FRAME
ACE.DELETE.FRAME ACE.SET.DEVICE ACE.QUICKDRAW&UPD ACE.RECONSTRUCT.FRAME
SUBLIST ACE.TRILLIUM ACE.TRILLIUM.LOOP ACE.RUN.TRILLIUM ACE.QUIT.TRILLIUM
ACE.CREATE.EDITING.BORDER ACE.GET.SEQ.FILE ACE.PUT.SEQ.FILE
ACE.GET.A.FILE.NAME ACE.ASKEM ACE.TELLEM ACE.CONFIRMIT ACE.DEFINE.SEQ.WINDOW
ACE.FIGURE.OUT.WINDOW ACE.RETURN.CLOSEST.VERTEX ACE.NEW.SEQ.ASST
ACE.DELAY.FRAME.ASST ACE.SETUP.CW.CLIPPING.REGIONS ACE.CHECKSTUFF
ACE.UPD.CONTROL.WINDOW ACE.UPD.CW.MULE ACE.UPD.CLEAR.SET.LINE
ACE.CREATE.CONTROL.MENU ACE.SEQ.FETCH.WIDTH ACE.SEQ.FETCH.HEIGHT
ACE.SET.SEQ.CLIP.REGION ACE.ASKEM2 ACE.TELLEM2 ACE.UPD.CONTROL.WINDOW2
ACE.COMPILE.FRAME ACE.EXTRACT ACESETTHRESHOLD ACE.MAX.REGIONS
ACE.PICK.BEST.REGION ACE.COMPUTE.AREA ACE.SCAN.BITMAPS ACE.SCAN.PRIMBLOCKS
ACE.FETCH.BLOCK)
(FILECREATED "16-Mar-2022 08:06:56" {DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>ACE>ACE.;2 146646
previous date%: "16-Nov-93 13:52:56" {DSK}<king>export>lispcore>lispusers>ACE.;2)
:CHANGES-TO (VARS ACECOMS ACE-MAINCOMS ACE-PRIMCOMS ACE.PIXPERWORD ACE.BITMAP.MASK ACE-EDITCOMS
)
(RECORDS ACE.FRAME ACE.BLIT)
(MACROS ACE.MT.SCRX.SEQX ACE.MT.SCRY.SEQY ACE.MT.SCRX.AWX ACE.MT.SCRY.AWY
ACE.MT.SEQ.SCR.REGION ACE.MT.SEQ.AW.REGION ACE.MT.AW.SCR.POINT
ACE.MT.AWX.SCRX ACE.MT.AWY.SCRY ACE.MT.AWX.SEQX ACE.MT.AWY.SEQY
ACE.MT.SEQX.SCRX ACE.MT.SEQY.SCRY ACE.MT.SEQX.AWX ACE.MT.SEQY.AWY
ACE.MAC.CW.INFO.CLIP ACE.MAC.CW.PROMPT.CLIP ACE.MAC.SEQ.CLIP
ACE.MAC.FETCH.WIDTH ACE.MAC.FETCH.HEIGHT)
:PREVIOUS-DATE "16-Nov-93 14:13:50"
{DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>ACE>ACE.;1)
(* ; "
Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
Copyright (c) 1988, 1993 by Michel Denber.
")
(PRETTYCOMPRINT ACECOMS)
(RPAQQ ACECOMS
(RPAQQ ACECOMS
(
(* ;; "Animation Compiler and Environment")
@@ -65,63 +60,63 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
(DECLARE%: EVAL@COMPILE
(PUTPROPS ACE.MT.SCRX.SEQX MACRO ((SCREENXCOOR)
(PUTPROPS ACE.MT.SCRX.SEQX MACRO ((SCREENXCOOR)
(IDIFFERENCE [IDIFFERENCE SCREENXCOOR (DSPXOFFSET
NIL
(WINDOWPROP ACE.SEQ.WINDOW
'DSP]
ACE.SEQ.WINDOW.XOFF)))
(PUTPROPS ACE.MT.SCRY.SEQY MACRO ((SCREENYCOOR)
(PUTPROPS ACE.MT.SCRY.SEQY MACRO ((SCREENYCOOR)
(IDIFFERENCE [IDIFFERENCE SCREENYCOOR (DSPYOFFSET
NIL
(WINDOWPROP ACE.SEQ.WINDOW
'DSP]
ACE.SEQ.WINDOW.YOFF)))
[PUTPROPS ACE.MT.SCRX.AWX MACRO ((SCREENXCOOR)
(PUTPROPS ACE.MT.SCRX.AWX MACRO [(SCREENXCOOR)
(IDIFFERENCE SCREENXCOOR (DSPXOFFSET NIL (WINDOWPROP ACE.SEQ.WINDOW
'DSP]
'DSP])
[PUTPROPS ACE.MT.SCRY.AWY MACRO ((SCREENYCOOR)
(PUTPROPS ACE.MT.SCRY.AWY MACRO [(SCREENYCOOR)
(IDIFFERENCE SCREENYCOOR (DSPYOFFSET NIL (WINDOWPROP ACE.SEQ.WINDOW
'DSP]
'DSP])
(PUTPROPS ACE.MT.SEQ.SCR.REGION MACRO (NIL (CREATEREGION (ACE.MT.SEQX.SCRX 0)
(PUTPROPS ACE.MT.SEQ.SCR.REGION MACRO (NIL (CREATEREGION (ACE.MT.SEQX.SCRX 0)
(ACE.MT.SEQY.SCRY 0)
ACE.SEQ.WIDTH ACE.SEQ.HEIGHT)))
(PUTPROPS ACE.MT.SEQ.AW.REGION MACRO (NIL (CREATEREGION ACE.SEQ.WINDOW.XOFF ACE.SEQ.WINDOW.YOFF
(PUTPROPS ACE.MT.SEQ.AW.REGION MACRO (NIL (CREATEREGION ACE.SEQ.WINDOW.XOFF ACE.SEQ.WINDOW.YOFF
ACE.SEQ.WIDTH ACE.SEQ.HEIGHT)))
[PUTPROPS ACE.MT.AW.SCR.POINT MACRO ((POINT)
(PUTPROPS ACE.MT.AW.SCR.POINT MACRO [(POINT)
(CONS (ACE.MT.AWX.SCRX (CAR POINT))
(ACE.MT.AWY.SCRY (CDR POINT]
(ACE.MT.AWY.SCRY (CDR POINT])
[PUTPROPS ACE.MT.AWX.SCRX MACRO ((WINDOWXCOOR)
(PUTPROPS ACE.MT.AWX.SCRX MACRO [(WINDOWXCOOR)
(IPLUS WINDOWXCOOR (DSPXOFFSET NIL (WINDOWPROP ACE.SEQ.WINDOW
'DSP]
'DSP])
[PUTPROPS ACE.MT.AWY.SCRY MACRO ((WINDOWYCOOR)
(PUTPROPS ACE.MT.AWY.SCRY MACRO [(WINDOWYCOOR)
(IPLUS WINDOWYCOOR (DSPYOFFSET NIL (WINDOWPROP ACE.SEQ.WINDOW
'DSP]
'DSP])
(PUTPROPS ACE.MT.AWX.SEQX MACRO ((WINDOWX)
(PUTPROPS ACE.MT.AWX.SEQX MACRO ((WINDOWX)
(IDIFFERENCE WINDOWX ACE.SEQ.WINDOW.XOFF)))
(PUTPROPS ACE.MT.AWY.SEQY MACRO ((WINDOWY)
(PUTPROPS ACE.MT.AWY.SEQY MACRO ((WINDOWY)
(IDIFFERENCE WINDOWY ACE.SEQ.WINDOW.YOFF)))
[PUTPROPS ACE.MT.SEQX.SCRX MACRO ((SEQXCOOR)
(IPLUS ACE.SEQ.WINDOW.XOFF (ACE.MT.AWX.SCRX SEQXCOOR]
(PUTPROPS ACE.MT.SEQX.SCRX MACRO ((SEQXCOOR)
(IPLUS ACE.SEQ.WINDOW.XOFF (ACE.MT.AWX.SCRX SEQXCOOR))))
[PUTPROPS ACE.MT.SEQY.SCRY MACRO ((SEQYCOOR)
(IPLUS ACE.SEQ.WINDOW.YOFF (ACE.MT.AWY.SCRY SEQYCOOR]
(PUTPROPS ACE.MT.SEQY.SCRY MACRO ((SEQYCOOR)
(IPLUS ACE.SEQ.WINDOW.YOFF (ACE.MT.AWY.SCRY SEQYCOOR))))
(PUTPROPS ACE.MT.SEQX.AWX MACRO ((SEQXCOOR)
(PUTPROPS ACE.MT.SEQX.AWX MACRO ((SEQXCOOR)
(IPLUS SEQXCOOR ACE.SEQ.WINDOW.XOFF)))
(PUTPROPS ACE.MT.SEQY.AWY MACRO ((SEQYCOOR)
(PUTPROPS ACE.MT.SEQY.AWY MACRO ((SEQYCOOR)
(IPLUS SEQYCOOR ACE.SEQ.WINDOW.YOFF)))
)
)
@@ -131,7 +126,7 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
(* ;; "ANIMATION FILES")
(RPAQQ ACE-MAINCOMS
(RPAQQ ACE-MAINCOMS
[(* MAIN TOP LEVEL STUFF)
(FNS ACE ACE.ANIMATE ACE.RUN ACEGETFRAME# ACERUNLOOP ACE.NEW.SEQUENCE ACE.NEW.FRAME
ACE.QUIT.ACE ACE.RESET.SEQ ACE.RUN.CURRENT.SEQ ACE.DELAY ACE.DELAY.FRAME ACE.DELAY.SEQ
@@ -1293,17 +1288,16 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
(DECLARE%: EVAL@COMPILE
(PUTPROPS ACE.MAC.CW.INFO.CLIP MACRO ((FORM)
(PUTPROPS ACE.MAC.CW.INFO.CLIP MACRO ((FORM)
(RESETLST
[RESETSAVE (PROGN (DSPCLIPPINGREGION (WINDOWPROP
ACE.CONTROL.WINDOW
'INFO.CLIP.REGION)
ACE.CONTROL.WINDOW)
(DSPLEFTMARGIN (fetch (REGION LEFT)
of
(WINDOWPROP
ACE.CONTROL.WINDOW
'INFO.CLIP.REGION))
of (WINDOWPROP
ACE.CONTROL.WINDOW
'INFO.CLIP.REGION))
ACE.CONTROL.WINDOW))
'(PROGN (DSPCLIPPINGREGION (WINDOWPROP
ACE.CONTROL.WINDOW
@@ -1314,36 +1308,29 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
ACE.CONTROL.WINDOW)
(DSPLEFTMARGIN (fetch (REGION LEFT)
of (WINDOWPROP
ACE.CONTROL.WINDOW
'
NORMAL.CLIP.REGION
))
ACE.CONTROL.WINDOW
'NORMAL.CLIP.REGION))
ACE.CONTROL.WINDOW]
FORM)))
(PUTPROPS ACE.MAC.CW.PROMPT.CLIP MACRO
((FORM)
(RESETLST
[RESETSAVE (PROGN (DSPCLIPPINGREGION (WINDOWPROP ACE.CONTROL.WINDOW 'PROMPT.CLIP.REGION)
(PUTPROPS ACE.MAC.CW.PROMPT.CLIP MACRO
((FORM)
(RESETLST
[RESETSAVE (PROGN (DSPCLIPPINGREGION (WINDOWPROP ACE.CONTROL.WINDOW
'PROMPT.CLIP.REGION)
ACE.CONTROL.WINDOW)
(DSPLEFTMARGIN (fetch (REGION LEFT) of (WINDOWPROP
ACE.CONTROL.WINDOW
'PROMPT.CLIP.REGION))
ACE.CONTROL.WINDOW))
'(PROGN (DSPCLIPPINGREGION (WINDOWPROP ACE.CONTROL.WINDOW 'NORMAL.CLIP.REGION)
ACE.CONTROL.WINDOW)
(DSPLEFTMARGIN (fetch (REGION LEFT) of (WINDOWPROP
ACE.CONTROL.WINDOW
'
PROMPT.CLIP.REGION
))
ACE.CONTROL.WINDOW))
'(PROGN (DSPCLIPPINGREGION (WINDOWPROP ACE.CONTROL.WINDOW 'NORMAL.CLIP.REGION)
ACE.CONTROL.WINDOW)
(DSPLEFTMARGIN (fetch (REGION LEFT) of (WINDOWPROP
ACE.CONTROL.WINDOW
'NORMAL.CLIP.REGION)
)
ACE.CONTROL.WINDOW]
FORM)))
(DSPLEFTMARGIN (fetch (REGION LEFT) of (WINDOWPROP ACE.CONTROL.WINDOW
'NORMAL.CLIP.REGION))
ACE.CONTROL.WINDOW]
FORM)))
[PUTPROPS ACE.MAC.SEQ.CLIP MACRO ((FORM)
(PUTPROPS ACE.MAC.SEQ.CLIP MACRO ((FORM)
(COND
((WINDOWPROP ACE.CONTROL.WINDOW 'SEQUENCE.CLIPPING.REGION)
(RESETLST
@@ -1358,22 +1345,19 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
ACE.SEQ.WINDOW)
ACE.SEQ.WINDOW))
FORM))
(T FORM]
(T FORM))))
)
(DECLARE%: EVAL@COMPILE
[PUTPROPS ACE.MAC.FETCH.WIDTH MACRO (NIL (fetch (BITMAP BITMAPWIDTH)
(PUTPROPS ACE.MAC.FETCH.WIDTH MACRO [NIL (fetch (BITMAP BITMAPWIDTH)
of (fetch (ACE.BLIT BITMAP)
of (CAR (fetch (ACE.FRAME BLITS)
of (CAR ACE.CURRENT.SEQUENCE
]
of (CAR (fetch (ACE.FRAME BLITS)
of (CAR ACE.CURRENT.SEQUENCE])
[PUTPROPS ACE.MAC.FETCH.HEIGHT MACRO (NIL (fetch (BITMAP BITMAPHEIGHT)
(PUTPROPS ACE.MAC.FETCH.HEIGHT MACRO [NIL (fetch (BITMAP BITMAPHEIGHT)
of (fetch (ACE.BLIT BITMAP)
of (CAR (fetch (ACE.FRAME BLITS)
of (CAR
ACE.CURRENT.SEQUENCE
]
of (CAR (fetch (ACE.FRAME BLITS)
of (CAR ACE.CURRENT.SEQUENCE])
)
(RPAQ ACE.LEFTMOUSE.CURSOR (CURSORCREATE (QUOTE #*(16 16)GOOLD@@DELIDELIDELIDELIDELIDELIDELIDD@@DD@@DD@@DD@@DD@@DD@@DGOOL
) (QUOTE NIL) 8 8))
@@ -1417,14 +1401,15 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
(ADDTOVAR LAMA )
)
(RPAQQ ACE-PRIMCOMS ((* COMPILER STUFF)
(VARS ACE.PIXPERWORD ACE.BITMAP.MASK)
(* LOW LEVEL COMPILER FNS)
(FNS ACE.COMPILE.FRAME ACE.EXTRACT ACESETTHRESHOLD)
(* REGION MAXING ROUTINES)
(FNS ACE.MAX.REGIONS ACE.PICK.BEST.REGION ACE.COMPUTE.AREA)
(* LOW LEVEL BITMAP COMPARISON)
(FNS ACE.SCAN.BITMAPS ACE.SCAN.PRIMBLOCKS ACE.FETCH.BLOCK)))
(RPAQQ ACE-PRIMCOMS
((* COMPILER STUFF)
(VARS ACE.PIXPERWORD ACE.BITMAP.MASK)
(* LOW LEVEL COMPILER FNS)
(FNS ACE.COMPILE.FRAME ACE.EXTRACT ACESETTHRESHOLD)
(* REGION MAXING ROUTINES)
(FNS ACE.MAX.REGIONS ACE.PICK.BEST.REGION ACE.COMPUTE.AREA)
(* LOW LEVEL BITMAP COMPARISON)
(FNS ACE.SCAN.BITMAPS ACE.SCAN.PRIMBLOCKS ACE.FETCH.BLOCK)))
@@ -1687,10 +1672,8 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
WORDOFFSET])
)
(RPAQQ ACE-EDITCOMS
[(FILES (LOADCOMP)
ACE)
(* TOP LEVEL EDITING STUFF)
(RPAQQ ACE-EDITCOMS
[(* TOP LEVEL EDITING STUFF)
(FNS ACE.EDIT ACE.EDIT.FRAME ACE.EDIT.SETUP.EDIT.MENU ACEGETREGIONFACTOR ACEROTATEREGION
ACESCALEREGION)
(* LINEART FNS)
@@ -1715,9 +1698,6 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
ACE.EDIT.TEXT.FACE.MENU ACE.EDIT.TEXTURE.MENU ACE.EDIT.PUTDOWN.MENU)
(DECLARE%: DONTEVAL@LOAD DOCOPY (P (ACE.EDIT.CLEAR.ALL.MENUS])
(FILESLOAD (LOADCOMP)
ACE)
(* TOP LEVEL EDITING STUFF)
@@ -1822,13 +1802,13 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
(SETQ WINDOW ACE.SEQ.WINDOW)
(SETQ WINDOW (\INSUREWINDOW WINDOW))
(RESETLST
(RESETSAVE NIL (LIST 'CURSOR (CURSOR)))
(RESETSAVE NIL (LIST 'CURSOR (CURSOR)))
(PROG (DS HOTX HOTY)
(TOTOPW WINDOW) (* look for a previously stored
 brush.)
 brush.)
[COND
((SETQ BRUSH (WINDOWPROP WINDOW 'PAINTBRUSH))
(SETQ PAINTCOMMANDMODE (CAR BRUSH))
((SETQ BRUSH (WINDOWPROP WINDOW 'PAINTBRUSH))
(SETQ PAINTCOMMANDMODE (CAR BRUSH))
(SETQ PAINTCOMMANDSHADE (CADR BRUSH))
(SETQ PAINTCOMMANDBRUSH (CADDR BRUSH]
(SETQ DS (WINDOWPROP WINDOW 'DSP))
@@ -1854,40 +1834,40 @@ Copyright (c) 1988, 1993 by Michel Denber. All rights reserved.
[CURSORHOTSPOT (create POSITION
XCOORD _ (SETQ HOTX (IDIFFERENCE (IMIN (fetch
BITMAPWIDTH
of BRUSH)
16)
2))
YCOORD _ (SETQ HOTY (IDIFFERENCE (IMIN (fetch
BITMAPHEIGHT
of BRUSH)
16)
2]
PAINTLP
(ACE.GET.DEVICE.STATE&CURSOR)
[COND
((KEYDOWNP 'RSHIFT)
(RETURN))
((OR (LASTMOUSESTATE RIGHT)
(KEYDOWNP 'LSHIFT))
(COND
((OR (INSIDE? (DSPCLIPPINGREGION NIL DS)
(LASTMOUSEX DS)
(LASTMOUSEY DS))
(NOT (WHICHW LASTMOUSEX LASTMOUSEY)))
(* inside the interior, give command
 menu)
(SELECTQ [MENU (COND
((type? MENU PAINTCOMMANDMENU)
PAINTCOMMANDMENU)
(T (SETQ PAINTCOMMANDMENU
(create MENU
ITEMS _ '((HardCopy 'HARDCOPY
"Makes a press file of the window and prints it"
)
(SetMode 'MODE
"Allows specification of how new bits are merged"
)
(SetShade 'SHADE
"Allows specification of new shade."
)
of BRUSH)
16)
2))
YCOORD _ (SETQ HOTY (IDIFFERENCE (IMIN (fetch
BITMAPHEIGHT
of BRUSH)
16)
2]
PAINTLP
(ACE.GET.DEVICE.STATE&CURSOR)
[COND
((KEYDOWNP 'RSHIFT)
(RETURN))
((OR (LASTMOUSESTATE RIGHT)
(KEYDOWNP 'LSHIFT))
(COND
((OR (INSIDE? (DSPCLIPPINGREGION NIL DS)
(LASTMOUSEX DS)
(LASTMOUSEY DS))
(NOT (WHICHW LASTMOUSEX LASTMOUSEY)))
(* inside the interior, give command
 menu)
(SELECTQ [MENU (COND
((type? MENU PAINTCOMMANDMENU)
PAINTCOMMANDMENU)
(T (SETQ PAINTCOMMANDMENU
(create MENU
ITEMS _ '((HardCopy 'HARDCOPY
"Makes a press file of the window and prints it"
)
(SetMode 'MODE
"Allows specification of how new bits are merged"
)
(SetShade 'SHADE
"Allows specification of new shade."
)
(SetShape 'SHAPE

BIN
lispusers/ACE/ACE.LCOM
View File

Binary file not shown.