m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added support for Mac OSX system fonts in texte.c.

Browse Source 
- Inverted the "AntiAlias" and "No AA" labels so it's more intuitive that way.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@349 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Franck Charlet
2008-11-16 00:50:14 +00:00
parent 9f8381593a
commit 415b878844
6 changed files with 142 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Grafx2.xcodeproj/project.pbxproj
View File

@@ -17,6 +17,7 @@
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 */; };
F5AE83FD0ECF8FD300200704 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */; };
F5B138940EB71977000B83CC /* texte.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B138930EB71977000B83CC /* texte.c */; };
F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138C20EB71D28000B83CC /* SDL_ttf */; };
F5B19B8D0EA4BE3E003F4BA4 /* aide.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B750EA4BE3E003F4BA4 /* aide.c */; };
@@ -27,7 +28,6 @@
F5B19B930EA4BE3E003F4BA4 /* graph.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; };
F5B19B940EA4BE3E003F4BA4 /* init.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7C0EA4BE3E003F4BA4 /* init.c */; };
F5B19B950EA4BE3E003F4BA4 /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7D0EA4BE3E003F4BA4 /* io.c */; };
F5B19B960EA4BE3E003F4BA4 /* linux.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7E0EA4BE3E003F4BA4 /* linux.c */; };
F5B19B970EA4BE3E003F4BA4 /* loadsave.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */; };
F5B19B980EA4BE3E003F4BA4 /* moteur.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */; };
F5B19B9A0EA4BE3E003F4BA4 /* op_c.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B820EA4BE3E003F4BA4 /* op_c.c */; };
@@ -118,6 +118,7 @@
F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Tuffy.ttf; path = fonts/Tuffy.ttf; sourceTree = "<group>"; };
F5A33E690EC893F800F8052D /* 8pxfont.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 8pxfont.png; path = fonts/8pxfont.png; sourceTree = "<group>"; };
F5AD4B1E0EA8CCF0009CCAC4 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; };
F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
F5B138930EB71977000B83CC /* texte.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = texte.c; sourceTree = "<group>"; };
F5B138C20EB71D28000B83CC /* SDL_ttf */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_ttf; path = /Library/Frameworks/SDL_ttf.framework/SDL_ttf; sourceTree = "<absolute>"; };
F5B19B6C0EA4BDA8003F4BA4 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = "<absolute>"; };
@@ -130,7 +131,6 @@
F5B19B7B0EA4BE3E003F4BA4 /* graph.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = graph.c; sourceTree = "<group>"; };
F5B19B7C0EA4BE3E003F4BA4 /* init.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = init.c; sourceTree = "<group>"; };
F5B19B7D0EA4BE3E003F4BA4 /* io.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; };
F5B19B7E0EA4BE3E003F4BA4 /* linux.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = linux.c; sourceTree = "<group>"; };
F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = loadsave.c; sourceTree = "<group>"; };
F5B19B800EA4BE3E003F4BA4 /* moteur.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = moteur.c; sourceTree = "<group>"; };
F5B19B820EA4BE3E003F4BA4 /* op_c.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = op_c.c; sourceTree = "<group>"; };
@@ -164,6 +164,7 @@
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
F5B19C1D0EA4D71C003F4BA4 /* CoreFoundation.framework in Frameworks */,
F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */,
F5AE83FD0ECF8FD300200704 /* ApplicationServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -209,6 +210,7 @@
29B97314FDCFA39411CA2CEA /* Grafx2 */ = {
isa = PBXGroup;
children = (
F5AE83FC0ECF8FD300200704 /* ApplicationServices.framework */,
F51CBD2B0EC8A3E1005C06AC /* 5pxtinyfont.png */,
F51CBD2C0EC8A3E1005C06AC /* colorfont.pcx */,
F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */,
@@ -233,7 +235,6 @@
F5B19B7B0EA4BE3E003F4BA4 /* graph.c */,
F5B19B7C0EA4BE3E003F4BA4 /* init.c */,
F5B19B7D0EA4BE3E003F4BA4 /* io.c */,
F5B19B7E0EA4BE3E003F4BA4 /* linux.c */,
F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */,
F5B19B800EA4BE3E003F4BA4 /* moteur.c */,
F5B19B820EA4BE3E003F4BA4 /* op_c.c */,
@@ -352,7 +353,6 @@
F5B19B930EA4BE3E003F4BA4 /* graph.c in Sources */,
F5B19B940EA4BE3E003F4BA4 /* init.c in Sources */,
F5B19B950EA4BE3E003F4BA4 /* io.c in Sources */,
F5B19B960EA4BE3E003F4BA4 /* linux.c in Sources */,
F5B19B970EA4BE3E003F4BA4 /* loadsave.c in Sources */,
F5B19B980EA4BE3E003F4BA4 /* moteur.c in Sources */,
F5B19B9A0EA4BE3E003F4BA4 /* op_c.c in Sources */,
@@ -392,8 +392,10 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
@@ -405,10 +407,12 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_image.framework\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_ttf.framework\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework\"";
PRODUCT_NAME = Grafx2;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
@@ -425,8 +429,10 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
INFOPLIST_FILE = Info.plist;
@@ -436,10 +442,12 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_image.framework\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_ttf.framework\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework\"";
PRODUCT_NAME = Grafx2;
WRAPPER_EXTENSION = app;
};

18
Grafx2.xcodeproj/xx.pbxuser
View File

@@ -43,7 +43,7 @@
PBXFileTableDataSourceColumnWidthsKey = (
20,
453,
58.2085,
58,
);
PBXFileTableDataSourceColumnsKey = (
PBXErrorsWarningsDataSource_TypeID,
@@ -77,7 +77,7 @@
43,
20,
79,
95,
121,
);
PBXFileTableDataSourceColumnsKey = (
PBXFileDataSource_FiletypeID,
@@ -145,7 +145,7 @@
};
PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnSortingKey = PBXTargetDataSource_PrimaryAttribute;
PBXFileTableDataSourceColumnWidthsKey = (
20,
200,
@@ -165,8 +165,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 248180012;
PBXWorkspaceStateSaveDate = 248180012;
PBXPerProjectTemplateStateSaveDate = 248478999;
PBXWorkspaceStateSaveDate = 248478999;
};
sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
userBuildSettings = {
@@ -186,10 +186,10 @@
};
F5B138930EB71977000B83CC /* texte.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1092, 4807}}";
sepNavSelRange = "{1127, 0}";
sepNavVisRect = "{{0, 339}, {867, 536}}";
sepNavWindowFrame = "{{34, 37}, {906, 665}}";
sepNavIntBoundsRect = "{{0, 0}, {932, 8455}}";
sepNavSelRange = "{2431, 70}";
sepNavVisRect = "{{0, 1377}, {867, 536}}";
sepNavWindowFrame = "{{67, 41}, {906, 665}}";
};
};
F5B19B5D0EA4BD57003F4BA4 /* Grafx2 */ = {

78
Grafx2.xcodeproj/xx.perspective
View File

@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>ActivePerspectiveName</key>
<string>Project</string>
<string>Build</string>
<key>AllowedModules</key>
<array>
<dict>
@@ -188,9 +188,9 @@
<array/>
<key>PerspectiveWidths</key>
<array>
<integer>977</integer>
<integer>977</integer>
<integer>977</integer>
<integer>1003</integer>
<integer>1003</integer>
<integer>1003</integer>
</array>
<key>Perspectives</key>
<array>
@@ -259,17 +259,21 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array>
<string>29B97314FDCFA39411CA2CEA</string>
<string>F5AE83FC0ECF8FD300200704</string>
<string>F5AE84000ECF8FD300200704</string>
<string>1C37FBAC04509CD000000102</string>
<string>F5AE85220ECF9FBE00200704</string>
<string>1C08E77C0454961000C914BD</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>9</integer>
<integer>1</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {305, 604}}</string>
<string>{{0, 0}, {305, 560}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -279,14 +283,12 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {322, 622}}</string>
<string>{{0, 0}, {322, 578}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
<real>305</real>
</array>
<key>RubberWindowFrame</key>
<string>62 83 977 663 0 0 1024 746 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -323,9 +325,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {650, 0}}</string>
<key>RubberWindowFrame</key>
<string>62 83 977 663 0 0 1024 746 </string>
<string>{{0, 0}, {676, 0}}</string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -334,12 +334,10 @@
</dict>
<dict>
<key>Proportion</key>
<string>617pt</string>
<string>573pt</string>
<key>Tabs</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -350,9 +348,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {650, 590}}</string>
<key>RubberWindowFrame</key>
<string>62 83 977 663 0 0 1024 746 </string>
<string>{{10, 27}, {676, 546}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -393,7 +389,7 @@
</dict>
</array>
<key>Proportion</key>
<string>650pt</string>
<string>676pt</string>
</dict>
</array>
<key>Name</key>
@@ -411,11 +407,11 @@
</array>
<key>TableOfContents</key>
<array>
<string>F5368CFF0EC8ADDF00444B30</string>
<string>F5AE83EB0ECF87BC00200704</string>
<string>1CA23ED40692098700951B8B</string>
<string>F5368D000EC8ADDF00444B30</string>
<string>F5AE83EC0ECF87BC00200704</string>
<string>F5A33EBD0EC89C3000F8052D</string>
<string>F5368D010EC8ADDF00444B30</string>
<string>F5AE83ED0ECF87BC00200704</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -449,6 +445,8 @@
<key>Layout</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -463,7 +461,7 @@
<dict>
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
<array>
<real>193</real>
<real>123</real>
</array>
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
<array>
@@ -481,7 +479,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {0, 0}}</string>
<string>{{0, 0}, {123, 536}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -491,17 +489,19 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {210, 622}}</string>
<string>{{0, 0}, {140, 554}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>MainColumn</string>
<real>193</real>
<real>123</real>
</array>
<key>RubberWindowFrame</key>
<string>26 67 953 595 0 0 1024 746 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
<key>Proportion</key>
<string>210pt</string>
<string>140pt</string>
</dict>
<dict>
<key>Dock</key>
@@ -533,7 +533,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {762, 0}}</string>
<string>{{0, 0}, {808, 0}}</string>
<key>RubberWindowFrame</key>
<string>26 67 953 595 0 0 1024 746 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -542,7 +544,7 @@
</dict>
<dict>
<key>Proportion</key>
<string>0pt</string>
<string>549pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -560,7 +562,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {0, -27}}</string>
<string>{{10, 27}, {808, 522}}</string>
<key>RubberWindowFrame</key>
<string>26 67 953 595 0 0 1024 746 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -622,7 +626,7 @@
</dict>
</array>
<key>Proportion</key>
<string>0pt</string>
<string>808pt</string>
</dict>
</array>
<key>Name</key>
@@ -640,14 +644,14 @@
</array>
<key>TableOfContents</key>
<array>
<string>F5368D020EC8ADDF00444B30</string>
<string>F5AE83EE0ECF87BC00200704</string>
<string>1CA23EE50692099D00951B8B</string>
<string>F5368D030EC8ADDF00444B30</string>
<string>F5AE83EF0ECF87BC00200704</string>
<string>F5A33EC20EC89C3000F8052D</string>
<string>F5368D040EC8ADDF00444B30</string>
<string>F5AE83F00ECF87BC00200704</string>
<string>XCMainBuildResultsModuleGUID</string>
<string>1CA23EE80692099D00951B8B</string>
<string>F5368D050EC8ADDF00444B30</string>
<string>F5AE83F10ECF87BC00200704</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildAndRun</string>
@@ -794,6 +798,8 @@
</array>
<key>PerspectivesBarVisible</key>
<true/>
<key>PinnedNavigatorIdentifier</key>
<string>F5AE852A0ECFA27900200704</string>
<key>ShelfIsVisible</key>
<false/>
<key>SourceDescription</key>
@@ -819,7 +825,7 @@
<string>/Users/xx/Grafx2/Grafx2.xcodeproj</string>
</array>
<key>WindowString</key>
<string>62 83 977 663 0 0 1024 746 </string>
<string>26 67 953 595 0 0 1024 746 </string>
<key>WindowTools</key>
<array>
<dict>