diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index 148d5464..9fe74167 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -165,20 +165,18 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 246237270; - PBXWorkspaceStateSaveDate = 246237270; + PBXPerProjectTemplateStateSaveDate = 246290428; + PBXWorkspaceStateSaveDate = 246290428; }; perUserProjectItems = { F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */; F5B1D1770EA5FE2100AB8D0F = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */; F5B1D1790EA5FE2100AB8D0F = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */; F5B1D1B70EA602BA00AB8D0F = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */; - F5B1EE860EAD0F5800B087B5 = F5B1EE860EAD0F5800B087B5 /* PBXTextBookmark */; F5B1EEA80EAD15CD00B087B5 = F5B1EEA80EAD15CD00B087B5 /* PBXTextBookmark */; - F5B1EEA90EAD15CD00B087B5 = F5B1EEA90EAD15CD00B087B5 /* PBXTextBookmark */; F5B1EEAA0EAD15CD00B087B5 = F5B1EEAA0EAD15CD00B087B5 /* PBXTextBookmark */; - F5B1EEBB0EAD20DC00B087B5 = F5B1EEBB0EAD20DC00B087B5 /* PBXTextBookmark */; F5B1EEBC0EAD20DC00B087B5 = F5B1EEBC0EAD20DC00B087B5 /* PBXTextBookmark */; + F5D4B83C0EAD7B9F00BCEF63 = F5D4B83C0EAD7B9F00BCEF63 /* PBXTextBookmark */; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { @@ -297,8 +295,8 @@ }; F5B19B850EA4BE3E003F4BA4 /* palette.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1268, 36746}}"; - sepNavSelRange = "{74708, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1268, 37202}}"; + sepNavSelRange = "{75869, 0}"; sepNavVisRect = "{{0, 0}, {0, 0}}"; sepNavWindowFrame = "{{15, 76}, {906, 665}}"; }; @@ -366,16 +364,6 @@ vrLen = 227; vrLoc = 0; }; - F5B1EE860EAD0F5800B087B5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; - name = "divers.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 123; - vrLoc = 0; - }; F5B1EEA80EAD15CD00B087B5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; @@ -386,14 +374,6 @@ vrLen = 123; vrLoc = 0; }; - F5B1EEA90EAD15CD00B087B5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: parse error at end of input"; - fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */; - rLen = 0; - rLoc = 1934; - rType = 1; - }; F5B1EEAA0EAD15CD00B087B5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; @@ -404,16 +384,6 @@ vrLen = 123; vrLoc = 0; }; - F5B1EEBB0EAD20DC00B087B5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; - name = "divers.c: 866"; - rLen = 0; - rLoc = 24223; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; F5B1EEBC0EAD20DC00B087B5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */; @@ -424,6 +394,16 @@ vrLen = 0; vrLoc = 0; }; + F5D4B83C0EAD7B9F00BCEF63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */; + name = "palette.c: 1958"; + rLen = 0; + rLoc = 75318; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; F5DCE2700EA50EDC0065B0EF /* SDL_image.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index 5703c137..db9ff661 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -464,8 +464,6 @@ Layout - BecomeActive - ContentConfiguration PBXBottomSmartGroupGIDs @@ -490,15 +488,18 @@ PBXSmartGroupTreeModuleOutlineStateKey_v7 PBXSmartGroupTreeModuleOutlineStateExpansionKey - + + 29B97314FDCFA39411CA2CEA + PBXSmartGroupTreeModuleOutlineStateSelectionKey + 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {251, 180}} + {{0, 0}, {251, 429}} PBXTopSmartGroupGIDs @@ -508,14 +509,14 @@ GeometryConfiguration Frame - {{0, 0}, {268, 198}} + {{0, 0}, {268, 447}} GroupTreeTableConfiguration MainColumn 251 RubberWindowFrame - 22 503 975 239 0 0 1024 746 + 47 162 969 488 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -543,13 +544,13 @@ _historyCapacity 0 bookmark - F5B1EEBC0EAD20DC00B087B5 + F5D4B83C0EAD7B9F00BCEF63 history F5B19C160EA4D6E8003F4BA4 F5B1D1770EA5FE2100AB8D0F F5B1EEA80EAD15CD00B087B5 - F5B1EEA90EAD15CD00B087B5 + F5B1EEBC0EAD20DC00B087B5 prevStack @@ -569,9 +570,9 @@ GeometryConfiguration Frame - {{0, 0}, {702, 0}} + {{0, 0}, {696, 0}} RubberWindowFrame - 22 503 975 239 0 0 1024 746 + 47 162 969 488 0 0 1024 746 Module PBXNavigatorGroup @@ -580,14 +581,16 @@ Proportion - 193pt + 442pt Tabs + BecomeActive + ContentConfiguration PBXBuildLogShowsTranscriptDefaultKey - {{0, 166}, {702, 0}} + {{0, 267}, {696, 148}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -600,9 +603,9 @@ GeometryConfiguration Frame - {{10, 27}, {702, 166}} + {{10, 27}, {696, 415}} RubberWindowFrame - 22 503 975 239 0 0 1024 746 + 47 162 969 488 0 0 1024 746 Module PBXBuildResultsModule @@ -664,7 +667,7 @@ Proportion - 702pt + 696pt Name @@ -682,14 +685,14 @@ TableOfContents - F5B1EEAC0EAD15CD00B087B5 + F5D4B83D0EAD7B9F00BCEF63 1CA23EE50692099D00951B8B - F5B1EEAD0EAD15CD00B087B5 + F5D4B83E0EAD7B9F00BCEF63 F5B19BA70EA4BF24003F4BA4 - F5B1EEAE0EAD15CD00B087B5 + F5D4B83F0EAD7B9F00BCEF63 XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - F5B1EEAF0EAD15CD00B087B5 + F5D4B8400EAD7B9F00BCEF63 ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -861,7 +864,7 @@ /Users/xx/Grafx2/Grafx2.xcodeproj WindowString - 22 503 975 239 0 0 1024 746 + 47 162 969 488 0 0 1024 746 WindowTools diff --git a/boutons.c b/boutons.c index 699db20e..4b19a079 100644 --- a/boutons.c +++ b/boutons.c @@ -1298,19 +1298,21 @@ void Afficher_liste_modes(short Debut_liste, short Position_curseur) memcpy(Chaine+9," Window ",15); if (Mode_video[Mode_courant].Largeur*3 == Mode_video[Mode_courant].Hauteur*4) - Ratio=" 4/3 "; + Ratio=" 4:3"; else if (Mode_video[Mode_courant].Largeur*9 == Mode_video[Mode_courant].Hauteur*16) - Ratio="16/9 "; + Ratio=" 16:9"; else if (Mode_video[Mode_courant].Largeur*10 == Mode_video[Mode_courant].Hauteur*16) - Ratio="16/10 "; + Ratio=" 16:10"; + else if (Mode_video[Mode_courant].Largeur*145 == Mode_video[Mode_courant].Hauteur*192) + Ratio="192:145"; else - Ratio=" "; + Ratio=" "; if (Mode_courant == 0) - Ratio=" "; + Ratio=" "; strcat(Chaine,Ratio); - Print_dans_fenetre(39,Pos_Y,Chaine,Couleur_texte,Couleur_fond); + Print_dans_fenetre(30,Pos_Y,Chaine,Couleur_texte,Couleur_fond); } }