More work on the GTK+ frontend.

Matthias Koeppe · Matthias Koeppe · commit 2893c25a74e9 · 2002-01-22T10:19:17.000Z
diff --git a/BUGS b/BUGS
@@ -1,9 +1,6 @@
 The current option handling should be replaced with a proper one,
 using getopt.
 
-After finishing Windows-32 support, the source structure should be
-cleaned up. There are too many hacks at the moment.
-
 When using `mz80' instead of the native Z80 kernel, a lot of things
 fail. 
 
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-22  Matthias Koeppe  <mkoeppe@mail.math.uni-magdeburg.de>
+
+	Version 0.8
+
+	* graphics.c, mz800gtk.c, mz800vga.c, pckey.c: More work on the
+	GTK+ frontend.
+
 2002-01-21  Matthias Koeppe  <mkoeppe@mail.math.uni-magdeburg.de>
 
 	* Makefile, README, TODO, mz800gtk.c, mz800vga.c, pckey.c,
diff --git a/Makefile b/Makefile
@@ -1,11 +1,18 @@
 # Makefile for mz800em
 
-VERSION=0.7.2
+INSTALLPREFIX = /usr/local
 
-FAST=1
+#FAST=1
+#STRANGEMAGIC=1
+#USE_MZ80=1
+#USE_RAWKEY=1
 
 #VIDEOFLAGS=-DHAVE_640X480X256
 
+## No user-serviceable parts below 
+
+VERSION=0.8.0
+
 ifdef FAST
 
 # This will make the Z80 kernel faster, BUT you will lose speed
@@ -14,24 +21,13 @@ ifdef FAST
 # about register use, and the whole thing will hardly compile on
 # low-memory systems.
 
-ifdef PGCC
-CC=pgcc
-CFLAGS:=$(CFLAGS) -O9 -mpentium -march=pentium \
-	-B /usr/lib/gcc-lib/i586-pc-linux-gnu/pgcc-2.91.60/ \
-	-bi586-pc-linux-gnu \
-	-fno-exceptions
-else
-#CFLAGS:=$(CFLAGS) -O9 -mpentium -Wall
-CFLAGS:=$(CFLAGS) -Wall
-endif
-
-PRINTFLAGS=-DPRINT_INVOKES_ENSCRIPT
-#  -DMZISHPRINTER
+CFLAGS:=$(CFLAGS) -O2 -Wall
 
 Z80FLAGS=-DCOPY_BANKSWITCH -DHEAVY_LOAD -DSLOPPY_2 -DUSE_REGS \
 	-DNO_COUNT_TSTATES -DRISKY_REGS -DWIN95PROOF \
-	 -DDELAYED_UPDATE -DTWO_Z80_COPIES $(PRINTFLAGS)
+	 -DDELAYED_UPDATE -DTWO_Z80_COPIES
 
+SUFFIX=-fast
 
 else
 
@@ -64,8 +60,12 @@ ifdef DEBUG
 CFLAGS:=$(CFLAGS) -g
 endif
 
-CFLAGS:=$(CFLAGS) -I. $(INCLUDE) $(RAWKEYFLAGS) $(Z80FLAGS) $(VIDEOFLAGS)
+ifdef STRANGEMAGIC
+PRINTFLAGS=-DPRINT_INVOKES_ENSCRIPT
+#  -DMZISHPRINTER
+endif
 
+CFLAGS:=$(CFLAGS) -I. $(INCLUDE) $(RAWKEYFLAGS) $(Z80FLAGS) $(VIDEOFLAGS) $(PRINTFLAGS)
 
 #### Targets ####
 
@@ -95,7 +95,7 @@ MZ800GTK_OBJS=$(MZ800EM_OBJS) mz800gtk.o
 
 .PHONY: all install clean tgz
 
-all: mz800em mzget mzextract
+all: mz800em$(SUFFIX) mzget mzextract gmz800em$(SUFFIX)
 
 z80.o: z80.c z80.h cbops.c edops.c z80ops.c
 	$(CC) -c $(CFLAGS) z80.c -o $@
@@ -114,10 +114,10 @@ GTKCFLAGS=`gtk-config --cflags`
 mz800gtk.o: mz800gtk.c 
 	$(CC) -c $(CFLAGS) $(GTKCFLAGS) $< -o $@
 
-mz800em: $(MZ800VGA_OBJS)
+mz800em$(SUFFIX): $(MZ800VGA_OBJS)
 	$(CC) $(CFLAGS) -o $@ $(MZ800VGA_OBJS) -lvga $(RAWKEYLIB) -lm
 
-gmz800em: $(MZ800GTK_OBJS)
+gmz800em$(SUFFIX): $(MZ800GTK_OBJS)
 	$(CC) $(CFLAGS) -o $@ $(MZ800GTK_OBJS) `gtk-config --libs`
 
 mz800em.exe: $(MZ800WIN_OBJS)
@@ -129,21 +129,21 @@ mzget: mzget.o
 mzextract: mzextract.o
 	$(CC) $(CFLAGS) -o mzextract mzextract.o
 
-INSTALLPREFIX = /usr/local
 # You also have to edit `main.c' if you want a different target directory.
 install:
-	install -o root -m 4555 -s mz800em $(INSTALLPREFIX)/bin
+	install -o root -m 4555 -s mz800em$(SUFFIX) $(INSTALLPREFIX)/bin
+	install -m 555 gmz800em$(SUFFIX) -s $(INSTALLPREFIX)/bin
 	install -m 555 -s mzget mzextract $(INSTALLPREFIX)/bin
 	install -m 555 mzjoinimage $(INSTALLPREFIX)/bin
 	install -m 444 mz700.rom mz700fon.dat mz800.rom $(INSTALLPREFIX)/lib
 
 #install -m 555 mzprint $(INSTALLPREFIX)/bin
 
 change: 
-	$(RM) -f main.o mz800em mz800em.exe
+	$(RM) -f main.o mz800em mz800em-fast gmz800em gmz800em-fast mz800em.exe
 
 clean:
-	$(RM) -f *.o *~ *.bak *.s *.i mz800em mz800em.exe mzextract mzget 
+	$(RM) -f *.o *~ *.bak *.s *.i mz800em mz800em-fast gmz800em-fast gzm800em mz800em.exe mzextract mzget 
 
 #### Distribution section ####
 
@@ -159,6 +159,7 @@ FILES = COPYING ChangeLog Makefile README README-700 TODO BUGS		\
 	cbops.c edops.c font.txt					\
 	librawkey.a main.c mz700em.h mzextract.c mzget.c mzjoinimage	\
 	rawkey.h unpix.c z80.c z80.h z80ops.c disk.c graphics.h		\
+	pckey.c mz800gtk.c mz800vga.c					\
 	graphics.c mzterm.c mzmagic mzcat mzprint mzprintw		\
 	$(CYGFILES) $(MZ80FILES)					\
 	mz800em.btx
diff --git a/README b/README
@@ -36,8 +36,12 @@ Description
 -----------
 
 `mz800em' is a Sharp MZ800 emulator. Its primary target are GNU/Linux
-systems; it uses svgalib there. It has also been ported to Windows-32
-systems, using Cygnus Solution's cygwin32 library.
+systems; originally it used svgalib there, but now it also supports X
+via the GTK+ toolkit.  The GTK+ version might run on other UNIX
+flavors as well (but probably some signal stuff needs to be changed).
+
+`mz800em' has also been ported to Windows-32 systems, using Cygnus
+Solution's cygwin32 library.
 
 You can run MZ80K, MZ700 and MZ800 programs. It supports most m/c
 programs and games. There are also methods for loading BASIC programs
@@ -130,12 +134,7 @@ are some ideas taken from README-700:
 History etc.
 ------------
 
-Mz800em is based on Mz700em by Russell Marks. Some of the changes at
-the Z80 kernel for version 0.5 (COPY_BANKSWITCH and fetch/read
-distinction), which led to a faster kernel, were inspired by a deep
-view into SHARP.EXE, a very efficient MZ-800 emulator for DOS machines
-by Jaroslav Kysela <kysela@virgo.jcu.cz>, which is unfortunately no
-longer supported by the author. See ChangeLog for details.
+Mz800em is based on Mz700em by Russell Marks. 
 
 Russell writes:
 
@@ -147,6 +146,13 @@ Russell writes:
   had anything else to do with it and probably hasn't even heard of
   the MZ700.
 
+Some of the changes at the Z80 kernel for version 0.5 (COPY_BANKSWITCH
+and fetch/read distinction), which led to a faster kernel, were
+inspired by a deep view into SHARP.EXE, a very efficient MZ-800
+emulator for DOS machines by Jaroslav Kysela <kysela@virgo.jcu.cz>,
+which is unfortunately no longer supported by the author. See
+ChangeLog for details.
+
 Mz800em now optionally works with MZ80, the `Multi-Z80 emulator' by
 Neil Bradley (ftp://ftp.synthcom.com/pub/emulators/cpu/makez80.zip),
 instead of mz800em's traditional Z80 kernel. MZ80 is coded in mixed
@@ -158,18 +164,23 @@ complex memory-access code for the memory-mapped modes. On
 bankswitching instructions, we switch between the two copies if
 necessary.
 
+Version 0.8 added a GTK+ frontend (gmz800em).  I took the code from
+Russell's nc100em-1.2 and modified it to work with mz800em. 
+
 
 Using mz800em
 -------------
 
 There's no man page due to this being a really quick hack, so this'll
 have to do. Sorry. :-)
 
-In GNU/Linux, mz800em uses SVGALIB, that is, you must run it on the
-console.  In Windows-32, mz800em runs in a window.
+In GNU/Linux, there are two binaries: `mz800em' uses SVGALIB, that is,
+it runs on the console, provided that SVGALIB supports your graphics
+card.  `gmz800em' runs in a window on X.  In Windows-32, mz800em runs
+in a window.
 
-You can quit with F10. In GNU/Linux, virtual console switching works
-as usual with Alt-Fn.
+You can quit with F10. In the SVGALIB front-end, virtual console
+switching works as usual with Alt-Fn.
 
 The emulated MZ800 attempts to run at 3.546MHz; the speed is
 timer-controlled. You can switch the speed control off by typing
@@ -344,9 +355,9 @@ the following features will be enabled:
 
   - Proper keyboard support.  The MZ-ish way of reading the keyboard
     is replaced by a new method. This will give you better keyboard
-    response and a normal keyboard layout (assuming German layout I'm
-    afraid, but you can change this with a little work in
-    `mzterm.c'; if you did, please send me a patch). 
+    response and a normal keyboard layout (with German layout for the
+    svgalib and Windows front-ends, but you can change this with a
+    little work in `pckey.c'; if you did, please send me a patch). 
 
   - Printer support.  The printer output is appended to a file
     `~printer~' in the current working directory. The current LPT mode
diff --git a/TODO b/TODO
@@ -17,17 +17,13 @@ removed conditionally if we decide to include "z80ops.c" two (or
 three) times; one copy with ixoriy #define'd 0, and one copy which
 becomes active when an dd/fd prefix occurs.
 
-Support the X Window system, maybe using some code from Russell Marks'
-Z81 (metalab.unc.edu/pub/Linux/system/emulators/zx/z81-1.2.tar.gz) or
-nc100em. 
-
-Make a version running in DOS (using DJGPP and the svgalib port to
-DJGPP). 
-
 Cygwin: Add proper timing. Fix palette problem. Let the process pause
 if window is not active, or if it is waiting for mzterm-ish keyboard
 input. 
 
+GTK+: Improve the GTK+ display code.  Add support for the border color
+(BCOL). 
+
 Add support for the SHARP MZ-900 series, a Z80 machine running at
 12MHz, compatible with the MZ-800 series, but featuring 2 pages of
 640x200 graphics at 16 colors (4 planes), mapped at addresses
diff --git a/graphics.c b/graphics.c
@@ -78,7 +78,8 @@ void graphics_write(int addr, int value)
   int x, y;
   unsigned char *pptr, *buffer;
 
-  pptr = buffer = writeptr + ((addr - 0x8000) & 0x1fff) * 8;
+  pptr = buffer = writeptr + ((addr - 0x8000)
+			      & (mzbpl==40 ? 0x1fff : 0x3fff)) * 8;
 
   switch (WF >> 5) {
   case 0: /* Single write -- write to addressed planes */
@@ -114,15 +115,17 @@ void graphics_write(int addr, int value)
   if (!directvideo && !writeplaneb) {
     x = ((addr - 0x8000) % mzbpl) * 8; 
     y = (addr - 0x8000) / mzbpl;
-    req_graphics_update(buffer, x, y, 8);
+    if (y < 200) 
+      req_graphics_update(buffer, x, y, 8);
   }
 
 }
 
 int graphics_read(int addr)
 {
   int i;
-  unsigned char *pptr = readptr + ((addr - 0x8000) & 0x1fff) * 8;
+  unsigned char *pptr = readptr + ((addr - 0x8000)
+				   & (mzbpl==40 ? 0x1fff : 0x3fff)) * 8;
   int result = 0;
 
   switch (RF >> 7) {
diff --git a/mz800gtk.c b/mz800gtk.c
diff --git a/mz800vga.c b/mz800vga.c
