[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [267] branches/fusegl/fuse/fusepb
Brought to you by:
fredm
From: <fr...@us...> - 2006-12-27 12:14:21
|
Revision: 267 http://svn.sourceforge.net/fuse-for-macosx/?rev=267&view=rev Author: fredm Date: 2006-12-27 04:14:20 -0800 (Wed, 27 Dec 2006) Log Message: ----------- Remove references to SDL joysticks, the HID looks nasty though :/ Modified Paths: -------------- branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj branches/fusegl/fuse/fusepb/controllers/PreferencesController.m branches/fusegl/fuse/fusepb/nibs/Preferences.nib/info.nib branches/fusegl/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib Added Paths: ----------- branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.h branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.m Removed Paths: ------------- branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.h branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m Modified: branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj =================================================================== --- branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2006-12-26 12:43:45 UTC (rev 266) +++ branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2006-12-27 12:14:20 UTC (rev 267) @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + B615BFE70B4261E50082D535 /* HIDJoysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B615BFE50B4261E50082D535 /* HIDJoysticks.h */; }; + 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 */; }; B61F459509121DF100C8096C /* tape_16.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F4076596FD00DE7E81 /* tape_16.szx */; }; @@ -94,7 +96,6 @@ B61F45F309121DF100C8096C /* MachineNameToIdTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B67F3CC307EE0A130045339F /* MachineNameToIdTransformer.h */; }; B61F45F409121DF100C8096C /* CAMachines.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CC82FF0800E408006EFFB9 /* CAMachines.h */; }; B61F45F509121DF100C8096C /* Joysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C740D90810BB0500AB170C /* Joysticks.h */; }; - B61F45F609121DF100C8096C /* SDLJoysticks.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C741110810C4A500AB170C /* SDLJoysticks.h */; }; B61F45F709121DF100C8096C /* VolumeSliderToPrefTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B66D6C9608115FC200FAE6F3 /* VolumeSliderToPrefTransformer.h */; }; B61F45F809121DF100C8096C /* ScalerNameToIdTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = B67F3C1407ED1C9D0045339F /* ScalerNameToIdTransformer.h */; }; B61F45F909121DF100C8096C /* profile.h in Headers */ = {isa = PBXBuildFile; fileRef = B6E811F1084B5117008CF718 /* profile.h */; }; @@ -234,7 +235,6 @@ B61F468E09121DF100C8096C /* MachineNameToIdTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = B67F3CC407EE0A130045339F /* MachineNameToIdTransformer.m */; }; B61F468F09121DF100C8096C /* CAMachines.m in Sources */ = {isa = PBXBuildFile; fileRef = B6CC83000800E408006EFFB9 /* CAMachines.m */; }; B61F469009121DF100C8096C /* Joysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C740DA0810BB0500AB170C /* Joysticks.m */; }; - B61F469109121DF100C8096C /* SDLJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C741120810C4A500AB170C /* SDLJoysticks.m */; }; B61F469209121DF100C8096C /* VolumeSliderToPrefTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = B66D6C9708115FC200FAE6F3 /* VolumeSliderToPrefTransformer.m */; }; B61F469309121DF100C8096C /* profile.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E811F0084B5117008CF718 /* profile.c */; }; B61F469409121DF100C8096C /* ide.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E811F4084B5148008CF718 /* ide.c */; }; @@ -357,6 +357,8 @@ 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>"; }; + 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>"; }; B61EF5B905FED7930081DF70 /* hq3x.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hq3x.cpp; path = scaler/hq3x.cpp; sourceTree = SOURCE_ROOT; }; B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; }; @@ -487,8 +489,6 @@ B6C691B704C20A42005EE041 /* joystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = joystick.c; path = ../joystick.c; sourceTree = SOURCE_ROOT; }; B6C740D90810BB0500AB170C /* Joysticks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Joysticks.h; path = content_arrays/Joysticks.h; sourceTree = SOURCE_ROOT; }; B6C740DA0810BB0500AB170C /* Joysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = Joysticks.m; path = content_arrays/Joysticks.m; sourceTree = SOURCE_ROOT; }; - B6C741110810C4A500AB170C /* SDLJoysticks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDLJoysticks.h; path = content_arrays/SDLJoysticks.h; sourceTree = SOURCE_ROOT; }; - B6C741120810C4A500AB170C /* SDLJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SDLJoysticks.m; path = content_arrays/SDLJoysticks.m; sourceTree = SOURCE_ROOT; }; B6C8696A06561155003000A6 /* hq2x.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hq2x.h; path = scaler/hq2x.h; sourceTree = SOURCE_ROOT; }; B6C8696B06561155003000A6 /* hq3x.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hq3x.h; path = scaler/hq3x.h; sourceTree = SOURCE_ROOT; }; B6C86978065611B3003000A6 /* intern.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = intern.h; path = scaler/intern.h; sourceTree = SOURCE_ROOT; }; @@ -950,10 +950,10 @@ children = ( B6CC82FF0800E408006EFFB9 /* CAMachines.h */, B6CC83000800E408006EFFB9 /* CAMachines.m */, + B615BFE50B4261E50082D535 /* HIDJoysticks.h */, + B615BFE60B4261E50082D535 /* HIDJoysticks.m */, B6C740D90810BB0500AB170C /* Joysticks.h */, B6C740DA0810BB0500AB170C /* Joysticks.m */, - B6C741110810C4A500AB170C /* SDLJoysticks.h */, - B6C741120810C4A500AB170C /* SDLJoysticks.m */, ); name = "Content Arrays"; sourceTree = "<group>"; @@ -1213,7 +1213,6 @@ B61F45F309121DF100C8096C /* MachineNameToIdTransformer.h in Headers */, B61F45F409121DF100C8096C /* CAMachines.h in Headers */, B61F45F509121DF100C8096C /* Joysticks.h in Headers */, - B61F45F609121DF100C8096C /* SDLJoysticks.h in Headers */, B61F45F709121DF100C8096C /* VolumeSliderToPrefTransformer.h in Headers */, B61F45F809121DF100C8096C /* ScalerNameToIdTransformer.h in Headers */, B61F45F909121DF100C8096C /* profile.h in Headers */, @@ -1227,6 +1226,7 @@ B6CE7F440B2830A300EB65B3 /* cocoaui.h in Headers */, B6CE7FCD0B28FBD600EB65B3 /* DisplayOpenGLView.h in Headers */, B6A6F11F0B3EA737000B88E9 /* cocoascreenshot.h in Headers */, + B615BFE70B4261E50082D535 /* HIDJoysticks.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1446,7 +1446,6 @@ B61F468E09121DF100C8096C /* MachineNameToIdTransformer.m in Sources */, B61F468F09121DF100C8096C /* CAMachines.m in Sources */, B61F469009121DF100C8096C /* Joysticks.m in Sources */, - B61F469109121DF100C8096C /* SDLJoysticks.m in Sources */, B61F469209121DF100C8096C /* VolumeSliderToPrefTransformer.m in Sources */, B61F469309121DF100C8096C /* profile.c in Sources */, B61F469409121DF100C8096C /* ide.c in Sources */, @@ -1464,6 +1463,7 @@ B6A6F0DA0B3D141B000B88E9 /* cocoaui.m in Sources */, B6A6F10E0B3D6360000B88E9 /* cocoaerror.m in Sources */, B6A6F1200B3EA737000B88E9 /* cocoascreenshot.m in Sources */, + B615BFE80B4261E50082D535 /* HIDJoysticks.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Copied: branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.h (from rev 265, branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.h) =================================================================== --- branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.h (rev 0) +++ branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.h 2006-12-27 12:14:20 UTC (rev 267) @@ -0,0 +1,46 @@ +/* HIDJoysticks.h: Object encapsulating SDL joysticks + Copyright (c) 2005 Fredrick Meunier + + $Id: HIDJoysticks.h,v 1.1 2005/04/18 02:55:20 fred Exp $ + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Author contact information: + + E-mail: pak...@sr... + Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England + +*/ + +#import <Cocoa/Cocoa.h> + +@interface HIDJoystick : NSObject <NSCoding> +{ + NSString *name; + int type; +} + ++ (NSArray *)allJoysticks; ++ (id)joystickWithName:(NSString *)aTitle andType:(int)aValue; ++ (HIDJoystick *)joystickForName:(NSString *)theName; ++ (HIDJoystick *)joystickForType:(int)theType; +- (int)joystickType; +- (void)setJoystickType:(int)aValue; +- (NSString *)joystickName; +- (void)setJoystickName:(NSString *)aName; + +- (id)copyWithZone:(NSZone *)zone; +- (id)valueForUndefinedKey:(NSString *)key; +@end Copied: branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.m (from rev 265, branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m) =================================================================== --- branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.m (rev 0) +++ branches/fusegl/fuse/fusepb/content_arrays/HIDJoysticks.m 2006-12-27 12:14:20 UTC (rev 267) @@ -0,0 +1,170 @@ +/* HIDJoysticks.m: Object encapsulating Mac OS X HID joysticks + Copyright (c) 2005 Fredrick Meunier + + $Id: HIDJoysticks.m,v 1.1 2005/04/18 02:55:20 fred Exp $ + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Author contact information: + + E-mail: pak...@sr... + Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England + +*/ + +#import "HIDJoysticks.h" + +#include <libspectrum.h> + +#include "joystick.h" + +@implementation HIDJoystick + +// Predefined global list of joysticks ++ (NSArray *)allJoysticks +{ + static NSMutableArray *joysticks; + if (!joysticks) { + size_t i; + + joysticks = [NSMutableArray arrayWithCapacity:joysticks_supported+1]; + + [joysticks addObject:[HIDJoystick joystickWithName:@"None" andType:0]]; +#if 0 + if( joysticks_supported > 0 ){ + for( i=0; i<joysticks_supported; i++ ) { + [joysticks addObject: + [HIDJoystick joystickWithName:[NSString stringWithUTF8String: + HID_JoystickName(i)] + andType:i+1] + ]; + } + } +#endif + } + return joysticks; +} + +// Retrieve joystick with given name from 'allHIDJoysticks' +// (see NSCoding methods). ++ (HIDJoystick *)joystickForName:(NSString *)theName +{ + NSEnumerator *joystickEnumerator = [[HIDJoystick allJoysticks] objectEnumerator]; + HIDJoystick *joystick; + while ((joystick = [joystickEnumerator nextObject])) { + if ([[joystick joystickName] isEqual:theName]) { + return joystick; + } + } + return nil; +} + +// Retrieve joystick with given type from 'allJoysticks' +// (see NSCoding methods). ++ (HIDJoystick *)joystickForType:(int)theType +{ + NSEnumerator *joystickEnumerator = [[HIDJoystick allJoysticks] objectEnumerator]; + HIDJoystick *joystick; + while ((joystick = [joystickEnumerator nextObject])) { + if (theType == [joystick joystickType]) { + return joystick; + } + } + return nil; +} + + +// Convenience constructor ++ (id)joystickWithName:(NSString *)aName andType:(int)aValue +{ + id newJoystick = [[[self alloc] init] autorelease]; + [newJoystick setJoystickName:aName]; + [newJoystick setJoystickType:aValue]; + + return newJoystick; +} + +/* + NSCoding methods + To encode, simply save 'type'; on decode, replace self with + the existing instance from 'allJoysticks' with the same type + */ +- (void)encodeWithCoder:(NSCoder *)encoder +{ + if ( [encoder allowsKeyedCoding] ) { + [encoder encodeInt: type forKey:@"priority"]; + } else { + [encoder encodeValueOfObjCType:@encode(int) at:&type]; + } +} + +- (id)initWithCoder:(NSCoder *)decoder +{ + int theType = 0; + if ( [decoder allowsKeyedCoding] ) { + theType = [decoder decodeIntForKey:@"type"]; + } else { + [decoder decodeValueOfObjCType:@encode(int) at:&type]; + } + [self autorelease]; + // returning "static" object from init method -- ensure retain count maintained + return [[HIDJoystick joystickForType:theType] retain]; +} + + +// Accessors +- (NSString *)joystickName +{ + return name; +} + +- (void)setJoystickName:(NSString *)aName +{ + if (name != aName) { + [name release]; + name = [aName copy]; + } + return; +} + +- (int)joystickType +{ + return type; +} + +- (void)setJoystickType:(int)aValue +{ + type = aValue; +} + +- (void)dealloc +{ + [self setJoystickName:nil]; + [super dealloc]; +} + +- (id)copyWithZone:(NSZone *)zone +{ + [self retain]; + return self; +} + +- (id)valueForUndefinedKey:(NSString *)key +{ +fprintf(stderr,"Undefined key:'%s'\n",[key UTF8String]); +return nil; +} + +@end Deleted: branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.h =================================================================== --- branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.h 2006-12-26 12:43:45 UTC (rev 266) +++ branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.h 2006-12-27 12:14:20 UTC (rev 267) @@ -1,46 +0,0 @@ -/* SDLJoysticks.h: Object encapsulating SDL joysticks - Copyright (c) 2005 Fredrick Meunier - - $Id: SDLJoysticks.h,v 1.1 2005/04/18 02:55:20 fred Exp $ - - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Author contact information: - - E-mail: pak...@sr... - Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England - -*/ - -#import <Cocoa/Cocoa.h> - -@interface SDLJoystick : NSObject <NSCoding> -{ - NSString *name; - int type; -} - -+ (NSArray *)allJoysticks; -+ (id)joystickWithName:(NSString *)aTitle andType:(int)aValue; -+ (SDLJoystick *)joystickForName:(NSString *)theName; -+ (SDLJoystick *)joystickForType:(int)theType; -- (int)joystickType; -- (void)setJoystickType:(int)aValue; -- (NSString *)joystickName; -- (void)setJoystickName:(NSString *)aName; - -- (id)copyWithZone:(NSZone *)zone; -- (id)valueForUndefinedKey:(NSString *)key; -@end Deleted: branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m =================================================================== --- branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m 2006-12-26 12:43:45 UTC (rev 266) +++ branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m 2006-12-27 12:14:20 UTC (rev 267) @@ -1,172 +0,0 @@ -/* SDLJoysticks.m: Object encapsulating libspectrum joysticks - Copyright (c) 2005 Fredrick Meunier - - $Id: SDLJoysticks.m,v 1.1 2005/04/18 02:55:20 fred Exp $ - - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Author contact information: - - E-mail: pak...@sr... - Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England - -*/ - -//#include <SDL.h> - -#import "SDLJoysticks.h" - -#include <libspectrum.h> - -#include "joystick.h" - -@implementation SDLJoystick - -// Predefined global list of joysticks -+ (NSArray *)allJoysticks -{ - static NSMutableArray *joysticks; - if (!joysticks) { - size_t i; - - joysticks = [NSMutableArray arrayWithCapacity:joysticks_supported+1]; - - [joysticks addObject:[SDLJoystick joystickWithName:@"None" andType:0]]; -#if 0 - if( joysticks_supported > 0 ){ - for( i=0; i<joysticks_supported; i++ ) { - [joysticks addObject: - [SDLJoystick joystickWithName:[NSString stringWithUTF8String: - SDL_JoystickName(i)] - andType:i+1] - ]; - } - } -#endif - } - return joysticks; -} - -// Retrieve joystick with given name from 'allSDLJoysticks' -// (see NSCoding methods). -+ (SDLJoystick *)joystickForName:(NSString *)theName -{ - NSEnumerator *joystickEnumerator = [[SDLJoystick allJoysticks] objectEnumerator]; - SDLJoystick *joystick; - while ((joystick = [joystickEnumerator nextObject])) { - if ([[joystick joystickName] isEqual:theName]) { - return joystick; - } - } - return nil; -} - -// Retrieve joystick with given type from 'allJoysticks' -// (see NSCoding methods). -+ (SDLJoystick *)joystickForType:(int)theType -{ - NSEnumerator *joystickEnumerator = [[SDLJoystick allJoysticks] objectEnumerator]; - SDLJoystick *joystick; - while ((joystick = [joystickEnumerator nextObject])) { - if (theType == [joystick joystickType]) { - return joystick; - } - } - return nil; -} - - -// Convenience constructor -+ (id)joystickWithName:(NSString *)aName andType:(int)aValue -{ - id newJoystick = [[[self alloc] init] autorelease]; - [newJoystick setJoystickName:aName]; - [newJoystick setJoystickType:aValue]; - - return newJoystick; -} - -/* - NSCoding methods - To encode, simply save 'type'; on decode, replace self with - the existing instance from 'allJoysticks' with the same type - */ -- (void)encodeWithCoder:(NSCoder *)encoder -{ - if ( [encoder allowsKeyedCoding] ) { - [encoder encodeInt: type forKey:@"priority"]; - } else { - [encoder encodeValueOfObjCType:@encode(int) at:&type]; - } -} - -- (id)initWithCoder:(NSCoder *)decoder -{ - int theType = 0; - if ( [decoder allowsKeyedCoding] ) { - theType = [decoder decodeIntForKey:@"type"]; - } else { - [decoder decodeValueOfObjCType:@encode(int) at:&type]; - } - [self autorelease]; - // returning "static" object from init method -- ensure retain count maintained - return [[SDLJoystick joystickForType:theType] retain]; -} - - -// Accessors -- (NSString *)joystickName -{ - return name; -} - -- (void)setJoystickName:(NSString *)aName -{ - if (name != aName) { - [name release]; - name = [aName copy]; - } - return; -} - -- (int)joystickType -{ - return type; -} - -- (void)setJoystickType:(int)aValue -{ - type = aValue; -} - -- (void)dealloc -{ - [self setJoystickName:nil]; - [super dealloc]; -} - -- (id)copyWithZone:(NSZone *)zone -{ - [self retain]; - return self; -} - -- (id)valueForUndefinedKey:(NSString *)key -{ -fprintf(stderr,"Undefined key:'%s'\n",[key UTF8String]); -return nil; -} - -@end Modified: branches/fusegl/fuse/fusepb/controllers/PreferencesController.m =================================================================== --- branches/fusegl/fuse/fusepb/controllers/PreferencesController.m 2006-12-26 12:43:45 UTC (rev 266) +++ branches/fusegl/fuse/fusepb/controllers/PreferencesController.m 2006-12-27 12:14:20 UTC (rev 267) @@ -34,7 +34,7 @@ #import "PreferencesController.h" #import "CAMachines.h" #import "Joysticks.h" -#import "SDLJoysticks.h" +#import "HIDJoysticks.h" #include "fuse.h" #include "joystick.h" @@ -186,7 +186,7 @@ - (NSArray *)sdlJoysticks { - return [SDLJoystick allJoysticks]; + return [HIDJoystick allJoysticks]; } - (IBAction)chooseROMFile:(id)sender Modified: branches/fusegl/fuse/fusepb/nibs/Preferences.nib/info.nib =================================================================== --- branches/fusegl/fuse/fusepb/nibs/Preferences.nib/info.nib 2006-12-26 12:43:45 UTC (rev 266) +++ branches/fusegl/fuse/fusepb/nibs/Preferences.nib/info.nib 2006-12-27 12:14:20 UTC (rev 267) @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>112 18 356 240 0 0 1440 878 </string> + <string>100 79 356 240 0 0 1440 878 </string> <key>IBFramework Version</key> <string>446.1</string> <key>IBGroupedObjects</key> @@ -25,7 +25,7 @@ <integer>5</integer> </array> <key>IBSystem Version</key> - <string>8J2135</string> + <string>8L2127</string> <key>IBUsesTextArchiving</key> <true/> </dict> Modified: branches/fusegl/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib =================================================================== --- branches/fusegl/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2006-12-26 12:43:45 UTC (rev 266) +++ branches/fusegl/fuse/fusepb/nibs/Preferences.nib/keyedobjects.nib 2006-12-27 12:14:20 UTC (rev 267) @@ -142,7 +142,7 @@ <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>75</integer> </dict> <key>NS.objects</key> <array> @@ -641,12 +641,12 @@ <key>$class</key> <dict> <key>CF$UID</key> - <integer>197</integer> + <integer>118</integer> </dict> <key>NSFrame</key> <dict> <key>CF$UID</key> - <integer>323</integer> + <integer>308</integer> </dict> <key>NSNextResponder</key> <dict> @@ -656,7 +656,7 @@ <key>NSSubviews</key> <dict> <key>CF$UID</key> - <integer>253</integer> + <integer>207</integer> </dict> </dict> <string>{{18, 103}, {105, 18}}</string> @@ -1163,7 +1163,7 @@ <key>$class</key> <dict> <key>CF$UID</key> - <integer>197</integer> + <integer>118</integer> </dict> <key>NSFrame</key> <dict> @@ -1185,7 +1185,7 @@ <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>75</integer> </dict> <key>NS.objects</key> <array> @@ -1221,7 +1221,7 @@ <key>NSFrame</key> <dict> <key>CF$UID</key> - <integer>249</integer> + <integer>203</integer> </dict> <key>NSNextResponder</key> <dict> @@ -1231,7 +1231,7 @@ <key>NSSelectedTabViewItem</key> <dict> <key>CF$UID</key> - <integer>363</integer> + <integer>540</integer> </dict> <key>NSSubviews</key> <dict> @@ -1246,7 +1246,7 @@ <key>NSTabViewItems</key> <dict> <key>CF$UID</key> - <integer>250</integer> + <integer>204</integer> </dict> <key>NSTvFlags</key> <integer>4</integer> @@ -1255,7 +1255,7 @@ <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>75</integer> </dict> <key>NS.objects</key> <array> @@ -1269,12 +1269,12 @@ <key>$class</key> <dict> <key>CF$UID</key> - <integer>197</integer> + <integer>118</integer> </dict> <key>NSFrame</key> <dict> <key>CF$UID</key> - <integer>248</integer> + <integer>202</integer> </dict> <key>NSNextResponder</key> <dict> @@ -1296,7 +1296,7 @@ <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>75</integer> </dict> <key>NS.objects</key> <array> @@ -1306,109 +1306,140 @@ </dict> <dict> <key>CF$UID</key> - <integer>56</integer> + <integer>129</integer> </dict> <dict> <key>CF$UID</key> - <integer>60</integer> + <integer>172</integer> </dict> - <dict> - <key>CF$UID</key> - <integer>64</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>208</integer> - </dict> </array> </dict> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>23</integer> + <integer>128</integer> </dict> - <key>NSCell</key> + <key>NSBorderType</key> + <integer>3</integer> + <key>NSBoxType</key> + <integer>0</integer> + <key>NSContentView</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> + <integer>119</integer> </dict> <key>NSNextResponder</key> <dict> <key>CF$UID</key> <integer>50</integer> </dict> + <key>NSOffsets</key> + <dict> + <key>CF$UID</key> + <integer>120</integer> + </dict> + <key>NSSubviews</key> + <dict> + <key>CF$UID</key> + <integer>53</integer> + </dict> <key>NSSuperview</key> <dict> <key>CF$UID</key> <integer>50</integer> </dict> - <key>NSvFlags</key> - <integer>256</integer> + <key>NSTitleCell</key> + <dict> + <key>CF$UID</key> + <integer>121</integer> + </dict> + <key>NSTitlePosition</key> + <integer>2</integer> + <key>NSTransparent</key> + <false/> </dict> - <string>{{378, 263}, {198, 18}}</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>22</integer> + <integer>75</integer> </dict> - <key>NSAlternateContents</key> + <key>NS.objects</key> + <array> + <dict> + <key>CF$UID</key> + <integer>54</integer> + </dict> + </array> + </dict> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>21</integer> + <integer>118</integer> </dict> - <key>NSAlternateImage</key> + <key>NSFrame</key> <dict> <key>CF$UID</key> - <integer>18</integer> + <integer>117</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> + <key>NSNextResponder</key> <dict> <key>CF$UID</key> - <integer>55</integer> + <integer>52</integer> </dict> - <key>NSControlView</key> + <key>NSSubviews</key> <dict> <key>CF$UID</key> - <integer>52</integer> + <integer>55</integer> </dict> - <key>NSKeyEquivalent</key> + <key>NSSuperview</key> <dict> <key>CF$UID</key> - <integer>21</integer> + <integer>52</integer> </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> + </dict> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>15</integer> + <integer>75</integer> </dict> + <key>NS.objects</key> + <array> + <dict> + <key>CF$UID</key> + <integer>56</integer> + </dict> + <dict> + <key>CF$UID</key> + <integer>79</integer> + </dict> + <dict> + <key>CF$UID</key> + <integer>94</integer> + </dict> + <dict> + <key>CF$UID</key> + <integer>108</integer> + </dict> + <dict> + <key>CF$UID</key> + <integer>112</integer> + </dict> + </array> </dict> - <string>Kempston joystick interface</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>23</integer> + <integer>78</integer> </dict> <key>NSCell</key> <dict> @@ -1425,46 +1456,45 @@ <key>NSNextResponder</key> <dict> <key>CF$UID</key> - <integer>50</integer> + <integer>54</integer> </dict> <key>NSSuperview</key> <dict> <key>CF$UID</key> - <integer>50</integer> + <integer>54</integer> </dict> <key>NSvFlags</key> <integer>256</integer> </dict> - <string>{{378, 219}, {138, 18}}</string> + <string>{{144, 44}, {249, 26}}</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>22</integer> + <integer>77</integer> </dict> <key>NSAlternateContents</key> <dict> <key>CF$UID</key> - <integer>21</integer> + <integer>60</integer> </dict> <key>NSAlternateImage</key> <dict> <key>CF$UID</key> - <integer>18</integer> + <integer>59</integer> </dict> + <key>NSAltersState</key> + <true/> + <key>NSArrowPosition</key> + <integer>1</integer> <key>NSButtonFlags</key> - <integer>1211912703</integer> + <integer>109199615</integer> <key>NSButtonFlags2</key> - <integer>2</integer> + <integer>1</integer> <key>NSCellFlags</key> - <integer>67239424</integer> + <integer>-2076049856</integer> <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> - <dict> - <key>CF$UID</key> - <integer>59</integer> - </dict> + <integer>134218752</integer> <key>NSControlView</key> <dict> <key>CF$UID</key> @@ -1473,1424 +1503,1180 @@ <key>NSKeyEquivalent</key> <dict> <key>CF$UID</key> - <integer>21</integer> + <integer>61</integer> </dict> + <key>NSMenu</key> + <dict> + <key>CF$UID</key> + <integer>63</integer> + </dict> + <key>NSMenuItem</key> + <dict> + <key>CF$UID</key> + <integer>62</integer> + </dict> <key>NSPeriodicDelay</key> - <integer>200</integer> + <integer>400</integer> <key>NSPeriodicInterval</key> - <integer>25</integer> + <integer>75</integer> + <key>NSPreferredEdge</key> + <integer>3</integer> <key>NSSupport</key> <dict> <key>CF$UID</key> <integer>15</integer> </dict> + <key>NSUsesItemFromMenu</key> + <true/> </dict> - <string>Interface II</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>23</integer> + <integer>17</integer> </dict> - <key>NSCell</key> + <key>NSName</key> <dict> <key>CF$UID</key> - <integer>62</integer> + <integer>16</integer> </dict> - <key>NSEnabled</key> - <true/> - <key>NSFrame</key> + <key>NSSize</key> + <real>13</real> + <key>NSfFlags</key> + <integer>16</integer> + </dict> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>61</integer> + <integer>45</integer> </dict> - <key>NSNextResponder</key> + <key>NS.string</key> + <string></string> + </dict> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>50</integer> + <integer>45</integer> </dict> - <key>NSSuperview</key> - <dict> - <key>CF$UID</key> - <integer>50</integer> - </dict> - <key>NSvFlags</key> - <integer>256</integer> + <key>NS.string</key> + <string></string> </dict> - <string>{{378, 241}, {187, 18}}</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>22</integer> + <integer>72</integer> </dict> - <key>NSAlternateContents</key> + <key>NSAction</key> <dict> <key>CF$UID</key> - <integer>21</integer> + <integer>71</integer> </dict> - <key>NSAlternateImage</key> + <key>NSKeyEquiv</key> <dict> <key>CF$UID</key> - <integer>18</integer> + <integer>21</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> + <key>NSKeyEquivModMask</key> + <integer>1048576</integer> + <key>NSMenu</key> <dict> <key>CF$UID</key> <integer>63</integer> </dict> - <key>NSControlView</key> + <key>NSMixedImage</key> <dict> <key>CF$UID</key> - <integer>60</integer> + <integer>69</integer> </dict> - <key>NSKeyEquivalent</key> + <key>NSMnemonicLoc</key> + <integer>2147483647</integer> + <key>NSOnImage</key> <dict> <key>CF$UID</key> - <integer>21</integer> + <integer>65</integer> </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> + <key>NSState</key> + <integer>1</integer> + <key>NSTarget</key> <dict> <key>CF$UID</key> - <integer>15</integer> + <integer>58</integer> </dict> + <key>NSTitle</key> + <dict> + <key>CF$UID</key> + <integer>64</integer> + </dict> </dict> - <string>Kempston mouse</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>207</integer> + <integer>76</integer> </dict> - <key>NSBorderType</key> - <integer>3</integer> - <key>NSBoxType</key> - <integer>0</integer> - <key>NSContentView</key> + <key>NSMenuItems</key> <dict> <key>CF$UID</key> - <integer>66</integer> + <integer>74</integer> </dict> - <key>NSFrame</key> + <key>NSTitle</key> <dict> <key>CF$UID</key> - <integer>198</integer> + <integer>73</integer> </dict> - <key>NSNextResponder</key> + </dict> + <string>Item1</string> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>50</integer> + <integer>68</integer> </dict> - <key>NSOffsets</key> + <key>NSClassName</key> <dict> <key>CF$UID</key> - <integer>199</integer> + <integer>66</integer> </dict> - <key>NSSubviews</key> + <key>NSResourceName</key> <dict> <key>CF$UID</key> - <integer>65</integer> + <integer>67</integer> </dict> - <key>NSSuperview</key> + </dict> + <string>NSImage</string> + <string>NSMenuCheckmark</string> + <dict> + <key>$classes</key> + <array> + <string>NSCustomResource</string> + <string>%NSCustomResource</string> + <string>NSObject</string> + </array> + <key>$classname</key> + <string>NSCustomResource</string> + </dict> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>50</integer> + <integer>68</integer> </dict> - <key>NSTitleCell</key> + <key>NSClassName</key> <dict> <key>CF$UID</key> - <integer>200</integer> + <integer>66</integer> </dict> - <key>NSTitlePosition</key> - <integer>2</integer> - <key>NSTransparent</key> - <false/> + <key>NSResourceName</key> + <dict> + <key>CF$UID</key> + <integer>70</integer> + </dict> </dict> + <string>NSMenuMixedState</string> + <string>_popUpItemAction:</string> <dict> + <key>$classes</key> + <array> + <string>NSMenuItem</string> + <string>NSObject</string> + </array> + <key>$classname</key> + <string>NSMenuItem</string> + </dict> + <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>45</integer> </dict> + <key>NS.string</key> + <string>OtherViews</string> + </dict> + <dict> + <key>$class</key> + <dict> + <key>CF$UID</key> + <integer>75</integer> + </dict> <key>NS.objects</key> <array> <dict> <key>CF$UID</key> - <integer>66</integer> + <integer>62</integer> </dict> </array> </dict> <dict> + <key>$classes</key> + <array> + <string>NSMutableArray</string> + <string>NSArray</string> + <string>NSObject</string> + </array> + <key>$classname</key> + <string>NSMutableArray</string> + </dict> + <dict> + <key>$classes</key> + <array> + <string>NSMenu</string> + <string>NSObject</string> + </array> + <key>$classname</key> + <string>NSMenu</string> + </dict> + <dict> + <key>$classes</key> + <array> + <string>NSPopUpButtonCell</string> + <string>NSMenuItemCell</string> + <string>NSButtonCell</string> + <string>%NSButtonCell</string> + <string>NSActionCell</string> + <string>NSCell</string> + <string>NSObject</string> + </array> + <key>$classname</key> + <string>NSPopUpButtonCell</string> + </dict> + <dict> + <key>$classes</key> + <array> + <string>NSPopUpButton</string> + <string>NSButton</string> + <string>NSControl</string> + <string>NSView</string> + <string>NSResponder</string> + <string>NSObject</string> + </array> + <key>$classname</key> + <string>NSPopUpButton</string> + </dict> + <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>197</integer> + <integer>78</integer> </dict> - <key>NSFrame</key> + <key>NSCell</key> <dict> <key>CF$UID</key> - <integer>196</integer> + <integer>81</integer> </dict> - <key>NSNextResponder</key> + <key>NSEnabled</key> + <true/> + <key>NSFrame</key> <dict> <key>CF$UID</key> - <integer>64</integer> + <integer>80</integer> </dict> - <key>NSSubviews</key> + <key>NSNextResponder</key> <dict> <key>CF$UID</key> - <integer>67</integer> + <integer>54</integer> </dict> <key>NSSuperview</key> <dict> <key>CF$UID</key> - <integer>64</integer> + <integer>54</integer> </dict> + <key>NSvFlags</key> + <integer>256</integer> </dict> + <string>{{144, 12}, {125, 26}}</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>77</integer> </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>68</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>128</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>132</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>136</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>140</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>144</integer> - </dict> - </array> + <key>NSAlternateContents</key> + <dict> + <key>CF$UID</key> + <integer>21</integer> + </dict> + <key>NSAlternateImage</key> + <dict> + <key>CF$UID</key> + <integer>59</integer> + </dict> + <key>NSAltersState</key> + <true/> + <key>NSArrowPosition</key> + <integer>1</integer> + <key>NSButtonFlags</key> + <integer>109199615</integer> + <key>NSButtonFlags2</key> + <integer>1</integer> + <key>NSCellFlags</key> + <integer>-2076049856</integer> + <key>NSCellFlags2</key> + <integer>134218752</integer> + <key>NSControlView</key> + <dict> + <key>CF$UID</key> + <integer>79</integer> + </dict> + <key>NSKeyEquivalent</key> + <dict> + <key>CF$UID</key> + <integer>82</integer> + </dict> + <key>NSMenu</key> + <dict> + <key>CF$UID</key> + <integer>84</integer> + </dict> + <key>NSMenuItem</key> + <dict> + <key>CF$UID</key> + <integer>83</integer> + </dict> + <key>NSPeriodicDelay</key> + <integer>400</integer> + <key>NSPeriodicInterval</key> + <integer>75</integer> + <key>NSPreferredEdge</key> + <integer>3</integer> + <key>NSSupport</key> + <dict> + <key>CF$UID</key> + <integer>15</integer> + </dict> + <key>NSUsesItemFromMenu</key> + <true/> </dict> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>127</integer> + <integer>45</integer> </dict> - <key>NSBackgroundColor</key> + <key>NS.string</key> + <string></string> + </dict> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>122</integer> + <integer>72</integer> </dict> - <key>NSCellBackgroundColor</key> + <key>NSAction</key> <dict> <key>CF$UID</key> - <integer>126</integer> + <integer>85</integer> </dict> - <key>NSCellClass</key> + <key>NSKeyEquiv</key> <dict> <key>CF$UID</key> - <integer>119</integer> + <integer>21</integer> </dict> - <key>NSCellSize</key> + <key>NSKeyEquivModMask</key> + <integer>1048576</integer> + <key>NSMenu</key> <dict> <key>CF$UID</key> - <integer>117</integer> + <integer>84</integer> </dict> - <key>NSCells</key> + <key>NSMixedImage</key> <dict> <key>CF$UID</key> - <integer>70</integer> + <integer>69</integer> </dict> - <key>NSEnabled</key> - <true/> - <key>NSFont</key> + <key>NSMnemonicLoc</key> + <integer>2147483647</integer> + <key>NSOnImage</key> <dict> <key>CF$UID</key> - <integer>15</integer> + <integer>65</integer> </dict> - <key>NSFrame</key> + <key>NSState</key> + <integer>1</integer> + <key>NSTarget</key> <dict> <key>CF$UID</key> - <integer>69</integer> + <integer>81</integer> </dict> - <key>NSIntercellSpacing</key> + <key>NSTitle</key> <dict> <key>CF$UID</key> - <integer>118</integer> + <integer>64</integer> </dict> - <key>NSMatrixFlags</key> - <integer>1076363264</integer> - <key>NSNextResponder</key> + </dict> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>66</integer> + <integer>76</integer> </dict> - <key>NSNumCols</key> - <integer>1</integer> - <key>NSNumRows</key> - <integer>6</integer> - <key>NSProtoCell</key> + <key>NSMenuItems</key> <dict> <key>CF$UID</key> - <integer>120</integer> + <integer>87</integer> </dict> - <key>NSSelectedCell</key> + <key>NSTitle</key> <dict> <key>CF$UID</key> - <integer>71</integer> + <integer>86</integer> </dict> - <key>NSSuperview</key> + </dict> + <string>_popUpItemAction:</string> + <dict> + <key>$class</key> <dict> <key>CF$UID</key> - <integer>66</integer> + <integer>45</integer> </dict> - <key>NSvFlags</key> - <integer>256</integer> + <key>NS.string</key> + <string>OtherViews</string> </dict> - <string>{{18, 9}, {138, 118}}</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>75</integer> </dict> <key>NS.objects</key> <array> <dict> <key>CF$UID</key> - <integer>71</integer> + <integer>83</integer> </dict> <dict> <key>CF$UID</key> - <integer>75</integer> + <integer>88</integer> </dict> <dict> <key>CF$UID</key> - <integer>78</integer> + <integer>91</integer> </dict> - <dict> - <key>CF$UID</key> - <integer>93</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>101</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>109</integer> - </dict> </array> </dict> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>22</integer> + <integer>72</integer> </dict> - <key>NSAlternateContents</key> + <key>NSAction</key> <dict> <key>CF$UID</key> + <integer>90</integer> + </dict> + <key>NSKeyEquiv</key> + <dict> + <key>CF$UID</key> <integer>21</integer> </dict> - <key>NSAlternateImage</key> + <key>NSKeyEquivModMask</key> + <integer>1048576</integer> + <key>NSMenu</key> <dict> <key>CF$UID</key> - <integer>73</integer> + <integer>84</integer> </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>2</integer> - <key>NSCellFlags</key> - <integer>-2080244224</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> + <key>NSMixedImage</key> <dict> <key>CF$UID</key> - <integer>72</integer> + <integer>69</integer> </dict> - <key>NSControlView</key> + <key>NSMnemonicLoc</key> + <integer>2147483647</integer> + <key>NSOnImage</key> <dict> <key>CF$UID</key> - <integer>68</integer> + <integer>65</integer> </dict> - <key>NSKeyEquivalent</key> + <key>NSTarget</key> <dict> <key>CF$UID</key> - <integer>21</integer> + <integer>81</integer> </dict> - <key>NSPeriodicDelay</key> - <integer>200</integer> - <key>NSPeriodicInterval</key> - <integer>25</integer> - <key>NSSupport</key> + <key>NSTitle</key> <dict> <key>CF$UID</key> - <integer>15</integer> + <integer>89</integer> </dict> </dict> - <string>None</string> + <string>Item2</string> + <string>_popUpItemAction:</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>20</integer> + <integer>72</integer> </dict> - <key>NSImageName</key> + <key>NSAction</key> <dict> <key>CF$UID</key> - <integer>74</integer> + <integer>93</integer> </dict> - </dict> - <string>NSRadioButton</string> - <dict> - <key>$class</key> + <key>NSKeyEquiv</key> <dict> <key>CF$UID</key> - <integer>22</integer> + <integer>21</integer> </dict> - <key>NSAlternateContents</key> + <key>NSKeyEquivModMask</key> + <integer>1048576</integer> + <key>NSMenu</key> <dict> <key>CF$UID</key> - <integer>77</integer> + <integer>84</integer> </dict> - <key>NSAlternateImage</key> + <key>NSMixedImage</key> <dict> <key>CF$UID</key> - <integer>73</integer> + <integer>69</integer> </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>0</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> + <key>NSMnemonicLoc</key> + <integer>2147483647</integer> + <key>NSOnImage</key> <dict> <key>CF$UID</key> - <integer>76</integer> + <integer>65</integer> </dict> - <key>NSControlView</key> + <key>NSTarget</key> <dict> <key>CF$UID</key> - <integer>68</integer> + <integer>81</integer> </dict> - <key>NSKeyEquivalent</key> + <key>NSTitle</key> <dict> <key>CF$UID</key> - <integer>77</integer> + <integer>92</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> - <key>NSTag</key> - <integer>1</integer> </dict> - <string>Interface I</string> + <string>Item3</string> + <string>_popUpItemAction:</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>45</integer> + <integer>107</integer> </dict> - <key>NS.string</key> - <string></string> + <key>NSCell</key> + <dict> + <key>CF$UID</key> + <integer>96</integer> + </dict> + <key>NSEnabled</key> + <true/> + <key>NSFrame</key> + <dict> + <key>CF$UID</key> + <integer>95</integer> + </dict> + <key>NSNextResponder</key> + <dict> + <key>CF$UID</key> + <integer>54</integer> + </dict> + <key>NSSuperview</key> + <dict> + <key>CF$UID</key> + <integer>54</integer> + </dict> + <key>NSvFlags</key> + <integer>256</integer> </dict> + <string>{{11, 50}, {114, 17}}</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>22</integer> + <integer>106</integer> </dict> - <key>NSAlternateImage</key> + <key>NSBackgroundColor</key> <dict> <key>CF$UID</key> - <integer>73</integer> + <integer>98</integer> </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>0</integer> <key>NSCellFlags</key> <integer>67239424</integer> <key>NSCellFlags2</key> - <integer>0</integer> + <integer>4194304</integer> <key>NSContents</key> <dict> <key>CF$UID</key> - <integer>79</integer> + <integer>97</integer> </dict> <key>NSControlView</key> <dict> <key>CF$UID</key> - <integer>68</integer> + <integer>94</integer> </dict> - <key>NSNormalImage</key> + <key>NSSupport</key> <dict> <key>CF$UID</key> - <integer>80</integer> + <integer>15</integer> </dict> - <key>NSPeriodicDelay</key> - <integer>400</integer> - <key>NSPeriodicInterval</key> - <integer>75</integer> - <key>NSSupport</key> + <key>NSTextColor</key> <dict> <key>CF$UID</key> - <integer>15</integer> + <integer>103</integer> </dict> - <key>NSTag</key> - <integer>2</integer> </dict> - <string>Simple 8-bit IDE</string> + <string>Real device: +</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>92</integer> + <integer>102</integer> </dict> - <key>NSColor</key> + <key>NSCatalogName</key> <dict> <key>CF$UID</key> - <integer>90</integer> + <integer>99</integer> </dict> - <key>NSImageFlags</key> - <integer>549453824</integer> - <key>NSReps</key> + <key>NSColor</key> <dict> <key>CF$UID</key> - <integer>82</integer> + <integer>101</integer> </dict> - <key>NSSize</key> + <key>NSColorName</key> <dict> <key>CF$UID</key> - <integer>81</integer> + <integer>100</integer> </dict> + <key>NSColorSpace</key> + <integer>6</integer> </dict> - <string>{18, 18}</string> + <string>System</string> + <string>controlColor</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>89</integer> + <integer>102</integer> </dict> - <key>NS.objects</key> + <key>NSColorSpace</key> + <integer>3</integer> + <key>NSWhite</key> + <data> + MC42NjY2NjY2OQA= + </data> + </dict> + <dict> + <key>$classes</key> <array> - <dict> - <key>CF$UID</key> - <integer>83</integer> - </dict> + <string>NSColor</string> + <string>NSObject</string> </array> + <key>$classname</key> + <string>NSColor</string> </dict> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>88</integer> + <integer>102</integer> </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>84</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>85</integer> - </dict> - </array> - </dict> - <integer>0</integer> - <dict> - <key>$class</key> + <key>NSCatalogName</key> <dict> <key>CF$UID</key> - <integer>87</integer> + <integer>99</integer> </dict> - <key>NSTIFFRepresentation</key> + <key>NSColor</key> <dict> <key>CF$UID</key> - <integer>86</integer> + <integer>105</integer> </dict> + <key>NSColorName</key> + <dict> + <key>CF$UID</key> + <integer>104</integer> + </dict> + <key>NSColorSpace</key> + <integer>6</integer> </dict> - <data> - TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMA - AAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXwIyMjyRwcHIsJCQk8AAAA - AwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ - 29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAUZGRl5dXV198PDw//8/Pz///////////////////////// - ///U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAAAAAAAxEREUZqamrmtbW1 - /+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG - AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z - 8/P/9fX1//Ly8v/u7u7/0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4 - eN2/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+srKz4AAAAJAAAAAMA - AAADAAAALrCwsPrW1tb/3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn - 5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAADAAAALp2dnezg4OD/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/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4u - LpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7//v7+//v7+//19fX/8PDw - /8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ - ///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAA - AAAAAAAAAwAAABcAAABlYmJi3NLS0v3///////////////////////////// - ///V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAAAAAAAAAAAAUAAAAfAAAA - ZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMA - AACzAAAAnwAAAHcAAABDAAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAuAAAAJAAAABcAAAAKAAAA - AwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - DQEAAAMAAAABABIAAAEBAAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAAB - AAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMA - AAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS - AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQAB - </data> + <string>controlTextColor</string> <dict> - <key>$classes</key> - <array> - <string>NSBitmapImageRep</string> - <string>NSImageRep</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSBitmapImageRep</string> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSArray</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSArray</string> - </dict> - <dict> - <key>$classes</key> - <array> - <string>NSMutableArray</string> - <string>NSArray</string> - <string>NSObject</string> - </array> - <key>$classname</key> - <string>NSMutableArray</string> - </dict> - <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>91</integer> + <integer>102</integer> </dict> <key>NSColorSpace</key> <integer>3</integer> <key>NSWhite</key> <data> - MCAwAA== + MAA= </data> </dict> <dict> <key>$classes</key> <array> - <string>NSColor</string> + <string>NSTextFieldCell</string> + <string>NSActionCell</string> + <string>NSCell</string> <string>NSObject</string> </array> <key>$classname</key> - <string>NSColor</string> + <string>NSTextFieldCell</string> </dict> <dict> <key>$classes</key> <array> - <string>NSImage</string> - <string>%NSImage</string> + <string>NSTextField</string> + <string>%NSTextField</string> + <string>NSControl</string> + <string>NSView</string> + <string>NSResponder</string> <string>NSObject</string> </array> <key>$classname</key> - <string>NSImage</string> + <string>NSTextField</string> </dict> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>22</integer> + <integer>107</integer> </dict> - <key>NSAlternateImage</key> + <key>NSCell</key> <dict> <key>CF$UID</key> - <integer>73</integer> + <integer>110</integer> </dict> - <key>NSButtonFlags</key> - <integer>1211912703</integer> - <key>NSButtonFlags2</key> - <integer>0</integer> - <key>NSCellFlags</key> - <integer>67239424</integer> - <key>NSCellFlags2</key> - <integer>0</integer> - <key>NSContents</key> + <key>NSEnabled</key> + <true/> + <key>NSFrame</key> <dict> <key>CF$UID</key> - <integer>94</integer> + <integer>109</integer> </dict> - <key>NSControlView</key> + <key>NSNextResponder</key> <dict> <key>CF$UID</key> - <integer>68</integer> + <integer>54</integer> </dict> - <key>NSNormalImage</key> + <key>NSSuperview</key> <dict> <key>CF$UID</key> - <integer>95</integer> + <integer>54</integer> </dict> - <key>NSPeriodicDelay</key> - <integer>400</integer> - <key>NSPeriodicInterval</key> - <integer>75</integer> - <key>NSSupport</key> - <dict> - <key>CF$UID</key> - <integer>15</integer> - </dict> - <key>NSTag</key> - <integer>3</integer> + <key>NSvFlags</key> + <integer>256</integer> </dict> - <string>ZXATASP interface</string> + <string>{{11, 18}, {122, 17}}</string> <dict> <key>$class</key> <dict> <key>CF$UID</key> - <integer>92</integer> + <integer>106</integer> </dict> - <key>NSColor</key> + <key>NSBackgroundColor</key> <dict> <key>CF$UID</key> - <integer>90</integer> + <integer>98</integer> </dict> - <key>NSImageFlags</key> - <integer>549453824</integer> - <key>NSReps</key> - <dict> - <key>CF$UID</key> - <integer>97</integer> - </dict> - <key>NSSize</key> - <dict> - <key>CF$UID</key> - <integer>96</integer> - </dict> - </dict> - <string>{18, 18}</string> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>89</integer> - </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>98</integer> - </dict> - </array> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>88</integer> - </dict> - <key>NS.objects</key> - <array> - <dict> - <key>CF$UID</key> - <integer>84</integer> - </dict> - <dict> - <key>CF$UID</key> - <integer>99</integer> - </dict> - </array> - </dict> - <dict> - <key>$class</key> - <dict> - <key>CF$UID</key> - <integer>87</integer> - </dict> - <key>NSTIFFRepresentation</key> - <dict> - <key>CF$UID</key> - <integer>100</integer> - </dict> - </dict> - <data> - TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMA - AAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAwAAADwRE... [truncated message content] |