Skip to content

Replace (OPCODES SUBRCALL subrnumber) with (SUBRCALL subrname #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2021
Merged

Replace (OPCODES SUBRCALL subrnumber) with (SUBRCALL subrname #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f233d51
Change numeric OPCODES SUBRCALL NN to use the LLSUBRS name
masinter Oct 24, 2021
4406a2a
more opcodes subr# in maikoloadupfns
masinter Oct 26, 2021
2c80f8f
even more OPCODES SUBRCALL
masinter Oct 26, 2021
9abf156
Recover BIGBMAPS definitions dup (but more recent) from LLCOLOR
masinter Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 69 additions & 103 deletions library/BIGBITMAPS
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified library/BIGBITMAPS.LCOM
View file
Open in desktop
Binary file not shown.
155 changes: 80 additions & 75 deletions library/LLCOLOR
View file
Open in desktop

Large diffs are not rendered by default.

121 changes: 75 additions & 46 deletions library/MAIKOCOLOR
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
(FILECREATED "23-Oct-91 14:43:35" |{PELE:MV:ENVOS}<LISPCORE>LIBRARY>MAIKOCOLOR.;6| 57582
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED "26-Oct-2021 10:53:57" {DSK}<home>larry>medley>library>MAIKOCOLOR.;2 60141

changes to%: (VARS MAIKOCOLORCOMS)
(FNS \MAIKOCOLOR.EVENTFN)
(MACROS \MAIKO.CGTHREEP \MAIKO.CGFOURP \MAIKO.CGSIXP \MAIKO.CGTWOP)
(FNS \MAIKO.COLORINIT \MAIKO.STARTCOLOR \MAIKO.STOPCOLOR \MAIKOCOLOR.EVENTFN
\MAIKO.SENDCOLORMAPENTRY \MAIKO.CHANGESCREEN CURSOREXIT CURSORSCREEN
WARPCURSOR \SLOWBLTCHAR \SOFTCURSORUP \BITBLT.DISPLAY \PUNT.SLOWBLTCHAR
\PUNT.BLTSHADE.BITMAP \PUNT.BITBLT.BITMAP BITMAPOBJ.SNAPW \MAIKO.PUNTBLTCHAR
\MAIKO.BLTCHAR)

previous date%: "22-Aug-91 17:11:25" |{PELE:MV:ENVOS}<LISPCORE>LIBRARY>MAIKOCOLOR.;3|)
previous date%: "23-Oct-91 14:43:35" {DSK}<home>larry>medley>library>MAIKOCOLOR.;1)


(* ; "
Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserved.
Copyright (c) 1988-1991 by Fuji Xerox Co., Ltd..
")

(PRETTYCOMPRINT MAIKOCOLORCOMS)
Expand Down Expand Up @@ -63,8 +69,9 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv

(\MAIKO.COLORINIT
[LAMBDA NIL
(DECLARE (GLOBALVARS \MAIKOCOLORWSOPS \MAIKOCOLORINFO))
(* ; "Edited 28-Apr-89 16:51 by tshimizu.fx")
(DECLARE (GLOBALVARS \MAIKOCOLORWSOPS \MAIKOCOLORINFO))
(* ;
 "Edited 28-Apr-89 16:51 by tshimizu.fx")
(SETQ \MAIKOCOLORWSOPS (create WSOPS
STARTBOARD _ (FUNCTION NILL)
STARTCOLOR _ (FUNCTION \MAIKO.STARTCOLOR)
Expand All @@ -82,27 +89,30 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(\DEFINEDISPLAYINFO \MAIKOCOLORINFO])

(\MAIKO.STARTCOLOR
[LAMBDA (FDEV) (* ; "Edited 2-Nov-88 11:13 by shimizu")
[LAMBDA (FDEV) (* ;
 "Edited 26-Oct-2021 10:17 by larry")
(* ;
 "Edited 2-Nov-88 11:13 by shimizu")
(PROG (DISPLAYSTATE)
(SETQ DISPLAYSTATE (fetch (FDEV DEVICEINFO) of FDEV))
(replace (DISPLAYSTATE ONOFF) of DISPLAYSTATE with 'STARTCOLOR)
(MOVD '\DISPLAY.PILOTBITBLT '\SOFTCURSORPILOTBITBLT)

(* ;; " MMAP colorbuffer")

((OPCODES SUBRCALL 136 1)
(FETCH (BITMAP BITMAPBASE) OF ColorScreenBitMap))
(SUBRCALL COLOR-INIT (FETCH (BITMAP BITMAPBASE) OF ColorScreenBitMap))
(replace (DISPLAYSTATE ONOFF) of DISPLAYSTATE with 'ON])

(\MAIKO.STOPCOLOR
[LAMBDA (FDEV) (* ; "Edited 28-Apr-89 16:51 by tshimizu.fx")
[LAMBDA (FDEV) (* ;
 "Edited 28-Apr-89 16:51 by tshimizu.fx")
(* ; "By Take")
(PROG (DISPLAYSTATE)
(SETQ DISPLAYSTATE (fetch (FDEV DEVICEINFO) of FDEV))
(replace (DISPLAYSTATE ONOFF) of DISPLAYSTATE with 'OFF])

(\MAIKOCOLOR.EVENTFN
[LAMBDA (FDEV EVENT) (* ; "Edited 23-Oct-91 14:18 by jds")
[LAMBDA (FDEV EVENT) (* ; "Edited 23-Oct-91 14:18 by jds")
(COND
((EQ (fetch (DISPLAYSTATE ONOFF) of (fetch (FDEV DEVICEINFO) of FDEV))
'ON)
Expand All @@ -117,22 +127,26 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
NIL])

(\MAIKO.SENDCOLORMAPENTRY
[LAMBDA (FDEV COLOR# RGB) (* ; "Edited 1-Dec-88 18:16 by shimizu")
((OPCODES SUBRCALL 138 4)
COLOR#
(CAR RGB)
(CADR RGB)
(CADDR RGB])
[LAMBDA (FDEV COLOR# RGB) (* ;
 "Edited 26-Oct-2021 10:17 by larry")
(* ;
 "Edited 1-Dec-88 18:16 by shimizu")
(SUBRCALL COLOR-MAP COLOR# (CAR RGB)
(CADR RGB)
(CADDR RGB])

(\MAIKO.CHANGESCREEN
[LAMBDA (TOSCREEN) (* ; "Edited 1-Dec-88 18:32 by shimizu")
((OPCODES SUBRCALL 137 1)
TOSCREEN])
[LAMBDA (TOSCREEN) (* ;
 "Edited 26-Oct-2021 10:18 by larry")
(* ;
 "Edited 1-Dec-88 18:32 by shimizu")
(SUBRCALL COLOR-SCREENMODE TOSCREEN])
)
(DEFINEQ

(CURSOREXIT
[LAMBDA NIL (* ; "Edited 11-Aug-89 13:16 by takeshi")
[LAMBDA NIL (* ;
 "Edited 11-Aug-89 13:16 by takeshi")

(* * called when cursor moves off the screen edge)

Expand Down Expand Up @@ -160,7 +174,8 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(CURSORSCREEN SCREEN2 XCOORD2 YCOORD2])

(CURSORSCREEN
[LAMBDA (SCREEN XCOORD YCOORD) (* ; "Edited 19-Jun-90 16:33 by matsuda")
[LAMBDA (SCREEN XCOORD YCOORD) (* ;
 "Edited 19-Jun-90 16:33 by matsuda")

(* * sets up SCREEN to be the current screen, XCOORD %, YCOORD is initial pos
 of cursor on SCREEN)
Expand Down Expand Up @@ -201,20 +216,24 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(CLEARW W))])

(WARPCURSOR
[LAMBDA (ENABLE) (* ; "Edited 20-Jul-90 19:02 by matsuda")
[LAMBDA (ENABLE) (* ;
 "Edited 20-Jul-90 19:02 by matsuda")
(COND
(ENABLE (MOVD 'SAVE.CURSOREXIT 'CURSOREXIT)
T)
(T (MOVD 'NILL 'CURSOREXIT)
NIL])

(\SLOWBLTCHAR
[LAMBDA (CHARCODE DISPLAYSTREAM) (* ; "Edited 7-Jun-90 14:06 by matsuda")
((OPCODES SUBRCALL 140 2)
CHARCODE DISPLAYSTREAM])
[LAMBDA (CHARCODE DISPLAYSTREAM) (* ;
 "Edited 26-Oct-2021 10:19 by larry")
(* ;
 "Edited 7-Jun-90 14:06 by matsuda")
(SUBRCALL C-SlowBltChar CHARCODE DISPLAYSTREAM])

(\SOFTCURSORUP
[LAMBDA (NEWCURSOR) (* ; "Edited 16-Jan-89 15:44 by shimizu")
[LAMBDA (NEWCURSOR) (* ;
 "Edited 16-Jan-89 15:44 by shimizu")
(* Put soft NEWCURSOR up, assuming
 soft cursor is down.
 *)
Expand Down Expand Up @@ -290,7 +309,8 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(\BITBLT.DISPLAY
[LAMBDA (SOURCEBITMAP SOURCELEFT SOURCEBOTTOM DESTSTRM DESTINATIONLEFT DESTINATIONBOTTOM WIDTH
HEIGHT SOURCETYPE OPERATION TEXTURE CLIPPINGREGION CLIPPEDSOURCELEFT
CLIPPEDSOURCEBOTTOM) (* ; "Edited 24-Jan-91 11:57 by matsuda")
CLIPPEDSOURCEBOTTOM) (* ;
 "Edited 24-Jan-91 11:57 by matsuda")
(DECLARE (LOCALVARS . T))
(DECLARE (GLOBALVARS \SYSPILOTBBT \SCREENBITMAPS \BBSCRATCHTEXTURE \SOFTCURSORP
\SOFTCURSORUPP \CURSORDESTINATION))
Expand Down Expand Up @@ -454,7 +474,8 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(DEFINEQ

(\PUNT.SLOWBLTCHAR
[LAMBDA (CHARCODE DISPLAYSTREAM) (* ; "Edited 2-Jul-90 14:23 by matsuda")
[LAMBDA (CHARCODE DISPLAYSTREAM) (* ;
 "Edited 2-Jul-90 14:23 by matsuda")

(* ;; "case of BLTCHAR where either font is rotated or destination is a color bitmap. DISPLAYSTREAM is known to be a display stream, and its cache fields have been updated for CHARCODE's charset")

Expand Down Expand Up @@ -535,7 +556,10 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(T (ERROR "Not implemented to rotate by other than 0, 90 or 270"])

(\MAIKO.PUNTBLTCHAR
[LAMBDA (CHARCODE DISPLAYSTREAM DISPLAYDATA) (* ; "Edited 1-Nov-89 15:26 by takeshi")
[LAMBDA (CHARCODE DISPLAYSTREAM DISPLAYDATA) (* ;
 "Edited 26-Oct-2021 10:21 by larry")
(* ;
 "Edited 1-Nov-89 15:26 by takeshi")

(* ;; "puts a character on a display stream. This function will be called when \maiko.bltchar failed. Punt from subr call")

Expand Down Expand Up @@ -598,20 +622,23 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
DDPILOTBBT)
of DISPLAYDATA)))
0)))
(.WHILE.TOP.DS. DISPLAYSTREAM ((OPCODES SUBRCALL 70 6)
LOCAL1 DISPLAYDATA CHAR8CODE CURX LEFT RIGHT))
(.WHILE.TOP.DS. DISPLAYSTREAM (SUBRCALL BLTCHAR LOCAL1 DISPLAYDATA CHAR8CODE
CURX LEFT RIGHT))
T])

(\MAIKO.BLTCHAR
[LAMBDA (CHARCODE DISPLAYSTREAM DISPLAYDATA) (* ; "Edited 6-Jul-90 10:14 by matsuda")
((OPCODES SUBRCALL 135 3)
CHARCODE DISPLAYSTREAM DISPLAYDATA])
[LAMBDA (CHARCODE DISPLAYSTREAM DISPLAYDATA) (* ;
 "Edited 26-Oct-2021 10:22 by larry")
(* ;
 "Edited 6-Jul-90 10:14 by matsuda")
(SUBRCALL NEW-BLTCHAR CHARCODE DISPLAYSTREAM DISPLAYDATA])
)
(DEFINEQ

(\PUNT.BLTSHADE.BITMAP
[LAMBDA (TEXTURE DESTINATIONBITMAP DESTINATIONLEFT DESTINATIONBOTTOM WIDTH HEIGHT OPERATION
CLIPPINGREGION) (* ; "Edited 5-Jun-90 12:12 by Takeshi")
CLIPPINGREGION) (* ;
 "Edited 5-Jun-90 12:12 by Takeshi")

(* ;; "This FNS is for a punt case of \BLTSHADE.BITMAP which is implemeted in C ")
(* ;
Expand Down Expand Up @@ -718,7 +745,8 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(\PUNT.BITBLT.BITMAP
[LAMBDA (SOURCEBITMAP SOURCELEFT SOURCEBOTTOM DESTBITMAP DESTINATIONLEFT DESTINATIONBOTTOM WIDTH
HEIGHT SOURCETYPE OPERATION TEXTURE CLIPPINGREGION CLIPPEDSOURCELEFT
CLIPPEDSOURCEBOTTOM) (* ; "Edited 5-Jun-90 11:59 by Takeshi")
CLIPPEDSOURCEBOTTOM) (* ;
 "Edited 5-Jun-90 11:59 by Takeshi")

(* ;; " This FNS is for a punt case of \BITBLT.BITMAP which is implemeted in C")

Expand Down Expand Up @@ -858,7 +886,8 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
(DEFINEQ

(BITMAPOBJ.SNAPW
[LAMBDA NIL (* ; "Edited 12-Apr-90 09:09 by matsuda")
[LAMBDA NIL (* ;
 "Edited 12-Apr-90 09:09 by matsuda")

(* * makes an image object of a prompted for region of the screen.)

Expand Down Expand Up @@ -962,11 +991,11 @@ Copyright (c) 1988, 1989, 1990, 1991 by Fuji Xerox Co., Ltd.. All rights reserv
)
(PUTPROPS MAIKOCOLOR COPYRIGHT ("Fuji Xerox Co., Ltd." 1988 1989 1990 1991))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (2782 5984 (\MAIKO.COLORINIT 2792 . 3962) (\MAIKO.STARTCOLOR 3964 . 4559) (
\MAIKO.STOPCOLOR 4561 . 4945) (\MAIKOCOLOR.EVENTFN 4947 . 5578) (\MAIKO.SENDCOLORMAPENTRY 5580 . 5805)
(\MAIKO.CHANGESCREEN 5807 . 5982)) (5985 26414 (CURSOREXIT 5995 . 7433) (CURSORSCREEN 7435 . 9475) (
WARPCURSOR 9477 . 9726) (\SLOWBLTCHAR 9728 . 9910) (\SOFTCURSORUP 9912 . 15707) (\BITBLT.DISPLAY 15709
. 26412)) (26485 37922 (\PUNT.SLOWBLTCHAR 26495 . 33267) (\MAIKO.PUNTBLTCHAR 33269 . 37722) (
\MAIKO.BLTCHAR 37724 . 37920)) (37923 54124 (\PUNT.BLTSHADE.BITMAP 37933 . 44959) (\PUNT.BITBLT.BITMAP
44961 . 54122)) (54125 54867 (BITMAPOBJ.SNAPW 54135 . 54865)))))
(FILEMAP (NIL (3229 7254 (\MAIKO.COLORINIT 3239 . 4475) (\MAIKO.STARTCOLOR 4477 . 5293) (
\MAIKO.STOPCOLOR 5295 . 5749) (\MAIKOCOLOR.EVENTFN 5751 . 6382) (\MAIKO.SENDCOLORMAPENTRY 6384 . 6842)
(\MAIKO.CHANGESCREEN 6844 . 7252)) (7255 28244 (CURSOREXIT 7265 . 8769) (CURSORSCREEN 8771 . 10877) (
WARPCURSOR 10879 . 11194) (\SLOWBLTCHAR 11196 . 11608) (\SOFTCURSORUP 11610 . 17471) (\BITBLT.DISPLAY
17473 . 28242)) (28315 40283 (\PUNT.SLOWBLTCHAR 28325 . 35163) (\MAIKO.PUNTBLTCHAR 35165 . 39855) (
\MAIKO.BLTCHAR 39857 . 40281)) (40284 56617 (\PUNT.BLTSHADE.BITMAP 40294 . 47386) (\PUNT.BITBLT.BITMAP
47388 . 56615)) (56618 57426 (BITMAPOBJ.SNAPW 56628 . 57424)))))
STOP
Binary file modified library/MAIKOCOLOR.LCOM
View file
Open in desktop
Binary file not shown.
Loading