minor fixes

src/blitter.c

 /*
-* UAE - The Un*x Amiga Emulator
-*
-* Custom chip emulation
-*
-* (c) 1995 Bernd Schmidt, Alessandro Bissacco
-* (c) 2002 - 2005 Toni Wilen
-*/
+ * UAE - The Un*x Amiga Emulator
+ *
+ * Custom chip emulation
+ *
+ * (c) 1995 Bernd Schmidt, Alessandro Bissacco
+ * (c) 2002 - 2005 Toni Wilen
+ */
 
 //#define BLITTER_DEBUG_NOWAIT
 //#define BLITTER_DEBUG

src/custom.c

 /*
-* UAE - The Un*x Amiga Emulator
-*
-* Custom chip emulation
-*
-* Copyright 1995-2002 Bernd Schmidt
-* Copyright 1995 Alessandro Bissacco
-* Copyright 2000-2010 Toni Wilen
-*/
+ * UAE - The Un*x Amiga Emulator
+ *
+ * Custom chip emulation
+ *
+ * Copyright 1995-2002 Bernd Schmidt
+ * Copyright 1995 Alessandro Bissacco
+ * Copyright 2000-2010 Toni Wilen
+ */
 
 #include "sysconfig.h"
 #include "sysdeps.h"

src/disk.c

@@ -2613,7 +2613,7 @@ static void fetchnextrevolution (drive *drv)
 #ifdef CAPS
 		caps_loadrevolution (drv->bigmfmbuf, drv - floppy, drv->cyl * 2 + side, &drv->tracklen);
 #endif
-	break;
+		break;
 	case ADF_FDI:
 #ifdef FDI2RAW
 		fdi2raw_loadrevolution (drv->fdi, drv->bigmfmbuf, drv->tracktiming, drv->cyl * 2 + side, &drv->tracklen, 1);

src/genblitter.c

@@ -174,7 +174,7 @@ static void generate_func(void)
 	if (a_is_on) printf("uae_u32 preva = 0;\n");
 	if (b_is_on) printf("uae_u32 prevb = 0, srcb = b->bltbhold;\n");
 	if (c_is_on) printf("uae_u32 srcc = b->bltcdat;\n");
-	printf("uae_u32 dstd=0;\n");
+	printf("uae_u32 dstd = 0;\n");
 	printf("uaecptr dstp = 0;\n");
 	printf("for (j = b->vblitsize; j--; ) {\n");
 	if (a_is_on) {

src/gencpu.c

@@ -2128,8 +2128,8 @@ static void gen_opcode (unsigned long int opcode)
 			printf ("\t\tint offset = 8;\n");
 #if 0
 			genamode (Aipi, "7", sz_word, "sr", 1, 0, 0);
-			genamode (Aipi, "7", sz_long, "pc", 1, 0, 0);
-			genamode (Aipi, "7", sz_word, "format", 1, 0, 0);
+		    genamode (Aipi, "7", sz_long, "pc", 1, 0, 0);
+		    genamode (Aipi, "7", sz_word, "format", 1, 0, 0);
 #endif
 			printf ("\t\tnewsr = sr; newpc = pc;\n");
 		    printf ("\t\tif ((format & 0xF000) == 0x0000) { m68k_areg (regs, 7) += offset; break; }\n");

src/include/options.h

@@ -211,6 +211,8 @@ struct uae_prefs {
 	int gfx_filter;
 	TCHAR gfx_filtershader[MAX_DPATH];
 	TCHAR gfx_filtermask[MAX_DPATH];
+	TCHAR gfx_filteroverlay[MAX_DPATH];
+	struct wh gfx_filteroverlay_pos;
 	int gfx_filter_scanlines;
 	int gfx_filter_scanlineratio;
 	int gfx_filter_scanlinelevel;

src/inputevents.def

@@ -299,7 +299,7 @@ DEFEVENT(KEY_7F,"Keycode 0x7F",AM_K,0,0,0x7f)
 /* special */
 
 DEFEVENT(SPC_ENTERGUI,"Enter GUI",AM_K,0,0,AKS_ENTERGUI)
-DEFEVENT(SPC_SCREENSHOT,"Screenshot",AM_K,0,0,AKS_SCREENSHOT_FILE)
+DEFEVENT(SPC_SCREENSHOT,"Screenshot (file)",AM_K,0,0,AKS_SCREENSHOT_FILE)
 DEFEVENT(SPC_SCREENSHOT_CLIPBOARD,"Screenshot (clipboard)",AM_K,0,0,AKS_SCREENSHOT_CLIPBOARD)
 DEFEVENT(SPC_FREEZEBUTTON,"Activate Cartridge",AM_K,0,0,AKS_FREEZEBUTTON)
 DEFEVENT(SPC_FLOPPY0,"Change disk in DF0:",AM_K,0,0,AKS_FLOPPY0)
@@ -362,9 +362,9 @@ DEFEVENT(SPC_DISK_NEXT3,"Next disk image in DF3:",AM_K,0,0,AKS_DISK_NEXT3)
 DEFEVENT(SPC_INPUT_CONFIG1,"Select Input Configuration #1",AM_K,0,0,AKS_INPUT_CONFIG_1)
 DEFEVENT(SPC_INPUT_CONFIG2,"Select Input Configuration #2",AM_K,0,0,AKS_INPUT_CONFIG_2)
 DEFEVENT(SPC_INPUT_CONFIG3,"Select Input Configuration #3",AM_K,0,0,AKS_INPUT_CONFIG_3)
-DEFEVENT(SPC_INPUT_CONFIG4,"Select Input Configuration #4",AM_K,0,0,AKS_INPUT_CONFIG_4)
+DEFEVENT(SPC_INPUT_CONFIG4,"Select GamePorts Input Configuration",AM_K,0,0,AKS_INPUT_CONFIG_4)
 
-DEFEVENT(SPC_ARCADIA_DIAGNOSTICS,"Arcadia diagnostics dip switch",AM_K,0,0,AKS_ARCADIADIAGNOSTICS)
+DEFEVENT(SPC_ARCADIA_DIAGNOSTICS,"Arcadia diagnostics DIP switch",AM_K,0,0,AKS_ARCADIADIAGNOSTICS)
 DEFEVENT(SPC_ARCADIA_PLAYER1,"Arcadia player 1",AM_K,0,0,AKS_ARCADIAPLY1)
 DEFEVENT(SPC_ARCADIA_PLAYER2,"Arcadia player 2",AM_K,0,0,AKS_ARCADIAPLY2)
 DEFEVENT(SPC_ARCADIA_COIN1,"Arcadia coin player 1",AM_K,0,0,AKS_ARCADIACOIN1)

src/tools/config.log

@@ -445,7 +445,7 @@ configure:4344: $? = 0
 configure:4344: result: yes
 configure:4350: checking for _doprnt
 configure:4350: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/cc4HIdmv.o: In function `main':
+/tmp/cc65mTgk.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:67: undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:4350: $? = 1
@@ -533,7 +533,7 @@ configure:4364: $? = 0
 configure:4364: result: yes
 configure:4364: checking for strcmpi
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/cc8gAlpK.o: In function `main':
+/tmp/cc7AqVhB.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `strcmpi'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1
@@ -613,7 +613,7 @@ configure: failed program was:
 configure:4364: result: no
 configure:4364: checking for stricmp
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccuLVxdI.o: In function `main':
+/tmp/ccqJO3OI.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `stricmp'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1