diff --git a/.DS_Store b/.DS_Store index 044e1969..1e60023b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings index 00b513ac..78ad12bd 100644 Binary files a/English.lproj/InfoPlist.strings and b/English.lproj/InfoPlist.strings differ diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index 00b0cf50..e9a306c0 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -43,7 +43,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 20, 453, - 122.2085, + 129.2085, ); PBXFileTableDataSourceColumnsKey = ( PBXErrorsWarningsDataSource_TypeID, @@ -77,7 +77,7 @@ 43, 20, 79, - 69, + 10, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, @@ -141,28 +141,32 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 245804800; - PBXWorkspaceStateSaveDate = 245804800; + PBXPerProjectTemplateStateSaveDate = 245883613; + PBXWorkspaceStateSaveDate = 245883613; }; perUserProjectItems = { - F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */; - F5B19C180EA4D6E8003F4BA4 = F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */; - F5B19C1A0EA4D6E8003F4BA4 = F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */; - F5B19C2F0EA4DB23003F4BA4 = F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */; - F5B19C300EA4DB23003F4BA4 = F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */; - F5B19C310EA4DB36003F4BA4 = F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */; - F5B1D1770EA5FE2100AB8D0F = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */; - F5B1D1790EA5FE2100AB8D0F = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */; - F5B1D1B50EA602BA00AB8D0F = F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */; - F5B1D1B70EA602BA00AB8D0F = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */; - F5B1D1BD0EA602C300AB8D0F = F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */; - F5B1D1CA0EA602F600AB8D0F = F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */; - F5BF1F1F0EA69319000E9B3D = F5BF1F1F0EA69319000E9B3D /* PBXTextBookmark */; - F5D35A630EA6AE4800497F18 = F5D35A630EA6AE4800497F18 /* PBXTextBookmark */; - F5DCE26A0EA50EDC0065B0EF = F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */; - F5DCE26B0EA50EDC0065B0EF = F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */; - F5DCE26C0EA50EDC0065B0EF = F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */; - F5DCE26E0EA50EDC0065B0EF = F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */; + F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */; + F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */; + F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */; + F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */ = F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */; + F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */ = F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */; + F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */ = F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */; + F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */ = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */; + F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */ = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */; + F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */ = F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */; + F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */ = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */; + F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */ = F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */; + F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */ = F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */; + F5B8B7700EA7E20300214777 /* PBXTextBookmark */ = F5B8B7700EA7E20300214777 /* PBXTextBookmark */; + F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */; + F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */; + F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */; + F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */; + F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */; + F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */; + F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */; + F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */; + F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { @@ -236,8 +240,8 @@ }; F5B19B7B0EA4BE3E003F4BA4 /* graph.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1620, 116090}}"; - sepNavSelRange = "{204086, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1620, 116109}}"; + sepNavSelRange = "{204170, 0}"; sepNavVisRect = "{{0, 0}, {0, 0}}"; }; }; @@ -356,9 +360,9 @@ }; F5B19C3C0EA4DC91003F4BA4 /* English */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1404, 536}}"; + sepNavIntBoundsRect = "{{0, 0}, {1692, 536}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {867, 536}}"; + sepNavVisRect = "{{825, 0}, {867, 536}}"; sepNavWindowFrame = "{{15, 76}, {906, 665}}"; }; }; @@ -422,26 +426,95 @@ vrLen = 170; vrLoc = 0; }; - F5BF1F1F0EA69319000E9B3D /* PBXTextBookmark */ = { + F5B8B7700EA7E20300214777 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; - name = "graph.c: 6162"; + name = "graph.c: 6111"; rLen = 0; - rLoc = 204086; - rType = 0; - vrLen = 170; - vrLoc = 0; - }; - F5D35A630EA6AE4800497F18 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; - name = "graph.c: 6162"; - rLen = 0; - rLoc = 204086; + rLoc = 204170; rType = 0; vrLen = 0; vrLoc = 0; }; + F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; + name = "graph.c: 6111"; + rLen = 0; + rLoc = 204170; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F5B8B7910EA7EE9F00214777 /* SDL_keysym.h */; + rLen = 0; + rLoc = 2147483647; + rType = 0; + }; + F5B8B7910EA7EE9F00214777 /* SDL_keysym.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = SDL_keysym.h; + path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {867, 5928}}"; + sepNavSelRange = "{2619, 11}"; + sepNavVisRect = "{{0, 1704}, {867, 536}}"; + sepNavWindowFrame = "{{38, -28}, {906, 665}}"; + }; + }; + F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F5B8B7930EA7EE9F00214777 /* SDL_keysym.h */; + name = SDLK_DELETE; + rLen = 11; + rLoc = 2619; + rType = 0; + vrLen = 559; + vrLoc = 2295; + }; + F5B8B7930EA7EE9F00214777 /* SDL_keysym.h */ = { + isa = PBXFileReference; + name = SDL_keysym.h; + path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h; + sourceTree = ""; + }; + F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F5B8B7970EA7EE9F00214777 /* SDL_keyboard.h */; + rLen = 0; + rLoc = 2147483647; + rType = 0; + }; + F5B8B7970EA7EE9F00214777 /* SDL_keyboard.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = SDL_keyboard.h; + path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h; + sourceTree = ""; + uiCtxt = { + sepNavWindowFrame = "{{15, 76}, {906, 665}}"; + }; + }; + F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F5B8B7990EA7EE9F00214777 /* SDL_keyboard.h */; + name = "(null): 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 961; + vrLoc = 1042; + }; + F5B8B7990EA7EE9F00214777 /* SDL_keyboard.h */ = { + isa = PBXFileReference; + name = SDL_keyboard.h; + path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h; + sourceTree = ""; + }; F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19B880EA4BE3E003F4BA4 /* saveini.c */; diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index ea913dd5..d7566246 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -185,12 +185,93 @@ Notifications OpenEditors - + + + Content + + PBXProjectModuleGUID + F5B8B78E0EA7EE9F00214777 + PBXProjectModuleLabel + SDL_keysym.h + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + F5B8B78F0EA7EE9F00214777 + PBXProjectModuleLabel + SDL_keysym.h + _historyCapacity + 0 + bookmark + F5B8B7920EA7EE9F00214777 + history + + F5B8B7900EA7EE9F00214777 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {906, 568}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 38 28 906 609 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + F5B8B7940EA7EE9F00214777 + PBXProjectModuleLabel + SDL_keyboard.h + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + F5B8B7950EA7EE9F00214777 + PBXProjectModuleLabel + SDL_keyboard.h + _historyCapacity + 0 + bookmark + F5B8B7980EA7EE9F00214777 + history + + F5B8B7960EA7EE9F00214777 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {906, 568}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 132 906 609 0 0 1024 746 + + + PerspectiveWidths - 985 - 985 - 985 + 992 + 992 + 992 Perspectives @@ -270,12 +351,12 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 40 - 39 + 3 + 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 494}, {339, 262}} + {{0, 0}, {339, 261}} PBXTopSmartGroupGIDs @@ -285,7 +366,7 @@ GeometryConfiguration Frame - {{0, 0}, {356, 280}} + {{0, 0}, {356, 279}} GroupTreeTableConfiguration FileBuiltColumn @@ -296,7 +377,7 @@ 297 RubberWindowFrame - 11 98 992 321 0 0 1024 746 + 24 426 883 320 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -324,7 +405,7 @@ _historyCapacity 0 bookmark - F5D35A630EA6AE4800497F18 + F5B8B7890EA7EE9F00214777 history F5B19C160EA4D6E8003F4BA4 @@ -333,7 +414,7 @@ F5DCE26C0EA50EDC0065B0EF F5B1D1770EA5FE2100AB8D0F F5B1D1B50EA602BA00AB8D0F - F5BF1F1F0EA69319000E9B3D + F5B8B7700EA7E20300214777 prevStack @@ -353,9 +434,9 @@ GeometryConfiguration Frame - {{0, 0}, {631, 0}} + {{0, 0}, {522, 0}} RubberWindowFrame - 11 98 992 321 0 0 1024 746 + 24 426 883 320 0 0 1024 746 Module PBXNavigatorGroup @@ -364,7 +445,7 @@ Proportion - 275pt + 274pt Tabs @@ -378,9 +459,9 @@ GeometryConfiguration Frame - {{10, 27}, {631, 248}} + {{10, 27}, {522, 247}} RubberWindowFrame - 11 98 992 321 0 0 1024 746 + 24 426 883 320 0 0 1024 746 Module XCDetailModule @@ -421,7 +502,7 @@ Proportion - 631pt + 522pt Name @@ -439,11 +520,11 @@ TableOfContents - F5D35A4C0EA6A4F800497F18 + F5B8B7780EA7E2E200214777 1CA23ED40692098700951B8B - F5D35A4D0EA6A4F800497F18 + F5B8B7790EA7E2E200214777 F5B19BA70EA4BF24003F4BA4 - F5D35A4E0EA6A4F800497F18 + F5B8B77A0EA7E2E200214777 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -491,7 +572,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 963 + 970 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -512,7 +593,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {0, 0}} + {{0, 0}, {970, 262}} PBXTopSmartGroupGIDs @@ -522,17 +603,17 @@ GeometryConfiguration Frame - {{0, 0}, {980, 520}} + {{0, 0}, {987, 280}} GroupTreeTableConfiguration MainColumn - 963 + 970 Module PBXSmartGroupTreeModule Proportion - 980pt + 987pt Dock @@ -581,16 +662,16 @@ GeometryConfiguration Frame - {{0, 0}, {0, 361}} + {{0, 0}, {0, 253}} Module PBXNavigatorGroup Proportion - 361pt + 253pt Proportion - 0pt + 108pt Tabs @@ -608,7 +689,7 @@ GeometryConfiguration Frame - {{10, 27}, {0, -27}} + {{10, 27}, {0, 81}} Module PBXBuildResultsModule @@ -688,14 +769,14 @@ TableOfContents - F5D35A4F0EA6A4F800497F18 + F5B8B78A0EA7EE9F00214777 1CA23EE50692099D00951B8B - F5D35A500EA6A4F800497F18 + F5B8B78B0EA7EE9F00214777 F5B19BA70EA4BF24003F4BA4 - F5D35A510EA6A4F800497F18 + F5B8B78C0EA7EE9F00214777 XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - F5D35A520EA6A4F800497F18 + F5B8B78D0EA7EE9F00214777 ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -864,10 +945,11 @@ 5 WindowOrderList + F5B8B78E0EA7EE9F00214777 /Users/xx/Grafx2/Grafx2.xcodeproj WindowString - 11 98 992 321 0 0 1024 746 + 24 426 883 320 0 0 1024 746 WindowTools diff --git a/clavier.c b/clavier.c index 409e0b2b..289cd8e1 100644 --- a/clavier.c +++ b/clavier.c @@ -535,9 +535,18 @@ word Conversion_ANSI(SDL_keysym Sym) case 0xC600: return 'ã'; // ã } + // Touche entre 127 et 255 if (Sym.unicode<256) { +#ifdef __macosx__ + // fc: Looks like there's a mismatch with delete & backspace + // i don't why SDLK_DELETE was returned instead of SDLK_BACKSPACE + if(Sym.unicode == 127) + { + return(SDLK_BACKSPACE); + } +#endif return Sym.unicode; } // Sinon c'est une touche spéciale, on retourne son scancode diff --git a/const.h b/const.h index c723de9e..440dc729 100644 --- a/const.h +++ b/const.h @@ -29,7 +29,7 @@ #define M_2PI 6.28318530717958647692528676656 // Note: La taille du fichier GFX2.DAT est définie au début de INIT.C ! -#define POURCENTAGE_VERSION "97.3%" // Libellé du pourcentage de la version ß +#define POURCENTAGE_VERSION "97.4%" // Libellé du pourcentage de la version ß #define VERSION1 2 // | #define VERSION2 0 // |_ Numéro de version découpé en #define BETA1 97 // | plusieurs parties => 2.0 ß95.5% diff --git a/readline.c b/readline.c index d086b6a5..e57173ef 100644 --- a/readline.c +++ b/readline.c @@ -156,6 +156,10 @@ byte Readline(word Pos_X,word Pos_Y,char * Chaine,byte Taille_affichee,byte Type UpdateRect(Fenetre_Pos_X+(Pos_X*Menu_Facteur_X),Fenetre_Pos_Y+(Pos_Y*Menu_Facteur_Y), Taille_affichee*(Menu_Facteur_X<<3),(Menu_Facteur_Y<<3)); +#ifdef __macosx__ + Flush_update(); +#endif + while ((Touche_lue!=SDLK_RETURN) && (Touche_lue!=SDLK_ESCAPE)) { Touche_lue=Get_key(); @@ -219,6 +223,7 @@ byte Readline(word Pos_X,word Pos_Y,char * Chaine,byte Taille_affichee,byte Type } break; case SDLK_BACKSPACE : // Backspace : combinaison de gauche + suppr + if (Position) { Position--; @@ -279,9 +284,9 @@ byte Readline(word Pos_X,word Pos_Y,char * Chaine,byte Taille_affichee,byte Type goto affichage; } // Fin du test d'autorisation de touche } // Fin du test de place libre - break; + break; - affichage: +affichage: Taille=strlen(Chaine); // Formatage d'une partie de la chaine (si trop longue pour tenir) strncpy(Chaine_affichee, Chaine + Offset, Taille_affichee); @@ -295,6 +300,9 @@ byte Readline(word Pos_X,word Pos_Y,char * Chaine,byte Taille_affichee,byte Type UpdateRect(Fenetre_Pos_X+(Pos_X*Menu_Facteur_X),Fenetre_Pos_Y+(Pos_Y*Menu_Facteur_Y), Taille_affichee*(Menu_Facteur_X<<3),(Menu_Facteur_Y<<3)); } // Fin du "switch(Touche_lue)" +#ifdef __macosx__ + Flush_update(); +#endif } // Fin du "while" // Effacement de la chaîne