Factored out a lot of functions into mz800gtk.c, mz800win.c, pckey.c,

and mz800vga.c, saving a million #ifdefs.

Started GTK+ frontend.

Author: Matthias Koeppe

Makefile

@@ -2,6 +2,10 @@
 
 VERSION=0.7.2
 
+FAST=1
+
+#VIDEOFLAGS=-DHAVE_640X480X256
+
 ifdef FAST
 
 # This will make the Z80 kernel faster, BUT you will lose speed
@@ -17,7 +21,8 @@ CFLAGS:=$(CFLAGS) -O9 -mpentium -march=pentium \
 	-bi586-pc-linux-gnu \
 	-fno-exceptions
 else
-CFLAGS:=$(CFLAGS) -O9 -m486 -Wall
+#CFLAGS:=$(CFLAGS) -O9 -mpentium -Wall
+CFLAGS:=$(CFLAGS) -Wall
 endif
 
 PRINTFLAGS=-DPRINT_INVOKES_ENSCRIPT
@@ -27,7 +32,6 @@ Z80FLAGS=-DCOPY_BANKSWITCH -DHEAVY_LOAD -DSLOPPY_2 -DUSE_REGS \
 	-DNO_COUNT_TSTATES -DRISKY_REGS -DWIN95PROOF \
 	 -DDELAYED_UPDATE -DTWO_Z80_COPIES $(PRINTFLAGS)
 
-#	-DVGA16
 
 else
 
@@ -60,7 +64,7 @@ ifdef DEBUG
 CFLAGS:=$(CFLAGS) -g
 endif
 
-CFLAGS:=$(CFLAGS) -I. $(RAWKEYFLAGS) $(Z80FLAGS)
+CFLAGS:=$(CFLAGS) -I. $(INCLUDE) $(RAWKEYFLAGS) $(Z80FLAGS) $(VIDEOFLAGS)
 
 
 #### Targets ####
@@ -83,7 +87,11 @@ endif
 
 MZ800EM_OBJS=$(Z80_OBJS) main.o disk.o graphics.o mzterm.o
 
-MZ800WIN_OBJS=$(MZ800EM_OBJS) mz800win.o
+MZ800VGA_OBJS=$(MZ800EM_OBJS) mz800vga.o pckey.o
+
+MZ800WIN_OBJS=$(MZ800EM_OBJS) mz800win.o pckey.o
+
+MZ800GTK_OBJS=$(MZ800EM_OBJS) mz800gtk.o
 
 .PHONY: all install clean tgz
 
@@ -101,8 +109,16 @@ mzterm.o: mzterm.c mz800win.h
 main.o: main.c mz800win.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mz800em: $(MZ800EM_OBJS)
-	$(CC) $(CFLAGS) -o mz800em $(MZ800EM_OBJS) -lvga $(RAWKEYLIB) -lm
+GTKCFLAGS=`gtk-config --cflags`
+
+mz800gtk.o: mz800gtk.c 
+	$(CC) -c $(CFLAGS) $(GTKCFLAGS) $< -o $@
+
+mz800em: $(MZ800VGA_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(MZ800VGA_OBJS) -lvga $(RAWKEYLIB) -lm
+
+gmz800em: $(MZ800GTK_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(MZ800GTK_OBJS) `gtk-config --libs`
 
 mz800em.exe: $(MZ800WIN_OBJS)
 	$(CC) $(CFLAGS) -o mz800em.exe $(MZ800WIN_OBJS) -lm -mwindows

README

@@ -3,7 +3,8 @@ system, also available for Windows-32 systems.
 
 Z80 emulation from `xz80', copyright (C) 1994 Ian Collier.
 MZ700 support and VGA front-end (C) 1996 Russell Marks.
-MZ800 support and Windows-32 port are copr. 1998,1999 Matthias Koeppe 
+GTK+ front-end taken from nc100em-1.2, which is copr. 1999 Russell Marks.
+MZ800 support and Windows-32 port are copr. 1998,1999,2002 Matthias Koeppe 
 <[email protected]>.
 
 This program is free software; you can redistribute it and/or modify

TODO

@@ -28,9 +28,6 @@ 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. 
 
-GNU/Linux: Finish the `VGA16' mode of doing graphics; this should
-improve speed on my slow VGA computer, especially in 640x200 mode.
-
 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