From 48d04c2568c5c24f13252b800250532bfdf4dbfb Mon Sep 17 00:00:00 2001 From: Franck Charlet Date: Fri, 31 Jul 2009 10:20:35 +0000 Subject: [PATCH] Updated XCode Project git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@969 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- .DS_Store | Bin 15364 -> 15364 bytes Grafx2.xcodeproj/project.pbxproj | 54 ++++++++++------ Grafx2.xcodeproj/xx.pbxuser | 40 +++++++----- Grafx2.xcodeproj/xx.perspective | 108 +++++++++++++++++-------------- main.c | 28 ++++---- sdlscreen.c | 3 +- 6 files changed, 135 insertions(+), 98 deletions(-) diff --git a/.DS_Store b/.DS_Store index fe73a055d20bdf2899e3ab74598cef0ae3857fc7..fdc8668961d00f89117ef9ffe07afe2f46cd36af 100644 GIT binary patch delta 128 zcmZpvXsMXs&uF_bU^hRb?PMMS3(l0{_ KjnBdp8+ZYXY$A~W delta 58 zcmV-A0LA}=c!YS6PXRiyP`eKSI+F|#II~+20|B#;5uON>f*KODVj86dk$`Kn2O#?d Qvr82N1G5q+@)MDO4NTM%v;Y7A diff --git a/Grafx2.xcodeproj/project.pbxproj b/Grafx2.xcodeproj/project.pbxproj index 44ef9528..fa145b90 100644 --- a/Grafx2.xcodeproj/project.pbxproj +++ b/Grafx2.xcodeproj/project.pbxproj @@ -12,6 +12,12 @@ 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 */; }; + F5142653101F6CC5006CF3C4 /* font_Classic.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F514264D101F6CB8006CF3C4 /* font_Classic.png */; }; + F5142654101F6CC5006CF3C4 /* font_Fairlight.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F514264E101F6CB8006CF3C4 /* font_Fairlight.png */; }; + F5142655101F6CC5006CF3C4 /* font_Fun.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F514264F101F6CB9006CF3C4 /* font_Fun.png */; }; + F5142656101F6CC5006CF3C4 /* font_Melon.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F5142650101F6CB9006CF3C4 /* font_Melon.png */; }; + F5142657101F6CC5006CF3C4 /* skin_classic.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F5142651101F6CB9006CF3C4 /* skin_classic.png */; }; + F5142658101F6CC5006CF3C4 /* skin_modern.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F5142652101F6CB9006CF3C4 /* skin_modern.png */; }; 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 */; }; @@ -52,8 +58,6 @@ F5B19BA30EA4BE3E003F4BA4 /* shade.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B8B0EA4BE3E003F4BA4 /* shade.c */; }; F5B19BA40EA4BE3E003F4BA4 /* special.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B8C0EA4BE3E003F4BA4 /* special.c */; }; F5B19BE10EA4C65A003F4BA4 /* gfx2.cfg in Resources */ = {isa = PBXBuildFile; fileRef = F5B19BDF0EA4C65A003F4BA4 /* gfx2.cfg */; }; - F5B19BE10EA4C65A003F4BA5 /* base.gif in Copy skins */ = {isa = PBXBuildFile; fileRef = F5B19BDF0EA4C65A003F4BA5 /* base.gif */; }; - F5B19BE10EA4C65A003F4BA6 /* ilkke.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F5B19BDF0EA4C65A003F4BA6 /* ilkke.png */; }; F5B19C1D0EA4D71C003F4BA4 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */; }; F5B19C3D0EA4DC91003F4BA4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5B19C3B0EA4DC91003F4BA4 /* InfoPlist.strings */; }; F5B1EE850EAD0F4E00B087B5 /* gfx2def.ini in Resources */ = {isa = PBXBuildFile; fileRef = F5B1EE840EAD0F4E00B087B5 /* gfx2def.ini */; }; @@ -104,6 +108,22 @@ name = "Copy Frameworks into .app bundle"; runOnlyForDeploymentPostprocessing = 0; }; + F514264B101F6C5B006CF3C4 /* Copy skins */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = skins; + dstSubfolderSpec = 7; + files = ( + F5142653101F6CC5006CF3C4 /* font_Classic.png in Copy skins */, + F5142654101F6CC5006CF3C4 /* font_Fairlight.png in Copy skins */, + F5142655101F6CC5006CF3C4 /* font_Fun.png in Copy skins */, + F5142656101F6CC5006CF3C4 /* font_Melon.png in Copy skins */, + F5142657101F6CC5006CF3C4 /* skin_classic.png in Copy skins */, + F5142658101F6CC5006CF3C4 /* skin_modern.png in Copy skins */, + ); + name = "Copy skins"; + runOnlyForDeploymentPostprocessing = 0; + }; F5A33F1D0EC8A26C00F8052D /* Copy fonts */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -119,18 +139,6 @@ name = "Copy fonts"; runOnlyForDeploymentPostprocessing = 0; }; - F5A33F1D0EC8A26C00F8052E /* Copy skins */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = skins; - dstSubfolderSpec = 7; - files = ( - F5B19BE10EA4C65A003F4BA5 /* base.gif in Copy skins */, - F5B19BE10EA4C65A003F4BA6 /* ilkke.png in Copy skins */, - ); - name = "Copy skins"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -145,6 +153,12 @@ 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; }; + F514264D101F6CB8006CF3C4 /* font_Classic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = font_Classic.png; path = skins/font_Classic.png; sourceTree = ""; }; + F514264E101F6CB8006CF3C4 /* font_Fairlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = font_Fairlight.png; path = skins/font_Fairlight.png; sourceTree = ""; }; + F514264F101F6CB9006CF3C4 /* font_Fun.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = font_Fun.png; path = skins/font_Fun.png; sourceTree = ""; }; + F5142650101F6CB9006CF3C4 /* font_Melon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = font_Melon.png; path = skins/font_Melon.png; sourceTree = ""; }; + F5142651101F6CB9006CF3C4 /* skin_classic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skin_classic.png; path = skins/skin_classic.png; sourceTree = ""; }; + F5142652101F6CB9006CF3C4 /* skin_modern.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = skin_modern.png; path = skins/skin_modern.png; sourceTree = ""; }; 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 = ""; }; @@ -186,8 +200,6 @@ F5B19B8B0EA4BE3E003F4BA4 /* shade.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = shade.c; sourceTree = ""; }; F5B19B8C0EA4BE3E003F4BA4 /* special.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = special.c; sourceTree = ""; }; F5B19BDF0EA4C65A003F4BA4 /* gfx2.cfg */ = {isa = PBXFileReference; lastKnownFileType = file; path = gfx2.cfg; sourceTree = ""; }; - F5B19BDF0EA4C65A003F4BA5 /* base.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = base.gif; path = skins/base.gif; sourceTree = ""; }; - F5B19BDF0EA4C65A003F4BA6 /* ilkke.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ilkke.png; path = skins/ilkke.png; sourceTree = ""; }; F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = SYSTEM_DEVELOPER_DIR; }; F5B19C3C0EA4DC91003F4BA4 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; F5B1EE840EAD0F4E00B087B5 /* gfx2def.ini */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = gfx2def.ini; sourceTree = ""; }; @@ -260,6 +272,12 @@ 29B97314FDCFA39411CA2CEA /* Grafx2 */ = { isa = PBXGroup; children = ( + F514264D101F6CB8006CF3C4 /* font_Classic.png */, + F514264E101F6CB8006CF3C4 /* font_Fairlight.png */, + F514264F101F6CB9006CF3C4 /* font_Fun.png */, + F5142650101F6CB9006CF3C4 /* font_Melon.png */, + F5142651101F6CB9006CF3C4 /* skin_classic.png */, + F5142652101F6CB9006CF3C4 /* skin_modern.png */, F539315D0FE171C3003CB103 /* pversion.c */, F5CDCE310F6EA6D600B31F63 /* pxdouble.c */, F5AC28B90F4873C700455509 /* hotkeys.c */, @@ -294,8 +312,6 @@ F5B19C3B0EA4DC91003F4BA4 /* InfoPlist.strings */, F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */, F5B19BDF0EA4C65A003F4BA4 /* gfx2.cfg */, - F5B19BDF0EA4C65A003F4BA5 /* base.gif */, - F5B19BDF0EA4C65A003F4BA6 /* ilkke.png */, F5B19B7B0EA4BE3E003F4BA4 /* graph.c */, F5B19B7C0EA4BE3E003F4BA4 /* init.c */, F5B19B7D0EA4BE3E003F4BA4 /* io.c */, @@ -366,7 +382,7 @@ 002F39FD09D0883400EBEB89 /* Copy Frameworks into .app bundle */, 002F39FD09D0883400EBEB8A /* Copy Frameworks into .app bundle */, F5A33F1D0EC8A26C00F8052D /* Copy fonts */, - F5A33F1D0EC8A26C00F8052E /* Copy skins */, + F514264B101F6C5B006CF3C4 /* Copy skins */, ); buildRules = ( ); diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index 28c221dc..a3b5507f 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -18,9 +18,9 @@ }; 002F3A3E09D088BA00EBEB88 /* main.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1060, 11476}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {867, 536}}"; + sepNavIntBoundsRect = "{{0, 0}, {1044, 15086}}"; + sepNavSelRange = "{19535, 0}"; + sepNavVisRect = "{{0, 10961}, {867, 536}}"; sepNavWindowFrame = "{{14, 76}, {906, 665}}"; }; }; @@ -29,7 +29,6 @@ activeExecutable = F5B19B5D0EA4BD57003F4BA4 /* Grafx2 */; activeTarget = 8D1107260486CEB800E47090 /* Grafx2 */; addToTargets = ( - 8D1107260486CEB800E47090 /* Grafx2 */, ); breakpointsGroup = F5B19B700EA4BDA9003F4BA4 /* XCBreakpointsBucket */; codeSenseManager = F5B19B6A0EA4BD79003F4BA4 /* Code sense */; @@ -70,14 +69,15 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Built_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 229, + 99, 20, 48, 43, 43, 20, - 79, - 88, + 264, + 10, + 20, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, @@ -89,6 +89,7 @@ PBXFileDataSource_Target_ColumnID, PBXFileDataSource_Path_ColumnID, PBXFileDataSource_Comments_ColumnID, + PBXFileDataSource_SCM_ColumnID, ); }; PBXConfiguration.PBXFileTableDataSource3.PBXFindDataSource = { @@ -165,8 +166,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 266433807; - PBXWorkspaceStateSaveDate = 266433807; + PBXPerProjectTemplateStateSaveDate = 270495112; + PBXWorkspaceStateSaveDate = 270495112; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { @@ -187,6 +188,11 @@ F5B19B5D0EA4BD57003F4BA4 /* Grafx2 */, ); }; + F51CBD2B0EC8A3E1005C06AC /* 5pxtinyfont.png */ = { + uiCtxt = { + sepNavWindowFrame = "{{15, 25}, {971, 716}}"; + }; + }; F5A33E690EC893F800F8052D /* 8pxfont.png */ = { uiCtxt = { sepNavWindowFrame = "{{15, 76}, {906, 665}}"; @@ -256,10 +262,10 @@ }; F5B19B7B0EA4BE3E003F4BA4 /* graph.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1620, 118579}}"; - sepNavSelRange = "{16112, 36}"; - sepNavVisRect = "{{0, 9964}, {867, 536}}"; - sepNavWindowFrame = "{{15, 76}, {906, 665}}"; + sepNavIntBoundsRect = "{{0, 0}, {1140, 52782}}"; + sepNavSelRange = "{6769, 0}"; + sepNavVisRect = "{{0, 0}, {867, 536}}"; + sepNavWindowFrame = "{{14, 76}, {906, 665}}"; }; }; F5B19B7C0EA4BE3E003F4BA4 /* init.c */ = { @@ -296,10 +302,10 @@ }; F5B19B890EA4BE3E003F4BA4 /* sdlscreen.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1580, 11571}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {867, 536}}"; - sepNavWindowFrame = "{{61, 34}, {906, 665}}"; + sepNavIntBoundsRect = "{{0, 0}, {1396, 4351}}"; + sepNavSelRange = "{2375, 0}"; + sepNavVisRect = "{{0, 1072}, {867, 536}}"; + sepNavWindowFrame = "{{35, 15}, {906, 665}}"; }; }; F5B19C3C0EA4DC91003F4BA4 /* English */ = { diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index 30368fc1..f9c5d992 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -188,9 +188,9 @@ PerspectiveWidths - 970 - 970 - 970 + 971 + 971 + 971 Perspectives @@ -247,7 +247,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 305 + 345 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -259,7 +259,10 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA + 29B97317FDCFA39411CA2CEA 1C37FBAC04509CD000000102 + F56B73F7101F6D9500B6D9A4 + F56B7443101FA1C600B6D9A4 PBXSmartGroupTreeModuleOutlineStateSelectionKey @@ -268,7 +271,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 124}, {305, 575}} + {{0, 0}, {345, 600}} PBXTopSmartGroupGIDs @@ -278,17 +281,17 @@ GeometryConfiguration Frame - {{0, 0}, {322, 593}} + {{0, 0}, {362, 618}} GroupTreeTableConfiguration MainColumn - 305 + 345 Module PBXSmartGroupTreeModule Proportion - 322pt + 362pt Dock @@ -299,7 +302,7 @@ PBXProjectModuleGUID F5A33EBD0EC89C3000F8052D PBXProjectModuleLabel - asm pthread_mutex_lock 0x90001a38 + PBXSplitModuleInNavigatorKey Split0 @@ -307,7 +310,7 @@ PBXProjectModuleGUID F5A33EBE0EC89C3000F8052D PBXProjectModuleLabel - asm pthread_mutex_lock 0x90001a38 + SplitCount 1 @@ -320,7 +323,7 @@ GeometryConfiguration Frame - {{0, 0}, {643, 0}} + {{0, 0}, {604, 0}} Module PBXNavigatorGroup @@ -329,7 +332,7 @@ Proportion - 588pt + 613pt Tabs @@ -343,7 +346,7 @@ GeometryConfiguration Frame - {{10, 27}, {643, 561}} + {{10, 27}, {604, 586}} Module XCDetailModule @@ -359,7 +362,7 @@ GeometryConfiguration Frame - {{10, 27}, {650, 590}} + {{10, 27}, {644, 586}} Module PBXProjectFindModule @@ -375,7 +378,7 @@ GeometryConfiguration Frame - {{10, 31}, {603, 297}} + {{10, 27}, {644, 586}} Module PBXCVSModule @@ -384,7 +387,7 @@ Proportion - 643pt + 604pt Name @@ -402,11 +405,11 @@ TableOfContents - F5D646000F487ECB007E515F + F56B7444101FA1C600B6D9A4 1CA23ED40692098700951B8B - F5D646010F487ECB007E515F + F56B7445101FA1C600B6D9A4 F5A33EBD0EC89C3000F8052D - F5D646020F487ECB007E515F + F56B7446101FA1C600B6D9A4 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -468,18 +471,24 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA + F5B19C3B0EA4DC91003F4BA4 080E96DDFE201D6D7F000001 29B97315FDCFA39411CA2CEA 29B97317FDCFA39411CA2CEA + 29B97323FDCFA39411CA2CEA + 1058C7A0FEA54F0111CA2CBB + 1058C7A2FEA54F0111CA2CBB + 19C28FACFE9D520D11CA2CBB PBXSmartGroupTreeModuleOutlineStateSelectionKey + 42 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {275, 583}} + {{0, 475}, {275, 600}} PBXTopSmartGroupGIDs @@ -489,14 +498,14 @@ GeometryConfiguration Frame - {{0, 0}, {292, 601}} + {{0, 0}, {292, 618}} GroupTreeTableConfiguration MainColumn 275 RubberWindowFrame - 65 75 944 642 0 0 1024 746 + 151 75 971 659 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -533,9 +542,9 @@ GeometryConfiguration Frame - {{0, 0}, {647, 0}} + {{0, 0}, {674, 0}} RubberWindowFrame - 65 75 944 642 0 0 1024 746 + 151 75 971 659 0 0 1024 746 Module PBXNavigatorGroup @@ -544,14 +553,14 @@ Proportion - 596pt + 613pt Tabs ContentConfiguration PBXBuildLogShowsTranscriptDefaultKey - {{0, 5}, {647, 564}} + {{0, 5}, {674, 581}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -564,9 +573,9 @@ GeometryConfiguration Frame - {{10, 27}, {647, 569}} + {{10, 27}, {674, 586}} RubberWindowFrame - 65 75 944 642 0 0 1024 746 + 151 75 971 659 0 0 1024 746 Module PBXBuildResultsModule @@ -628,7 +637,7 @@ Proportion - 647pt + 674pt Name @@ -646,14 +655,14 @@ TableOfContents - F53931560FE170BC003CB103 + F56B7447101FA1C600B6D9A4 1CA23EE50692099D00951B8B - F53931570FE170BC003CB103 + F56B7448101FA1C600B6D9A4 F5A33EC20EC89C3000F8052D - F53931580FE170BC003CB103 + F56B7449101FA1C600B6D9A4 XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - F53931590FE170BC003CB103 + F56B744A101FA1C600B6D9A4 ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -697,7 +706,7 @@ GeometryConfiguration Frame - {{0, 0}, {1323, 0}} + {{0, 0}, {971, 0}} Module PBXDebugCLIModule @@ -721,8 +730,8 @@ yes sizes - {{0, 0}, {641, 197}} - {{641, 0}, {682, 197}} + {{0, 0}, {470, 295}} + {{470, 0}, {501, 295}} VerticalSplitView @@ -737,8 +746,8 @@ yes sizes - {{0, 0}, {1323, 197}} - {{0, 197}, {1323, 211}} + {{0, 0}, {971, 295}} + {{0, 295}, {971, 318}} @@ -760,12 +769,12 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 5}, {1323, 408}} + {{0, 5}, {971, 613}} Module PBXDebugSessionModule Proportion - 408pt + 613pt Name @@ -784,15 +793,15 @@ TableOfContents - F5AED0700F1999130090A93F + F56B744B101FA1C600B6D9A4 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - F5AED0710F1999130090A93F - F5AED0720F1999130090A93F - F5AED0730F1999130090A93F - F5AED0740F1999130090A93F - F5AED0410F1989EC0090A93F - F5AED0750F1999130090A93F + F56B744C101FA1C600B6D9A4 + F56B744D101FA1C600B6D9A4 + F56B744E101FA1C600B6D9A4 + F56B744F101FA1C600B6D9A4 + F56B7409101F6DEB00B6D9A4 + F56B7450101FA1C600B6D9A4 ToolbarConfiguration xcode.toolbar.config.debug @@ -801,7 +810,7 @@ PerspectivesBarVisible PinnedNavigatorIdentifier - F539315B0FE170D5003CB103 + F56B743E101F7E4F00B6D9A4 ShelfIsVisible SourceDescription @@ -824,10 +833,11 @@ 5 WindowOrderList + F56B7450101FA1C600B6D9A4 /Users/xx/Grafx2/Grafx2.xcodeproj WindowString - 65 75 944 642 0 0 1024 746 + 151 75 971 659 0 0 1024 746 WindowTools diff --git a/main.c b/main.c index 38e944c8..9ee547b0 100644 --- a/main.c +++ b/main.c @@ -344,6 +344,7 @@ int Init_program(int argc,char * argv[]) strcpy(Main_file_directory,Main_current_directory); strcpy(Main_filename,"NO_NAME.GIF"); Main_fileformat=DEFAULT_FILEFORMAT; + // On initialise les données sur le nom de fichier de l'image de brouillon: strcpy(Spare_current_directory,Main_current_directory); strcpy(Spare_file_directory,Main_file_directory); @@ -407,6 +408,7 @@ int Init_program(int argc,char * argv[]) printf("Couldn't initialize SDL.\n"); return(0); } + Joystick = SDL_JoystickOpen(0); SDL_EnableKeyRepeat(250, 32); SDL_EnableUNICODE(SDL_ENABLE); @@ -440,18 +442,18 @@ int Init_program(int argc,char * argv[]) Set_all_video_modes(); Pixel_ratio=PIXEL_SIMPLE; // On initialise les données sur l'état du programme: - // Donnée sur la sortie du programme: + // Donnée sur la sortie du programme: Quit_is_required=0; Quitting=0; - // Données sur l'état du menu: + // Données sur l'état du menu: Pixel_in_menu=Pixel_in_toolbar; Menu_is_visible=1; - // Données sur les couleurs et la palette: + // Données sur les couleurs et la palette: First_color_in_palette=0; - // Données sur le curseur: + // Données sur le curseur: Cursor_shape=CURSOR_SHAPE_TARGET; Cursor_hidden=0; - // Données sur le pinceau: + // Données sur le pinceau: Paintbrush_X=0; Paintbrush_Y=0; Paintbrush_shape=PAINTBRUSH_SHAPE_ROUND; @@ -515,6 +517,7 @@ int Init_program(int argc,char * argv[]) // Charger la configuration des touches Set_config_defaults(); + switch(Load_CFG(1)) { case ERROR_CFG_MISSING: @@ -583,7 +586,7 @@ int Init_program(int argc,char * argv[]) starting_videomode=Current_resolution; Horizontal_line_buffer=NULL; Screen_width=Screen_height=Current_resolution=0; - + Init_mode_video( Video_mode[starting_videomode].Width, Video_mode[starting_videomode].Height, @@ -684,16 +687,16 @@ void Program_shutdown(void) #endif // On libère le buffer de gestion de lignes - free(Horizontal_line_buffer); + if(Horizontal_line_buffer) free(Horizontal_line_buffer); // On libère le pinceau spécial - free(Paintbrush_sprite); + if (Paintbrush_sprite) free(Paintbrush_sprite); // On libère les différents écrans virtuels et brosse: - free(Brush); + if(Brush) free(Brush); Set_number_of_backups(0); - free(Spare_screen); - free(Main_screen); + if(Spare_screen) free(Spare_screen); + if(Main_screen) free(Main_screen); // Free the skin (Gui graphics) data if (Gfx) @@ -730,9 +733,9 @@ int main(int argc,char * argv[]) int phoenix2_found=0; char phoenix_filename1[MAX_PATH_CHARACTERS]; char phoenix_filename2[MAX_PATH_CHARACTERS]; - if(!Init_program(argc,argv)) { + Program_shutdown(); return 0; } @@ -752,6 +755,7 @@ int main(int argc,char * argv[]) strcpy(Main_file_directory,Config_directory); strcpy(Main_filename,"phoenix2.img"); chdir(Main_file_directory); + Button_Reload(); Main_image_is_modified=1; Warning_message("Spare page recovered"); diff --git a/sdlscreen.c b/sdlscreen.c index 6dd348d4..df0594a6 100644 --- a/sdlscreen.c +++ b/sdlscreen.c @@ -61,8 +61,9 @@ void Set_mode_SDL(int *width, int *height, int fullscreen) Screen_pixels=Screen_SDL->pixels; } else + { DEBUG("Error: Unable to change video mode!",0); - + } SDL_ShowCursor(0); // Hide the SDL mouse cursor, we use our own }