diff --git a/Grafx2.xcodeproj/project.pbxproj b/Grafx2.xcodeproj/project.pbxproj index 5b9cd413..048530c4 100644 --- a/Grafx2.xcodeproj/project.pbxproj +++ b/Grafx2.xcodeproj/project.pbxproj @@ -8,13 +8,17 @@ /* Begin PBXBuildFile section */ 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; }; + 002F39FA09D0881F10EBEB88 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F10EBEB88 /* SDL_image.framework */; }; 002F3A2E09D0888800EBEB88 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */; }; 002F3A3F09D088BA00EBEB88 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A3E09D088BA00EBEB88 /* main.c */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + F51CBD2E0EC8A3E1005C06AC /* 5pxtinyfont.png in Copy fonts */ = {isa = PBXBuildFile; fileRef = F51CBD2B0EC8A3E1005C06AC /* 5pxtinyfont.png */; }; + F51CBD2F0EC8A3E1005C06AC /* colorfont.pcx in Copy fonts */ = {isa = PBXBuildFile; fileRef = F51CBD2C0EC8A3E1005C06AC /* colorfont.pcx */; }; + F51CBD300EC8A3E1005C06AC /* Tuffy.ttf in Copy fonts */ = {isa = PBXBuildFile; fileRef = F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */; }; + F5A33E6A0EC893F800F8052D /* 8pxfont.png in Copy fonts */ = {isa = PBXBuildFile; fileRef = F5A33E690EC893F800F8052D /* 8pxfont.png */; }; F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AD4B1E0EA8CCF0009CCAC4 /* version.c */; }; F5B138940EB71977000B83CC /* texte.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B138930EB71977000B83CC /* texte.c */; }; F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138C20EB71D28000B83CC /* SDL_ttf */; }; - F5B19B740EA4BDF5003F4BA4 /* 8pxfont.png in Resources */ = {isa = PBXBuildFile; fileRef = F5B19B730EA4BDF5003F4BA4 /* 8pxfont.png */; }; F5B19B8D0EA4BE3E003F4BA4 /* aide.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B750EA4BE3E003F4BA4 /* aide.c */; }; F5B19B8E0EA4BE3E003F4BA4 /* boutons.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B760EA4BE3E003F4BA4 /* boutons.c */; }; F5B19B8F0EA4BE3E003F4BA4 /* clavier.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B770EA4BE3E003F4BA4 /* clavier.c */; }; @@ -81,10 +85,25 @@ name = "Copy Frameworks into .app bundle"; runOnlyForDeploymentPostprocessing = 0; }; + F5A33F1D0EC8A26C00F8052D /* Copy fonts */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = fonts; + dstSubfolderSpec = 7; + files = ( + F51CBD300EC8A3E1005C06AC /* Tuffy.ttf in Copy fonts */, + F51CBD2F0EC8A3E1005C06AC /* colorfont.pcx in Copy fonts */, + F51CBD2E0EC8A3E1005C06AC /* 5pxtinyfont.png in Copy fonts */, + F5A33E6A0EC893F800F8052D /* 8pxfont.png in Copy fonts */, + ); + name = "Copy fonts"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ 002F39F909D0881F00EBEB88 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; }; + 002F39F909D0881F10EBEB88 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = ""; }; 002F3A2B09D0888800EBEB88 /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = SOURCE_ROOT; }; 002F3A2C09D0888800EBEB88 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = SOURCE_ROOT; }; 002F3A3E09D088BA00EBEB88 /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = SOURCE_ROOT; }; @@ -94,11 +113,14 @@ 32CA4F630368D1EE00C91783 /* Grafx2_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Grafx2_Prefix.pch; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D1107320486CEB800E47090 /* Grafx2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Grafx2.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F51CBD2B0EC8A3E1005C06AC /* 5pxtinyfont.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 5pxtinyfont.png; path = fonts/5pxtinyfont.png; sourceTree = ""; }; + F51CBD2C0EC8A3E1005C06AC /* colorfont.pcx */ = {isa = PBXFileReference; lastKnownFileType = file; name = colorfont.pcx; path = fonts/colorfont.pcx; sourceTree = ""; }; + F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Tuffy.ttf; path = fonts/Tuffy.ttf; sourceTree = ""; }; + F5A33E690EC893F800F8052D /* 8pxfont.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 8pxfont.png; path = fonts/8pxfont.png; sourceTree = ""; }; F5AD4B1E0EA8CCF0009CCAC4 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = ""; }; F5B138930EB71977000B83CC /* texte.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = texte.c; sourceTree = ""; }; F5B138C20EB71D28000B83CC /* SDL_ttf */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_ttf; path = /Library/Frameworks/SDL_ttf.framework/SDL_ttf; sourceTree = ""; }; F5B19B6C0EA4BDA8003F4BA4 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = ""; }; - F5B19B730EA4BDF5003F4BA4 /* 8pxfont.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 8pxfont.png; sourceTree = ""; }; F5B19B750EA4BE3E003F4BA4 /* aide.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = aide.c; sourceTree = ""; }; F5B19B760EA4BE3E003F4BA4 /* boutons.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = boutons.c; sourceTree = ""; }; F5B19B770EA4BE3E003F4BA4 /* clavier.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = clavier.c; sourceTree = ""; }; @@ -138,6 +160,7 @@ buildActionMask = 2147483647; files = ( 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */, + 002F39FA09D0881F10EBEB88 /* SDL_image.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, F5B19C1D0EA4D71C003F4BA4 /* CoreFoundation.framework in Frameworks */, F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */, @@ -160,6 +183,7 @@ isa = PBXGroup; children = ( 002F39F909D0881F00EBEB88 /* SDL.framework */, + 002F39F909D0881F10EBEB88 /* SDL_image.framework */, 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -185,6 +209,10 @@ 29B97314FDCFA39411CA2CEA /* Grafx2 */ = { isa = PBXGroup; children = ( + F51CBD2B0EC8A3E1005C06AC /* 5pxtinyfont.png */, + F51CBD2C0EC8A3E1005C06AC /* colorfont.pcx */, + F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */, + F5A33E690EC893F800F8052D /* 8pxfont.png */, F5B138C20EB71D28000B83CC /* SDL_ttf */, F5B138930EB71977000B83CC /* texte.c */, F5B1EE840EAD0F4E00B087B5 /* gfx2.ini */, @@ -219,7 +247,6 @@ F5B19B8A0EA4BE3E003F4BA4 /* SFont.c */, F5B19B8B0EA4BE3E003F4BA4 /* shade.c */, F5B19B8C0EA4BE3E003F4BA4 /* special.c */, - F5B19B730EA4BDF5003F4BA4 /* 8pxfont.png */, F5B19B6C0EA4BDA8003F4BA4 /* SDL_image.framework */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -269,6 +296,7 @@ 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */, 002F39FD09D0883400EBEB89 /* Copy Frameworks into .app bundle */, 002F39FD09D0883400EBEB8A /* Copy Frameworks into .app bundle */, + F5A33F1D0EC8A26C00F8052D /* Copy fonts */, ); buildRules = ( ); @@ -300,7 +328,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - F5B19B740EA4BDF5003F4BA4 /* 8pxfont.png in Resources */, F5B19BE10EA4C65A003F4BA4 /* gfx2.cfg in Resources */, F5B19BE20EA4C65A003F4BA4 /* gfx2.dat in Resources */, F5B19C3D0EA4DC91003F4BA4 /* InfoPlist.strings in Resources */, @@ -422,7 +449,6 @@ isa = XCBuildConfiguration; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( - "$(HOME)/Library/Frameworks", /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); @@ -440,7 +466,7 @@ "$(HEADER_SEARCH_PATHS)", ); PREBINDING = NO; - PRELINK_LIBS = "-lSDL_Image"; + PRELINK_LIBS = SDL_Image; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = YES; }; @@ -451,7 +477,6 @@ buildSettings = { DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = ( - "$(HOME)/Library/Frameworks", /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); @@ -467,7 +492,7 @@ "$(HEADER_SEARCH_PATHS)", ); PREBINDING = NO; - PRELINK_LIBS = "-lSDL_Image"; + PRELINK_LIBS = SDL_Image; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Release; diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index 8a710782..56baabf5 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -43,7 +43,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 20, 453, - 88.2085, + 58.2085, ); PBXFileTableDataSourceColumnsKey = ( PBXErrorsWarningsDataSource_TypeID, @@ -57,7 +57,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 22, 300, - 280, + 209, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, @@ -77,7 +77,7 @@ 43, 20, 79, - 51, + 95, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, @@ -165,16 +165,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 246882396; - PBXWorkspaceStateSaveDate = 246882396; - }; - perUserProjectItems = { - F5AE7F8D0EB12409001C151F = F5AE7F8D0EB12409001C151F /* PBXTextBookmark */; - F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */; - F5B1D1770EA5FE2100AB8D0F = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */; - F5B1D1790EA5FE2100AB8D0F = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */; - F5B1EEA80EAD15CD00B087B5 = F5B1EEA80EAD15CD00B087B5 /* PBXTextBookmark */; - F5B1EEAA0EAD15CD00B087B5 = F5B1EEAA0EAD15CD00B087B5 /* PBXTextBookmark */; + PBXPerProjectTemplateStateSaveDate = 248029954; + PBXWorkspaceStateSaveDate = 248029954; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { @@ -187,15 +179,10 @@ F5B19B5D0EA4BD57003F4BA4 /* Grafx2 */, ); }; - F5AE7F8D0EB12409001C151F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */; - name = "palette.c: 1942"; - rLen = 0; - rLoc = 75128; - rType = 0; - vrLen = 0; - vrLoc = 0; + F5A33E690EC893F800F8052D /* 8pxfont.png */ = { + uiCtxt = { + sepNavWindowFrame = "{{15, 76}, {906, 665}}"; + }; }; F5B138930EB71977000B83CC /* texte.c */ = { uiCtxt = { @@ -251,11 +238,6 @@ objects = ( ); }; - F5B19B730EA4BDF5003F4BA4 /* 8pxfont.png */ = { - uiCtxt = { - sepNavWindowFrame = "{{38, 55}, {906, 665}}"; - }; - }; F5B19B750EA4BE3E003F4BA4 /* aide.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {964, 7904}}"; @@ -281,9 +263,10 @@ }; F5B19B7B0EA4BE3E003F4BA4 /* graph.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1620, 116128}}"; - sepNavSelRange = "{204170, 0}"; - sepNavVisRect = "{{0, 0}, {0, 0}}"; + sepNavIntBoundsRect = "{{0, 0}, {1620, 118579}}"; + sepNavSelRange = "{16112, 36}"; + sepNavVisRect = "{{0, 9964}, {867, 536}}"; + sepNavWindowFrame = "{{15, 76}, {906, 665}}"; }; }; F5B19B7C0EA4BE3E003F4BA4 /* init.c */ = { @@ -334,23 +317,6 @@ sepNavWindowFrame = "{{61, 34}, {906, 665}}"; }; }; - F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19C170EA4D6E8003F4BA4 /* curl.h */; - name = "(null): 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 209; - vrLoc = 41573; - }; - F5B19C170EA4D6E8003F4BA4 /* curl.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = curl.h; - path = /Developer/SDKs/MacOSX10.4u.sdk/usr/include/curl/curl.h; - sourceTree = ""; - }; F5B19C3C0EA4DC91003F4BA4 /* English */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1692, 536}}"; @@ -359,51 +325,4 @@ sepNavWindowFrame = "{{15, 76}, {906, 665}}"; }; }; - F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5DCE2700EA50EDC0065B0EF /* SDL_image.h */; - name = "SDL_image.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 376; - vrLoc = 0; - }; - F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5DCE2700EA50EDC0065B0EF /* SDL_image.h */; - name = "SDL_image.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 376; - vrLoc = 0; - }; - F5B1EEA80EAD15CD00B087B5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; - name = "divers.c: 865"; - rLen = 0; - rLoc = 24200; - rType = 0; - vrLen = 123; - vrLoc = 0; - }; - F5B1EEAA0EAD15CD00B087B5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; - name = "divers.c: 865"; - rLen = 0; - rLoc = 24200; - rType = 0; - vrLen = 123; - vrLoc = 0; - }; - F5DCE2700EA50EDC0065B0EF /* SDL_image.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = SDL_image.h; - path = /Library/Frameworks/SDL_image.framework/Headers/SDL_image.h; - sourceTree = ""; - }; } diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index 0b10c7af..ddd4066f 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -166,7 +166,7 @@ FavBarConfig PBXProjectModuleGUID - F5B19BC40EA4C1B1003F4BA4 + F5A33EC80EC89C3000F8052D XCBarModuleItemNames XCBarModuleItems @@ -188,9 +188,9 @@ PerspectiveWidths - 967 - 967 - 967 + 977 + 977 + 977 Perspectives @@ -222,8 +222,6 @@ Layout - BecomeActive - ContentConfiguration PBXBottomSmartGroupGIDs @@ -249,14 +247,10 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 20 - 22 - 297 + 305 PBXSmartGroupTreeModuleColumnsKey_v4 - FileBuiltColumn - TargetStatusColumn MainColumn @@ -264,26 +258,20 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey - 29B97314FDCFA39411CA2CEA - 080E96DDFE201D6D7F000001 - 29B97315FDCFA39411CA2CEA - 29B97317FDCFA39411CA2CEA - 29B97323FDCFA39411CA2CEA - 19C28FACFE9D520D11CA2CBB 1C37FBAC04509CD000000102 - F5B138DE0EB72045000B83CC - F5B138DF0EB72045000B83CC - F5B138E00EB72045000B83CC - F5B138E10EB72045000B83CC + F51CBD120EC8A302005C06AC + F51CBD3B0EC8AB35005C06AC PBXSmartGroupTreeModuleOutlineStateSelectionKey - 0 + 9 + 2 + 1 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 662}, {339, 544}} + {{0, 0}, {305, 604}} PBXTopSmartGroupGIDs @@ -293,23 +281,19 @@ GeometryConfiguration Frame - {{0, 0}, {356, 562}} + {{0, 0}, {322, 622}} GroupTreeTableConfiguration - FileBuiltColumn - 20 - TargetStatusColumn - 22 MainColumn - 297 + 305 RubberWindowFrame - 25 79 967 603 0 0 1024 746 + 62 83 977 663 0 0 1024 746 Module PBXSmartGroupTreeModule Proportion - 356pt + 322pt Dock @@ -318,26 +302,17 @@ ContentConfiguration PBXProjectModuleGUID - F5B19BA70EA4BF24003F4BA4 + F5A33EBD0EC89C3000F8052D PBXProjectModuleLabel - + asm pthread_mutex_lock 0x90001a38 PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - F5B19BA80EA4BF24003F4BA4 + F5A33EBE0EC89C3000F8052D PBXProjectModuleLabel - - history - - F5B19C160EA4D6E8003F4BA4 - F5B1D1770EA5FE2100AB8D0F - - prevStack - - F5B1D1790EA5FE2100AB8D0F - + asm pthread_mutex_lock 0x90001a38 SplitCount 1 @@ -350,9 +325,9 @@ GeometryConfiguration Frame - {{0, 0}, {606, 0}} + {{0, 0}, {650, 0}} RubberWindowFrame - 25 79 967 603 0 0 1024 746 + 62 83 977 663 0 0 1024 746 Module PBXNavigatorGroup @@ -361,10 +336,12 @@ Proportion - 557pt + 617pt Tabs + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -375,9 +352,9 @@ GeometryConfiguration Frame - {{10, 27}, {606, 530}} + {{10, 27}, {650, 590}} RubberWindowFrame - 25 79 967 603 0 0 1024 746 + 62 83 977 663 0 0 1024 746 Module XCDetailModule @@ -393,7 +370,7 @@ GeometryConfiguration Frame - {{10, 27}, {702, 389}} + {{10, 27}, {650, 590}} Module PBXProjectFindModule @@ -418,7 +395,7 @@ Proportion - 606pt + 650pt Name @@ -436,11 +413,11 @@ TableOfContents - F5B138E20EB72045000B83CC + F51CBD140EC8A305005C06AC 1CA23ED40692098700951B8B - F5B138E30EB72045000B83CC - F5B19BA70EA4BF24003F4BA4 - F5B138E40EB72045000B83CC + F51CBD150EC8A305005C06AC + F5A33EBD0EC89C3000F8052D + F51CBD160EC8A305005C06AC 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -488,7 +465,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 327 + 193 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -506,7 +483,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {327, 544}} + {{0, 0}, {193, 604}} PBXTopSmartGroupGIDs @@ -516,17 +493,17 @@ GeometryConfiguration Frame - {{0, 0}, {344, 562}} + {{0, 0}, {210, 622}} GroupTreeTableConfiguration MainColumn - 327 + 193 Module PBXSmartGroupTreeModule Proportion - 344pt + 210pt Dock @@ -535,29 +512,17 @@ ContentConfiguration PBXProjectModuleGUID - F5B19BA70EA4BF24003F4BA4 + F5A33EC20EC89C3000F8052D PBXProjectModuleLabel - palette.c + asm pthread_mutex_lock 0x90001a38 PBXSplitModuleInNavigatorKey Split0 PBXProjectModuleGUID - F5B19BA80EA4BF24003F4BA4 + F5A33EC30EC89C3000F8052D PBXProjectModuleLabel - palette.c - history - - F5B19C160EA4D6E8003F4BA4 - F5B1D1770EA5FE2100AB8D0F - F5B1EEA80EAD15CD00B087B5 - F5AE7F8D0EB12409001C151F - - prevStack - - F5B1D1790EA5FE2100AB8D0F - F5B1EEAA0EAD15CD00B087B5 - + asm pthread_mutex_lock 0x90001a38 SplitCount 1 @@ -570,7 +535,7 @@ GeometryConfiguration Frame - {{0, 0}, {618, 0}} + {{0, 0}, {762, 0}} Module PBXNavigatorGroup @@ -579,14 +544,12 @@ Proportion - 557pt + 617pt Tabs ContentConfiguration - PBXBuildLogShowsTranscriptDefaultKey - {{0, 141}, {618, 389}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -599,7 +562,7 @@ GeometryConfiguration Frame - {{10, 27}, {618, 530}} + {{10, 27}, {762, 590}} Module PBXBuildResultsModule @@ -652,7 +615,7 @@ GeometryConfiguration Frame - {{10, 27}, {771, 338}} + {{0, 0}, {0, 0}} Module PBXRunSessionModule @@ -661,7 +624,7 @@ Proportion - 618pt + 762pt Name @@ -679,14 +642,14 @@ TableOfContents - F5B138E50EB72045000B83CC + F51CBD1B0EC8A347005C06AC 1CA23EE50692099D00951B8B - F5B138E60EB72045000B83CC - F5B19BA70EA4BF24003F4BA4 - F5B138E70EB72045000B83CC + F51CBD1C0EC8A347005C06AC + F5A33EC20EC89C3000F8052D + F51CBD1D0EC8A347005C06AC XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - F5B138E80EB72045000B83CC + F51CBD1E0EC8A347005C06AC ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -730,12 +693,12 @@ GeometryConfiguration Frame - {{0, 0}, {969, 12}} + {{0, 0}, {977, 174}} Module PBXDebugCLIModule Proportion - 12pt + 174pt ContentConfiguration @@ -754,8 +717,8 @@ yes sizes - {{0, 0}, {453, 205}} - {{453, 0}, {516, 205}} + {{0, 0}, {474, 215}} + {{474, 0}, {503, 215}} VerticalSplitView @@ -770,8 +733,8 @@ yes sizes - {{0, 0}, {969, 205}} - {{0, 205}, {969, 225}} + {{0, 0}, {977, 215}} + {{0, 215}, {977, 228}} @@ -793,12 +756,12 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 17}, {969, 430}} + {{0, 179}, {977, 443}} Module PBXDebugSessionModule Proportion - 430pt + 443pt Name @@ -817,15 +780,15 @@ TableOfContents - F5B1389F0EB71A4B000B83CC + F5A33EF20EC89FAD00F8052D 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - F5B138A00EB71A4B000B83CC - F5B138A10EB71A4B000B83CC - F5B138A20EB71A4B000B83CC - F5B138A30EB71A4B000B83CC - F5B138A40EB71A4B000B83CC - F5B138A50EB71A4B000B83CC + F5A33EF30EC89FAD00F8052D + F5A33EF40EC89FAD00F8052D + F5A33EF50EC89FAD00F8052D + F5A33EF60EC89FAD00F8052D + F5A33EE10EC89F6100F8052D + F5A33EF70EC89FAD00F8052D ToolbarConfiguration xcode.toolbar.config.debug @@ -858,7 +821,7 @@ /Users/xx/Grafx2/Grafx2.xcodeproj WindowString - 25 79 967 603 0 0 1024 746 + 62 83 977 663 0 0 1024 746 WindowTools diff --git a/aide.c b/aide.c index f98dc99a..a2f1fa7e 100644 --- a/aide.c +++ b/aide.c @@ -371,8 +371,8 @@ void Bouton_Stats(void) #ifdef __linux__ statfs(Principal_Repertoire_courant,&Informations_Disque); - Taille=Informations_Disque.f_bfree * Informations_Disque.f_bsize; - #else + Taille=(uint64_t) Informations_Disque.f_bfree * (uint64_t) Informations_Disque.f_bsize; + #else #if defined(__amigaos4__)||defined(__BEOS__)||defined(__HAIKU__) #else GetDiskFreeSpaceEx(Principal_Repertoire_courant,&tailleU,NULL,NULL); diff --git a/boutons.c b/boutons.c index d176e9dc..f6f23e75 100644 --- a/boutons.c +++ b/boutons.c @@ -1306,6 +1306,14 @@ void Afficher_liste_modes(short Debut_liste, short Position_curseur) Ratio=" 16:10"; else if (Mode_video[Mode_courant].Largeur*145 == Mode_video[Mode_courant].Hauteur*192) Ratio="192:145"; + else if (Mode_video[Mode_courant].Largeur*2 == Mode_video[Mode_courant].Hauteur*3) + Ratio=" 3:2"; + else if (Mode_video[Mode_courant].Largeur*3 == Mode_video[Mode_courant].Hauteur*5) + Ratio=" 5:3"; + else if (Mode_video[Mode_courant].Largeur*4 == Mode_video[Mode_courant].Hauteur*5) + Ratio=" 5:4"; + else if (Mode_video[Mode_courant].Largeur*16 == Mode_video[Mode_courant].Hauteur*25) + Ratio=" 25:16"; else Ratio=" "; if (Mode_courant == 0)