fuse-for-macosx-commits Mailing List for Fuse for macOS (Page 11)
Brought to you by:
fredm
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(31) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(24) |
Feb
(11) |
Mar
(6) |
Apr
(48) |
May
(9) |
Jun
(38) |
Jul
(33) |
Aug
(15) |
Sep
|
Oct
(3) |
Nov
(6) |
Dec
(3) |
2008 |
Jan
|
Feb
(24) |
Mar
(11) |
Apr
(22) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(3) |
Nov
(18) |
Dec
(23) |
2009 |
Jan
(16) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
(7) |
Jul
(4) |
Aug
(11) |
Sep
(9) |
Oct
|
Nov
(3) |
Dec
(2) |
2010 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
(2) |
May
(8) |
Jun
|
Jul
|
Aug
(2) |
Sep
(2) |
Oct
(9) |
Nov
|
Dec
(8) |
2011 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(2) |
Dec
|
2012 |
Jan
(4) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(13) |
Dec
(11) |
2013 |
Jan
(4) |
Feb
(1) |
Mar
(8) |
Apr
(8) |
May
(16) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
2014 |
Jan
|
Feb
(6) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(10) |
Jun
(9) |
Jul
(6) |
Aug
(5) |
Sep
(3) |
Oct
(6) |
Nov
(5) |
Dec
|
From: <fr...@us...> - 2009-01-09 23:20:33
|
Revision: 587 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=587&view=rev Author: fredm Date: 2009-01-09 23:20:25 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Merge r577: also update the statusbar if nothing has changed on the Speccy screen. Modified Paths: -------------- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m Modified: branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h 2009-01-09 23:16:34 UTC (rev 586) +++ branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h 2009-01-09 23:20:25 UTC (rev 587) @@ -61,6 +61,7 @@ ui_statusbar_state disk_state; ui_statusbar_state mdr_state; ui_statusbar_state tape_state; + BOOL statusbar_updated; NSLock *view_lock; Modified: branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 23:16:34 UTC (rev 586) +++ branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 23:20:25 UTC (rev 587) @@ -119,6 +119,9 @@ [self displayLinkStart]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] releaseCmdKeys:@"f":QZ_f]; } @@ -248,6 +251,8 @@ currentScreenTex = 0; + statusbar_updated = NO; + return self; } @@ -484,6 +489,8 @@ /* Swap buffer to screen */ [[self openGLContext] flushBuffer]; + statusbar_updated = NO; + [view_lock unlock]; } @@ -528,6 +535,8 @@ glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); + statusbar_updated = YES; + [view_lock unlock]; } @@ -960,18 +969,27 @@ -(void) setDiskState:(NSNumber*)state { disk_state = [state unsignedCharValue]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] setDiskState:state]; } -(void) setTapeState:(NSNumber*)state { tape_state = [state unsignedCharValue]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] setTapeState:state]; } -(void) setMdrState:(NSNumber*)state { mdr_state = [state unsignedCharValue]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] setMdrState:state]; } @@ -1206,43 +1224,47 @@ PIG_dirtytable *workdirty = NULL; [buffered_screen_lock lock]; - if( buffered_screen.dirty->count == 0 ) { + if( buffered_screen.dirty->count == 0 && !statusbar_updated ) { [buffered_screen_lock unlock]; return kCVReturnSuccess; } - if (screenTex[currentScreenTex].dirty) - pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); - - currentScreenTex = !currentScreenTex; - - pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); - - if( workdirty ) - pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); - else - pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); - - /* Draw texture to screen */ - for(i = 0; i < workdirty->count; ++i) - copy_area( &screenTex[currentScreenTex], &buffered_screen, - workdirty->rects + i ); - - buffered_screen.dirty->count = 0; - - pig_dirty_close( workdirty ); - - [[self openGLContext] makeCurrentContext]; - - /* Bind, update and draw new image */ - glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); - - glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, - screenTex[currentScreenTex].full_width, - screenTex[currentScreenTex].full_height, GL_BGRA, - GL_UNSIGNED_SHORT_1_5_5_5_REV, - screenTex[currentScreenTex].pixels ); + if( buffered_screen.dirty->count > 0 ) { + if (screenTex[currentScreenTex].dirty) + pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); + + currentScreenTex = !currentScreenTex; + + pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); + + if( workdirty ) + pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); + else + pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); + + /* Draw texture to screen */ + for(i = 0; i < workdirty->count; ++i) + copy_area( &screenTex[currentScreenTex], &buffered_screen, + workdirty->rects + i ); + + buffered_screen.dirty->count = 0; + + pig_dirty_close( workdirty ); + + [[self openGLContext] makeCurrentContext]; + + /* Bind, update and draw new image */ + glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); + + glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, + screenTex[currentScreenTex].full_width, + screenTex[currentScreenTex].full_height, GL_BGRA, + GL_UNSIGNED_SHORT_1_5_5_5_REV, + screenTex[currentScreenTex].pixels ); + + } + [buffered_screen_lock unlock]; NSAutoreleasePool *pool = [NSAutoreleasePool new]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2009-01-09 23:16:38
|
Revision: 586 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=586&view=rev Author: fredm Date: 2009-01-09 23:16:34 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Merge r576: decouple texture updating and drawing and only update texture when there are changes (Roine Gustafsson). Modified Paths: -------------- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m Modified: branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h 2009-01-09 23:10:29 UTC (rev 585) +++ branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.h 2009-01-09 23:16:34 UTC (rev 586) @@ -61,7 +61,6 @@ ui_statusbar_state disk_state; ui_statusbar_state mdr_state; ui_statusbar_state tape_state; - BOOL statusbar_updated; NSLock *view_lock; Modified: branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 23:10:29 UTC (rev 585) +++ branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 23:16:34 UTC (rev 586) @@ -119,9 +119,6 @@ [self displayLinkStart]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] releaseCmdKeys:@"f":QZ_f]; } @@ -195,7 +192,6 @@ instance = self; buffered_screen_lock = [[NSLock alloc] init]; - [buffered_screen_lock retain]; real_emulator = [[Emulator alloc] init]; } @@ -252,18 +248,28 @@ currentScreenTex = 0; - statusbar_updated = NO; - return self; } +-(void)dealloc +{ + if (view_lock) + [view_lock release]; + view_lock = nil; + + if (buffered_screen_lock) + [buffered_screen_lock release]; + buffered_screen_lock = nil; + + [super dealloc]; +} + -(void) awakeFromNib { /* keep the window in the standard aspect ratio if the user resizes */ [[self window] setContentAspectRatio:NSMakeSize(4.0,3.0)]; view_lock = [[NSLock alloc] init]; - [view_lock retain]; CVReturn error = kCVReturnSuccess; CGDirectDisplayID displayID = CGMainDisplayID(); @@ -308,9 +314,6 @@ [greenDisk release]; greenDisk = nil; - [buffered_screen_lock release]; - buffered_screen_lock = nil; - [self release]; } @@ -412,40 +415,17 @@ -(void) drawRect:(NSRect)aRect { - int i; - PIG_dirtytable *workdirty = NULL; + [view_lock lock]; - [view_lock lock]; - [buffered_screen_lock lock]; - if( NO == screenTexInitialised ) { - [buffered_screen_lock unlock]; + [[self openGLContext] makeCurrentContext]; + + if (!screenTexInitialised) { + glClear(GL_COLOR_BUFFER_BIT); + [view_lock unlock]; return; } - if( screenTex[currentScreenTex].dirty ) - pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); - - currentScreenTex = !currentScreenTex; - - pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); - - if( workdirty ) - pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); - else - pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); - - /* Draw texture to screen */ - for(i = 0; i < workdirty->count; ++i) - copy_area( &screenTex[currentScreenTex], &buffered_screen, - workdirty->rects + i ); - - buffered_screen.dirty->count = 0; - - pig_dirty_close( workdirty ); - - [[self openGLContext] makeCurrentContext]; - int border_x_offset = 0; int border_y_offset = 0; if( settings_current.full_screen && settings_current.full_screen_panorama ) { @@ -472,15 +452,8 @@ /* Bind, update and draw new image */ glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); - - glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, - screenTex[currentScreenTex].full_width, - screenTex[currentScreenTex].full_height, GL_BGRA, - GL_UNSIGNED_SHORT_1_5_5_5_REV, - screenTex[currentScreenTex].pixels ); - + glBegin( GL_QUADS ); - glTexCoord2f( (float)(screenTex[currentScreenTex].image_width + screenTex[currentScreenTex].image_xoffset + border_y_offset), (float)(screenTex[currentScreenTex].image_yoffset + border_x_offset) @@ -504,7 +477,6 @@ (float)(screenTex[currentScreenTex].image_yoffset + border_x_offset) ); glVertex2f( -1.0f, 1.0f ); - glEnd(); if ( settings_current.statusbar ) [self iconOverlay]; @@ -512,9 +484,6 @@ /* Swap buffer to screen */ [[self openGLContext] flushBuffer]; - statusbar_updated = NO; - - [buffered_screen_lock unlock]; [view_lock unlock]; } @@ -559,7 +528,6 @@ glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); - statusbar_updated = YES; [view_lock unlock]; } @@ -567,12 +535,11 @@ { GLuint i; - [view_lock lock]; - if( screenTexInitialised == NO) { - [view_lock unlock]; + if (!screenTexInitialised) return; - } + [view_lock lock]; + [self displayLinkStop]; glDeleteTextures( MAX_SCREEN_BUFFERS, screenTexId ); @@ -993,27 +960,18 @@ -(void) setDiskState:(NSNumber*)state { disk_state = [state unsignedCharValue]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] setDiskState:state]; } -(void) setTapeState:(NSNumber*)state { tape_state = [state unsignedCharValue]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] setTapeState:state]; } -(void) setMdrState:(NSNumber*)state { mdr_state = [state unsignedCharValue]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] setMdrState:state]; } @@ -1244,7 +1202,52 @@ -(CVReturn) displayFrame:(const CVTimeStamp *)timeStamp { + int i; + PIG_dirtytable *workdirty = NULL; + + [buffered_screen_lock lock]; + if( buffered_screen.dirty->count == 0 ) { + [buffered_screen_lock unlock]; + return kCVReturnSuccess; + } + + if (screenTex[currentScreenTex].dirty) + pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); + + currentScreenTex = !currentScreenTex; + + pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); + + if( workdirty ) + pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); + else + pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); + + /* Draw texture to screen */ + for(i = 0; i < workdirty->count; ++i) + copy_area( &screenTex[currentScreenTex], &buffered_screen, + workdirty->rects + i ); + + buffered_screen.dirty->count = 0; + + pig_dirty_close( workdirty ); + + [[self openGLContext] makeCurrentContext]; + + /* Bind, update and draw new image */ + glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); + + glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, + screenTex[currentScreenTex].full_width, + screenTex[currentScreenTex].full_height, GL_BGRA, + GL_UNSIGNED_SHORT_1_5_5_5_REV, + screenTex[currentScreenTex].pixels ); + + [buffered_screen_lock unlock]; + + NSAutoreleasePool *pool = [NSAutoreleasePool new]; [self drawRect:NSZeroRect]; + [pool release]; return kCVReturnSuccess; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2009-01-09 23:10:34
|
Revision: 585 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=585&view=rev Author: fredm Date: 2009-01-09 23:10:29 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Merge r575: stop displayLink when quitting from emulator before stopping emulator thread. Modified Paths: -------------- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m Modified: branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 23:04:32 UTC (rev 584) +++ branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 23:10:29 UTC (rev 585) @@ -1235,6 +1235,8 @@ int error = [self checkMediaChanged]; if( error ) return NO; + [self displayLinkStop]; + return YES; } return NO; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2009-01-09 23:04:39
|
Revision: 584 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=584&view=rev Author: fredm Date: 2009-01-09 23:04:32 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Merge r574 from trunk: fix colours in minimised toolbar icon on GMA950 card (Roine Gustafsson). Modified Paths: -------------- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m Modified: branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 22:46:17 UTC (rev 583) +++ branches/Release-0_10_0-branch/fuse/fusepb/views/DisplayOpenGLView.m 2009-01-09 23:04:32 UTC (rev 584) @@ -1201,7 +1201,8 @@ CGDataProviderRef provider = CGDataProviderCreateDirectAccess(bitmap, rowbytes * size.height, &gProviderCallbacks); CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB(); CGImageRef cgImage = CGImageCreate(size.width, size.height, 8, 32, rowbytes, cs, - kCGImageAlphaNoneSkipFirst, provider, NULL, NO, kCGRenderingIntentDefault); + kCGBitmapByteOrder32Host | kCGImageAlphaNoneSkipFirst, provider, NULL, NO, + kCGRenderingIntentDefault); // composite the CGImage into the view CGContextRef gc = [[NSGraphicsContext currentContext] graphicsPort]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2009-01-09 22:46:23
|
Revision: 583 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=583&view=rev Author: fredm Date: 2009-01-09 22:46:17 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Merge r578 from trunk to fix running with sound disabled. Modified Paths: -------------- branches/Release-0_10_0-branch/fuse/fusepb/English.lproj/InfoPlist.strings branches/Release-0_10_0-branch/fuse/fusepb/Fuse.xcodeproj/project.pbxproj branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.h branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.m branches/Release-0_10_0-branch/fuse/spectrum.c Added Paths: ----------- branches/Release-0_10_0-branch/fuse/fusepb/timer/ branches/Release-0_10_0-branch/fuse/fusepb/timer/timer.c Removed Paths: ------------- branches/Release-0_10_0-branch/fuse/fusepb/timer/timer.c Property Changed: ---------------- branches/Release-0_10_0-branch/ branches/Release-0_10_0-branch/fuse/ branches/Release-0_10_0-branch/libspectrum/libspectrum/ Property changes on: branches/Release-0_10_0-branch ___________________________________________________________________ Added: svn:mergeinfo + /trunk:578 Property changes on: branches/Release-0_10_0-branch/fuse ___________________________________________________________________ Modified: svn:mergeinfo - /vendor/fuse-emulator/0.10.0/fuse:556-557 /vendor/fuse-emulator/0.10.0-pre1/fuse:545-546 /vendor/fuse-emulator/current/fuse:530-538 + /trunk/fuse:578 /vendor/fuse-emulator/0.10.0/fuse:556-557 /vendor/fuse-emulator/0.10.0-pre1/fuse:545-546 /vendor/fuse-emulator/current/fuse:530-538 Modified: branches/Release-0_10_0-branch/fuse/fusepb/English.lproj/InfoPlist.strings =================================================================== (Binary files differ) Modified: branches/Release-0_10_0-branch/fuse/fusepb/Fuse.xcodeproj/project.pbxproj =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-01-09 14:05:27 UTC (rev 582) +++ branches/Release-0_10_0-branch/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-01-09 22:46:17 UTC (rev 583) @@ -163,8 +163,8 @@ B62B1A2A0DD667EC00D42AAF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B62B1A290DD667EC00D42AAF /* main.m */; }; B63225EC0C66BA1300BB081B /* osname.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225EB0C66BA1300BB081B /* osname.c */; }; B63225EE0C66BA3700BB081B /* paths.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225ED0C66BA3700BB081B /* paths.c */; }; - B63225F50C66BA7400BB081B /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225F20C66BA7400BB081B /* timer.c */; }; B63225F70C66BA7400BB081B /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225F40C66BA7400BB081B /* unix.c */; }; + B6374FA50F178298003CE6E2 /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = B6374FA40F178298003CE6E2 /* timer.c */; }; B639B7680A6BAFCF00927E24 /* csw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7670A6BAFCF00927E24 /* csw.icns */; }; B639B7D10A6BB45600927E24 /* raw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7D00A6BB45600927E24 /* raw.icns */; }; B6403FD80A7E4B1A00E00B11 /* loader.c in Sources */ = {isa = PBXBuildFile; fileRef = B6403FD60A7E4B1A00E00B11 /* loader.c */; }; @@ -328,11 +328,11 @@ B62F3BCF059F5BF300A7009A /* PokeFinderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PokeFinderController.m; path = controllers/PokeFinderController.m; sourceTree = "<group>"; }; B63225EB0C66BA1300BB081B /* osname.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = osname.c; sourceTree = "<group>"; }; B63225ED0C66BA3700BB081B /* paths.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = paths.c; sourceTree = "<group>"; }; - B63225F20C66BA7400BB081B /* timer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = timer.c; sourceTree = "<group>"; }; B63225F30C66BA7400BB081B /* timer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; }; B63225F40C66BA7400BB081B /* unix.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = unix.c; sourceTree = "<group>"; }; B632C6AE03E5368700A864FD /* DebuggerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerController.h; path = controllers/DebuggerController.h; sourceTree = "<group>"; }; B632C6AF03E5368700A864FD /* DebuggerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerController.m; path = controllers/DebuggerController.m; sourceTree = "<group>"; }; + B6374FA40F178298003CE6E2 /* timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timer.c; path = timer/timer.c; sourceTree = SOURCE_ROOT; }; B6379299060AA0D300246736 /* se-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "se-0.rom"; path = "../roms/se-0.rom"; sourceTree = SOURCE_ROOT; }; B637929A060AA0D300246736 /* se-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "se-1.rom"; path = "../roms/se-1.rom"; sourceTree = SOURCE_ROOT; }; B639B7670A6BAFCF00927E24 /* csw.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = csw.icns; sourceTree = "<group>"; }; @@ -785,7 +785,7 @@ B63225EF0C66BA4B00BB081B /* timer */ = { isa = PBXGroup; children = ( - B63225F20C66BA7400BB081B /* timer.c */, + B6374FA40F178298003CE6E2 /* timer.c */, B63225F30C66BA7400BB081B /* timer.h */, B63225F40C66BA7400BB081B /* unix.c */, ); @@ -1477,7 +1477,6 @@ B6CADD580C47AD90004BA954 /* Texture.m in Sources */, B63225EC0C66BA1300BB081B /* osname.c in Sources */, B63225EE0C66BA3700BB081B /* paths.c in Sources */, - B63225F50C66BA7400BB081B /* timer.c in Sources */, B63225F70C66BA7400BB081B /* unix.c in Sources */, B6CE3A060CD2160A005ACDC8 /* beta.c in Sources */, B6CE3A080CD2160A005ACDC8 /* crc.c in Sources */, @@ -1495,6 +1494,7 @@ B684A19E0E93A8CD00A5B097 /* event.c in Sources */, B684A1A00E93A8D700A5B097 /* variable.c in Sources */, B684A1A20E93A8FC00A5B097 /* file.c in Sources */, + B6374FA50F178298003CE6E2 /* timer.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.h =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.h 2009-01-09 14:05:27 UTC (rev 582) +++ branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.h 2009-01-09 22:46:17 UTC (rev 583) @@ -64,7 +64,7 @@ -(void) stopEmulationTimer; -(void) updateEmulation:(NSTimer*)theTimer; --(void) updateEmulationForTimeDelta:(CFAbsoluteTime)deltaTime; +-(void) updateEmulationForTimeDelta:(CFTimeInterval)deltaTime; -(void) setEmulationHz:(float)hz; /* FIXME: Could do with a setSettings? maybe we just update settings when Modified: branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.m =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.m 2009-01-09 14:05:27 UTC (rev 582) +++ branches/Release-0_10_0-branch/fuse/fusepb/models/Emulator.m 2009-01-09 22:46:17 UTC (rev 583) @@ -148,7 +148,7 @@ } /* given a delta time in seconds, update overall emulation state */ --(void) updateEmulationForTimeDelta:(CFAbsoluteTime)deltaTime +-(void) updateEmulationForTimeDelta:(CFTimeInterval)deltaTime { if( sound_enabled ) { int too_long = 0; Deleted: branches/Release-0_10_0-branch/fuse/fusepb/timer/timer.c =================================================================== --- trunk/fuse/fusepb/timer/timer.c 2009-01-09 13:06:36 UTC (rev 578) +++ branches/Release-0_10_0-branch/fuse/fusepb/timer/timer.c 2009-01-09 22:46:17 UTC (rev 583) @@ -1,136 +0,0 @@ -/* timer.c: Speed routines for Fuse - Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier - - $Id: timer.c 3681 2008-06-16 09:40:29Z pak21 $ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - Author contact information: - - E-mail: phi...@sh... - -*/ - -#include <config.h> - -#include "event.h" -#include "settings.h" -#include "sound.h" -#include "tape.h" -#include "timer.h" -#include "ui/ui.h" - -/* - * Routines for estimating emulation speed - */ - -/* The actual time at the end of each of the last 10 emulated seconds */ -static timer_type stored_times[10]; - -/* Which is the next entry in 'stored_times' that we will update */ -static size_t next_stored_time; - -/* The number of frames until we next update 'stored_times' */ -static int frames_until_update; - -/* The number of time samples we have for estimating speed */ -static int samples; - -float current_speed = 100.0; - -static timer_type start_time; - -int timer_event; - -static void timer_frame( libspectrum_dword last_tstates, int event GCC_UNUSED, - void *user_data GCC_UNUSED ); - -int -timer_estimate_speed( void ) -{ - timer_type current_time; - float difference; - int error; - - if( frames_until_update-- ) return 0; - - error = timer_get_real_time( ¤t_time ); if( error ) return error; - - if( samples < 10 ) { - - /* If we don't have enough data, assume we're running at the desired - speed :-) */ - current_speed = settings_current.emulation_speed; - - } else { - - difference = - timer_get_time_difference( ¤t_time, - &stored_times[ next_stored_time ] ); - current_speed = 100 * ( 10.0 / difference ); - - } - - ui_statusbar_update_speed( current_speed ); - - stored_times[ next_stored_time ] = current_time; - - next_stored_time = ( next_stored_time + 1 ) % 10; - frames_until_update = - ( machine_current->timings.processor_speed / - machine_current->timings.tstates_per_frame ) - 1; - - samples++; - - return 0; -} - -int -timer_estimate_reset( void ) -{ - int error = timer_get_real_time( &start_time ); if( error ) return error; - samples = 0; - next_stored_time = 0; - frames_until_update = 0; - - return 0; -} - -int -timer_init( void ) -{ - int error = timer_get_real_time( &start_time ); if( error ) return error; - - timer_event = event_register( timer_frame, "Timer" ); - if( timer_event == -1 ) return 1; - - error = event_add( 0, timer_event ); - if( error ) return error; - - return 0; -} - -int -timer_end( void ) -{ - return event_remove_type( timer_event ); -} - -static void -timer_frame( libspectrum_dword last_tstates, int event GCC_UNUSED, - void *user_data GCC_UNUSED ) -{ - event_timer = 1; -} Copied: branches/Release-0_10_0-branch/fuse/fusepb/timer/timer.c (from rev 578, trunk/fuse/fusepb/timer/timer.c) =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/timer/timer.c (rev 0) +++ branches/Release-0_10_0-branch/fuse/fusepb/timer/timer.c 2009-01-09 22:46:17 UTC (rev 583) @@ -0,0 +1,136 @@ +/* timer.c: Speed routines for Fuse + Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier + + $Id: timer.c 3681 2008-06-16 09:40:29Z pak21 $ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Author contact information: + + E-mail: phi...@sh... + +*/ + +#include <config.h> + +#include "event.h" +#include "settings.h" +#include "sound.h" +#include "tape.h" +#include "timer.h" +#include "ui/ui.h" + +/* + * Routines for estimating emulation speed + */ + +/* The actual time at the end of each of the last 10 emulated seconds */ +static timer_type stored_times[10]; + +/* Which is the next entry in 'stored_times' that we will update */ +static size_t next_stored_time; + +/* The number of frames until we next update 'stored_times' */ +static int frames_until_update; + +/* The number of time samples we have for estimating speed */ +static int samples; + +float current_speed = 100.0; + +static timer_type start_time; + +int timer_event; + +static void timer_frame( libspectrum_dword last_tstates, int event GCC_UNUSED, + void *user_data GCC_UNUSED ); + +int +timer_estimate_speed( void ) +{ + timer_type current_time; + float difference; + int error; + + if( frames_until_update-- ) return 0; + + error = timer_get_real_time( ¤t_time ); if( error ) return error; + + if( samples < 10 ) { + + /* If we don't have enough data, assume we're running at the desired + speed :-) */ + current_speed = settings_current.emulation_speed; + + } else { + + difference = + timer_get_time_difference( ¤t_time, + &stored_times[ next_stored_time ] ); + current_speed = 100 * ( 10.0 / difference ); + + } + + ui_statusbar_update_speed( current_speed ); + + stored_times[ next_stored_time ] = current_time; + + next_stored_time = ( next_stored_time + 1 ) % 10; + frames_until_update = + ( machine_current->timings.processor_speed / + machine_current->timings.tstates_per_frame ) - 1; + + samples++; + + return 0; +} + +int +timer_estimate_reset( void ) +{ + int error = timer_get_real_time( &start_time ); if( error ) return error; + samples = 0; + next_stored_time = 0; + frames_until_update = 0; + + return 0; +} + +int +timer_init( void ) +{ + int error = timer_get_real_time( &start_time ); if( error ) return error; + + timer_event = event_register( timer_frame, "Timer" ); + if( timer_event == -1 ) return 1; + + error = event_add( 0, timer_event ); + if( error ) return error; + + return 0; +} + +int +timer_end( void ) +{ + return event_remove_type( timer_event ); +} + +static void +timer_frame( libspectrum_dword last_tstates, int event GCC_UNUSED, + void *user_data GCC_UNUSED ) +{ + event_timer = 1; +} Modified: branches/Release-0_10_0-branch/fuse/spectrum.c =================================================================== --- branches/Release-0_10_0-branch/fuse/spectrum.c 2009-01-09 14:05:27 UTC (rev 582) +++ branches/Release-0_10_0-branch/fuse/spectrum.c 2009-01-09 22:46:17 UTC (rev 583) @@ -275,11 +275,11 @@ void spectrum_do_timer( libspectrum_dword target_tstates ) { + event_timer=0; if( event_add( target_tstates + tstates, timer_event ) ) { /* Some sort of dire error */ return; } - event_timer=0; while( !event_timer ) { z80_do_opcodes(); event_do_events(); @@ -287,5 +287,4 @@ spectrum_do_frame_end(); } } - event_timer=0; } Property changes on: branches/Release-0_10_0-branch/libspectrum/libspectrum ___________________________________________________________________ Modified: svn:mergeinfo - /vendor/fuse-emulator/0.10.0/libspectrum:556-557 /vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546 /vendor/fuse-emulator/current/libspectrum:530-538 + /trunk/libspectrum/libspectrum:578 /vendor/fuse-emulator/0.10.0/libspectrum:556-557 /vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546 /vendor/fuse-emulator/current/libspectrum:530-538 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2009-01-09 14:05:37
|
Revision: 582 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=582&view=rev Author: fredm Date: 2009-01-09 14:05:27 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Fix machine list in ROM dialog. Modified Paths: -------------- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib Modified: trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-01-09 14:04:45 UTC (rev 581) +++ trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-01-09 14:05:27 UTC (rev 582) @@ -8,8 +8,9 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1347"/> <integer value="6"/> + <integer value="1634"/> + <integer value="1686"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -277,7 +278,7 @@ <string key="NSFrameAutosaveName"/> </object> <object class="NSCustomView" id="869768206"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -476,20 +477,28 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>allowsFloats</string> + <string>decimalSeparator</string> <string>formatterBehavior</string> + <string>groupingSeparator</string> <string>minimum</string> <string>multiplier</string> + <string>negativeFormat</string> <string>numberStyle</string> <string>positiveFormat</string> + <string>usesGroupingSeparator</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="1" id="9"/> + <string>.</string> <integer value="1000"/> + <string>,</string> <reference ref="9"/> - <real value="1.000000e+00"/> + <reference ref="9"/> + <string>-#,##0.00</string> <integer value="3" id="11"/> <string>#,##0%</string> + <integer value="1" id="5"/> </object> </object> <string key="NS.positiveformat">#,##0%</string> @@ -620,7 +629,8 @@ <reference key="NSSupport" ref="447006373"/> </object> </object> - <reference key="NSSelectedCell" ref="494277899"/> + <int key="NSSelectedRow">-1</int> + <int key="NSSelectedCol">-1</int> <object class="NSColor" key="NSBackgroundColor" id="519317542"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> @@ -745,7 +755,6 @@ </object> </object> <string key="NSFrameSize">{627, 265}</string> - <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="803517542"> @@ -2601,7 +2610,7 @@ <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="754180095"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3451,10 +3460,11 @@ </object> </object> <string key="NSFrameSize">{627, 343}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="453171511"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3993,6 +4003,7 @@ </object> </object> <string key="NSFrameSize">{627, 338}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="462167203"> @@ -5496,22 +5507,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">content: arrangedObjects.machine.machineName</string> - <reference key="source" ref="968324611"/> - <reference key="destination" ref="657424118"/> - <object class="NSNibBindingConnector" key="connector" id="427947948"> - <reference key="NSSource" ref="968324611"/> - <reference key="NSDestination" ref="657424118"/> - <string key="NSLabel">content: arrangedObjects.machine.machineName</string> - <string key="NSBinding">content</string> - <string key="NSKeyPath">arrangedObjects.machine.machineName</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">1641</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: selection.rom0</string> <reference key="source" ref="965417210"/> <reference key="destination" ref="657424118"/> @@ -6441,6 +6436,22 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> + <string key="label">content: arrangedObjects.machine.machineName</string> + <reference key="source" ref="968324611"/> + <reference key="destination" ref="657424118"/> + <object class="NSNibBindingConnector" key="connector" id="178033173"> + <reference key="NSSource" ref="968324611"/> + <reference key="NSDestination" ref="657424118"/> + <string key="NSLabel">content: arrangedObjects.machine.machineName</string> + <string key="NSBinding">content</string> + <string key="NSKeyPath">arrangedObjects.machine.machineName</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1819</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> <string key="label">selectionIndexes: selectionIndexes</string> <reference key="source" ref="968324611"/> <reference key="destination" ref="657424118"/> @@ -6450,12 +6461,32 @@ <string key="NSLabel">selectionIndexes: selectionIndexes</string> <string key="NSBinding">selectionIndexes</string> <string key="NSKeyPath">selectionIndexes</string> - <reference key="NSPreviousConnector" ref="427947948"/> + <reference key="NSPreviousConnector" ref="178033173"/> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">1789</int> + <int key="connectionID">1820</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: arrangedObjects.machine.machineName</string> + <reference key="source" ref="22856524"/> + <reference key="destination" ref="657424118"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="22856524"/> + <reference key="NSDestination" ref="657424118"/> + <string key="NSLabel">value: arrangedObjects.machine.machineName</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">arrangedObjects.machine.machineName</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSConditionallySetsEditable</string> + <reference key="NS.object.0" ref="5"/> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1822</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -9223,7 +9254,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">1794</int> + <int key="maxID">1822</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> Modified: trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2009-01-09 14:04:45 UTC (rev 581) +++ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2009-01-09 14:05:27 UTC (rev 582) @@ -1,187 +1,294 @@ bplist00\xD4 |
From: <fr...@us...> - 2009-01-09 14:04:52
|
Revision: 581 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=581&view=rev Author: fredm Date: 2009-01-09 14:04:45 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Indentation fixes. Modified Paths: -------------- trunk/fuse/fusepb/content_arrays/CAMachines.m Modified: trunk/fuse/fusepb/content_arrays/CAMachines.m =================================================================== --- trunk/fuse/fusepb/content_arrays/CAMachines.m 2009-01-09 13:08:27 UTC (rev 580) +++ trunk/fuse/fusepb/content_arrays/CAMachines.m 2009-01-09 14:04:45 UTC (rev 581) @@ -152,14 +152,14 @@ - (id)copyWithZone:(NSZone *)zone { - [self retain]; - return self; + [self retain]; + return self; } - (id)valueForUndefinedKey:(NSString *)key { -fprintf(stderr,"Undefined key:'%s'\n",[key UTF8String]); -return nil; + fprintf(stderr,"Undefined key:'%s'\n",[key UTF8String]); + return nil; } @end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2009-01-09 13:08:38
|
Revision: 580 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=580&view=rev Author: fredm Date: 2009-01-09 13:08:27 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Fix references to a couple of Tape menu items. Modified Paths: -------------- trunk/fuse/fusepb/resources/Fuse Help/html/menus.html Modified: trunk/fuse/fusepb/resources/Fuse Help/html/menus.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/menus.html 2009-01-09 13:07:29 UTC (rev 579) +++ trunk/fuse/fusepb/resources/Fuse Help/html/menus.html 2009-01-09 13:08:27 UTC (rev 580) @@ -240,20 +240,20 @@ <p> <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Media,</em></font></span> <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Tape, -Clear</em></font></span> -<font face="Lucida Grande,Helvetica,Arial">Clear the current -virtual tape. This is particularly useful when you want a `clean +Close</em></font></span> +<font face="Lucida Grande,Helvetica,Arial">Close the current +virtual tape file. This is particularly useful when you want a `clean slate' to add newly-saved files to, before doing -<span class="emphasis"><em>Tape, Write...</em></span></font></p> +<span class="emphasis"><em>Tape, Save As...</em></span></font></p> <p> <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Media,</em></font></span> <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Tape, -Write...</em></font></span> +Save As...</em></font></span> <font face="Lucida Grande,Helvetica,Arial">Write the current virtual-tape contents to a TZX file. The virtual-tape contents are the contents of the previously-loaded tape (if any has been loaded since you last did a <span class="emphasis"><em>Tape, -Clear</em></span>), followed by anything you've saved from the +Close</em></span>), followed by anything you've saved from the emulated machine since. These newly-saved files are <span class="emphasis"><em>not</em></span> written to any tape file until you choose this option!</font></p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2009-01-09 13:07:35
|
Revision: 579 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=579&view=rev Author: fredm Date: 2009-01-09 13:07:29 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Fix emulation speed preference. Modified Paths: -------------- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib Modified: trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-01-09 13:06:36 UTC (rev 578) +++ trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2009-01-09 13:07:29 UTC (rev 579) @@ -2,14 +2,14 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9F2114</string> + <string key="IBDocument.SystemVersion">9G55</string> <string key="IBDocument.InterfaceBuilderVersion">672</string> - <string key="IBDocument.AppKitVersion">949.41</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="6"/> <integer value="1347"/> + <integer value="6"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -480,28 +480,24 @@ <string>minimum</string> <string>multiplier</string> <string>numberStyle</string> + <string>positiveFormat</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="1" id="9"/> - <integer value="1040" id="736002568"/> + <integer value="1000"/> <reference ref="9"/> - <reference ref="9"/> + <real value="1.000000e+00"/> <integer value="3" id="11"/> + <string>#,##0%</string> </object> </object> <string key="NS.positiveformat">#,##0%</string> - <string key="NS.negativeformat">#,##0%</string> + <string key="NS.negativeformat">-#,##0.00</string> <nil key="NS.positiveattrs"/> <nil key="NS.negativeattrs"/> <object class="NSAttributedString" key="NS.zero"> - <nil key="NSString"/> - </object> - <object class="NSAttributedString" key="NS.nil"> - <nil key="NSString"/> - </object> - <object class="NSAttributedString" key="NS.nan"> - <string key="NSString">NaN</string> + <string key="NSString">0</string> <object class="NSDictionary" key="NSAttributes" id="625184385"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -512,6 +508,13 @@ </object> </object> </object> + <object class="NSAttributedString" key="NS.nil"> + <string key="NSString"/> + </object> + <object class="NSAttributedString" key="NS.nan"> + <string key="NSString">NaN</string> + <reference key="NSAttributes" ref="625184385"/> + </object> <reference key="NS.min" ref="9"/> <object class="NSDecimalNumberPlaceholder" key="NS.max" id="648108068"> <int key="NS.exponent">0</int> @@ -521,12 +524,7 @@ <int key="NS.mantissa.bo">1</int> <bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes> </object> - <object class="NSDecimalNumberHandler" key="NS.rounding"> - <int key="NS.roundingmode">3</int> - <bool key="NS.raise.overflow">YES</bool> - <bool key="NS.raise.underflow">YES</bool> - <bool key="NS.raise.dividebyzero">YES</bool> - </object> + <nil key="NS.rounding"/> <string key="NS.decimal">.</string> <string key="NS.thousand">,</string> <bool key="NS.hasthousands">YES</bool> @@ -560,7 +558,7 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="9"/> - <reference ref="736002568"/> + <integer value="1040" id="736002568"/> <real value="5.000000e+01" id="754928329"/> <reference ref="9"/> <integer value="0" id="8"/> @@ -622,8 +620,7 @@ <reference key="NSSupport" ref="447006373"/> </object> </object> - <int key="NSSelectedRow">-1</int> - <int key="NSSelectedCol">-1</int> + <reference key="NSSelectedCell" ref="494277899"/> <object class="NSColor" key="NSBackgroundColor" id="519317542"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> Modified: trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2009-01-09 13:06:36 UTC (rev 578) +++ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2009-01-09 13:07:29 UTC (rev 579) @@ -1,183 +1,153 @@ bplist00\xD4 |
From: <fr...@us...> - 2009-01-09 13:06:42
|
Revision: 578 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=578&view=rev Author: fredm Date: 2009-01-09 13:06:36 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Fix running with sound off. Modified Paths: -------------- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj trunk/fuse/fusepb/models/Emulator.h trunk/fuse/fusepb/models/Emulator.m trunk/fuse/spectrum.c Added Paths: ----------- trunk/fuse/fusepb/timer/ trunk/fuse/fusepb/timer/timer.c Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj =================================================================== --- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-18 10:18:38 UTC (rev 577) +++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2009-01-09 13:06:36 UTC (rev 578) @@ -170,8 +170,8 @@ B62B1A2A0DD667EC00D42AAF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B62B1A290DD667EC00D42AAF /* main.m */; }; B63225EC0C66BA1300BB081B /* osname.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225EB0C66BA1300BB081B /* osname.c */; }; B63225EE0C66BA3700BB081B /* paths.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225ED0C66BA3700BB081B /* paths.c */; }; - B63225F50C66BA7400BB081B /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225F20C66BA7400BB081B /* timer.c */; }; B63225F70C66BA7400BB081B /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225F40C66BA7400BB081B /* unix.c */; }; + B6374FA50F178298003CE6E2 /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = B6374FA40F178298003CE6E2 /* timer.c */; }; B639B7680A6BAFCF00927E24 /* csw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7670A6BAFCF00927E24 /* csw.icns */; }; B639B7D10A6BB45600927E24 /* raw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7D00A6BB45600927E24 /* raw.icns */; }; B6403FD80A7E4B1A00E00B11 /* loader.c in Sources */ = {isa = PBXBuildFile; fileRef = B6403FD60A7E4B1A00E00B11 /* loader.c */; }; @@ -339,11 +339,11 @@ B62F3BCF059F5BF300A7009A /* PokeFinderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PokeFinderController.m; path = controllers/PokeFinderController.m; sourceTree = "<group>"; }; B63225EB0C66BA1300BB081B /* osname.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = osname.c; sourceTree = "<group>"; }; B63225ED0C66BA3700BB081B /* paths.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = paths.c; sourceTree = "<group>"; }; - B63225F20C66BA7400BB081B /* timer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = timer.c; sourceTree = "<group>"; }; B63225F30C66BA7400BB081B /* timer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; }; B63225F40C66BA7400BB081B /* unix.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = unix.c; sourceTree = "<group>"; }; B632C6AE03E5368700A864FD /* DebuggerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerController.h; path = controllers/DebuggerController.h; sourceTree = "<group>"; }; B632C6AF03E5368700A864FD /* DebuggerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerController.m; path = controllers/DebuggerController.m; sourceTree = "<group>"; }; + B6374FA40F178298003CE6E2 /* timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timer.c; path = timer/timer.c; sourceTree = SOURCE_ROOT; }; B6379299060AA0D300246736 /* se-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "se-0.rom"; path = "../roms/se-0.rom"; sourceTree = SOURCE_ROOT; }; B637929A060AA0D300246736 /* se-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "se-1.rom"; path = "../roms/se-1.rom"; sourceTree = SOURCE_ROOT; }; B639B7670A6BAFCF00927E24 /* csw.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = csw.icns; sourceTree = "<group>"; }; @@ -789,7 +789,7 @@ B63225EF0C66BA4B00BB081B /* timer */ = { isa = PBXGroup; children = ( - B63225F20C66BA7400BB081B /* timer.c */, + B6374FA40F178298003CE6E2 /* timer.c */, B63225F30C66BA7400BB081B /* timer.h */, B63225F40C66BA7400BB081B /* unix.c */, ); @@ -1481,7 +1481,6 @@ B6CADD580C47AD90004BA954 /* Texture.m in Sources */, B63225EC0C66BA1300BB081B /* osname.c in Sources */, B63225EE0C66BA3700BB081B /* paths.c in Sources */, - B63225F50C66BA7400BB081B /* timer.c in Sources */, B63225F70C66BA7400BB081B /* unix.c in Sources */, B6CE3A060CD2160A005ACDC8 /* beta.c in Sources */, B6CE3A080CD2160A005ACDC8 /* crc.c in Sources */, @@ -1499,6 +1498,7 @@ B684A19E0E93A8CD00A5B097 /* event.c in Sources */, B684A1A00E93A8D700A5B097 /* variable.c in Sources */, B684A1A20E93A8FC00A5B097 /* file.c in Sources */, + B6374FA50F178298003CE6E2 /* timer.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: trunk/fuse/fusepb/models/Emulator.h =================================================================== --- trunk/fuse/fusepb/models/Emulator.h 2008-12-18 10:18:38 UTC (rev 577) +++ trunk/fuse/fusepb/models/Emulator.h 2009-01-09 13:06:36 UTC (rev 578) @@ -64,7 +64,7 @@ -(void) stopEmulationTimer; -(void) updateEmulation:(NSTimer*)theTimer; --(void) updateEmulationForTimeDelta:(CFAbsoluteTime)deltaTime; +-(void) updateEmulationForTimeDelta:(CFTimeInterval)deltaTime; -(void) setEmulationHz:(float)hz; /* FIXME: Could do with a setSettings? maybe we just update settings when Modified: trunk/fuse/fusepb/models/Emulator.m =================================================================== --- trunk/fuse/fusepb/models/Emulator.m 2008-12-18 10:18:38 UTC (rev 577) +++ trunk/fuse/fusepb/models/Emulator.m 2009-01-09 13:06:36 UTC (rev 578) @@ -148,7 +148,7 @@ } /* given a delta time in seconds, update overall emulation state */ --(void) updateEmulationForTimeDelta:(CFAbsoluteTime)deltaTime +-(void) updateEmulationForTimeDelta:(CFTimeInterval)deltaTime { if( sound_enabled ) { int too_long = 0; Added: trunk/fuse/fusepb/timer/timer.c =================================================================== --- trunk/fuse/fusepb/timer/timer.c (rev 0) +++ trunk/fuse/fusepb/timer/timer.c 2009-01-09 13:06:36 UTC (rev 578) @@ -0,0 +1,136 @@ +/* timer.c: Speed routines for Fuse + Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier + + $Id: timer.c 3681 2008-06-16 09:40:29Z pak21 $ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Author contact information: + + E-mail: phi...@sh... + +*/ + +#include <config.h> + +#include "event.h" +#include "settings.h" +#include "sound.h" +#include "tape.h" +#include "timer.h" +#include "ui/ui.h" + +/* + * Routines for estimating emulation speed + */ + +/* The actual time at the end of each of the last 10 emulated seconds */ +static timer_type stored_times[10]; + +/* Which is the next entry in 'stored_times' that we will update */ +static size_t next_stored_time; + +/* The number of frames until we next update 'stored_times' */ +static int frames_until_update; + +/* The number of time samples we have for estimating speed */ +static int samples; + +float current_speed = 100.0; + +static timer_type start_time; + +int timer_event; + +static void timer_frame( libspectrum_dword last_tstates, int event GCC_UNUSED, + void *user_data GCC_UNUSED ); + +int +timer_estimate_speed( void ) +{ + timer_type current_time; + float difference; + int error; + + if( frames_until_update-- ) return 0; + + error = timer_get_real_time( ¤t_time ); if( error ) return error; + + if( samples < 10 ) { + + /* If we don't have enough data, assume we're running at the desired + speed :-) */ + current_speed = settings_current.emulation_speed; + + } else { + + difference = + timer_get_time_difference( ¤t_time, + &stored_times[ next_stored_time ] ); + current_speed = 100 * ( 10.0 / difference ); + + } + + ui_statusbar_update_speed( current_speed ); + + stored_times[ next_stored_time ] = current_time; + + next_stored_time = ( next_stored_time + 1 ) % 10; + frames_until_update = + ( machine_current->timings.processor_speed / + machine_current->timings.tstates_per_frame ) - 1; + + samples++; + + return 0; +} + +int +timer_estimate_reset( void ) +{ + int error = timer_get_real_time( &start_time ); if( error ) return error; + samples = 0; + next_stored_time = 0; + frames_until_update = 0; + + return 0; +} + +int +timer_init( void ) +{ + int error = timer_get_real_time( &start_time ); if( error ) return error; + + timer_event = event_register( timer_frame, "Timer" ); + if( timer_event == -1 ) return 1; + + error = event_add( 0, timer_event ); + if( error ) return error; + + return 0; +} + +int +timer_end( void ) +{ + return event_remove_type( timer_event ); +} + +static void +timer_frame( libspectrum_dword last_tstates, int event GCC_UNUSED, + void *user_data GCC_UNUSED ) +{ + event_timer = 1; +} Modified: trunk/fuse/spectrum.c =================================================================== --- trunk/fuse/spectrum.c 2008-12-18 10:18:38 UTC (rev 577) +++ trunk/fuse/spectrum.c 2009-01-09 13:06:36 UTC (rev 578) @@ -275,11 +275,11 @@ void spectrum_do_timer( libspectrum_dword target_tstates ) { + event_timer=0; if( event_add( target_tstates + tstates, timer_event ) ) { /* Some sort of dire error */ return; } - event_timer=0; while( !event_timer ) { z80_do_opcodes(); event_do_events(); @@ -287,5 +287,4 @@ spectrum_do_frame_end(); } } - event_timer=0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-18 10:18:44
|
Revision: 577 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=577&view=rev Author: fredm Date: 2008-12-18 10:18:38 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Also update the statusbar if nothing has changed on the Speccy screen. Modified Paths: -------------- trunk/fuse/fusepb/views/DisplayOpenGLView.h trunk/fuse/fusepb/views/DisplayOpenGLView.m Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h =================================================================== --- trunk/fuse/fusepb/views/DisplayOpenGLView.h 2008-12-17 23:31:08 UTC (rev 576) +++ trunk/fuse/fusepb/views/DisplayOpenGLView.h 2008-12-18 10:18:38 UTC (rev 577) @@ -61,6 +61,7 @@ ui_statusbar_state disk_state; ui_statusbar_state mdr_state; ui_statusbar_state tape_state; + BOOL statusbar_updated; NSLock *view_lock; Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-17 23:31:08 UTC (rev 576) +++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-18 10:18:38 UTC (rev 577) @@ -119,6 +119,9 @@ [self displayLinkStart]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] releaseCmdKeys:@"f":QZ_f]; } @@ -248,6 +251,8 @@ currentScreenTex = 0; + statusbar_updated = NO; + return self; } @@ -484,6 +489,8 @@ /* Swap buffer to screen */ [[self openGLContext] flushBuffer]; + statusbar_updated = NO; + [view_lock unlock]; } @@ -528,6 +535,8 @@ glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); + statusbar_updated = YES; + [view_lock unlock]; } @@ -960,18 +969,27 @@ -(void) setDiskState:(NSNumber*)state { disk_state = [state unsignedCharValue]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] setDiskState:state]; } -(void) setTapeState:(NSNumber*)state { tape_state = [state unsignedCharValue]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] setTapeState:state]; } -(void) setMdrState:(NSNumber*)state { mdr_state = [state unsignedCharValue]; + [view_lock lock]; + statusbar_updated = YES; + [view_lock unlock]; [[FuseController singleton] setMdrState:state]; } @@ -1206,43 +1224,47 @@ PIG_dirtytable *workdirty = NULL; [buffered_screen_lock lock]; - if( buffered_screen.dirty->count == 0 ) { + if( buffered_screen.dirty->count == 0 && !statusbar_updated ) { [buffered_screen_lock unlock]; return kCVReturnSuccess; } - if (screenTex[currentScreenTex].dirty) - pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); - - currentScreenTex = !currentScreenTex; - - pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); - - if( workdirty ) - pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); - else - pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); - - /* Draw texture to screen */ - for(i = 0; i < workdirty->count; ++i) - copy_area( &screenTex[currentScreenTex], &buffered_screen, - workdirty->rects + i ); - - buffered_screen.dirty->count = 0; - - pig_dirty_close( workdirty ); - - [[self openGLContext] makeCurrentContext]; - - /* Bind, update and draw new image */ - glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); - - glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, - screenTex[currentScreenTex].full_width, - screenTex[currentScreenTex].full_height, GL_BGRA, - GL_UNSIGNED_SHORT_1_5_5_5_REV, - screenTex[currentScreenTex].pixels ); + if( buffered_screen.dirty->count > 0 ) { + if (screenTex[currentScreenTex].dirty) + pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); + + currentScreenTex = !currentScreenTex; + + pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); + + if( workdirty ) + pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); + else + pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); + + /* Draw texture to screen */ + for(i = 0; i < workdirty->count; ++i) + copy_area( &screenTex[currentScreenTex], &buffered_screen, + workdirty->rects + i ); + + buffered_screen.dirty->count = 0; + + pig_dirty_close( workdirty ); + + [[self openGLContext] makeCurrentContext]; + + /* Bind, update and draw new image */ + glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); + + glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, + screenTex[currentScreenTex].full_width, + screenTex[currentScreenTex].full_height, GL_BGRA, + GL_UNSIGNED_SHORT_1_5_5_5_REV, + screenTex[currentScreenTex].pixels ); + + } + [buffered_screen_lock unlock]; NSAutoreleasePool *pool = [NSAutoreleasePool new]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-17 23:31:10
|
Revision: 576 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=576&view=rev Author: fredm Date: 2008-12-17 23:31:08 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Decouple texture updating and drawing and only update texture when there are changes (Roine Gustafsson). Modified Paths: -------------- trunk/fuse/fusepb/views/DisplayOpenGLView.h trunk/fuse/fusepb/views/DisplayOpenGLView.m Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h =================================================================== --- trunk/fuse/fusepb/views/DisplayOpenGLView.h 2008-12-17 22:38:04 UTC (rev 575) +++ trunk/fuse/fusepb/views/DisplayOpenGLView.h 2008-12-17 23:31:08 UTC (rev 576) @@ -61,7 +61,6 @@ ui_statusbar_state disk_state; ui_statusbar_state mdr_state; ui_statusbar_state tape_state; - BOOL statusbar_updated; NSLock *view_lock; Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-17 22:38:04 UTC (rev 575) +++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-17 23:31:08 UTC (rev 576) @@ -119,9 +119,6 @@ [self displayLinkStart]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] releaseCmdKeys:@"f":QZ_f]; } @@ -195,7 +192,6 @@ instance = self; buffered_screen_lock = [[NSLock alloc] init]; - [buffered_screen_lock retain]; real_emulator = [[Emulator alloc] init]; } @@ -252,18 +248,28 @@ currentScreenTex = 0; - statusbar_updated = NO; - return self; } +-(void)dealloc +{ + if (view_lock) + [view_lock release]; + view_lock = nil; + + if (buffered_screen_lock) + [buffered_screen_lock release]; + buffered_screen_lock = nil; + + [super dealloc]; +} + -(void) awakeFromNib { /* keep the window in the standard aspect ratio if the user resizes */ [[self window] setContentAspectRatio:NSMakeSize(4.0,3.0)]; view_lock = [[NSLock alloc] init]; - [view_lock retain]; CVReturn error = kCVReturnSuccess; CGDirectDisplayID displayID = CGMainDisplayID(); @@ -308,9 +314,6 @@ [greenDisk release]; greenDisk = nil; - [buffered_screen_lock release]; - buffered_screen_lock = nil; - [self release]; } @@ -412,40 +415,17 @@ -(void) drawRect:(NSRect)aRect { - int i; - PIG_dirtytable *workdirty = NULL; + [view_lock lock]; - [view_lock lock]; - [buffered_screen_lock lock]; - if( NO == screenTexInitialised ) { - [buffered_screen_lock unlock]; + [[self openGLContext] makeCurrentContext]; + + if (!screenTexInitialised) { + glClear(GL_COLOR_BUFFER_BIT); + [view_lock unlock]; return; } - if( screenTex[currentScreenTex].dirty ) - pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); - - currentScreenTex = !currentScreenTex; - - pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); - - if( workdirty ) - pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); - else - pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); - - /* Draw texture to screen */ - for(i = 0; i < workdirty->count; ++i) - copy_area( &screenTex[currentScreenTex], &buffered_screen, - workdirty->rects + i ); - - buffered_screen.dirty->count = 0; - - pig_dirty_close( workdirty ); - - [[self openGLContext] makeCurrentContext]; - int border_x_offset = 0; int border_y_offset = 0; if( settings_current.full_screen && settings_current.full_screen_panorama ) { @@ -472,15 +452,8 @@ /* Bind, update and draw new image */ glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); - - glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, - screenTex[currentScreenTex].full_width, - screenTex[currentScreenTex].full_height, GL_BGRA, - GL_UNSIGNED_SHORT_1_5_5_5_REV, - screenTex[currentScreenTex].pixels ); - + glBegin( GL_QUADS ); - glTexCoord2f( (float)(screenTex[currentScreenTex].image_width + screenTex[currentScreenTex].image_xoffset + border_y_offset), (float)(screenTex[currentScreenTex].image_yoffset + border_x_offset) @@ -504,7 +477,6 @@ (float)(screenTex[currentScreenTex].image_yoffset + border_x_offset) ); glVertex2f( -1.0f, 1.0f ); - glEnd(); if ( settings_current.statusbar ) [self iconOverlay]; @@ -512,9 +484,6 @@ /* Swap buffer to screen */ [[self openGLContext] flushBuffer]; - statusbar_updated = NO; - - [buffered_screen_lock unlock]; [view_lock unlock]; } @@ -559,7 +528,6 @@ glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); - statusbar_updated = YES; [view_lock unlock]; } @@ -567,12 +535,11 @@ { GLuint i; - [view_lock lock]; - if( screenTexInitialised == NO) { - [view_lock unlock]; + if (!screenTexInitialised) return; - } + [view_lock lock]; + [self displayLinkStop]; glDeleteTextures( MAX_SCREEN_BUFFERS, screenTexId ); @@ -993,27 +960,18 @@ -(void) setDiskState:(NSNumber*)state { disk_state = [state unsignedCharValue]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] setDiskState:state]; } -(void) setTapeState:(NSNumber*)state { tape_state = [state unsignedCharValue]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] setTapeState:state]; } -(void) setMdrState:(NSNumber*)state { mdr_state = [state unsignedCharValue]; - [view_lock lock]; - statusbar_updated = YES; - [view_lock unlock]; [[FuseController singleton] setMdrState:state]; } @@ -1244,7 +1202,52 @@ -(CVReturn) displayFrame:(const CVTimeStamp *)timeStamp { + int i; + PIG_dirtytable *workdirty = NULL; + + [buffered_screen_lock lock]; + if( buffered_screen.dirty->count == 0 ) { + [buffered_screen_lock unlock]; + return kCVReturnSuccess; + } + + if (screenTex[currentScreenTex].dirty) + pig_dirty_copy( &workdirty, screenTex[currentScreenTex].dirty ); + + currentScreenTex = !currentScreenTex; + + pig_dirty_copy( &screenTex[currentScreenTex].dirty, buffered_screen.dirty ); + + if( workdirty ) + pig_dirty_merge(workdirty, screenTex[currentScreenTex].dirty); + else + pig_dirty_copy(&workdirty, screenTex[currentScreenTex].dirty); + + /* Draw texture to screen */ + for(i = 0; i < workdirty->count; ++i) + copy_area( &screenTex[currentScreenTex], &buffered_screen, + workdirty->rects + i ); + + buffered_screen.dirty->count = 0; + + pig_dirty_close( workdirty ); + + [[self openGLContext] makeCurrentContext]; + + /* Bind, update and draw new image */ + glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[currentScreenTex] ); + + glTexSubImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, + screenTex[currentScreenTex].full_width, + screenTex[currentScreenTex].full_height, GL_BGRA, + GL_UNSIGNED_SHORT_1_5_5_5_REV, + screenTex[currentScreenTex].pixels ); + + [buffered_screen_lock unlock]; + + NSAutoreleasePool *pool = [NSAutoreleasePool new]; [self drawRect:NSZeroRect]; + [pool release]; return kCVReturnSuccess; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-17 22:38:06
|
Revision: 575 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=575&view=rev Author: fredm Date: 2008-12-17 22:38:04 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Stop displayLink when quitting from emulator before stopping emulator thread. Modified Paths: -------------- trunk/fuse/fusepb/views/DisplayOpenGLView.m Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-16 12:43:10 UTC (rev 574) +++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-17 22:38:04 UTC (rev 575) @@ -1235,6 +1235,8 @@ int error = [self checkMediaChanged]; if( error ) return NO; + [self displayLinkStop]; + return YES; } return NO; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-16 12:43:40
|
Revision: 574 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=574&view=rev Author: fredm Date: 2008-12-16 12:43:10 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Fix colours in minimised toolbar icon on GMA950 card (Roine Gustafsson). Modified Paths: -------------- trunk/fuse/fusepb/views/DisplayOpenGLView.m Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m =================================================================== --- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-15 11:38:40 UTC (rev 573) +++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-12-16 12:43:10 UTC (rev 574) @@ -1201,7 +1201,8 @@ CGDataProviderRef provider = CGDataProviderCreateDirect(bitmap, rowbytes * size.height, &gProviderCallbacks); CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB(); CGImageRef cgImage = CGImageCreate(size.width, size.height, 8, 32, rowbytes, cs, - kCGImageAlphaNoneSkipFirst, provider, NULL, NO, kCGRenderingIntentDefault); + kCGBitmapByteOrder32Host | kCGImageAlphaNoneSkipFirst, provider, NULL, NO, + kCGRenderingIntentDefault); // composite the CGImage into the view CGContextRef gc = [[NSGraphicsContext currentContext] graphicsPort]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-15 12:22:19
|
Revision: 573 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=573&view=rev Author: fredm Date: 2008-12-15 11:38:40 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Add titles for each help page and remove pre-10.4 compatible help index. Modified Paths: -------------- trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.html trunk/fuse/fusepb/resources/Fuse Help/html/about.html trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html trunk/fuse/fusepb/resources/Fuse Help/html/divide.html trunk/fuse/fusepb/resources/Fuse Help/html/dsk.html trunk/fuse/fusepb/resources/Fuse Help/html/emulation.html trunk/fuse/fusepb/resources/Fuse Help/html/filters.html trunk/fuse/fusepb/resources/Fuse Help/html/formats.html trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html trunk/fuse/fusepb/resources/Fuse Help/html/menus.html trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html trunk/fuse/fusepb/resources/Fuse Help/html/printer.html trunk/fuse/fusepb/resources/Fuse Help/html/quicklook.html trunk/fuse/fusepb/resources/Fuse Help/html/spotlight.html trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html trunk/fuse/fusepb/resources/Fuse Help/html/zxatasp.html Removed Paths: ------------- trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx Deleted: trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx =================================================================== (Binary files differ) Modified: trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex =================================================================== (Binary files differ) Modified: trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,7 +2,7 @@ <html> <head> <meta http-equiv="content-type" content="text/html;charset=iso-8859-1"> - <title>Quick Clicks</title> + <title>Fuse Help</title> <meta name="AppleTitle" content="Fuse Help"> <meta name="AppleIcon" content="Fuse%20Help/gfx/Fuse16.png"> <meta name="AppleFont" content="Lucida Grande,Helvetica"> @@ -55,7 +55,7 @@ latest news.</font> <div align="right"> <p><font face="Lucida Grande,Helvetica,Arial"><a - href="http://fuse-emulator.sourceforge.net/">Go</a></font></p> + href="http://fuse-for-macosx.sourceforge.net/">Go</a></font></p> </div> </td> <td width="4"><br> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/about.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/about.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/about.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ <!-- AppleSegStart="About Fuse" --> +<head> + <title>About Fuse</title> +</head> <div class="refentry" xml:lang="en" lang="en"> <font face="Lucida Grande,Helvetica,Arial"><a name="About Fuse"></a><!-- AppleSegDescription="This section describes the Fuse emulator." --></font> <div class="refsect1" xml:lang="en" lang="en"> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2008-12-15 11:38:40 UTC (rev 573) @@ -5,7 +5,7 @@ content="HTML Tidy for Mac OS X (vers 1st December 2002), see www.w3.org" name="generator"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>fuse</title> + <title>What's New In Fuse?</title> <meta name="generator" content="DocBook XSL Stylesheets V1.62.4"> </head> <body> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,6 +2,7 @@ <html> <head> <!-- AppleSegStart="Compressed Files" --> + <title>Compressed Files</title> </head> <body> <font face="Lucida Grande,Helvetica,Arial"><a name="Compressed Files"></a><!-- AppleSegDescription="This section describes Fuses support of compressed files." --></font> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/divide.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/divide.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/divide.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ +<head> <!-- AppleSegStart="DivIDE" --> + <title>DivIDE</title> +</head> <font face="Lucida Grande,Helvetica,Arial"><a name="DivIDE"></a><!-- AppleSegDescription="This section describes the DivIDE interface emulation in Fuse." --></font> <div class="refsect1" xml:lang="en" lang="en"> <h2><font face="Lucida Grande,Helvetica,Arial">DivIDE</font></h2> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/dsk.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/dsk.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/dsk.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,8 @@ -<!-- AppleSegStart="The .DSK Format" --><font +<head> +<!-- AppleSegStart="The .DSK Format" --> + <title>The .DSK Format</title> +</head> +<font face="Lucida Grande,Helvetica,Arial"><a name="The .DSK Format"></a><!-- AppleSegDescription="This section describes the .DSK format for Spectrum +3 disks." --></font> <div class="refsect1" xml:lang="en" lang="en"> <h2><font face="Lucida Grande,Helvetica,Arial">The .DSK Modified: trunk/fuse/fusepb/resources/Fuse Help/html/emulation.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/emulation.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/emulation.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ +<head> <!-- AppleSegStart="The Emulated Spectrum" --> + <title>The Emulated Spectrum</title> +</head> <font face="Lucida Grande,Helvetica,Arial"><a name="The Emulated Spectrum"></a><!-- AppleSegDescription="This section describes the machine as emulated by Fuse." --></font> <div class="refsect1" xml:lang="en" lang="en"> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/filters.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/filters.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/filters.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ +<head> <!-- AppleSegStart="Graphics Filters" --> + <title>Graphics Filters</title> +</head> <font face="Lucida Grande,Helvetica,Arial"><a name="Graphics Filters"></a><!-- AppleSegDescription="This section describes the graphics filters for Fuse." --></font> <div class="refsect1" xml:lang="en" lang="en"> <h2><font face="Lucida Grande,Helvetica,Arial">Graphics Modified: trunk/fuse/fusepb/resources/Fuse Help/html/formats.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/formats.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/formats.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,6 +2,7 @@ <html> <head> <!-- AppleSegStart="Disk Formats" --> + <title>Disk Formats</title> </head> <body> <font face="Lucida Grande,Helvetica,Arial"><a name="Disk Formats"></a><!-- AppleSegDescription="This section describes the disk formats supported by Fuse." --></font> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/mappings.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ +<head> <!-- AppleSegStart="Key Mappings" --> + <title>Key Mappings</title> +</head> <font face="Lucida Grande,Helvetica,Arial"><a name= "Key Mappings"></a><!-- AppleSegDescription="This section describes the key mappings for the emulated computer." --></font> <div class="refsect1" xml:lang="en" lang="en"> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/menus.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/menus.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/menus.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,6 +2,7 @@ <html> <head> <!-- AppleSegStart="Menus And Keys" --> + <title>Menus And Keys</title> </head> <body> <font face="Lucida Grande,Helvetica,Arial"><a name="Menus And Keys"></a><!-- AppleSegDescription="This section describes the Fuse menus and options." --></font> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,6 +2,7 @@ <html> <head> <!-- AppleSegStart="Monitor/Debugger" --> + <title>Monitor/Debugger</title> </head> <body> <font face="Lucida Grande,Helvetica,Arial"><a name="Monitor/Debugger"></a><!-- AppleSegDescription="This section describes the Fuse machine code monitor and debugger." --></font> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ +<head> <!-- AppleSegStart="+D Emulation" --> + <title>+D Emulation</title> +</head> <font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the +D interface emulation in Fuse." --></font> <div class="refsect1" xml:lang="en" lang="en"> <h2><font face="Lucida Grande,Helvetica,Arial">+D Emulation</font></h2> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/pokefinder.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,8 @@ -<!-- AppleSegStart="The Poke Finder" --><font +<head> +<!-- AppleSegStart="The Poke Finder" --> + <title>The Poke Finder</title> +</head> +<font face="Lucida Grande,Helvetica,Arial"><a name="The Poke Finder"></a><!-- AppleSegDescription="This section describes the Fuse poke finder." --></font> <div class="refsect1" xml:lang="en" lang="en"> <h2><font face="Lucida Grande,Helvetica,Arial">The Poke Modified: trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,6 +2,7 @@ <html> <head> <!-- AppleSegStart="Preferences" --> + <title>Preferences</title> </head> <body> <font face="Lucida Grande,Helvetica,Arial"><a name="Preferences"></a><!-- AppleSegDescription="This section describes the Fuse preferences dialog." --></font> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/printer.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/printer.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/printer.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ +<head> <!-- AppleSegStart="Printer Emulation" --> + <title>Printer Emulation</title> +</head> <font face="Lucida Grande,Helvetica,Arial"><a name="Printer Emulation"></a><!-- AppleSegDescription="This section describes the printer emulation in Fuse." --></font> <div class="refsect1" xml:lang="en" lang="en"> <h2><font face="Lucida Grande,Helvetica,Arial">Printer Modified: trunk/fuse/fusepb/resources/Fuse Help/html/quicklook.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/quicklook.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/quicklook.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,6 +2,7 @@ <html> <head> <!-- AppleSegStart="Quick Look Generator" --> + <title>Quick Look Generator</title> </head> <body> <font face="Lucida Grande,Helvetica,Arial"><a @@ -37,5 +38,6 @@ loader in the tape is extracted and used as the thumbnail of the file in the same way as snapshot files above.</font> +<!-- AppleSegEnd --> </body> </html> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/spotlight.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/spotlight.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/spotlight.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,7 @@ +<head> <!-- AppleSegStart="Spotlight Importer" --> + <title>Spotlight Importer</title> +</head> <font face="Lucida Grande,Helvetica,Arial"><a name="Spotlight Importer"></a><!-- AppleSegDescription="This section describes Fuses support of the Spotlight feature of Mac OS X 10.4 and newer." --></font> <h2><font face="Lucida Grande,Helvetica,Arial">Spotlight Importer</font></h2> <p><font face="Lucida Grande,Helvetica,Arial">On Mac OS X 10.4 and Modified: trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html 2008-12-15 11:38:40 UTC (rev 573) @@ -3,7 +3,6 @@ <head> <meta http-equiv="content-type" content="text/html;charset=iso-8859-1"> <title>Fuse Help</title> - <meta name="robots" content="anchors"> </head> <body> <div id="mainbox" align="left"> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html 2008-12-15 11:38:40 UTC (rev 573) @@ -2,6 +2,7 @@ <html> <head> <!-- AppleSegStart="Beta 128 Emulation" --> + <title>Beta 128 Emulation</title> </head> <body> <font face="Lucida Grande,Helvetica,Arial"><a name="Beta 128 Emulation"></a><!-- AppleSegDescription="This section describes the TR-DOS disk formats supported by Fuse." --></font> Modified: trunk/fuse/fusepb/resources/Fuse Help/html/zxatasp.html =================================================================== --- trunk/fuse/fusepb/resources/Fuse Help/html/zxatasp.html 2008-12-15 11:08:41 UTC (rev 572) +++ trunk/fuse/fusepb/resources/Fuse Help/html/zxatasp.html 2008-12-15 11:38:40 UTC (rev 573) @@ -1,4 +1,8 @@ -<!-- AppleSegStart="ZXATASP and ZXCF" --><font +<head> +<!-- AppleSegStart="ZXATASP and ZXCF" --> + <title>ZXATASP and ZXCF</title> +</head> +<font face="Lucida Grande,Helvetica,Arial"><a name="ZXATASP and ZXCF"></a><!-- AppleSegDescription="This section describes the ZXATASP and ZXCF interface emulation in Fuse." --></font> <div class="refsect1" xml:lang="en" lang="en"> <h2><font face="Lucida Grande,Helvetica,Arial">ZXATASP and This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-15 11:09:01
|
Revision: 572 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=572&view=rev Author: fredm Date: 2008-12-15 11:08:41 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Remove icon thumbnails as they are obsolete with OS X 10.5 and spotlight. Modified Paths: -------------- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj trunk/fuse/fusepb/controllers/FuseController.m trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib trunk/fuse/settings.dat trunk/fuse/ui/cocoa/cocoascreenshot.h trunk/fuse/ui/cocoa/cocoascreenshot.m Added Paths: ----------- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib Removed Paths: ------------- trunk/fuse/fusepb/thumbnail.h trunk/fuse/fusepb/thumbnail.m Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj =================================================================== --- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-14 20:15:22 UTC (rev 571) +++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-15 11:08:41 UTC (rev 572) @@ -175,9 +175,6 @@ B639B7680A6BAFCF00927E24 /* csw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7670A6BAFCF00927E24 /* csw.icns */; }; B639B7D10A6BB45600927E24 /* raw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7D00A6BB45600927E24 /* raw.icns */; }; B6403FD80A7E4B1A00E00B11 /* loader.c in Sources */ = {isa = PBXBuildFile; fileRef = B6403FD60A7E4B1A00E00B11 /* loader.c */; }; - B64E29FA0A6532ED006863D9 /* IconFamily.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E29F80A6532ED006863D9 /* IconFamily.m */; }; - B64E29FE0A65337A006863D9 /* NSString+CarbonFSRefCreation.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E29FC0A65337A006863D9 /* NSString+CarbonFSRefCreation.m */; }; - B64E2A020A6533FD006863D9 /* thumbnail.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E2A000A6533FD006863D9 /* thumbnail.m */; }; B64E2A170A6534A3006863D9 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B64E2A160A6534A3006863D9 /* Carbon.framework */; }; B650986D09366C8F003AF1BF /* hdf.icns in Resources */ = {isa = PBXBuildFile; fileRef = B650986A09366C8F003AF1BF /* hdf.icns */; }; B650986E09366C8F003AF1BF /* rom.icns in Resources */ = {isa = PBXBuildFile; fileRef = B650986B09366C8F003AF1BF /* rom.icns */; }; @@ -364,12 +361,6 @@ B643BB980403A13600A864FD /* tzx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tzx.icns; sourceTree = "<group>"; }; B64586D2059BC04A00934482 /* pokefinder.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pokefinder.c; path = ../pokefinder/pokefinder.c; sourceTree = SOURCE_ROOT; }; B64586D3059BC04A00934482 /* pokefinder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pokefinder.h; path = ../pokefinder/pokefinder.h; sourceTree = SOURCE_ROOT; }; - B64E29F70A6532ED006863D9 /* IconFamily.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IconFamily.h; sourceTree = "<group>"; }; - B64E29F80A6532ED006863D9 /* IconFamily.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = IconFamily.m; sourceTree = "<group>"; }; - B64E29FB0A65337A006863D9 /* NSString+CarbonFSRefCreation.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "NSString+CarbonFSRefCreation.h"; sourceTree = "<group>"; }; - B64E29FC0A65337A006863D9 /* NSString+CarbonFSRefCreation.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = "NSString+CarbonFSRefCreation.m"; sourceTree = "<group>"; }; - B64E29FF0A6533FD006863D9 /* thumbnail.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = thumbnail.h; sourceTree = SOURCE_ROOT; }; - B64E2A000A6533FD006863D9 /* thumbnail.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = thumbnail.m; sourceTree = SOURCE_ROOT; }; B64E2A160A6534A3006863D9 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; B64FEA96084F8EC300879389 /* FuseImporter.mdimporter */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.bundle"; name = FuseImporter.mdimporter; path = ../../FuseImporter/build/deployment/FuseImporter.mdimporter; sourceTree = SOURCE_ROOT; }; B650986A09366C8F003AF1BF /* hdf.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = hdf.icns; path = resources/hdf.icns; sourceTree = SOURCE_ROOT; }; @@ -664,7 +655,6 @@ B6DD457908134943008E9F7E /* Content Arrays */, B67F3C4E07ED34260045339F /* Transformers */, B632C6AD03E5360C00A864FD /* Controllers */, - B64E29F40A6532A2006863D9 /* icon_family */, B66EA7830401075300A864FD /* FuseMenus.h */, B66EA7840401075300A864FD /* FuseMenus.m */, B6A7F0E904C9A11D001025EB /* NumberFormatter.h */, @@ -886,17 +876,6 @@ name = pokefinder; sourceTree = "<group>"; }; - B64E29F40A6532A2006863D9 /* icon_family */ = { - isa = PBXGroup; - children = ( - B64E29F70A6532ED006863D9 /* IconFamily.h */, - B64E29F80A6532ED006863D9 /* IconFamily.m */, - B64E29FB0A65337A006863D9 /* NSString+CarbonFSRefCreation.h */, - B64E29FC0A65337A006863D9 /* NSString+CarbonFSRefCreation.m */, - ); - path = icon_family; - sourceTree = "<group>"; - }; B678E3E20608FAA600678A33 /* sound */ = { isa = PBXGroup; children = ( @@ -1227,8 +1206,6 @@ F55986180389234A01A804BA /* spectrum.h */, F559862B0389235F01A804BA /* tape.c */, F559862C0389235F01A804BA /* tape.h */, - B64E29FF0A6533FD006863D9 /* thumbnail.h */, - B64E2A000A6533FD006863D9 /* thumbnail.m */, B6AB429D0677466E007C50EF /* ula.c */, B6AB429E0677466E007C50EF /* ula.h */, B6DDE53B0D67963600D6F905 /* ui.c */, @@ -1484,9 +1461,6 @@ B61F469309121DF100C8096C /* profile.c in Sources */, B61F469409121DF100C8096C /* ide.c in Sources */, B6825549091817F30014B5EE /* divide.c in Sources */, - B64E29FA0A6532ED006863D9 /* IconFamily.m in Sources */, - B64E29FE0A65337A006863D9 /* NSString+CarbonFSRefCreation.m in Sources */, - B64E2A020A6533FD006863D9 /* thumbnail.m in Sources */, B6403FD80A7E4B1A00E00B11 /* loader.c in Sources */, B6CE7F420B2830A300EB65B3 /* cocoajoystick.c in Sources */, B6CE7FCE0B28FBD600EB65B3 /* DisplayOpenGLView.m in Sources */, Modified: trunk/fuse/fusepb/controllers/FuseController.m =================================================================== --- trunk/fuse/fusepb/controllers/FuseController.m 2008-12-14 20:15:22 UTC (rev 571) +++ trunk/fuse/fusepb/controllers/FuseController.m 2008-12-15 11:08:41 UTC (rev 572) @@ -52,7 +52,6 @@ #include "settings_cocoa.h" #include "snapshot.h" #include "tape.h" -#include "thumbnail.h" #include "ui.h" #include "uidisplay.h" #include "utils.h" @@ -640,9 +639,6 @@ [[DisplayOpenGLView instance] snapshotWrite:filename]; - if( settings_current.thumbnails ) - add_screen_thumbnail_to( filename ); - [self addRecentSnapshot:filename]; free( filename ); @@ -707,9 +703,6 @@ [[DisplayOpenGLView instance] screenshotScrWrite:filename]; - if( settings_current.thumbnails ) - add_screen_thumbnail_to( filename ); - [self addRecentSnapshot:filename]; free( filename ); @@ -729,9 +722,6 @@ [[DisplayOpenGLView instance] screenshotWrite:filename]; - if( settings_current.thumbnails ) - add_screen_thumbnail_to( filename ); - free( filename ); [[DisplayOpenGLView instance] unpause]; Added: trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib (rev 0) +++ trunk/fuse/fusepb/nibs/Preferences.nib/designable.nib 2008-12-15 11:08:41 UTC (rev 572) @@ -0,0 +1,9338 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> + <data> + <int key="IBDocument.SystemTarget">1050</int> + <string key="IBDocument.SystemVersion">9F2114</string> + <string key="IBDocument.InterfaceBuilderVersion">672</string> + <string key="IBDocument.AppKitVersion">949.41</string> + <string key="IBDocument.HIToolboxVersion">352.00</string> + <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="6"/> + <integer value="1347"/> + </object> + <object class="NSArray" key="IBDocument.PluginDependencies"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + <object class="NSMutableArray" key="IBDocument.RootObjects" id="729263285"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomObject" id="363526684"> + <string key="NSClassName">PreferencesController</string> + </object> + <object class="NSCustomObject" id="341482335"> + <string key="NSClassName">FirstResponder</string> + </object> + <object class="NSCustomObject" id="218789108"> + <string key="NSClassName">NSApplication</string> + </object> + <object class="NSWindowTemplate" id="765474969"> + <int key="NSWindowStyleMask">3</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{24, 202}, {627, 403}}</string> + <int key="NSWTFlags">1886912512</int> + <string key="NSWindowTitle">Preferences</string> + <string key="NSWindowClass">NSPanel</string> + <object class="NSToolbar" key="NSViewClass" id="281460241"> + <object class="NSMutableString" key="NSToolbarIdentifier"> + <characters key="NS.bytes">2B5EC7EB-5A6C-4F96-8405-91E5B21A019C</characters> + </object> + <nil key="NSToolbarDelegate"/> + <bool key="NSToolbarPrefersToBeShown">YES</bool> + <bool key="NSToolbarShowsBaselineSeparator">NO</bool> + <bool key="NSToolbarAllowsUserCustomization">NO</bool> + <bool key="NSToolbarAutosavesConfiguration">YES</bool> + <int key="NSToolbarDisplayMode">1</int> + <int key="NSToolbarSizeMode">1</int> + <object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>1D3C684F-4B0A-4828-ADF3-E4106D08C1CD</string> + <string>2C4BF74A-9900-4A0E-A2FC-50ADDA64B166</string> + <string>4F5A5E26-7A02-464D-80D8-F49DECE3E69B</string> + <string>75749378-6992-4894-9B4C-43B464285D3E</string> + <string>BE697B6E-7F18-4D78-9F89-364AF4806055</string> + <string>D64DF5CD-B687-4DAB-8B9B-CB7BCB98DECE</string> + <string>F897F259-A5D7-4274-A9C8-9D7D7C86199E</string> + <string>FD445694-259E-4F31-A40E-117D01F46BB6</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSToolbarItem" id="761998648"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">1D3C684F-4B0A-4828-ADF3-E4106D08C1CD</characters> + </object> + <string key="NSToolbarItemLabel">Sound</string> + <string key="NSToolbarItemPaletteLabel">Sound</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Sound</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">1</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + <object class="NSToolbarItem" id="141636598"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">2C4BF74A-9900-4A0E-A2FC-50ADDA64B166</characters> + </object> + <string key="NSToolbarItemLabel">Video</string> + <string key="NSToolbarItemPaletteLabel">Video</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Graphics_Filter</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">7</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + <object class="NSToolbarItem" id="160350779"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">4F5A5E26-7A02-464D-80D8-F49DECE3E69B</characters> + </object> + <string key="NSToolbarItemLabel">Peripherals</string> + <string key="NSToolbarItemPaletteLabel">Peripherals</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Peripherals</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">2</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + <object class="NSToolbarItem" id="924265735"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">75749378-6992-4894-9B4C-43B464285D3E</characters> + </object> + <string key="NSToolbarItemLabel">General</string> + <string key="NSToolbarItemPaletteLabel">General</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSPreferencesGeneral</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">0</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + <object class="NSToolbarItem" id="490785676"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">BE697B6E-7F18-4D78-9F89-364AF4806055</characters> + </object> + <string key="NSToolbarItemLabel">Recording</string> + <string key="NSToolbarItemPaletteLabel">Recording</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">RZX</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">3</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + <object class="NSToolbarItem" id="367507624"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">D64DF5CD-B687-4DAB-8B9B-CB7BCB98DECE</characters> + </object> + <string key="NSToolbarItemLabel">ROM</string> + <string key="NSToolbarItemPaletteLabel">ROM</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Select_ROMs</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">5</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + <object class="NSToolbarItem" id="156451834"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">F897F259-A5D7-4274-A9C8-9D7D7C86199E</characters> + </object> + <string key="NSToolbarItemLabel">Joysticks</string> + <string key="NSToolbarItemPaletteLabel">Joysticks</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">qs2t_icon</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">4</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + <object class="NSToolbarItem" id="943816128"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">FD445694-259E-4F31-A40E-117D01F46BB6</characters> + </object> + <string key="NSToolbarItemLabel">Machine</string> + <string key="NSToolbarItemPaletteLabel">Machine</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Machine</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">NO</bool> + <int key="NSToolbarItemTag">6</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> + </object> + </object> + <object class="NSArray" key="NSToolbarIBAllowedItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="924265735"/> + <reference ref="761998648"/> + <reference ref="160350779"/> + <reference ref="490785676"/> + <reference ref="156451834"/> + <reference ref="367507624"/> + <reference ref="943816128"/> + <reference ref="141636598"/> + </object> + <object class="NSMutableArray" key="NSToolbarIBDefaultItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="924265735"/> + <reference ref="761998648"/> + <reference ref="160350779"/> + <reference ref="490785676"/> + <reference ref="156451834"/> + <reference ref="367507624"/> + <reference ref="943816128"/> + <reference ref="141636598"/> + </object> + <object class="NSMutableArray" key="NSToolbarIBSelectableItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMinSize">{213, 107}</string> + <object class="NSView" key="NSWindowView" id="41054612"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{627, 403}</string> + <reference key="NSSuperview"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> + <string key="NSMinSize">{213, 184}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSFrameAutosaveName"/> + </object> + <object class="NSCustomView" id="869768206"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="382408068"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{119, 49}, {123, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="508894506"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Confirm actions</string> + <object class="NSFont" key="NSSupport" id="447006373"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="382408068"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <object class="NSButtonImageSource" key="NSAlternateImage" id="529831564"> + <string key="NSImageName">NSSwitch</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="691708568"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{293, 169}, {131, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="565379702"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Issue 2 keyboard</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="691708568"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="236482654"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{119, 69}, {168, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1036853429"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Show tape/disk status</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="236482654"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="876021687"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{119, 89}, {165, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="288530032"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Auto-load media</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="876021687"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="632257383"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{293, 109}, {105, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="336105546"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Use .slt traps</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="632257383"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="776295189"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{119, 169}, {113, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="921014375"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Use tape traps</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="776295189"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="706432924"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{293, 89}, {214, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="71439217"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Set joysticks on snapshot load</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="706432924"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="173497110"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{293, 129}, {151, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="279939766"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Allow writes to ROM</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="173497110"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSForm" id="418457192"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{121, 193}, {279, 52}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <int key="NSNumRows">2</int> + <int key="NSNumCols">1</int> + <object class="NSMutableArray" key="NSCells"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSFormCell" id="494277899"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">-1941961728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="447006373"/> + <object class="NSNumberFormatter" key="NSFormatter" id="815687010"> + <object class="NSMutableDictionary" key="NS.attributes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>allowsFloats</string> + <string>formatterBehavior</string> + <string>minimum</string> + <string>multiplier</string> + <string>numberStyle</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="1" id="9"/> + <integer value="1040" id="736002568"/> + <reference ref="9"/> + <reference ref="9"/> + <integer value="3" id="11"/> + </object> + </object> + <string key="NS.positiveformat">#,##0%</string> + <string key="NS.negativeformat">#,##0%</string> + <nil key="NS.positiveattrs"/> + <nil key="NS.negativeattrs"/> + <object class="NSAttributedString" key="NS.zero"> + <nil key="NSString"/> + </object> + <object class="NSAttributedString" key="NS.nil"> + <nil key="NSString"/> + </object> + <object class="NSAttributedString" key="NS.nan"> + <string key="NSString">NaN</string> + <object class="NSDictionary" key="NSAttributes" id="625184385"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + </object> + <reference key="NS.min" ref="9"/> + <object class="NSDecimalNumberPlaceholder" key="NS.max" id="648108068"> + <int key="NS.exponent">0</int> + <int key="NS.length">0</int> + <bool key="NS.negative">YES</bool> + <bool key="NS.compact">NO</bool> + <int key="NS.mantissa.bo">1</int> + <bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes> + </object> + <object class="NSDecimalNumberHandler" key="NS.rounding"> + <int key="NS.roundingmode">3</int> + <bool key="NS.raise.overflow">YES</bool> + <bool key="NS.raise.underflow">YES</bool> + <bool key="NS.raise.dividebyzero">YES</bool> + </object> + <string key="NS.decimal">.</string> + <string key="NS.thousand">,</string> + <bool key="NS.hasthousands">YES</bool> + <bool key="NS.localized">YES</bool> + <bool key="NS.allowsfloats">YES</bool> + </object> + <reference key="NSControlView" ref="418457192"/> + <double key="NSTitleWidth">1.610000e+02</double> + <object class="NSCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67108864</int> + <string key="NSContents">Emulation speed:</string> + <reference key="NSSupport" ref="447006373"/> + </object> + </object> + <object class="NSFormCell" id="319020855"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">205521920</int> + <reference key="NSSupport" ref="447006373"/> + <object class="NSNumberFormatter" key="NSFormatter" id="657991658"> + <object class="NSMutableDictionary" key="NS.attributes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>allowsFloats</string> + <string>formatterBehavior</string> + <string>maximum</string> + <string>minimum</string> + <string>numberStyle</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="9"/> + <reference ref="736002568"/> + <real value="5.000000e+01" id="754928329"/> + <reference ref="9"/> + <integer value="0" id="8"/> + </object> + </object> + <string key="NS.positiveformat">#</string> + <string key="NS.negativeformat">#</string> + <nil key="NS.positiveattrs"/> + <nil key="NS.negativeattrs"/> + <object class="NSAttributedString" key="NS.zero"> + <nil key="NSString"/> + </object> + <object class="NSAttributedString" key="NS.nil"> + <nil key="NSString"/> + </object> + <object class="NSAttributedString" key="NS.nan"> + <string key="NSString">NaN</string> + <reference key="NSAttributes" ref="625184385"/> + </object> + <reference key="NS.min" ref="9"/> + <reference key="NS.max" ref="754928329"/> + <object class="NSDecimalNumberHandler" key="NS.rounding"> + <int key="NS.roundingmode">3</int> + <bool key="NS.raise.overflow">YES</bool> + <bool key="NS.raise.underflow">YES</bool> + <bool key="NS.raise.dividebyzero">YES</bool> + </object> + <string key="NS.decimal">.</string> + <string key="NS.thousand">,</string> + <bool key="NS.hasthousands">NO</bool> + <bool key="NS.localized">YES</bool> + <bool key="NS.allowsfloats">YES</bool> + </object> + <int key="NSTag">1</int> + <reference key="NSControlView" ref="418457192"/> + <double key="NSTitleWidth">1.610000e+02</double> + <object class="NSCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67108864</int> + <string key="NSContents">Screen refresh rate (1:n):</string> + <reference key="NSSupport" ref="447006373"/> + </object> + </object> + </object> + <string key="NSCellSize">{279, 22}</string> + <string key="NSIntercellSpacing">{1, 8}</string> + <int key="NSMatrixFlags">67633152</int> + <string key="NSCellClass">NSActionCell</string> + <object class="NSFormCell" key="NSProtoCell" id="912393328"> + <int key="NSCellFlags">343014976</int> + <int key="NSCellFlags2">205521920</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="447006373"/> + <double key="NSTitleWidth">1.610000e+02</double> + <object class="NSCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">67108864</int> + <string key="NSContents">Field:</string> + <reference key="NSSupport" ref="447006373"/> + </object> + </object> + <int key="NSSelectedRow">-1</int> + <int key="NSSelectedCol">-1</int> + <object class="NSColor" key="NSBackgroundColor" id="519317542"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor" id="429360493"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + </object> + </object> + <object class="NSColor" key="NSCellBackgroundColor" id="70288484"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + <reference key="NSFont" ref="447006373"/> + </object> + <object class="NSButton" id="281223997"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{119, 149}, {131, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="787494350"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Fast tape loading</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="281223997"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="695941014"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{119, 109}, {145, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="539932935"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Detect tape loaders</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="695941014"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="759805714"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{119, 129}, {170, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="153178233"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Accelerate tape loaders</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="759805714"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="384664460"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{293, 149}, {151, 18}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="696843910"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Late CPU timings</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="384664460"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="934579195"> + <reference key="NSNextResponder" ref="869768206"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{461, 12}, {152, 32}}</string> + <reference key="NSSuperview" ref="869768206"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="305612276"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Reset Preferences</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="934579195"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="447006373"/> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrameSize">{627, 265}</string> + <reference key="NSSuperview"/> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="803517542"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="992395947"> + <reference key="NSNextResponder" ref="803517542"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{216, 70}, {154, 18}}</string> + <reference key="NSSuperview" ref="803517542"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="896123690"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">AY stereo seperation</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="992395947"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1049631705"> + <reference key="NSNextResponder" ref="803517542"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{216, 50}, {162, 18}}</string> + <reference key="NSSuperview" ref="803517542"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1047691103"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Beeper pseudo-stereo</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="1049631705"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="441962883"> + <reference key="NSNextResponder" ref="803517542"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{216, 90}, {126, 18}}</string> + <reference key="NSSuperview" ref="803517542"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="486371396"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Loading sounds</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="441962883"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSSlider" id="524220653"> + <reference key="NSNextResponder" ref="803517542"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{295, 114}, {115, 25}}</string> + <reference key="NSSuperview" ref="803517542"/> + <bool key="NSEnabled">YES</bool> + <object class="NSSliderCell" key="NSCell" id="904083090"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <object class="NSMutableString" key="NSContents"> + <characters key="NS.bytes"/> + </object> + <object class="NSFont" key="NSSupport"> + <string key="NSName">Helvetica</string> + <double key="NSSize">1.200000e+01</double> + <int key="NSfFlags">16</int> + </object> + <reference key="NSControlView" ref="524220653"/> + <double key="NSMaxValue">8.000000e+00</double> + <double key="NSMinValue">3.000000e+00</double> + <double key="NSValue">8.000000e+00</double> + <double key="NSAltIncValue">0.000000e+00</double> + <int key="NSNumberOfTickMarks">6</int> + <int key="NSTickMarkPosition">0</int> + <bool key="NSAllowsTickMarkValuesOnly">YES</bool> + <bool key="NSVertical">NO</bool> + </object> + </object> + <object class="NSButton" id="637855161"> + <reference key="NSNextResponder" ref="803517542"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{216, 141}, {116, 18}}</string> + <reference key="NSSuperview" ref="803517542"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="759125109"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Enabled</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="637855161"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="843751024"> + <reference key="NSNextResponder" ref="803517542"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{232, 118}, {60, 17}}</string> + <reference key="NSSuperview" ref="803517542"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="529077263"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">4194304</int> + <string key="NSContents">Volume</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="843751024"/> + <reference key="NSBackgroundColor" ref="519317542"/> + <object class="NSColor" key="NSTextColor" id="696958365"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor" id="399634204"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> + </object> + </object> + </object> + <object class="NSButton" id="141004482"> + <reference key="NSNextResponder" ref="803517542"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{216, 30}, {162, 18}}</string> + <reference key="NSSuperview" ref="803517542"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="530825906"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Hi-Fi beeper</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="141004482"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrameSize">{627, 177}</string> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="649138232"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="724557388"> + <reference key="NSNextResponder" ref="649138232"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{399, 307}, {198, 18}}</string> + <reference key="NSSuperview" ref="649138232"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="101822818"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Kempston joystick interface</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="724557388"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1010771688"> + <reference key="NSNextResponder" ref="649138232"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{399, 263}, {138, 18}}</string> + <reference key="NSSuperview" ref="649138232"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="813453349"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Interface II</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="1010771688"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1031545301"> + <reference key="NSNextResponder" ref="649138232"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{399, 285}, {187, 18}}</string> + <reference key="NSSuperview" ref="649138232"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="354861720"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Kempston mouse</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="1031545301"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSAlternateImage" ref="529831564"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSBox" id="342524131"> + <reference key="NSNextResponder" ref="649138232"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="173510519"> + <reference key="NSNextResponder" ref="342524131"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMatrix" id="833825163"> + <reference key="NSNextResponder" ref="173510519"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{14, 9}, {138, 158}}</string> + <reference key="NSSuperview" ref="173510519"/> + <bool key="NSEnabled">YES</bool> + <int key="NSNumRows">8</int> + <int key="NSNumCols">1</int> + <object class="NSMutableArray" key="NSCells"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButtonCell" id="949804708"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">None</string> + <reference key="NSSupport" ref="447006373"/> + <reference key="NSControlView" ref="833825163"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <object class="NSButtonImageSource" key="NSAlternateImage" id="32434582"> + <string key="NSImageName">NSRadioButton</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <object class="NSButtonCell" id="1035080357"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Interface I</string> + <reference key="NSSupport" ref="447006373"/> + <int key="NSTag">1</int> + <reference key="NSControlView" ref="833825163"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">0</int> + <reference key="NSAlternateImage" ref="32434582"/> + <object class="NSMutableString" key="NSAlternateContents" id="974780515"> + <characters key="NS.bytes"/> + </object> + <reference key="NSKeyEquivalent" ref="974780515"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <object class="NSButtonCell" id="225396391"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Simple 8-bit IDE</string> + <reference key="NSSupport" ref="447006373"/> + <int key="NSTag">2</int> + <reference key="NSControlView" ref="833825163"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">0</int> + <object class="NSImage" key="NSNormalImage"> + <int key="NSImageFlags">549453824</int> + <string key="NSSize">{18, 18}</string> + <object class="NSMutableArray" key="NSReps"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="8"/> + <object class="NSBitmapImageRep"> + <object class="NSData" key="NSTIFFRepresentation"> + <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw +IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ +29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 +dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA +AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG +AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ +0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ +7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ +5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ +3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD +AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns +AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ +6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ +/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ +///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl +YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA +AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD +AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu +AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB +AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> + </object> + </object> + </object> + </object> + <object class="NSColor" key="NSColor" id="408283555"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> + </object> + <reference key="NSAlternateImag... [truncated message content] |
From: <fr...@us...> - 2008-12-14 20:15:29
|
Revision: 571 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=571&view=rev Author: fredm Date: 2008-12-14 20:15:22 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to Mac OS X 10.5 SDK and "proper" Preferences window. Modified Paths: -------------- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj trunk/fuse/fusepb/controllers/PreferencesController.h trunk/fuse/fusepb/controllers/PreferencesController.m trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib trunk/fuse/fusepb/views/DisplayOpenGLView.m Added Paths: ----------- trunk/fuse/fusepb/resources/Graphics_Filter.png trunk/fuse/fusepb/resources/Machine.png trunk/fuse/fusepb/resources/Peripherals.png trunk/fuse/fusepb/resources/RZX.png trunk/fuse/fusepb/resources/Select_ROMs.png trunk/fuse/fusepb/resources/Sound.png trunk/fuse/fusepb/resources/qs2t_icon.png Removed Paths: ------------- trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib trunk/fuse/fusepb/nibs/Preferences.nib/info.nib Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj =================================================================== --- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-12 12:30:50 UTC (rev 570) +++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-14 20:15:22 UTC (rev 571) @@ -8,6 +8,13 @@ /* Begin PBXBuildFile section */ B604B21B0DC182BE00981CC7 /* FuseGenerator.qlgenerator in CopyFiles */ = {isa = PBXBuildFile; fileRef = B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */; }; + B61159BF0EEE99D50029FEA3 /* Graphics_Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */; }; + B61159C10EEE99E20029FEA3 /* Machine.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C00EEE99E20029FEA3 /* Machine.png */; }; + B61159C30EEE99EE0029FEA3 /* Peripherals.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C20EEE99EE0029FEA3 /* Peripherals.png */; }; + B61159C50EEE99FA0029FEA3 /* qs2t_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C40EEE99FA0029FEA3 /* qs2t_icon.png */; }; + B61159C70EEE9A080029FEA3 /* RZX.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C60EEE9A080029FEA3 /* RZX.png */; }; + B61159C90EEE9A140029FEA3 /* Select_ROMs.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C80EEE9A140029FEA3 /* Select_ROMs.png */; }; + B61159CB0EEE9A1E0029FEA3 /* Sound.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159CA0EEE9A1E0029FEA3 /* Sound.png */; }; B615BFE80B4261E50082D535 /* HIDJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B615BFE60B4261E50082D535 /* HIDJoysticks.m */; }; B61F459309121DF100C8096C /* Fuse Help in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F905ED05CDA24300C2F10D /* Fuse Help */; }; B61F459409121DF100C8096C /* disk_plus3.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F2076596C700DE7E81 /* disk_plus3.szx */; }; @@ -310,6 +317,13 @@ B611190206A1FA12006D2711 /* JoystickConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JoystickConfigurationController.h; path = controllers/JoystickConfigurationController.h; sourceTree = SOURCE_ROOT; }; B611190306A1FA12006D2711 /* JoystickConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = JoystickConfigurationController.m; path = controllers/JoystickConfigurationController.m; sourceTree = SOURCE_ROOT; }; B611196806A1FBB6006D2711 /* JoystickConfiguration.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = JoystickConfiguration.nib; path = nibs/JoystickConfiguration.nib; sourceTree = "<group>"; }; + B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Graphics_Filter.png; sourceTree = "<group>"; }; + B61159C00EEE99E20029FEA3 /* Machine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Machine.png; sourceTree = "<group>"; }; + B61159C20EEE99EE0029FEA3 /* Peripherals.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Peripherals.png; sourceTree = "<group>"; }; + B61159C40EEE99FA0029FEA3 /* qs2t_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = qs2t_icon.png; sourceTree = "<group>"; }; + B61159C60EEE9A080029FEA3 /* RZX.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RZX.png; sourceTree = "<group>"; }; + B61159C80EEE9A140029FEA3 /* Select_ROMs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Select_ROMs.png; sourceTree = "<group>"; }; + B61159CA0EEE9A1E0029FEA3 /* Sound.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sound.png; sourceTree = "<group>"; }; B615BFE50B4261E50082D535 /* HIDJoysticks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HIDJoysticks.h; path = content_arrays/HIDJoysticks.h; sourceTree = "<group>"; }; B615BFE60B4261E50082D535 /* HIDJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = HIDJoysticks.m; path = content_arrays/HIDJoysticks.m; sourceTree = "<group>"; }; B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; }; @@ -831,20 +845,27 @@ B6F0480E0952B597006D8005 /* dck.icns */, B643BB8D0403A0FD00A864FD /* dsk.icns */, F5F4333103903ED801E7A043 /* Fuse.icns */, + B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */, B650986A09366C8F003AF1BF /* hdf.icns */, + B61159C00EEE99E20029FEA3 /* Machine.png */, B6F048100952B5AD006D8005 /* mdr.icns */, B6CADD6E0C48E1A3004BA954 /* microdrive_green.png */, B6CADD6F0C48E1A3004BA954 /* microdrive_red.png */, + B61159C20EEE99EE0029FEA3 /* Peripherals.png */, B6CADD700C48E1A3004BA954 /* plus3disk_green.png */, B6CADD710C48E1A3004BA954 /* plus3disk_red.png */, + B61159C40EEE99FA0029FEA3 /* qs2t_icon.png */, B639B7D00A6BB45600927E24 /* raw.icns */, B650986B09366C8F003AF1BF /* rom.icns */, B650986C09366C8F003AF1BF /* rzx.icns */, + B61159C60EEE9A080029FEA3 /* RZX.png */, B6F048120952B5C1006D8005 /* scl.icns */, B643BB900403A11B00A864FD /* scr.icns */, + B61159C80EEE9A140029FEA3 /* Select_ROMs.png */, B6F048140952B5DA006D8005 /* slt.icns */, B643BB910403A11B00A864FD /* sna.icns */, B6F048160952B5EC006D8005 /* snp.icns */, + B61159CA0EEE9A1E0029FEA3 /* Sound.png */, B6F048170952B5EC006D8005 /* sp.icns */, B650987009366CA2003AF1BF /* szx.icns */, B643BB920403A11B00A864FD /* tap.icns */, @@ -1357,6 +1378,13 @@ B6CADD730C48E1A3004BA954 /* microdrive_red.png in Resources */, B6CADD740C48E1A3004BA954 /* plus3disk_green.png in Resources */, B6CADD750C48E1A3004BA954 /* plus3disk_red.png in Resources */, + B61159BF0EEE99D50029FEA3 /* Graphics_Filter.png in Resources */, + B61159C10EEE99E20029FEA3 /* Machine.png in Resources */, + B61159C30EEE99EE0029FEA3 /* Peripherals.png in Resources */, + B61159C50EEE99FA0029FEA3 /* qs2t_icon.png in Resources */, + B61159C70EEE9A080029FEA3 /* RZX.png in Resources */, + B61159C90EEE9A140029FEA3 /* Select_ROMs.png in Resources */, + B61159CB0EEE9A1E0029FEA3 /* Sound.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1639,7 +1667,7 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_VERSION = 4.0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; YACCFLAGS = "-d"; YACC_GENERATED_FILE_STEM = InputFileStem; ZERO_LINK = YES; @@ -1658,7 +1686,7 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_VERSION = 4.0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; YACCFLAGS = "-d"; YACC_GENERATED_FILE_STEM = InputFileStem; ZERO_LINK = NO; @@ -1676,7 +1704,7 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_VERSION = 4.0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; YACCFLAGS = "-d"; YACC_GENERATED_FILE_STEM = InputFileStem; ZERO_LINK = NO; Modified: trunk/fuse/fusepb/controllers/PreferencesController.h =================================================================== --- trunk/fuse/fusepb/controllers/PreferencesController.h 2008-12-12 12:30:50 UTC (rev 570) +++ trunk/fuse/fusepb/controllers/PreferencesController.h 2008-12-14 20:15:22 UTC (rev 571) @@ -36,6 +36,16 @@ IBOutlet NSFormCell *rom3Filename; IBOutlet NSArrayController *machineRomsController; IBOutlet NSMatrix *massStorageType; + IBOutlet NSTabView *tabView; + IBOutlet NSToolbar *toolbar; + IBOutlet NSView *generalPrefsView; + IBOutlet NSView *soundPrefsView; + IBOutlet NSView *peripheralsPrefsView; + IBOutlet NSView *rzxPrefsView; + IBOutlet NSView *joysticksPrefsView; + IBOutlet NSView *romPrefsView; + IBOutlet NSView *machinePrefsView; + IBOutlet NSView *filterPrefsView; JoystickConfigurationController *joystickConfigurationController; @@ -56,6 +66,8 @@ - (IBAction)resetROMFile:(id)sender; - (IBAction)resetUserDefaults:(id)sender; - (IBAction)massStorageTypeClicked:(id)sender; +- (IBAction)selectPrefPanel:(id)item; +- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)bar; - (void)setMassStorageType; - (unsigned int)countOfMachineRoms; Modified: trunk/fuse/fusepb/controllers/PreferencesController.m =================================================================== --- trunk/fuse/fusepb/controllers/PreferencesController.m 2008-12-12 12:30:50 UTC (rev 570) +++ trunk/fuse/fusepb/controllers/PreferencesController.m 2008-12-14 20:15:22 UTC (rev 571) @@ -112,6 +112,14 @@ return self; } +- (void)awakeFromNib +{ + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSToolbarItem *item = [[toolbar items] objectAtIndex:[defaults integerForKey:@"preferencestab"]]; + [toolbar setSelectedItemIdentifier:[item itemIdentifier]]; + [self selectPrefPanel:item]; +} + - (void)showWindow:(id)sender { [[DisplayOpenGLView instance] pause]; @@ -366,6 +374,70 @@ [currentValues setObject:[NSNumber numberWithBool:settings_current.plusd ? YES : NO] forKey:@"plusd"]; } +- (IBAction)selectPrefPanel:(id)item +{ + NSString *sender; + + if( item == nil ){ //set the pane to the default. + sender = @"General"; + [toolbar setSelectedItemIdentifier:sender]; + } else { + sender = [item label]; + } + + NSWindow *window = [self window]; + + // make a temp pointer. + NSView *prefsView = generalPrefsView; + + // set the title to the name of the Preference Item. + [window setTitle:sender]; + + if( [sender isEqualToString:@"Sound"] ) { + prefsView = soundPrefsView; + } else if( [sender isEqualToString:@"Peripherals"] ) { + prefsView = peripheralsPrefsView; + } else if( [sender isEqualToString:@"Recording"] ) { + prefsView = rzxPrefsView; + } else if( [sender isEqualToString:@"Joysticks"] ) { + prefsView = joysticksPrefsView; + } else if( [sender isEqualToString:@"ROM"] ) { + prefsView = romPrefsView; + } else if( [sender isEqualToString:@"Machine"] ) { + prefsView = machinePrefsView; + } else if( [sender isEqualToString:@"Video"] ) { + prefsView = filterPrefsView; + } + + // to stop flicker, we make a temp blank view. + NSView *tempView = [[NSView alloc] initWithFrame:[[window contentView] frame]]; + [window setContentView:tempView]; + [tempView release]; + + // mojo to get the right frame for the new window. + NSRect newFrame = [window frame]; + newFrame.size.height = [prefsView frame].size.height + + ([window frame].size.height - [[window contentView] frame].size.height); + newFrame.origin.y += ([[window contentView] frame].size.height - + [prefsView frame].size.height); + + // set the frame to newFrame and animate it. + [window setShowsResizeIndicator:YES]; + [window setFrame:newFrame display:YES animate:YES]; + // set the main content view to the new view we have picked through the if structure above. + [window setContentView:prefsView]; + + [[NSUserDefaults standardUserDefaults] + setObject:[NSNumber numberWithInteger:[item tag]] forKey:@"preferencestab"]; +} + +// NSToolbar delegate method +- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)bar +{ + // Every toolbar icon is selectable + return [[bar items] valueForKey:@"itemIdentifier"]; +} + - (void)setMassStorageType { int value = 0; Deleted: trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib 2008-12-12 12:30:50 UTC (rev 570) +++ trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib 2008-12-14 20:15:22 UTC (rev 571) @@ -1,37 +0,0 @@ -{ - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - chooseFile = id; - chooseROMFile = id; - massStorageTypeClicked = id; - resetROMFile = id; - resetUserDefaults = id; - setup = id; - showWindow = id; - }; - CLASS = PreferencesController; - LANGUAGE = ObjC; - OUTLETS = { - machineRomsController = NSArrayController; - massStorageType = NSMatrix; - rom0Filename = NSFormCell; - rom1Filename = NSFormCell; - rom2Filename = NSFormCell; - rom3Filename = NSFormCell; - }; - SUPERCLASS = NSWindowController; - }, - { - CLASS = SDLJoystick; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} \ No newline at end of file Deleted: trunk/fuse/fusepb/nibs/Preferences.nib/info.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/info.nib 2008-12-12 12:30:50 UTC (rev 570) +++ trunk/fuse/fusepb/nibs/Preferences.nib/info.nib 2008-12-14 20:15:22 UTC (rev 571) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>95 15 356 240 0 0 1280 778 </string> - <key>IBFramework Version</key> - <string>489.0</string> - <key>IBGroupedObjects</key> - <dict> - <key>3</key> - <array> - <string>122</string> - <string>127</string> - <string>121</string> - <string>124</string> - </array> - <key>4</key> - <array> - <string>993</string> - <string>995</string> - <string>992</string> - <string>994</string> - </array> - </dict> - <key>IBLastGroupID</key> - <string>5</string> - <key>IBOldestOS</key> - <integer>3</integer> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> - <key>IBSystem Version</key> - <string>9F2114</string> - <key>IBUsesTextArchiving</key> - <true/> -</dict> -</plist> Modified: trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib =================================================================== --- trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2008-12-12 12:30:50 UTC (rev 570) +++ trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2008-12-14 20:15:22 UTC (rev 571) @@ -1,27597 +1,1425 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>$archiver</key> - <string>NSKeyedArchiver</string> - <key>$objects</key> - <array> - <string>$null</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>1588</integer> - </dict> - <key>NSAccessibilityConnectors</key> - <dict> - <key>CF$UID</key> - <integer>1585</integer> - </dict> - <key>NSAccessibilityOidsKeys</key> - <dict> - <key>CF$UID</key> - <integer>1586</integer> - </dict> - <key>NSAccessibilityOidsValues</key> - <dict> - <key>CF$UID</key> - <integer>1587</integer> - </dict> - <key>NSClassesKeys</key> - <dict> - <key>CF$UID</key> - <integer>1270</integer> - </dict> - <key>NSClassesValues</key> - <dict> - <key>CF$UID</key> - <integer>1271</integer> - </dict> - <key>NSConnections</key> - <dict> - <key>CF$UID</key> - <integer>8</integer> - </dict> - <key>NSFontManager</key> - <dict> - <key>CF$UID</key> - <integer>0</integer> - </dict> - <key>NSFramework</key> - <dict> - <key>CF$UID</key> - <integer>5</integer> - </dict> - <key>NSNamesKeys</key> - <dict> - <key>CF$UID</key> - <integer>1202</integer> - </dict> - <key>NSNamesValues</key> - <dict> - <key>CF$UID</key> - <integer>1203</integer> - </dict> - <key>NSNextOid</key> - <integer>1206</integer> - <key>NSObjectsKeys</key> - <dict> - <key>CF$UID</key> - <integer>1195</integer> - </dict> - <key>NSObjectsValues</key> - <dict> - <key>CF$UID</key> - <integer>1201</integer> - </dict> - <key>NSOidsKeys</key> - <dict> - <key>CF$UID</key> - <integer>1272</integer> - </dict> - <key>NSOidsValues</key> - <dict> - <key>CF$UID</key> - <integer>1273</integer> - </dict> - <key>NSRoot</key> - <dict> - <key>CF$UID</key> - <integer>2</integer> - </dict> - <key>NSVisibleWindows</key> - <dict> - <key>CF$UID</key> - <integer>6</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>4</integer> - </dict> - <key>NSClassName</key> - <dict> - <key>CF$UID</key> - <integer>3</integer> - </dict> - </dict> - <string>PreferencesController</string> - <dict> - <key>$classes</key> - <array> - <string>NSCustomObject</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSCustomObject</string> - </dict> - <string>IBCocoaFramework</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>7</integer> - </dict> - <key>NS.objects</key> - <array/> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSMutableSet</string> - <string>NSSet</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSMutableSet</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>104</integer> - </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>9</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>30</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>39</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>831</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>841</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>842</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>846</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>849</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>852</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>855</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>858</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>861</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>864</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>867</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>870</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>873</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>876</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>879</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>882</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>885</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>888</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>891</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>894</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>897</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>900</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>903</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>906</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>915</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>922</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>925</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>926</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>928</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>939</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>942</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>946</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>963</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>967</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>971</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>975</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>981</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>984</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>987</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>991</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>993</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>995</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>997</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>999</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1001</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1002</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1003</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1004</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1006</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1009</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1012</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1015</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1018</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1026</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1027</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1028</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1029</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1032</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1033</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1036</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1039</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1040</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1043</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1049</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1050</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1051</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1052</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1053</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1058</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1062</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1068</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1073</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1077</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1081</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1083</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1084</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1087</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1091</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1093</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1095</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1098</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1101</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1103</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1105</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1108</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1111</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1114</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1117</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1119</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1121</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1122</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1123</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1124</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1126</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1128</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1130</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1132</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1135</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1138</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1141</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1144</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1148</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1150</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1152</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1154</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1157</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1159</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1161</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1163</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1165</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1167</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1169</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1171</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1173</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1176</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1179</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1181</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1183</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1185</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1188</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>1191</integer> - </dict> - </array> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>29</integer> - </dict> - <key>NSDestination</key> - <dict> - <key>CF$UID</key> - <integer>24</integer> - </dict> - <key>NSLabel</key> - <dict> - <key>CF$UID</key> - <integer>28</integer> - </dict> - <key>NSSource</key> - <dict> - <key>CF$UID</key> - <integer>10</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>23</integer> - </dict> - <key>NSCell</key> - <dict> - <key>CF$UID</key> - <integer>13</integer> - </dict> - <key>NSEnabled</key> - <true/> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>12</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>127</integer> - </dict> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>205</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>0</integer> - </dict> - <key>NSSubviews</key> - <dict> - <key>CF$UID</key> - <integer>132</integer> - </dict> - </dict> - <string>{{192, 167}, {105, 18}}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>22</integer> - </dict> - <key>NSAlternateContents</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSAlternateImage</key> - <dict> - <key>CF$UID</key> - <integer>18</integer> - </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>2</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>14</integer> - </dict> - <key>NSControlView</key> - <dict> - <key>CF$UID</key> - <integer>10</integer> - </dict> - <key>NSKeyEquivalent</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Use .slt traps</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>17</integer> - </dict> - <key>NSName</key> - <dict> - <key>CF$UID</key> - <integer>16</integer> - </dict> - <key>NSSize</key> - <real>13</real> - <key>NSfFlags</key> - <integer>1044</integer> - </dict> - <string>LucidaGrande</string> - <dict> - <key>$classes</key> - <array> - <string>NSFont</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSFont</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>20</integer> - </dict> - <key>NSImageName</key> - <dict> - <key>CF$UID</key> - <integer>19</integer> - </dict> - </dict> - <string>NSSwitch</string> - <dict> - <key>$classes</key> - <array> - <string>NSButtonImageSource</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSButtonImageSource</string> - </dict> - <string></string> - <dict> - <key>$classes</key> - <array> - <string>NSButtonCell</string> - <string>%NSButtonCell</string> - <string>NSActionCell</string> - <string>NSCell</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSButtonCell</string> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSButton</string> - <string>NSControl</string> - <string>NSView</string> - <string>NSResponder</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSButton</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>23</integer> - </dict> - <key>NSCell</key> - <dict> - <key>CF$UID</key> - <integer>26</integer> - </dict> - <key>NSEnabled</key> - <true/> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>25</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> - </dict> - <string>{{192, 187}, {151, 18}}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>22</integer> - </dict> - <key>NSAlternateContents</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSAlternateImage</key> - <dict> - <key>CF$UID</key> - <integer>18</integer> - </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>2</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>27</integer> - </dict> - <key>NSControlView</key> - <dict> - <key>CF$UID</key> - <integer>24</integer> - </dict> - <key>NSKeyEquivalent</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Allow writes to ROM</string> - <string>nextKeyView</string> - <dict> - <key>$classes</key> - <array> - <string>NSNibOutletConnector</string> - <string>NSNibConnector</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSNibOutletConnector</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>29</integer> - </dict> - <key>NSDestination</key> - <dict> - <key>CF$UID</key> - <integer>35</integer> - </dict> - <key>NSLabel</key> - <dict> - <key>CF$UID</key> - <integer>28</integer> - </dict> - <key>NSSource</key> - <dict> - <key>CF$UID</key> - <integer>31</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>23</integer> - </dict> - <key>NSCell</key> - <dict> - <key>CF$UID</key> - <integer>33</integer> - </dict> - <key>NSEnabled</key> - <true/> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>32</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> - </dict> - <string>{{18, 227}, {113, 18}}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>22</integer> - </dict> - <key>NSAlternateContents</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSAlternateImage</key> - <dict> - <key>CF$UID</key> - <integer>18</integer> - </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>2</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>34</integer> - </dict> - <key>NSControlView</key> - <dict> - <key>CF$UID</key> - <integer>31</integer> - </dict> - <key>NSKeyEquivalent</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Use tape traps</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>23</integer> - </dict> - <key>NSCell</key> - <dict> - <key>CF$UID</key> - <integer>37</integer> - </dict> - <key>NSEnabled</key> - <true/> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>36</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>11</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> - </dict> - <string>{{18, 147}, {165, 18}}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>22</integer> - </dict> - <key>NSAlternateContents</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSAlternateImage</key> - <dict> - <key>CF$UID</key> - <integer>18</integer> - </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>2</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>38</integer> - </dict> - <key>NSControlView</key> - <dict> - <key>CF$UID</key> - <integer>35</integer> - </dict> - <key>NSKeyEquivalent</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Auto-load media</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>29</integer> - </dict> - <key>NSDestination</key> - <dict> - <key>CF$UID</key> - <integer>40</integer> - </dict> - <key>NSLabel</key> - <dict> - <key>CF$UID</key> - <integer>830</integer> - </dict> - <key>NSSource</key> - <dict> - <key>CF$UID</key> - <integer>2</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>829</integer> - </dict> - <key>NSMaxSize</key> - <dict> - <key>CF$UID</key> - <integer>828</integer> - </dict> - <key>NSMinSize</key> - <dict> - <key>CF$UID</key> - <integer>827</integer> - </dict> - <key>NSScreenRect</key> - <dict> - <key>CF$UID</key> - <integer>826</integer> - </dict> - <key>NSViewClass</key> - <dict> - <key>CF$UID</key> - <integer>44</integer> - </dict> - <key>NSWTFlags</key> - <integer>1886912512</integer> - <key>NSWindowBacking</key> - <integer>2</integer> - <key>NSWindowClass</key> - <dict> - <key>CF$UID</key> - <integer>43</integer> - </dict> - <key>NSWindowRect</key> - <dict> - <key>CF$UID</key> - <integer>41</integer> - </dict> - <key>NSWindowStyleMask</key> - <integer>3</integer> - <key>NSWindowTitle</key> - <dict> - <key>CF$UID</key> - <integer>42</integer> - </dict> - <key>NSWindowView</key> - <dict> - <key>CF$UID</key> - <integer>46</integer> - </dict> - </dict> - <string>{{24, 182}, {634, 423}}</string> - <string>Preferences</string> - <string>NSPanel</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>45</integer> - </dict> - <key>NS.string</key> - <string>View</string> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSMutableString</string> - <string>NSString</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSMutableString</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>127</integer> - </dict> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>825</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>0</integer> - </dict> - <key>NSSubviews</key> - <dict> - <key>CF$UID</key> - <integer>47</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>104</integer> - </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>48</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>787</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>820</integer> - </dict> - </array> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>786</integer> - </dict> - <key>NSAllowTruncatedLabels</key> - <true/> - <key>NSDrawsBackground</key> - <true/> - <key>NSFont</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>128</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>46</integer> - </dict> - <key>NSSelectedTabViewItem</key> - <dict> - <key>CF$UID</key> - <integer>419</integer> - </dict> - <key>NSSubviews</key> - <dict> - <key>CF$UID</key> - <integer>49</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>46</integer> - </dict> - <key>NSTabViewItems</key> - <dict> - <key>CF$UID</key> - <integer>129</integer> - </dict> - <key>NSTvFlags</key> - <integer>4</integer> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>104</integer> - </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - </array> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>127</integer> - </dict> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>126</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>48</integer> - </dict> - <key>NSSubviews</key> - <dict> - <key>CF$UID</key> - <integer>51</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>48</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>104</integer> - </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>52</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>56</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>60</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>118</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>122</integer> - </dict> - </array> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>23</integer> - </dict> - <key>NSCell</key> - <dict> - <key>CF$UID</key> - <integer>54</integer> - </dict> - <key>NSEnabled</key> - <true/> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>53</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> - </dict> - <string>{{18, 245}, {145, 18}}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>22</integer> - </dict> - <key>NSAlternateContents</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSAlternateImage</key> - <dict> - <key>CF$UID</key> - <integer>18</integer> - </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>2</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>55</integer> - </dict> - <key>NSControlView</key> - <dict> - <key>CF$UID</key> - <integer>52</integer> - </dict> - <key>NSKeyEquivalent</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Competition mode</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>23</integer> - </dict> - <key>NSCell</key> - <dict> - <key>CF$UID</key> - <integer>58</integer> - </dict> - <key>NSEnabled</key> - <true/> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>57</integer> - </dict> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> - </dict> - <string>{{18, 267}, {145, 18}}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>22</integer> - </dict> - <key>NSAlternateContents</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSAlternateImage</key> - <dict> - <key>CF$UID</key> - <integer>18</integer> - </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>2</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>59</integer> - </dict> - <key>NSControlView</key> - <dict> - <key>CF$UID</key> - <integer>56</integer> - </dict> - <key>NSKeyEquivalent</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Compress data</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>117</integer> - </dict> - <key>NSBackgroundColor</key> - <dict> - <key>CF$UID</key> - <integer>111</integer> - </dict> - <key>NSCellBackgroundColor</key> - <dict> - <key>CF$UID</key> - <integer>116</integer> - </dict> - <key>NSCellClass</key> - <dict> - <key>CF$UID</key> - <integer>107</integer> - </dict> - <key>NSCellSize</key> - <dict> - <key>CF$UID</key> - <integer>105</integer> - </dict> - <key>NSCells</key> - <dict> - <key>CF$UID</key> - <integer>62</integer> - </dict> - <key>NSEnabled</key> - <true/> - <key>NSFont</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - <key>NSFrame</key> - <dict> - <key>CF$UID</key> - <integer>61</integer> - </dict> - <key>NSIntercellSpacing</key> - <dict> - <key>CF$UID</key> - <integer>106</integer> - </dict> - <key>NSMatrixFlags</key> - <integer>67633152</integer> - <key>NSNextResponder</key> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - <key>NSNumCols</key> - <integer>1</integer> - <key>NSNumRows</key> - <integer>1</integer> - <key>NSProtoCell</key> - <dict> - <key>CF$UID</key> - <integer>108</integer> - </dict> - <key>NSSelectedCol</key> - <integer>-1</integer> - <key>NSSelectedRow</key> - <integer>-1</integer> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> - </dict> - <string>{{20, 217}, {256, 22}}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>104</integer> - </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>63</integer> - </dict> - </array> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>103</integer> - </dict> - <key>NSCellFlags</key> - <integer>343014977</integer> - <key>NSCellFlags2</key> - <integer>-1941961728</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>64</integer> - </dict> - <key>NSControlView</key> - <dict> - <key>CF$UID</key> - <integer>60</integer> - </dict> - <key>NSFormatter</key> - <dict> - <key>CF$UID</key> - <integer>65</integer> - </dict> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - <key>NSTitleCell</key> - <dict> - <key>CF$UID</key> - <integer>100</integer> - </dict> - <key>NSTitleWidth</key> - <real>121</real> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>45</integer> - </dict> - <key>NS.string</key> - <string></string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>99</integer> - </dict> - <key>NS.allowsfloats</key> - <true/> - <key>NS.attributes</key> - <dict> - <key>CF$UID</key> - <integer>66</integer> - </dict> - <key>NS.decimal</key> - <dict> - <key>CF$UID</key> - <integer>90</integer> - </dict> - <key>NS.hasthousands</key> - <false/> - <key>NS.localized</key> - <false/> - <key>NS.max</key> - <dict> - <key>CF$UID</key> - <integer>98</integer> - </dict> - <key>NS.min</key> - <dict> - <key>CF$UID</key> - <integer>79</integer> - </dict> - <key>NS.nan</key> - <dict> - <key>CF$UID</key> - <integer>95</integer> - </dict> - <key>NS.negativeattrs</key> - <dict> - <key>CF$UID</key> - <integer>0</integer> - </dict> - <key>NS.negativeformat</key> - <dict> - <key>CF$UID</key> - <integer>93</integer> - </dict> - <key>NS.nil</key> - <dict> - <key>CF$UID</key> - <integer>86</integer> - </dict> - <key>NS.positiveattrs</key> - <dict> - <key>CF$UID</key> - <integer>0</integer> - </dict> - <key>NS.positiveformat</key> - <dict> - <key>CF$UID</key> - <integer>81</integer> - </dict> - <key>NS.rounding</key> - <dict> - <key>CF$UID</key> - <integer>0</integer> - </dict> - <key>NS.thousand</key> - <dict> - <key>CF$UID</key> - <integer>94</integer> - </dict> - <key>NS.zero</key> - <dict> - <key>CF$UID</key> - <integer>82</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>97</integer> - </dict> - <key>NS.keys</key> - <array> - <dict> - <key>CF$UID</key> - <integer>67</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>68</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>69</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>70</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>71</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>72</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>73</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>74</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>75</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>76</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>77</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>78</integer> - </dict> - </array> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>79</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>81</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>82</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>86</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>87</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>89</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>90</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>91</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>92</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>93</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>94</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>95</integer> - </dict> - </array> - </dict> - <string>minimum</string> - <string>positiveFormat</string> - <string>attributedStringForZero</string> - <string>attributedStringForNil</string> - <string>locale</string> - <string>formatterBehavior</string> - <string>decimalSeparator</string> - <string>allowsFloats</string> - <string>usesGroupingSeparator</string> - <string>negativeFormat</string> - <string>groupingSeparator</string> - <string>attributedStringForNotANumber</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>80</integer> - </dict> - <key>NS.compact</key> - <false/> - <key>NS.exponent</key> - <integer>0</integer> - <key>NS.length</key> - <integer>0</integer> - <key>NS.mantissa</key> - <data> - AAAAAAAAAAAAAAAAAAAAAA== - </data> - <key>NS.mantissa.bo</key> - <integer>1</integer> - <key>NS.negative</key> - <false/> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSDecimalNumberPlaceholder</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSDecimalNumberPlaceholder</string> - </dict> - <string>0</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>85</integer> - </dict> - <key>NSAttributes</key> - <dict> - <key>CF$UID</key> - <integer>83</integer> - </dict> - <key>NSString</key> - <dict> - <key>CF$UID</key> - <integer>81</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>84</integer> - </dict> - <key>NS.keys</key> - <array/> - <key>NS.objects</key> - <array/> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSDictionary</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSDictionary</string> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSAttributedString</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSAttributedString</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>85</integer> - </dict> - <key>NSString</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>88</integer> - </dict> - <key>NS.identifier</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSLocale</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSLocale</string> - </dict> - <integer>1000</integer> - <string>.</string> - <true/> - <false/> - <string>-0</string> - <string>,</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>85</integer> - </dict> - <key>NSAttributes</key> - <dict> - <key>CF$UID</key> - <integer>83</integer> - </dict> - <key>NSString</key> - <dict> - <key>CF$UID</key> - <integer>96</integer> - </dict> - </dict> - <string>NaN</string> - <dict> - <key>$classes</key> - <array> - <string>NSMutableDictionary</string> - <string>NSDictionary</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSMutableDictionary</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>80</integer> - </dict> - <key>NS.compact</key> - <false/> - <key>NS.exponent</key> - <integer>0</integer> - <key>NS.length</key> - <integer>0</integer> - <key>NS.mantissa</key> - <data> - AAAAAAAAAAAAAAAAAAAAAA== - </data> - <key>NS.mantissa.bo</key> - <integer>1</integer> - <key>NS.negative</key> - <true/> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSNumberFormatter</string> - <string>NSFormatter</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSNumberFormatter</string> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>102</integer> - </dict> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>67108864</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>101</integer> - </dict> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Competition code:</string> - <dict> - <key>$classes</key> - <array> - <string>NSCell</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSCell</string> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSFormCell</string> - <string>NSActionCell</string> - <string>NSCell</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSFormCell</string> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSMutableArray</string> - <string>NSArray</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSMutableArray</string> - </dict> - <string>{256, 22}</string> - <string>{1, 8}</string> - <string>NSActionCell</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>103</integer> - </dict> - <key>NSCellFlags</key> - <integer>343014976</integer> - <key>NSCellFlags2</key> - <integer>205521920</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>21</integer> - </dict> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - <key>NSTitleCell</key> - <dict> - <key>CF$UID</key> - <integer>109</integer> - </dict> - <key>NSTitleWidth</key> - <real>121</real> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>102</integer> - </dict> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>67108864</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>110</integer> - </dict> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - </dict> - <string>Field:</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>115</integer> - </dict> - <key>NSCatalogName</key> - <dict> - <key>CF$UID</key> - <integer>112</integer> - </dict> - <key>NSColor</key> - <dict> - <key>CF$UID</key> - <integer>114</integer> - </dict> - <key>NSColorName</key> - <dict> - <key>CF$UID</key> - <in... [truncated message content] |
From: <fr...@us...> - 2008-12-12 12:30:58
|
Revision: 570 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=570&view=rev Author: fredm Date: 2008-12-12 12:30:50 +0000 (Fri, 12 Dec 2008) Log Message: ----------- Tag 0.10.0.1 release. Added Paths: ----------- tags/Release-0_10_0_1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-12 12:28:32
|
Revision: 569 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=569&view=rev Author: fredm Date: 2008-12-12 12:28:27 +0000 (Fri, 12 Dec 2008) Log Message: ----------- Bump version strings etc. to 0.10.0.1. Modified Paths: -------------- branches/Release-0_10_0-branch/fuse/fusepb/English.lproj/InfoPlist.strings branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist branches/Release-0_10_0-branch/fuse/fusepb/config.h Modified: branches/Release-0_10_0-branch/fuse/fusepb/English.lproj/InfoPlist.strings =================================================================== (Binary files differ) Modified: branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist 2008-12-12 12:14:01 UTC (rev 568) +++ branches/Release-0_10_0-branch/fuse/fusepb/Info-Fuse.plist 2008-12-12 12:28:27 UTC (rev 569) @@ -480,7 +480,7 @@ <key>CFBundleSignature</key> <string>FUSE</string> <key>CFBundleVersion</key> - <string>0.10.0</string> + <string>0.10.0.1</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> Modified: branches/Release-0_10_0-branch/fuse/fusepb/config.h =================================================================== --- branches/Release-0_10_0-branch/fuse/fusepb/config.h 2008-12-12 12:14:01 UTC (rev 568) +++ branches/Release-0_10_0-branch/fuse/fusepb/config.h 2008-12-12 12:28:27 UTC (rev 569) @@ -152,7 +152,7 @@ /* #undef USE_WIDGET */ /* Version number of package */ -#define VERSION "0.10.0" +#define VERSION "0.10.0.1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-12 12:14:07
|
Revision: 568 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=568&view=rev Author: fredm Date: 2008-12-12 12:14:01 +0000 (Fri, 12 Dec 2008) Log Message: ----------- Merge in vendor 0.10.0.1 release changes. Modified Paths: -------------- branches/Release-0_10_0-branch/fuse/ChangeLog branches/Release-0_10_0-branch/fuse/Makefile.am branches/Release-0_10_0-branch/fuse/README branches/Release-0_10_0-branch/fuse/compat/unix/file.c branches/Release-0_10_0-branch/fuse/configure.in branches/Release-0_10_0-branch/fuse/hacking/ChangeLog branches/Release-0_10_0-branch/fuse/hacking/cvs-tags branches/Release-0_10_0-branch/fuse/man/fuse.1 branches/Release-0_10_0-branch/fuse/ui/fb/Makefile.am Modified: branches/Release-0_10_0-branch/fuse/ChangeLog =================================================================== --- branches/Release-0_10_0-branch/fuse/ChangeLog 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/ChangeLog 2008-12-12 12:14:01 UTC (rev 568) @@ -1,5 +1,15 @@ -2008-11-?? Philip Kendall <phi...@sh...> +2008-12-10 Philip Kendall <phi...@sh...> + * Fuse 0.10.0.1 released + + * Writing files would not truncate the file at the correct point, + leading to corrupt files when overwriting an existing file + (Philip Kendall; thanks, Matthew Westcott). + + * Distribute ui/fb/fbmouse.h (Fredrick Meunier; thanks, rkd77). + +2008-12-03 Philip Kendall <phi...@sh...> + * Fuse 0.10.0 released * New upd765 FDC emulation; all known +3 DSK images now work (Gergely Modified: branches/Release-0_10_0-branch/fuse/Makefile.am =================================================================== --- branches/Release-0_10_0-branch/fuse/Makefile.am 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/Makefile.am 2008-12-12 12:14:01 UTC (rev 568) @@ -134,6 +134,7 @@ @WINDRES_OBJ@ fuse_DEPENDENCIES = @UI_LIBS@ \ + compat/@COMPAT_OSNAME@/libcompatos.a disk/libdisk.a \ debugger/libdebugger.a \ machines/libmachines.a \ Modified: branches/Release-0_10_0-branch/fuse/README =================================================================== --- branches/Release-0_10_0-branch/fuse/README 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/README 2008-12-12 12:14:01 UTC (rev 568) @@ -1,5 +1,5 @@ -The Free Unix Spectrum Emulator (Fuse) 0.10.0 -============================================= +The Free Unix Spectrum Emulator (Fuse) 0.10.0.1 +=============================================== Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat unsurprisingly, an emulator of the ZX Spectrum (a popular 1980s home @@ -150,6 +150,6 @@ ( http://www.worldofspectrum.org/faq/index.html ) first! Philip Kendall <phi...@sh...> -3 December 2008 +10 December 2008 $Id: README 3866 2008-11-29 17:05:40Z pak21 $ Modified: branches/Release-0_10_0-branch/fuse/compat/unix/file.c =================================================================== --- branches/Release-0_10_0-branch/fuse/compat/unix/file.c 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/compat/unix/file.c 2008-12-12 12:14:01 UTC (rev 568) @@ -47,7 +47,8 @@ compat_fd compat_file_open( const char *path, int write ) { - int flags = write ? O_WRONLY | O_CREAT | O_BINARY : O_RDONLY | O_BINARY; + int flags = O_BINARY; + flags |= write ? O_WRONLY | O_CREAT | O_TRUNC : O_RDONLY; return open( path, flags, 0666 ); } Modified: branches/Release-0_10_0-branch/fuse/configure.in =================================================================== --- branches/Release-0_10_0-branch/fuse/configure.in 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/configure.in 2008-12-12 12:14:01 UTC (rev 568) @@ -24,7 +24,7 @@ AC_CANONICAL_SYSTEM dnl Use automake to produce `Makefile.in' -AM_INIT_AUTOMAKE(fuse, 0.10.0) +AM_INIT_AUTOMAKE(fuse, 0.10.0.1) dnl Checks for programs. AC_PROG_CC Modified: branches/Release-0_10_0-branch/fuse/hacking/ChangeLog =================================================================== --- branches/Release-0_10_0-branch/fuse/hacking/ChangeLog 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/hacking/ChangeLog 2008-12-12 12:14:01 UTC (rev 568) @@ -2954,3 +2954,8 @@ 20081129 configure.in,man/fuse.1,README: final tweaks for 0.10.0 release (Release_0_10_0-branch). 20081201 fuse.c: update libspectrum version needed (Release_0_10_0-branch). +20081206 ui/fb/Makefile.am: distribute fbmouse.h (thanks, rkd77) (Fred). +20081210 Makefile.am,compat/unix/file.c: must open files for writing with + O_TRUNC to ensure that any old data is cleared out. Also fix a + dependency problem (thanks, Matthew Westcott). +20081210 ChangeLog,configure.in,man/fuse.1,README: update for 0.10.0.1 release. Modified: branches/Release-0_10_0-branch/fuse/hacking/cvs-tags =================================================================== --- branches/Release-0_10_0-branch/fuse/hacking/cvs-tags 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/hacking/cvs-tags 2008-12-12 12:14:01 UTC (rev 568) @@ -164,6 +164,10 @@ | | Release-0_9_0-branch | +-\ -| | Release-0_10_0-branch +| | Release_0_10_0-pre1 +| | Release_0_10_0 +| | Release_0_10_0_1 +| | +| | Release_0_10_0-branch | HEAD Modified: branches/Release-0_10_0-branch/fuse/man/fuse.1 =================================================================== --- branches/Release-0_10_0-branch/fuse/man/fuse.1 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/man/fuse.1 2008-12-12 12:14:01 UTC (rev 568) @@ -23,7 +23,7 @@ .\" E-mail: phi...@sh... .\" .\" -.TH fuse 1 "3rd December, 2008" "Version 0.10.0" "Emulators" +.TH fuse 1 "10th December, 2008" "Version 0.10.0.1" "Emulators" .\" .\"------------------------------------------------------------------ .\" Modified: branches/Release-0_10_0-branch/fuse/ui/fb/Makefile.am =================================================================== --- branches/Release-0_10_0-branch/fuse/ui/fb/Makefile.am 2008-12-12 12:00:42 UTC (rev 567) +++ branches/Release-0_10_0-branch/fuse/ui/fb/Makefile.am 2008-12-12 12:14:01 UTC (rev 568) @@ -42,6 +42,7 @@ @PERL@ -I$(srcdir)/../../perl $(srcdir)/../../keysyms.pl fb $(srcdir)/../../keysyms.dat > $@.tmp && mv $@.tmp $@ noinst_HEADERS = fbdisplay.h \ - fbkeyboard.h + fbkeyboard.h \ + fbmouse.h CLEANFILES = keysyms.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-12 12:00:48
|
Revision: 567 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=567&view=rev Author: fredm Date: 2008-12-12 12:00:42 +0000 (Fri, 12 Dec 2008) Log Message: ----------- Make a branch for 0.10.0 releases (hopefully just the one). Added Paths: ----------- branches/Release-0_10_0-branch/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-09 12:09:40
|
Revision: 566 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=566&view=rev Author: fredm Date: 2008-12-09 12:09:31 +0000 (Tue, 09 Dec 2008) Log Message: ----------- Revert "Add GNU style changelog." This reverts commit 32a621d145e473b4cb2a8d3b255523cb63f18364. Removed Paths: ------------- trunk/ChangeLog Deleted: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-12-09 12:08:31 UTC (rev 565) +++ trunk/ChangeLog 2008-12-09 12:09:31 UTC (rev 566) @@ -1,7237 +0,0 @@ -2008-11-18 12:25 fredm - - * .: Create Release-0_10_0-pre1 tag. - -2008-11-18 12:21 fredm - - * trunk/fuse/fusepb/Credits.html: Add some additional credits from - the Fuse version of the file. - -2008-11-18 12:05 fredm - - * trunk/FuseGenerator/libspectrum.h, - trunk/FuseImporter/libspectrum.h, trunk/fuse, - trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, - trunk/fuse/configure.in, trunk/fuse/disk/disk.c, - trunk/fuse/fuse.c, - trunk/fuse/fusepb/English.lproj/InfoPlist.strings, - trunk/fuse/fusepb/Info-Fuse.plist, - trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, - trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html, - trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/Makefile.am, - trunk/fuse/hacking/cvs-tags, trunk/fuse/machines/specplus2a.c, - trunk/fuse/machines/specplus3.c, trunk/fuse/man/fuse.1, - trunk/fuse/ui/win32/Makefile.am, trunk/fuse/utils.c, - trunk/libspectrum/Info.plist, trunk/libspectrum/libspectrum, - trunk/libspectrum/libspectrum.h, - trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj, - trunk/libspectrum/libspectrum/configure.in, - trunk/libspectrum/libspectrum/doc/cvs-tags, - trunk/libspectrum/libspectrum/doc/libspectrum.txt, - trunk/libspectrum/libspectrum/hacking/ChangeLog, - trunk/libspectrum/libspectrum/libspectrum.c, - trunk/libspectrum/libspectrum/libspectrum.h.in: Merge up to - vendor 0.10.0-pre1 release. - -2008-11-07 12:14 fredm - - * trunk/FuseGenerator/LibspectrumSCRExtractor.m, - trunk/FuseImporter/LibspectrumMetadataImporter.m: Correct - reporting of unknown classes, log name of tape being scanned for - metadata. - -2008-11-05 11:41 fredm - - * trunk/README: Remove old reference to lib765. - -2008-11-05 11:38 fredm - - * trunk/fuse/TODO, trunk/fuse/fusepb/resources/Fuse - Help/html/changelog.html, trunk/fuse/fusepb/resources/Fuse - Help/html/compressed.html, trunk/fuse/fusepb/resources/Fuse - Help/html/formats.html, trunk/fuse/fusepb/resources/Fuse - Help/html/monitor.html, trunk/fuse/fusepb/resources/Fuse - Help/html/preferences.html: Update manual for changes from - vendor. - -2008-11-05 11:33 fredm - - * trunk/fuse/debugger/commandl.l: Remove exit command as it causes - a ruckus when the main thread - doesn't know that the emulator thread is gone. - -2008-11-05 11:32 fredm - - * trunk/fuse/fusepb/nibs/Preferences.nib/info.nib, - trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Add - setting for create autosaves in RZX dialog. - -2008-11-03 12:27 fredm - - * trunk/FuseGenerator/libspectrum.h, - trunk/FuseImporter/libspectrum.h, trunk/fuse, - trunk/fuse/ChangeLog, trunk/fuse/README, - trunk/fuse/compat/unix/file.c, trunk/fuse/configure.in, - trunk/fuse/disk/fdd.c, trunk/fuse/disk/upd_fdc.c, - trunk/fuse/fuse.c, - trunk/fuse/fusepb/English.lproj/InfoPlist.strings, - trunk/fuse/fusepb/Info-Fuse.plist, - trunk/fuse/fusepb/models/Emulator.m, - trunk/fuse/hacking/ChangeLog, trunk/fuse/man/fuse.1, - trunk/fuse/menu.c, trunk/fuse/rzx.c, trunk/fuse/settings.dat, - trunk/fuse/ui/options.dat, trunk/fuse/ui/win32/win32internals.h, - trunk/fuse/ui/win32/win32joystick.c, - trunk/fuse/ui/win32/win32joystick.h, - trunk/fuse/ui/win32/win32ui.c, trunk/fuse/z80/tests/README, - trunk/libspectrum/libspectrum, trunk/libspectrum/libspectrum.h, - trunk/libspectrum/libspectrum/ChangeLog, - trunk/libspectrum/libspectrum/README, - trunk/libspectrum/libspectrum/doc/libspectrum.txt, - trunk/libspectrum/libspectrum/hacking/ChangeLog, - trunk/libspectrum/libspectrum/libspectrum.h.in, - trunk/libspectrum/libspectrum/rzx.c, - trunk/libspectrum/libspectrum/sna.c, - trunk/libspectrum/libspectrum/tap.c, - trunk/libspectrum/libspectrum/tape_block.c, - trunk/libspectrum/libspectrum/test/empty.z80, - trunk/libspectrum/libspectrum/test/test.c, - trunk/libspectrum/libspectrum/tzx_read.c, - trunk/libspectrum/libspectrum/tzx_write.c, - trunk/libspectrum/libspectrum/warajevo_read.c, - trunk/libspectrum/libspectrum/z80.c: Merge up to vendor revision - 3804. - -2008-10-28 13:18 fredm - - * trunk/fuse/fuse.c: Don't deallocate memory and similar arrays - 'till we've had a chance - to use them when writing settings back to the prefs database. - -2008-10-28 11:37 fredm - - * trunk/FuseImporter/LibspectrumMetadataImporter.m: Log filename - that causes an error. - -2008-10-21 12:05 fredm - - * trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj, - trunk/FuseGenerator/LibspectrumSCRExtractor.m, - trunk/FuseGenerator/generate.pl, - trunk/FuseGenerator/libspectrum.h, - trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj, - trunk/FuseImporter/LibspectrumMetadataImporter.m, - trunk/FuseImporter/generate.pl, trunk/FuseImporter/libspectrum.h, - trunk/fuse, trunk/fuse/Makefile.am, trunk/fuse/PORTING, - trunk/fuse/README, trunk/fuse/compat.h, - trunk/fuse/compat/amiga/Makefile.am, - trunk/fuse/compat/morphos/Makefile.am, - trunk/fuse/compat/unix/Makefile.am, - trunk/fuse/compat/unix/file.c, trunk/fuse/compat/unix/osname.c, - trunk/fuse/compat/wii, trunk/fuse/compat/wii/Makefile.am, - trunk/fuse/compat/wii/file.c, - trunk/fuse/compat/win32/Makefile.am, trunk/fuse/configure.in, - trunk/fuse/dck.c, trunk/fuse/debugger/Makefile.am, - trunk/fuse/debugger/breakpoint.c, - trunk/fuse/debugger/breakpoint.h, trunk/fuse/debugger/command.c, - trunk/fuse/debugger/commandl.l, trunk/fuse/debugger/commandy.y, - trunk/fuse/debugger/debugger.c, trunk/fuse/debugger/debugger.h, - trunk/fuse/debugger/debugger_internals.h, - trunk/fuse/debugger/event.c, trunk/fuse/debugger/expression.c, - trunk/fuse/debugger/variable.c, trunk/fuse/disk/beta.c, - trunk/fuse/disk/beta.h, trunk/fuse/disk/disk.c, - trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, - trunk/fuse/disk/plusd.c, trunk/fuse/disk/plusd.h, - trunk/fuse/disk/upd_fdc.c, trunk/fuse/disk/upd_fdc.h, - trunk/fuse/disk/wd_fdc.c, trunk/fuse/disk/wd_fdc.h, - trunk/fuse/divide.c, trunk/fuse/event.c, trunk/fuse/event.h, - trunk/fuse/fuse.c, - trunk/fuse/fusepb/English.lproj/InfoPlist.strings, - trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/fuse/fusepb/Info-Fuse.plist, - trunk/fuse/fusepb/controllers/DebuggerController.m, - trunk/fuse/fusepb/models/Emulator.m, - trunk/fuse/hacking/ChangeLog, trunk/fuse/if1.c, - trunk/fuse/input.c, trunk/fuse/input.h, trunk/fuse/keysyms.pl, - trunk/fuse/loader.c, trunk/fuse/machine.c, - trunk/fuse/machines/specplus3.h, trunk/fuse/memory.c, - trunk/fuse/mempool.c, trunk/fuse/mempool.h, trunk/fuse/menu.c, - trunk/fuse/menu.h, trunk/fuse/menu_data.dat, - trunk/fuse/menu_data.pl, trunk/fuse/periph.c, - trunk/fuse/periph.h, trunk/fuse/profile.c, trunk/fuse/rzx.c, - trunk/fuse/rzx.h, trunk/fuse/screenshot.c, - trunk/fuse/settings.dat, trunk/fuse/simpleide.c, - trunk/fuse/snapshot.c, trunk/fuse/sound/alsasound.c, - trunk/fuse/sound/dxsound.c, trunk/fuse/sound/win32sound.c, - trunk/fuse/spectrum.c, trunk/fuse/spectrum.h, trunk/fuse/tape.c, - trunk/fuse/tape.h, trunk/fuse/timer/timer.c, - trunk/fuse/timer/timer.h, trunk/fuse/ui/cocoa/cocoajoystick.c, - trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/gtk/debugger.c, - trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkkeyboard.c, - trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/options.dat, - trunk/fuse/ui/scaler/scalers.c, trunk/fuse/ui/sdl/sdldisplay.c, - trunk/fuse/ui/sdl/sdljoystick.c, - trunk/fuse/ui/svga/svgadisplay.c, - trunk/fuse/ui/svga/svgajoystick.c, trunk/fuse/ui/uidisplay.h, - trunk/fuse/ui/uijoystick.c, trunk/fuse/ui/widget/Makefile.am, - trunk/fuse/ui/widget/browse.c, trunk/fuse/ui/widget/debugger.c, - trunk/fuse/ui/widget/error.c, trunk/fuse/ui/widget/filesel.c, - trunk/fuse/ui/widget/memory.c, trunk/fuse/ui/widget/menu.c, - trunk/fuse/ui/widget/options.pl, trunk/fuse/ui/widget/picture.c, - trunk/fuse/ui/widget/pokefinder.c, trunk/fuse/ui/widget/query.c, - trunk/fuse/ui/widget/roms.c, trunk/fuse/ui/widget/select.c, - trunk/fuse/ui/widget/text.c, trunk/fuse/ui/widget/widget.c, - trunk/fuse/ui/widget/widget.h, - trunk/fuse/ui/widget/widget_internals.h, - trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/binary.c, - trunk/fuse/ui/win32/binary.rc, trunk/fuse/ui/win32/browse.c, - trunk/fuse/ui/win32/browse.h, trunk/fuse/ui/win32/browse.rc, - trunk/fuse/ui/win32/confirm.c, trunk/fuse/ui/win32/debugger.c, - trunk/fuse/ui/win32/debugger.h, trunk/fuse/ui/win32/debugger.rc, - trunk/fuse/ui/win32/error.c, trunk/fuse/ui/win32/fileselector.c, - trunk/fuse/ui/win32/memorybrowser.c, - trunk/fuse/ui/win32/memorybrowser.h, - trunk/fuse/ui/win32/memorybrowser.rc, - trunk/fuse/ui/win32/options-header.pl, - trunk/fuse/ui/win32/options-resource.pl, - trunk/fuse/ui/win32/options.pl, trunk/fuse/ui/win32/picture.c, - trunk/fuse/ui/win32/picture.h, trunk/fuse/ui/win32/picture.rc, - trunk/fuse/ui/win32/pokefinder.c, - trunk/fuse/ui/win32/pokefinder.h, - trunk/fuse/ui/win32/pokefinder.rc, - trunk/fuse/ui/win32/rollback.c, trunk/fuse/ui/win32/rollback.rc, - trunk/fuse/ui/win32/roms.c, trunk/fuse/ui/win32/roms.rc, - trunk/fuse/ui/win32/select_template.rc, - trunk/fuse/ui/win32/statusbar.c, - trunk/fuse/ui/win32/win32display.c, - trunk/fuse/ui/win32/win32display.h, - trunk/fuse/ui/win32/win32internals.h, - trunk/fuse/ui/win32/win32joystick.c, - trunk/fuse/ui/win32/win32joystick.rc, - trunk/fuse/ui/win32/win32keyboard.c, - trunk/fuse/ui/win32/win32keyboard.h, - trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/xlib/xdisplay.c, - trunk/fuse/ui/xlib/xui.c, trunk/fuse/unittests/unittests.c, - trunk/fuse/utils.c, trunk/fuse/z80/coretest.c, - trunk/fuse/z80/tests/tests.expected, - trunk/fuse/z80/tests/tests.in, trunk/fuse/z80/z80.c, - trunk/fuse/z80/z80.h, trunk/fuse/z80/z80.pl, - trunk/fuse/z80/z80_ops.c, trunk/fuse/zxatasp.c, - trunk/fuse/zxcf.c, trunk/libspectrum/generate.pl, - trunk/libspectrum/libspectrum, trunk/libspectrum/libspectrum.h, - trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj, - trunk/libspectrum/libspectrum/Makefile.am, - trunk/libspectrum/libspectrum/accessor.pl, - trunk/libspectrum/libspectrum/bzip2.c, - trunk/libspectrum/libspectrum/configure.in, - trunk/libspectrum/libspectrum/creator.c, - trunk/libspectrum/libspectrum/crypto.c, - trunk/libspectrum/libspectrum/csw.c, - trunk/libspectrum/libspectrum/dck.c, - trunk/libspectrum/libspectrum/hacking/ChangeLog, - trunk/libspectrum/libspectrum/ide.c, - trunk/libspectrum/libspectrum/internals.h, - trunk/libspectrum/libspectrum/libspectrum.c, - trunk/libspectrum/libspectrum/libspectrum.h.in, - trunk/libspectrum/libspectrum/make-perl.c, - trunk/libspectrum/libspectrum/memory.c, - trunk/libspectrum/libspectrum/microdrive.c, - trunk/libspectrum/libspectrum/myglib/Makefile.am, - trunk/libspectrum/libspectrum/myglib/garray.c, - trunk/libspectrum/libspectrum/myglib/ghash.c, - trunk/libspectrum/libspectrum/myglib/gslist.c, - trunk/libspectrum/libspectrum/plusd.c, - trunk/libspectrum/libspectrum/rzx.c, - trunk/libspectrum/libspectrum/sna.c, - trunk/libspectrum/libspectrum/snapshot.c, - trunk/libspectrum/libspectrum/sp.c, - trunk/libspectrum/libspectrum/szx.c, - trunk/libspectrum/libspectrum/tap.c, - trunk/libspectrum/libspectrum/tape.c, - trunk/libspectrum/libspectrum/tape_block.c, - trunk/libspectrum/libspectrum/tape_block.h, - trunk/libspectrum/libspectrum/test/Makefile.am, - trunk/libspectrum/libspectrum/test/edges.c, - trunk/libspectrum/libspectrum/test/test.c, - trunk/libspectrum/libspectrum/test/test.h, - trunk/libspectrum/libspectrum/test/test15.c, - trunk/libspectrum/libspectrum/test/writeprotected.mdr, - trunk/libspectrum/libspectrum/tzx_read.c, - trunk/libspectrum/libspectrum/tzx_write.c, - trunk/libspectrum/libspectrum/warajevo_read.c, - trunk/libspectrum/libspectrum/wav.c, - trunk/libspectrum/libspectrum/z80.c, - trunk/libspectrum/libspectrum/z80em.c, - trunk/libspectrum/libspectrum/zlib.c, - trunk/libspectrum/libspectrum/zxs.c: Merge up to vendor revision - 3775. - -2008-05-10 23:53 fredm - - * trunk/FuseGenerator/libspectrum.h, - trunk/FuseImporter/libspectrum.h, trunk/README, - trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/README, - trunk/fuse/ay.c, trunk/fuse/compat/amiga/Makefile.am, - trunk/fuse/compat/amiga/osname.c, - trunk/fuse/compat/amiga/paths.c, trunk/fuse/configure.in, - trunk/fuse/dck.c, trunk/fuse/debugger/commandl.l, - trunk/fuse/debugger/commandy.y, trunk/fuse/debugger/debugger.c, - trunk/fuse/debugger/debugger_internals.h, - trunk/fuse/disk/Makefile.am, trunk/fuse/disk/beta.c, - trunk/fuse/disk/disk.c, trunk/fuse/disk/disk.h, - trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, - trunk/fuse/disk/plusd.c, trunk/fuse/disk/upd_fdc.c, - trunk/fuse/disk/upd_fdc.h, trunk/fuse/disk/wd_fdc.c, - trunk/fuse/disk/wd_fdc.h, trunk/fuse/display.c, - trunk/fuse/divide.c, trunk/fuse/event.c, trunk/fuse/event.h, - trunk/fuse/fuse.c, trunk/fuse/fuse.cpp, trunk/fuse/fuse.h, - trunk/fuse/fusepb/English.lproj/InfoPlist.strings, - trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/fuse/fusepb/Info-Fuse.plist, - trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/main.m, trunk/fuse/fusepb/main.mm, - trunk/fuse/fusepb/models/Emulator.h, - trunk/fuse/fusepb/models/Emulator.m, - trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, - trunk/fuse/fusepb/scaler/hq2x.cpp, - trunk/fuse/fusepb/scaler/hq2x.h, - trunk/fuse/fusepb/scaler/hq3x.cpp, - trunk/fuse/fusepb/scaler/hq3x.h, - trunk/fuse/fusepb/scaler/intern.h, - trunk/fuse/fusepb/scaler/scalers16.c, - trunk/fuse/fusepb/scaler/scalers16.cpp, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m, - trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags, - trunk/fuse/hacking/win32_todo.txt, trunk/fuse/if1.c, - trunk/fuse/input.c, trunk/fuse/kempmouse.c, - trunk/fuse/kempmouse.h, trunk/fuse/keysyms.pl, - trunk/fuse/loader.c, trunk/fuse/loader.h, trunk/fuse/machine.c, - trunk/fuse/machine.h, trunk/fuse/machines/pentagon.c, - trunk/fuse/machines/pentagon.h, - trunk/fuse/machines/pentagon1024.c, - trunk/fuse/machines/pentagon512.c, - trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c, - trunk/fuse/machines/spec128.h, trunk/fuse/machines/spec16.c, - trunk/fuse/machines/spec48.c, trunk/fuse/machines/spec48.h, - trunk/fuse/machines/spec_se.c, trunk/fuse/machines/specplus2.c, - trunk/fuse/machines/specplus2a.c, - trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h, - trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c, - trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h, - trunk/fuse/machines/ts2068.c, trunk/fuse/man/fuse.1, - trunk/fuse/memory.c, trunk/fuse/memory.h, trunk/fuse/menu.c, - trunk/fuse/menu_data.dat, trunk/fuse/periph.c, - trunk/fuse/roms/plus3e-0.rom, trunk/fuse/roms/plus3e-1.rom, - trunk/fuse/roms/plus3e-2.rom, trunk/fuse/settings.dat, - trunk/fuse/settings.pl, trunk/fuse/simpleide.c, - trunk/fuse/sound/Makefile.am, trunk/fuse/sound/aosound.c, - trunk/fuse/sound/win32sound.c, trunk/fuse/spectrum.c, - trunk/fuse/spectrum.h, trunk/fuse/tape.c, trunk/fuse/tape.h, - trunk/fuse/timer/Makefile.am, trunk/fuse/ui.c, - trunk/fuse/ui/Makefile.am, trunk/fuse/ui/fb/fbkeyboard.c, - trunk/fuse/ui/gtk/Makefile.am, trunk/fuse/ui/gtk/fileselector.c, - trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/options.dat, - trunk/fuse/ui/scaler/Makefile.am, trunk/fuse/ui/scaler/scaler.c, - trunk/fuse/ui/scaler/scaler.h, - trunk/fuse/ui/scaler/scaler_hq2x.c, - trunk/fuse/ui/scaler/scaler_hq3x.c, - trunk/fuse/ui/scaler/scaler_internals.h, - trunk/fuse/ui/scaler/scalers.c, trunk/fuse/ui/scaler/scalers.cpp, - trunk/fuse/ui/sdl/Makefile.am, trunk/fuse/ui/sdl/sdldisplay.c, - trunk/fuse/ui/sdl/sdlkeyboard.c, - trunk/fuse/ui/svga/svgakeyboard.c, trunk/fuse/ui/ui.h, - trunk/fuse/ui/widget, trunk/fuse/ui/widget/Makefile.am, - trunk/fuse/ui/widget/browse.c, trunk/fuse/ui/widget/debugger.c, - trunk/fuse/ui/widget/error.c, trunk/fuse/ui/widget/filesel.c, - trunk/fuse/ui/widget/fuse.font.sbf, - trunk/fuse/ui/widget/memory.c, trunk/fuse/ui/widget/menu.c, - trunk/fuse/ui/widget/mkfusefont.pl, - trunk/fuse/ui/widget/options-header.pl, - trunk/fuse/ui/widget/options.pl, trunk/fuse/ui/widget/picture.c, - trunk/fuse/ui/widget/pokefinder.c, trunk/fuse/ui/widget/query.c, - trunk/fuse/ui/widget/roms.c, trunk/fuse/ui/widget/select.c, - trunk/fuse/ui/widget/text.c, trunk/fuse/ui/widget/widget.c, - trunk/fuse/ui/widget/widget.h, - trunk/fuse/ui/widget/widget_internals.h, - trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/binary.c, - trunk/fuse/ui/win32/binary.h, trunk/fuse/ui/win32/binary.rc, - trunk/fuse/ui/win32/browse.c, trunk/fuse/ui/win32/browse.h, - trunk/fuse/ui/win32/browse.rc, trunk/fuse/ui/win32/debugger.c, - trunk/fuse/ui/win32/debugger.h, trunk/fuse/ui/win32/debugger.rc, - trunk/fuse/ui/win32/del_o.bat, trunk/fuse/ui/win32/error.c, - trunk/fuse/ui/win32/icons/Makefile.am, - trunk/fuse/ui/win32/icons/mdr_active.bmp, - trunk/fuse/ui/win32/icons/mdr_inactive.bmp, - trunk/fuse/ui/win32/icons/mouse_active.bmp, - trunk/fuse/ui/win32/icons/mouse_inactive.bmp, - trunk/fuse/ui/win32/icons/tape_marker_mask.bmp, - trunk/fuse/ui/win32/memorybrowser.c, - trunk/fuse/ui/win32/memorybrowser.h, - trunk/fuse/ui/win32/memorybrowser.rc, - trunk/fuse/ui/win32/menu_data.c, trunk/fuse/ui/win32/menu_data.h, - trunk/fuse/ui/win32/menu_data.rc, - trunk/fuse/ui/win32/options-header.pl, - trunk/fuse/ui/win32/options-resource.pl, - trunk/fuse/ui/win32/options.pl, trunk/fuse/ui/win32/picture.c, - trunk/fuse/ui/win32/picture.h, trunk/fuse/ui/win32/picture.rc, - trunk/fuse/ui/win32/pokefinder.c, - trunk/fuse/ui/win32/pokefinder.h, - trunk/fuse/ui/win32/pokefinder.rc, - trunk/fuse/ui/win32/rollback.c, trunk/fuse/ui/win32/rollback.h, - trunk/fuse/ui/win32/rollback.rc, trunk/fuse/ui/win32/roms.c, - trunk/fuse/ui/win32/roms.h, trunk/fuse/ui/win32/roms.rc, - trunk/fuse/ui/win32/select_template.h, - trunk/fuse/ui/win32/select_template.rc, - trunk/fuse/ui/win32/statusbar.c, - trunk/fuse/ui/win32/statusbar.rc, - trunk/fuse/ui/win32/win32display.c, - trunk/fuse/ui/win32/win32display.h, - trunk/fuse/ui/win32/win32internals.h, - trunk/fuse/ui/win32/win32joystick.c, - trunk/fuse/ui/win32/win32joystick.h, - trunk/fuse/ui/win32/win32joystick.rc, - trunk/fuse/ui/win32/win32keyboard.h, - trunk/fuse/ui/win32/win32mouse.c, trunk/fuse/ui/win32/win32ui.c, - trunk/fuse/ui/win32/win32ui.rc, trunk/fuse/ui/xlib/xdisplay.c, - trunk/fuse/ui/xlib/xerror.c, trunk/fuse/ui/xlib/xkeyboard.c, - trunk/fuse/ula.c, trunk/fuse/unittests, - trunk/fuse/unittests/Makefile.am, - trunk/fuse/unittests/unittests.c, - trunk/fuse/unittests/unittests.h, trunk/fuse/utils.c, - trunk/fuse/widget, trunk/fuse/windres.rc, trunk/fuse/winfuse.ico, - trunk/fuse/z80/z80.c, trunk/fuse/z80/z80_ops.c, trunk/lib765, - trunk/libspectrum/config.h, trunk/libspectrum/libspectrum.h, - trunk/libspectrum/libspectrum/ChangeLog, - trunk/libspectrum/libspectrum/README, - trunk/libspectrum/libspectrum/TODO, - trunk/libspectrum/libspectrum/accessor.pl, - trunk/libspectrum/libspectrum/configure.in, - trunk/libspectrum/libspectrum/doc/libspectrum.txt, - trunk/libspectrum/libspectrum/hacking/ChangeLog, - trunk/libspectrum/libspectrum/ide.c, - trunk/libspectrum/libspectrum/internals.h, - trunk/libspectrum/libspectrum/libspectrum.c, - trunk/libspectrum/libspectrum/libspectrum.h.in, - trunk/libspectrum/libspectrum/sna.c, - trunk/libspectrum/libspectrum/snap_accessors.txt, - trunk/libspectrum/libspectrum/snapshot.c, - trunk/libspectrum/libspectrum/szx.c, - trunk/libspectrum/libspectrum/tape.c, - trunk/libspectrum/libspectrum/test/Makefile.am, - trunk/libspectrum/libspectrum/test/edges.c, - trunk/libspectrum/libspectrum/test/test.h, - trunk/libspectrum/libspectrum/test/test15.c, - trunk/libspectrum/libspectrum/z80.c: Merge up to vendor revision - 3612. - -2008-05-07 11:35 fredm - - * trunk/fuse/TODO: Update TODO. - -2008-05-04 10:38 fredm - - * trunk/FuseGenerator/LibspectrumSCRExtractor.m: Have inlay images - take priority over loading screens. - -2008-05-04 09:11 fredm - - * trunk/FuseGenerator/GeneratePreviewForURL.m, - trunk/FuseGenerator/GenerateThumbnailForURL.m, - trunk/FuseGenerator/LibspectrumSCRExtractor.h, - trunk/FuseGenerator/LibspectrumSCRExtractor.m, trunk/fuse/TODO: - Add support for TZX custom screenshot and tape inlay blocks. - -2008-04-29 12:59 fredm - - * trunk/fuse/fusepb/English.lproj/InfoPlist.strings: Bump version - to 0.9.0.2. - -2008-04-29 12:44 fredm - - * trunk/fuse/fusepb/controllers/FuseController.m: Fix betaFileTypes - declaration. - -2008-04-29 12:24 fredm - - * trunk/fuse/TODO, trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add UI - support for .udi, .fdi and .scl files for Beta disk images. - -2008-04-28 13:55 fredm - - * trunk/FuseGenerator/GeneratePreviewForURL.m: Generate previews - for all docs, not just screenshots. - -2008-04-28 13:21 fredm - - * trunk/FuseImporter/COPYING, trunk/FuseImporter/Howto build.rtf, - trunk/FuseImporter/README.rtf: Remove obsolete files. - -2008-04-28 13:15 fredm - - * trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx, - trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex, - trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, - trunk/fuse/fusepb/resources/Fuse Help/html/quicklook.html, - trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html: Add - Quick Look generator documentation, update index. - -2008-04-28 13:14 fredm - - * trunk/fuse/settings.dat: Change thumbnail icon generation default - to be off as it is superceded by Quick - Look on Mac OS X 10.5 and up. - -2008-04-28 11:32 fredm - - * trunk/FuseImporter/English.lproj/InfoPlist.strings, - trunk/FuseImporter/Info.plist: Bump version to 1.1, add - references for img, mgt and raw file formats. - -2008-04-28 10:45 fredm - - * trunk/fuse/TODO: Update TODO list. - -2008-04-28 10:42 fredm - - * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: Distribute - QuickLook generator. - -2008-04-28 10:17 fredm - - * trunk/FuseImporter/LibspectrumMetadataImporter.h: Add declaration - of process_tape. - -2008-04-28 10:14 fredm - - * trunk/FuseImporter/English.lproj/schema.strings: Add display name - for graphics mode. - -2008-04-09 21:13 fredm - - * trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c: Don't report - errors back to the user when we fail to open a joystick device - that already has exclusive access given to someone else (e.g. a - Wacom tablet - and it's associated driver) (James Weatherley). - -2008-04-08 13:38 fredm - - * trunk/fuse/ui/cocoa/cocoadisplay.m: Move lock allocation and - initialisation to DisplayOpenGLView. - -2008-04-08 13:36 fredm - - * trunk/fuse/fusepb/English.lproj/InfoPlist.strings: Update version - strings to 0.9.0.1. - -2008-04-08 13:34 fredm - - * trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, - trunk/fuse/fusepb/resources/Fuse Help/html/menus.html: Add - references for new menu options, update ChangeLog for recent - changes. - -2008-04-08 13:31 fredm - - * trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.m: Add 4x and 5x zoom - options for those with big screens. - -2008-04-08 12:08 fredm - - * trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c: Merge up to - revision 3524 of SDL_sysjoystick.c, in hope of fixing errors - starting Fuse with a Wacom graphics tablet attached. - -2008-03-31 12:46 fredm - - * trunk/fuse/TODO, trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/models/Emulator.h, - trunk/fuse/fusepb/models/Emulator.m, - trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m: Add +D and Beta disk - insert menu entries. Allow +D to save .img images. - -2008-03-31 11:51 fredm - - * trunk/fuse/TODO, trunk/fuse/fusepb/controllers/FuseController.m: - Allow .img files to be opened as +D images. - -2008-03-29 03:19 fredm - - * trunk/fuse/fusepb/controllers/PreferencesController.m, - trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Add - preferences support for Beta 128 interface. - -2008-03-29 03:18 fredm - - * trunk/fuse/fusepb/English.lproj/InfoPlist.strings: Change - additional copyright date to 2008. - -2008-03-28 13:01 fredm - - * trunk/fuse/fusepb/English.lproj/InfoPlist.strings, - trunk/fuse/fusepb/Info-Fuse.plist, trunk/fuse/fusepb/config.h, - trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Move - version to Fuse for Mac OS X 0.9.0. - -2008-03-27 12:04 fredm - - * trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/models/Emulator.h, - trunk/fuse/fusepb/models/Emulator.m, - trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m: Add +D and Beta disk - write protect support. Fix Microdrive cartridge menus. - Add command key release for keyboard joystick binding shortcut. - -2008-03-27 12:03 fredm - - * trunk/fuse/fusepb/Info-Fuse.plist: Fix mdr type info, round out - mgt and img type exports. - -2008-03-26 10:36 fredm - - * trunk/fuse/TODO, trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, - trunk/fuse/fusepb/resources/Fuse Help/html/menus.html, - trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html: Move - Emulate keyboard joystick option to to Bind Keys to Joystick - option in - Machine menu - -2008-03-26 08:46 fredm - - * trunk/fuse/fusepb/nibs/Preferences.nib/info.nib, - trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Fix - keyboard joystick enabled preference binding. - -2008-02-18 09:48 fredm - - * trunk/README: Remove reference to bzip2 framework. - -2008-02-18 08:45 fredm - - * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/fuse/fusepb/FuseMenus.m: Don't use standard Fuse menu.c, - move only function we use - (menu_select_roms_with_title) to FuseMenus.m. - -2008-02-18 07:25 fredm - - * trunk/fuse/fusepb/controllers/FuseController.m: Ignore any - shortcuts that raise dialogs in fullscreen mode. - -2008-02-18 07:20 fredm - - * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: Remove - pentagon.h from distribution binaries and remove references to - obsolete - SDL and bzip2 frameworks. - -2008-02-18 04:00 fredm - - * trunk/libgcrypt/Info-gcrypt.plist, - trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj, - trunk/libgcrypt/libgcrypt/AUTHORS, - trunk/libgcrypt/libgcrypt/ChangeLog, - trunk/libgcrypt/libgcrypt/INSTALL, - trunk/libgcrypt/libgcrypt/Makefile.am, - trunk/libgcrypt/libgcrypt/Makefile.in, - trunk/libgcrypt/libgcrypt/NEWS, trunk/libgcrypt/libgcrypt/README, - trunk/libgcrypt/libgcrypt/README.CVS, - trunk/libgcrypt/libgcrypt/README.SVN, - trunk/libgcrypt/libgcrypt/THANKS, trunk/libgcrypt/libgcrypt/TODO, - trunk/libgcrypt/libgcrypt/VERSION, - trunk/libgcrypt/libgcrypt/acinclude.m4, - trunk/libgcrypt/libgcrypt/aclocal.m4, - trunk/libgcrypt/libgcrypt/autogen.sh, - trunk/libgcrypt/libgcrypt/cipher/ChangeLog, - trunk/libgcrypt/libgcrypt/cipher/Makefile.in, - trunk/libgcrypt/libgcrypt/cipher/ac.c, - trunk/libgcrypt/libgcrypt/cipher/blowfish.c, - trunk/libgcrypt/libgcrypt/cipher/cast5.c, - trunk/libgcrypt/libgcrypt/cipher/cipher.c, - trunk/libgcrypt/libgcrypt/cipher/crc.c, - trunk/libgcrypt/libgcrypt/cipher/des.c, - trunk/libgcrypt/libgcrypt/cipher/dsa.c, - trunk/libgcrypt/libgcrypt/cipher/elgamal.c, - trunk/libgcrypt/libgcrypt/cipher/md.c, - trunk/libgcrypt/libgcrypt/cipher/primegen.c, - trunk/libgcrypt/libgcrypt/cipher/pubkey.c, - trunk/libgcrypt/libgcrypt/cipher/random.c, - trunk/libgcrypt/libgcrypt/cipher/random.h, - trunk/libgcrypt/libgcrypt/cipher/rfc2268.c, - trunk/libgcrypt/libgcrypt/cipher/rijndael.c, - trunk/libgcrypt/libgcrypt/cipher/rmd160.c, - trunk/libgcrypt/libgcrypt/cipher/rndlinux.c, - trunk/libgcrypt/libgcrypt/cipher/rndw32.c, - trunk/libgcrypt/libgcrypt/cipher/rsa.c, - trunk/libgcrypt/libgcrypt/cipher/serpent.c, - trunk/libgcrypt/libgcrypt/cipher/sha256.c, - trunk/libgcrypt/libgcrypt/cipher/sha512.c, - trunk/libgcrypt/libgcrypt/cipher/tiger.c, - trunk/libgcrypt/libgcrypt/cipher/twofish.c, - trunk/libgcrypt/libgcrypt/compile, - trunk/libgcrypt/libgcrypt/config.guess, - trunk/libgcrypt/libgcrypt/config.h.in, - trunk/libgcrypt/libgcrypt/config.sub, - trunk/libgcrypt/libgcrypt/configure, - trunk/libgcrypt/libgcrypt/configure.ac, - trunk/libgcrypt/libgcrypt/depcomp, - trunk/libgcrypt/libgcrypt/doc/ChangeLog, - trunk/libgcrypt/libgcrypt/doc/Makefile.in, - trunk/libgcrypt/libgcrypt/doc/gcrypt.info, - trunk/libgcrypt/libgcrypt/doc/gcrypt.texi, - trunk/libgcrypt/libgcrypt/doc/mdate-sh, - trunk/libgcrypt/libgcrypt/doc/stamp-vti, - trunk/libgcrypt/libgcrypt/doc/texinfo.tex, - trunk/libgcrypt/libgcrypt/doc/version.texi, - trunk/libgcrypt/libgcrypt/install-sh, - trunk/libgcrypt/libgcrypt/ltmain.sh, - trunk/libgcrypt/libgcrypt/m4, - trunk/libgcrypt/libgcrypt/m4/ChangeLog, - trunk/libgcrypt/libgcrypt/m4/Makefile.am, - trunk/libgcrypt/libgcrypt/m4/Makefile.in, - trunk/libgcrypt/libgcrypt/m4/libtool.m4, - trunk/libgcrypt/libgcrypt/m4/onceonly.m4, - trunk/libgcrypt/libgcrypt/m4/socklen.m4, - trunk/libgcrypt/libgcrypt/m4/sys_socket_h.m4, - trunk/libgcrypt/libgcrypt/missing, - trunk/libgcrypt/libgcrypt/mkinstalldirs, - trunk/libgcrypt/libgcrypt/mpi/ChangeLog, - trunk/libgcrypt/libgcrypt/mpi/Makefile.am, - trunk/libgcrypt/libgcrypt/mpi/Makefile.in, - trunk/libgcrypt/libgcrypt/mpi/config.links, - trunk/libgcrypt/libgcrypt/mpi/hppa1.1/udiv-qrnnd.S, - trunk/libgcrypt/libgcrypt/mpi/mpi-bit.c, - trunk/libgcrypt/libgcrypt/mpi/mpi-pow.c, - trunk/libgcrypt/libgcrypt/mpi/mpicoder.c, - trunk/libgcrypt/libgcrypt/mpi/mpiutil.c, - trunk/libgcrypt/libgcrypt/src/ChangeLog, - trunk/libgcrypt/libgcrypt/src/Makefile.am, - trunk/libgcrypt/libgcrypt/src/Makefile.in, - trunk/libgcrypt/libgcrypt/src/ath.c, - trunk/libgcrypt/libgcrypt/src/ath.h, - trunk/libgcrypt/libgcrypt/src/g10lib.h, - trunk/libgcrypt/libgcrypt/src/gcrypt-module.h, - trunk/libgcrypt/libgcrypt/src/gcrypt.h, - trunk/libgcrypt/libgcrypt/src/gcrypt.h.in, - trunk/libgcrypt/libgcrypt/src/global.c, - trunk/libgcrypt/libgcrypt/src/libgcrypt.m4, - trunk/libgcrypt/libgcrypt/src/missing-string.c, - trunk/libgcrypt/libgcrypt/src/secmem.c, - trunk/libgcrypt/libgcrypt/src/secmem.h, - trunk/libgcrypt/libgcrypt/src/sexp.c, - trunk/libgcrypt/libgcrypt/src/types.h, - trunk/libgcrypt/libgcrypt/tests/ChangeLog, - trunk/libgcrypt/libgcrypt/tests/Makefile.am, - trunk/libgcrypt/libgcrypt/tests/Makefile.in, - trunk/libgcrypt/libgcrypt/tests/ac.c, - trunk/libgcrypt/libgcrypt/tests/basic.c, - trunk/libgcrypt/libgcrypt/tests/benchmark.c, - trunk/libgcrypt/libgcrypt/tests/pubkey.c, - trunk/libgcrypt/libgcrypt/tests/random.c, - trunk/libgcrypt/libgcrypt/tests/t-mpi-bit.c, - trunk/libgcrypt/libgcrypt/tests/tsexp.c, - trunk/libgcrypt/libgcrypt/w32-dll/Makefile.in: Merge up to vendor - libgcrypt version 1.2.4. - -2008-02-17 22:06 fredm - - * trunk/FuseImporter/Info.plist, trunk/fuse/fusepb/Info-Fuse.plist, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add - entries for newly-supported tape and snap formats. - -2008-02-17 02:02 fredm - - * trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/README, - trunk/fuse/ay.c, trunk/fuse/compat/Makefile.am, - trunk/fuse/compat/win32/osname.c, trunk/fuse/configure.in, - trunk/fuse/disk/beta.c, trunk/fuse/disk/beta.h, - trunk/fuse/disk/disk.c, trunk/fuse/disk/disk.h, - trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, - trunk/fuse/disk/plusd.c, trunk/fuse/disk/plusd.h, - trunk/fuse/disk/wd_fdc.c, trunk/fuse/disk/wd_fdc.h, - trunk/fuse/display.c, trunk/fuse/divide.c, - trunk/fuse/fusepb/English.lproj/InfoPlist.strings, - trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/fuse/fusepb/Info-Fuse.plist, - trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/models/Emulator.h, - trunk/fuse/fusepb/models/Emulator.m, - trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx, - trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex, - trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, - trunk/fuse/fusepb/resources/Fuse Help/html/formats.html, - trunk/fuse/fusepb/resources/Fuse Help/html/menus.html, - trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html, - trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html, - trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m, - trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags, - trunk/fuse/hacking/tc2048_tech_notes.txt, trunk/fuse/if1.c, - trunk/fuse/if1.h, trunk/fuse/if2.c, trunk/fuse/input.c, - trunk/fuse/joystick.c, trunk/fuse/kempmouse.c, - trunk/fuse/keyboard.c, trunk/fuse/machine.c, - trunk/fuse/machines/Makefile.am, trunk/fuse/machines/machines.h, - trunk/fuse/machines/pentagon.c, trunk/fuse/machines/pentagon.h, - trunk/fuse/machines/pentagon1024.c, - trunk/fuse/machines/pentagon512.c, - trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c, - trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c, - trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c, - trunk/fuse/machines/specplus2.c, - trunk/fuse/machines/specplus2a.c, - trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h, - trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c, - trunk/fuse/machines/tc2068.c, trunk/fuse/machines/ts2068.c, - trunk/fuse/man/fuse.1, trunk/fuse/memory.c, trunk/fuse/menu.c, - trunk/fuse/menu.h, trunk/fuse/menu_data.dat, - trunk/fuse/menu_data.pl, trunk/fuse/module.c, - trunk/fuse/module.h, trunk/fuse/periph.c, trunk/fuse/periph.h, - trunk/fuse/printer.c, trunk/fuse/profile.c, trunk/fuse/scld.c, - trunk/fuse/settings.dat, trunk/fuse/settings.pl, - trunk/fuse/simpleide.c, trunk/fuse/slt.c, trunk/fuse/snapshot.c, - trunk/fuse/sound/alsasound.c, trunk/fuse/sound/sdlsound.c, - trunk/fuse/spectrum.c, trunk/fuse/spectrum.h, trunk/fuse/tape.c, - trunk/fuse/tape.h, trunk/fuse/ui.c, - trunk/fuse/ui/cocoa/cocoaui.m, trunk/fuse/ui/fb/fbdisplay.c, - trunk/fuse/ui/fb/fbmouse.c, trunk/fuse/ui/gtk/binary.c, - trunk/fuse/ui/gtk/confirm.c, trunk/fuse/ui/gtk/fileselector.c, - trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkui.c, - trunk/fuse/ui/gtk/pokefinder.c, trunk/fuse/ui/gtk/rollback.c, - trunk/fuse/ui/gtk/roms.c, trunk/fuse/ui/options.dat, - trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/ui.h, - trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/error.c, - trunk/fuse/ui/win32/win32internals.h, - trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ula.c, - trunk/fuse/utils.c, trunk/fuse/widget/browse.c, - trunk/fuse/widget/filesel.c, trunk/fuse/widget/menu.c, - trunk/fuse/widget/options.pl, trunk/fuse/widget/roms.c, - trunk/fuse/widget/widget.c, trunk/fuse/widget/widget.h, - trunk/fuse/widget/widget_internals.h, trunk/fuse/z80/coretest.c, - trunk/fuse/z80/tests/Makefile.am, trunk/fuse/z80/z80.c, - trunk/fuse/z80/z80.pl, trunk/fuse/z80/z80_macros.h, - trunk/fuse/z80/z80_ops.c, trunk/fuse/zxatasp.c, - trunk/fuse/zxcf.c: Merge up to vendor Fuse 0.9.0. - -2008-02-14 13:00 fredm - - * trunk/FuseGenerator/libspectrum.h, - trunk/FuseImporter/GetMetadataForFile.m, - trunk/FuseImporter/LibspectrumMetadataImporter.m, - trunk/FuseImporter/libspectrum.h, trunk/libspectrum/Info.plist, - trunk/libspectrum/libspectrum.h, - trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj, - trunk/libspectrum/libspectrum/COPYING, - trunk/libspectrum/libspectrum/ChangeLog, - trunk/libspectrum/libspectrum/Makefile.am, - trunk/libspectrum/libspectrum/README, - trunk/libspectrum/libspectrum/accessor.pl, - trunk/libspectrum/libspectrum/configure.in, - trunk/libspectrum/libspectrum/csw.c, - trunk/libspectrum/libspectrum/dll.c, - trunk/libspectrum/libspectrum/doc/cvs-tags, - trunk/libspectrum/libspectrum/doc/libspectrum.3, - trunk/libspectrum/libspectrum/doc/libspectrum.txt, - trunk/libspectrum/libspectrum/hacking/ChangeLog, - trunk/libspectrum/libspectrum/internals.h, - trunk/libspectrum/libspectrum/libspectrum.c, - trunk/libspectrum/libspectrum/libspectrum.h.in, - trunk/libspectrum/libspectrum/plusd.c, - trunk/libspectrum/libspectrum/sna.c, - trunk/libspectrum/libspectrum/snap_accessors.txt, - trunk/libspectrum/libspectrum/snapshot.c, - trunk/libspectrum/libspectrum/szx.c, - trunk/libspectrum/libspectrum/tap.c, - trunk/libspectrum/libspectrum/tape.c, - trunk/libspectrum/libspectrum/tape_block.c, - trunk/libspectrum/libspectrum/test/Makefile.am, - trunk/libspectrum/libspectrum/test/empty.csw, - trunk/libspectrum/libspectrum/test/sp-2000.sna.gz, - trunk/libspectrum/libspectrum/test/sp-ffff.sna.gz, - trunk/libspectrum/libspectrum/test/test.c, - trunk/libspectrum/libspectrum/timings.c, - trunk/libspectrum/libspectrum/z80.c: Merge up to vendor version - 0.4.0. - -2008-02-13 12:54 fredm - - * trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m: Fix the blocked - keyboard from Command-q (quit), Command-h (hide) and Command-m - (minimise) (fixes bug #1842577). - -2008-02-11 12:16 fredm - - * trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/views/DisplayOpenGLView.m: Clear stuck shortcut - keys for Command-{0,1,2,3,f,s,z,b,o,p,period}, still need - to handle Command-q (quit), Command-h (hide) and Command-m - (minimise). - -2008-02-10 20:47 fredm - - * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m: Make application - quit menu use performClose on the window, and switch exit - confirm dialog to windowShouldClose in DisplayOpenGLView (partial - fix to - bug #1842576). - -2007-12-21 02:42 fredm - - * trunk/FuseGenerator/LibspectrumSCRExtractor.m: Some SCREEN$ were - saved from places other than 16384 (presumably due to art - packages and the like). - -2007-12-21 00:16 fredm - - * trunk/FuseGenerator, trunk/FuseGenerator/English.lproj, - trunk/FuseGenerator/English.lproj/InfoPlist.strings, - trunk/FuseGenerator/FuseGenerator.xcodeproj, - trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj, - trunk/FuseGenerator/GeneratePreviewForURL.m, - trunk/FuseGenerator/GenerateThumbnailForURL.m, - trunk/FuseGenerator/Info.plist, - trunk/FuseGenerator/JWSpectrumScreen, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlock.h, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlock.m, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockIterator.h, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockIterator.m, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimex.h, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimex.m, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimexHiRes.h, - trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimexHiRes.m, - trunk/FuseGenerator/JWSpectrumScreen/AttributeManager.c, - trunk/FuseGenerator/JWSpectrumScreen/AttributeManager.h, - trunk/FuseGenerator/JWSpectrumScreen/ColourMacros.c, - trunk/FuseGenerator/JWSpectrumScreen/ColourMacros.h, - trunk/FuseGenerator/JWSpectrumScreen/English.lproj, - trunk/FuseGenerator/JWSpectrumScreen/English.lproj/InfoPlist.strings, - trunk/FuseGenerator/JWSpectrumScreen/Info.plist, - trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.h, - trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.m, - trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.xcodeproj, - trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.xcodeproj/project.pbxproj, - trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreenConstants.h, - trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen_Prefix.pch, - trunk/FuseGenerator/JWSpectrumScreen/PixelData.h, - trunk/FuseGenerator/JWSpectrumScreen/README, - trunk/FuseGenerator/LibspectrumSCRExtractor.h, - trunk/FuseGenerator/LibspectrumSCRExtractor.m, - trunk/FuseGenerator/config.h, trunk/FuseGenerator/generate.pl, - trunk/FuseGenerator/libspectrum, - trunk/FuseGenerator/libspectrum.h, trunk/FuseGenerator/main.c, - trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj, - trunk/README, trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: - Add QuickLook generator for Speccy-related files, thanks to James - Weatherley for - JWSpectrumScreen that makes it all possible. - -2007-12-20 11:04 fredm - - * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: Spotlight - importer should be in Contents/Library/Spotlight, not PlugIns - -2007-11-17 11:17 fredm - - * trunk/fuse/fusepb/resources/Fuse.icns: Add 512x512px icon for - Fuse. - -2007-11-17 07:49 fredm - - * trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add - some extra change entries. - -2007-11-16 23:51 fredm - - * trunk/fuse/fusepb/Info-Fuse.plist: Increment version number to - reflect merge state. - -2007-11-16 23:49 fredm - - * trunk/FuseImporter/libspectrum.h, - trunk/audiofile/audiofile.xcodeproj/project.pbxproj, - trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/ay.c, - trunk/fuse/bitmap.h, trunk/fuse/compat.h, - trunk/fuse/compat/Makefile.am, - trunk/fuse/compat/amiga/Makefile.am, - trunk/fuse/compat/amiga/paths.c, - trunk/fuse/compat/morphos/Makefile.am, - trunk/fuse/compat/morphos/osname.c, - trunk/fuse/compat/unix/Makefile.am, - trunk/fuse/compat/unix/osname.c, trunk/fuse/compat/unix/paths.c, - trunk/fuse/compat/win32/Makefile.am, - trunk/fuse/compat/win32/osname.c, - trunk/fuse/compat/win32/paths.c, trunk/fuse/configure.in, - trunk/fuse/debugger/Makefile.am, - trunk/fuse/debugger/breakpoint.c, trunk/fuse/debugger/command.c, - trunk/fuse/debugger/commandy.y, trunk/fuse/debugger/debugger.c, - trunk/fuse/debugger/debugger_internals.h, - trunk/fuse/debugger/disassemble.c, - trunk/fuse/debugger/expression.c, trunk/fuse/disk/Makefile.am, - trunk/fuse/disk/beta.c, trunk/fuse/disk/beta.h, - trunk/fuse/disk/crc.c, trunk/fuse/disk/crc.h, - trunk/fuse/disk/disk.c, trunk/fuse/disk/disk.h, - trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, - trunk/fuse/disk/plusd.c, trunk/fuse/disk/plusd.h, - trunk/fuse/disk/wd1770.c, trunk/fuse/disk/wd1770.h, - trunk/fuse/disk/wd_fdc.c, trunk/fuse/disk/wd_fdc.h, - trunk/fuse/divide.c, trunk/fuse/event.c, trunk/fuse/event.h, - trunk/fuse/fuse.cpp, - trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/fuse/fusepb/Makefile, - trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m, - trunk/fuse/fusepb/models/Emulator.h, - trunk/fuse/fusepb/models/Emulator.m, - trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, - trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib, - trunk/fuse/fusepb/nibs/Preferences.nib/info.nib, - trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m, - trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags, - trunk/fuse/if1.c, trunk/fuse/if2.c, trunk/fuse/keyboard.h, - trunk/fuse/keysyms.pl, trunk/fuse/lib/Makefile.am, - trunk/fuse/machine.c, trunk/fuse/machines/Makefile.am, - trunk/fuse/machines/machines.h, trunk/fuse/machines/pentagon.c, - trunk/fuse/machines/pentagon1024.c, - trunk/fuse/machines/pentagon512.c, - trunk/fuse/machines/scorpion.c, trunk/fuse/machines/scorpion.h, - trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec128.h, - trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c, - trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c, - trunk/fuse/machines/specplus2.c, - trunk/fuse/machines/specplus2a.c, - trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h, - trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c, - trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h, - trunk/fuse/machines/ts2068.c, trunk/fuse/man/fuse.1, - trunk/fuse/memory.h, trunk/fuse/menu.c, trunk/fuse/menu_data.dat, - trunk/fuse/menu_data.pl, trunk/fuse/periph.c, - trunk/fuse/periph.h, trunk/fuse/pokefinder/Makefile.am, - trunk/fuse/pokefinder/pokefinder.c, trunk/fuse/printer.c, - trunk/fuse/profile.c, trunk/fuse/profile.h, - trunk/fuse/roms/Makefile.am, trunk/fuse/roms/gluck.rom, - trunk/fuse/roms/plus3e-0.rom, trunk/fuse/roms/plus3e-1.rom, - trunk/fuse/roms/plus3e-2.rom, trunk/fuse/rzx.c, - trunk/fuse/settings.dat, trunk/fuse/settings.pl, - trunk/fuse/snapshot.c, trunk/fuse/sound.c, - trunk/fuse/sound/Makefile.am, trunk/fuse/sound/alsasound.c, - trunk/fuse/sound/aosound.c, trunk/fuse/sound/dxsound.c, - trunk/fuse/sound/hpsound.c, trunk/fuse/sound/nullsound.c, - trunk/fuse/sound/osssound.c, trunk/fuse/sound/sdlsound.c, - trunk/fuse/sound/sfifo.c, trunk/fuse/sound/sunsound.c, - trunk/fuse/spectrum.h, trunk/fuse/tape.c, - trunk/fuse/timer/Makefile.am, trunk/fuse/timer/timer.c, - trunk/fuse/timer/unix.c, trunk/fuse/trdos.c, trunk/fuse/trdos.h, - trunk/fuse/ui.c, trunk/fuse/ui/Makefile.am, - trunk/fuse/ui/cocoa/cocoaui.m, trunk/fuse/ui/fb/Makefile.am, - trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/fb/fbjoystick.c, - trunk/fuse/ui/fb/fbkeyboard.c, trunk/fuse/ui/fb/fbmouse.c, - trunk/fuse/ui/fb/fbui.c, trunk/fuse/ui/ggi, - trunk/fuse/ui/gtk/Makefile.am, trunk/fuse/ui/gtk/binary.c, - trunk/fuse/ui/gtk/browse.c, trunk/fuse/ui/gtk/confirm.c, - trunk/fuse/ui/gtk/debugger.c, trunk/fuse/ui/gtk/fileselector.c, - trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/gtk/gtkjoystick.c, - trunk/fuse/ui/gtk/gtkkeyboard.c, trunk/fuse/ui/gtk/gtkmouse.c, - trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/gtk/memory.c, - trunk/fuse/ui/gtk/options-header.pl, - trunk/fuse/ui/gtk/options.pl, trunk/fuse/ui/gtk/picture.c, - trunk/fuse/ui/gtk/pokefinder.c, trunk/fuse/ui/gtk/rollback.c, - trunk/fuse/ui/gtk/roms.c, trunk/fuse/ui/gtk/statusbar.c, - trunk/fuse/ui/options.dat, trunk/fuse/ui/scaler/Makefile.am, - trunk/fuse/ui/scaler/scaler.c, trunk/fuse/ui/scaler/scalers.cpp, - trunk/fuse/ui/sdl/Makefile.am, trunk/fuse/ui/sdl/sdldisplay.c, - trunk/fuse/ui/sdl/sdljoystick.c, trunk/fuse/ui/sdl/sdlkeyboard.c, - trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/svga/Makefile.am, - trunk/fuse/ui/svga/svgadisplay.c, - trunk/fuse/ui/svga/svgajoystick.c, - trunk/fuse/ui/svga/svgakeyboard.c, trunk/fuse/ui/svga/svgaui.c, - trunk/fuse/ui/ui.h, trunk/fuse/ui/uijoystick.c, - trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/debugger.c, - trunk/fuse/ui/win32/error.c, trunk/fuse/ui/win32/menu_data.c, - trunk/fuse/ui/win32/menu_data.h, - trunk/fuse/ui/win32/menu_data.rc, - trunk/fuse/ui/win32/options-header.pl, - trunk/fuse/ui/win32/options-resource.pl, - trunk/fuse/ui/win32/options.pl, trunk/fuse/ui/win32/pokefinder.c, - trunk/fuse/ui/win32/statusbar.c, - trunk/fuse/ui/win32/win32display.c, - trunk/fuse/ui/win32/win32display.h, - trunk/fuse/ui/win32/win32internals.h, - trunk/fuse/ui/win32/win32keyboard.c, - trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/xlib/Makefile.am, - trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/ui/xlib/xerror.c, - trunk/fuse/ui/xlib/xjoystick.c, trunk/fuse/ui/xlib/xkeyboard.c, - trunk/fuse/ui/xlib/xui.c, trunk/fuse/utils.c, trunk/fuse/utils.h, - trunk/fuse/widget/Makefile.am, trunk/fuse/widget/browse.c, - trunk/fuse/widget/debugger.c, trunk/fuse/widget/error.c, - trunk/fuse/widget/filesel.c, trunk/fuse/widget/memory.c, - trunk/fuse/widget/menu.c, trunk/fuse/widget/options.pl, - trunk/fuse/widget/picture.c, trunk/fuse/widget/pokefinder.c, - trunk/fuse/widget/query.c, trunk/fuse/widget/roms.c, - trunk/fuse/widget/select.c, trunk/fuse/widget/text.c, - trunk/fuse/widget/widget.c, trunk/fuse/widget/widget.h, - trunk/fuse/widget/widget_internals.h, trunk/fuse/z80/Makefile.am, - trunk/fuse/z80/coretest.c, trunk/fuse/z80/z80.c, - trunk/fuse/z80/z80.pl, trunk/fuse/z80/z80_checks.h, - trunk/fuse/z80/z80_ops.c, trunk/libspectrum/libspectrum.h, - trunk/libspectrum/libspectrum/ChangeLog, - trunk/libspectrum/libspectrum/Makefile.am, - trunk/libspectrum/libspectrum/configure.in, - trunk/libspectrum/libspectrum/csw.c, - trunk/libspectrum/libspectrum/doc/libspectrum.txt, - trunk/libspectrum/libspectrum/generate.pl.in, - trunk/libspectrum/libspectrum/hacking/ChangeLog, - trunk/libspectrum/libspectrum/libspectrum.c, - trunk/libspectrum/libspectrum/libspectrum.h.in, - trunk/libspectrum/libspectrum/plusd.c, - trunk/libspectrum/libspectrum/rzx.c, - trunk/libspectrum/libspectrum/sna.c, - trunk/libspectrum/libspectrum/szx.c, - trunk/libspectrum/libspectrum/tape.c, - trunk/libspectrum/libspectrum/test/Makefile.am, - trunk/libspectrum/libspectrum/test/complete-tzx.pl, - trunk/libspectrum/libspectrum/test/edges.c, - trunk/libspectrum/libspectrum/test/invalid-warajevo-blockoffset.tap, - trunk/libspectrum/libspectrum/test/jump.tzx, - trunk/libspectrum/libspectrum/test/loop2.tzx, - trunk/libspectrum/libspectrum/test/test.c, - trunk/libspectrum/libspectrum/test/test.h, - trunk/libspectrum/libspectrum/test/test15.c, - trunk/libspectrum/libspectrum/timings.c, - trunk/libspectrum/libspectrum/z80.c: Merge up to vendor r3254. - -2007-11-09 23:10 fredm - - * trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj, - trunk/audiofile/audiofile.xcodeproj/project.pbxproj, trunk/bzip2, - trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/lib765/lib765.xcodeproj/project.pbxproj, - trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj, - trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj: Move to - XCode 2.5 and 10.4 target for all frameworks. Link to libbz2 in - /usr/lib instead of framework. - -2007-11-09 22:38 fredm - - * trunk/fuse/TODO: Update for last few changes. - -2007-08-15 23:23 fredm - - * trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, - trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib: Disable - Tape->Record menu item when tape traps are enabled. - -2007-08-14 14:04 fredm - - * trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m, - trunk/fuse/settings.dat: Refactor display link starting and - stopping and try to only stop and start the - display link at appropriate times, add support for panoramic - fullscreen mode. - -2007-08-12 05:49 fredm - - * trunk/fuse/fusepb/controllers/PreferencesController.m, - trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, - trunk/fuse/fusepb/views/DisplayOpenGLView.h, - trunk/fuse/fusepb/views/DisplayOpenGLView.m, - trunk/fuse/settings.dat, trunk/fuse/ui/cocoa/cocoadisplay.m: - Rollback revision 434 now we understand what was causing the - texture - distortion. - -2007-08-12 00:30 fredm - - * trunk/fuse/fusepb/views/DisplayOpenGLView.m: Use correct offset - for emulator top right texture. - -2007-08-06 02:39 fredm - - * trunk/lib765/lib765/config.h, trunk/lib765/libdsk/config.h: Bump - version numbers in config.h headers. - -2007-08-06 02:24 fredm - - * trunk/fuse/Makefile.am, trunk/fuse/compat.h, - trunk/fuse/compat/Makefile.am, trunk/fuse/compat/amiga, - trunk/fuse/compat/amiga/Makefile.am, - trunk/fuse/compat/amiga/paths.c, trunk/fuse/compat/dirname.c, - trunk/fuse/compat/getopt.c, trunk/fuse/compat/getopt1.c, - trunk/fuse/compat/mkstemp.c, trunk/fuse/compat/morphos, - trunk/fuse/compat/morphos/Makefile.am, - trunk/fuse/compat/morphos/osname.c, trunk/fuse/compat/unix, - trunk/fuse/compat/unix/Makefile.am, - trunk/fuse/compat/unix/osname.c, trunk/fuse/compat/unix/paths.c, - trunk/fuse/compat/win32, trunk/fuse/compat/win32/Makefile.am, - trunk/fuse/compat/win32/osname.c, - trunk/fuse/compat/win32/paths.c, trunk/fuse/configure.in, - trunk/fuse/event.c, trunk/fuse/fuse.cpp, - trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, - trunk/fuse/fusepb/Info-Fuse.plist, trunk/fuse/fusepb/config.h, - trunk/fuse/hacking/ChangeLog, trunk/fuse/machines/tc2048.c, - trunk/fuse/menu_data.pl, trunk/fuse/printer.c, trunk/fuse/rzx.c, - trunk/fuse/settings.pl, trunk/fuse/sound.c, - trunk/fuse/sound/Makefile.am, trunk/fuse/sound/alsasound.c, - trunk/fuse/sound/aosound.c, trunk/fuse/sound/coreaudiosound.c, - trunk/fuse/sound/dxsound.c, trunk/fuse/sound/hpsound.c, - trunk/fuse/sound/lowlevel.h, trunk/fuse/sound/nullsound.c, - trunk/fuse/sound/osssound.c, trunk/fuse/sound/sdlsound.c, - trunk/fuse/sound/sfifo.c, trunk/fuse/sound/sunsound.c, - trunk/fuse/spectrum.c, trunk/fuse/tape.c, trunk/fuse/tape.h, - trunk/fuse/timer, trunk/fuse/timer.c, trunk/fuse/timer.h, - trunk/fuse/timer/Makefile.am, trunk/fuse/timer/sdl.c, - trunk/fuse/timer/timer.c, trunk/fuse/timer/timer.h, - trunk/fuse/timer/unix.c, trunk/fuse/timer/win32.c, - trunk/fuse/trdos.c, trunk/fuse/ui/gtk/debugger.c, - trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkmouse.c, - trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/gtk/pokefinder.c, - trunk/fuse/ui/gtk/stock.c, trunk/fuse/ula.c, trunk/fuse/utils.c, - trunk/fuse/widget/widget.c, trunk/fuse/z80/coretest.c: Merge up - to vendor revision 3095. - -2007-08-06 01:11 fredm - - * trunk/lib765/Info.plist, trunk/lib765/config.h, - trunk/lib765/lib765.xcodeproj/project.pbxproj, - trunk/lib765/lib765/ChangeLog, trunk/lib765/lib765/configure, - trunk/lib765/lib765/configure.in, - trunk/lib765/lib765/lib/765ldsk.c, - trunk/lib765/lib765/lib/Makefile.am, - trunk/lib765/lib765/lib/Makefile.in, - trunk/lib765/libdsk/ChangeLog, trunk/lib765/libdsk/configure, - trunk/lib765/libdsk/configure.in, - trunk/lib765/libdsk/doc/libdsk.lyx, - trunk/lib765/libdsk/doc/libdsk.pdf, - trunk/lib765/libdsk/doc/libdsk.txt, - trunk/lib765/libdsk/dos16ppd/Makefile, - trunk/lib765/libdsk/dos32gcc/Makefile, - trunk/lib765/libdsk/include/libdsk.h, - trunk/lib765/libdsk/lib/Makefile.am, - trunk/lib765/libdsk/lib/Makefile.in, - trunk/lib765/libdsk/lib/drivers.h, - trunk/lib765/libdsk/lib/drivers.inc, - trunk/lib765/libdsk/lib/drvlogi.c, - trunk/lib765/libdsk/lib/drvlogi.h, - trunk/lib765/libdsk/lib/drvtele.c, - trunk/lib765/libdsk/lib/drvtele.h, - trunk/lib765/libdsk/lib/dsksgeom.c, - trunk/lib765/libdsk/man/apriboot.1, - trunk/lib765/libdsk/man/dskdump.1, - trunk/lib765/libdsk/man/dskform.1, - trunk/lib765/libdsk/man/dskid.1, - trunk/lib765/libdsk/man/dskscan.1, - trunk/lib765/libdsk/man/dsktrans.1, - trunk/lib765/libdsk/man/dskutil.1, - trunk/lib765/libdsk/man/md3serial.1, - trunk/lib765/libdsk/tools/dsktrans.c, - trunk/lib765/libdsk/win16bc5/libdsk.ide, - trunk/lib765/libdsk/win16vc1/LIBDSK16.MAK, - trunk/lib765/libdsk/win32bc5/libdsk.ide, - trunk/lib765/libdsk/win32vc6/atlibdsk.dsp, - trunk/lib765/libdsk/win32vc6/atlibdsk.h, - trunk/lib765/libdsk/win32vc6/atlibdsk_i.c, - trunk/lib765/libdsk/win32vc6/atlibdsk_p.c, - trunk/lib765/libdsk/win32vc6/libdsk.dsp: Merge up to vendor - libdsk-1.1.14 and lib765-0.4.1. - -2007-08-03 10:15 fredm - - * trunk/fuse/fusepb/controllers/FuseController.h, - trunk/fuse/fusepb/controllers/FuseController.m: Remove obsolete - key release methods. - -2007-07-28 12:44 fredm - - * trunk/fuse/fusepb/views/DisplayOpenGLView.m: Don't run the - display link when the emulator is paused or we don't have a - screen - texture initialised. - -2007-07-28 03:39 fredm - - * trunk/fuse/ChangeLog, trunk/fuse/configure.in, - trunk/fuse/disk/Makefile.am, trunk/fuse/disk/plusd.c, - trunk/fuse/disk/plusd.h, trunk/fuse/disk/wd1770.c, - trunk/fuse/disk/wd1770.h, trunk/fuse/divide.c, - trunk/fuse/fusepb/English.lproj/InfoPlist.strings, - trunk/fuse/fusepb/Info-Fuse.plist, trunk/fuse/fusepb/config.h, - trunk/fuse/hacking/ChangeLog, trunk/fuse/if1.c, trunk/fuse/if2.c, - trunk/fuse/joystick.c, trunk/fuse/kempmouse.c, - trunk/fuse/keyboard.c, trunk/fuse/machines/specplus3.c, - trunk/fuse/memory.c, trunk/fuse/module.c, trunk/fuse/module.h, - trunk/fuse/periph.c, trunk/fuse/printer.c, trunk/fuse/scld.c, - trunk/fuse/simpleide.c, trunk/fuse/sound/alsasound.c, - trunk/fuse/sound/sfifo.c, trunk/fuse/tape.c, - trunk/fuse/ui/ggi/ggi_internals.h, - trunk/fuse/ui/ggi/ggidisplay.c, trunk/fuse/ui/ggi/ggikeyboard.c, - trunk/fuse/ui/ggi/ggiui.c, trunk/fuse/ui/gtk/browse.c, - trunk/fuse/ui/gtk/debugger.c, trunk/fuse/ui/gtk/gtkjoystick.c, - trunk/fuse/ui/gtk/gtkmouse.c, trunk/fuse/ui/gtk/gtkui.c, - trunk/fuse/ui/gtk/pokefinder.c, trunk/fuse/ui/gtk/rollback.c, - trunk/fuse/ui/win32/debugger.c, trunk/fuse/ui/win32/error.c, - trunk/fuse/ui/win32/icons/Makefile.am, - trunk/fuse/ui/win32/menu_data.c, trunk/fuse/ui/win32/menu_data.h, - trunk/fuse/ui/win32/menu_data.rc, - trunk/fuse/ui/win32/statusbar.c, - trunk/fuse/ui/win32/win32display.c, - trunk/fuse/ui/win32/win32display.h, - trunk/fuse/ui/win32/win32ui.c, trunk/fuse/utils.c, - trunk/fuse/utils.h, trunk/fuse/z80/Makefile.am, - trunk/fuse/z80/coretest.c, trunk/fuse/z80/harness.pl, - trunk/fuse/z80/tests/00.in, trunk/fuse/z80/tests/00.out, - trunk/fuse/z80/tests/01.in, trunk/fuse/z80/tests/01.out, - trunk/fuse/z80/tests/02.in, trunk/fuse/z80/tests/02.out, - trunk/fuse/z80/tests/03.in, trunk/fuse/z80/tests/03.out, - trunk/fuse/z80/tests/04.in, trunk/fuse/z80/tests/04.out, - trunk/fuse/z80/tests/05.in, trunk/fuse/z80/tests/05.out, - trunk/fuse/z80/tests/06.in, trunk/fuse/z80/tests/06.out, - trunk/fuse/z80/tests/07.in, trunk/fuse/z80/tests/07.out, - trunk/fuse/z80/tests/08.in, trunk/fuse/z80/tests/08.out, - trunk/fuse/z80/tests/09.in, trunk/fuse/z80/tests/09.out, - ... [truncated message content] |
From: <fr...@us...> - 2008-12-09 12:08:38
|
Revision: 565 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=565&view=rev Author: fredm Date: 2008-12-09 12:08:31 +0000 (Tue, 09 Dec 2008) Log Message: ----------- Migrate to XCode 3.1 and set base targets to 10.4. Add x86_64 build of QuickLook viewer. Remove some warnings and fix sorting of ROMs array in preferences controller. Modified Paths: -------------- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj trunk/FuseGenerator/LibspectrumSCRExtractor.m trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj trunk/audiofile/audiofile.xcodeproj/project.pbxproj trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj trunk/fuse/fusepb/controllers/DebuggerController.m trunk/fuse/fusepb/controllers/FuseController.m trunk/fuse/settings.pl trunk/fuse/utils.c trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj =================================================================== --- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565) @@ -472,7 +472,7 @@ "-lz", ); PRODUCT_NAME = FuseGenerator; - VALID_ARCHS = "i386 ppc"; + VALID_ARCHS = "ppc x86_64 i386"; WRAPPER_EXTENSION = qlgenerator; ZERO_LINK = YES; }; @@ -496,7 +496,7 @@ "-lz", ); PRODUCT_NAME = FuseGenerator; - VALID_ARCHS = "i386 ppc"; + VALID_ARCHS = "ppc x86_64 i386"; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", @@ -509,8 +509,11 @@ 2CA326230896AD4900168862 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64"; DEAD_CODE_STRIPPING = YES; GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; @@ -521,12 +524,11 @@ 2CA326240896AD4900168862 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64"; DEAD_CODE_STRIPPING = YES; GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; Modified: trunk/FuseGenerator/LibspectrumSCRExtractor.m =================================================================== --- trunk/FuseGenerator/LibspectrumSCRExtractor.m 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/FuseGenerator/LibspectrumSCRExtractor.m 2008-12-09 12:08:31 UTC (rev 565) @@ -442,7 +442,7 @@ scr_length ); } - scrData = [NSData dataWithBytesNoCopy:(const void *)scr_data length:scr_length]; + scrData = [NSData dataWithBytesNoCopy:(void *)scr_data length:scr_length]; image_type = TYPE_SCR; } Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj =================================================================== --- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565) @@ -436,10 +436,6 @@ B6B0E2FD08CC65D5001D8411 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; FRAMEWORK_SEARCH_PATHS = ""; @@ -461,8 +457,6 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Library/Spotlight; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.4; - OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-lbz2", @@ -485,10 +479,6 @@ B6B0E2FE08CC65D5001D8411 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -501,7 +491,6 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Library/Spotlight; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-lbz2", @@ -524,10 +513,6 @@ B6B0E2FF08CC65D5001D8411 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -538,7 +523,6 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Library/Spotlight; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-lbz2", @@ -561,7 +545,10 @@ B6B0E30108CC65D5001D8411 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = 4.0; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; @@ -569,8 +556,11 @@ B6B0E30208CC65D5001D8411 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; + GCC_VERSION = 4.0; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; @@ -578,7 +568,10 @@ B6B0E30308CC65D5001D8411 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = 4.0; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj =================================================================== --- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565) @@ -134,7 +134,7 @@ 000000000000000016620A20 /* units.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = units.h; sourceTree = "<group>"; }; 000000000000000016620B50 /* util.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; }; 000000000000000016620BD0 /* wave.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wave.h; sourceTree = "<group>"; }; - B62395C00C1CF586003B8E87 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; }; + B62395C00C1CF586003B8E87 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; B62395C10C1CF586003B8E87 /* audiofile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = audiofile.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B62395C80C1CF5AC003B8E87 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -303,9 +303,11 @@ 000000000000000016601A90 /* Project object */ = { isa = PBXProject; buildConfigurationList = B62395470C1CF4F8003B8E87 /* Build configuration list for PBXProject "audiofile" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 0000000000000000166142F0; projectDirPath = ""; + projectRoot = ""; targets = ( B623958A0C1CF586003B8E87 /* audiofile Framework */, ); @@ -390,13 +392,12 @@ B62395480C1CF4F8003B8E87 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = NO; FRAMEWORK_VERSION = 0.2.6; + GCC_VERSION = 4.0; MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; @@ -405,13 +406,12 @@ B62395490C1CF4F8003B8E87 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; FRAMEWORK_VERSION = 0.2.6; + GCC_VERSION = 4.0; MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; @@ -420,13 +420,12 @@ B623954A0C1CF4F8003B8E87 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = NO; FRAMEWORK_VERSION = 0.2.6; + GCC_VERSION = 4.0; MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; @@ -435,6 +434,8 @@ B62395BD0C1CF586003B8E87 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1.2; @@ -460,11 +461,10 @@ OTHER_LDFLAGS = ( "-lm", "-lc", - "-seg1addr", - 0x27000000, ); OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = audiofile; SECTORDER_FLAGS = ""; @@ -477,6 +477,8 @@ B62395BE0C1CF586003B8E87 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1.2; @@ -501,11 +503,10 @@ OTHER_LDFLAGS = ( "-lm", "-lc", - "-seg1addr", - 0x27000000, ); OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = audiofile; SECTORDER_FLAGS = ""; @@ -518,6 +519,8 @@ B62395BF0C1CF586003B8E87 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1.2; FRAMEWORK_VERSION = 0.2.6; @@ -540,11 +543,10 @@ OTHER_LDFLAGS = ( "-lm", "-lc", - "-seg1addr", - 0x27000000, ); OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = audiofile; SECTORDER_FLAGS = ""; Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj =================================================================== --- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565) @@ -314,7 +314,7 @@ B615BFE60B4261E50082D535 /* HIDJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = HIDJoysticks.m; path = content_arrays/HIDJoysticks.m; sourceTree = "<group>"; }; B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; }; B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.bundle"; name = FuseGenerator.qlgenerator; path = ../../FuseGenerator/build/Release/FuseGenerator.qlgenerator; sourceTree = SOURCE_ROOT; }; - B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; }; + B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; }; B61F46AA09121DF200C8096C /* Fuse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fuse.app; sourceTree = BUILT_PRODUCTS_DIR; }; B621A11E062E92FB00F63DBC /* if2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = if2.c; path = ../if2.c; sourceTree = SOURCE_ROOT; }; B621A11F062E92FB00F63DBC /* if2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = if2.h; path = ../if2.h; sourceTree = SOURCE_ROOT; }; @@ -1268,9 +1268,11 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* Fuse */; projectDirPath = ""; + projectRoot = ""; targets = ( B61F459009121DF100C8096C /* Fuse */, ); @@ -1515,10 +1517,6 @@ B61F46A609121DF100C8096C /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(HOME)/Library/Frameworks", @@ -1558,10 +1556,6 @@ B61F46A709121DF100C8096C /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( "$(HOME)/Library/Frameworks", @@ -1600,10 +1594,6 @@ B61F46A809121DF100C8096C /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); FRAMEWORK_SEARCH_PATHS = ( "$(HOME)/Library/Frameworks", ../../libspectrum/build/Deployment, @@ -1641,13 +1631,13 @@ B63319B4086803BA00732AA3 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_AUTO_VECTORIZATION = NO; GCC_DYNAMIC_NO_PIC = YES; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; YACCFLAGS = "-d"; @@ -1659,14 +1649,14 @@ B63319B5086803BA00732AA3 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; + GCC_AUTO_VECTORIZATION = NO; GCC_DYNAMIC_NO_PIC = YES; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; YACCFLAGS = "-d"; @@ -1678,13 +1668,13 @@ B63319B6086803BA00732AA3 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_AUTO_VECTORIZATION = NO; GCC_DYNAMIC_NO_PIC = YES; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; YACCFLAGS = "-d"; Modified: trunk/fuse/fusepb/controllers/DebuggerController.m =================================================================== --- trunk/fuse/fusepb/controllers/DebuggerController.m 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/fuse/fusepb/controllers/DebuggerController.m 2008-12-09 12:08:31 UTC (rev 565) @@ -482,7 +482,7 @@ - (IBAction)debugger_cmd_evaluate:(id)sender { - debugger_command_evaluate( [[entry stringValue] lossyCString] ); + debugger_command_evaluate( [[entry stringValue] UTF8String] ); } - (IBAction)debugger_done_step:(id)sender Modified: trunk/fuse/fusepb/controllers/FuseController.m =================================================================== --- trunk/fuse/fusepb/controllers/FuseController.m 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/fuse/fusepb/controllers/FuseController.m 2008-12-09 12:08:31 UTC (rev 565) @@ -963,13 +963,13 @@ NSPoint point; event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0 - timestamp:nil windowNumber:0 context:nil characters:character + timestamp:0 windowNumber:0 context:nil characters:character charactersIgnoringModifiers:character isARepeat:NO keyCode:keyCode]; [NSApp postEvent:event1 atStart:NO]; event2 = [NSEvent keyEventWithType:NSFlagsChanged location:point - modifierFlags:0 timestamp:nil windowNumber:0 context:nil + modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:nil charactersIgnoringModifiers:nil isARepeat:NO keyCode:0]; [NSApp postEvent:event2 atStart:NO]; @@ -991,7 +991,7 @@ NSPoint point; event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0 - timestamp:nil windowNumber:0 context:nil characters:@" " + timestamp:0 windowNumber:0 context:nil characters:@" " charactersIgnoringModifiers:@" " isARepeat:NO keyCode:keyCode]; [NSApp postEvent:event1 atStart:NO]; } @@ -1276,7 +1276,7 @@ @"Stop Recording"]; } -- (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem +- (BOOL)validateMenuItem:(NSMenuItem*)menuItem { switch( [menuItem tag] ) { case 1: Modified: trunk/fuse/settings.pl =================================================================== --- trunk/fuse/settings.pl 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/fuse/settings.pl 2008-12-09 12:08:31 UTC (rev 565) @@ -607,6 +607,24 @@ print hashline( __LINE__ ), << 'CODE'; +/* Comparison function to sort the machineroms array */ +int +machineroms_compare( id dict1, id dict2, void *context ) +{ + NSMutableDictionary *roms1 = (NSMutableDictionary*)dict1; + NSMutableDictionary *roms2 = (NSMutableDictionary*)dict2; + int index1 = machine_get_index( [[roms1 valueForKey:@"machine"] machineType] ); + int index2 = machine_get_index( [[roms2 valueForKey:@"machine"] machineType] ); + int retval = NSOrderedSame; + if( index1 > index2 ) { + retval = NSOrderedDescending; + } else if( index1 < index2 ) { + retval = NSOrderedAscending; + } + + return retval; +} + /* Fill a NSMutableArray with rom information suitable for use with Cocoa bindings */ NSMutableArray* @@ -642,14 +660,8 @@ print hashline( __LINE__ ), << 'CODE'; /* We assume that we got all machines in the array, this should always be true*/ - NSEnumerator *enumerator = [machineroms objectEnumerator]; - while ( ( roms = [enumerator nextObject] ) ) { - int index = machine_get_index( [[roms valueForKey:@"machine"] machineType] ); - int i = [machineroms indexOfObject:roms]; - if( i != index ) { - [machineroms exchangeObjectAtIndex:i withObjectAtIndex:index]; - } - } + [machineroms sortUsingFunction:machineroms_compare context:nil]; + return machineroms; } CODE Modified: trunk/fuse/utils.c =================================================================== --- trunk/fuse/utils.c 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/fuse/utils.c 2008-12-09 12:08:31 UTC (rev 565) @@ -253,7 +253,7 @@ resource_url, file, false); if (file_url == NULL) goto deallocate; - if (!CFURLGetFileSystemRepresentation (file_url, TRUE, path, + if (!CFURLGetFileSystemRepresentation (file_url, TRUE, (unsigned char*)path, PATH_MAX)) goto deallocate; deallocate: Modified: trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj =================================================================== --- trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565) @@ -138,7 +138,7 @@ 000000000000000016430580 /* mpi-inv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "mpi-inv.c"; sourceTree = "<group>"; }; 000000000000000016430A90 /* dsa.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = dsa.c; sourceTree = "<group>"; }; 000000000000000016430DB0 /* module.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = module.c; sourceTree = "<group>"; }; - B61D2B3C0A59ED5F0008B6CC /* Info-gcrypt.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-gcrypt.plist"; sourceTree = "<group>"; }; + B61D2B3C0A59ED5F0008B6CC /* Info-gcrypt.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-gcrypt.plist"; sourceTree = "<group>"; }; B61D2B3D0A59ED5F0008B6CC /* gcrypt.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = gcrypt.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B69AFF390A5BFD0F00EEA5ED /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -357,9 +357,11 @@ 00000000000000001640F4D0 /* Project object */ = { isa = PBXProject; buildConfigurationList = B61D2B3F0A59ED600008B6CC /* Build configuration list for PBXProject "libgcrypt" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 00000000000000001640F560; projectDirPath = ""; + projectRoot = ""; targets = ( B61D2B040A59ED5F0008B6CC /* gcrypt Framework */, ); @@ -467,9 +469,9 @@ ); INFOPLIST_FILE = "Info-gcrypt.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = gcrypt; SECTORDER_FLAGS = ""; @@ -502,9 +504,9 @@ ); INFOPLIST_FILE = "Info-gcrypt.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = gcrypt; SECTORDER_FLAGS = ""; @@ -535,9 +537,9 @@ ); INFOPLIST_FILE = "Info-gcrypt.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = gcrypt; SECTORDER_FLAGS = ""; @@ -549,11 +551,11 @@ B61D2B400A59ED600008B6CC /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = 4.0; + PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; @@ -561,12 +563,12 @@ B61D2B410A59ED600008B6CC /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; + GCC_VERSION = 4.0; + PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; @@ -574,11 +576,11 @@ B61D2B420A59ED600008B6CC /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = 4.0; + PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; Modified: trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj =================================================================== --- trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564) +++ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565) @@ -123,7 +123,7 @@ B67099A00A6B4EA700CA951F /* z80em.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = z80em.c; sourceTree = "<group>"; }; B6BF2A9A0A60023100D16624 /* libspectrum.h.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = libspectrum.h.in; sourceTree = "<group>"; }; B6BF2AA40A6005E800D16624 /* libspectrum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = libspectrum.h; sourceTree = SOURCE_ROOT; }; - B6CBAD780A5F3C2900F826D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; }; + B6CBAD780A5F3C2900F826D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; B6CBAD790A5F3C2900F826D6 /* spectrum.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = spectrum.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B6CBADB70A5F3F3400F826D6 /* gcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = gcrypt.framework; path = ../libgcrypt/build/Deployment/gcrypt.framework; sourceTree = SOURCE_ROOT; }; B6CBAE200A5FDDC700F826D6 /* snap_accessors.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = snap_accessors.txt; sourceTree = "<group>"; }; @@ -275,9 +275,11 @@ 000000000000000016410950 /* Project object */ = { isa = PBXProject; buildConfigurationList = B69A010D0A5F3BF500EEA5ED /* Build configuration list for PBXProject "libspectrum" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 0000000000000000164109E0; projectDirPath = ""; + projectRoot = ""; targets = ( B6CBAD510A5F3C2900F826D6 /* spectrum Framework */, ); @@ -353,11 +355,10 @@ B69A010E0A5F3BF500EEA5ED /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = 4.0; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; @@ -365,12 +366,11 @@ B69A010F0A5F3BF500EEA5ED /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; + GCC_VERSION = 4.0; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; @@ -378,11 +378,10 @@ B69A01100A5F3BF500EEA5ED /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = 4.0; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; @@ -425,11 +424,10 @@ OTHER_LDFLAGS = ( "-lbz2", "-lz", - "-seg1addr", - 0x10000000, ); OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = spectrum; SECTORDER_FLAGS = ""; @@ -476,11 +474,10 @@ OTHER_LDFLAGS = ( "-lbz2", "-lz", - "-seg1addr", - 0x10000000, ); OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = spectrum; SECTORDER_FLAGS = ""; @@ -525,11 +522,10 @@ OTHER_LDFLAGS = ( "-lbz2", "-lz", - "-seg1addr", - 0x10000000, ); OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; + PREBINDING = NO; PRINCIPAL_CLASS = ""; PRODUCT_NAME = spectrum; SECTORDER_FLAGS = ""; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2008-12-09 12:04:24
|
Revision: 564 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=564&view=rev Author: fredm Date: 2008-12-09 12:04:14 +0000 (Tue, 09 Dec 2008) Log Message: ----------- Add GNU style changelog. Added Paths: ----------- trunk/ChangeLog Added: trunk/ChangeLog =================================================================== --- trunk/ChangeLog (rev 0) +++ trunk/ChangeLog 2008-12-09 12:04:14 UTC (rev 564) @@ -0,0 +1,7237 @@ +2008-11-18 12:25 fredm + + * .: Create Release-0_10_0-pre1 tag. + +2008-11-18 12:21 fredm + + * trunk/fuse/fusepb/Credits.html: Add some additional credits from + the Fuse version of the file. + +2008-11-18 12:05 fredm + + * trunk/FuseGenerator/libspectrum.h, + trunk/FuseImporter/libspectrum.h, trunk/fuse, + trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, + trunk/fuse/configure.in, trunk/fuse/disk/disk.c, + trunk/fuse/fuse.c, + trunk/fuse/fusepb/English.lproj/InfoPlist.strings, + trunk/fuse/fusepb/Info-Fuse.plist, + trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, + trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html, + trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/Makefile.am, + trunk/fuse/hacking/cvs-tags, trunk/fuse/machines/specplus2a.c, + trunk/fuse/machines/specplus3.c, trunk/fuse/man/fuse.1, + trunk/fuse/ui/win32/Makefile.am, trunk/fuse/utils.c, + trunk/libspectrum/Info.plist, trunk/libspectrum/libspectrum, + trunk/libspectrum/libspectrum.h, + trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj, + trunk/libspectrum/libspectrum/configure.in, + trunk/libspectrum/libspectrum/doc/cvs-tags, + trunk/libspectrum/libspectrum/doc/libspectrum.txt, + trunk/libspectrum/libspectrum/hacking/ChangeLog, + trunk/libspectrum/libspectrum/libspectrum.c, + trunk/libspectrum/libspectrum/libspectrum.h.in: Merge up to + vendor 0.10.0-pre1 release. + +2008-11-07 12:14 fredm + + * trunk/FuseGenerator/LibspectrumSCRExtractor.m, + trunk/FuseImporter/LibspectrumMetadataImporter.m: Correct + reporting of unknown classes, log name of tape being scanned for + metadata. + +2008-11-05 11:41 fredm + + * trunk/README: Remove old reference to lib765. + +2008-11-05 11:38 fredm + + * trunk/fuse/TODO, trunk/fuse/fusepb/resources/Fuse + Help/html/changelog.html, trunk/fuse/fusepb/resources/Fuse + Help/html/compressed.html, trunk/fuse/fusepb/resources/Fuse + Help/html/formats.html, trunk/fuse/fusepb/resources/Fuse + Help/html/monitor.html, trunk/fuse/fusepb/resources/Fuse + Help/html/preferences.html: Update manual for changes from + vendor. + +2008-11-05 11:33 fredm + + * trunk/fuse/debugger/commandl.l: Remove exit command as it causes + a ruckus when the main thread + doesn't know that the emulator thread is gone. + +2008-11-05 11:32 fredm + + * trunk/fuse/fusepb/nibs/Preferences.nib/info.nib, + trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Add + setting for create autosaves in RZX dialog. + +2008-11-03 12:27 fredm + + * trunk/FuseGenerator/libspectrum.h, + trunk/FuseImporter/libspectrum.h, trunk/fuse, + trunk/fuse/ChangeLog, trunk/fuse/README, + trunk/fuse/compat/unix/file.c, trunk/fuse/configure.in, + trunk/fuse/disk/fdd.c, trunk/fuse/disk/upd_fdc.c, + trunk/fuse/fuse.c, + trunk/fuse/fusepb/English.lproj/InfoPlist.strings, + trunk/fuse/fusepb/Info-Fuse.plist, + trunk/fuse/fusepb/models/Emulator.m, + trunk/fuse/hacking/ChangeLog, trunk/fuse/man/fuse.1, + trunk/fuse/menu.c, trunk/fuse/rzx.c, trunk/fuse/settings.dat, + trunk/fuse/ui/options.dat, trunk/fuse/ui/win32/win32internals.h, + trunk/fuse/ui/win32/win32joystick.c, + trunk/fuse/ui/win32/win32joystick.h, + trunk/fuse/ui/win32/win32ui.c, trunk/fuse/z80/tests/README, + trunk/libspectrum/libspectrum, trunk/libspectrum/libspectrum.h, + trunk/libspectrum/libspectrum/ChangeLog, + trunk/libspectrum/libspectrum/README, + trunk/libspectrum/libspectrum/doc/libspectrum.txt, + trunk/libspectrum/libspectrum/hacking/ChangeLog, + trunk/libspectrum/libspectrum/libspectrum.h.in, + trunk/libspectrum/libspectrum/rzx.c, + trunk/libspectrum/libspectrum/sna.c, + trunk/libspectrum/libspectrum/tap.c, + trunk/libspectrum/libspectrum/tape_block.c, + trunk/libspectrum/libspectrum/test/empty.z80, + trunk/libspectrum/libspectrum/test/test.c, + trunk/libspectrum/libspectrum/tzx_read.c, + trunk/libspectrum/libspectrum/tzx_write.c, + trunk/libspectrum/libspectrum/warajevo_read.c, + trunk/libspectrum/libspectrum/z80.c: Merge up to vendor revision + 3804. + +2008-10-28 13:18 fredm + + * trunk/fuse/fuse.c: Don't deallocate memory and similar arrays + 'till we've had a chance + to use them when writing settings back to the prefs database. + +2008-10-28 11:37 fredm + + * trunk/FuseImporter/LibspectrumMetadataImporter.m: Log filename + that causes an error. + +2008-10-21 12:05 fredm + + * trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj, + trunk/FuseGenerator/LibspectrumSCRExtractor.m, + trunk/FuseGenerator/generate.pl, + trunk/FuseGenerator/libspectrum.h, + trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj, + trunk/FuseImporter/LibspectrumMetadataImporter.m, + trunk/FuseImporter/generate.pl, trunk/FuseImporter/libspectrum.h, + trunk/fuse, trunk/fuse/Makefile.am, trunk/fuse/PORTING, + trunk/fuse/README, trunk/fuse/compat.h, + trunk/fuse/compat/amiga/Makefile.am, + trunk/fuse/compat/morphos/Makefile.am, + trunk/fuse/compat/unix/Makefile.am, + trunk/fuse/compat/unix/file.c, trunk/fuse/compat/unix/osname.c, + trunk/fuse/compat/wii, trunk/fuse/compat/wii/Makefile.am, + trunk/fuse/compat/wii/file.c, + trunk/fuse/compat/win32/Makefile.am, trunk/fuse/configure.in, + trunk/fuse/dck.c, trunk/fuse/debugger/Makefile.am, + trunk/fuse/debugger/breakpoint.c, + trunk/fuse/debugger/breakpoint.h, trunk/fuse/debugger/command.c, + trunk/fuse/debugger/commandl.l, trunk/fuse/debugger/commandy.y, + trunk/fuse/debugger/debugger.c, trunk/fuse/debugger/debugger.h, + trunk/fuse/debugger/debugger_internals.h, + trunk/fuse/debugger/event.c, trunk/fuse/debugger/expression.c, + trunk/fuse/debugger/variable.c, trunk/fuse/disk/beta.c, + trunk/fuse/disk/beta.h, trunk/fuse/disk/disk.c, + trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, + trunk/fuse/disk/plusd.c, trunk/fuse/disk/plusd.h, + trunk/fuse/disk/upd_fdc.c, trunk/fuse/disk/upd_fdc.h, + trunk/fuse/disk/wd_fdc.c, trunk/fuse/disk/wd_fdc.h, + trunk/fuse/divide.c, trunk/fuse/event.c, trunk/fuse/event.h, + trunk/fuse/fuse.c, + trunk/fuse/fusepb/English.lproj/InfoPlist.strings, + trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/fuse/fusepb/Info-Fuse.plist, + trunk/fuse/fusepb/controllers/DebuggerController.m, + trunk/fuse/fusepb/models/Emulator.m, + trunk/fuse/hacking/ChangeLog, trunk/fuse/if1.c, + trunk/fuse/input.c, trunk/fuse/input.h, trunk/fuse/keysyms.pl, + trunk/fuse/loader.c, trunk/fuse/machine.c, + trunk/fuse/machines/specplus3.h, trunk/fuse/memory.c, + trunk/fuse/mempool.c, trunk/fuse/mempool.h, trunk/fuse/menu.c, + trunk/fuse/menu.h, trunk/fuse/menu_data.dat, + trunk/fuse/menu_data.pl, trunk/fuse/periph.c, + trunk/fuse/periph.h, trunk/fuse/profile.c, trunk/fuse/rzx.c, + trunk/fuse/rzx.h, trunk/fuse/screenshot.c, + trunk/fuse/settings.dat, trunk/fuse/simpleide.c, + trunk/fuse/snapshot.c, trunk/fuse/sound/alsasound.c, + trunk/fuse/sound/dxsound.c, trunk/fuse/sound/win32sound.c, + trunk/fuse/spectrum.c, trunk/fuse/spectrum.h, trunk/fuse/tape.c, + trunk/fuse/tape.h, trunk/fuse/timer/timer.c, + trunk/fuse/timer/timer.h, trunk/fuse/ui/cocoa/cocoajoystick.c, + trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/gtk/debugger.c, + trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkkeyboard.c, + trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/options.dat, + trunk/fuse/ui/scaler/scalers.c, trunk/fuse/ui/sdl/sdldisplay.c, + trunk/fuse/ui/sdl/sdljoystick.c, + trunk/fuse/ui/svga/svgadisplay.c, + trunk/fuse/ui/svga/svgajoystick.c, trunk/fuse/ui/uidisplay.h, + trunk/fuse/ui/uijoystick.c, trunk/fuse/ui/widget/Makefile.am, + trunk/fuse/ui/widget/browse.c, trunk/fuse/ui/widget/debugger.c, + trunk/fuse/ui/widget/error.c, trunk/fuse/ui/widget/filesel.c, + trunk/fuse/ui/widget/memory.c, trunk/fuse/ui/widget/menu.c, + trunk/fuse/ui/widget/options.pl, trunk/fuse/ui/widget/picture.c, + trunk/fuse/ui/widget/pokefinder.c, trunk/fuse/ui/widget/query.c, + trunk/fuse/ui/widget/roms.c, trunk/fuse/ui/widget/select.c, + trunk/fuse/ui/widget/text.c, trunk/fuse/ui/widget/widget.c, + trunk/fuse/ui/widget/widget.h, + trunk/fuse/ui/widget/widget_internals.h, + trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/binary.c, + trunk/fuse/ui/win32/binary.rc, trunk/fuse/ui/win32/browse.c, + trunk/fuse/ui/win32/browse.h, trunk/fuse/ui/win32/browse.rc, + trunk/fuse/ui/win32/confirm.c, trunk/fuse/ui/win32/debugger.c, + trunk/fuse/ui/win32/debugger.h, trunk/fuse/ui/win32/debugger.rc, + trunk/fuse/ui/win32/error.c, trunk/fuse/ui/win32/fileselector.c, + trunk/fuse/ui/win32/memorybrowser.c, + trunk/fuse/ui/win32/memorybrowser.h, + trunk/fuse/ui/win32/memorybrowser.rc, + trunk/fuse/ui/win32/options-header.pl, + trunk/fuse/ui/win32/options-resource.pl, + trunk/fuse/ui/win32/options.pl, trunk/fuse/ui/win32/picture.c, + trunk/fuse/ui/win32/picture.h, trunk/fuse/ui/win32/picture.rc, + trunk/fuse/ui/win32/pokefinder.c, + trunk/fuse/ui/win32/pokefinder.h, + trunk/fuse/ui/win32/pokefinder.rc, + trunk/fuse/ui/win32/rollback.c, trunk/fuse/ui/win32/rollback.rc, + trunk/fuse/ui/win32/roms.c, trunk/fuse/ui/win32/roms.rc, + trunk/fuse/ui/win32/select_template.rc, + trunk/fuse/ui/win32/statusbar.c, + trunk/fuse/ui/win32/win32display.c, + trunk/fuse/ui/win32/win32display.h, + trunk/fuse/ui/win32/win32internals.h, + trunk/fuse/ui/win32/win32joystick.c, + trunk/fuse/ui/win32/win32joystick.rc, + trunk/fuse/ui/win32/win32keyboard.c, + trunk/fuse/ui/win32/win32keyboard.h, + trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/xlib/xdisplay.c, + trunk/fuse/ui/xlib/xui.c, trunk/fuse/unittests/unittests.c, + trunk/fuse/utils.c, trunk/fuse/z80/coretest.c, + trunk/fuse/z80/tests/tests.expected, + trunk/fuse/z80/tests/tests.in, trunk/fuse/z80/z80.c, + trunk/fuse/z80/z80.h, trunk/fuse/z80/z80.pl, + trunk/fuse/z80/z80_ops.c, trunk/fuse/zxatasp.c, + trunk/fuse/zxcf.c, trunk/libspectrum/generate.pl, + trunk/libspectrum/libspectrum, trunk/libspectrum/libspectrum.h, + trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj, + trunk/libspectrum/libspectrum/Makefile.am, + trunk/libspectrum/libspectrum/accessor.pl, + trunk/libspectrum/libspectrum/bzip2.c, + trunk/libspectrum/libspectrum/configure.in, + trunk/libspectrum/libspectrum/creator.c, + trunk/libspectrum/libspectrum/crypto.c, + trunk/libspectrum/libspectrum/csw.c, + trunk/libspectrum/libspectrum/dck.c, + trunk/libspectrum/libspectrum/hacking/ChangeLog, + trunk/libspectrum/libspectrum/ide.c, + trunk/libspectrum/libspectrum/internals.h, + trunk/libspectrum/libspectrum/libspectrum.c, + trunk/libspectrum/libspectrum/libspectrum.h.in, + trunk/libspectrum/libspectrum/make-perl.c, + trunk/libspectrum/libspectrum/memory.c, + trunk/libspectrum/libspectrum/microdrive.c, + trunk/libspectrum/libspectrum/myglib/Makefile.am, + trunk/libspectrum/libspectrum/myglib/garray.c, + trunk/libspectrum/libspectrum/myglib/ghash.c, + trunk/libspectrum/libspectrum/myglib/gslist.c, + trunk/libspectrum/libspectrum/plusd.c, + trunk/libspectrum/libspectrum/rzx.c, + trunk/libspectrum/libspectrum/sna.c, + trunk/libspectrum/libspectrum/snapshot.c, + trunk/libspectrum/libspectrum/sp.c, + trunk/libspectrum/libspectrum/szx.c, + trunk/libspectrum/libspectrum/tap.c, + trunk/libspectrum/libspectrum/tape.c, + trunk/libspectrum/libspectrum/tape_block.c, + trunk/libspectrum/libspectrum/tape_block.h, + trunk/libspectrum/libspectrum/test/Makefile.am, + trunk/libspectrum/libspectrum/test/edges.c, + trunk/libspectrum/libspectrum/test/test.c, + trunk/libspectrum/libspectrum/test/test.h, + trunk/libspectrum/libspectrum/test/test15.c, + trunk/libspectrum/libspectrum/test/writeprotected.mdr, + trunk/libspectrum/libspectrum/tzx_read.c, + trunk/libspectrum/libspectrum/tzx_write.c, + trunk/libspectrum/libspectrum/warajevo_read.c, + trunk/libspectrum/libspectrum/wav.c, + trunk/libspectrum/libspectrum/z80.c, + trunk/libspectrum/libspectrum/z80em.c, + trunk/libspectrum/libspectrum/zlib.c, + trunk/libspectrum/libspectrum/zxs.c: Merge up to vendor revision + 3775. + +2008-05-10 23:53 fredm + + * trunk/FuseGenerator/libspectrum.h, + trunk/FuseImporter/libspectrum.h, trunk/README, + trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/README, + trunk/fuse/ay.c, trunk/fuse/compat/amiga/Makefile.am, + trunk/fuse/compat/amiga/osname.c, + trunk/fuse/compat/amiga/paths.c, trunk/fuse/configure.in, + trunk/fuse/dck.c, trunk/fuse/debugger/commandl.l, + trunk/fuse/debugger/commandy.y, trunk/fuse/debugger/debugger.c, + trunk/fuse/debugger/debugger_internals.h, + trunk/fuse/disk/Makefile.am, trunk/fuse/disk/beta.c, + trunk/fuse/disk/disk.c, trunk/fuse/disk/disk.h, + trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, + trunk/fuse/disk/plusd.c, trunk/fuse/disk/upd_fdc.c, + trunk/fuse/disk/upd_fdc.h, trunk/fuse/disk/wd_fdc.c, + trunk/fuse/disk/wd_fdc.h, trunk/fuse/display.c, + trunk/fuse/divide.c, trunk/fuse/event.c, trunk/fuse/event.h, + trunk/fuse/fuse.c, trunk/fuse/fuse.cpp, trunk/fuse/fuse.h, + trunk/fuse/fusepb/English.lproj/InfoPlist.strings, + trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/fuse/fusepb/Info-Fuse.plist, + trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/main.m, trunk/fuse/fusepb/main.mm, + trunk/fuse/fusepb/models/Emulator.h, + trunk/fuse/fusepb/models/Emulator.m, + trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, + trunk/fuse/fusepb/scaler/hq2x.cpp, + trunk/fuse/fusepb/scaler/hq2x.h, + trunk/fuse/fusepb/scaler/hq3x.cpp, + trunk/fuse/fusepb/scaler/hq3x.h, + trunk/fuse/fusepb/scaler/intern.h, + trunk/fuse/fusepb/scaler/scalers16.c, + trunk/fuse/fusepb/scaler/scalers16.cpp, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m, + trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags, + trunk/fuse/hacking/win32_todo.txt, trunk/fuse/if1.c, + trunk/fuse/input.c, trunk/fuse/kempmouse.c, + trunk/fuse/kempmouse.h, trunk/fuse/keysyms.pl, + trunk/fuse/loader.c, trunk/fuse/loader.h, trunk/fuse/machine.c, + trunk/fuse/machine.h, trunk/fuse/machines/pentagon.c, + trunk/fuse/machines/pentagon.h, + trunk/fuse/machines/pentagon1024.c, + trunk/fuse/machines/pentagon512.c, + trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c, + trunk/fuse/machines/spec128.h, trunk/fuse/machines/spec16.c, + trunk/fuse/machines/spec48.c, trunk/fuse/machines/spec48.h, + trunk/fuse/machines/spec_se.c, trunk/fuse/machines/specplus2.c, + trunk/fuse/machines/specplus2a.c, + trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h, + trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c, + trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h, + trunk/fuse/machines/ts2068.c, trunk/fuse/man/fuse.1, + trunk/fuse/memory.c, trunk/fuse/memory.h, trunk/fuse/menu.c, + trunk/fuse/menu_data.dat, trunk/fuse/periph.c, + trunk/fuse/roms/plus3e-0.rom, trunk/fuse/roms/plus3e-1.rom, + trunk/fuse/roms/plus3e-2.rom, trunk/fuse/settings.dat, + trunk/fuse/settings.pl, trunk/fuse/simpleide.c, + trunk/fuse/sound/Makefile.am, trunk/fuse/sound/aosound.c, + trunk/fuse/sound/win32sound.c, trunk/fuse/spectrum.c, + trunk/fuse/spectrum.h, trunk/fuse/tape.c, trunk/fuse/tape.h, + trunk/fuse/timer/Makefile.am, trunk/fuse/ui.c, + trunk/fuse/ui/Makefile.am, trunk/fuse/ui/fb/fbkeyboard.c, + trunk/fuse/ui/gtk/Makefile.am, trunk/fuse/ui/gtk/fileselector.c, + trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/options.dat, + trunk/fuse/ui/scaler/Makefile.am, trunk/fuse/ui/scaler/scaler.c, + trunk/fuse/ui/scaler/scaler.h, + trunk/fuse/ui/scaler/scaler_hq2x.c, + trunk/fuse/ui/scaler/scaler_hq3x.c, + trunk/fuse/ui/scaler/scaler_internals.h, + trunk/fuse/ui/scaler/scalers.c, trunk/fuse/ui/scaler/scalers.cpp, + trunk/fuse/ui/sdl/Makefile.am, trunk/fuse/ui/sdl/sdldisplay.c, + trunk/fuse/ui/sdl/sdlkeyboard.c, + trunk/fuse/ui/svga/svgakeyboard.c, trunk/fuse/ui/ui.h, + trunk/fuse/ui/widget, trunk/fuse/ui/widget/Makefile.am, + trunk/fuse/ui/widget/browse.c, trunk/fuse/ui/widget/debugger.c, + trunk/fuse/ui/widget/error.c, trunk/fuse/ui/widget/filesel.c, + trunk/fuse/ui/widget/fuse.font.sbf, + trunk/fuse/ui/widget/memory.c, trunk/fuse/ui/widget/menu.c, + trunk/fuse/ui/widget/mkfusefont.pl, + trunk/fuse/ui/widget/options-header.pl, + trunk/fuse/ui/widget/options.pl, trunk/fuse/ui/widget/picture.c, + trunk/fuse/ui/widget/pokefinder.c, trunk/fuse/ui/widget/query.c, + trunk/fuse/ui/widget/roms.c, trunk/fuse/ui/widget/select.c, + trunk/fuse/ui/widget/text.c, trunk/fuse/ui/widget/widget.c, + trunk/fuse/ui/widget/widget.h, + trunk/fuse/ui/widget/widget_internals.h, + trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/binary.c, + trunk/fuse/ui/win32/binary.h, trunk/fuse/ui/win32/binary.rc, + trunk/fuse/ui/win32/browse.c, trunk/fuse/ui/win32/browse.h, + trunk/fuse/ui/win32/browse.rc, trunk/fuse/ui/win32/debugger.c, + trunk/fuse/ui/win32/debugger.h, trunk/fuse/ui/win32/debugger.rc, + trunk/fuse/ui/win32/del_o.bat, trunk/fuse/ui/win32/error.c, + trunk/fuse/ui/win32/icons/Makefile.am, + trunk/fuse/ui/win32/icons/mdr_active.bmp, + trunk/fuse/ui/win32/icons/mdr_inactive.bmp, + trunk/fuse/ui/win32/icons/mouse_active.bmp, + trunk/fuse/ui/win32/icons/mouse_inactive.bmp, + trunk/fuse/ui/win32/icons/tape_marker_mask.bmp, + trunk/fuse/ui/win32/memorybrowser.c, + trunk/fuse/ui/win32/memorybrowser.h, + trunk/fuse/ui/win32/memorybrowser.rc, + trunk/fuse/ui/win32/menu_data.c, trunk/fuse/ui/win32/menu_data.h, + trunk/fuse/ui/win32/menu_data.rc, + trunk/fuse/ui/win32/options-header.pl, + trunk/fuse/ui/win32/options-resource.pl, + trunk/fuse/ui/win32/options.pl, trunk/fuse/ui/win32/picture.c, + trunk/fuse/ui/win32/picture.h, trunk/fuse/ui/win32/picture.rc, + trunk/fuse/ui/win32/pokefinder.c, + trunk/fuse/ui/win32/pokefinder.h, + trunk/fuse/ui/win32/pokefinder.rc, + trunk/fuse/ui/win32/rollback.c, trunk/fuse/ui/win32/rollback.h, + trunk/fuse/ui/win32/rollback.rc, trunk/fuse/ui/win32/roms.c, + trunk/fuse/ui/win32/roms.h, trunk/fuse/ui/win32/roms.rc, + trunk/fuse/ui/win32/select_template.h, + trunk/fuse/ui/win32/select_template.rc, + trunk/fuse/ui/win32/statusbar.c, + trunk/fuse/ui/win32/statusbar.rc, + trunk/fuse/ui/win32/win32display.c, + trunk/fuse/ui/win32/win32display.h, + trunk/fuse/ui/win32/win32internals.h, + trunk/fuse/ui/win32/win32joystick.c, + trunk/fuse/ui/win32/win32joystick.h, + trunk/fuse/ui/win32/win32joystick.rc, + trunk/fuse/ui/win32/win32keyboard.h, + trunk/fuse/ui/win32/win32mouse.c, trunk/fuse/ui/win32/win32ui.c, + trunk/fuse/ui/win32/win32ui.rc, trunk/fuse/ui/xlib/xdisplay.c, + trunk/fuse/ui/xlib/xerror.c, trunk/fuse/ui/xlib/xkeyboard.c, + trunk/fuse/ula.c, trunk/fuse/unittests, + trunk/fuse/unittests/Makefile.am, + trunk/fuse/unittests/unittests.c, + trunk/fuse/unittests/unittests.h, trunk/fuse/utils.c, + trunk/fuse/widget, trunk/fuse/windres.rc, trunk/fuse/winfuse.ico, + trunk/fuse/z80/z80.c, trunk/fuse/z80/z80_ops.c, trunk/lib765, + trunk/libspectrum/config.h, trunk/libspectrum/libspectrum.h, + trunk/libspectrum/libspectrum/ChangeLog, + trunk/libspectrum/libspectrum/README, + trunk/libspectrum/libspectrum/TODO, + trunk/libspectrum/libspectrum/accessor.pl, + trunk/libspectrum/libspectrum/configure.in, + trunk/libspectrum/libspectrum/doc/libspectrum.txt, + trunk/libspectrum/libspectrum/hacking/ChangeLog, + trunk/libspectrum/libspectrum/ide.c, + trunk/libspectrum/libspectrum/internals.h, + trunk/libspectrum/libspectrum/libspectrum.c, + trunk/libspectrum/libspectrum/libspectrum.h.in, + trunk/libspectrum/libspectrum/sna.c, + trunk/libspectrum/libspectrum/snap_accessors.txt, + trunk/libspectrum/libspectrum/snapshot.c, + trunk/libspectrum/libspectrum/szx.c, + trunk/libspectrum/libspectrum/tape.c, + trunk/libspectrum/libspectrum/test/Makefile.am, + trunk/libspectrum/libspectrum/test/edges.c, + trunk/libspectrum/libspectrum/test/test.h, + trunk/libspectrum/libspectrum/test/test15.c, + trunk/libspectrum/libspectrum/z80.c: Merge up to vendor revision + 3612. + +2008-05-07 11:35 fredm + + * trunk/fuse/TODO: Update TODO. + +2008-05-04 10:38 fredm + + * trunk/FuseGenerator/LibspectrumSCRExtractor.m: Have inlay images + take priority over loading screens. + +2008-05-04 09:11 fredm + + * trunk/FuseGenerator/GeneratePreviewForURL.m, + trunk/FuseGenerator/GenerateThumbnailForURL.m, + trunk/FuseGenerator/LibspectrumSCRExtractor.h, + trunk/FuseGenerator/LibspectrumSCRExtractor.m, trunk/fuse/TODO: + Add support for TZX custom screenshot and tape inlay blocks. + +2008-04-29 12:59 fredm + + * trunk/fuse/fusepb/English.lproj/InfoPlist.strings: Bump version + to 0.9.0.2. + +2008-04-29 12:44 fredm + + * trunk/fuse/fusepb/controllers/FuseController.m: Fix betaFileTypes + declaration. + +2008-04-29 12:24 fredm + + * trunk/fuse/TODO, trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add UI + support for .udi, .fdi and .scl files for Beta disk images. + +2008-04-28 13:55 fredm + + * trunk/FuseGenerator/GeneratePreviewForURL.m: Generate previews + for all docs, not just screenshots. + +2008-04-28 13:21 fredm + + * trunk/FuseImporter/COPYING, trunk/FuseImporter/Howto build.rtf, + trunk/FuseImporter/README.rtf: Remove obsolete files. + +2008-04-28 13:15 fredm + + * trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx, + trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex, + trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, + trunk/fuse/fusepb/resources/Fuse Help/html/quicklook.html, + trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html: Add + Quick Look generator documentation, update index. + +2008-04-28 13:14 fredm + + * trunk/fuse/settings.dat: Change thumbnail icon generation default + to be off as it is superceded by Quick + Look on Mac OS X 10.5 and up. + +2008-04-28 11:32 fredm + + * trunk/FuseImporter/English.lproj/InfoPlist.strings, + trunk/FuseImporter/Info.plist: Bump version to 1.1, add + references for img, mgt and raw file formats. + +2008-04-28 10:45 fredm + + * trunk/fuse/TODO: Update TODO list. + +2008-04-28 10:42 fredm + + * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: Distribute + QuickLook generator. + +2008-04-28 10:17 fredm + + * trunk/FuseImporter/LibspectrumMetadataImporter.h: Add declaration + of process_tape. + +2008-04-28 10:14 fredm + + * trunk/FuseImporter/English.lproj/schema.strings: Add display name + for graphics mode. + +2008-04-09 21:13 fredm + + * trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c: Don't report + errors back to the user when we fail to open a joystick device + that already has exclusive access given to someone else (e.g. a + Wacom tablet + and it's associated driver) (James Weatherley). + +2008-04-08 13:38 fredm + + * trunk/fuse/ui/cocoa/cocoadisplay.m: Move lock allocation and + initialisation to DisplayOpenGLView. + +2008-04-08 13:36 fredm + + * trunk/fuse/fusepb/English.lproj/InfoPlist.strings: Update version + strings to 0.9.0.1. + +2008-04-08 13:34 fredm + + * trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, + trunk/fuse/fusepb/resources/Fuse Help/html/menus.html: Add + references for new menu options, update ChangeLog for recent + changes. + +2008-04-08 13:31 fredm + + * trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.m: Add 4x and 5x zoom + options for those with big screens. + +2008-04-08 12:08 fredm + + * trunk/fuse/ui/cocoa/SDL_joystick/SDL_sysjoystick.c: Merge up to + revision 3524 of SDL_sysjoystick.c, in hope of fixing errors + starting Fuse with a Wacom graphics tablet attached. + +2008-03-31 12:46 fredm + + * trunk/fuse/TODO, trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/models/Emulator.h, + trunk/fuse/fusepb/models/Emulator.m, + trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m: Add +D and Beta disk + insert menu entries. Allow +D to save .img images. + +2008-03-31 11:51 fredm + + * trunk/fuse/TODO, trunk/fuse/fusepb/controllers/FuseController.m: + Allow .img files to be opened as +D images. + +2008-03-29 03:19 fredm + + * trunk/fuse/fusepb/controllers/PreferencesController.m, + trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Add + preferences support for Beta 128 interface. + +2008-03-29 03:18 fredm + + * trunk/fuse/fusepb/English.lproj/InfoPlist.strings: Change + additional copyright date to 2008. + +2008-03-28 13:01 fredm + + * trunk/fuse/fusepb/English.lproj/InfoPlist.strings, + trunk/fuse/fusepb/Info-Fuse.plist, trunk/fuse/fusepb/config.h, + trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Move + version to Fuse for Mac OS X 0.9.0. + +2008-03-27 12:04 fredm + + * trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/models/Emulator.h, + trunk/fuse/fusepb/models/Emulator.m, + trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m: Add +D and Beta disk + write protect support. Fix Microdrive cartridge menus. + Add command key release for keyboard joystick binding shortcut. + +2008-03-27 12:03 fredm + + * trunk/fuse/fusepb/Info-Fuse.plist: Fix mdr type info, round out + mgt and img type exports. + +2008-03-26 10:36 fredm + + * trunk/fuse/TODO, trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, + trunk/fuse/fusepb/resources/Fuse Help/html/menus.html, + trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html: Move + Emulate keyboard joystick option to to Bind Keys to Joystick + option in + Machine menu + +2008-03-26 08:46 fredm + + * trunk/fuse/fusepb/nibs/Preferences.nib/info.nib, + trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib: Fix + keyboard joystick enabled preference binding. + +2008-02-18 09:48 fredm + + * trunk/README: Remove reference to bzip2 framework. + +2008-02-18 08:45 fredm + + * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/fuse/fusepb/FuseMenus.m: Don't use standard Fuse menu.c, + move only function we use + (menu_select_roms_with_title) to FuseMenus.m. + +2008-02-18 07:25 fredm + + * trunk/fuse/fusepb/controllers/FuseController.m: Ignore any + shortcuts that raise dialogs in fullscreen mode. + +2008-02-18 07:20 fredm + + * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: Remove + pentagon.h from distribution binaries and remove references to + obsolete + SDL and bzip2 frameworks. + +2008-02-18 04:00 fredm + + * trunk/libgcrypt/Info-gcrypt.plist, + trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj, + trunk/libgcrypt/libgcrypt/AUTHORS, + trunk/libgcrypt/libgcrypt/ChangeLog, + trunk/libgcrypt/libgcrypt/INSTALL, + trunk/libgcrypt/libgcrypt/Makefile.am, + trunk/libgcrypt/libgcrypt/Makefile.in, + trunk/libgcrypt/libgcrypt/NEWS, trunk/libgcrypt/libgcrypt/README, + trunk/libgcrypt/libgcrypt/README.CVS, + trunk/libgcrypt/libgcrypt/README.SVN, + trunk/libgcrypt/libgcrypt/THANKS, trunk/libgcrypt/libgcrypt/TODO, + trunk/libgcrypt/libgcrypt/VERSION, + trunk/libgcrypt/libgcrypt/acinclude.m4, + trunk/libgcrypt/libgcrypt/aclocal.m4, + trunk/libgcrypt/libgcrypt/autogen.sh, + trunk/libgcrypt/libgcrypt/cipher/ChangeLog, + trunk/libgcrypt/libgcrypt/cipher/Makefile.in, + trunk/libgcrypt/libgcrypt/cipher/ac.c, + trunk/libgcrypt/libgcrypt/cipher/blowfish.c, + trunk/libgcrypt/libgcrypt/cipher/cast5.c, + trunk/libgcrypt/libgcrypt/cipher/cipher.c, + trunk/libgcrypt/libgcrypt/cipher/crc.c, + trunk/libgcrypt/libgcrypt/cipher/des.c, + trunk/libgcrypt/libgcrypt/cipher/dsa.c, + trunk/libgcrypt/libgcrypt/cipher/elgamal.c, + trunk/libgcrypt/libgcrypt/cipher/md.c, + trunk/libgcrypt/libgcrypt/cipher/primegen.c, + trunk/libgcrypt/libgcrypt/cipher/pubkey.c, + trunk/libgcrypt/libgcrypt/cipher/random.c, + trunk/libgcrypt/libgcrypt/cipher/random.h, + trunk/libgcrypt/libgcrypt/cipher/rfc2268.c, + trunk/libgcrypt/libgcrypt/cipher/rijndael.c, + trunk/libgcrypt/libgcrypt/cipher/rmd160.c, + trunk/libgcrypt/libgcrypt/cipher/rndlinux.c, + trunk/libgcrypt/libgcrypt/cipher/rndw32.c, + trunk/libgcrypt/libgcrypt/cipher/rsa.c, + trunk/libgcrypt/libgcrypt/cipher/serpent.c, + trunk/libgcrypt/libgcrypt/cipher/sha256.c, + trunk/libgcrypt/libgcrypt/cipher/sha512.c, + trunk/libgcrypt/libgcrypt/cipher/tiger.c, + trunk/libgcrypt/libgcrypt/cipher/twofish.c, + trunk/libgcrypt/libgcrypt/compile, + trunk/libgcrypt/libgcrypt/config.guess, + trunk/libgcrypt/libgcrypt/config.h.in, + trunk/libgcrypt/libgcrypt/config.sub, + trunk/libgcrypt/libgcrypt/configure, + trunk/libgcrypt/libgcrypt/configure.ac, + trunk/libgcrypt/libgcrypt/depcomp, + trunk/libgcrypt/libgcrypt/doc/ChangeLog, + trunk/libgcrypt/libgcrypt/doc/Makefile.in, + trunk/libgcrypt/libgcrypt/doc/gcrypt.info, + trunk/libgcrypt/libgcrypt/doc/gcrypt.texi, + trunk/libgcrypt/libgcrypt/doc/mdate-sh, + trunk/libgcrypt/libgcrypt/doc/stamp-vti, + trunk/libgcrypt/libgcrypt/doc/texinfo.tex, + trunk/libgcrypt/libgcrypt/doc/version.texi, + trunk/libgcrypt/libgcrypt/install-sh, + trunk/libgcrypt/libgcrypt/ltmain.sh, + trunk/libgcrypt/libgcrypt/m4, + trunk/libgcrypt/libgcrypt/m4/ChangeLog, + trunk/libgcrypt/libgcrypt/m4/Makefile.am, + trunk/libgcrypt/libgcrypt/m4/Makefile.in, + trunk/libgcrypt/libgcrypt/m4/libtool.m4, + trunk/libgcrypt/libgcrypt/m4/onceonly.m4, + trunk/libgcrypt/libgcrypt/m4/socklen.m4, + trunk/libgcrypt/libgcrypt/m4/sys_socket_h.m4, + trunk/libgcrypt/libgcrypt/missing, + trunk/libgcrypt/libgcrypt/mkinstalldirs, + trunk/libgcrypt/libgcrypt/mpi/ChangeLog, + trunk/libgcrypt/libgcrypt/mpi/Makefile.am, + trunk/libgcrypt/libgcrypt/mpi/Makefile.in, + trunk/libgcrypt/libgcrypt/mpi/config.links, + trunk/libgcrypt/libgcrypt/mpi/hppa1.1/udiv-qrnnd.S, + trunk/libgcrypt/libgcrypt/mpi/mpi-bit.c, + trunk/libgcrypt/libgcrypt/mpi/mpi-pow.c, + trunk/libgcrypt/libgcrypt/mpi/mpicoder.c, + trunk/libgcrypt/libgcrypt/mpi/mpiutil.c, + trunk/libgcrypt/libgcrypt/src/ChangeLog, + trunk/libgcrypt/libgcrypt/src/Makefile.am, + trunk/libgcrypt/libgcrypt/src/Makefile.in, + trunk/libgcrypt/libgcrypt/src/ath.c, + trunk/libgcrypt/libgcrypt/src/ath.h, + trunk/libgcrypt/libgcrypt/src/g10lib.h, + trunk/libgcrypt/libgcrypt/src/gcrypt-module.h, + trunk/libgcrypt/libgcrypt/src/gcrypt.h, + trunk/libgcrypt/libgcrypt/src/gcrypt.h.in, + trunk/libgcrypt/libgcrypt/src/global.c, + trunk/libgcrypt/libgcrypt/src/libgcrypt.m4, + trunk/libgcrypt/libgcrypt/src/missing-string.c, + trunk/libgcrypt/libgcrypt/src/secmem.c, + trunk/libgcrypt/libgcrypt/src/secmem.h, + trunk/libgcrypt/libgcrypt/src/sexp.c, + trunk/libgcrypt/libgcrypt/src/types.h, + trunk/libgcrypt/libgcrypt/tests/ChangeLog, + trunk/libgcrypt/libgcrypt/tests/Makefile.am, + trunk/libgcrypt/libgcrypt/tests/Makefile.in, + trunk/libgcrypt/libgcrypt/tests/ac.c, + trunk/libgcrypt/libgcrypt/tests/basic.c, + trunk/libgcrypt/libgcrypt/tests/benchmark.c, + trunk/libgcrypt/libgcrypt/tests/pubkey.c, + trunk/libgcrypt/libgcrypt/tests/random.c, + trunk/libgcrypt/libgcrypt/tests/t-mpi-bit.c, + trunk/libgcrypt/libgcrypt/tests/tsexp.c, + trunk/libgcrypt/libgcrypt/w32-dll/Makefile.in: Merge up to vendor + libgcrypt version 1.2.4. + +2008-02-17 22:06 fredm + + * trunk/FuseImporter/Info.plist, trunk/fuse/fusepb/Info-Fuse.plist, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add + entries for newly-supported tape and snap formats. + +2008-02-17 02:02 fredm + + * trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/README, + trunk/fuse/ay.c, trunk/fuse/compat/Makefile.am, + trunk/fuse/compat/win32/osname.c, trunk/fuse/configure.in, + trunk/fuse/disk/beta.c, trunk/fuse/disk/beta.h, + trunk/fuse/disk/disk.c, trunk/fuse/disk/disk.h, + trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, + trunk/fuse/disk/plusd.c, trunk/fuse/disk/plusd.h, + trunk/fuse/disk/wd_fdc.c, trunk/fuse/disk/wd_fdc.h, + trunk/fuse/display.c, trunk/fuse/divide.c, + trunk/fuse/fusepb/English.lproj/InfoPlist.strings, + trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/fuse/fusepb/Info-Fuse.plist, + trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/models/Emulator.h, + trunk/fuse/fusepb/models/Emulator.m, + trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/resources/Fuse Help/Fuse Help idx, + trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex, + trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html, + trunk/fuse/fusepb/resources/Fuse Help/html/formats.html, + trunk/fuse/fusepb/resources/Fuse Help/html/menus.html, + trunk/fuse/fusepb/resources/Fuse Help/html/preferences.html, + trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html, + trunk/fuse/fusepb/resources/Fuse Help/html/trdos.html, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m, + trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags, + trunk/fuse/hacking/tc2048_tech_notes.txt, trunk/fuse/if1.c, + trunk/fuse/if1.h, trunk/fuse/if2.c, trunk/fuse/input.c, + trunk/fuse/joystick.c, trunk/fuse/kempmouse.c, + trunk/fuse/keyboard.c, trunk/fuse/machine.c, + trunk/fuse/machines/Makefile.am, trunk/fuse/machines/machines.h, + trunk/fuse/machines/pentagon.c, trunk/fuse/machines/pentagon.h, + trunk/fuse/machines/pentagon1024.c, + trunk/fuse/machines/pentagon512.c, + trunk/fuse/machines/scorpion.c, trunk/fuse/machines/spec128.c, + trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c, + trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c, + trunk/fuse/machines/specplus2.c, + trunk/fuse/machines/specplus2a.c, + trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h, + trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c, + trunk/fuse/machines/tc2068.c, trunk/fuse/machines/ts2068.c, + trunk/fuse/man/fuse.1, trunk/fuse/memory.c, trunk/fuse/menu.c, + trunk/fuse/menu.h, trunk/fuse/menu_data.dat, + trunk/fuse/menu_data.pl, trunk/fuse/module.c, + trunk/fuse/module.h, trunk/fuse/periph.c, trunk/fuse/periph.h, + trunk/fuse/printer.c, trunk/fuse/profile.c, trunk/fuse/scld.c, + trunk/fuse/settings.dat, trunk/fuse/settings.pl, + trunk/fuse/simpleide.c, trunk/fuse/slt.c, trunk/fuse/snapshot.c, + trunk/fuse/sound/alsasound.c, trunk/fuse/sound/sdlsound.c, + trunk/fuse/spectrum.c, trunk/fuse/spectrum.h, trunk/fuse/tape.c, + trunk/fuse/tape.h, trunk/fuse/ui.c, + trunk/fuse/ui/cocoa/cocoaui.m, trunk/fuse/ui/fb/fbdisplay.c, + trunk/fuse/ui/fb/fbmouse.c, trunk/fuse/ui/gtk/binary.c, + trunk/fuse/ui/gtk/confirm.c, trunk/fuse/ui/gtk/fileselector.c, + trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkui.c, + trunk/fuse/ui/gtk/pokefinder.c, trunk/fuse/ui/gtk/rollback.c, + trunk/fuse/ui/gtk/roms.c, trunk/fuse/ui/options.dat, + trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/ui.h, + trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/error.c, + trunk/fuse/ui/win32/win32internals.h, + trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ula.c, + trunk/fuse/utils.c, trunk/fuse/widget/browse.c, + trunk/fuse/widget/filesel.c, trunk/fuse/widget/menu.c, + trunk/fuse/widget/options.pl, trunk/fuse/widget/roms.c, + trunk/fuse/widget/widget.c, trunk/fuse/widget/widget.h, + trunk/fuse/widget/widget_internals.h, trunk/fuse/z80/coretest.c, + trunk/fuse/z80/tests/Makefile.am, trunk/fuse/z80/z80.c, + trunk/fuse/z80/z80.pl, trunk/fuse/z80/z80_macros.h, + trunk/fuse/z80/z80_ops.c, trunk/fuse/zxatasp.c, + trunk/fuse/zxcf.c: Merge up to vendor Fuse 0.9.0. + +2008-02-14 13:00 fredm + + * trunk/FuseGenerator/libspectrum.h, + trunk/FuseImporter/GetMetadataForFile.m, + trunk/FuseImporter/LibspectrumMetadataImporter.m, + trunk/FuseImporter/libspectrum.h, trunk/libspectrum/Info.plist, + trunk/libspectrum/libspectrum.h, + trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj, + trunk/libspectrum/libspectrum/COPYING, + trunk/libspectrum/libspectrum/ChangeLog, + trunk/libspectrum/libspectrum/Makefile.am, + trunk/libspectrum/libspectrum/README, + trunk/libspectrum/libspectrum/accessor.pl, + trunk/libspectrum/libspectrum/configure.in, + trunk/libspectrum/libspectrum/csw.c, + trunk/libspectrum/libspectrum/dll.c, + trunk/libspectrum/libspectrum/doc/cvs-tags, + trunk/libspectrum/libspectrum/doc/libspectrum.3, + trunk/libspectrum/libspectrum/doc/libspectrum.txt, + trunk/libspectrum/libspectrum/hacking/ChangeLog, + trunk/libspectrum/libspectrum/internals.h, + trunk/libspectrum/libspectrum/libspectrum.c, + trunk/libspectrum/libspectrum/libspectrum.h.in, + trunk/libspectrum/libspectrum/plusd.c, + trunk/libspectrum/libspectrum/sna.c, + trunk/libspectrum/libspectrum/snap_accessors.txt, + trunk/libspectrum/libspectrum/snapshot.c, + trunk/libspectrum/libspectrum/szx.c, + trunk/libspectrum/libspectrum/tap.c, + trunk/libspectrum/libspectrum/tape.c, + trunk/libspectrum/libspectrum/tape_block.c, + trunk/libspectrum/libspectrum/test/Makefile.am, + trunk/libspectrum/libspectrum/test/empty.csw, + trunk/libspectrum/libspectrum/test/sp-2000.sna.gz, + trunk/libspectrum/libspectrum/test/sp-ffff.sna.gz, + trunk/libspectrum/libspectrum/test/test.c, + trunk/libspectrum/libspectrum/timings.c, + trunk/libspectrum/libspectrum/z80.c: Merge up to vendor version + 0.4.0. + +2008-02-13 12:54 fredm + + * trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m: Fix the blocked + keyboard from Command-q (quit), Command-h (hide) and Command-m + (minimise) (fixes bug #1842577). + +2008-02-11 12:16 fredm + + * trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/views/DisplayOpenGLView.m: Clear stuck shortcut + keys for Command-{0,1,2,3,f,s,z,b,o,p,period}, still need + to handle Command-q (quit), Command-h (hide) and Command-m + (minimise). + +2008-02-10 20:47 fredm + + * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m: Make application + quit menu use performClose on the window, and switch exit + confirm dialog to windowShouldClose in DisplayOpenGLView (partial + fix to + bug #1842576). + +2007-12-21 02:42 fredm + + * trunk/FuseGenerator/LibspectrumSCRExtractor.m: Some SCREEN$ were + saved from places other than 16384 (presumably due to art + packages and the like). + +2007-12-21 00:16 fredm + + * trunk/FuseGenerator, trunk/FuseGenerator/English.lproj, + trunk/FuseGenerator/English.lproj/InfoPlist.strings, + trunk/FuseGenerator/FuseGenerator.xcodeproj, + trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj, + trunk/FuseGenerator/GeneratePreviewForURL.m, + trunk/FuseGenerator/GenerateThumbnailForURL.m, + trunk/FuseGenerator/Info.plist, + trunk/FuseGenerator/JWSpectrumScreen, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlock.h, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlock.m, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockIterator.h, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockIterator.m, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimex.h, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimex.m, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimexHiRes.h, + trunk/FuseGenerator/JWSpectrumScreen/AttributeBlockTimexHiRes.m, + trunk/FuseGenerator/JWSpectrumScreen/AttributeManager.c, + trunk/FuseGenerator/JWSpectrumScreen/AttributeManager.h, + trunk/FuseGenerator/JWSpectrumScreen/ColourMacros.c, + trunk/FuseGenerator/JWSpectrumScreen/ColourMacros.h, + trunk/FuseGenerator/JWSpectrumScreen/English.lproj, + trunk/FuseGenerator/JWSpectrumScreen/English.lproj/InfoPlist.strings, + trunk/FuseGenerator/JWSpectrumScreen/Info.plist, + trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.h, + trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.m, + trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.xcodeproj, + trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen.xcodeproj/project.pbxproj, + trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreenConstants.h, + trunk/FuseGenerator/JWSpectrumScreen/JWSpectrumScreen_Prefix.pch, + trunk/FuseGenerator/JWSpectrumScreen/PixelData.h, + trunk/FuseGenerator/JWSpectrumScreen/README, + trunk/FuseGenerator/LibspectrumSCRExtractor.h, + trunk/FuseGenerator/LibspectrumSCRExtractor.m, + trunk/FuseGenerator/config.h, trunk/FuseGenerator/generate.pl, + trunk/FuseGenerator/libspectrum, + trunk/FuseGenerator/libspectrum.h, trunk/FuseGenerator/main.c, + trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj, + trunk/README, trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: + Add QuickLook generator for Speccy-related files, thanks to James + Weatherley for + JWSpectrumScreen that makes it all possible. + +2007-12-20 11:04 fredm + + * trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj: Spotlight + importer should be in Contents/Library/Spotlight, not PlugIns + +2007-11-17 11:17 fredm + + * trunk/fuse/fusepb/resources/Fuse.icns: Add 512x512px icon for + Fuse. + +2007-11-17 07:49 fredm + + * trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html: Add + some extra change entries. + +2007-11-16 23:51 fredm + + * trunk/fuse/fusepb/Info-Fuse.plist: Increment version number to + reflect merge state. + +2007-11-16 23:49 fredm + + * trunk/FuseImporter/libspectrum.h, + trunk/audiofile/audiofile.xcodeproj/project.pbxproj, + trunk/fuse/ChangeLog, trunk/fuse/Makefile.am, trunk/fuse/ay.c, + trunk/fuse/bitmap.h, trunk/fuse/compat.h, + trunk/fuse/compat/Makefile.am, + trunk/fuse/compat/amiga/Makefile.am, + trunk/fuse/compat/amiga/paths.c, + trunk/fuse/compat/morphos/Makefile.am, + trunk/fuse/compat/morphos/osname.c, + trunk/fuse/compat/unix/Makefile.am, + trunk/fuse/compat/unix/osname.c, trunk/fuse/compat/unix/paths.c, + trunk/fuse/compat/win32/Makefile.am, + trunk/fuse/compat/win32/osname.c, + trunk/fuse/compat/win32/paths.c, trunk/fuse/configure.in, + trunk/fuse/debugger/Makefile.am, + trunk/fuse/debugger/breakpoint.c, trunk/fuse/debugger/command.c, + trunk/fuse/debugger/commandy.y, trunk/fuse/debugger/debugger.c, + trunk/fuse/debugger/debugger_internals.h, + trunk/fuse/debugger/disassemble.c, + trunk/fuse/debugger/expression.c, trunk/fuse/disk/Makefile.am, + trunk/fuse/disk/beta.c, trunk/fuse/disk/beta.h, + trunk/fuse/disk/crc.c, trunk/fuse/disk/crc.h, + trunk/fuse/disk/disk.c, trunk/fuse/disk/disk.h, + trunk/fuse/disk/fdd.c, trunk/fuse/disk/fdd.h, + trunk/fuse/disk/plusd.c, trunk/fuse/disk/plusd.h, + trunk/fuse/disk/wd1770.c, trunk/fuse/disk/wd1770.h, + trunk/fuse/disk/wd_fdc.c, trunk/fuse/disk/wd_fdc.h, + trunk/fuse/divide.c, trunk/fuse/event.c, trunk/fuse/event.h, + trunk/fuse/fuse.cpp, + trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/fuse/fusepb/Makefile, + trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m, + trunk/fuse/fusepb/models/Emulator.h, + trunk/fuse/fusepb/models/Emulator.m, + trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib, + trunk/fuse/fusepb/nibs/Preferences.nib/classes.nib, + trunk/fuse/fusepb/nibs/Preferences.nib/info.nib, + trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m, + trunk/fuse/hacking/ChangeLog, trunk/fuse/hacking/cvs-tags, + trunk/fuse/if1.c, trunk/fuse/if2.c, trunk/fuse/keyboard.h, + trunk/fuse/keysyms.pl, trunk/fuse/lib/Makefile.am, + trunk/fuse/machine.c, trunk/fuse/machines/Makefile.am, + trunk/fuse/machines/machines.h, trunk/fuse/machines/pentagon.c, + trunk/fuse/machines/pentagon1024.c, + trunk/fuse/machines/pentagon512.c, + trunk/fuse/machines/scorpion.c, trunk/fuse/machines/scorpion.h, + trunk/fuse/machines/spec128.c, trunk/fuse/machines/spec128.h, + trunk/fuse/machines/spec16.c, trunk/fuse/machines/spec48.c, + trunk/fuse/machines/spec48.h, trunk/fuse/machines/spec_se.c, + trunk/fuse/machines/specplus2.c, + trunk/fuse/machines/specplus2a.c, + trunk/fuse/machines/specplus3.c, trunk/fuse/machines/specplus3.h, + trunk/fuse/machines/specplus3e.c, trunk/fuse/machines/tc2048.c, + trunk/fuse/machines/tc2068.c, trunk/fuse/machines/tc2068.h, + trunk/fuse/machines/ts2068.c, trunk/fuse/man/fuse.1, + trunk/fuse/memory.h, trunk/fuse/menu.c, trunk/fuse/menu_data.dat, + trunk/fuse/menu_data.pl, trunk/fuse/periph.c, + trunk/fuse/periph.h, trunk/fuse/pokefinder/Makefile.am, + trunk/fuse/pokefinder/pokefinder.c, trunk/fuse/printer.c, + trunk/fuse/profile.c, trunk/fuse/profile.h, + trunk/fuse/roms/Makefile.am, trunk/fuse/roms/gluck.rom, + trunk/fuse/roms/plus3e-0.rom, trunk/fuse/roms/plus3e-1.rom, + trunk/fuse/roms/plus3e-2.rom, trunk/fuse/rzx.c, + trunk/fuse/settings.dat, trunk/fuse/settings.pl, + trunk/fuse/snapshot.c, trunk/fuse/sound.c, + trunk/fuse/sound/Makefile.am, trunk/fuse/sound/alsasound.c, + trunk/fuse/sound/aosound.c, trunk/fuse/sound/dxsound.c, + trunk/fuse/sound/hpsound.c, trunk/fuse/sound/nullsound.c, + trunk/fuse/sound/osssound.c, trunk/fuse/sound/sdlsound.c, + trunk/fuse/sound/sfifo.c, trunk/fuse/sound/sunsound.c, + trunk/fuse/spectrum.h, trunk/fuse/tape.c, + trunk/fuse/timer/Makefile.am, trunk/fuse/timer/timer.c, + trunk/fuse/timer/unix.c, trunk/fuse/trdos.c, trunk/fuse/trdos.h, + trunk/fuse/ui.c, trunk/fuse/ui/Makefile.am, + trunk/fuse/ui/cocoa/cocoaui.m, trunk/fuse/ui/fb/Makefile.am, + trunk/fuse/ui/fb/fbdisplay.c, trunk/fuse/ui/fb/fbjoystick.c, + trunk/fuse/ui/fb/fbkeyboard.c, trunk/fuse/ui/fb/fbmouse.c, + trunk/fuse/ui/fb/fbui.c, trunk/fuse/ui/ggi, + trunk/fuse/ui/gtk/Makefile.am, trunk/fuse/ui/gtk/binary.c, + trunk/fuse/ui/gtk/browse.c, trunk/fuse/ui/gtk/confirm.c, + trunk/fuse/ui/gtk/debugger.c, trunk/fuse/ui/gtk/fileselector.c, + trunk/fuse/ui/gtk/gtkdisplay.c, trunk/fuse/ui/gtk/gtkjoystick.c, + trunk/fuse/ui/gtk/gtkkeyboard.c, trunk/fuse/ui/gtk/gtkmouse.c, + trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/gtk/memory.c, + trunk/fuse/ui/gtk/options-header.pl, + trunk/fuse/ui/gtk/options.pl, trunk/fuse/ui/gtk/picture.c, + trunk/fuse/ui/gtk/pokefinder.c, trunk/fuse/ui/gtk/rollback.c, + trunk/fuse/ui/gtk/roms.c, trunk/fuse/ui/gtk/statusbar.c, + trunk/fuse/ui/options.dat, trunk/fuse/ui/scaler/Makefile.am, + trunk/fuse/ui/scaler/scaler.c, trunk/fuse/ui/scaler/scalers.cpp, + trunk/fuse/ui/sdl/Makefile.am, trunk/fuse/ui/sdl/sdldisplay.c, + trunk/fuse/ui/sdl/sdljoystick.c, trunk/fuse/ui/sdl/sdlkeyboard.c, + trunk/fuse/ui/sdl/sdlui.c, trunk/fuse/ui/svga/Makefile.am, + trunk/fuse/ui/svga/svgadisplay.c, + trunk/fuse/ui/svga/svgajoystick.c, + trunk/fuse/ui/svga/svgakeyboard.c, trunk/fuse/ui/svga/svgaui.c, + trunk/fuse/ui/ui.h, trunk/fuse/ui/uijoystick.c, + trunk/fuse/ui/win32/Makefile.am, trunk/fuse/ui/win32/debugger.c, + trunk/fuse/ui/win32/error.c, trunk/fuse/ui/win32/menu_data.c, + trunk/fuse/ui/win32/menu_data.h, + trunk/fuse/ui/win32/menu_data.rc, + trunk/fuse/ui/win32/options-header.pl, + trunk/fuse/ui/win32/options-resource.pl, + trunk/fuse/ui/win32/options.pl, trunk/fuse/ui/win32/pokefinder.c, + trunk/fuse/ui/win32/statusbar.c, + trunk/fuse/ui/win32/win32display.c, + trunk/fuse/ui/win32/win32display.h, + trunk/fuse/ui/win32/win32internals.h, + trunk/fuse/ui/win32/win32keyboard.c, + trunk/fuse/ui/win32/win32ui.c, trunk/fuse/ui/xlib/Makefile.am, + trunk/fuse/ui/xlib/xdisplay.c, trunk/fuse/ui/xlib/xerror.c, + trunk/fuse/ui/xlib/xjoystick.c, trunk/fuse/ui/xlib/xkeyboard.c, + trunk/fuse/ui/xlib/xui.c, trunk/fuse/utils.c, trunk/fuse/utils.h, + trunk/fuse/widget/Makefile.am, trunk/fuse/widget/browse.c, + trunk/fuse/widget/debugger.c, trunk/fuse/widget/error.c, + trunk/fuse/widget/filesel.c, trunk/fuse/widget/memory.c, + trunk/fuse/widget/menu.c, trunk/fuse/widget/options.pl, + trunk/fuse/widget/picture.c, trunk/fuse/widget/pokefinder.c, + trunk/fuse/widget/query.c, trunk/fuse/widget/roms.c, + trunk/fuse/widget/select.c, trunk/fuse/widget/text.c, + trunk/fuse/widget/widget.c, trunk/fuse/widget/widget.h, + trunk/fuse/widget/widget_internals.h, trunk/fuse/z80/Makefile.am, + trunk/fuse/z80/coretest.c, trunk/fuse/z80/z80.c, + trunk/fuse/z80/z80.pl, trunk/fuse/z80/z80_checks.h, + trunk/fuse/z80/z80_ops.c, trunk/libspectrum/libspectrum.h, + trunk/libspectrum/libspectrum/ChangeLog, + trunk/libspectrum/libspectrum/Makefile.am, + trunk/libspectrum/libspectrum/configure.in, + trunk/libspectrum/libspectrum/csw.c, + trunk/libspectrum/libspectrum/doc/libspectrum.txt, + trunk/libspectrum/libspectrum/generate.pl.in, + trunk/libspectrum/libspectrum/hacking/ChangeLog, + trunk/libspectrum/libspectrum/libspectrum.c, + trunk/libspectrum/libspectrum/libspectrum.h.in, + trunk/libspectrum/libspectrum/plusd.c, + trunk/libspectrum/libspectrum/rzx.c, + trunk/libspectrum/libspectrum/sna.c, + trunk/libspectrum/libspectrum/szx.c, + trunk/libspectrum/libspectrum/tape.c, + trunk/libspectrum/libspectrum/test/Makefile.am, + trunk/libspectrum/libspectrum/test/complete-tzx.pl, + trunk/libspectrum/libspectrum/test/edges.c, + trunk/libspectrum/libspectrum/test/invalid-warajevo-blockoffset.tap, + trunk/libspectrum/libspectrum/test/jump.tzx, + trunk/libspectrum/libspectrum/test/loop2.tzx, + trunk/libspectrum/libspectrum/test/test.c, + trunk/libspectrum/libspectrum/test/test.h, + trunk/libspectrum/libspectrum/test/test15.c, + trunk/libspectrum/libspectrum/timings.c, + trunk/libspectrum/libspectrum/z80.c: Merge up to vendor r3254. + +2007-11-09 23:10 fredm + + * trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj, + trunk/audiofile/audiofile.xcodeproj/project.pbxproj, trunk/bzip2, + trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/lib765/lib765.xcodeproj/project.pbxproj, + trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj, + trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj: Move to + XCode 2.5 and 10.4 target for all frameworks. Link to libbz2 in + /usr/lib instead of framework. + +2007-11-09 22:38 fredm + + * trunk/fuse/TODO: Update for last few changes. + +2007-08-15 23:23 fredm + + * trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib, + trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib: Disable + Tape->Record menu item when tape traps are enabled. + +2007-08-14 14:04 fredm + + * trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m, + trunk/fuse/settings.dat: Refactor display link starting and + stopping and try to only stop and start the + display link at appropriate times, add support for panoramic + fullscreen mode. + +2007-08-12 05:49 fredm + + * trunk/fuse/fusepb/controllers/PreferencesController.m, + trunk/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib, + trunk/fuse/fusepb/views/DisplayOpenGLView.h, + trunk/fuse/fusepb/views/DisplayOpenGLView.m, + trunk/fuse/settings.dat, trunk/fuse/ui/cocoa/cocoadisplay.m: + Rollback revision 434 now we understand what was causing the + texture + distortion. + +2007-08-12 00:30 fredm + + * trunk/fuse/fusepb/views/DisplayOpenGLView.m: Use correct offset + for emulator top right texture. + +2007-08-06 02:39 fredm + + * trunk/lib765/lib765/config.h, trunk/lib765/libdsk/config.h: Bump + version numbers in config.h headers. + +2007-08-06 02:24 fredm + + * trunk/fuse/Makefile.am, trunk/fuse/compat.h, + trunk/fuse/compat/Makefile.am, trunk/fuse/compat/amiga, + trunk/fuse/compat/amiga/Makefile.am, + trunk/fuse/compat/amiga/paths.c, trunk/fuse/compat/dirname.c, + trunk/fuse/compat/getopt.c, trunk/fuse/compat/getopt1.c, + trunk/fuse/compat/mkstemp.c, trunk/fuse/compat/morphos, + trunk/fuse/compat/morphos/Makefile.am, + trunk/fuse/compat/morphos/osname.c, trunk/fuse/compat/unix, + trunk/fuse/compat/unix/Makefile.am, + trunk/fuse/compat/unix/osname.c, trunk/fuse/compat/unix/paths.c, + trunk/fuse/compat/win32, trunk/fuse/compat/win32/Makefile.am, + trunk/fuse/compat/win32/osname.c, + trunk/fuse/compat/win32/paths.c, trunk/fuse/configure.in, + trunk/fuse/event.c, trunk/fuse/fuse.cpp, + trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj, + trunk/fuse/fusepb/Info-Fuse.plist, trunk/fuse/fusepb/config.h, + trunk/fuse/hacking/ChangeLog, trunk/fuse/machines/tc2048.c, + trunk/fuse/menu_data.pl, trunk/fuse/printer.c, trunk/fuse/rzx.c, + trunk/fuse/settings.pl, trunk/fuse/sound.c, + trunk/fuse/sound/Makefile.am, trunk/fuse/sound/alsasound.c, + trunk/fuse/sound/aosound.c, trunk/fuse/sound/coreaudiosound.c, + trunk/fuse/sound/dxsound.c, trunk/fuse/sound/hpsound.c, + trunk/fuse/sound/lowlevel.h, trunk/fuse/sound/nullsound.c, + trunk/fuse/sound/osssound.c, trunk/fuse/sound/sdlsound.c, + trunk/fuse/sound/sfifo.c, trunk/fuse/sound/sunsound.c, + trunk/fuse/spectrum.c, trunk/fuse/tape.c, trunk/fuse/tape.h, + trunk/fuse/timer, trunk/fuse/timer.c, trunk/fuse/timer.h, + trunk/fuse/timer/Makefile.am, trunk/fuse/timer/sdl.c, + trunk/fuse/timer/timer.c, trunk/fuse/timer/timer.h, + trunk/fuse/timer/unix.c, trunk/fuse/timer/win32.c, + trunk/fuse/trdos.c, trunk/fuse/ui/gtk/debugger.c, + trunk/fuse/ui/gtk/gtkjoystick.c, trunk/fuse/ui/gtk/gtkmouse.c, + trunk/fuse/ui/gtk/gtkui.c, trunk/fuse/ui/gtk/pokefinder.c, + trunk/fuse/ui/gtk/stock.c, trunk/fuse/ula.c, trunk/fuse/utils.c, + trunk/fuse/widget/widget.c, trunk/fuse/z80/coretest.c: Merge up + to vendor revision 3095. + +2007-08-06 01:11 fredm + + * trunk/lib765/Info.plist, trunk/lib765/config.h, + trunk/lib765/lib765.xcodeproj/project.pbxproj, + trunk/lib765/lib765/ChangeLog, trunk/lib765/lib765/configure, + trunk/lib765/lib765/configure.in, + trunk/lib765/lib765/lib/765ldsk.c, + trunk/lib765/lib765/lib/Makefile.am, + trunk/lib765/lib765/lib/Makefile.in, + trunk/lib765/libdsk/ChangeLog, trunk/lib765/libdsk/configure, + trunk/lib765/libdsk/configure.in, + trunk/lib765/libdsk/doc/libdsk.lyx, + trunk/lib765/libdsk/doc/libdsk.pdf, + trunk/lib765/libdsk/doc/libdsk.txt, + trunk/lib765/libdsk/dos16ppd/Makefile, + trunk/lib765/libdsk/dos32gcc/Makefile, + trunk/lib765/libdsk/include/libdsk.h, + trunk/lib765/libdsk/lib/Makefile.am, + trunk/lib765/libdsk/lib/Makefile.in, + trunk/lib765/libdsk/lib/drivers.h, + trunk/lib765/libdsk/lib/drivers.inc, + trunk/lib765/libdsk/lib/drvlogi.c, + trunk/lib765/libdsk/lib/drvlogi.h, + trunk/lib765/libdsk/lib/drvtele.c, + trunk/lib765/libdsk/lib/drvtele.h, + trunk/lib765/libdsk/lib/dsksgeom.c, + trunk/lib765/libdsk/man/apriboot.1, + trunk/lib765/libdsk/man/dskdump.1, + trunk/lib765/libdsk/man/dskform.1, + trunk/lib765/libdsk/man/dskid.1, + trunk/lib765/libdsk/man/dskscan.1, + trunk/lib765/libdsk/man/dsktrans.1, + trunk/lib765/libdsk/man/dskutil.1, + trunk/lib765/libdsk/man/md3serial.1, + trunk/lib765/libdsk/tools/dsktrans.c, + trunk/lib765/libdsk/win16bc5/libdsk.ide, + trunk/lib765/libdsk/win16vc1/LIBDSK16.MAK, + trunk/lib765/libdsk/win32bc5/libdsk.ide, + trunk/lib765/libdsk/win32vc6/atlibdsk.dsp, + trunk/lib765/libdsk/win32vc6/atlibdsk.h, + trunk/lib765/libdsk/win32vc6/atlibdsk_i.c, + trunk/lib765/libdsk/win32vc6/atlibdsk_p.c, + trunk/lib765/libdsk/win32vc6/libdsk.dsp: Merge up to vendor + libdsk-1.1.14 and lib765-0.4.1. + +2007-08-03 10:15 fredm + + * trunk/fuse/fusepb/controllers/FuseController.h, + trunk/fuse/fusepb/controllers/FuseController.m: Remove obsolete + key release methods. + +2007-07-28 12:44 fredm + + * trunk/fuse/fusepb/views/DisplayOpenGLView.m: Don't run the + display link when the emulator is paused or we don't have a + screen + texture initialised. + +2007-07-28 03:39 fredm + + * trunk/fuse/ChangeLog, trunk/fuse/configure.in, + trunk/fuse/disk/Makefile.am, trunk/fuse/disk/plusd.c, + trunk/fuse/disk/plusd.h, trunk/fuse/disk/wd1770.c, + trunk/fuse/disk/wd1770.h, trunk/fuse/divide.c, + trunk/fuse/fusepb/English.lproj/InfoPlist.strings, + trunk/fuse/fusepb/Info-Fuse.plist, trunk/fuse/fusepb/config.h, + trunk/fuse/hacking/ChangeLog, trunk/fuse/if1.c, trunk/fuse/if2.c, + trunk/fuse/joystick.c, trunk/fuse/kempmouse.c, + trunk/fuse/keyboard.c, trunk/fuse/machines/specplus3.c, + trunk/fuse/memory.c, trunk/fuse/module.c, trunk/fuse/module.h, + trunk/fuse/periph.c, trunk/fuse/printer.c, trunk/fuse/scld.c, + trunk/fuse/simpleide.c, trunk/fuse/sound/alsasound.c, + trunk/fuse/sound/sfifo.c, trunk/fuse/tape.c, + trunk/fuse/ui/ggi/ggi_internals.h, + trunk/fuse/ui/ggi/ggidisplay.c, trunk/fuse/ui/ggi/ggikeyboard.c, + trunk/fuse/ui/ggi/ggiui.c, trunk/fuse/ui/gtk/browse.c, + trunk/fuse/ui/gtk/debugger.c, trunk/fuse/ui/gtk/gtkjoystick.c, + trunk/fuse/ui/gtk/gtkmouse.c, trunk/fuse/ui/gtk/gtkui.c, + trunk/fuse/ui/gtk/pokefinder.c, trunk/fuse/ui/gtk/rollback.c, + trunk/fuse/ui/win32/debugger.c, trunk/fuse/ui/win32/error.c, + trunk/fuse/ui/win32/icons/Makefile.am, + trunk/fuse/ui/win32/menu_data.c, trunk/fuse/ui/win32/menu_data.h, + trunk/fuse/ui/win32/menu_data.rc, + trunk/fuse/ui/win32/statusbar.c, + trunk/fuse/ui/win32/win32display.c, + trunk/fuse/ui/win32/win32display.h, + trunk/fuse/ui/win32/win32ui.c, trunk/fuse/utils.c, + trunk/fuse/utils.h, trunk/fuse/z80/Makefile.am, + trunk/fuse/z80/coretest.c, trunk/fuse/z80/harness.pl, + trunk/fuse/z80/tests/00.in, trunk/fuse/z80/tests/00.out, + trunk/fuse/z80/tests/01.in, trunk/fuse/z80/tests/01.out, + trunk/fuse/z80/tests/02.in, trunk/fuse/z80/tests/02.out, + trunk/fuse/z80/tests/03.in, trunk/fuse/z80/tests/03.out, + trunk/fuse/z80/tests/04.in, trunk/fuse/z80/tests/04.out, + trunk/fuse/z80/tests/05.in, trunk/fuse/z80/tests/05.out, + trunk/fuse/z80/tests/06.in, trunk/fuse/z80/tests/06.out, + trunk/fuse/z80/tests/07.in, trunk/fuse/z80/tests/07.out, + trunk/fuse/z80/tests/08.in, trunk/fuse/z80/tests/08.out, + trunk/fuse/z80/tests/09.in, trunk/fuse/z80/tests/09.out, + trunk/fuse/z80/tests/0a.in, trunk/fuse/z80/tests/0a.out, + trunk/fuse/z80/te... [truncated message content] |
From: <fr...@us...> - 2008-12-04 20:04:51
|
Revision: 563 http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=563&view=rev Author: fredm Date: 2008-12-04 20:04:46 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Add correct release tag. Added Paths: ----------- tags/Release-0_10_0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |