github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-03-27 02:14:15 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

merge into: github.com:mth38--support-runtime-debug-output
Branches Tags
github.com:master github.com:nhb-pcap-ethernet github.com:fgh_makefile-consolidation github.com:lmm-hcfiles-submodule github.com:lmm32-gitignore-for-subproject-maiko github.com:fgh_libbsd github.com:nhb-rewrite-version-parser-v2 github.com:nhb-rewrite-version-parser github.com:fgh_fix-2164-WSL1 github.com:mth38--support-runtime-debug-output github.com:fgh_github-actions-updates github.com:nhb-update-for-sdl3 github.com:wip-nhb-sdl-mouse-fix github.com:fgh_nethub-build github.com:fgh_emscripten-03 github.com:fgh_emscripten-combined github.com:fgh_emscripten-02 github.com:debug-arrayspace github.com:lmm-maiko github.com:build-201 github.com:sdl-texture-direct github.com:multi-val-retun-unbind github.com:no-DOS github.com:pi-init github.com:Fix-Unicode-EOL-convention
github.com:maiko-260319-9259716e github.com:maiko-260301-f4021ef2 github.com:maiko-251031-d791b1d3 github.com:maiko-250616-de1fafba github.com:maiko-250201-55e20ea9 github.com:maiko-250201-7fe0f706 github.com:maiko-250201-7d85a59e github.com:maiko-250126-e61d0f2e github.com:maiko-250128-9628bb1b github.com:maiko-240513-4becc6ad github.com:maiko-240510-fd16058c github.com:maiko-240506-6c6b01f9 github.com:maiko-240424-c3916416 github.com:maiko-240211-ce20acca github.com:maiko-231112-42477318 github.com:maiko-230809-7fce08f9 github.com:maiko-230607-d1f4653b github.com:maiko-220929-f5b17b0e github.com:maiko-220603-b5f51d58 github.com:maiko-220212-20046b26 github.com:maiko-220212-e6a974a2 github.com:maiko-220117-5eba2c3a github.com:maiko-220109 github.com:maiko-211222 github.com:maiko-211203 github.com:maiko-211107 github.com:maiko-211010 github.com:maiko-211022 github.com:maiko-211003 github.com:maiko-210923 github.com:maiko-210917 github.com:maiko-210910 github.com:maiko-210908 github.com:maiko-210905 github.com:maiko-210903 github.com:maiko-210828 github.com:maiko-210825 github.com:testing123 github.com:original-020102-01
...
pull from: github.com:wip-nhb-sdl-mouse-fix
Branches Tags
github.com:nhb-pcap-ethernet github.com:master github.com:fgh_makefile-consolidation github.com:lmm-hcfiles-submodule github.com:lmm32-gitignore-for-subproject-maiko github.com:fgh_libbsd github.com:nhb-rewrite-version-parser-v2 github.com:nhb-rewrite-version-parser github.com:fgh_fix-2164-WSL1 github.com:mth38--support-runtime-debug-output github.com:fgh_github-actions-updates github.com:nhb-update-for-sdl3 github.com:wip-nhb-sdl-mouse-fix github.com:fgh_nethub-build github.com:fgh_emscripten-03 github.com:fgh_emscripten-combined github.com:fgh_emscripten-02 github.com:debug-arrayspace github.com:lmm-maiko github.com:build-201 github.com:sdl-texture-direct github.com:multi-val-retun-unbind github.com:no-DOS github.com:pi-init github.com:Fix-Unicode-EOL-convention
github.com:maiko-260319-9259716e github.com:maiko-260301-f4021ef2 github.com:maiko-251031-d791b1d3 github.com:maiko-250616-de1fafba github.com:maiko-250201-55e20ea9 github.com:maiko-250201-7fe0f706 github.com:maiko-250201-7d85a59e github.com:maiko-250126-e61d0f2e github.com:maiko-250128-9628bb1b github.com:maiko-240513-4becc6ad github.com:maiko-240510-fd16058c github.com:maiko-240506-6c6b01f9 github.com:maiko-240424-c3916416 github.com:maiko-240211-ce20acca github.com:maiko-231112-42477318 github.com:maiko-230809-7fce08f9 github.com:maiko-230607-d1f4653b github.com:maiko-220929-f5b17b0e github.com:maiko-220603-b5f51d58 github.com:maiko-220212-20046b26 github.com:maiko-220212-e6a974a2 github.com:maiko-220117-5eba2c3a github.com:maiko-220109 github.com:maiko-211222 github.com:maiko-211203 github.com:maiko-211107 github.com:maiko-211010 github.com:maiko-211022 github.com:maiko-211003 github.com:maiko-210923 github.com:maiko-210917 github.com:maiko-210910 github.com:maiko-210908 github.com:maiko-210905 github.com:maiko-210903 github.com:maiko-210828 github.com:maiko-210825 github.com:testing123 github.com:original-020102-01

4 Commits
mth38--sup ... wip-nhb-sd

Author SHA1 Message Date
Nick Briggs
fd90bbf9b9 Ignore mouse motion events when the window does not have keyboard focus 2024-08-15 20:36:26 -07:00
Nick Briggs
cec93e6ae5 Set up makeright etc. to allow for easier compilation of alternate versions 
The makeright script and the makefile-* slices it depends are modified
to allow easily specifying the RELEASE version number of the Maiko emulator
to be built.  The default version remains 351, but can be changed with e.g.

RELEASE=201 ./makeright x

The object directories and executables are NOT named with the version.
 2024-08-05 17:13:01 -07:00
Nick Briggs
72e26ca033 Fix compilation for maiko version 201 
Version 201 did not have NEWCDRCODING, so the implementation of
N_OP_rplcons requires definitions from gcdata.h and address.h
 2024-08-05 16:23:54 -07:00
Nick Briggs
f6f833c612 Fix compilation for maiko version 201 
Version 201 does not have BIGVM, so SWA_FNHEAD requires swapx
which is defined in byteswapdefs.h
 2024-08-05 16:20:09 -07:00
43 changed files with 68 additions and 43 deletions
Expand all files Collapse all files

2
bin/makefile-cygwin.x86_64-sdl
View File

@@ -15,7 +15,7 @@ XFLAGS = -DSDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -lm -L/usr/local/lib -lSDL2 LDFLAGS = -lm -L/usr/local/lib -lSDL2
# #

2
bin/makefile-cygwin.x86_64-x
View File

@@ -18,7 +18,7 @@ XFLAGS = -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-darwin.386-x
View File

@@ -19,7 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \ DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \
-DRELEASE=351 # -DSTACKCHECK -DFSBCHECK -DPCTRACE -DRELEASE=$(RELEASE) # -DSTACKCHECK -DFSBCHECK -DPCTRACE
LDFLAGS = -L/opt/X11/lib -lX11 -lm LDFLAGS = -L/opt/X11/lib -lX11 -lm
LDELDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm

2
bin/makefile-darwin.aarch64-sdl
View File

@@ -16,7 +16,7 @@ SDLFLAGS = -DSDL=2 -F /Library/Frameworks
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351 DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2 LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-darwin.aarch64-x
View File

@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 OPTFLAGS = -O2
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/opt/X11/lib -lX11 -lm LDFLAGS = -L/opt/X11/lib -lX11 -lm
LDELDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm

2
bin/makefile-darwin.ppc-x
View File

@@ -19,7 +19,7 @@ XFLAGS = -I/usr/X11/include -DXWINDOW
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \ DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \
-DRELEASE=351 -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lm LDFLAGS = -L/usr/X11/lib -lX11 -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lm

2
bin/makefile-darwin.x86_64-sdl
View File

@@ -15,7 +15,7 @@ SDLFLAGS = -DSDL=2 -F /Library/Frameworks
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351 DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2 LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-darwin.x86_64-x
View File

@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O1 -g OPTFLAGS = -O1 -g
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/opt/X11/lib -lX11 -lm LDFLAGS = -L/opt/X11/lib -lX11 -lm
LDELDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm

2
bin/makefile-emscripten.wasm-wasm
View File

@@ -14,7 +14,7 @@ XFLAGS = -DSDL=2 -sUSE_SDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 OPTFLAGS = -O2
DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB
MEDLEY?=../../medley MEDLEY?=../../medley
SYSOUT?=$(MEDLEY)/loadups/full.sysout SYSOUT?=$(MEDLEY)/loadups/full.sysout

2
bin/makefile-emscripten.wasm_nl-wasm_nl
View File

@@ -14,7 +14,7 @@ XFLAGS = -DSDL=2 -sUSE_SDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 OPTFLAGS = -O2
DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB
MEDLEY?=../../medley MEDLEY?=../../medley
SYSOUT?=$(MEDLEY)/loadups/full.sysout SYSOUT?=$(MEDLEY)/loadups/full.sysout

2
bin/makefile-freebsd.386-sdl
View File

@@ -14,7 +14,7 @@ SDLFLAGS = -DSDL=2 -I/usr/local/include
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DFLAGS = $(SDLFLAGS) -DRELEASE=351 DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/local/lib -lSDL2 -lm LDFLAGS = -L/usr/local/lib -lSDL2 -lm
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-freebsd.386-x
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm

2
bin/makefile-freebsd.aarch64-sdl
View File

@@ -14,7 +14,7 @@ SDLFLAGS = -DSDL=2 -I/usr/local/include
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DFLAGS = $(SDLFLAGS) -DRELEASE=351 DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/local/lib -lSDL2 -lm LDFLAGS = -L/usr/local/lib -lSDL2 -lm
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-freebsd.aarch64-x
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm

2
bin/makefile-freebsd.x86_64-sdl
View File

@@ -14,7 +14,7 @@ SDLFLAGS = -DSDL=2 -I/usr/local/include
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DFLAGS = $(SDLFLAGS) -DRELEASE=351 DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/local/lib -lSDL2 -lm LDFLAGS = -L/usr/local/lib -lSDL2 -lm
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-freebsd.x86_64-x
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g OPTFLAGS = -O2 -g
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm

2
bin/makefile-haiku.x86_64-sdl
View File

@@ -15,7 +15,7 @@ XFLAGS = -DSDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -lSDL2 -lnetwork LDFLAGS = -lSDL2 -lnetwork
LDELDFLAGS = -lnetwork -lbsd LDELDFLAGS = -lnetwork -lbsd

2
bin/makefile-init-darwin.386
View File

@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
OPTFLAGS = -O0 -g OPTFLAGS = -O0 -g
DEBUGFLAGS = DEBUGFLAGS =
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/usr/X11/lib -lX11 -lm LDFLAGS = -L/usr/X11/lib -lX11 -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lm

2
bin/makefile-init-darwin.aarch64
View File

@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O0 -g3 OPTFLAGS = -O0 -g3
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/opt/X11/lib -lX11 -lm LDFLAGS = -L/opt/X11/lib -lX11 -lm
LDELDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm

2
bin/makefile-init-darwin.x86_64
View File

@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O0 -g OPTFLAGS = -O0 -g
DEBUGFLAGS = # -DDEBUG -DOPTRACE DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/opt/X11/lib -lX11 -lm LDFLAGS = -L/opt/X11/lib -lX11 -lm
LDELDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm

2
bin/makefile-init-freebsd.386
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW
# OPTFLAGS is normally -O0 for init # OPTFLAGS is normally -O0 for init
OPTFLAGS = -O0 -g OPTFLAGS = -O0 -g
DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm

2
bin/makefile-init-freebsd.aarch64
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW
# OPTFLAGS is normally -O0 for init # OPTFLAGS is normally -O0 for init
OPTFLAGS = -O0 -g OPTFLAGS = -O0 -g
DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm

2
bin/makefile-init-freebsd.x86_64
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW
# OPTFLAGS is normally -O0 for init # OPTFLAGS is normally -O0 for init
OPTFLAGS = -O0 -g OPTFLAGS = -O0 -g
DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm

2
bin/makefile-init-linux.aarch64
View File

@@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
OPTFLAGS = -O0 -g OPTFLAGS = -O0 -g
DEBUGFLAGS = DEBUGFLAGS =
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-init-linux.x86_64
View File

@@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
OPTFLAGS = -O0 -g OPTFLAGS = -O0 -g
DEBUGFLAGS = DEBUGFLAGS =
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-init-openbsd.x86_64
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT
LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm

2
bin/makefile-init-sunos5.sparc
View File

@@ -50,7 +50,7 @@ DFLAGS = -DINIT \
$(XFLAGS) \ $(XFLAGS) \
$(DEBUGFLAGS) \ $(DEBUGFLAGS) \
$(MACHINEFLAGS) \ $(MACHINEFLAGS) \
-DNOVERSION -DRELEASE=351 -DNOVERSION -DRELEASE=$(RELEASE)
LDFLAGS = -lX11 -lc -lm -lsocket -lnsl LDFLAGS = -lX11 -lc -lm -lsocket -lnsl

2
bin/makefile-linux.386-sdl
View File

@@ -15,7 +15,7 @@ XFLAGS = -DSDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -lm -lSDL2 LDFLAGS = -lm -lSDL2
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-linux.386-x
View File

@@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-linux.aarch64-sdl
View File

@@ -15,7 +15,7 @@ SDLFLAGS = -DSDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(SDLFLAGS) -DRELEASE=351 DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -lSDL2 -lm LDFLAGS = -lSDL2 -lm
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-linux.aarch64-x
View File

@@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-linux.armv7l-sdl
View File

@@ -15,7 +15,7 @@ XFLAGS = -DSDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -lm -lSDL2 LDFLAGS = -lm -lSDL2
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-linux.armv7l-x
View File

@@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-linux.x86_64-sdl
View File

@@ -15,7 +15,7 @@ XFLAGS = -DSDL=2
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -lm -lSDL2 LDFLAGS = -lm -lSDL2
LDELDFLAGS = LDELDFLAGS =

2
bin/makefile-linux.x86_64-x
View File

@@ -18,7 +18,7 @@ XFLAGS = -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm

2
bin/makefile-openbsd.x86_64-x
View File

@@ -17,7 +17,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW
# OPTFLAGS is normally -O2. # OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g3 OPTFLAGS = -O2 -g3
DFLAGS = $(XFLAGS) -DRELEASE=351 DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm

2
bin/makefile-sunos5.386-x
View File

@@ -36,7 +36,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
DFLAGS = $(XFLAGS) \ DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \ $(DEBUGFLAGS) \
-DOS5 \ -DOS5 \
-DRELEASE=351 -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl

2
bin/makefile-sunos5.sparc-x
View File

@@ -45,7 +45,7 @@ MACHINEFLAGS = -DOS5 -DUSE_DLPI
DFLAGS = $(XFLAGS) \ DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \ $(DEBUGFLAGS) \
$(MACHINEFLAGS) \ $(MACHINEFLAGS) \
-DRELEASE=351 -DRELEASE=$(RELEASE)
LDFLAGS = -lX11 -lc -lm -lsocket -lnsl LDFLAGS = -lX11 -lc -lm -lsocket -lnsl
LDELDFLAGS = -lX11 -lc -lm -lsocket -lnsl LDELDFLAGS = -lX11 -lc -lm -lsocket -lnsl

2
bin/makefile-sunos5.x86_64-x
View File

@@ -37,7 +37,7 @@ DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \ $(DEBUGFLAGS) \
-DOS5 \ -DOS5 \
-DUSE_DLPI \ -DUSE_DLPI \
-DRELEASE=351 -DRELEASE=$(RELEASE)
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl

7
bin/makeright
View File

@@ -54,9 +54,10 @@ if test $# -gt 0
shift shift
fi fi
: ${RELEASE=351}
architecture=`machinetype` architecture=`machinetype`
osversion=`osversion` osversion=`osversion`
echo "making so far for ${osversion} on ${architecture}." echo "making release ${RELEASE} for ${osversion} on ${architecture}."
case "$display" in case "$display" in
init) display=single init) display=single
releasename=init-${osversion}.${architecture} releasename=init-${osversion}.${architecture}
@@ -106,12 +107,12 @@ if [ ! -d ../${releasename} ]; then
mkdir ../${releasename} mkdir ../${releasename}
fi fi
echo start making lde for ${releasename}. echo start making lde for ${releasename}
# then finally do the make, including the right stuff # then finally do the make, including the right stuff
# With makefile-tail merged, this should only take ONE make command.... # With makefile-tail merged, this should only take ONE make command....
make RELEASENAME=${releasename} LDENAME=${ldename} \ make RELEASENAME=${releasename} RELEASE=${RELEASE} LDENAME=${ldename} \
OSARCHNAME=${osversion}.${architecture} \ OSARCHNAME=${osversion}.${architecture} \
-f makefile-header -f makefile-${releasename} \ -f makefile-header -f makefile-${releasename} \
-f makefile-tail $* -f makefile-tail $*

1
src/mvs.c
View File

@@ -35,6 +35,7 @@
#ifdef BIGVM #ifdef BIGVM
#define SWA_FNHEAD #define SWA_FNHEAD
#else #else
#include "byteswapdefs.h" // for swapx
#define SWA_FNHEAD swapx #define SWA_FNHEAD swapx
#endif /* BIGVM */ #endif /* BIGVM */

4
src/rplcons.c
View File

@@ -29,6 +29,10 @@
#include "lspglob.h" #include "lspglob.h"
#include "lsptypes.h" // for Listp #include "lsptypes.h" // for Listp
#include "rplconsdefs.h" // for N_OP_rplcons #include "rplconsdefs.h" // for N_OP_rplcons
#ifndef NEWCDRCODING
#include "gcdata.h"
#include "address.h"
#endif
/***************************************************/ /***************************************************/

21
src/sdl.c
View File

@@ -46,7 +46,7 @@ static Uint32 sdl_foreground;
static Uint32 sdl_background; static Uint32 sdl_background;
static int sdl_bytesperpixel; static int sdl_bytesperpixel;
static SDL_PixelFormat *sdl_pixelformat; static SDL_PixelFormat *sdl_pixelformat;
static int sdl_window_focusp = 0;
extern void kb_trans(u_short keycode, u_short upflg); extern void kb_trans(u_short keycode, u_short upflg);
extern int error(const char *s); extern int error(const char *s);
@@ -625,6 +625,22 @@ void process_SDLevents() {
sdl_windowheight = event.window.data2; sdl_windowheight = event.window.data2;
sdl_update_viewport(sdl_windowwidth, sdl_windowheight); sdl_update_viewport(sdl_windowwidth, sdl_windowheight);
break; break;
case SDL_WINDOWEVENT_ENTER:
break;
case SDL_WINDOWEVENT_LEAVE:
break;
case SDL_WINDOWEVENT_SHOWN:
break;
case SDL_WINDOWEVENT_HIDDEN:
break;
case SDL_WINDOWEVENT_EXPOSED:
break;
case SDL_WINDOWEVENT_FOCUS_GAINED:
sdl_window_focusp = 1;
break;
case SDL_WINDOWEVENT_FOCUS_LOST:
sdl_window_focusp = 0;
break;
} }
break; break;
#else #else
@@ -673,6 +689,7 @@ void process_SDLevents() {
int ix, iy; int ix, iy;
float x, y; float x, y;
#endif #endif
if (!sdl_window_focusp) break;
SDL_GetMouseState(&x, &y); SDL_GetMouseState(&x, &y);
x /= sdl_pixelscale; x /= sdl_pixelscale;
y /= sdl_pixelscale; y /= sdl_pixelscale;
@@ -727,6 +744,8 @@ void process_SDLevents() {
printf("mousewheel mouse %d x %d y %d direction %s\n", event.wheel.which, event.wheel.x, printf("mousewheel mouse %d x %d y %d direction %s\n", event.wheel.which, event.wheel.x,
event.wheel.y, event.wheel.y,
event.wheel.direction == SDL_MOUSEWHEEL_NORMAL ? "normal" : "flipped"); event.wheel.direction == SDL_MOUSEWHEEL_NORMAL ? "normal" : "flipped");
*/
/*
these are the 4 key bits for mouse wheel/trackpad scrolling - which unlike X11 are these are the 4 key bits for mouse wheel/trackpad scrolling - which unlike X11 are
*not* presented as mouse button down/up events for each scroll action *not* presented as mouse button down/up events for each scroll action