[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [252] branches/fusegl/fuse
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [252] branches/fusegl/fuse
|
From: <fr...@us...> - 2006-12-19 06:40:18
|
Revision: 252
http://svn.sourceforge.net/fuse-for-macosx/?rev=252&view=rev
Author: fredm
Date: 2006-12-18 22:40:16 -0800 (Mon, 18 Dec 2006)
Log Message:
-----------
Inital rough cut of native Cocoa UI, only screen done yet, still need to do
input, sound and lots of tidying.
Modified Paths:
--------------
branches/fusegl/fuse/TODO
branches/fusegl/fuse/compat.h
branches/fusegl/fuse/fuse.cpp
branches/fusegl/fuse/fuse.h
branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
branches/fusegl/fuse/fusepb/FuseMenus.h
branches/fusegl/fuse/fusepb/FuseMenus.m
branches/fusegl/fuse/fusepb/Info-Fuse.plist
branches/fusegl/fuse/fusepb/config.h
branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m
branches/fusegl/fuse/fusepb/controllers/FuseController.m
branches/fusegl/fuse/fusepb/controllers/JoystickConfigurationController.m
branches/fusegl/fuse/fusepb/controllers/PreferencesController.m
branches/fusegl/fuse/fusepb/nibs/MainMenu.nib/classes.nib
branches/fusegl/fuse/fusepb/nibs/MainMenu.nib/info.nib
branches/fusegl/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
branches/fusegl/fuse/machine.c
branches/fusegl/fuse/menu.h
Added Paths:
-----------
branches/fusegl/fuse/fusepb/main.h
branches/fusegl/fuse/fusepb/main.mm
branches/fusegl/fuse/fusepb/nibs/MainMenu.nib/
branches/fusegl/fuse/fusepb/views/
branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
branches/fusegl/fuse/ui/cocoa/
branches/fusegl/fuse/ui/cocoa/cocoadisplay.c
branches/fusegl/fuse/ui/cocoa/cocoadisplay.h
branches/fusegl/fuse/ui/cocoa/cocoajoystick.c
branches/fusegl/fuse/ui/cocoa/cocoaui.c
branches/fusegl/fuse/ui/cocoa/cocoaui.h
branches/fusegl/fuse/ui/cocoa/keysyms.c
Removed Paths:
-------------
branches/fusegl/fuse/fusepb/keysyms.c
branches/fusegl/fuse/fusepb/nibs/SDLMain.nib/
Modified: branches/fusegl/fuse/TODO
===================================================================
--- branches/fusegl/fuse/TODO 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/TODO 2006-12-19 06:40:16 UTC (rev 252)
@@ -1,3 +1,16 @@
TODO
+X Move Fuse to have a loop that runs a single frame at a time (will be callback
+ in threaded Cocoa GL UI)
+X Switch to Cocoa run loop for Fuse
+X Add GL renderer
+* Add native CoreAudio sound processing (removes SDL sound dependency from Fuse)
+* Add native keyboard processing (removes SDL keyboard input dependency from
+ Fuse)
+* Fix menus, preferences etc.
+* Fix scalers
+* Add native joystick processing (removes SDL joystick input dependency from
+ Fuse)
+* Add native mouse processing (removes SDL mouse input dependency from Fuse)
+
$Id: TODO,v 1.4 2004/03/02 13:38:08 pak21 Exp $
Modified: branches/fusegl/fuse/compat.h
===================================================================
--- branches/fusegl/fuse/compat.h 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/compat.h 2006-12-19 06:40:16 UTC (rev 252)
@@ -59,7 +59,7 @@
#endif /* #ifndef HAVE_GETOPT_LONG */
#ifndef HAVE_MKSTEMP
-int mkstemp( char *template );
+int mkstemp( char *tmpl );
#endif /* #ifndef HAVE_MKSTEMP */
#endif /* #ifndef FUSE_COMPAT_H */
Modified: branches/fusegl/fuse/fuse.cpp
===================================================================
--- branches/fusegl/fuse/fuse.cpp 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fuse.cpp 2006-12-19 06:40:16 UTC (rev 252)
@@ -83,7 +83,7 @@
}
/* What name were we called under? */
-char *fuse_progname;
+const char *fuse_progname;
/* Which directory were we started in? */
char fuse_directory[ PATH_MAX ];
@@ -125,8 +125,6 @@
} start_files_t;
-static int fuse_init(int argc, char **argv);
-
static int creator_init( void );
static void fuse_show_copyright(void);
static void fuse_show_version( void );
@@ -137,9 +135,7 @@
start_files_t *start_files );
static int do_start_files( start_files_t *start_files );
-static int fuse_end(void);
-
-int main(int argc, char **argv)
+int old_main(int argc, char **argv)
{
if(fuse_init(argc,argv)) {
fprintf(stderr,"%s: error initialising -- giving up!\n", fuse_progname);
@@ -159,7 +155,7 @@
}
-static int fuse_init(int argc, char **argv)
+int fuse_init(int argc, char **argv)
{
int error, first_arg;
char *start_scaler;
@@ -753,7 +749,7 @@
}
/* Tidy-up function called at end of emulation */
-static int fuse_end(void)
+int fuse_end(void)
{
/* Must happen before memory is deallocated as we read the character
set from memory for the text output */
Modified: branches/fusegl/fuse/fuse.h
===================================================================
--- branches/fusegl/fuse/fuse.h 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fuse.h 2006-12-19 06:40:16 UTC (rev 252)
@@ -34,7 +34,7 @@
#include "compat.h"
-extern char *fuse_progname; /* argv[0] */
+extern const char *fuse_progname; /* argv[0] */
extern char fuse_directory[ PATH_MAX ]; /* The directory we started in */
extern int fuse_exiting; /* Shall we exit now? */
@@ -48,6 +48,11 @@
void fuse_abort( void ) GCC_NORETURN; /* Emergency shutdown */
+int fuse_init(int argc, char **argv);
+
+int fuse_end(void); /* Tidy-up function called at end of
+ emulation */
+
extern int fuse_sound_in_use; /* Are we trying to produce sound? */
extern libspectrum_creator *fuse_creator; /* Creator information for file
Modified: branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2006-12-19 06:40:16 UTC (rev 252)
@@ -21,13 +21,9 @@
B61F459F09121DF100C8096C /* tape_scorpion.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C40A0765988200DE7E81 /* tape_scorpion.szx */; };
B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; };
B61F45A309121DF100C8096C /* 765.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F541C0750396490901C2A5B9 /* 765.framework */; };
- B61F45A409121DF100C8096C /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F50F65A003B2355701A804BA /* SDL.framework */; };
B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; };
B61F45A709121DF100C8096C /* libbz2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
- B61F45A909121DF100C8096C /* SDLMain.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985400389209A01A804BA /* SDLMain.h */; };
B61F45AA09121DF100C8096C /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F5598598038921C501A804BA /* config.h */; };
- B61F45AB09121DF100C8096C /* sdldisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985A40389221501A804BA /* sdldisplay.h */; };
- B61F45AC09121DF100C8096C /* sdlkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985A60389221501A804BA /* sdlkeyboard.h */; };
B61F45AD09121DF100C8096C /* ui.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AD0389222701A804BA /* ui.h */; };
B61F45AE09121DF100C8096C /* uidisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985AE0389222701A804BA /* uidisplay.h */; };
B61F45AF09121DF100C8096C /* z80_macros.h in Headers */ = {isa = PBXBuildFile; fileRef = F55985B10389224001A804BA /* z80_macros.h */; };
@@ -61,9 +57,7 @@
B61F45CB09121DF100C8096C /* debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = B68CB2C503DD920300A804BA /* debugger.h */; };
B61F45CC09121DF100C8096C /* DebuggerController.h in Headers */ = {isa = PBXBuildFile; fileRef = B632C6AE03E5368700A864FD /* DebuggerController.h */; };
B61F45CD09121DF100C8096C /* FuseMenus.h in Headers */ = {isa = PBXBuildFile; fileRef = B66EA7830401075300A864FD /* FuseMenus.h */; };
- B61F45CE09121DF100C8096C /* sdlscreenshot.h in Headers */ = {isa = PBXBuildFile; fileRef = B68D5B20041E085000A864FD /* sdlscreenshot.h */; };
B61F45CF09121DF100C8096C /* scaler_internals.h in Headers */ = {isa = PBXBuildFile; fileRef = B60A6A3A042BEECE00D41533 /* scaler_internals.h */; };
- B61F45D009121DF100C8096C /* sdljoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = B6030027043363C900A864FD /* sdljoystick.h */; };
B61F45D109121DF100C8096C /* dck.h in Headers */ = {isa = PBXBuildFile; fileRef = B65E4C610445DB7D00A864FD /* dck.h */; };
B61F45D209121DF100C8096C /* psg.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CA304D049CEC410037E9F2 /* psg.h */; };
B61F45D309121DF100C8096C /* compat.h in Headers */ = {isa = PBXBuildFile; fileRef = B6871C9D04AF7BEF00C24D83 /* compat.h */; };
@@ -74,7 +68,6 @@
B61F45D809121DF100C8096C /* pokefinder.h in Headers */ = {isa = PBXBuildFile; fileRef = B64586D3059BC04A00934482 /* pokefinder.h */; };
B61F45D909121DF100C8096C /* PokeFinderController.h in Headers */ = {isa = PBXBuildFile; fileRef = B62F3BCE059F5BF300A7009A /* PokeFinderController.h */; };
B61F45DA09121DF100C8096C /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = B6FD5C7A05A4F5B600A6C4FC /* utils.h */; };
- B61F45DB09121DF100C8096C /* sdlui.h in Headers */ = {isa = PBXBuildFile; fileRef = B627DAA705ACDF4E00609956 /* sdlui.h */; };
B61F45DC09121DF100C8096C /* MemoryBrowserController.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D2989105B061CB00C2AA14 /* MemoryBrowserController.h */; };
B61F45DD09121DF100C8096C /* periph.h in Headers */ = {isa = PBXBuildFile; fileRef = B6C57E0105ECA05B0056F1D0 /* periph.h */; };
B61F45DE09121DF100C8096C /* breakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = B66050ED0606AAF500247454 /* breakpoint.h */; };
@@ -117,7 +110,7 @@
B61F460709121DF100C8096C /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6BA6F0207B1E04200E44C8D /* Preferences.nib */; };
B61F460809121DF100C8096C /* Rollback.nib in Resources */ = {isa = PBXBuildFile; fileRef = B600ADA3077237920030FD05 /* Rollback.nib */; };
B61F460909121DF100C8096C /* SaveBinary.nib in Resources */ = {isa = PBXBuildFile; fileRef = B6F74F9A04B85B4F0059D51C /* SaveBinary.nib */; };
- B61F460A09121DF100C8096C /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5598546038920E401A804BA /* SDLMain.nib */; };
+ B61F460A09121DF100C8096C /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = F5598546038920E401A804BA /* MainMenu.nib */; };
B61F460B09121DF100C8096C /* TapeBrowser.nib in Resources */ = {isa = PBXBuildFile; fileRef = F59B5587039F8DB601A804BA /* TapeBrowser.nib */; };
B61F460C09121DF100C8096C /* 48.rom in Resources */ = {isa = PBXBuildFile; fileRef = F559854C0389212301A804BA /* 48.rom */; };
B61F460D09121DF100C8096C /* 128-0.rom in Resources */ = {isa = PBXBuildFile; fileRef = F559854D0389212301A804BA /* 128-0.rom */; };
@@ -184,7 +177,6 @@
B61F464D09121DF100C8096C /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = F55986350389237101A804BA /* timer.c */; };
B61F464E09121DF100C8096C /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = F559863B0389238101A804BA /* ui.c */; };
B61F464F09121DF100C8096C /* uidisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = F559863C0389238101A804BA /* uidisplay.c */; };
- B61F465009121DF100C8096C /* error.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F8763503995372011FA3A4 /* error.m */; };
B61F465109121DF100C8096C /* FuseController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F876380399540D011FA3A4 /* FuseController.m */; };
B61F465209121DF100C8096C /* TapeBrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = F59B5590039FD8F901A804BA /* TapeBrowserController.m */; };
B61F465309121DF100C8096C /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = F536B56503A0C275011517A0 /* utils.c */; };
@@ -199,28 +191,22 @@
B61F465C09121DF100C8096C /* debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = B68CB2C403DD920300A804BA /* debugger.c */; };
B61F465D09121DF100C8096C /* disassemble.c in Sources */ = {isa = PBXBuildFile; fileRef = B68CB2C603DD920300A804BA /* disassemble.c */; };
B61F465E09121DF100C8096C /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = B68CB2CC03DD923C00A804BA /* memory.c */; };
- B61F465F09121DF100C8096C /* sdlkeyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = B6586D8503E744C000A804BA /* sdlkeyboard.c */; };
B61F466009121DF100C8096C /* DebuggerController.m in Sources */ = {isa = PBXBuildFile; fileRef = B632C6AF03E5368700A864FD /* DebuggerController.m */; };
- B61F466109121DF100C8096C /* sdldisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = B6F4396C03E9645500A864FD /* sdldisplay.c */; };
B61F466209121DF100C8096C /* FuseMenus.m in Sources */ = {isa = PBXBuildFile; fileRef = B66EA7840401075300A864FD /* FuseMenus.m */; };
B61F466309121DF100C8096C /* scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = B63ABD8D042F175200A864FD /* scaler.c */; };
B61F466409121DF100C8096C /* tc2068.c in Sources */ = {isa = PBXBuildFile; fileRef = B6FEA44F0444C3370013916D /* tc2068.c */; };
B61F466509121DF100C8096C /* dck.c in Sources */ = {isa = PBXBuildFile; fileRef = B65E4C600445DB7D00A864FD /* dck.c */; };
- B61F466609121DF100C8096C /* keysyms.c in Sources */ = {isa = PBXBuildFile; fileRef = B61D4512048F8F5800FEA4F1 /* keysyms.c */; };
B61F466709121DF100C8096C /* psg.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CA304C049CEC410037E9F2 /* psg.c */; };
B61F466809121DF100C8096C /* LoadBinaryController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F74F9704B855D40059D51C /* LoadBinaryController.m */; };
B61F466909121DF100C8096C /* SaveBinaryController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F74F9D04B85B660059D51C /* SaveBinaryController.m */; };
- B61F466A09121DF100C8096C /* sdljoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B6C691B504C20A09005EE041 /* sdljoystick.c */; };
B61F466B09121DF100C8096C /* joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B6C691B704C20A42005EE041 /* joystick.c */; };
B61F466C09121DF100C8096C /* expression.c in Sources */ = {isa = PBXBuildFile; fileRef = B604635E04C5F37B00C225C9 /* expression.c */; };
B61F466D09121DF100C8096C /* NumberFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A7F0EA04C9A11D001025EB /* NumberFormatter.m */; };
B61F466E09121DF100C8096C /* pokefinder.c in Sources */ = {isa = PBXBuildFile; fileRef = B64586D2059BC04A00934482 /* pokefinder.c */; };
B61F466F09121DF100C8096C /* machine.c in Sources */ = {isa = PBXBuildFile; fileRef = B60B11F7059BC7E70048B64B /* machine.c */; };
B61F467009121DF100C8096C /* PokeFinderController.m in Sources */ = {isa = PBXBuildFile; fileRef = B62F3BCF059F5BF300A7009A /* PokeFinderController.m */; };
- B61F467109121DF100C8096C /* sdlui.c in Sources */ = {isa = PBXBuildFile; fileRef = B627DAA605ACDF4E00609956 /* sdlui.c */; };
B61F467209121DF100C8096C /* MemoryBrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D2989205B061CB00C2AA14 /* MemoryBrowserController.m */; };
B61F467309121DF100C8096C /* periph.c in Sources */ = {isa = PBXBuildFile; fileRef = B6C57E0005ECA05B0056F1D0 /* periph.c */; };
- B61F467409121DF100C8096C /* SDLMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6C57E0605ECC4160056F1D0 /* SDLMain.mm */; };
B61F467509121DF100C8096C /* scalers16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6C57E3F05ECC9260056F1D0 /* scalers16.cpp */; };
B61F467609121DF100C8096C /* hq2x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B65163AB05F4A11E001903BE /* hq2x.cpp */; };
B61F467709121DF100C8096C /* hq3x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B61EF5B905FED7930081DF70 /* hq3x.cpp */; };
@@ -253,13 +239,11 @@
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 */; };
- B61F469509121DF100C8096C /* sdlscreenshot.m in Sources */ = {isa = PBXBuildFile; fileRef = B619FC69090E649700344F94 /* sdlscreenshot.m */; };
B61F469A09121DF100C8096C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
B61F469B09121DF100C8096C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; };
B61F469C09121DF100C8096C /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
B61F469D09121DF100C8096C /* spectrum.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F541C04303963A9F01C2A5B9 /* spectrum.framework */; };
B61F469E09121DF100C8096C /* 765.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F541C0750396490901C2A5B9 /* 765.framework */; };
- B61F469F09121DF100C8096C /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F50F65A003B2355701A804BA /* SDL.framework */; };
B61F46A109121DF100C8096C /* gcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BA1A8B04E4F3290017354F /* gcrypt.framework */; };
B61F46A209121DF100C8096C /* libbz2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
B61F46A409121DF100C8096C /* FuseImporter.mdimporter in CopyFiles */ = {isa = PBXBuildFile; fileRef = B64FEA96084F8EC300879389 /* FuseImporter.mdimporter */; };
@@ -280,6 +264,15 @@
B650987109366CA2003AF1BF /* szx.icns in Resources */ = {isa = PBXBuildFile; fileRef = B650987009366CA2003AF1BF /* szx.icns */; };
B6825549091817F30014B5EE /* divide.c in Sources */ = {isa = PBXBuildFile; fileRef = B6825547091817F30014B5EE /* divide.c */; };
B682554A091817F30014B5EE /* divide.h in Headers */ = {isa = PBXBuildFile; fileRef = B6825548091817F30014B5EE /* divide.h */; };
+ B6CE7F400B2830A300EB65B3 /* cocoadisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F3A0B2830A300EB65B3 /* cocoadisplay.c */; };
+ B6CE7F410B2830A300EB65B3 /* cocoadisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CE7F3B0B2830A300EB65B3 /* cocoadisplay.h */; };
+ B6CE7F420B2830A300EB65B3 /* cocoajoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F3C0B2830A300EB65B3 /* cocoajoystick.c */; };
+ B6CE7F430B2830A300EB65B3 /* cocoaui.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F3D0B2830A300EB65B3 /* cocoaui.c */; };
+ B6CE7F440B2830A300EB65B3 /* cocoaui.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CE7F3E0B2830A300EB65B3 /* cocoaui.h */; };
+ B6CE7F450B2830A300EB65B3 /* keysyms.c in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F3F0B2830A300EB65B3 /* keysyms.c */; };
+ B6CE7F520B283A0700EB65B3 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7F510B283A0700EB65B3 /* main.mm */; };
+ B6CE7FCD0B28FBD600EB65B3 /* DisplayOpenGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = B6CE7FCB0B28FBD600EB65B3 /* DisplayOpenGLView.h */; };
+ B6CE7FCE0B28FBD600EB65B3 /* DisplayOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = B6CE7FCC0B28FBD600EB65B3 /* DisplayOpenGLView.m */; };
B6F047F60952A6D6006D8005 /* tape_se.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F20952A6BA006D8005 /* tape_se.szx */; };
B6F047F70952A6D6006D8005 /* tape_ts2068.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F30952A6BA006D8005 /* tape_ts2068.szx */; };
B6F047F80952A6E3006D8005 /* tape_plus3e.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F00952A69A006D8005 /* tape_plus3e.szx */; };
@@ -325,7 +318,6 @@
files = (
B61F45A209121DF100C8096C /* spectrum.framework in CopyFiles */,
B61F45A309121DF100C8096C /* 765.framework in CopyFiles */,
- B61F45A409121DF100C8096C /* SDL.framework in CopyFiles */,
B61F45A609121DF100C8096C /* gcrypt.framework in CopyFiles */,
B61F45A709121DF100C8096C /* libbz2.framework in CopyFiles */,
);
@@ -353,7 +345,6 @@
B601847A065A586900B0BE59 /* zxatasp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = zxatasp.h; path = ../zxatasp.h; sourceTree = SOURCE_ROOT; };
B601847B065A586900B0BE59 /* zxcf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = zxcf.c; path = ../zxcf.c; sourceTree = SOURCE_ROOT; };
B601847C065A586900B0BE59 /* zxcf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = zxcf.h; path = ../zxcf.h; sourceTree = SOURCE_ROOT; };
- B6030027043363C900A864FD /* sdljoystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdljoystick.h; path = ../ui/sdl/sdljoystick.h; sourceTree = "<group>"; };
B604635E04C5F37B00C225C9 /* expression.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = expression.c; path = ../debugger/expression.c; sourceTree = SOURCE_ROOT; };
B60A6A3A042BEECE00D41533 /* scaler_internals.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = scaler_internals.h; path = ../ui/scaler/scaler_internals.h; sourceTree = SOURCE_ROOT; };
B60B11F7059BC7E70048B64B /* machine.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = machine.c; path = ../machine.c; sourceTree = SOURCE_ROOT; };
@@ -361,16 +352,12 @@
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>"; };
B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; };
- B619FC69090E649700344F94 /* sdlscreenshot.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = sdlscreenshot.m; sourceTree = SOURCE_ROOT; };
- B61D4512048F8F5800FEA4F1 /* keysyms.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = keysyms.c; sourceTree = SOURCE_ROOT; };
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>"; };
B61F46AA09121DF200C8096C /* Fuse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fuse.app; sourceTree = BUILT_PRODUCTS_DIR; };
B6202BD105BD43D800A1EA8F /* libbz2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbz2.framework; path = ../../bzip2/build/Deployment/libbz2.framework; sourceTree = SOURCE_ROOT; };
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; };
- B627DAA605ACDF4E00609956 /* sdlui.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdlui.c; path = ../ui/sdl/sdlui.c; sourceTree = SOURCE_ROOT; };
- B627DAA705ACDF4E00609956 /* sdlui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sdlui.h; sourceTree = SOURCE_ROOT; };
B62E1BC303E298B200A80002 /* Debugger.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Debugger.nib; path = nibs/Debugger.nib; sourceTree = SOURCE_ROOT; };
B62F3BB4059F5B5900A7009A /* PokeFinder.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PokeFinder.nib; path = nibs/PokeFinder.nib; sourceTree = "<group>"; };
B62F3BCE059F5BF300A7009A /* PokeFinderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PokeFinderController.h; path = controllers/PokeFinderController.h; sourceTree = "<group>"; };
@@ -421,7 +408,6 @@
B650F73E07E7CD3F00E4F3AF /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PreferencesController.h; path = controllers/PreferencesController.h; sourceTree = SOURCE_ROOT; };
B650F73F07E7CD3F00E4F3AF /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PreferencesController.m; path = controllers/PreferencesController.m; sourceTree = SOURCE_ROOT; };
B65163AB05F4A11E001903BE /* hq2x.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hq2x.cpp; path = scaler/hq2x.cpp; sourceTree = SOURCE_ROOT; };
- B6586D8503E744C000A804BA /* sdlkeyboard.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdlkeyboard.c; path = ../ui/sdl/sdlkeyboard.c; sourceTree = SOURCE_ROOT; };
B65E4C600445DB7D00A864FD /* dck.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dck.c; path = ../dck.c; sourceTree = SOURCE_ROOT; };
B65E4C610445DB7D00A864FD /* dck.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dck.h; path = ../dck.h; sourceTree = SOURCE_ROOT; };
B66050EC0606AAF500247454 /* breakpoint.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = breakpoint.c; path = ../debugger/breakpoint.c; sourceTree = SOURCE_ROOT; };
@@ -462,7 +448,6 @@
B68CB2C503DD920300A804BA /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = debugger.h; path = ../debugger/debugger.h; sourceTree = "<group>"; };
B68CB2C603DD920300A804BA /* disassemble.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = disassemble.c; path = ../debugger/disassemble.c; sourceTree = "<group>"; };
B68CB2CC03DD923C00A804BA /* memory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = memory.c; sourceTree = "<group>"; };
- B68D5B20041E085000A864FD /* sdlscreenshot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sdlscreenshot.h; sourceTree = SOURCE_ROOT; };
B6A7F0E904C9A11D001025EB /* NumberFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberFormatter.h; sourceTree = "<group>"; };
B6A7F0EA04C9A11D001025EB /* NumberFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NumberFormatter.m; sourceTree = "<group>"; };
B6AA8A3C03D2FC1C00FED55D /* trdos.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = trdos.rom; path = ../roms/trdos.rom; sourceTree = SOURCE_ROOT; };
@@ -485,9 +470,7 @@
B6C3479F044B091100E1BBA7 /* ts2068.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ts2068.png; path = resources/ts2068.png; sourceTree = SOURCE_ROOT; };
B6C57E0005ECA05B0056F1D0 /* periph.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = periph.c; path = ../periph.c; sourceTree = SOURCE_ROOT; };
B6C57E0105ECA05B0056F1D0 /* periph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = periph.h; path = ../periph.h; sourceTree = SOURCE_ROOT; };
- B6C57E0605ECC4160056F1D0 /* SDLMain.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SDLMain.mm; sourceTree = SOURCE_ROOT; };
B6C57E3F05ECC9260056F1D0 /* scalers16.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = scalers16.cpp; path = scaler/scalers16.cpp; sourceTree = SOURCE_ROOT; };
- B6C691B504C20A09005EE041 /* sdljoystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdljoystick.c; path = ../ui/sdl/sdljoystick.c; sourceTree = SOURCE_ROOT; };
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; };
@@ -503,6 +486,15 @@
B6CC82FF0800E408006EFFB9 /* CAMachines.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CAMachines.h; path = content_arrays/CAMachines.h; sourceTree = SOURCE_ROOT; };
B6CC83000800E408006EFFB9 /* CAMachines.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CAMachines.m; path = content_arrays/CAMachines.m; sourceTree = SOURCE_ROOT; };
B6CD0B9E06069F4A00847338 /* fuse.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = fuse.cpp; path = ../fuse.cpp; sourceTree = SOURCE_ROOT; };
+ B6CE7F3A0B2830A300EB65B3 /* cocoadisplay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = cocoadisplay.c; sourceTree = "<group>"; };
+ B6CE7F3B0B2830A300EB65B3 /* cocoadisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cocoadisplay.h; sourceTree = "<group>"; };
+ B6CE7F3C0B2830A300EB65B3 /* cocoajoystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = cocoajoystick.c; sourceTree = "<group>"; };
+ B6CE7F3D0B2830A300EB65B3 /* cocoaui.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = cocoaui.c; sourceTree = "<group>"; };
+ B6CE7F3E0B2830A300EB65B3 /* cocoaui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cocoaui.h; sourceTree = "<group>"; };
+ B6CE7F3F0B2830A300EB65B3 /* keysyms.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = keysyms.c; sourceTree = "<group>"; };
+ B6CE7F510B283A0700EB65B3 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
+ B6CE7FCB0B28FBD600EB65B3 /* DisplayOpenGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DisplayOpenGLView.h; sourceTree = "<group>"; };
+ B6CE7FCC0B28FBD600EB65B3 /* DisplayOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DisplayOpenGLView.m; sourceTree = "<group>"; };
B6D2989105B061CB00C2AA14 /* MemoryBrowserController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MemoryBrowserController.h; path = controllers/MemoryBrowserController.h; sourceTree = "<group>"; };
B6D2989205B061CB00C2AA14 /* MemoryBrowserController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MemoryBrowserController.m; path = controllers/MemoryBrowserController.m; sourceTree = "<group>"; };
B6D2993105B06AD200C2AA14 /* MemoryBrowser.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = MemoryBrowser.nib; path = nibs/MemoryBrowser.nib; sourceTree = "<group>"; };
@@ -530,7 +522,6 @@
B6F060AB078FB63A00CD5D95 /* tc2068.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tc2068.h; path = ../machines/tc2068.h; sourceTree = SOURCE_ROOT; };
B6F06100078FC2C900CD5D95 /* sfifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sfifo.c; path = ../sound/sfifo.c; sourceTree = SOURCE_ROOT; };
B6F06101078FC2C900CD5D95 /* sfifo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sfifo.h; path = ../sound/sfifo.h; sourceTree = SOURCE_ROOT; };
- B6F4396C03E9645500A864FD /* sdldisplay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdldisplay.c; path = ../ui/sdl/sdldisplay.c; sourceTree = SOURCE_ROOT; };
B6F74F9404B855930059D51C /* LoadBinary.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = LoadBinary.nib; path = nibs/LoadBinary.nib; sourceTree = "<group>"; };
B6F74F9604B855D40059D51C /* LoadBinaryController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LoadBinaryController.h; path = controllers/LoadBinaryController.h; sourceTree = "<group>"; };
B6F74F9704B855D40059D51C /* LoadBinaryController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = LoadBinaryController.m; path = controllers/LoadBinaryController.m; sourceTree = "<group>"; };
@@ -544,15 +535,13 @@
B6FEA44B0444C2CC0013916D /* tc2068-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "tc2068-0.rom"; path = "../roms/tc2068-0.rom"; sourceTree = SOURCE_ROOT; };
B6FEA44C0444C2CC0013916D /* tc2068-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "tc2068-1.rom"; path = "../roms/tc2068-1.rom"; sourceTree = SOURCE_ROOT; };
B6FEA44F0444C3370013916D /* tc2068.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tc2068.c; path = ../machines/tc2068.c; sourceTree = SOURCE_ROOT; };
- F50F65A003B2355701A804BA /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = ../../SDL.framework; sourceTree = SOURCE_ROOT; };
F520C8BC038D022E01A804BA /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
F536B56503A0C275011517A0 /* utils.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = utils.c; path = ../utils.c; sourceTree = SOURCE_ROOT; };
F541C04303963A9F01C2A5B9 /* spectrum.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = spectrum.framework; path = ../../libspectrum/build/Deployment/spectrum.framework; sourceTree = SOURCE_ROOT; };
F541C0750396490901C2A5B9 /* 765.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = 765.framework; path = ../../lib765/build/Deployment/765.framework; sourceTree = SOURCE_ROOT; };
F541FB5E03B0B33401FF8235 /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = scaler.h; path = ../ui/scaler/scaler.h; sourceTree = SOURCE_ROOT; };
F54670EB03A3F3E70143EC2C /* settings.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = settings.m; sourceTree = SOURCE_ROOT; };
- F55985400389209A01A804BA /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = "<group>"; };
- F5598546038920E401A804BA /* SDLMain.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SDLMain.nib; path = nibs/SDLMain.nib; sourceTree = "<group>"; };
+ F5598546038920E401A804BA /* MainMenu.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = MainMenu.nib; path = nibs/MainMenu.nib; sourceTree = "<group>"; };
F559854C0389212301A804BA /* 48.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = 48.rom; path = ../roms/48.rom; sourceTree = SOURCE_ROOT; };
F559854D0389212301A804BA /* 128-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "128-0.rom"; path = "../roms/128-0.rom"; sourceTree = SOURCE_ROOT; };
F559854E0389212301A804BA /* 128-1.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "128-1.rom"; path = "../roms/128-1.rom"; sourceTree = SOURCE_ROOT; };
@@ -564,8 +553,6 @@
F55985570389213E01A804BA /* plus3-3.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "plus3-3.rom"; path = "../roms/plus3-3.rom"; sourceTree = SOURCE_ROOT; };
F55985580389213E01A804BA /* tc2048.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = tc2048.rom; path = ../roms/tc2048.rom; sourceTree = SOURCE_ROOT; };
F5598598038921C501A804BA /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
- F55985A40389221501A804BA /* sdldisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdldisplay.h; path = ../ui/sdl/sdldisplay.h; sourceTree = SOURCE_ROOT; };
- F55985A60389221501A804BA /* sdlkeyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdlkeyboard.h; path = ../ui/sdl/sdlkeyboard.h; sourceTree = SOURCE_ROOT; };
F55985AD0389222701A804BA /* ui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ui.h; path = ../ui/ui.h; sourceTree = SOURCE_ROOT; };
F55985AE0389222701A804BA /* uidisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = uidisplay.h; path = ../ui/uidisplay.h; sourceTree = SOURCE_ROOT; };
F55985B10389224001A804BA /* z80_macros.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = z80_macros.h; path = ../z80/z80_macros.h; sourceTree = SOURCE_ROOT; };
@@ -622,7 +609,6 @@
F59B5590039FD8F901A804BA /* TapeBrowserController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TapeBrowserController.m; path = controllers/TapeBrowserController.m; sourceTree = SOURCE_ROOT; };
F5F291060396932B01730B00 /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = Credits.html; sourceTree = "<group>"; };
F5F4333103903ED801E7A043 /* Fuse.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Fuse.icns; sourceTree = "<group>"; };
- F5F8763503995372011FA3A4 /* error.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = error.m; sourceTree = SOURCE_ROOT; };
F5F876370399540D011FA3A4 /* FuseController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FuseController.h; path = controllers/FuseController.h; sourceTree = SOURCE_ROOT; };
F5F876380399540D011FA3A4 /* FuseController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FuseController.m; path = controllers/FuseController.m; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
@@ -637,7 +623,6 @@
B61F469C09121DF100C8096C /* AppKit.framework in Frameworks */,
B61F469D09121DF100C8096C /* spectrum.framework in Frameworks */,
B61F469E09121DF100C8096C /* 765.framework in Frameworks */,
- B61F469F09121DF100C8096C /* SDL.framework in Frameworks */,
B61F46A109121DF100C8096C /* gcrypt.framework in Frameworks */,
B61F46A209121DF100C8096C /* libbz2.framework in Frameworks */,
B64E2A170A6534A3006863D9 /* Carbon.framework in Frameworks */,
@@ -650,15 +635,16 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
+ B6CE7FCF0B28FBEC00EB65B3 /* Views */,
B6DD457908134943008E9F7E /* Content Arrays */,
B67F3C4E07ED34260045339F /* Transformers */,
B632C6AD03E5360C00A864FD /* Controllers */,
+ B64E29F40A6532A2006863D9 /* icon_family */,
B66EA7830401075300A864FD /* FuseMenus.h */,
B66EA7840401075300A864FD /* FuseMenus.m */,
B6A7F0E904C9A11D001025EB /* NumberFormatter.h */,
B6A7F0EA04C9A11D001025EB /* NumberFormatter.m */,
- F55985400389209A01A804BA /* SDLMain.h */,
- B6C57E0605ECC4160056F1D0 /* SDLMain.mm */,
+ B6CE7F510B283A0700EB65B3 /* main.mm */,
);
name = Classes;
sourceTree = "<group>";
@@ -672,7 +658,6 @@
F520C8BC038D022E01A804BA /* OpenGL.framework */,
F541C04303963A9F01C2A5B9 /* spectrum.framework */,
F541C0750396490901C2A5B9 /* 765.framework */,
- F50F65A003B2355701A804BA /* SDL.framework */,
B6BA1A8B04E4F3290017354F /* gcrypt.framework */,
);
name = "Linked Frameworks";
@@ -711,7 +696,6 @@
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
isa = PBXGroup;
children = (
- B64E29F40A6532A2006863D9 /* icon_family */,
B6AD8FE106221F7200C70D75 /* machines */,
B678E3E20608FAA600678A33 /* sound */,
B64586CE059BC02C00934482 /* pokefinder */,
@@ -722,6 +706,7 @@
F5598598038921C501A804BA /* config.h */,
);
name = "Other Sources";
+ path = ..;
sourceTree = "<group>";
};
29B97317FDCFA39411CA2CEA /* Resources */ = {
@@ -870,7 +855,7 @@
B68CB2C603DD920300A804BA /* disassemble.c */,
B604635E04C5F37B00C225C9 /* expression.c */,
);
- name = debugger;
+ path = debugger;
sourceTree = "<group>";
};
B6AD8FE106221F7200C70D75 /* machines */ = {
@@ -899,6 +884,29 @@
name = machines;
sourceTree = "<group>";
};
+ B6CE7E8A0B28027000EB65B3 /* cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ B6CE7F3A0B2830A300EB65B3 /* cocoadisplay.c */,
+ B6CE7F3B0B2830A300EB65B3 /* cocoadisplay.h */,
+ B6CE7F3C0B2830A300EB65B3 /* cocoajoystick.c */,
+ B6CE7F3D0B2830A300EB65B3 /* cocoaui.c */,
+ B6CE7F3E0B2830A300EB65B3 /* cocoaui.h */,
+ B6CE7F3F0B2830A300EB65B3 /* keysyms.c */,
+ );
+ path = cocoa;
+ sourceTree = "<group>";
+ };
+ B6CE7FCF0B28FBEC00EB65B3 /* Views */ = {
+ isa = PBXGroup;
+ children = (
+ B6CE7FCB0B28FBD600EB65B3 /* DisplayOpenGLView.h */,
+ B6CE7FCC0B28FBD600EB65B3 /* DisplayOpenGLView.m */,
+ );
+ name = Views;
+ path = views;
+ sourceTree = "<group>";
+ };
B6D81CAF0813561B00558C18 /* NIB Files */ = {
isa = PBXGroup;
children = (
@@ -911,7 +919,7 @@
B6BA6F0207B1E04200E44C8D /* Preferences.nib */,
B600ADA3077237920030FD05 /* Rollback.nib */,
B6F74F9A04B85B4F0059D51C /* SaveBinary.nib */,
- F5598546038920E401A804BA /* SDLMain.nib */,
+ F5598546038920E401A804BA /* MainMenu.nib */,
F59B5587039F8DB601A804BA /* TapeBrowser.nib */,
B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */,
);
@@ -944,7 +952,7 @@
B60A6A3A042BEECE00D41533 /* scaler_internals.h */,
B6C57E3F05ECC9260056F1D0 /* scalers16.cpp */,
);
- name = scaler;
+ path = scaler;
sourceTree = "<group>";
};
F559854A038920FD01A804BA /* roms */ = {
@@ -1005,34 +1013,15 @@
F559859A038921CA01A804BA /* ui */ = {
isa = PBXGroup;
children = (
+ B6CE7E8A0B28027000EB65B3 /* cocoa */,
F541FB5C03B0B31601FF8235 /* scaler */,
- F559859B038921CF01A804BA /* sdl */,
F55985AD0389222701A804BA /* ui.h */,
F55985AE0389222701A804BA /* uidisplay.h */,
B6BA1A9404E4F88F0017354F /* uijoystick.h */,
);
- name = ui;
+ path = ui;
sourceTree = "<group>";
};
- F559859B038921CF01A804BA /* sdl */ = {
- isa = PBXGroup;
- children = (
- F5F8763503995372011FA3A4 /* error.m */,
- B61D4512048F8F5800FEA4F1 /* keysyms.c */,
- B6F4396C03E9645500A864FD /* sdldisplay.c */,
- F55985A40389221501A804BA /* sdldisplay.h */,
- B6C691B504C20A09005EE041 /* sdljoystick.c */,
- B6030027043363C900A864FD /* sdljoystick.h */,
- B6586D8503E744C000A804BA /* sdlkeyboard.c */,
- F55985A60389221501A804BA /* sdlkeyboard.h */,
- B68D5B20041E085000A864FD /* sdlscreenshot.h */,
- B619FC69090E649700344F94 /* sdlscreenshot.m */,
- B627DAA605ACDF4E00609956 /* sdlui.c */,
- B627DAA705ACDF4E00609956 /* sdlui.h */,
- );
- name = sdl;
- sourceTree = SOURCE_ROOT;
- };
F559859C038921D601A804BA /* z80 */ = {
isa = PBXGroup;
children = (
@@ -1125,7 +1114,6 @@
B601847C065A586900B0BE59 /* zxcf.h */,
);
name = fuse;
- path = ..;
sourceTree = "<group>";
};
/* End PBXGroup section */
@@ -1135,10 +1123,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- B61F45A909121DF100C8096C /* SDLMain.h in Headers */,
B61F45AA09121DF100C8096C /* config.h in Headers */,
- B61F45AB09121DF100C8096C /* sdldisplay.h in Headers */,
- B61F45AC09121DF100C8096C /* sdlkeyboard.h in Headers */,
B61F45AD09121DF100C8096C /* ui.h in Headers */,
B61F45AE09121DF100C8096C /* uidisplay.h in Headers */,
B61F45AF09121DF100C8096C /* z80_macros.h in Headers */,
@@ -1172,9 +1157,7 @@
B61F45CB09121DF100C8096C /* debugger.h in Headers */,
B61F45CC09121DF100C8096C /* DebuggerController.h in Headers */,
B61F45CD09121DF100C8096C /* FuseMenus.h in Headers */,
- B61F45CE09121DF100C8096C /* sdlscreenshot.h in Headers */,
B61F45CF09121DF100C8096C /* scaler_internals.h in Headers */,
- B61F45D009121DF100C8096C /* sdljoystick.h in Headers */,
B61F45D109121DF100C8096C /* dck.h in Headers */,
B61F45D209121DF100C8096C /* psg.h in Headers */,
B61F45D309121DF100C8096C /* compat.h in Headers */,
@@ -1185,7 +1168,6 @@
B61F45D809121DF100C8096C /* pokefinder.h in Headers */,
B61F45D909121DF100C8096C /* PokeFinderController.h in Headers */,
B61F45DA09121DF100C8096C /* utils.h in Headers */,
- B61F45DB09121DF100C8096C /* sdlui.h in Headers */,
B61F45DC09121DF100C8096C /* MemoryBrowserController.h in Headers */,
B61F45DD09121DF100C8096C /* periph.h in Headers */,
B61F45DE09121DF100C8096C /* breakpoint.h in Headers */,
@@ -1222,6 +1204,9 @@
B64E29FD0A65337A006863D9 /* NSString+CarbonFSRefCreation.h in Headers */,
B64E2A010A6533FD006863D9 /* thumbnail.h in Headers */,
B6403FD90A7E4B1A00E00B11 /* loader.h in Headers */,
+ B6CE7F410B2830A300EB65B3 /* cocoadisplay.h in Headers */,
+ B6CE7F440B2830A300EB65B3 /* cocoaui.h in Headers */,
+ B6CE7FCD0B28FBD600EB65B3 /* DisplayOpenGLView.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1283,7 +1268,7 @@
B61F460809121DF100C8096C /* Rollback.nib in Resources */,
B61F460909121DF100C8096C /* SaveBinary.nib in Resources */,
B61F463709121DF100C8096C /* SavePanelAccessoryView.nib in Resources */,
- B61F460A09121DF100C8096C /* SDLMain.nib in Resources */,
+ B61F460A09121DF100C8096C /* MainMenu.nib in Resources */,
B61F460B09121DF100C8096C /* TapeBrowser.nib in Resources */,
B61F460C09121DF100C8096C /* 48.rom in Resources */,
B61F460D09121DF100C8096C /* 128-0.rom in Resources */,
@@ -1384,7 +1369,6 @@
B61F464D09121DF100C8096C /* timer.c in Sources */,
B61F464E09121DF100C8096C /* ui.c in Sources */,
B61F464F09121DF100C8096C /* uidisplay.c in Sources */,
- B61F465009121DF100C8096C /* error.m in Sources */,
B61F465109121DF100C8096C /* FuseController.m in Sources */,
B61F465209121DF100C8096C /* TapeBrowserController.m in Sources */,
B61F465309121DF100C8096C /* utils.c in Sources */,
@@ -1399,28 +1383,22 @@
B61F465C09121DF100C8096C /* debugger.c in Sources */,
B61F465D09121DF100C8096C /* disassemble.c in Sources */,
B61F465E09121DF100C8096C /* memory.c in Sources */,
- B61F465F09121DF100C8096C /* sdlkeyboard.c in Sources */,
B61F466009121DF100C8096C /* DebuggerController.m in Sources */,
- B61F466109121DF100C8096C /* sdldisplay.c in Sources */,
B61F466209121DF100C8096C /* FuseMenus.m in Sources */,
B61F466309121DF100C8096C /* scaler.c in Sources */,
B61F466409121DF100C8096C /* tc2068.c in Sources */,
B61F466509121DF100C8096C /* dck.c in Sources */,
- B61F466609121DF100C8096C /* keysyms.c in Sources */,
B61F466709121DF100C8096C /* psg.c in Sources */,
B61F466809121DF100C8096C /* LoadBinaryController.m in Sources */,
B61F466909121DF100C8096C /* SaveBinaryController.m in Sources */,
- B61F466A09121DF100C8096C /* sdljoystick.c in Sources */,
B61F466B09121DF100C8096C /* joystick.c in Sources */,
B61F466C09121DF100C8096C /* expression.c in Sources */,
B61F466D09121DF100C8096C /* NumberFormatter.m in Sources */,
B61F466E09121DF100C8096C /* pokefinder.c in Sources */,
B61F466F09121DF100C8096C /* machine.c in Sources */,
B61F467009121DF100C8096C /* PokeFinderController.m in Sources */,
- B61F467109121DF100C8096C /* sdlui.c in Sources */,
B61F467209121DF100C8096C /* MemoryBrowserController.m in Sources */,
B61F467309121DF100C8096C /* periph.c in Sources */,
- B61F467409121DF100C8096C /* SDLMain.mm in Sources */,
B61F467509121DF100C8096C /* scalers16.cpp in Sources */,
B61F467609121DF100C8096C /* hq2x.cpp in Sources */,
B61F467709121DF100C8096C /* hq3x.cpp in Sources */,
@@ -1453,12 +1431,17 @@
B61F469209121DF100C8096C /* VolumeSliderToPrefTransformer.m in Sources */,
B61F469309121DF100C8096C /* profile.c in Sources */,
B61F469409121DF100C8096C /* ide.c in Sources */,
- B61F469509121DF100C8096C /* sdlscreenshot.m 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 */,
+ B6CE7F400B2830A300EB65B3 /* cocoadisplay.c in Sources */,
+ B6CE7F420B2830A300EB65B3 /* cocoajoystick.c in Sources */,
+ B6CE7F430B2830A300EB65B3 /* cocoaui.c in Sources */,
+ B6CE7F450B2830A300EB65B3 /* keysyms.c in Sources */,
+ B6CE7F520B283A0700EB65B3 /* main.mm in Sources */,
+ B6CE7FCE0B28FBD600EB65B3 /* DisplayOpenGLView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: branches/fusegl/fuse/fusepb/FuseMenus.h
===================================================================
--- branches/fusegl/fuse/fusepb/FuseMenus.h 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/FuseMenus.h 2006-12-19 06:40:16 UTC (rev 252)
@@ -28,6 +28,11 @@
#ifndef FUSEMENUS_H
#define FUSEMENUS_H
+#include "ui/cocoa/cocoadisplay.h"
+
+void CreateTexture(Cocoa_Texture*);
+void DestroyTexture(void);
+
void Hide(void);
void Open(void);
void SaveAs(void);
Modified: branches/fusegl/fuse/fusepb/FuseMenus.m
===================================================================
--- branches/fusegl/fuse/fusepb/FuseMenus.m 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/FuseMenus.m 2006-12-19 06:40:16 UTC (rev 252)
@@ -27,7 +27,9 @@
*/
+#import "DisplayOpenGLView.h"
#import "FuseController.h"
+#import "FuseMenus.h"
/* Definition of Mac native keycodes for characters used as menu shortcuts that
bring up a window. */
@@ -43,6 +45,17 @@
#define QZ_k 0x28
#define QZ_COMMA 0x2B
+void
+CreateTexture(Cocoa_Texture* new_screen)
+{
+ [[DisplayOpenGLView instance] createTexture:new_screen];
+}
+
+void DestroyTexture(void)
+{
+ [[DisplayOpenGLView instance] destroyTexture];
+}
+
void Hide(void)
{
[NSApp hide:[FuseController singleton]];
Modified: branches/fusegl/fuse/fusepb/Info-Fuse.plist
===================================================================
--- branches/fusegl/fuse/fusepb/Info-Fuse.plist 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/Info-Fuse.plist 2006-12-19 06:40:16 UTC (rev 252)
@@ -367,7 +367,7 @@
<key>CFBundleVersion</key>
<string>20060718</string>
<key>NSMainNibFile</key>
- <string>SDLMain</string>
+ <string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>UTExportedTypeDeclarations</key>
Modified: branches/fusegl/fuse/fusepb/config.h
===================================================================
--- branches/fusegl/fuse/fusepb/config.h 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/config.h 2006-12-19 06:40:16 UTC (rev 252)
@@ -55,7 +55,7 @@
/* #undef UI_GTK2 */
/* Defined if the SDL UI in use */
-#define UI_SDL 1
+/* #undef UI_SDL */
/* Defined if svgalib UI in use */
/* #undef UI_SVGA */
Modified: branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m
===================================================================
--- branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/content_arrays/SDLJoysticks.m 2006-12-19 06:40:16 UTC (rev 252)
@@ -24,7 +24,7 @@
*/
-#include <SDL.h>
+//#include <SDL.h>
#import "SDLJoysticks.h"
Modified: branches/fusegl/fuse/fusepb/controllers/FuseController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/FuseController.m 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/controllers/FuseController.m 2006-12-19 06:40:16 UTC (rev 252)
@@ -52,9 +52,11 @@
#include "psg.h"
#include "rzx.h"
#include "screenshot.h"
+#if 0
#include "sdlscreenshot.h"
#include "sdlui.h"
#include "sdldisplay.h"
+#endif
#include "settings.h"
#include "settings_cocoa.h"
#include "simpleide.h"
@@ -1776,7 +1778,7 @@
switch( item ) {
case UI_STATUSBAR_ITEM_DISK:
- sdl_disk_state = state;
+ //sdl_disk_state = state;
return 0;
case UI_STATUSBAR_ITEM_PAUSED:
@@ -1784,12 +1786,12 @@
return 0;
case UI_STATUSBAR_ITEM_TAPE:
- sdl_tape_state = state;
+ //sdl_tape_state = state;
[[FuseController singleton] setTapePlayMenu:state];
return 0;
case UI_STATUSBAR_ITEM_MICRODRIVE:
- sdl_mdr_state = state;
+ //sdl_mdr_state = state;
return 0;
case UI_STATUSBAR_ITEM_MOUSE:
Modified: branches/fusegl/fuse/fusepb/controllers/JoystickConfigurationController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/JoystickConfigurationController.m 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/controllers/JoystickConfigurationController.m 2006-12-19 06:40:16 UTC (rev 252)
@@ -26,8 +26,6 @@
#import "JoystickConfigurationController.h"
-#include <SDL.h>
-
#include <config.h>
#include <assert.h>
Modified: branches/fusegl/fuse/fusepb/controllers/PreferencesController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/PreferencesController.m 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/controllers/PreferencesController.m 2006-12-19 06:40:16 UTC (rev 252)
@@ -24,8 +24,6 @@
*/
-#include <SDL.h>
-
#include <libspectrum.h>
#include <string.h>
Deleted: branches/fusegl/fuse/fusepb/keysyms.c
===================================================================
--- branches/fusegl/fuse/fusepb/keysyms.c 2006-12-17 13:51:06 UTC (rev 251)
+++ branches/fusegl/fuse/fusepb/keysyms.c 2006-12-19 06:40:16 UTC (rev 252)
@@ -1,178 +0,0 @@
-/* keysyms.c: UI keysym to Fuse input layer keysym mappings
- Copyright (c) 2000-2005 Philip Kendall, Matan Ziv-Av, Russell Marks,
- Fredrick Meunier, Catalin Mihaila
-
- 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., 49 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
-
-*/
-
-/* This file is autogenerated from keysyms.dat by keysyms.pl.
- Do not edit unless you know what you're doing! */
-
-#include <config.h>
-
-#ifdef UI_SDL
-
-#include <SDL.h>
-
-#include "input.h"
-#include "keyboard.h"
-
-/* Map ADC keyboard scancode to Fuse input layer keysym for Spectrum
- virtual keyboard */
-const keysyms_map_t keysyms_map[] = {
-
- { 18, INPUT_KEY_1 },
- { 19, INPUT_KEY_2 },
- { 20, INPUT_KEY_3 },
- { 21, INPUT_KEY_4 },
- { 23, INPUT_KEY_5 },
- { 22, INPUT_KEY_6 },
- { 26, INPUT_KEY_7 },
- { 28, INPUT_KEY_8 },
- { 25, INPUT_KEY_9 },
- { 29, INPUT_KEY_0 },
- { 12, INPUT_KEY_q },
- { 13, INPUT_KEY_w },
- { 14, INPUT_KEY_e },
- { 15, INPUT_KEY_r },
- { 17, INPUT_KEY_t },
- { 16, INPUT_KEY_y },
- { 32, INPUT_KEY_u },
- { 34, INPUT_KEY_i },
- { 31, INPUT_KEY_o },
- { 35, INPUT_KEY_p },
- { 0, INPUT_KEY_a },
- { 1, INPUT_KEY_s },
- { 2, INPUT_KEY_d },
- { 3, INPUT_KEY_f },
- { 5, INPUT_KEY_g },
- { 4, INPUT_KEY_h },
- { 38, INPUT_KEY_j },
- { 40, INPUT_KEY_k },
- { 37, INPUT_KEY_l },
- { 6, INPUT_KEY_z },
- { 7, INPUT_KEY_x },
- { 8, INPUT_KEY_c },
- { 9, INPUT_KEY_v },
- { 11, INPUT_KEY_b },
- { 45, INPUT_KEY_n },
- { 46, INPUT_KEY_m },
-
- { 0xff, 0 } /* End marker: DO NOT MOVE! */
-
-};
-
-/* Map things with no reasonable Unicode value (modifiers etc.) from SDL sym
- to Fuse input layer keysym */
-const keysyms_map_t modifier_keysyms_map[] = {
-
- { SDLK_ESCAPE, INPUT_KEY_Escape },
- { SDLK_F1, INPUT_KEY_F1 },
- { SDLK_F2, INPUT_KEY_F2 },
- { SDLK_F3, INPUT_KEY_F3 },
- { SDLK_F4, INPUT_KEY_F4 },
- { SDLK_F5, INPUT_KEY_F5 },
- { SDLK_F6, INPUT_KEY_F6 },
- { SDLK_F7, INPUT_KEY_F7 },
- { SDLK_F8, INPUT_KEY_F8 },
- { SDLK_F9, INPUT_KEY_F9 },
- { SDLK_F10, INPUT_KEY_F10 },
- { SDLK_F11, INPUT_KEY_F11 },
- { SDLK_F12, INPUT_KEY_F12 },
- { SDLK_BACKSPACE, INPUT_KEY_BackSpace },
- { SDLK_TAB, INPUT_KEY_Tab },
- //{ SDLK_CAPSLOCK, INPUT_KEY_Caps_Lock },
- { SDLK_RETURN, INPUT_KEY_Return },
- { SDLK_LSHIFT, INPUT_KEY_Shift_L },
- { SDLK_RSHIFT, INPUT_KEY_Shift_R },
- { SDLK_LCTRL, INPUT_KEY_Control_L },
- { SDLK_LALT, INPUT_KEY_Alt_L },
- { SDLK_LSUPER, INPUT_KEY_Super_L },
- { SDLK_SPACE, INPUT_KEY_space },
- { SDLK_RSUPER, INPUT_KEY_Super_R },
- { SDLK_RALT, INPUT_KEY_Alt_R },
- { SDLK_RCTRL, INPUT_KEY_Control_R },
- { SDLK_MENU, INPUT_KEY_Mode_switch },
- { SDLK_LEFT, INPUT_KEY_Left },
- { SDLK_DOWN, ...
[truncated message content] |
