19.05.2010

src/gencpu.c

@@ -3809,7 +3809,6 @@ int main (int argc, char **argv)
      * I don't dare to touch the 68k version.  */
 
     headerfile = fopen ("cputbl.h", "wb");
-
 	stblfile = fopen ("cpustbl.c", "wb");
     generate_includes (stblfile);
 

src/gfx-sdl/sdlgfx.c

@@ -123,13 +123,13 @@ static int mousegrab;
 static int mousehack;
 
 static int is_hwsurface;
-
 static int have_rawkeys;
-
 static int refresh_necessary;
-
 static int last_state = -1;
 
+int alt_pressed;
+unsigned int mouse_capture;
+
 /*
  * Set window title with some useful status info.
  */
@@ -673,7 +673,7 @@ STATIC_INLINE void render_gl_buffer (const struct gl_buffer_t *buffer, int first
 
     if (currprefs.leds_on_screen) bottomledspace=14; //reserve some space for drawing leds
 
-    if (currprefs.gfx_lores_mode) {						
+    if (currprefs.gfx_lores_mode) {
 		amiga_real_w = 362;
 		gfx_gl_x_offset = (float) currprefs.gfx_gl_x_offset;
     } else {
@@ -682,21 +682,21 @@ STATIC_INLINE void render_gl_buffer (const struct gl_buffer_t *buffer, int first
     }
     if (currprefs.gfx_linedbl) {
 		amiga_real_h = 568;
-		gfx_gl_y_offset = (float) currprefs.gfx_gl_y_offset * 2; 
-    } else {  
+		gfx_gl_y_offset = (float) currprefs.gfx_gl_y_offset * 2;
+    } else {
 		amiga_real_h = 284;
-		gfx_gl_y_offset = (float) currprefs.gfx_gl_y_offset; 
+		gfx_gl_y_offset = (float) currprefs.gfx_gl_y_offset;
     }
-    
+
     if ((current_width >= amiga_real_w ) &&  (current_height >= amiga_real_h )  && (!screen_is_picasso)  ) {
         gfx_gl_x_panscan = currprefs.gfx_gl_panscan * 1.33f;
 		gfx_gl_y_panscan = currprefs.gfx_gl_panscan;
-	
+
 		right_crop	= (current_width - amiga_real_w) + gfx_gl_x_panscan ;
 		left_crop	= gfx_gl_x_panscan;
 		bottom_crop	= (current_height - amiga_real_h) + gfx_gl_y_panscan;
 		top_crop	= gfx_gl_y_panscan;
-	
+
 		bottom_crop			= bottom_crop - bottomledspace ;
 		bottom_crop_global	= (int) (bottom_crop - gfx_gl_y_panscan);
 		right_crop_global	= (int) (right_crop - gfx_gl_x_panscan);
@@ -708,7 +708,7 @@ STATIC_INLINE void render_gl_buffer (const struct gl_buffer_t *buffer, int first
 		gfx_gl_x_offset = 0;
 		gfx_gl_y_offset = 0;
     }
-    
+
     if (have_texture_rectangles) {
 		tx0 = 			      left_crop  - gfx_gl_x_offset;
 		tx1 = (float) buffer->width - right_crop - gfx_gl_x_offset;
@@ -1330,6 +1330,23 @@ void handle_events (void)
 			int keycode;
 			int ievent;
 
+			// Hack -- Alt + Tab
+/*
+			if (rEvent.key.keysym.sym == SDLK_LALT) alt_pressed = rEvent.key.type;
+			if (rEvent.key.keysym.sym == SDLK_RALT) alt_pressed = rEvent.key.type;
+			if ((rEvent.key.keysym.sym == SDLK_TAB) && (alt_pressed == SDL_KEYDOWN)) {
+				alt_pressed = SDL_KEYUP;
+
+				if (mouse_capture) {
+			                SDL_WM_GrabInput(SDL_GRAB_ON);
+			                SDL_ShowCursor(SDL_DISABLE);
+			        } else {
+			                SDL_WM_GrabInput(SDL_GRAB_OFF);
+			                SDL_ShowCursor(SDL_ENABLE);
+			        }
+				break;
+			}
+*/
 			if (currprefs.map_raw_keys) {
 			    keycode = rEvent.key.keysym.scancode;
 			    // Hack - OS4 keyup events have bit 7 set.

src/misc.c

@@ -836,3 +836,4 @@ int input_get_default_joystick_analog (struct uae_input_device *uid, int i, int
         return 0;
 }
 
+//

src/od-macosx/Info.plist

@@ -28,8 +28,8 @@
 	<key>CFBundleName</key>
 	<string>PUAE</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 </dict>
 </plist>

src/savestate.c

@@ -358,7 +358,7 @@ static void restore_header (uae_u8 *src)
     emuversion = restore_string ();
     description = restore_string ();
 	write_log ("Saved with: '%s %s', description: '%s'\n",
-	emuname, emuversion, description);
+		emuname, emuversion, description);
 	xfree (description);
 	xfree (emuversion);
 	xfree (emuname);

src/scsiemul.c

@@ -207,33 +207,33 @@ static uae_u32 REGPARAM2 dev_open_2 (TrapContext *context, int type)
     if (!dev)
 		return openfail (ioreq, 32); /* badunitnum */
     if (!dev->opencnt) {
-	for (i = 0; i < MAX_OPEN_DEVICES; i++) {
-	    pdev = &pdevst[i];
-	    if (pdev->inuse == 0) break;
-	}
+		for (i = 0; i < MAX_OPEN_DEVICES; i++) {
+		    pdev = &pdevst[i];
+		    if (pdev->inuse == 0) break;
+		}
 		if (type == UAEDEV_SCSI_ID && sys_command_open (dev->allow_scsi ? DF_SCSI : DF_IOCTL, dev->unitnum)) {
 			setpdev (pdev, dev);
-	}
-	if (type == UAEDEV_DISK_ID && sys_command_open (DF_IOCTL, dev->unitnum)) {
-	    pdev->ioctl = 1;
-	    pdev->mode = DF_IOCTL;
-	}
-	if (!pdev->scsi && !pdev->ioctl)
-			return openfail (ioreq, IOERR_OPENFAIL);
-	pdev->type = type;
-	pdev->unit = unit;
-	pdev->flags = flags;
-	pdev->inuse = 1;
-	put_long (ioreq + 24, pdev - pdevst);
-	start_thread (dev);
+		}
+		if (type == UAEDEV_DISK_ID && sys_command_open (DF_IOCTL, dev->unitnum)) {
+		    pdev->ioctl = 1;
+		    pdev->mode = DF_IOCTL;
+		}
+		if (!pdev->scsi && !pdev->ioctl)
+				return openfail (ioreq, IOERR_OPENFAIL);
+		pdev->type = type;
+		pdev->unit = unit;
+		pdev->flags = flags;
+		pdev->inuse = 1;
+		put_long (ioreq + 24, pdev - pdevst);
+		start_thread (dev);
     } else {
-	for (i = 0; i < MAX_OPEN_DEVICES; i++) {
-	    pdev = &pdevst[i];
+		for (i = 0; i < MAX_OPEN_DEVICES; i++) {
+		    pdev = &pdevst[i];
 			if (pdev->inuse && pdev->unit == unit) break;
-	}
-	if (i == MAX_OPEN_DEVICES)
+		}
+		if (i == MAX_OPEN_DEVICES)
 			return openfail (ioreq, IOERR_OPENFAIL);
-	put_long (ioreq + 24, pdev - pdevst);
+		put_long (ioreq + 24, pdev - pdevst);
     }
     dev->opencnt++;
 
@@ -265,8 +265,8 @@ static int is_async_request (struct devstruct *dev, uaecptr request)
 {
     int i = 0;
     while (i < MAX_ASYNC_REQUESTS) {
-	if (dev->d_request[i] == request) return 1;
-	i++;
+		if (dev->d_request[i] == request) return 1;
+		i++;
     }
     return 0;
 }
@@ -559,7 +559,7 @@ static int dev_do_io (struct devstruct *dev, uaecptr request)
 		if (!dev->di.media_inserted)
 			goto no_media;
 		if (dev->di.write_protected || dev->drivetype == INQ_ROMD) {
-	io_error = 28; /* writeprotect */
+			io_error = 28; /* writeprotect */
 		} else if ((io_offset & bmask) || bmask == 0 || io_data == 0) {
 			goto bad_command;
 		} else if ((io_length & bmask) || io_length == 0) {

src/sysconfig.h

@@ -293,7 +293,7 @@
 #define PACKAGE_NAME "PUAE"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PUAE 2.1.0"
+#define PACKAGE_STRING "PUAE 2.2.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "puae"
@@ -302,7 +302,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1.0"
+#define PACKAGE_VERSION "2.2.0"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -395,7 +395,7 @@
 
 
 /* Version number of package */
-#define VERSION "2.1.0"
+#define VERSION "2.2.0"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

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/ccSMtDaE.o: In function `main':
+/tmp/ccduySMn.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/ccMreunT.o: In function `main':
+/tmp/ccgpaTxE.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/ccfHXHOY.o: In function `main':
+/tmp/ccAjejvH.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

src/traps.c

@@ -227,8 +227,6 @@ static void *trap_thread (void *arg)
 {
 	TrapContext *context = (TrapContext *) arg;
 
-    uae_set_thread_priority (2);
-
     /* Wait until main thread is ready to switch to the
      * this trap context. */
     uae_sem_wait (&context->switch_to_trap_sem);

src/uaeexe.c

@@ -19,7 +19,7 @@
 static struct uae_xcmd *first = NULL;
 static struct uae_xcmd *last  = NULL;
 static TCHAR running = 0;
-static uae_u32 uaeexe_server (TrapContext *context) REGPARAM;
+static uae_u32 REGPARAM3 uaeexe_server (TrapContext *context) REGPARAM;
 
 /*
  * Install the server

src/uaelib.c

@@ -57,7 +57,7 @@ static uae_u32 emulib_Reset (void)
 static uae_u32 emulib_EnableSound (uae_u32 val)
 {
     if (!sound_available || currprefs.produce_sound == 2)
-	return 0;
+		return 0;
 
     currprefs.produce_sound = val;
     return 1;
@@ -79,12 +79,12 @@ static uae_u32 emulib_EnableJoystick (uae_u32 val)
 static uae_u32 emulib_SetFrameRate (uae_u32 val)
 {
     if (val == 0)
-	return 0;
+		return 0;
     else if (val > 20)
-	return 0;
+		return 0;
     else {
-	currprefs.gfx_framerate = val;
-	return 1;
+		currprefs.gfx_framerate = val;
+		return 1;
     }
 }
 
@@ -191,7 +191,7 @@ static uae_u32 emulib_InsertDisk (uaecptr name, uae_u32 drive)
 		return 0;
 
     while ((real_name[i] = get_byte (name + i)) != 0 && i++ != 254)
-	;
+		;
 
     if (i == 255)
 		return 0; /* ENAMETOOLONG */
@@ -371,32 +371,32 @@ static uae_u32 REGPARAM2 uaelib_demux2 (TrapContext *context)
 
     switch (ARG0)
 	{
-     case 0: return emulib_GetVersion ();
-     case 1: return emulib_GetUaeConfig (ARG1);
-     case 2: return emulib_SetUaeConfig (ARG1);
-     case 3: return emulib_HardReset ();
-     case 4: return emulib_Reset ();
-     case 5: return emulib_InsertDisk (ARG1, ARG2);
-     case 6: return emulib_EnableSound (ARG1);
-     case 7: return emulib_EnableJoystick (ARG1);
-     case 8: return emulib_SetFrameRate (ARG1);
+	case 0: return emulib_GetVersion ();
+	case 1: return emulib_GetUaeConfig (ARG1);
+	case 2: return emulib_SetUaeConfig (ARG1);
+	case 3: return emulib_HardReset ();
+	case 4: return emulib_Reset ();
+	case 5: return emulib_InsertDisk (ARG1, ARG2);
+	case 6: return emulib_EnableSound (ARG1);
+	case 7: return emulib_EnableJoystick (ARG1);
+	case 8: return emulib_SetFrameRate (ARG1);
 	case 9: return emulib_ChgCMemSize (ARG1);
 	case 10: return emulib_ChgSMemSize (ARG1);
 	case 11: return emulib_ChgFMemSize (ARG1);
-     case 12: return emulib_ChangeLanguage (ARG1);
-	/* The next call brings bad luck */
-     case 13: return emulib_ExitEmu ();
-     case 14: return emulib_GetDisk (ARG1, ARG2);
-     case 15: return emulib_Debug ();
+	case 12: return emulib_ChangeLanguage (ARG1);
+		/* The next call brings bad luck */
+	case 13: return emulib_ExitEmu ();
+	case 14: return emulib_GetDisk (ARG1, ARG2);
+	case 15: return emulib_Debug ();
 
-     case 68: return emulib_Minimize ();
+	case 68: return emulib_Minimize ();
 	case 69: return emulib_ExecuteNativeCode ();
 
 	case 70: return 0; /* RESERVED. Something uses this.. */
 
-     case 80: return currprefs.maprom ? currprefs.maprom : 0xffffffff;
-     case 81: return cfgfile_uaelib (ARG1, ARG2, ARG3, ARG4);
-     case 82: return cfgfile_uaelib_modify (ARG1, ARG2, ARG3, ARG4, ARG5);
+	case 80: return currprefs.maprom ? currprefs.maprom : 0xffffffff;
+	case 81: return cfgfile_uaelib (ARG1, ARG2, ARG3, ARG4);
+	case 82: return cfgfile_uaelib_modify (ARG1, ARG2, ARG3, ARG4, ARG5);
 	case 83: currprefs.mmkeyboard = ARG1 ? 1 : 0; return currprefs.mmkeyboard;
 #ifdef DEBUGGER
 	case 84: return mmu_init (ARG1, ARG2, ARG3);