Vm-dev August 2010

vm-dev@lists.squeakfoundation.org

26 participants
51 discussions

[commit] r2265 - iOS xcode project updates
by commits＠squeakvm.org 28 Aug '10

28 Aug '10

Author: johnmci Date: 2010-08-27 21:28:39 -0700 (Fri, 27 Aug 2010) New Revision: 2265 Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/project.pbxproj trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj Log: iOS xcode project updates Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-08-28 04:28:15 UTC (rev 2264) +++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-08-28 04:28:39 UTC (rev 2265) @@ -270,88 +270,7 @@ </dict> </array> <key>OpenEditors</key> - <array> - <dict> - <key>Content</key> - <dict> - <key>PBXProjectModuleGUID</key> - <string>9419454C12170FF900D708DB</string> - <key>PBXProjectModuleLabel</key> - <string>sqSqueakOSXNSView.m</string> - <key>PBXSplitModuleInNavigatorKey</key> - <dict> - <key>Split0</key> - <dict> - <key>PBXProjectModuleGUID</key> - <string>9419454D12170FF900D708DB</string> - <key>PBXProjectModuleLabel</key> - <string>sqSqueakOSXNSView.m</string> - <key>_historyCapacity</key> - <integer>0</integer> - <key>bookmark</key> - <string>94037711121D9C0300ECC885</string> - <key>history</key> - <array> - <string>9471135D121C7729003C6B20</string> - </array> - </dict> - <key>SplitCount</key> - <string>1</string> - </dict> - <key>StatusBarVisibility</key> - <true/> - </dict> - <key>Geometry</key> - <dict> - <key>Frame</key> - <string>{{0, 20}, {1076, 924}}</string> - <key>PBXModuleWindowStatusBarHidden2</key> - <false/> - <key>RubberWindowFrame</key> - <string>570 63 1076 965 0 0 1680 1028 </string> - </dict> - </dict> - <dict> - <key>Content</key> - <dict> - <key>PBXProjectModuleGUID</key> - <string>9419455012170FF900D708DB</string> - <key>PBXProjectModuleLabel</key> - <string>sqSqueakScreenAndWindow.m</string> - <key>PBXSplitModuleInNavigatorKey</key> - <dict> - <key>Split0</key> - <dict> - <key>PBXProjectModuleGUID</key> - <string>9419455112170FF900D708DB</string> - <key>PBXProjectModuleLabel</key> - <string>sqSqueakScreenAndWindow.m</string> - <key>_historyCapacity</key> - <integer>0</integer> - <key>bookmark</key> - <string>94037712121D9C0300ECC885</string> - <key>history</key> - <array> - <string>9471135E121C7729003C6B20</string> - </array> - </dict> - <key>SplitCount</key> - <string>1</string> - </dict> - <key>StatusBarVisibility</key> - <true/> - </dict> - <key>Geometry</key> - <dict> - <key>Frame</key> - <string>{{0, 20}, {1131, 922}}</string> - <key>PBXModuleWindowStatusBarHidden2</key> - <false/> - <key>RubberWindowFrame</key> - <string>148 65 1131 963 0 0 1680 1028 </string> - </dict> - </dict> - </array> + <array/> <key>PerspectiveWidths</key> <array> <integer>-1</integer> @@ -442,6 +361,7 @@ <string>94E658E20DDD03FE00358328</string> <string>94210B270E956AC200C1A314</string> <string>29B97317FDCFA39411CA2CEA</string> + <string>947E64DC10AA18FE00D3B69E</string> <string>29B97323FDCFA39411CA2CEA</string> <string>19C28FACFE9D520D11CA2CBB</string> <string>1C37FBAC04509CD000000102</string> @@ -450,9 +370,9 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>140</integer> - <integer>116</integer> - <integer>114</integer> + <integer>42</integer> + <integer>23</integer> + <integer>21</integer> <integer>20</integer> <integer>3</integer> <integer>2</integer> @@ -460,7 +380,7 @@ </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 0}, {443, 919}}</string> + <string>{{0, 822}, {443, 919}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -481,7 +401,7 @@ <real>421</real> </array> <key>RubberWindowFrame</key> - <string>123 50 1509 978 0 0 1680 1028 </string> + <string>124 50 1553 978 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> @@ -497,7 +417,7 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>SqueakUIView.m</string> + <string>sqSqueakOSXNSView.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -505,11 +425,11 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>SqueakUIView.m</string> + <string>sqSqueakOSXNSView.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>9403770E121D9C0300ECC885</string> + <string>940C29C91228C5630009E415</string> <key>history</key> <array> <string>94BCE7390DDDEF8200F38F31</string> @@ -535,7 +455,6 @@ <string>948704B20E12CABF00D565C3</string> <string>9487071F0E132B1000D565C3</string> <string>94ED7EFA0E6C2ABE00F4DD03</string> - <string>94B88C530E81500200C98131</string> <string>94B88C560E81500200C98131</string> <string>94F155570E83EA1F001657CE</string> <string>94F155580E83EA1F001657CE</string> @@ -562,7 +481,6 @@ <string>947E61DC10AA049300D3B69E</string> <string>947E644910AA0F2C00D3B69E</string> <string>947E644B10AA0F2C00D3B69E</string> - <string>947E644E10AA0F2C00D3B69E</string> <string>947E645010AA0F2C00D3B69E</string> <string>942ABEC510AA34820086D908</string> <string>94BCAD4A10AB981B00F87527</string> @@ -695,12 +613,10 @@ <string>946DAA3A10C0D8B700F26F56</string> <string>946DAA3C10C0D8B700F26F56</string> <string>946DAB5110C0F2B000F26F56</string> - <string>94F1F5C910C30C22008DB9CF</string> <string>947713D410C45E5F00890A9B</string> <string>94B7898910C4F95E005EA70D</string> <string>9487755C10C64FF100E4AEC5</string> <string>9487755D10C64FF100E4AEC5</string> - <string>9487756010C64FF100E4AEC5</string> <string>9402DC9C10CDB5F3005C2102</string> <string>9402DDB610CE12A5005C2102</string> <string>94D3660B10CEE03900805023</string> @@ -715,46 +631,78 @@ <string>9473A9701103BE0A00D135CB</string> <string>948C0820112DE98D0017EE7F</string> <string>94E8EEEA11C94D5D0049D853</string> - <string>94783A3E11D135AD00AF11A9</string> <string>94D9B9E311D13CD100AB6CB4</string> <string>949DDD6D11D141080017F79B</string> <string>94E745ED11E5346100E90B3A</string> - <string>94E745EE11E5346100E90B3A</string> <string>94E745EF11E5346100E90B3A</string> <string>94E745F011E5346100E90B3A</string> <string>94E746D011E539AF00E90B3A</string> <string>949AD1ED11E54549006D6BF4</string> - <string>949AD24F11E5469C006D6BF4</string> <string>949AD25011E5469C006D6BF4</string> <string>949AD25111E5469C006D6BF4</string> <string>94EF6D6611E55D1F003BA64D</string> <string>94EF6D6D11E55E31003BA64D</string> <string>94EF6E0511E5617E003BA64D</string> - <string>94EF6E0611E5617E003BA64D</string> <string>94C3AC3E11E6C9D000DBE1E9</string> - <string>94C3AC3F11E6C9D000DBE1E9</string> - <string>94C3AC4011E6C9D000DBE1E9</string> - <string>94C3AC4111E6C9D000DBE1E9</string> - <string>94C3AC4211E6C9D000DBE1E9</string> <string>94EF889211E7ECF2002332CF</string> <string>94F1F6B111EB8E14004B3AE3</string> <string>9458424811EF764100C0FAE3</string> - <string>94D051D2120CE2D40039F8B7</string> <string>94D051D3120CE2D40039F8B7</string> <string>94D0520F120CE6650039F8B7</string> - <string>942087951213257A0024232A</string> - <string>9419454612170FF900D708DB</string> - <string>9483EAF7121C60C70070C43B</string> <string>9483EAF9121C60C70070C43B</string> <string>9483EAFA121C60C70070C43B</string> <string>9483EAFB121C60C70070C43B</string> <string>9483EAFC121C60C70070C43B</string> - <string>9483EAFD121C60C70070C43B</string> - <string>9483EAFE121C60C70070C43B</string> - <string>9483EB1D121C61290070C43B</string> <string>9483EB56121C6B7B0070C43B</string> <string>9483EB57121C6B7B0070C43B</string> - <string>9403770D121D9C0300ECC885</string> + <string>94669D8C1225EF670062028C</string> + <string>9449127012260EF400DC049E</string> + <string>944912841226106200DC049E</string> + <string>940CA58B1226E9B2008BF48A</string> + <string>94329A6912270E2F0090298B</string> + <string>94329B3E122729BA0090298B</string> + <string>94329B3F122729BA0090298B</string> + <string>94329B40122729BA0090298B</string> + <string>94329B5412272A0C0090298B</string> + <string>94329D6412274F350090298B</string> + <string>94329D6612274F350090298B</string> + <string>94329D6812274F350090298B</string> + <string>94329D6A12274F350090298B</string> + <string>94329E0E12275AC30090298B</string> + <string>94329E0F12275AC30090298B</string> + <string>94329E4E12275D8D0090298B</string> + <string>94329FEA122765A60090298B</string> + <string>941DE8041227A7600027D899</string> + <string>941DE8061227A7600027D899</string> + <string>941DE8171227AB370027D899</string> + <string>94A3ECEB12281C6A00DF449D</string> + <string>94A3ED1D1228213E00DF449D</string> + <string>94A3ED1E1228213E00DF449D</string> + <string>94A3ED201228213E00DF449D</string> + <string>94A3ED211228213E00DF449D</string> + <string>94A3ED231228213E00DF449D</string> + <string>94A3ED241228213E00DF449D</string> + <string>94A3ED251228213E00DF449D</string> + <string>94A3ED261228213E00DF449D</string> + <string>94A3ED281228213E00DF449D</string> + <string>94A3ED291228213E00DF449D</string> + <string>94A3ED3F122821D100DF449D</string> + <string>94A3ED40122821D100DF449D</string> + <string>94A3ED881228429500DF449D</string> + <string>94A3ED891228429500DF449D</string> + <string>94A3ED8A1228429500DF449D</string> + <string>94A3ED8B1228429500DF449D</string> + <string>94A3ED8C1228429500DF449D</string> + <string>94A3EE5D122845D700DF449D</string> + <string>94D12BE412289C66006B7504</string> + <string>94D12BE512289C66006B7504</string> + <string>940C29211228BDC80009E415</string> + <string>940C29221228BDC80009E415</string> + <string>940C293D1228BE370009E415</string> + <string>940C29711228C1260009E415</string> + <string>940C297D1228C1FC0009E415</string> + <string>940C29C71228C4F40009E415</string> + <string>940C29B21228C4A30009E415</string> </array> </dict> <key>SplitCount</key> @@ -766,14 +714,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1044, 877}}</string> + <string>{{0, 0}, {1088, 892}}</string> <key>RubberWindowFrame</key> - <string>123 50 1509 978 0 0 1680 1028 </string> + <string>124 50 1553 978 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>877pt</string> + <string>892pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -786,18 +734,18 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 882}, {1044, 55}}</string> + <string>{{0, 897}, {1088, 40}}</string> <key>RubberWindowFrame</key> - <string>123 50 1509 978 0 0 1680 1028 </string> + <string>124 50 1553 978 0 0 1680 1028 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> - <string>55pt</string> + <string>40pt</string> </dict> </array> <key>Proportion</key> - <string>1044pt</string> + <string>1088pt</string> </dict> </array> <key>Name</key> @@ -812,9 +760,9 @@ </array> <key>TableOfContents</key> <array> - <string>9403770F121D9C0300ECC885</string> + <string>940C28CD1228B8620009E415</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>94037710121D9C0300ECC885</string> + <string>940C28CE1228B8620009E415</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -935,7 +883,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>303930371.84930301</real> + <real>304661859.44390798</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -950,14 +898,17 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>9424FF6E0DDCB226009912BF</string> - <string>9419455012170FF900D708DB</string> + <string>1C530D57069F1CE1000CFCEE</string> + <string>940C296D1228BFE80009E415</string> + <string>940C296E1228BFE80009E415</string> + <string>9488792B0E0F2F8000555242</string> <string>1CD10A99069EF8BA00B06720</string> - <string>9419454C12170FF900D708DB</string> + <string>9424FF6E0DDCB226009912BF</string> + <string>1C78EAAD065D492600B07095</string> <string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc.xcodeproj</string> </array> <key>WindowString</key> - <string>123 50 1509 978 0 0 1680 1028 </string> + <string>124 50 1553 978 0 0 1680 1028 </string> <key>WindowToolsV3</key> <array> <dict> @@ -978,23 +929,25 @@ <key>PBXProjectModuleGUID</key> <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> - <string></string> + <string>DropPlugin.c</string> <key>StatusBarVisibility</key> <true/> </dict> <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1332, 643}}</string> + <string>{{0, 0}, {1332, 736}}</string> <key>RubberWindowFrame</key> - <string>174 63 1332 919 0 0 1680 1028 </string> + <string>348 109 1332 919 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>643pt</string> + <string>736pt</string> </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1009,14 +962,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 648}, {1332, 230}}</string> + <string>{{0, 741}, {1332, 137}}</string> <key>RubberWindowFrame</key> - <string>174 63 1332 919 0 0 1680 1028 </string> + <string>348 109 1332 919 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> <key>Proportion</key> - <string>230pt</string> + <string>137pt</string> </dict> </array> <key>Proportion</key> @@ -1034,18 +987,18 @@ <key>TableOfContents</key> <array> <string>9424FF6E0DDCB226009912BF</string> - <string>94037713121D9C0300ECC885</string> + <string>940C28BF1228B8160009E415</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.buildV3</string> <key>WindowString</key> - <string>174 63 1332 919 0 0 1680 1028 </string> + <string>348 109 1332 919 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>9424FF6E0DDCB226009912BF</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -1076,8 +1029,8 @@ <string>yes</string> <key>sizes</key> <array> - <string>{{0, 0}, {150, 491}}</string> - <string>{{150, 0}, {1226, 491}}</string> + <string>{{0, 0}, {150, 478}}</string> + <string>{{150, 0}, {1226, 478}}</string> </array> </dict> <key>VerticalSplitView</key> @@ -1092,8 +1045,8 @@ <string>yes</string> <key>sizes</key> <array> - <string>{{0, 0}, {1376, 491}}</string> - <string>{{0, 491}, {1376, 436}}</string> + <string>{{0, 0}, {1376, 478}}</string> + <string>{{0, 478}, {1376, 449}}</string> </array> </dict> </dict> @@ -1126,12 +1079,12 @@ <real>713</real> </array> <key>Frame</key> - <string>{{150, 0}, {1226, 491}}</string> + <string>{{150, 0}, {1226, 478}}</string> <key>RubberWindowFrame</key> - <string>256 60 1376 968 0 0 1680 1028 </string> + <string>557 60 1376 968 0 0 1680 1028 </string> </dict> <key>RubberWindowFrame</key> - <string>256 60 1376 968 0 0 1680 1028 </string> + <string>557 60 1376 968 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXDebugSessionModule</string> @@ -1154,22 +1107,22 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>94037714121D9C0300ECC885</string> + <string>940C28C01228B8160009E415</string> <string>1C162984064C10D400B95A72</string> - <string>94037715121D9C0300ECC885</string> - <string>94037716121D9C0300ECC885</string> - <string>94037717121D9C0300ECC885</string> - <string>94037718121D9C0300ECC885</string> - <string>94037719121D9C0300ECC885</string> + <string>940C28C11228B8160009E415</string> + <string>940C28C21228B8160009E415</string> + <string>940C28C31228B8160009E415</string> + <string>940C28C41228B8160009E415</string> + <string>940C28C51228B8160009E415</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> <key>WindowString</key> - <string>256 60 1376 968 0 0 1680 1028 </string> + <string>557 60 1376 968 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -1187,21 +1140,23 @@ <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> - <string>sqiPhoneScreenAndWindow.m</string> + <string>sqMacV2Memory.c</string> <key>StatusBarVisibility</key> <true/> </dict> <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1417, 592}}</string> + <string>{{0, 0}, {1417, 512}}</string> <key>RubberWindowFrame</key> - <string>209 4 1417 1024 0 0 1680 1028 </string> + <string>141 4 1417 1024 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -1210,11 +1165,9 @@ </dict> </array> <key>Proportion</key> - <string>592pt</string> + <string>512pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1225,14 +1178,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 597}, {1417, 386}}</string> + <string>{{0, 517}, {1417, 466}}</string> <key>RubberWindowFrame</key> - <string>209 4 1417 1024 0 0 1680 1028 </string> + <string>141 4 1417 1024 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXProjectFindModule</string> <key>Proportion</key> - <string>386pt</string> + <string>466pt</string> </dict> </array> <key>Proportion</key> @@ -1250,17 +1203,17 @@ <key>TableOfContents</key> <array> <string>1C530D57069F1CE1000CFCEE</string> - <string>9483EAD4121C5FE20070C43B</string> - <string>9483EAD5121C5FE20070C43B</string> + <string>940C29A71228C4800009E415</string> + <string>940C29A81228C4800009E415</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> - <string>209 4 1417 1024 0 0 1680 1028 </string> + <string>141 4 1417 1024 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>Identifier</key> @@ -1279,6 +1232,8 @@ <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1289,18 +1244,18 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1619, 787}}</string> + <string>{{0, 0}, {1273, 856}}</string> <key>RubberWindowFrame</key> - <string>61 60 1619 828 0 0 1680 1028 </string> + <string>51 69 1273 897 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXDebugCLIModule</string> <key>Proportion</key> - <string>787pt</string> + <string>856pt</string> </dict> </array> <key>Proportion</key> - <string>787pt</string> + <string>856pt</string> </dict> </array> <key>Name</key> @@ -1314,17 +1269,17 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>9483EB05121C60C70070C43B</string> + <string>940C296B1228BFE80009E415</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.consoleV3</string> <key>WindowString</key> - <string>61 60 1619 828 0 0 1680 1028 </string> + <string>51 69 1273 897 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -1406,7 +1361,7 @@ <key>PBXProjectModuleGUID</key> <string>1C78EAB2065D492600B07095</string> <key>PBXProjectModuleLabel</key> - <string>interp.c</string> + <string>SqueakOSXAppDelegate.h</string> <key>StatusBarVisibility</key> <true/> </dict> @@ -1455,7 +1410,7 @@ <key>PBXProjectModuleLabel</key> <string>SCM Results</string> <key>SCMActivityViewerShowingDefaultKey</key> - <string>{{0, 648}, {1582, 110}}</string> + <string>{{0, 652}, {1582, 106}}</string> </dict> <key>GeometryConfiguration</key> <dict> @@ -1485,7 +1440,7 @@ <key>TableOfContents</key> <array> <string>9488792B0E0F2F8000555242</string> - <string>9483EB06121C60C70070C43B</string> + <string>940C29241228BDC80009E415</string> <string>1C78EAB2065D492600B07095</string> <string>1CD052920623707200166675</string> </array> Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser 2010-08-28 04:28:15 UTC (rev 2264) +++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser 2010-08-28 04:28:39 UTC (rev 2265) @@ -2,17 +2,17 @@ { 1D3623240D0F684500981E51 /* SqueakNoOGLIPhoneAppDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1118, 858}}"; - sepNavSelRange = "{1869, 12}"; - sepNavVisRange = "{63, 3247}"; + sepNavIntBoundsRect = "{{0, 0}, {1118, 880}}"; + sepNavSelRange = "{2172, 73}"; + sepNavVisRange = "{0, 3310}"; sepNavWindowFrame = "{{15, 15}, {694, 1008}}"; }; }; 1D3623250D0F684500981E51 /* SqueakNoOGLIPhoneAppDelegate.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1368, 3224}}"; - sepNavSelRange = "{3848, 14}"; - sepNavVisRange = "{2961, 1466}"; + sepNavSelRange = "{2991, 0}"; + sepNavVisRange = "{2416, 1022}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; @@ -23,35 +23,35 @@ ); }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeArchitecturePreference = armv6; - activeBuildConfigurationName = Debug; + activeArchitecturePreference = i386; + activeBuildConfigurationName = Distribution; activeExecutable = 947E62FD10AA098300D3B69E /* SqueakPureObjc */; - activeSDKPreference = macosx10.5; + activeSDKPreference = macosx10.6; activeTarget = 947E626F10AA098300D3B69E /* SqueakPureObjc */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* SqueakNoOGLIPhone */, ); breakpoints = ( - 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:465 */, - 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:461 */, - 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:449 */, - 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:437 */, - 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:445 */, - 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:474 */, + 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:477 */, + 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:473 */, + 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:461 */, + 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:449 */, + 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:457 */, + 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:489 */, 94A1B1B810B9C1A800C64473 /* sqMacUIEventsUniversal.c:1429 */, - 945C4E6310BB29B500548CC1 /* sqSqueakFileDirectoryInterface.m:117 */, - 945C4E8010BB2CE000548CC1 /* sqSqueakFileDirectoryInterface.m:101 */, + 945C4E6310BB29B500548CC1 /* sqSqueakFileDirectoryInterface.m:118 */, + 945C4E8010BB2CE000548CC1 /* sqSqueakFileDirectoryInterface.m:102 */, 9428BC5C10BB760200DAD287 /* sqSqueakOSXApplication+clipboard.m:59 */, - 9428BCDC10BB937100DAD287 /* sqSqueakFileDirectoryInterface.m:218 */, - 9428BD7010BBA1DC00DAD287 /* sqSqueakFileDirectoryInterface.m:179 */, - 9428BD7710BBA26000DAD287 /* sqSqueakFileDirectoryInterface.m:204 */, - 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:432 */, - 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:453 */, - 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:457 */, + 9428BCDC10BB937100DAD287 /* sqSqueakFileDirectoryInterface.m:219 */, + 9428BD7010BBA1DC00DAD287 /* sqSqueakFileDirectoryInterface.m:180 */, + 9428BD7710BBA26000DAD287 /* sqSqueakFileDirectoryInterface.m:205 */, + 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:444 */, + 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:465 */, + 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:469 */, 946DA99210C0CE1900F26F56 /* sqSqueakOSXDropAPI.m:79 */, - 946DAB1210C0F00400F26F56 /* sqMacUnixExternalPrims.m:218 */, - 9476030E10C375C300B621C9 /* sqSqueakOSXApplication.m:257 */, - 9476031010C375C600B621C9 /* sqSqueakOSXApplication.m:262 */, + 946DAB1210C0F00400F26F56 /* sqMacUnixExternalPrims.m:219 */, + 9476030E10C375C300B621C9 /* sqSqueakOSXApplication.m:260 */, + 9476031010C375C600B621C9 /* sqSqueakOSXApplication.m:265 */, 947713B610C45C0A00890A9B /* Queue.m:117 */, 9495E43B10C9DFDD003E3D28 /* aio.c:235 */, 9458511410F03996001401E7 /* sqMacExtendedClipboard.m:101 */, @@ -65,15 +65,13 @@ 9458527F10F045FB001401E7 /* sqSqueakIPhoneClipboardAPI.m:31 */, 9458528110F045FC001401E7 /* sqSqueakIPhoneClipboardAPI.m:24 */, 9458528310F045FD001401E7 /* sqSqueakIPhoneClipboardAPI.m:17 */, - 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:352 */, - 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:529 */, + 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:364 */, + 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:544 */, 940CD113110E3E6500A9344A /* sqSqueakOSXDropAPI.m:53 */, 94C0D1AC112D5DAE00213581 /* sqSqueakScreenAPI.m:79 */, 941C24EF1198BBE3008BF398 /* sqSqueakScreenAndWindow.m:96 */, - 94E8EF1211C950540049D853 /* sqSqueakOSXNSView.m:118 */, - 94D0527E120CEFB40039F8B7 /* sqSqueakOSXNSView.m:310 */, - 94D05280120CEFB50039F8B7 /* sqSqueakOSXNSView.m:314 */, - 94D05282120CEFB60039F8B7 /* sqSqueakOSXNSView.m:317 */, + 941DE81D1227AB450027D899 /* sqSqueakOSXNSView.m:323 */, + 941DE8221227AB710027D899 /* sqSqueakOSXNSView.m:420 */, ); codeSenseManager = 9424FF430DDC8673009912BF /* Code sense */; executables = ( @@ -146,7 +144,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 22, 300, - 830, + 692.58349609375, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, @@ -159,7 +157,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 805, + 849, 20, 48, 43, @@ -233,7 +231,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 431, + 765, 60, 20, 48, @@ -250,24 +248,30 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 303930365; - PBXWorkspaceStateSaveDate = 303930365; + PBXPerProjectTemplateStateSaveDate = 304658390; + PBXWorkspaceStateSaveDate = 304658390; }; perUserProjectItems = { 9402DC9C10CDB5F3005C2102 /* PBXTextBookmark */ = 9402DC9C10CDB5F3005C2102 /* PBXTextBookmark */; 9402DDB610CE12A5005C2102 /* PBXTextBookmark */ = 9402DDB610CE12A5005C2102 /* PBXTextBookmark */; - 9403770D121D9C0300ECC885 /* PBXTextBookmark */ = 9403770D121D9C0300ECC885 /* PBXTextBookmark */; - 9403770E121D9C0300ECC885 /* PBXTextBookmark */ = 9403770E121D9C0300ECC885 /* PBXTextBookmark */; - 94037711121D9C0300ECC885 /* PBXTextBookmark */ = 94037711121D9C0300ECC885 /* PBXTextBookmark */; - 94037712121D9C0300ECC885 /* PBXTextBookmark */ = 94037712121D9C0300ECC885 /* PBXTextBookmark */; 9406E7E210B663F4002F81F2 /* PBXTextBookmark */ = 9406E7E210B663F4002F81F2 /* PBXTextBookmark */; 9406E87110B66A74002F81F2 /* PBXTextBookmark */ = 9406E87110B66A74002F81F2 /* PBXTextBookmark */; 9406E8CC10B67499002F81F2 /* PBXTextBookmark */ = 9406E8CC10B67499002F81F2 /* PBXTextBookmark */; + 940C29211228BDC80009E415 /* PBXTextBookmark */ = 940C29211228BDC80009E415 /* PBXTextBookmark */; + 940C29221228BDC80009E415 /* PBXTextBookmark */ = 940C29221228BDC80009E415 /* PBXTextBookmark */; + 940C293D1228BE370009E415 /* PBXTextBookmark */ = 940C293D1228BE370009E415 /* PBXTextBookmark */; + 940C29711228C1260009E415 /* PBXTextBookmark */ = 940C29711228C1260009E415 /* PBXTextBookmark */; + 940C297D1228C1FC0009E415 /* PBXTextBookmark */ = 940C297D1228C1FC0009E415 /* PBXTextBookmark */; + 940C29B21228C4A30009E415 /* PBXTextBookmark */ = 940C29B21228C4A30009E415 /* PBXTextBookmark */; + 940C29C71228C4F40009E415 /* PBXTextBookmark */ = 940C29C71228C4F40009E415 /* PBXTextBookmark */; + 940C29C91228C5630009E415 /* PBXTextBookmark */ = 940C29C91228C5630009E415 /* PBXTextBookmark */; + 940CA58B1226E9B2008BF48A /* PBXTextBookmark */ = 940CA58B1226E9B2008BF48A /* PBXTextBookmark */; 941441FD10BC817D0088F8AC /* PBXTextBookmark */ = 941441FD10BC817D0088F8AC /* PBXTextBookmark */; 9414420110BC817D0088F8AC /* PBXTextBookmark */ = 9414420110BC817D0088F8AC /* PBXTextBookmark */; 9414425110BC8A620088F8AC /* PBXBookmark */ = 9414425110BC8A620088F8AC /* PBXBookmark */; - 9419454612170FF900D708DB /* PBXTextBookmark */ = 9419454612170FF900D708DB /* PBXTextBookmark */; - 942087951213257A0024232A /* PBXTextBookmark */ = 942087951213257A0024232A /* PBXTextBookmark */; + 941DE8041227A7600027D899 /* PBXTextBookmark */ = 941DE8041227A7600027D899 /* PBXTextBookmark */; + 941DE8061227A7600027D899 /* PBXTextBookmark */ = 941DE8061227A7600027D899 /* PBXTextBookmark */; + 941DE8171227AB370027D899 /* PBXTextBookmark */ = 941DE8171227AB370027D899 /* PBXTextBookmark */; 9421AB550FF1807D008F54E9 /* PBXTextBookmark */ = 9421AB550FF1807D008F54E9 /* PBXTextBookmark */; 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */ = 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */; 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */ = 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */; @@ -285,8 +289,23 @@ 9430325510BD0B6D0045D33B /* PBXTextBookmark */ = 9430325510BD0B6D0045D33B /* PBXTextBookmark */; 9430329A10BD103B0045D33B /* PBXTextBookmark */ = 9430329A10BD103B0045D33B /* PBXTextBookmark */; 9430329B10BD103B0045D33B /* PBXTextBookmark */ = 9430329B10BD103B0045D33B /* PBXTextBookmark */; + 94329A6912270E2F0090298B /* PBXTextBookmark */ = 94329A6912270E2F0090298B /* PBXTextBookmark */; + 94329B3E122729BA0090298B /* PBXTextBookmark */ = 94329B3E122729BA0090298B /* PBXTextBookmark */; + 94329B3F122729BA0090298B /* PBXTextBookmark */ = 94329B3F122729BA0090298B /* PBXTextBookmark */; + 94329B40122729BA0090298B /* PBXTextBookmark */ = 94329B40122729BA0090298B /* PBXTextBookmark */; + 94329B5412272A0C0090298B /* PBXTextBookmark */ = 94329B5412272A0C0090298B /* PBXTextBookmark */; + 94329D6412274F350090298B /* PBXTextBookmark */ = 94329D6412274F350090298B /* PBXTextBookmark */; + 94329D6612274F350090298B /* PBXTextBookmark */ = 94329D6612274F350090298B /* PBXTextBookmark */; + 94329D6812274F350090298B /* PBXTextBookmark */ = 94329D6812274F350090298B /* PBXTextBookmark */; + 94329D6A12274F350090298B /* PBXTextBookmark */ = 94329D6A12274F350090298B /* PBXTextBookmark */; + 94329E0E12275AC30090298B /* PBXTextBookmark */ = 94329E0E12275AC30090298B /* PBXTextBookmark */; + 94329E0F12275AC30090298B /* PBXTextBookmark */ = 94329E0F12275AC30090298B /* PBXTextBookmark */; + 94329E4E12275D8D0090298B /* PBXTextBookmark */ = 94329E4E12275D8D0090298B /* PBXTextBookmark */; + 94329FEA122765A60090298B /* PBXTextBookmark */ = 94329FEA122765A60090298B /* PBXTextBookmark */; 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */ = 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */; 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */ = 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */; + 9449127012260EF400DC049E /* PBXTextBookmark */ = 9449127012260EF400DC049E /* PBXTextBookmark */; + 944912841226106200DC049E /* PBXTextBookmark */ = 944912841226106200DC049E /* PBXTextBookmark */; 94547F160DE0AC7D00DD588F /* PBXTextBookmark */ = 94547F160DE0AC7D00DD588F /* PBXTextBookmark */; 945481A60DE2A79200DD588F /* PBXTextBookmark */ = 945481A60DE2A79200DD588F /* PBXTextBookmark */; 94554E670DF1171500FB176B /* PBXTextBookmark */ = 94554E670DF1171500FB176B /* PBXTextBookmark */; @@ -305,6 +324,7 @@ 945F30FC0E0C763800CFF3DC /* PBXTextBookmark */ = 945F30FC0E0C763800CFF3DC /* PBXTextBookmark */; 94638BD10EB0F98000A3F155 /* PBXTextBookmark */ = 94638BD10EB0F98000A3F155 /* PBXTextBookmark */; 94638CEA0EB16F1100A3F155 /* PBXTextBookmark */ = 94638CEA0EB16F1100A3F155 /* PBXTextBookmark */; + 94669D8C1225EF670062028C /* PBXTextBookmark */ = 94669D8C1225EF670062028C /* PBXTextBookmark */; 946D973B0FE165B70038846B /* PBXTextBookmark */ = 946D973B0FE165B70038846B /* PBXTextBookmark */; 946DA76810C09A8C00F26F56 /* PBXTextBookmark */ = 946DA76810C09A8C00F26F56 /* PBXTextBookmark */; 946DA7E010C0A7A400F26F56 /* PBXTextBookmark */ = 946DA7E010C0A7A400F26F56 /* PBXTextBookmark */; @@ -315,8 +335,6 @@ 946DAA3A10C0D8B700F26F56 /* PBXTextBookmark */ = 946DAA3A10C0D8B700F26F56 /* PBXTextBookmark */; 946DAA3C10C0D8B700F26F56 /* PBXTextBookmark */ = 946DAA3C10C0D8B700F26F56 /* PBXTextBookmark */; 946DAB5110C0F2B000F26F56 /* PBXTextBookmark */ = 946DAB5110C0F2B000F26F56 /* PBXTextBookmark */; - 9471135D121C7729003C6B20 /* PBXTextBookmark */ = 9471135D121C7729003C6B20 /* PBXTextBookmark */; - 9471135E121C7729003C6B20 /* PBXTextBookmark */ = 9471135E121C7729003C6B20 /* PBXTextBookmark */; 9471E48A0EB6C393000AE79D /* PBXTextBookmark */ = 9471E48A0EB6C393000AE79D /* PBXTextBookmark */; 947332EE0EA70E8C003F9084 /* PBXTextBookmark */ = 947332EE0EA70E8C003F9084 /* PBXTextBookmark */; 9473A34810BBD84100ED7D00 /* PBXTextBookmark */ = 9473A34810BBD84100ED7D00 /* PBXTextBookmark */; @@ -326,7 +344,6 @@ 9475F56B10BF20A00047A24B /* PBXTextBookmark */ = 9475F56B10BF20A00047A24B /* PBXTextBookmark */; 9475F5A710BF25A10047A24B /* PBXTextBookmark */ = 9475F5A710BF25A10047A24B /* PBXTextBookmark */; 947713D410C45E5F00890A9B /* PBXTextBookmark */ = 947713D410C45E5F00890A9B /* PBXTextBookmark */; - 94783A3E11D135AD00AF11A9 /* PlistBookmark */ = 94783A3E11D135AD00AF11A9 /* PlistBookmark */; 9478E13D0EC8EB46007096A7 /* PBXTextBookmark */ = 9478E13D0EC8EB46007096A7 /* PBXTextBookmark */; 947923F21102BC12007C87F8 /* PBXTextBookmark */ = 947923F21102BC12007C87F8 /* PBXTextBookmark */; 947923FE1102BE53007C87F8 /* PBXTextBookmark */ = 947923FE1102BE53007C87F8 /* PBXTextBookmark */; @@ -337,16 +354,11 @@ 947E61DC10AA049300D3B69E /* PBXTextBookmark */ = 947E61DC10AA049300D3B69E /* PBXTextBookmark */; 947E644910AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644910AA0F2C00D3B69E /* PBXTextBookmark */; 947E644B10AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644B10AA0F2C00D3B69E /* PBXTextBookmark */; - 947E644E10AA0F2C00D3B69E /* PBXTextBookmark */ = 947E644E10AA0F2C00D3B69E /* PBXTextBookmark */; 947E645010AA0F2C00D3B69E /* PBXTextBookmark */ = 947E645010AA0F2C00D3B69E /* PBXTextBookmark */; - 9483EAF7121C60C70070C43B /* PBXTextBookmark */ = 9483EAF7121C60C70070C43B /* PBXTextBookmark */; 9483EAF9121C60C70070C43B /* PBXTextBookmark */ = 9483EAF9121C60C70070C43B /* PBXTextBookmark */; 9483EAFA121C60C70070C43B /* PBXTextBookmark */ = 9483EAFA121C60C70070C43B /* PBXTextBookmark */; 9483EAFB121C60C70070C43B /* PBXTextBookmark */ = 9483EAFB121C60C70070C43B /* PBXTextBookmark */; 9483EAFC121C60C70070C43B /* PBXTextBookmark */ = 9483EAFC121C60C70070C43B /* PBXTextBookmark */; - 9483EAFD121C60C70070C43B /* PBXTextBookmark */ = 9483EAFD121C60C70070C43B /* PBXTextBookmark */; - 9483EAFE121C60C70070C43B /* PBXTextBookmark */ = 9483EAFE121C60C70070C43B /* PBXTextBookmark */; - 9483EB1D121C61290070C43B /* PBXTextBookmark */ = 9483EB1D121C61290070C43B /* PBXTextBookmark */; 9483EB56121C6B7B0070C43B /* PBXTextBookmark */ = 9483EB56121C6B7B0070C43B /* PBXTextBookmark */; 9483EB57121C6B7B0070C43B /* PBXTextBookmark */ = 9483EB57121C6B7B0070C43B /* PBXTextBookmark */; 9484F86210B0DCC60038BDC0 /* PBXTextBookmark */ = 9484F86210B0DCC60038BDC0 /* PBXTextBookmark */; @@ -361,7 +373,6 @@ 9487071F0E132B1000D565C3 /* PBXTextBookmark */ = 9487071F0E132B1000D565C3 /* PBXTextBookmark */; 9487755C10C64FF100E4AEC5 /* PBXTextBookmark */ = 9487755C10C64FF100E4AEC5 /* PBXTextBookmark */; 9487755D10C64FF100E4AEC5 /* PBXTextBookmark */ = 9487755D10C64FF100E4AEC5 /* PBXTextBookmark */; - 9487756010C64FF100E4AEC5 /* PBXTextBookmark */ = 9487756010C64FF100E4AEC5 /* PBXTextBookmark */; 948C0820112DE98D0017EE7F /* PBXTextBookmark */ = 948C0820112DE98D0017EE7F /* PBXTextBookmark */; 948FAA0310BF855500BE88CF /* PBXTextBookmark */ = 948FAA0310BF855500BE88CF /* PBXTextBookmark */; 948FAB5B10BFAD3C00BE88CF /* PBXTextBookmark */ = 948FAB5B10BFAD3C00BE88CF /* PBXTextBookmark */; @@ -373,17 +384,34 @@ 949245B210BA4A6200E726F5 /* PBXTextBookmark */ = 949245B210BA4A6200E726F5 /* PBXTextBookmark */; 9493E98F10EE90BC000C4FB3 /* PBXTextBookmark */ = 9493E98F10EE90BC000C4FB3 /* PBXTextBookmark */; 949AD1ED11E54549006D6BF4 /* PBXTextBookmark */ = 949AD1ED11E54549006D6BF4 /* PBXTextBookmark */; - 949AD24F11E5469C006D6BF4 /* PBXTextBookmark */ = 949AD24F11E5469C006D6BF4 /* PBXTextBookmark */; 949AD25011E5469C006D6BF4 /* PBXTextBookmark */ = 949AD25011E5469C006D6BF4 /* PBXTextBookmark */; 949AD25111E5469C006D6BF4 /* PBXTextBookmark */ = 949AD25111E5469C006D6BF4 /* PBXTextBookmark */; 949DDD6D11D141080017F79B /* PBXTextBookmark */ = 949DDD6D11D141080017F79B /* PBXTextBookmark */; 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */ = 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */; 94A1B41E10BA05E600C64473 /* PBXTextBookmark */ = 94A1B41E10BA05E600C64473 /* PBXTextBookmark */; + 94A3ECEB12281C6A00DF449D /* PBXTextBookmark */ = 94A3ECEB12281C6A00DF449D /* PBXTextBookmark */; + 94A3ED1D1228213E00DF449D /* PBXTextBookmark */ = 94A3ED1D1228213E00DF449D /* PBXTextBookmark */; + 94A3ED1E1228213E00DF449D /* PBXTextBookmark */ = 94A3ED1E1228213E00DF449D /* PBXTextBookmark */; + 94A3ED201228213E00DF449D /* PBXTextBookmark */ = 94A3ED201228213E00DF449D /* PBXTextBookmark */; + 94A3ED211228213E00DF449D /* PBXTextBookmark */ = 94A3ED211228213E00DF449D /* PBXTextBookmark */; + 94A3ED231228213E00DF449D /* PBXTextBookmark */ = 94A3ED231228213E00DF449D /* PBXTextBookmark */; + 94A3ED241228213E00DF449D /* PBXTextBookmark */ = 94A3ED241228213E00DF449D /* PBXTextBookmark */; + 94A3ED251228213E00DF449D /* PBXTextBookmark */ = 94A3ED251228213E00DF449D /* PBXTextBookmark */; + 94A3ED261228213E00DF449D /* PBXTextBookmark */ = 94A3ED261228213E00DF449D /* PBXTextBookmark */; + 94A3ED281228213E00DF449D /* PBXTextBookmark */ = 94A3ED281228213E00DF449D /* PBXTextBookmark */; + 94A3ED291228213E00DF449D /* PBXTextBookmark */ = 94A3ED291228213E00DF449D /* PBXTextBookmark */; + 94A3ED3F122821D100DF449D /* PBXTextBookmark */ = 94A3ED3F122821D100DF449D /* PBXTextBookmark */; + 94A3ED40122821D100DF449D /* PBXTextBookmark */ = 94A3ED40122821D100DF449D /* PBXTextBookmark */; + 94A3ED881228429500DF449D /* PBXTextBookmark */ = 94A3ED881228429500DF449D /* PBXTextBookmark */; + 94A3ED891228429500DF449D /* PBXTextBookmark */ = 94A3ED891228429500DF449D /* PBXTextBookmark */; + 94A3ED8A1228429500DF449D /* PBXTextBookmark */ = 94A3ED8A1228429500DF449D /* PBXTextBookmark */; + 94A3ED8B1228429500DF449D /* PlistBookmark */ = 94A3ED8B1228429500DF449D /* PlistBookmark */; + 94A3ED8C1228429500DF449D /* PlistBookmark */ = 94A3ED8C1228429500DF449D /* PlistBookmark */; + 94A3EE5D122845D700DF449D /* PlistBookmark */ = 94A3EE5D122845D700DF449D /* PlistBookmark */; 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */; 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */; 94B1514E0DE2CE530059F208 /* PBXTextBookmark */ = 94B1514E0DE2CE530059F208 /* PBXTextBookmark */; 94B7898910C4F95E005EA70D /* PBXTextBookmark */ = 94B7898910C4F95E005EA70D /* PBXTextBookmark */; - 94B88C530E81500200C98131 /* PBXTextBookmark */ = 94B88C530E81500200C98131 /* PBXTextBookmark */; 94B88C560E81500200C98131 /* PBXTextBookmark */ = 94B88C560E81500200C98131 /* PBXTextBookmark */; 94B954A010E6D0F700DC476A /* PBXTextBookmark */ = 94B954A010E6D0F700DC476A /* PBXTextBookmark */; 94BCAD4A10AB981B00F87527 /* PBXTextBookmark */ = 94BCAD4A10AB981B00F87527 /* PBXTextBookmark */; @@ -401,10 +429,6 @@ 94C3698D10B082DF0041953A /* PBXTextBookmark */ = 94C3698D10B082DF0041953A /* PBXTextBookmark */; 94C3699110B082DF0041953A /* PBXTextBookmark */ = 94C3699110B082DF0041953A /* PBXTextBookmark */; 94C3AC3E11E6C9D000DBE1E9 /* PBXTextBookmark */ = 94C3AC3E11E6C9D000DBE1E9 /* PBXTextBookmark */; - 94C3AC3F11E6C9D000DBE1E9 /* PBXTextBookmark */ = 94C3AC3F11E6C9D000DBE1E9 /* PBXTextBookmark */; - 94C3AC4011E6C9D000DBE1E9 /* PlistBookmark */ = 94C3AC4011E6C9D000DBE1E9 /* PlistBookmark */; - 94C3AC4111E6C9D000DBE1E9 /* PBXTextBookmark */ = 94C3AC4111E6C9D000DBE1E9 /* PBXTextBookmark */; - 94C3AC4211E6C9D000DBE1E9 /* PBXTextBookmark */ = 94C3AC4211E6C9D000DBE1E9 /* PBXTextBookmark */; 94C4B83610C0708F00CD4F90 /* PBXTextBookmark */ = 94C4B83610C0708F00CD4F90 /* PBXTextBookmark */; 94C887D410ADCC0D007CB39E /* PBXTextBookmark */ = 94C887D410ADCC0D007CB39E /* PBXTextBookmark */; 94C888B710ADE75B007CB39E /* PBXTextBookmark */ = 94C888B710ADE75B007CB39E /* PBXTextBookmark */; @@ -416,9 +440,10 @@ 94CFE6B910BE63A900847DF5 /* PBXTextBookmark */ = 94CFE6B910BE63A900847DF5 /* PBXTextBookmark */; 94CFE6C010BE63A900847DF5 /* PBXTextBookmark */ = 94CFE6C010BE63A900847DF5 /* PBXTextBookmark */; 94CFE70110BE683800847DF5 /* PBXTextBookmark */ = 94CFE70110BE683800847DF5 /* PBXTextBookmark */; - 94D051D2120CE2D40039F8B7 /* PBXTextBookmark */ = 94D051D2120CE2D40039F8B7 /* PBXTextBookmark */; 94D051D3120CE2D40039F8B7 /* PBXTextBookmark */ = 94D051D3120CE2D40039F8B7 /* PBXTextBookmark */; 94D0520F120CE6650039F8B7 /* PBXTextBookmark */ = 94D0520F120CE6650039F8B7 /* PBXTextBookmark */; + 94D12BE412289C66006B7504 /* PBXTextBookmark */ = 94D12BE412289C66006B7504 /* PBXTextBookmark */; + 94D12BE512289C66006B7504 /* PBXTextBookmark */ = 94D12BE512289C66006B7504 /* PBXTextBookmark */; 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */ = 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */; 94D16BFE10BCEFEE00A69A89 /* PBXTextBookmark */ = 94D16BFE10BCEFEE00A69A89 /* PBXTextBookmark */; 94D16C2A10BCF28A00A69A89 /* PBXTextBookmark */ = 94D16C2A10BCF28A00A69A89 /* PBXTextBookmark */; @@ -474,7 +499,6 @@ 94E584FF10BF79AB0073FD63 /* PBXTextBookmark */ = 94E584FF10BF79AB0073FD63 /* PBXTextBookmark */; 94E5850010BF79AB0073FD63 /* PBXTextBookmark */ = 94E5850010BF79AB0073FD63 /* PBXTextBookmark */; 94E745ED11E5346100E90B3A /* PBXTextBookmark */ = 94E745ED11E5346100E90B3A /* PBXTextBookmark */; - 94E745EE11E5346100E90B3A /* PBXTextBookmark */ = 94E745EE11E5346100E90B3A /* PBXTextBookmark */; 94E745EF11E5346100E90B3A /* PBXTextBookmark */ = 94E745EF11E5346100E90B3A /* PBXTextBookmark */; 94E745F011E5346100E90B3A /* PBXTextBookmark */ = 94E745F011E5346100E90B3A /* PBXTextBookmark */; 94E746D011E539AF00E90B3A /* PBXTextBookmark */ = 94E746D011E539AF00E90B3A /* PBXTextBookmark */; @@ -483,11 +507,9 @@ 94EF6D6611E55D1F003BA64D /* PBXTextBookmark */ = 94EF6D6611E55D1F003BA64D /* PBXTextBookmark */; 94EF6D6D11E55E31003BA64D /* PBXTextBookmark */ = 94EF6D6D11E55E31003BA64D /* PBXTextBookmark */; 94EF6E0511E5617E003BA64D /* PBXTextBookmark */ = 94EF6E0511E5617E003BA64D /* PBXTextBookmark */; - 94EF6E0611E5617E003BA64D /* PBXTextBookmark */ = 94EF6E0611E5617E003BA64D /* PBXTextBookmark */; 94EF889211E7ECF2002332CF /* PlistBookmark */ = 94EF889211E7ECF2002332CF /* PlistBookmark */; 94F155570E83EA1F001657CE /* PBXTextBookmark */ = 94F155570E83EA1F001657CE /* PBXTextBookmark */; 94F155580E83EA1F001657CE /* PBXTextBookmark */ = 94F155580E83EA1F001657CE /* PBXTextBookmark */; - 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */ = 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */; 94F1F6B111EB8E14004B3AE3 /* PBXTextBookmark */ = 94F1F6B111EB8E14004B3AE3 /* PBXTextBookmark */; 94F5C1870DF26EF200099B11 /* PBXTextBookmark */ = 94F5C1870DF26EF200099B11 /* PBXTextBookmark */; 94F5C25F0DF42C7600099B11 /* PBXTextBookmark */ = 94F5C25F0DF42C7600099B11 /* PBXTextBookmark */; @@ -544,25 +566,25 @@ }; 9402DD5E10CE0C16005C2102 /* SqViewBitmapConversion.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {2070, 1053}}"; - sepNavSelRange = "{1428, 17}"; - sepNavVisRange = "{0, 1743}"; + sepNavIntBoundsRect = "{{0, 0}, {2070, 1066}}"; + sepNavSelRange = "{2824, 26}"; + sepNavVisRange = "{1744, 1329}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; 9402DD5F10CE0C16005C2102 /* SqViewBitmapConversion.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1279, 3588}}"; - sepNavSelRange = "{7186, 15}"; - sepNavVisRange = "{6017, 2651}"; + sepNavIntBoundsRect = "{{0, 0}, {2077, 3549}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1455}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; 9402DD6F10CE0E91005C2102 /* SqViewClut.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1040}}"; - sepNavSelRange = "{66, 17}"; - sepNavVisRange = "{0, 1978}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 1066}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1379}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; @@ -605,46 +627,6 @@ sepNavVisRange = "{0, 1669}"; }; }; - 9403770D121D9C0300ECC885 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 949E5DB60DE3AB6A007388E0 /* SqueakUIView.m */; - name = "SqueakUIView.m: 126"; - rLen = 13; - rLoc = 4598; - rType = 0; - vrLen = 2084; - vrLoc = 4205; - }; - 9403770E121D9C0300ECC885 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 949E5DB60DE3AB6A007388E0 /* SqueakUIView.m */; - name = "SqueakUIView.m: 126"; - rLen = 13; - rLoc = 4598; - rType = 0; - vrLen = 2084; - vrLoc = 4205; - }; - 94037711121D9C0300ECC885 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - name = "sqSqueakOSXNSView.m: 242"; - rLen = 0; - rLoc = 7938; - rType = 0; - vrLen = 2496; - vrLoc = 6472; - }; - 94037712121D9C0300ECC885 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9471D2720E04703B00703D45 /* sqSqueakScreenAndWindow.m */; - name = "sqSqueakScreenAndWindow.m: 112"; - rLen = 13; - rLoc = 3318; - rType = 0; - vrLen = 1795; - vrLoc = 2662; - }; 9406E7E210B663F4002F81F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94C36A6D10B091BB0041953A /* NSCursor.h */; @@ -710,7 +692,104 @@ path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSRange.h; sourceTree = "<absolute>"; }; - 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:529 */ = { + 940C29211228BDC80009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9424FF670DDCB202009912BF /* sqMacV2Memory.c */; + name = "sqMacV2Memory.c: 95"; + rLen = 0; + rLoc = 3266; + rType = 0; + vrLen = 2141; + vrLoc = 2615; + }; + 940C29221228BDC80009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94E658F80DDD03FE00358328 /* GeniePlugin.c */; + name = "GeniePlugin.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1889; + vrLoc = 0; + }; + 940C293D1228BE370009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9452D6070E044D2F000AD792 /* sqSqueakEventsAPI.m */; + name = "sqSqueakEventsAPI.m: 59"; + rLen = 0; + rLoc = 2291; + rType = 0; + vrLen = 1998; + vrLoc = 1024; + }; + 940C29711228C1260009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E647910AA100900D3B69E /* SqueakOSXAppDelegate.h */; + name = "SqueakOSXAppDelegate.h: 18"; + rLen = 0; + rLoc = 717; + rType = 0; + vrLen = 2474; + vrLoc = 0; + }; + 940C297D1228C1FC0009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9424FF5C0DDCB1C7009912BF /* sqMemoryAccess.h */; + name = "sqMemoryAccess.h: 82"; + rLen = 0; + rLoc = 2844; + rType = 0; + vrLen = 4604; + vrLoc = 1894; + }; + 940C29B21228C4A30009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + name = "sqSqueakOSXNSView.m: 118"; + rLen = 0; + rLoc = 4090; + rType = 0; + vrLen = 2090; + vrLoc = 3779; + }; + 940C29C71228C4F40009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94E658E00DDD03FE00358328 /* interp.c */; + name = "interp.c: 25356"; + rLen = 40; + rLoc = 803246; + rType = 0; + vrLen = 2071; + vrLoc = 802259; + }; + 940C29C91228C5630009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + name = "sqSqueakOSXNSView.m: 118"; + rLen = 0; + rLoc = 4090; + rType = 0; + vrLen = 2194; + vrLoc = 3779; + }; + 940CA5401226E8D5008BF48A /* mpeg3io.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = mpeg3io.c; + path = /Users/johnmci/Documents/SqueakmpegFullSource/libmpeg/mpeg3io.c; + sourceTree = "<absolute>"; + }; + 940CA58B1226E9B2008BF48A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 940CA5401226E8D5008BF48A /* mpeg3io.c */; + name = "mpeg3io.c: 5"; + rLen = 8; + rLoc = 48; + rType = 0; + vrLen = 2211; + vrLoc = 0; + }; + 940CD10B110E3E4D00A9344A /* sqSqueakOSXNSView.m:544 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -722,9 +801,9 @@ functionName = "-draggingExited:"; hitCount = 0; ignoreCount = 0; - lineNumber = 529; + lineNumber = 544; location = Squeak; - modificationTime = 303852409.95164; + modificationTime = 304661666.500072; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -741,7 +820,7 @@ ignoreCount = 0; lineNumber = 53; location = Squeak; - modificationTime = 303852409.951423; + modificationTime = 304661666.541146; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -836,16 +915,6 @@ sepNavVisRange = "{2526, 1527}"; }; }; - 9419454612170FF900D708DB /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9452D6070E044D2F000AD792 /* sqSqueakEventsAPI.m */; - name = "sqSqueakEventsAPI.m: 72"; - rLen = 105; - rLoc = 2733; - rType = 0; - vrLen = 2004; - vrLoc = 1307; - }; 941C24EF1198BBE3008BF398 /* sqSqueakScreenAndWindow.m:96 */ = { isa = PBXFileBreakpoint; actions = ( @@ -860,7 +929,7 @@ ignoreCount = 0; lineNumber = 96; location = Squeak; - modificationTime = 303849777.28711; + modificationTime = 304661662.315874; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -869,16 +938,93 @@ sepNavWindowFrame = "{{15, 166}, {1288, 857}}"; }; }; - 942087951213257A0024232A /* PBXTextBookmark */ = { + 941DE8041227A7600027D899 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 947E647910AA100900D3B69E /* SqueakOSXAppDelegate.h */; - name = "SqueakOSXAppDelegate.h: 49"; - rLen = 8; - rLoc = 2121; + fRef = 941DE8051227A7600027D899 /* sqUnixQuartzGL.h */; + name = "sqUnixQuartzGL.h: 10"; + rLen = 0; + rLoc = 234; rType = 0; - vrLen = 2472; + vrLen = 2585; vrLoc = 0; }; + 941DE8051227A7600027D899 /* sqUnixQuartzGL.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = sqUnixQuartzGL.h; + path = "/Users/johnmci/Documents/SqueakIA32ABIPlugin/platforms/unix/vm-display-Quartz/sqUnixQuartzGL.h"; + sourceTree = "<absolute>"; + }; + 941DE8061227A7600027D899 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 941DE8071227A7600027D899 /* bluepony.c */; + name = "bluepony.c: 374"; + rLen = 0; + rLoc = 10642; + rType = 0; + vrLen = 1270; + vrLoc = 10231; + }; + 941DE8071227A7600027D899 /* bluepony.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = bluepony.c; + path = "/Volumes/330GB Photos/WWDC10-SampleCode/Mac/MultiGPUIOSurface/bluepony.c"; + sourceTree = "<absolute>"; + }; + 941DE8171227AB370027D899 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 941DE8181227AB370027D899 /* SqueakGL.c */; + name = "SqueakGL.c: 368"; + rLen = 0; + rLoc = 12320; + rType = 0; + vrLen = 2041; + vrLoc = 11532; + }; + 941DE8181227AB370027D899 /* SqueakGL.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = SqueakGL.c; + path = "/Users/johnmci/Documents/Squeak/Disney Related Changes/plugin-build/Squeak3DX/SqueakGL.c"; + sourceTree = "<absolute>"; + }; + 941DE81D1227AB450027D899 /* sqSqueakOSXNSView.m:323 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + functionName = "-dealWithOpenStepChars:"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 323; + location = Squeak; + modificationTime = 304661666.600198; + originalNumberOfMultipleMatches = 1; + state = 1; + }; + 941DE8221227AB710027D899 /* sqSqueakOSXNSView.m:420 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + functionName = "-doCommandBySelector:"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 420; + location = Squeak; + modificationTime = 304661666.627954; + originalNumberOfMultipleMatches = 1; + state = 1; + }; 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1368, 27417}}"; @@ -1077,17 +1223,17 @@ }; 9424FF5C0DDCB1C7009912BF /* sqMemoryAccess.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 2249}}"; - sepNavSelRange = "{6311, 17}"; - sepNavVisRange = "{5223, 2838}"; + sepNavIntBoundsRect = "{{0, 0}, {1039, 2236}}"; + sepNavSelRange = "{2844, 0}"; + sepNavVisRange = "{1894, 4604}"; sepNavWindowFrame = "{{15, 4}, {878, 1019}}"; }; }; 9424FF5D0DDCB1C7009912BF /* sq.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 6032}}"; + sepNavIntBoundsRect = "{{0, 0}, {1368, 6227}}"; sepNavSelRange = "{8329, 15}"; - sepNavVisRange = "{7276, 1460}"; + sepNavVisRange = "{7685, 1051}"; sepNavWindowFrame = "{{73, 4}, {1326, 1010}}"; }; }; @@ -1116,9 +1262,9 @@ }; 9424FF640DDCB1EF009912BF /* sqPlatformSpecific.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 2106}}"; - sepNavSelRange = "{3907, 26}"; - sepNavVisRange = "{3055, 2395}"; + sepNavIntBoundsRect = "{{0, 0}, {1368, 2197}}"; + sepNavSelRange = "{3359, 19}"; + sepNavVisRange = "{2915, 1435}"; sepNavWindowFrame = "{{38, 19}, {905, 983}}"; }; }; @@ -1139,10 +1285,10 @@ }; 9424FF670DDCB202009912BF /* sqMacV2Memory.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 2483}}"; - sepNavSelRange = "{5856, 96}"; - sepNavVisRange = "{4753, 1326}"; - sepNavWindowFrame = "{{38, 19}, {905, 983}}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 2561}}"; + sepNavSelRange = "{3098, 0}"; + sepNavVisRange = "{2830, 1316}"; + sepNavWindowFrame = "{{518, 45}, {905, 983}}"; }; }; 9424FF680DDCB202009912BF /* sqMacV2Memory.h */ = { @@ -1185,9 +1331,9 @@ }; 9428BA9610BB440800DAD287 /* sqSqueakOSXClipboardAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1215, 871}}"; - sepNavSelRange = "{2148, 13}"; - sepNavVisRange = "{787, 2052}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 871}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1648}"; sepNavWindowFrame = "{{16, 4}, {878, 1019}}"; }; }; @@ -1271,11 +1417,11 @@ ignoreCount = 0; lineNumber = 59; location = Squeak; - modificationTime = 303849777.284693; + modificationTime = 304661662.315289; originalNumberOfMultipleMatches = 1; state = 2; }; - 9428BCDC10BB937100DAD287 /* sqSqueakFileDirectoryInterface.m:218 */ = { + 9428BCDC10BB937100DAD287 /* sqSqueakFileDirectoryInterface.m:219 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1287,13 +1433,13 @@ functionName = "-dir_Delete:length:"; hitCount = 0; ignoreCount = 0; - lineNumber = 218; + lineNumber = 219; location = Squeak; - modificationTime = 303849777.284721; + modificationTime = 304661662.315302; originalNumberOfMultipleMatches = 1; state = 2; }; - 9428BD7010BBA1DC00DAD287 /* sqSqueakFileDirectoryInterface.m:179 */ = { + 9428BD7010BBA1DC00DAD287 /* sqSqueakFileDirectoryInterface.m:180 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1305,13 +1451,13 @@ functionName = "-dir_Create:length:"; hitCount = 0; ignoreCount = 0; - lineNumber = 179; + lineNumber = 180; location = Squeak; - modificationTime = 303849777.284748; + modificationTime = 304661662.315317; originalNumberOfMultipleMatches = 1; state = 2; }; - 9428BD7710BBA26000DAD287 /* sqSqueakFileDirectoryInterface.m:204 */ = { + 9428BD7710BBA26000DAD287 /* sqSqueakFileDirectoryInterface.m:205 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1323,9 +1469,9 @@ functionName = "-dir_Delete:length:"; hitCount = 0; ignoreCount = 0; - lineNumber = 204; + lineNumber = 205; location = Squeak; - modificationTime = 303849777.284779; + modificationTime = 304661662.31534; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1626,6 +1772,206 @@ path = "/Users/johnmci/Documents/SqueakHydra/platforms/unix/vm-display-Quartz/sqUnixQuartz.m"; sourceTree = "<absolute>"; }; + 94329A6912270E2F0090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 946DA91410C0C71100F26F56 /* sqSqueakOSXDropAPI.m */; + name = "sqSqueakOSXDropAPI.m: 55"; + rLen = 6; + rLoc = 2171; + rType = 0; + vrLen = 2458; + vrLoc = 645; + }; + 94329B2F122727BC0090298B /* stack_logging.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = stack_logging.c; + path = "/Users/johnmci/Shared/Libc-594.9.1/gen/stack_logging.c"; + sourceTree = "<absolute>"; + }; + 94329B31122727BC0090298B /* osgdb_ImageIO.cpp */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.cpp; + name = osgdb_ImageIO.cpp; + path = /Users/johnmci/Shared/osgdb_ImageIO.cpp; + sourceTree = "<absolute>"; + }; + 94329B33122727BC0090298B /* stack_logging_disk.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = stack_logging_disk.c; + path = "/Users/johnmci/Shared/Libc-594.9.1/gen/stack_logging_disk.c"; + sourceTree = "<absolute>"; + }; + 94329B3E122729BA0090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329B33122727BC0090298B /* stack_logging_disk.c */; + name = "stack_logging_disk.c: 14"; + rLen = 0; + rLoc = 615; + rType = 0; + vrLen = 2182; + vrLoc = 0; + }; + 94329B3F122729BA0090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329B31122727BC0090298B /* osgdb_ImageIO.cpp */; + name = "osgdb_ImageIO.cpp: 26"; + rLen = 0; + rLoc = 1170; + rType = 0; + vrLen = 2416; + vrLoc = 0; + }; + 94329B40122729BA0090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329B2F122727BC0090298B /* stack_logging.c */; + name = "stack_logging.c: 11"; + rLen = 0; + rLoc = 478; + rType = 0; + vrLen = 2414; + vrLoc = 0; + }; + 94329B5412272A0C0090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329B5512272A0C0090298B /* NSZone.h */; + name = "NSZone.h: 59"; + rLen = 17; + rLoc = 2898; + rType = 0; + vrLen = 3026; + vrLoc = 0; + }; + 94329B5512272A0C0090298B /* NSZone.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = NSZone.h; + path = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.2.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSZone.h; + sourceTree = "<absolute>"; + }; + 94329D6412274F350090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329D6512274F350090298B /* ClientOpenGLView.m */; + name = "ClientOpenGLView.m: 145"; + rLen = 13; + rLoc = 4761; + rType = 0; + vrLen = 1608; + vrLoc = 3748; + }; + 94329D6512274F350090298B /* ClientOpenGLView.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = ClientOpenGLView.m; + path = "/Volumes/330GB Photos/WWDC10-SampleCode/Mac/MultiGPUIOSurface/ClientOpenGLView.m"; + sourceTree = "<absolute>"; + }; + 94329D6612274F350090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329D6712274F350090298B /* sqOpenGLRenderer.c */; + name = "sqOpenGLRenderer.c: 95"; + rLen = 0; + rLoc = 3086; + rType = 0; + vrLen = 2590; + vrLoc = 2485; + }; + 94329D6712274F350090298B /* sqOpenGLRenderer.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = sqOpenGLRenderer.c; + path = "/Users/johnmci/Documents/Squeak/Squeak3.0 Folder/Squeak 3.1.1/sqOpenGLRenderer.c"; + sourceTree = "<absolute>"; + }; + 94329D6812274F350090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329D6912274F350090298B /* OpenGLRenderer.m */; + name = "OpenGLRenderer.m: 16"; + rLen = 0; + rLoc = 729; + rType = 0; + vrLen = 2048; + vrLoc = 9387; + }; + 94329D6912274F350090298B /* OpenGLRenderer.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = OpenGLRenderer.m; + path = "/Volumes/330GB Photos/WWDC10-SampleCode/Mac/GLEssentials/Classes/OpenGLRenderer.m"; + sourceTree = "<absolute>"; + }; + 94329D6A12274F350090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329D6B12274F350090298B /* sqUnixQuartzGL.h */; + name = "sqUnixQuartzGL.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 3333; + vrLoc = 0; + }; + 94329D6B12274F350090298B /* sqUnixQuartzGL.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = sqUnixQuartzGL.h; + path = "/Volumes/330GB Photos/Cog Before Aug 2010 changes/platforms/unix/vm-display-Quartz/sqUnixQuartzGL.h"; + sourceTree = "<absolute>"; + }; + 94329D6D12274F350090298B /* sqUnixQuartz.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = sqUnixQuartz.m; + path = "/Volumes/330GB Photos/Cog Before Aug 2010 changes/platforms/unix/vm-display-Quartz/sqUnixQuartz.m"; + sourceTree = "<absolute>"; + }; + 94329D6F12274F350090298B /* SqView.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = SqView.h; + path = "/Users/johnmci/Work In Progress/smalltalk/CocoaSqueakSource/SqueakAppKit/SqView.h"; + sourceTree = "<absolute>"; + }; + 94329E0E12275AC30090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329D6F12274F350090298B /* SqView.h */; + name = "SqView.h: 4"; + rLen = 1; + rLoc = 42; + rType = 0; + vrLen = 1636; + vrLoc = 0; + }; + 94329E0F12275AC30090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94329D6D12274F350090298B /* sqUnixQuartz.m */; + name = "sqUnixQuartz.m: 162"; + rLen = 8; + rLoc = 5164; + rType = 0; + vrLen = 1838; + vrLoc = 3983; + }; + 94329E4E12275D8D0090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 949E5DB60DE3AB6A007388E0 /* SqueakUIView.m */; + name = "SqueakUIView.m: 118"; + rLen = 18; + rLoc = 4411; + rType = 0; + vrLen = 2049; + vrLoc = 4205; + }; + 94329FEA122765A60090298B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9402DD5F10CE0C16005C2102 /* SqViewBitmapConversion.m */; + name = "SqViewBitmapConversion.m: 203"; + rLen = 26; + rLoc = 7753; + rType = 0; + vrLen = 2204; + vrLoc = 7161; + }; 94360A8C10E84CC90060221A /* NSException.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -1635,9 +1981,9 @@ }; 944069CD10E6B63200353B27 /* MacMenubarPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 22763}}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 22139}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 902}"; + sepNavVisRange = "{0, 873}"; }; }; 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */ = { @@ -1662,11 +2008,31 @@ }; 944895AD10F4081300FB3EC8 /* PharoV10.sources */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 3.5531e+06}}"; - sepNavSelRange = "{1830818, 7}"; - sepNavVisRange = "{1829163, 2381}"; + sepNavIntBoundsRect = "{{0, 0}, {1368, 3.55387e+06}}"; + sepNavSelRange = "{3217524, 3}"; + sepNavVisRange = "{3217191, 992}"; }; }; + 9449127012260EF400DC049E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* SqueakNoOGLIPhoneAppDelegate.m */; + name = "SqueakNoOGLIPhoneAppDelegate.m: 81"; + rLen = 6; + rLoc = 3039; + rType = 0; + vrLen = 2240; + vrLoc = 2640; + }; + 944912841226106200DC049E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9424FF5D0DDCB1C7009912BF /* sq.h */; + name = "sq.h: 334"; + rLen = 0; + rLoc = 12931; + rType = 0; + vrLen = 2839; + vrLoc = 12002; + }; 9452BDC10F4095DE006410DE /* sqSqueakIPhoneApplication+Network.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1036, 652}}"; @@ -1701,7 +2067,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1327, 2327}}"; sepNavSelRange = "{4706, 0}"; - sepNavVisRange = "{3907, 848}"; + sepNavVisRange = "{3907, 850}"; sepNavWindowFrame = "{{239, 129}, {1441, 887}}"; }; }; @@ -1737,17 +2103,17 @@ }; 9452D5DE0E044A9D000AD792 /* sqSqueakFileDirectoryInterface.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1287, 4251}}"; - sepNavSelRange = "{2112, 437}"; - sepNavVisRange = "{1789, 1986}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 4199}}"; + sepNavSelRange = "{2570, 0}"; + sepNavVisRange = "{2030, 1014}"; sepNavWindowFrame = "{{15, 4}, {1334, 1019}}"; }; }; 9452D5DF0E044A9D000AD792 /* sqSqueakMainApp.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 2145}}"; - sepNavSelRange = "{3803, 0}"; - sepNavVisRange = "{3610, 1369}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 2080}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1410}"; }; }; 9452D5E00E044A9D000AD792 /* sqSqueakMainApp.h */ = { @@ -1775,17 +2141,17 @@ }; 9452D5E30E044A9D000AD792 /* sqSqueakMainApplication.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1170}}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 1183}}"; sepNavSelRange = "{1908, 23}"; - sepNavVisRange = "{972, 1692}"; + sepNavVisRange = "{840, 1891}"; sepNavWindowFrame = "{{888, 14}, {694, 1008}}"; }; }; 9452D5E40E044A9D000AD792 /* sqSqueakMainApplication.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 3224}}"; - sepNavSelRange = "{4744, 14}"; - sepNavVisRange = "{4224, 805}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 3198}}"; + sepNavSelRange = "{4763, 0}"; + sepNavVisRange = "{4413, 613}"; sepNavWindowFrame = "{{15, 40}, {905, 983}}"; }; }; @@ -1812,25 +2178,25 @@ }; 9452D6070E044D2F000AD792 /* sqSqueakEventsAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1533, 1287}}"; - sepNavSelRange = "{3525, 0}"; - sepNavVisRange = "{1923, 315}"; + sepNavIntBoundsRect = "{{0, 0}, {1538, 1118}}"; + sepNavSelRange = "{2291, 0}"; + sepNavVisRange = "{1024, 1998}"; sepNavWindowFrame = "{{905, 13}, {1012, 1015}}"; }; }; 9452D7630E0452D3000AD792 /* sqiPhoneScreenAndWindow.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 598}}"; - sepNavSelRange = "{1883, 23}"; - sepNavVisRange = "{101, 1842}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 768}}"; + sepNavSelRange = "{1909, 23}"; + sepNavVisRange = "{0, 1943}"; sepNavWindowFrame = "{{15, 49}, {1346, 974}}"; }; }; 9452D7640E0452D3000AD792 /* sqiPhoneScreenAndWindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1001}}"; - sepNavSelRange = "{2703, 13}"; - sepNavVisRange = "{1654, 1147}"; + sepNavIntBoundsRect = "{{0, 0}, {838, 1001}}"; + sepNavSelRange = "{2596, 20}"; + sepNavVisRange = "{273, 2528}"; sepNavWindowFrame = "{{802, 9}, {878, 1019}}"; }; }; @@ -2045,9 +2411,9 @@ }; 94584F6110F020BD001401E7 /* ClipboardExtendedPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 3107}}"; - sepNavSelRange = "{4263, 0}"; - sepNavVisRange = "{3941, 851}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 3224}}"; + sepNavSelRange = "{6079, 2}"; + sepNavVisRange = "{5674, 1042}"; }; }; 94584FD910F02378001401E7 /* sqMacExtendedClipboard.m */ = { @@ -2080,7 +2446,7 @@ ignoreCount = 0; lineNumber = 101; location = Squeak; - modificationTime = 303852409.9529139; + modificationTime = 304661666.070802; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2098,7 +2464,7 @@ ignoreCount = 0; lineNumber = 69; location = Squeak; - modificationTime = 303852409.952652; + modificationTime = 304661666.130565; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2116,7 +2482,7 @@ ignoreCount = 0; lineNumber = 75; location = Squeak; - modificationTime = 303852409.95406; + modificationTime = 304661666.165129; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2149,7 +2515,7 @@ ignoreCount = 0; lineNumber = 37; location = Squeak; - modificationTime = 303852409.952689; + modificationTime = 304661666.225319; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2166,7 +2532,7 @@ ignoreCount = 0; lineNumber = 45; location = Squeak; - modificationTime = 303852409.9539911; + modificationTime = 304661666.282176; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2183,7 +2549,7 @@ ignoreCount = 0; lineNumber = 50; location = Squeak; - modificationTime = 303852409.953803; + modificationTime = 304661666.346521; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2200,7 +2566,7 @@ ignoreCount = 0; lineNumber = 72; location = Squeak; - modificationTime = 303852409.953362; + modificationTime = 304661666.387487; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2217,7 +2583,7 @@ ignoreCount = 0; lineNumber = 88; location = Squeak; - modificationTime = 303852409.951569; + modificationTime = 304661666.435488; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2261,9 +2627,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 31; - modificationTime = 303852409.9519941; + modificationTime = 304661662.315739; originalNumberOfMultipleMatches = 1; - state = 1; + state = 0; }; 9458528110F045FC001401E7 /* sqSqueakIPhoneClipboardAPI.m:24 */ = { isa = PBXFileBreakpoint; @@ -2277,9 +2643,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 24; - modificationTime = 303852409.953647; + modificationTime = 304661662.315754; originalNumberOfMultipleMatches = 1; - state = 1; + state = 0; }; 9458528310F045FD001401E7 /* sqSqueakIPhoneClipboardAPI.m:17 */ = { isa = PBXFileBreakpoint; @@ -2293,9 +2659,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 17; - modificationTime = 303852409.9539201; + modificationTime = 304661662.315777; originalNumberOfMultipleMatches = 1; - state = 1; + state = 0; }; 9459E7C510C047DD001D0053 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -2331,7 +2697,7 @@ path = /Developer/SDKs/MacOSX10.6.sdk/usr/include/libkern/OSTypes.h; sourceTree = "<absolute>"; }; - 945C4E6310BB29B500548CC1 /* sqSqueakFileDirectoryInterface.m:117 */ = { + 945C4E6310BB29B500548CC1 /* sqSqueakFileDirectoryInterface.m:118 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2343,13 +2709,13 @@ functionName = "-dir_Lookup:length:index:name:length:creationDate:modificationDate:isDirectory:sizeIfFile:"; hitCount = 0; ignoreCount = 0; - lineNumber = 117; + lineNumber = 118; location = Squeak; - modificationTime = 303849777.284624; + modificationTime = 304661662.315247; originalNumberOfMultipleMatches = 1; state = 2; }; - 945C4E8010BB2CE000548CC1 /* sqSqueakFileDirectoryInterface.m:101 */ = { + 945C4E8010BB2CE000548CC1 /* sqSqueakFileDirectoryInterface.m:102 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2361,9 +2727,9 @@ functionName = "-dir_Lookup:length:index:name:length:creationDate:modificationDate:isDirectory:sizeIfFile:"; hitCount = 0; ignoreCount = 0; - lineNumber = 101; + lineNumber = 102; location = Squeak; - modificationTime = 303849777.284658; + modificationTime = 304661662.315272; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2420,9 +2786,9 @@ }; 94638B260EAFB77B00A3F155 /* iPhone.changes */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {943, 1.75945e+06}}"; - sepNavSelRange = "{5548785, 0}"; - sepNavVisRange = "{940, 1428}"; + sepNavIntBoundsRect = "{{0, 0}, {1368, 1.75799e+06}}"; + sepNavSelRange = "{5317317, 27}"; + sepNavVisRange = "{5316066, 3257}"; }; }; 94638BD10EB0F98000A3F155 /* PBXTextBookmark */ = { @@ -2480,6 +2846,16 @@ sepNavVisRange = "{3547, 944}"; }; }; + 94669D8C1225EF670062028C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94D3654D10CEC86C00805023 /* BitMapConversionLogicFromX11.h */; + name = "BitMapConversionLogicFromX11.h: 18"; + rLen = 14; + rLoc = 581; + rType = 0; + vrLen = 1092; + vrLoc = 0; + }; 946D973B0FE165B70038846B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 946D973C0FE165B70038846B /* sqSqueakEventsAPI.m */; @@ -2547,9 +2923,9 @@ }; 946DA8D210C0C30D00F26F56 /* DropPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 2496}}"; - sepNavSelRange = "{2324, 0}"; - sepNavVisRange = "{1835, 1278}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 2548}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1485}"; sepNavWindowFrame = "{{254, 4}, {1426, 1019}}"; }; }; @@ -2606,9 +2982,9 @@ }; 946DA91410C0C71100F26F56 /* sqSqueakOSXDropAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1066}}"; - sepNavSelRange = "{2160, 17}"; - sepNavVisRange = "{1643, 1403}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 1079}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1643}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; @@ -2625,15 +3001,15 @@ ignoreCount = 0; lineNumber = 79; location = Squeak; - modificationTime = 303852409.9516032; + modificationTime = 304661665.801686; originalNumberOfMultipleMatches = 1; state = 1; }; 946DA9FF10C0D35500F26F56 /* sqMacUnixExternalPrims.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 4004}}"; - sepNavSelRange = "{6987, 6}"; - sepNavVisRange = "{6445, 1059}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 3926}}"; + sepNavSelRange = "{7333, 20}"; + sepNavVisRange = "{6641, 924}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; @@ -2688,7 +3064,7 @@ path = "/Users/johnmci/Documents/SqueakHydraZBaseCheck/HydraVM-src/platforms/unix/vm/sqUnixExternalPrims.c"; sourceTree = "<absolute>"; }; - 946DAB1210C0F00400F26F56 /* sqMacUnixExternalPrims.m:218 */ = { + 946DAB1210C0F00400F26F56 /* sqMacUnixExternalPrims.m:219 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2700,9 +3076,9 @@ functionName = "ioLoadModuleRaw()"; hitCount = 0; ignoreCount = 0; - lineNumber = 218; + lineNumber = 219; location = Squeak; - modificationTime = 303852409.95208; + modificationTime = 304661665.839168; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2713,50 +3089,30 @@ rLen = 18; rLoc = 4453; rType = 0; - vrLen = 1691; + vrLen = 1680; vrLoc = 3335; }; - 9471135D121C7729003C6B20 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - name = "sqSqueakOSXNSView.m: 242"; - rLen = 0; - rLoc = 7938; - rType = 0; - vrLen = 2496; - vrLoc = 6472; - }; - 9471135E121C7729003C6B20 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9471D2720E04703B00703D45 /* sqSqueakScreenAndWindow.m */; - name = "sqSqueakScreenAndWindow.m: 112"; - rLen = 13; - rLoc = 3318; - rType = 0; - vrLen = 1795; - vrLoc = 2662; - }; 9471D2710E04703B00703D45 /* sqSqueakScreenAndWindow.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1299, 923}}"; - sepNavSelRange = "{2746, 52}"; - sepNavVisRange = "{84, 2719}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 923}}"; + sepNavSelRange = "{2569, 0}"; + sepNavVisRange = "{1784, 1019}"; sepNavWindowFrame = "{{15, 49}, {1346, 974}}"; }; }; 9471D2720E04703B00703D45 /* sqSqueakScreenAndWindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1293, 2769}}"; - sepNavSelRange = "{3318, 13}"; - sepNavVisRange = "{2662, 1795}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 2782}}"; + sepNavSelRange = "{3392, 0}"; + sepNavVisRange = "{2970, 614}"; sepNavWindowFrame = "{{148, 9}, {1131, 1019}}"; }; }; 9471D2DF0E04743F00703D45 /* sqSqueakAppDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 741}}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 741}}"; sepNavSelRange = "{2103, 14}"; - sepNavVisRange = "{254, 2008}"; + sepNavVisRange = "{267, 2001}"; sepNavWindowFrame = "{{15, 4}, {1378, 1024}}"; }; }; @@ -2868,7 +3224,7 @@ vrLen = 1966; vrLoc = 0; }; - 9476030E10C375C300B621C9 /* sqSqueakOSXApplication.m:257 */ = { + 9476030E10C375C300B621C9 /* sqSqueakOSXApplication.m:260 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2880,13 +3236,13 @@ functionName = "-isImageFile:"; hitCount = 0; ignoreCount = 0; - lineNumber = 257; + lineNumber = 260; location = Squeak; - modificationTime = 303852409.95288; + modificationTime = 304661665.934478; originalNumberOfMultipleMatches = 1; state = 1; }; - 9476031010C375C600B621C9 /* sqSqueakOSXApplication.m:262 */ = { + 9476031010C375C600B621C9 /* sqSqueakOSXApplication.m:265 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2898,9 +3254,9 @@ functionName = "-isImageFile:"; hitCount = 0; ignoreCount = 0; - lineNumber = 262; + lineNumber = 265; location = Squeak; - modificationTime = 303852409.952841; + modificationTime = 304661665.978907; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2918,7 +3274,7 @@ ignoreCount = 0; lineNumber = 117; location = Squeak; - modificationTime = 303849777.286064; + modificationTime = 304661662.315547; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2939,18 +3295,6 @@ vrLen = 2334; vrLoc = 74; }; - 94783A3E11D135AD00AF11A9 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 94C36C9710B0CF290041953A /* Info-iPhone.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleVersion, - ); - name = "/Volumes/px2/business/SqueakiPhone/SqueakObjCBasedForOSXAndIPhone/SqueakNoOGLIPhoneOSX/platforms/iOS/vm/Info-iPhone.plist"; - rLen = 0; - rLoc = 9223372036854775808; - }; 9478E0250EC8D957007096A7 /* dummyFFI.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1283, 2652}}"; @@ -3005,9 +3349,9 @@ }; 9478E05F0EC8DCFB007096A7 /* sqSqueakSoundCoreAudio.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1540, 5928}}"; - sepNavSelRange = "{11435, 136}"; - sepNavVisRange = "{10202, 2721}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 5720}}"; + sepNavSelRange = "{10010, 0}"; + sepNavVisRange = "{9239, 849}"; sepNavWindowFrame = "{{38, 3}, {1587, 998}}"; }; }; @@ -3067,9 +3411,9 @@ }; 947E20F50EB281C5007957D0 /* SqueakFFIPrims.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 35737}}"; - sepNavSelRange = "{62516, 0}"; - sepNavVisRange = "{61857, 1313}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 37401}}"; + sepNavSelRange = "{63121, 2}"; + sepNavVisRange = "{62724, 744}"; }; }; 947E20F90EB2826C007957D0 /* sqFFI.h */ = { @@ -3193,7 +3537,7 @@ 242, ); autoAttachOnCrash = 1; - breakpointsEnabled = 1; + breakpointsEnabled = 0; configStateDict = { "PBXLSLaunchAction-0" = { PBXLSLaunchAction = 0; @@ -3258,6 +3602,11 @@ name = MallocGuardEdges; value = YES; }, + { + active = NO; + name = NSDebugConcurrentViewDrawing; + value = YES; + }, ); executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; @@ -3349,16 +3698,6 @@ vrLen = 1243; vrLoc = 0; }; - 947E644E10AA0F2C00D3B69E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658F80DDD03FE00358328 /* GeniePlugin.c */; - name = "GeniePlugin.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1285; - vrLoc = 0; - }; 947E645010AA0F2C00D3B69E /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94E658FE0DDD03FE00358328 /* JPEGReaderPlugin.c */; @@ -3371,46 +3710,36 @@ }; 947E647910AA100900D3B69E /* SqueakOSXAppDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 767}}"; - sepNavSelRange = "{2305, 17}"; - sepNavVisRange = "{586, 1886}"; + sepNavIntBoundsRect = "{{0, 0}, {1533, 780}}"; + sepNavSelRange = "{1916, 50}"; + sepNavVisRange = "{1643, 459}"; sepNavWindowFrame = "{{522, 48}, {1017, 978}}"; }; }; 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {995, 2340}}"; - sepNavSelRange = "{6551, 0}"; - sepNavVisRange = "{2347, 2089}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 2509}}"; + sepNavSelRange = "{6510, 19}"; + sepNavVisRange = "{5623, 1131}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; 947E64CA10AA16FE00D3B69E /* sqSqueakOSXApplication.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1379, 891}}"; - sepNavSelRange = "{1983, 53}"; - sepNavVisRange = "{0, 2397}"; + sepNavSelRange = "{2413, 0}"; + sepNavVisRange = "{0, 2419}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {887, 3497}}"; - sepNavSelRange = "{7081, 12}"; - sepNavVisRange = "{0, 2355}"; + sepNavIntBoundsRect = "{{0, 0}, {970, 3562}}"; + sepNavSelRange = "{2696, 40}"; + sepNavVisRange = "{2506, 1924}"; sepNavWindowFrame = "{{522, 48}, {1017, 978}}"; }; }; - 9483EAF7121C60C70070C43B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623250D0F684500981E51 /* SqueakNoOGLIPhoneAppDelegate.m */; - name = "SqueakNoOGLIPhoneAppDelegate.m: 139"; - rLen = 0; - rLoc = 5126; - rType = 0; - vrLen = 2468; - vrLoc = 6454; - }; 9483EAF9121C60C70070C43B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 949E5DB50DE3AB6A007388E0 /* SqueakUIView.h */; @@ -3451,36 +3780,6 @@ vrLen = 2291; vrLoc = 695; }; - 9483EAFD121C60C70070C43B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; - name = "sqSqueakOSXNSView.h: 65"; - rLen = 10; - rLoc = 2615; - rType = 0; - vrLen = 2685; - vrLoc = 1032; - }; - 9483EAFE121C60C70070C43B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - name = "sqSqueakOSXNSView.m: 94"; - rLen = 0; - rLoc = 3633; - rType = 0; - vrLen = 2058; - vrLoc = 7284; - }; - 9483EB1D121C61290070C43B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; - name = "SqueakOSXAppDelegate.m: 190"; - rLen = 0; - rLoc = 6551; - rType = 0; - vrLen = 2089; - vrLoc = 2347; - }; 9483EB56121C6B7B0070C43B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D7640E0452D3000AD792 /* sqiPhoneScreenAndWindow.m */; @@ -3692,29 +3991,19 @@ vrLen = 1164; vrLoc = 2105; }; - 9487756010C64FF100E4AEC5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658EA0DDD03FE00358328 /* BitBltPlugin.c */; - name = "BitBltPlugin.c: 254"; - rLen = 21; - rLoc = 10581; - rType = 0; - vrLen = 730; - vrLoc = 9968; - }; 94883B2A0E0C2A5E005A4738 /* aio.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 5356}}"; - sepNavSelRange = "{6577, 0}"; - sepNavVisRange = "{5835, 1292}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 5044}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1492}"; sepNavWindowFrame = "{{15, 45}, {1017, 978}}"; }; }; 94883B400E0C2B9C005A4738 /* sqUnixSocket.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1160, 27599}}"; - sepNavSelRange = "{2087, 0}"; - sepNavVisRange = "{1917, 1006}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 28392}}"; + sepNavSelRange = "{50782, 14}"; + sepNavVisRange = "{50398, 658}"; sepNavWindowFrame = "{{38, 14}, {799, 988}}"; }; }; @@ -3835,9 +4124,9 @@ }; 9492453010BA43AA00E726F5 /* SqueakOSXApplication.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {995, 822}}"; - sepNavSelRange = "{1874, 17}"; - sepNavVisRange = "{0, 2433}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 702}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1641}"; sepNavWindowFrame = "{{15, 4}, {878, 1019}}"; }; }; @@ -3882,11 +4171,11 @@ ignoreCount = 0; lineNumber = 235; location = Squeak; - modificationTime = 303852409.9534339; + modificationTime = 304661666.042408; originalNumberOfMultipleMatches = 1; state = 1; }; - 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:352 */ = { + 9496D5CD10FAFA29007762DE /* sqSqueakOSXNSView.m:364 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -3898,9 +4187,9 @@ functionName = "-doCommandBySelector:"; hitCount = 0; ignoreCount = 0; - lineNumber = 352; + lineNumber = 364; location = Squeak; - modificationTime = 303849777.286522; + modificationTime = 304661662.315794; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -3914,16 +4203,6 @@ vrLen = 1369; vrLoc = 3610; }; - 949AD24F11E5469C006D6BF4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9424FF5C0DDCB1C7009912BF /* sqMemoryAccess.h */; - name = "sqMemoryAccess.h: 132"; - rLen = 17; - rLoc = 6311; - rType = 0; - vrLen = 2838; - vrLoc = 5223; - }; 949AD25011E5469C006D6BF4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9424FF710DDCB234009912BF /* macintoshextra.c */; @@ -3970,17 +4249,17 @@ }; 949E5DB50DE3AB6A007388E0 /* SqueakUIView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {995, 822}}"; - sepNavSelRange = "{1945, 12}"; + sepNavIntBoundsRect = "{{0, 0}, {838, 880}}"; + sepNavSelRange = "{2317, 58}"; sepNavVisRange = "{0, 2380}"; sepNavWindowFrame = "{{21, 20}, {694, 1008}}"; }; }; 949E5DB60DE3AB6A007388E0 /* SqueakUIView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1440, 3523}}"; - sepNavSelRange = "{4598, 13}"; - sepNavVisRange = "{4205, 2084}"; + sepNavIntBoundsRect = "{{0, 0}, {1202, 3549}}"; + sepNavSelRange = "{2254, 12}"; + sepNavVisRange = "{1280, 2122}"; sepNavWindowFrame = "{{152, 50}, {1040, 978}}"; }; }; @@ -4016,9 +4295,9 @@ }; 94A0E8840DE5EF430071C8B9 /* sqSqueakMainApplication+imageReadWrite.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 858}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1794}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 793}}"; + sepNavSelRange = "{2341, 0}"; + sepNavVisRange = "{1288, 1226}"; sepNavWindowFrame = "{{15, 15}, {694, 1008}}"; }; }; @@ -4032,9 +4311,9 @@ }; 94A0E9830DE5F1FE0071C8B9 /* sqSqueakMainApplication+screen.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {905, 767}}"; - sepNavSelRange = "{1924, 15}"; - sepNavVisRange = "{0, 2171}"; + sepNavIntBoundsRect = "{{0, 0}, {1368, 676}}"; + sepNavSelRange = "{1967, 6}"; + sepNavVisRange = "{0, 2166}"; sepNavWindowFrame = "{{15, 15}, {694, 1008}}"; }; }; @@ -4047,16 +4326,17 @@ }; 94A1B0050E0DBE2400EB5EFC /* sqSqueakMainApplication+events.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 671}}"; - sepNavSelRange = "{1925, 31}"; - sepNavVisRange = "{0, 2005}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 896}}"; + sepNavSelRange = "{709, 0}"; + sepNavVisRange = "{0, 2027}"; + sepNavWindowFrame = "{{15, 4}, {1042, 1024}}"; }; }; 94A1B0060E0DBE2400EB5EFC /* sqSqueakMainApplication+events.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1327, 845}}"; - sepNavSelRange = "{1934, 0}"; - sepNavVisRange = "{1090, 1171}"; + sepNavIntBoundsRect = "{{0, 0}, {838, 1040}}"; + sepNavSelRange = "{1884, 23}"; + sepNavVisRange = "{578, 2333}"; sepNavWindowFrame = "{{38, 17}, {847, 985}}"; }; }; @@ -4104,7 +4384,7 @@ ignoreCount = 0; lineNumber = 1429; location = "Squeak VM Opt"; - modificationTime = 303849777.284588; + modificationTime = 304661662.31523; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -4167,9 +4447,9 @@ }; 94A3488D0DDCCCC700D1D4A9 /* sqSqueakScreenAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 1755}}"; - sepNavSelRange = "{2661, 20}"; - sepNavVisRange = "{1628, 1821}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 1807}}"; + sepNavSelRange = "{2078, 51}"; + sepNavVisRange = "{1773, 1687}"; sepNavWindowFrame = "{{20, 20}, {694, 1008}}"; }; }; @@ -4180,6 +4460,201 @@ sepNavVisRange = "{1158, 1564}"; }; }; + 94A3ECEB12281C6A00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94B88C540E81500200C98131 /* SqView.m */; + name = "SqView.m: 409"; + rLen = 10; + rLoc = 11118; + rType = 0; + vrLen = 1310; + vrLoc = 10665; + }; + 94A3ED1D1228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9471D2DF0E04743F00703D45 /* sqSqueakAppDelegate.h */; + name = "sqSqueakAppDelegate.h: 51"; + rLen = 14; + rLoc = 2103; + rType = 0; + vrLen = 2001; + vrLoc = 267; + }; + 94A3ED1E1228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9452D5E30E044A9D000AD792 /* sqSqueakMainApplication.h */; + name = "sqSqueakMainApplication.h: 45"; + rLen = 23; + rLoc = 1908; + rType = 0; + vrLen = 1891; + vrLoc = 840; + }; + 94A3ED201228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; + name = "SqueakOSXAppDelegate.m: 92"; + rLen = 0; + rLoc = 3489; + rType = 0; + vrLen = 1416; + vrLoc = 2192; + }; + 94A3ED211228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C88BDE10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.m */; + name = "sqSqueakOSXScreenAndWindow.m: 59"; + rLen = 0; + rLoc = 2292; + rType = 0; + vrLen = 1687; + vrLoc = 707; + }; + 94A3ED231228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C887FA10ADCEFC007CB39E /* sqSqueakOSXApplication+imageReadWrite.m */; + name = "sqSqueakOSXApplication+imageReadWrite.m: 126"; + rLen = 27; + rLoc = 4983; + rType = 0; + vrLen = 2152; + vrLoc = 3149; + }; + 94A3ED241228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C887F910ADCEFC007CB39E /* sqSqueakOSXApplication+imageReadWrite.h */; + name = "sqSqueakOSXApplication+imageReadWrite.h: 42"; + rLen = 0; + rLoc = 1939; + rType = 0; + vrLen = 2010; + vrLoc = 0; + }; + 94A3ED251228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94BCAE6810ACA10100F87527 /* sqSqueakOSXInfoPlistInterface.m */; + name = "sqSqueakOSXInfoPlistInterface.m: 137"; + rLen = 27; + rLoc = 5705; + rType = 0; + vrLen = 2312; + vrLoc = 4190; + }; + 94A3ED261228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94BCAD1B10AB942300F87527 /* sqSqueakOSXApplication+attributes.h */; + name = "sqSqueakOSXApplication+attributes.h: 6"; + rLen = 1692; + rLoc = 109; + rType = 0; + vrLen = 1897; + vrLoc = 0; + }; + 94A3ED281228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C36A9210B09EE70041953A /* sqSqueakOSXApplication+events.h */; + name = "sqSqueakOSXApplication+events.h: 52"; + rLen = 0; + rLoc = 2818; + rType = 0; + vrLen = 2781; + vrLoc = 0; + }; + 94A3ED291228213E00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94A1B0050E0DBE2400EB5EFC /* sqSqueakMainApplication+events.h */; + name = "sqSqueakMainApplication+events.h: 44"; + rLen = 0; + rLoc = 2021; + rType = 0; + vrLen = 2027; + vrLoc = 0; + }; + 94A3ED3F122821D100DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C36A9310B09EE70041953A /* sqSqueakOSXApplication+events.m */; + name = "sqSqueakOSXApplication+events.m: 110"; + rLen = 0; + rLoc = 4995; + rType = 0; + vrLen = 2451; + vrLoc = 4417; + }; + 94A3ED40122821D100DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94A1B0060E0DBE2400EB5EFC /* sqSqueakMainApplication+events.m */; + name = "sqSqueakMainApplication+events.m: 27"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 2236; + vrLoc = 578; + }; + 94A3ED881228429500DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9471D2720E04703B00703D45 /* sqSqueakScreenAndWindow.m */; + name = "sqSqueakScreenAndWindow.m: 110"; + rLen = 39; + rLoc = 3191; + rType = 0; + vrLen = 1431; + vrLoc = 2662; + }; + 94A3ED891228429500DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9452D7630E0452D3000AD792 /* sqiPhoneScreenAndWindow.h */; + name = "sqiPhoneScreenAndWindow.h: 42"; + rLen = 23; + rLoc = 1909; + rType = 0; + vrLen = 1943; + vrLoc = 0; + }; + 94A3ED8A1228429500DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94BCAD1C10AB942300F87527 /* sqSqueakOSXApplication+attributes.m */; + name = "sqSqueakOSXApplication+attributes.m: 87"; + rLen = 0; + rLoc = 3138; + rType = 0; + vrLen = 2712; + vrLoc = 2184; + }; + 94A3ED8B1228429500DF449D /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 94C36C9710B0CF290041953A /* Info-iPhone.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleVersion, + ); + name = "/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/Info-iPhone.plist"; + rLen = 0; + rLoc = 9223372036854775808; + }; + 94A3ED8C1228429500DF449D /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 948774B110C64DD800E4AEC5 /* SqueakPureObjc-Info 64*64.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + ); + name = "/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc-Info 64*64.plist"; + rLen = 0; + rLoc = 9223372036854775808; + }; + 94A3EE5D122845D700DF449D /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 947E5F9F10A9FFA000D3B69E /* SqueakPureObjc-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + LSBackgroundOnly, + ); + name = "/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc-Info.plist"; + rLen = 0; + rLoc = 9223372036854775808; + }; 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94AB2E6B0E003879006A79E4 /* npsqueak.c */; @@ -4249,16 +4724,6 @@ vrLen = 1922; vrLoc = 499; }; - 94B88C530E81500200C98131 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94B88C540E81500200C98131 /* SqView.m */; - name = "SqView.m: 409"; - rLen = 10; - rLoc = 11118; - rType = 0; - vrLen = 1338; - vrLoc = 10637; - }; 94B88C540E81500200C98131 /* SqView.m */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -4303,7 +4768,7 @@ }; 94B8F54E10CF677800F0DD6B /* SqViewClut.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 560}}"; + sepNavIntBoundsRect = "{{0, 0}, {1368, 455}}"; sepNavSelRange = "{66, 17}"; sepNavVisRange = "{0, 254}"; }; @@ -4326,9 +4791,9 @@ }; 94B9533410E6BD7100DC476A /* MacMenuOS9ToOSX.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1109, 3562}}"; - sepNavSelRange = "{5489, 0}"; - sepNavVisRange = "{4844, 1473}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 3705}}"; + sepNavSelRange = "{1329, 39}"; + sepNavVisRange = "{979, 704}"; sepNavWindowFrame = "{{15, 9}, {1078, 1014}}"; }; }; @@ -4355,6 +4820,12 @@ name = NSApplication.h; path = /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/AppKit.framework/Versions/C/Headers/NSApplication.h; sourceTree = "<absolute>"; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {3652, 5811}}"; + sepNavSelRange = "{13541, 43}"; + sepNavVisRange = "{12028, 3678}"; + sepNavWindowFrame = "{{15, 4}, {1042, 1024}}"; + }; }; 94BCABBF10AB72A600F87527 /* sqSqueakOSXFileDirectoryInterface.h */ = { uiCtxt = { @@ -4415,16 +4886,16 @@ }; 94BCAD1B10AB942300F87527 /* sqSqueakOSXApplication+attributes.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 615}}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 745}}"; sepNavSelRange = "{109, 1692}"; sepNavVisRange = "{0, 1897}"; }; }; 94BCAD1C10AB942300F87527 /* sqSqueakOSXApplication+attributes.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1729}}"; - sepNavSelRange = "{3086, 0}"; - sepNavVisRange = "{2741, 3090}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 2093}}"; + sepNavSelRange = "{2143, 17}"; + sepNavVisRange = "{1329, 1241}"; sepNavWindowFrame = "{{15, 45}, {1017, 978}}"; }; }; @@ -4448,9 +4919,9 @@ }; 94BCAE6810ACA10100F87527 /* sqSqueakOSXInfoPlistInterface.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 2834}}"; - sepNavSelRange = "{8644, 12}"; - sepNavVisRange = "{7310, 4459}"; + sepNavIntBoundsRect = "{{0, 0}, {1251, 3640}}"; + sepNavSelRange = "{5705, 27}"; + sepNavVisRange = "{4190, 2312}"; sepNavWindowFrame = "{{15, 45}, {1017, 978}}"; }; }; @@ -4581,9 +5052,9 @@ }; 94BCEA2B0DDE0C1600F38F31 /* sqMacHostWindow.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {858, 2509}}"; - sepNavSelRange = "{2600, 14}"; - sepNavVisRange = "{1691, 1563}"; + sepNavIntBoundsRect = "{{0, 0}, {858, 2561}}"; + sepNavSelRange = "{2124, 115}"; + sepNavVisRange = "{1236, 1931}"; sepNavWindowFrame = "{{775, 4}, {905, 983}}"; }; }; @@ -4615,23 +5086,23 @@ ignoreCount = 0; lineNumber = 79; location = Squeak; - modificationTime = 303849777.2870719; + modificationTime = 304661662.315858; originalNumberOfMultipleMatches = 1; state = 2; }; 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {995, 1157}}"; - sepNavSelRange = "{2615, 10}"; - sepNavVisRange = "{1032, 2685}"; + sepNavIntBoundsRect = "{{0, 0}, {1279, 1118}}"; + sepNavSelRange = "{3616, 0}"; + sepNavVisRange = "{711, 2935}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1139, 9672}}"; - sepNavSelRange = "{7938, 0}"; - sepNavVisRange = "{6472, 2496}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 10205}}"; + sepNavSelRange = "{4090, 0}"; + sepNavVisRange = "{3779, 2194}"; sepNavWindowFrame = "{{570, 7}, {1076, 1021}}"; }; }; @@ -4799,9 +5270,9 @@ }; 94C3687710AFA77F0041953A /* sqSqueakOSXApplication+cursor.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1963}}"; - sepNavSelRange = "{4567, 0}"; - sepNavVisRange = "{4072, 1722}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 2015}}"; + sepNavSelRange = "{3958, 28}"; + sepNavVisRange = "{3487, 1045}"; sepNavWindowFrame = "{{299, 9}, {1426, 1019}}"; }; }; @@ -4829,9 +5300,9 @@ }; 94C3688B10AFA9EF0041953A /* sqSqueakMainApplication+cursor.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 624}}"; - sepNavSelRange = "{1961, 6}"; - sepNavVisRange = "{62, 1980}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 624}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1651}"; }; }; 94C368F610AFAEA60041953A /* QuickdrawTypes.h */ = { @@ -4908,17 +5379,17 @@ }; 94C36A9210B09EE70041953A /* sqSqueakOSXApplication+events.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 702}}"; - sepNavSelRange = "{2235, 17}"; - sepNavVisRange = "{343, 2438}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 715}}"; + sepNavSelRange = "{1877, 0}"; + sepNavVisRange = "{854, 1965}"; sepNavWindowFrame = "{{149, 4}, {905, 983}}"; }; }; 94C36A9310B09EE70041953A /* sqSqueakOSXApplication+events.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1412, 4485}}"; - sepNavSelRange = "{2028, 17}"; - sepNavVisRange = "{986, 2076}"; + sepNavIntBoundsRect = "{{0, 0}, {1412, 4875}}"; + sepNavSelRange = "{4972, 23}"; + sepNavVisRange = "{3444, 3128}"; sepNavWindowFrame = "{{15, 4}, {1131, 1019}}"; }; }; @@ -4944,48 +5415,6 @@ vrLen = 275; vrLoc = 0; }; - 94C3AC3F11E6C9D000DBE1E9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */; - name = "ObjectiveCPlugin.c: 10"; - rLen = 35; - rLoc = 190; - rType = 0; - vrLen = 1354; - vrLoc = 0; - }; - 94C3AC4011E6C9D000DBE1E9 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 947E5F9F10A9FFA000D3B69E /* SqueakPureObjc-Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - LSBackgroundOnly, - ); - name = "/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc-Info.plist"; - rLen = 0; - rLoc = 9223372036854775808; - }; - 94C3AC4111E6C9D000DBE1E9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94BCAD1B10AB942300F87527 /* sqSqueakOSXApplication+attributes.h */; - name = "sqSqueakOSXApplication+attributes.h: 6"; - rLen = 1692; - rLoc = 109; - rType = 0; - vrLen = 1897; - vrLoc = 0; - }; - 94C3AC4211E6C9D000DBE1E9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94BCAD1C10AB942300F87527 /* sqSqueakOSXApplication+attributes.m */; - name = "sqSqueakOSXApplication+attributes.m: 82"; - rLen = 9; - rLoc = 2924; - rType = 0; - vrLen = 1992; - vrLoc = 2383; - }; 94C4B80F10C06C4700CD4F90 /* configx.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {994, 799}}"; @@ -5002,9 +5431,9 @@ }; 94C4B82F10C06F8800CD4F90 /* sqSqueakOSXSoundCoreAudio.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 793}}"; - sepNavSelRange = "{1951, 5}"; - sepNavVisRange = "{1559, 486}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 793}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1758}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; @@ -5037,16 +5466,16 @@ }; 94C887F910ADCEFC007CB39E /* sqSqueakOSXApplication+imageReadWrite.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {908, 585}}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 745}}"; sepNavSelRange = "{1939, 0}"; - sepNavVisRange = "{47, 1963}"; + sepNavVisRange = "{0, 2010}"; }; }; 94C887FA10ADCEFC007CB39E /* sqSqueakOSXApplication+imageReadWrite.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1327, 1807}}"; - sepNavSelRange = "{2511, 0}"; - sepNavVisRange = "{1986, 1116}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 1833}}"; + sepNavSelRange = "{4983, 27}"; + sepNavVisRange = "{3149, 2152}"; sepNavWindowFrame = "{{685, 4}, {878, 1019}}"; }; }; @@ -5079,18 +5508,18 @@ }; 94C88BDD10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 676}}"; - sepNavSelRange = "{2068, 17}"; - sepNavVisRange = "{193, 1918}"; - sepNavWindowFrame = "{{15, 4}, {1392, 1019}}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 676}}"; + sepNavSelRange = "{1866, 45}"; + sepNavVisRange = "{707, 1400}"; + sepNavWindowFrame = "{{16, 4}, {1392, 1019}}"; }; }; 94C88BDE10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1014}}"; - sepNavSelRange = "{2178, 17}"; - sepNavVisRange = "{1324, 1418}"; - sepNavWindowFrame = "{{15, 49}, {1346, 974}}"; + sepNavIntBoundsRect = "{{0, 0}, {1299, 988}}"; + sepNavSelRange = "{2648, 13}"; + sepNavVisRange = "{340, 2332}"; + sepNavWindowFrame = "{{334, 25}, {1346, 974}}"; }; }; 94C88C0E10AF4196007CB39E /* NSGeometry.h */ = { @@ -5177,16 +5606,6 @@ vrLen = 1801; vrLoc = 7114; }; - 94D051D2120CE2D40039F8B7 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658E00DDD03FE00358328 /* interp.c */; - name = "interp.c: 4"; - rLen = 0; - rLoc = 67; - rType = 0; - vrLen = 1224; - vrLoc = 50; - }; 94D051D3120CE2D40039F8B7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94638B260EAFB77B00A3F155 /* iPhone.changes */; @@ -5207,60 +5626,6 @@ vrLen = 615; vrLoc = 4413; }; - 94D0527E120CEFB40039F8B7 /* sqSqueakOSXNSView.m:310 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - functionName = "-mouseDown:"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 310; - location = Squeak; - modificationTime = 303852409.953138; - originalNumberOfMultipleMatches = 1; - state = 1; - }; - 94D05280120CEFB50039F8B7 /* sqSqueakOSXNSView.m:314 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - functionName = "-rightMouseDown:"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 314; - location = Squeak; - modificationTime = 303852409.9521199; - originalNumberOfMultipleMatches = 1; - state = 1; - }; - 94D05282120CEFB60039F8B7 /* sqSqueakOSXNSView.m:317 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - functionName = "-otherMouseDown:"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 317; - location = Squeak; - modificationTime = 303852409.952371; - originalNumberOfMultipleMatches = 1; - state = 1; - }; 94D098C21102956D005BCD7B /* interp.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -5268,6 +5633,26 @@ path = /Users/johnmci/Documents/Squeak3.8.0/src/vm/interp.c; sourceTree = "<absolute>"; }; + 94D12BE412289C66006B7504 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94E658EA0DDD03FE00358328 /* BitBltPlugin.c */; + name = "BitBltPlugin.c: 2459"; + rLen = 0; + rLoc = 71472; + rType = 0; + vrLen = 1211; + vrLoc = 71047; + }; + 94D12BE512289C66006B7504 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; + name = "sqSqueakOSXNSView.h: 71"; + rLen = 0; + rLoc = 3051; + rType = 0; + vrLen = 2405; + vrLoc = 1217; + }; 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94D16BFD10BCEFEE00A69A89 /* Document.m */; @@ -5349,7 +5734,7 @@ }; 94D3654D10CEC86C00805023 /* BitMapConversionLogicFromX11.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 702}}"; + sepNavIntBoundsRect = "{{0, 0}, {995, 844}}"; sepNavSelRange = "{581, 14}"; sepNavVisRange = "{0, 1092}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; @@ -5581,7 +5966,7 @@ vrLen = 1347; vrLoc = 59154; }; - 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:465 */ = { + 94D7181B10B74A2500F69A71 /* sqSqueakOSXNSView.m:477 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5592,13 +5977,13 @@ fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; hitCount = 0; ignoreCount = 0; - lineNumber = 465; + lineNumber = 477; location = Squeak; - modificationTime = 303849777.2836739; + modificationTime = 304661662.315041; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:461 */ = { + 94D7181D10B74A2600F69A71 /* sqSqueakOSXNSView.m:473 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5610,13 +5995,13 @@ functionName = "-firstRectForCharacterRange:"; hitCount = 0; ignoreCount = 0; - lineNumber = 461; + lineNumber = 473; location = Squeak; - modificationTime = 303849777.2838889; + modificationTime = 304661662.315117; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:449 */ = { + 94D7182310B74A2900F69A71 /* sqSqueakOSXNSView.m:461 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5628,13 +6013,13 @@ functionName = "-attributedSubstringFromRange:"; hitCount = 0; ignoreCount = 0; - lineNumber = 449; + lineNumber = 461; location = Squeak; - modificationTime = 303849777.284035; + modificationTime = 304661662.315146; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:437 */ = { + 94D7182910B74A4A00F69A71 /* sqSqueakOSXNSView.m:449 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5646,13 +6031,13 @@ functionName = "-unmarkText"; hitCount = 0; ignoreCount = 0; - lineNumber = 437; + lineNumber = 449; location = Squeak; - modificationTime = 303849777.2841781; + modificationTime = 304661662.315164; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:445 */ = { + 94D7182D10B74A4E00F69A71 /* sqSqueakOSXNSView.m:457 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5664,13 +6049,13 @@ functionName = "-conversationIdentifier"; hitCount = 0; ignoreCount = 0; - lineNumber = 445; + lineNumber = 457; location = Squeak; - modificationTime = 303849777.284315; + modificationTime = 304661662.315188; originalNumberOfMultipleMatches = 1; state = 2; }; - 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:474 */ = { + 94D7183310B74BD100F69A71 /* sqSqueakOSXNSView.m:489 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -5682,9 +6067,9 @@ functionName = "-drawsVerticallyForCharacterAtIndex:"; hitCount = 0; ignoreCount = 0; - lineNumber = 474; + lineNumber = 489; location = Squeak; - modificationTime = 303849777.284447; + modificationTime = 304661662.315204; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -6059,7 +6444,7 @@ fRef = 9452D5DE0E044A9D000AD792 /* sqSqueakFileDirectoryInterface.m */; name = "sqSqueakFileDirectoryInterface.m: 158"; rLen = 6; - rLoc = 6260; + rLoc = 6271; rType = 0; vrLen = 2025; vrLoc = 5386; @@ -6256,9 +6641,9 @@ }; 94E658E00DDD03FE00358328 /* interp.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1790, 359255}}"; - sepNavSelRange = "{180245, 20}"; - sepNavVisRange = "{180098, 416}"; + sepNavIntBoundsRect = "{{0, 0}, {3694, 359203}}"; + sepNavSelRange = "{803246, 40}"; + sepNavVisRange = "{802259, 2071}"; sepNavWindowFrame = "{{38, 34}, {1438, 968}}"; }; }; @@ -6286,9 +6671,9 @@ }; 94E658EA0DDD03FE00358328 /* BitBltPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1405, 73931}}"; - sepNavSelRange = "{124124, 6}"; - sepNavVisRange = "{122886, 1446}"; + sepNavIntBoundsRect = "{{0, 0}, {1944, 73528}}"; + sepNavSelRange = "{71472, 0}"; + sepNavVisRange = "{71047, 1211}"; }; }; 94E658EC0DDD03FE00358328 /* BMPReadWriterPlugin.c */ = { @@ -6307,9 +6692,9 @@ }; 94E658F20DDD03FE00358328 /* FFTPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1357, 4641}}"; - sepNavSelRange = "{8267, 0}"; - sepNavVisRange = "{8149, 272}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 4823}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 366}"; }; }; 94E658F40DDD03FE00358328 /* FilePlugin.c */ = { @@ -6329,16 +6714,16 @@ }; 94E658F80DDD03FE00358328 /* GeniePlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 5044}}"; + sepNavIntBoundsRect = "{{0, 0}, {1594, 5135}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 192}"; + sepNavVisRange = "{0, 1889}"; }; }; 94E658FA0DDD03FE00358328 /* HostWindowPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1482, 5096}}"; - sepNavSelRange = "{7284, 37}"; - sepNavVisRange = "{6628, 930}"; + sepNavIntBoundsRect = "{{0, 0}, {1860, 5122}}"; + sepNavSelRange = "{3964, 41}"; + sepNavVisRange = "{3221, 1609}"; }; }; 94E658FE0DDD03FE00358328 /* JPEGReaderPlugin.c */ = { @@ -6387,9 +6772,9 @@ }; 94E6590A0DDD03FE00358328 /* MiscPrimitivePlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 10621}}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 10634}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 850}"; + sepNavVisRange = "{0, 844}"; }; }; 94E6590C0DDD03FE00358328 /* RePlugin.c */ = { @@ -6409,9 +6794,9 @@ }; 94E659100DDD03FE00358328 /* SocketPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1377, 23595}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 845}"; + sepNavIntBoundsRect = "{{0, 0}, {1377, 23582}}"; + sepNavSelRange = "{50205, 2}"; + sepNavVisRange = "{49677, 1491}"; sepNavWindowFrame = "{{15, 8}, {1012, 1015}}"; }; }; @@ -6439,9 +6824,9 @@ }; 94E659180DDD03FE00358328 /* Squeak3D.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1440, 39338}}"; - sepNavSelRange = "{3704, 6}"; - sepNavVisRange = "{2895, 2373}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 39858}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 366}"; }; }; 94E6591A0DDD03FE00358328 /* StarSqueakPlugin.c */ = { @@ -6453,9 +6838,9 @@ }; 94E6591D0DDD03FE00358328 /* UUIDPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1104, 2041}}"; - sepNavSelRange = "{2745, 19}"; - sepNavVisRange = "{2105, 1164}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 2067}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 867}"; sepNavWindowFrame = "{{38, 17}, {847, 985}}"; }; }; @@ -6781,9 +7166,9 @@ }; 94E659830DDD053900358328 /* jmemdatasrc.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 2639}}"; - sepNavSelRange = "{8018, 0}"; - sepNavVisRange = "{7282, 942}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 2600}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 661}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; @@ -6895,9 +7280,9 @@ }; 94E6599C0DDD053900358328 /* b3dMain.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1283, 19396}}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 19292}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 931}"; + sepNavVisRange = "{0, 866}"; }; }; 94E6599D0DDD053900358328 /* b3dRemap.c */ = { @@ -6938,8 +7323,8 @@ 94E65A290DDD053900358328 /* chartables.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1283, 2457}}"; - sepNavSelRange = "{489, 0}"; - sepNavVisRange = "{0, 1280}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1175}"; }; }; 94E65A2B0DDD053900358328 /* get.c */ = { @@ -6995,16 +7380,6 @@ vrLen = 2792; vrLoc = 854; }; - 94E745EE11E5346100E90B3A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C36A9310B09EE70041953A /* sqSqueakOSXApplication+events.m */; - name = "sqSqueakOSXApplication+events.m: 109"; - rLen = 31; - rLoc = 4982; - rType = 0; - vrLen = 2159; - vrLoc = 3909; - }; 94E745EF11E5346100E90B3A /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D5E00E044A9D000AD792 /* sqSqueakMainApp.h */; @@ -7052,24 +7427,6 @@ path = "/Users/johnmci/Documents/Squeak3.8.0/History/4.2.4b1/platforms/unix/vm-display-Quartz/sqUnixQuartz.m"; sourceTree = "<absolute>"; }; - 94E8EF1211C950540049D853 /* sqSqueakOSXNSView.m:118 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - functionName = "-initWithFrame:"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 118; - location = Squeak; - modificationTime = 303852409.952513; - originalNumberOfMultipleMatches = 1; - state = 1; - }; 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94ED7EFB0E6C2ABE00F4DD03 /* Document.m */; @@ -7124,16 +7481,6 @@ vrLen = 1006; vrLoc = 1917; }; - 94EF6E0611E5617E003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9424FF5D0DDCB1C7009912BF /* sq.h */; - name = "sq.h: 334"; - rLen = 0; - rLoc = 12931; - rType = 0; - vrLen = 2166; - vrLoc = 12256; - }; 94EF889211E7ECF2002332CF /* PlistBookmark */ = { isa = PlistBookmark; fRef = 941D1C9A0E696FC7005B77B3 /* Entitlements.plist */; @@ -7172,23 +7519,6 @@ path = "/Users/johnmci/Work In Progress/smalltalk/FScriptSources-20031020/FScript/FScriptFramework/FSNSProxy.m"; sourceTree = "<absolute>"; }; - 94F1F5C910C30C22008DB9CF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94F1F5CA10C30C22008DB9CF /* mpeg3io.c */; - name = "mpeg3io.c: 5"; - rLen = 1155; - rLoc = 45; - rType = 0; - vrLen = 1995; - vrLoc = 0; - }; - 94F1F5CA10C30C22008DB9CF /* mpeg3io.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = mpeg3io.c; - path = /Users/johnmci/Documents/SqueakmpegFullSource/libmpeg/mpeg3io.c; - sourceTree = "<absolute>"; - }; 94F1F6B111EB8E14004B3AE3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9424FF5B0DDCB1C7009912BF /* sqGnu.h */; @@ -7255,7 +7585,7 @@ vrLen = 1899; vrLoc = 192393; }; - 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:432 */ = { + 94F5F28710BC517200847EEE /* sqSqueakOSXNSView.m:444 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -7267,13 +7597,13 @@ functionName = "-setMarkedText:selectedRange:replacementRange:"; hitCount = 0; ignoreCount = 0; - lineNumber = 432; + lineNumber = 444; location = Squeak; - modificationTime = 303849777.284807; + modificationTime = 304661662.315367; originalNumberOfMultipleMatches = 1; state = 2; }; - 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:453 */ = { + 94F5F28B10BC517500847EEE /* sqSqueakOSXNSView.m:465 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -7285,13 +7615,13 @@ functionName = "-markedRange"; hitCount = 0; ignoreCount = 0; - lineNumber = 453; + lineNumber = 465; location = Squeak; - modificationTime = 303849777.285561; + modificationTime = 304661662.31538; originalNumberOfMultipleMatches = 1; state = 2; }; - 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:457 */ = { + 94F5F28D10BC517700847EEE /* sqSqueakOSXNSView.m:469 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -7303,9 +7633,9 @@ functionName = "-selectedRange"; hitCount = 0; ignoreCount = 0; - lineNumber = 457; + lineNumber = 469; location = Squeak; - modificationTime = 303849777.285744; + modificationTime = 304661662.315413; originalNumberOfMultipleMatches = 1; state = 2; }; Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/project.pbxproj =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/project.pbxproj 2010-08-28 04:28:15 UTC (rev 2264) +++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/project.pbxproj 2010-08-28 04:28:39 UTC (rev 2265) @@ -39,6 +39,7 @@ 942ABE6F10AA23E20086D908 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 942ABE6E10AA23E20086D908 /* ApplicationServices.framework */; }; 942F75D30E0B67AD00848BF2 /* sqSqueakVmAndImagePathAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 942F75D20E0B67AD00848BF2 /* sqSqueakVmAndImagePathAPI.m */; }; 942F76320E0B6C7600848BF2 /* sqSqueakMainApplication+attributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 942F76310E0B6C7600848BF2 /* sqSqueakMainApplication+attributes.m */; }; + 94329ECB12275FFA0090298B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94329ECA12275FFA0090298B /* OpenGL.framework */; }; 944069CE10E6B63200353B27 /* MacMenubarPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 944069CD10E6B63200353B27 /* MacMenubarPlugin.c */; }; 944069CF10E6B63200353B27 /* MacMenubarPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 944069CD10E6B63200353B27 /* MacMenubarPlugin.c */; }; 944895AE10F4081300FB3EC8 /* PharoV10.sources in Resources */ = {isa = PBXBuildFile; fileRef = 944895AD10F4081300FB3EC8 /* PharoV10.sources */; }; @@ -570,6 +571,7 @@ 943001270E0D5D670040BB27 /* sqSqueakIPhoneApplication+imageReadWrite.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "sqSqueakIPhoneApplication+imageReadWrite.m"; sourceTree = "<group>"; }; 943001A30E0D600C0040BB27 /* sqSqueakIPhoneFileDirectoryInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSqueakIPhoneFileDirectoryInterface.h; sourceTree = "<group>"; }; 943001A40E0D600C0040BB27 /* sqSqueakIPhoneFileDirectoryInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sqSqueakIPhoneFileDirectoryInterface.m; sourceTree = "<group>"; }; + 94329ECA12275FFA0090298B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 944069CD10E6B63200353B27 /* MacMenubarPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MacMenubarPlugin.c; sourceTree = "<group>"; }; 944895AD10F4081300FB3EC8 /* PharoV10.sources */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PharoV10.sources; path = iPhone/PharoV10.sources; sourceTree = "<group>"; }; 9452BDC10F4095DE006410DE /* sqSqueakIPhoneApplication+Network.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sqSqueakIPhoneApplication+Network.h"; sourceTree = "<group>"; }; @@ -869,6 +871,7 @@ 947E62F710AA098300D3B69E /* SystemConfiguration.framework in Frameworks */, 942ABE6F10AA23E20086D908 /* ApplicationServices.framework in Frameworks */, 94C208F910AF7262002F4160 /* QuartzCore.framework in Frameworks */, + 94329ECB12275FFA0090298B /* OpenGL.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1001,6 +1004,7 @@ 94577FC410684D7E0020840A /* SystemConfiguration.framework */, 942ABE6E10AA23E20086D908 /* ApplicationServices.framework */, 94C208F810AF7262002F4160 /* QuartzCore.framework */, + 94329ECA12275FFA0090298B /* OpenGL.framework */, ); name = Frameworks; sourceTree = "<group>"; Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-08-28 04:28:15 UTC (rev 2264) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-08-28 04:28:39 UTC (rev 2265) @@ -302,6 +302,8 @@ <key>Layout</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -371,12 +373,12 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>181</integer> - <integer>179</integer> + <integer>182</integer> + <integer>180</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 2333}, {443, 914}}</string> + <string>{{0, 339}, {443, 914}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -397,7 +399,7 @@ <real>421</real> </array> <key>RubberWindowFrame</key> - <string>34 50 1646 973 0 0 1680 1028 </string> + <string>38 55 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> @@ -413,7 +415,7 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>SqueakOSXAppDelegate.m</string> + <string>sqSqueakOSXApplication.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -421,11 +423,11 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>SqueakOSXAppDelegate.m</string> + <string>sqSqueakOSXApplication.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>9499A91A1225C3B000022E3A</string> + <string>940C2A3F1228C78C0009E415</string> <key>history</key> <array> <string>94BCE7390DDDEF8200F38F31</string> @@ -641,7 +643,6 @@ <string>94EF6CFD11E55BAC003BA64D</string> <string>94EF6CFF11E55BAC003BA64D</string> <string>94EF6FD211E57601003BA64D</string> - <string>94EF701E11E57905003BA64D</string> <string>94EF702B11E57954003BA64D</string> <string>94EF709B11E57D20003BA64D</string> <string>94EE1DAA11E57FAB00DC6E8C</string> @@ -653,13 +654,11 @@ <string>94A3F91B11E6564F008113C6</string> <string>9441DB6E11E6805300345F6C</string> <string>9441DB6F11E6805300345F6C</string> - <string>9441DB7011E6805300345F6C</string> <string>9441DB7111E6805300345F6C</string> <string>9441DB7211E6805300345F6C</string> <string>9441DB7311E6805300345F6C</string> <string>9441DB7511E6805300345F6C</string> <string>9441DB7811E6805300345F6C</string> - <string>9441DB7A11E6805300345F6C</string> <string>9475A80511E695600010FB38</string> <string>9475A83511E6B5D50010FB38</string> <string>94D124C311E6DCD000AAF81C</string> @@ -682,7 +681,6 @@ <string>94FE723E12208E9300417A56</string> <string>94FE724012208E9300417A56</string> <string>949813161220A5A200A71D33</string> - <string>940E861D1220A67600AAB6F5</string> <string>940E86871220A79D00AAB6F5</string> <string>940E86A11220A8D200AAB6F5</string> <string>940E86A31220A8D200AAB6F5</string> @@ -701,10 +699,15 @@ <string>94E8FA3C12258ED500EECD29</string> <string>94E8FA5712258FA800EECD29</string> <string>94E8FA731225913000EECD29</string> - <string>94E8FB181225ABA900EECD29</string> <string>94E8FB6B1225BE3D00EECD29</string> <string>94E8FB6C1225BE3D00EECD29</string> - <string>942AC5E01225C266002E79AA</string> + <string>94FE45BC1225DC52005A3A8A</string> + <string>941DE77F1227996A0027D899</string> + <string>941DE7801227996A0027D899</string> + <string>94A3EDC8122842CD00DF449D</string> + <string>94C83E751228B6D10021DA2B</string> + <string>940C2A271228C6F20009E415</string> + <string>940C2A281228C6F20009E415</string> </array> </dict> <key>SplitCount</key> @@ -716,14 +719,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1181, 654}}</string> + <string>{{0, 0}, {1181, 608}}</string> <key>RubberWindowFrame</key> - <string>34 50 1646 973 0 0 1680 1028 </string> + <string>38 55 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>654pt</string> + <string>608pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -736,14 +739,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 659}, {1181, 273}}</string> + <string>{{0, 613}, {1181, 319}}</string> <key>RubberWindowFrame</key> - <string>34 50 1646 973 0 0 1680 1028 </string> + <string>38 55 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> - <string>273pt</string> + <string>319pt</string> </dict> </array> <key>Proportion</key> @@ -762,9 +765,9 @@ </array> <key>TableOfContents</key> <array> - <string>9499A90F1225C34100022E3A</string> + <string>940C29E01228C5890009E415</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>9499A9101225C34100022E3A</string> + <string>940C29E11228C5890009E415</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -885,7 +888,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>304464816.21677101</real> + <real>304662412.049927</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -900,13 +903,16 @@ <integer>5</integer> <key>WindowOrderList</key> <array> + <string>1C530D57069F1CE1000CFCEE</string> + <string>940C2A191228C6260009E415</string> + <string>940C2A1A1228C6260009E415</string> + <string>9424FF6E0DDCB226009912BF</string> <string>1CD10A99069EF8BA00B06720</string> - <string>9424FF6E0DDCB226009912BF</string> + <string>1C78EAAD065D492600B07095</string> <string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjcCOGVM.xcodeproj</string> - <string>1C530D57069F1CE1000CFCEE</string> </array> <key>WindowString</key> - <string>34 50 1646 973 0 0 1680 1028 </string> + <string>38 55 1646 973 0 0 1680 1028 </string> <key>WindowToolsV3</key> <array> <dict> @@ -927,7 +933,7 @@ <key>PBXProjectModuleGUID</key> <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> - <string></string> + <string>sqSqueakOSXScreenAndWindow.h</string> <key>StatusBarVisibility</key> <true/> </dict> @@ -985,7 +991,7 @@ <key>TableOfContents</key> <array> <string>9424FF6E0DDCB226009912BF</string> - <string>9499A9111225C34100022E3A</string> + <string>940C29E21228C5890009E415</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> @@ -996,7 +1002,7 @@ <key>WindowToolGUID</key> <string>9424FF6E0DDCB226009912BF</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -1105,13 +1111,13 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>9499A9121225C34100022E3A</string> + <string>940C29E31228C5890009E415</string> <string>1C162984064C10D400B95A72</string> - <string>9499A9131225C34100022E3A</string> - <string>9499A9141225C34100022E3A</string> - <string>9499A9151225C34100022E3A</string> - <string>9499A9161225C34100022E3A</string> - <string>9499A9171225C34100022E3A</string> + <string>940C29E41228C5890009E415</string> + <string>940C29E51228C5890009E415</string> + <string>940C29E61228C5890009E415</string> + <string>940C29E71228C5890009E415</string> + <string>940C29E81228C5890009E415</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> @@ -1138,12 +1144,14 @@ <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> - <string></string> + <string>sqSqueakOSXApplication.m</string> <key>StatusBarVisibility</key> <true/> </dict> @@ -1164,8 +1172,6 @@ <string>629pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1201,8 +1207,8 @@ <key>TableOfContents</key> <array> <string>1C530D57069F1CE1000CFCEE</string> - <string>9499A91B1225C3B000022E3A</string> - <string>9499A91C1225C3B000022E3A</string> + <string>940C2A2A1228C6F20009E415</string> + <string>940C2A2B1228C6F20009E415</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> @@ -1211,7 +1217,7 @@ <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>Identifier</key> @@ -1267,7 +1273,7 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>94E8FA4A12258ED500EECD29</string> + <string>940C2A171228C6260009E415</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> @@ -1277,7 +1283,7 @@ <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-08-28 04:28:15 UTC (rev 2264) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-08-28 04:28:39 UTC (rev 2265) @@ -24,7 +24,7 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeArchitecturePreference = armv6; - activeBuildConfigurationName = Distribution; + activeBuildConfigurationName = Debug; activeExecutable = 947E62FD10AA098300D3B69E /* SqueakPureObjc */; activeSDKPreference = macosx10.5; activeTarget = 947E626F10AA098300D3B69E /* SqueakPureObjc */; @@ -219,8 +219,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 304464660; - PBXWorkspaceStateSaveDate = 304464660; + PBXPerProjectTemplateStateSaveDate = 304661869; + PBXWorkspaceStateSaveDate = 304661869; }; perUserProjectItems = { 9402DDB610CE12A5005C2102 /* PBXTextBookmark */ = 9402DDB610CE12A5005C2102 /* PBXTextBookmark */; @@ -231,7 +231,9 @@ 9406E87110B66A74002F81F2 /* PBXTextBookmark */ = 9406E87110B66A74002F81F2 /* PBXTextBookmark */; 9406E8CC10B67499002F81F2 /* PBXTextBookmark */ = 9406E8CC10B67499002F81F2 /* PBXTextBookmark */; 940BCEBB11EC2D75007A3EE5 /* PBXTextBookmark */ = 940BCEBB11EC2D75007A3EE5 /* PBXTextBookmark */; - 940E861D1220A67600AAB6F5 /* PlistBookmark */ = 940E861D1220A67600AAB6F5 /* PlistBookmark */; + 940C2A271228C6F20009E415 /* PlistBookmark */ = 940C2A271228C6F20009E415 /* PlistBookmark */; + 940C2A281228C6F20009E415 /* PBXTextBookmark */ = 940C2A281228C6F20009E415 /* PBXTextBookmark */; + 940C2A3F1228C78C0009E415 /* PBXTextBookmark */ = 940C2A3F1228C78C0009E415 /* PBXTextBookmark */; 940E86871220A79D00AAB6F5 /* PBXTextBookmark */ = 940E86871220A79D00AAB6F5 /* PBXTextBookmark */; 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */ = 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */; 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */ = 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */; @@ -245,6 +247,8 @@ 941A331F11E63E1A004796BA /* PBXTextBookmark */ = 941A331F11E63E1A004796BA /* PBXTextBookmark */; 941A333A11E640EE004796BA /* PBXTextBookmark */ = 941A333A11E640EE004796BA /* PBXTextBookmark */; 941A33B411E64E46004796BA /* PBXTextBookmark */ = 941A33B411E64E46004796BA /* PBXTextBookmark */; + 941DE77F1227996A0027D899 /* PBXTextBookmark */ = 941DE77F1227996A0027D899 /* PBXTextBookmark */; + 941DE7801227996A0027D899 /* PBXTextBookmark */ = 941DE7801227996A0027D899 /* PBXTextBookmark */; 9421AB550FF1807D008F54E9 /* PBXTextBookmark */ = 9421AB550FF1807D008F54E9 /* PBXTextBookmark */; 94238E5E11E7B0EB004401BE /* PBXTextBookmark */ = 94238E5E11E7B0EB004401BE /* PBXTextBookmark */; 942807EE1224862A0000DCFE /* PBXTextBookmark */ = 942807EE1224862A0000DCFE /* PBXTextBookmark */; @@ -258,7 +262,6 @@ 9428BF3810BBC2ED00DAD287 /* PBXTextBookmark */ = 9428BF3810BBC2ED00DAD287 /* PBXTextBookmark */; 9428BF4F10BBCAAC00DAD287 /* PBXTextBookmark */ = 9428BF4F10BBCAAC00DAD287 /* PBXTextBookmark */; 942ABEC510AA34820086D908 /* PBXTextBookmark */ = 942ABEC510AA34820086D908 /* PBXTextBookmark */; - 942AC5E01225C266002E79AA /* PBXTextBookmark */ = 942AC5E01225C266002E79AA /* PBXTextBookmark */; 942B77330EA7E642004B266D /* PBXTextBookmark */ = 942B77330EA7E642004B266D /* PBXTextBookmark */; 942B77380EA7E642004B266D /* PBXTextBookmark */ = 942B77380EA7E642004B266D /* PBXTextBookmark */; 942B779B0EA7F2E0004B266D /* PBXTextBookmark */ = 942B779B0EA7F2E0004B266D /* PBXTextBookmark */; @@ -271,13 +274,11 @@ 9430329B10BD103B0045D33B /* PBXTextBookmark */ = 9430329B10BD103B0045D33B /* PBXTextBookmark */; 9441DB6E11E6805300345F6C /* PBXTextBookmark */ = 9441DB6E11E6805300345F6C /* PBXTextBookmark */; 9441DB6F11E6805300345F6C /* PBXTextBookmark */ = 9441DB6F11E6805300345F6C /* PBXTextBookmark */; - 9441DB7011E6805300345F6C /* PBXTextBookmark */ = 9441DB7011E6805300345F6C /* PBXTextBookmark */; 9441DB7111E6805300345F6C /* PBXTextBookmark */ = 9441DB7111E6805300345F6C /* PBXTextBookmark */; 9441DB7211E6805300345F6C /* PBXTextBookmark */ = 9441DB7211E6805300345F6C /* PBXTextBookmark */; 9441DB7311E6805300345F6C /* PBXTextBookmark */ = 9441DB7311E6805300345F6C /* PBXTextBookmark */; 9441DB7511E6805300345F6C /* PBXTextBookmark */ = 9441DB7511E6805300345F6C /* PBXTextBookmark */; 9441DB7811E6805300345F6C /* PBXTextBookmark */ = 9441DB7811E6805300345F6C /* PBXTextBookmark */; - 9441DB7A11E6805300345F6C /* PBXTextBookmark */ = 9441DB7A11E6805300345F6C /* PBXTextBookmark */; 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */ = 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */; 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */ = 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */; 9449ACA211EE4ECD00F667AC /* PBXTextBookmark */ = 9449ACA211EE4ECD00F667AC /* PBXTextBookmark */; @@ -365,7 +366,6 @@ 9494944B11E52D570019BC29 /* PBXTextBookmark */ = 9494944B11E52D570019BC29 /* PBXTextBookmark */; 94977E7C11EE46BC002BC5E9 /* PBXTextBookmark */ = 94977E7C11EE46BC002BC5E9 /* PBXTextBookmark */; 949813161220A5A200A71D33 /* PBXTextBookmark */ = 949813161220A5A200A71D33 /* PBXTextBookmark */; - 9499A91A1225C3B000022E3A /* PBXTextBookmark */ = 9499A91A1225C3B000022E3A /* PBXTextBookmark */; 949AD35211E54A81006D6BF4 /* PBXTextBookmark */ = 949AD35211E54A81006D6BF4 /* PBXTextBookmark */; 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */ = 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */; 949AD4BD11E552D7006D6BF4 /* PBXTextBookmark */ = 949AD4BD11E552D7006D6BF4 /* PBXTextBookmark */; @@ -375,6 +375,7 @@ 949F254811EC33FA00A34245 /* PBXTextBookmark */ = 949F254811EC33FA00A34245 /* PBXTextBookmark */; 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */ = 94A1B2AA10B9E92A00C64473 /* PBXTextBookmark */; 94A1B41E10BA05E600C64473 /* PBXTextBookmark */ = 94A1B41E10BA05E600C64473 /* PBXTextBookmark */; + 94A3EDC8122842CD00DF449D /* PBXTextBookmark */ = 94A3EDC8122842CD00DF449D /* PBXTextBookmark */; 94A3F91B11E6564F008113C6 /* PBXTextBookmark */ = 94A3F91B11E6564F008113C6 /* PBXTextBookmark */; 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */; 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */; @@ -398,6 +399,7 @@ 94C3696410AFB7550041953A /* PBXTextBookmark */ = 94C3696410AFB7550041953A /* PBXTextBookmark */; 94C3698D10B082DF0041953A /* PBXTextBookmark */ = 94C3698D10B082DF0041953A /* PBXTextBookmark */; 94C3699110B082DF0041953A /* PBXTextBookmark */ = 94C3699110B082DF0041953A /* PBXTextBookmark */; + 94C83E751228B6D10021DA2B /* PBXTextBookmark */ = 94C83E751228B6D10021DA2B /* PBXTextBookmark */; 94C887D410ADCC0D007CB39E /* PBXTextBookmark */ = 94C887D410ADCC0D007CB39E /* PBXTextBookmark */; 94C888B710ADE75B007CB39E /* PBXTextBookmark */ = 94C888B710ADE75B007CB39E /* PBXTextBookmark */; 94C88B6810AF26F8007CB39E /* PBXTextBookmark */ = 94C88B6810AF26F8007CB39E /* PBXTextBookmark */; @@ -466,7 +468,6 @@ 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */ = 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */; 94E8FA5712258FA800EECD29 /* PBXTextBookmark */ = 94E8FA5712258FA800EECD29 /* PBXTextBookmark */; 94E8FA731225913000EECD29 /* PBXTextBookmark */ = 94E8FA731225913000EECD29 /* PBXTextBookmark */; - 94E8FB181225ABA900EECD29 /* PBXTextBookmark */ = 94E8FB181225ABA900EECD29 /* PBXTextBookmark */; 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */ = 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */; 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */ = 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */; 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */; @@ -476,7 +477,6 @@ 94EF6CFD11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFD11E55BAC003BA64D /* PBXTextBookmark */; 94EF6CFF11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFF11E55BAC003BA64D /* PBXTextBookmark */; 94EF6FD211E57601003BA64D /* PBXTextBookmark */ = 94EF6FD211E57601003BA64D /* PBXTextBookmark */; - 94EF701E11E57905003BA64D /* PBXTextBookmark */ = 94EF701E11E57905003BA64D /* PBXTextBookmark */; 94EF702B11E57954003BA64D /* PBXTextBookmark */ = 94EF702B11E57954003BA64D /* PBXTextBookmark */; 94EF709B11E57D20003BA64D /* PBXTextBookmark */ = 94EF709B11E57D20003BA64D /* PBXTextBookmark */; 94F155570E83EA1F001657CE /* PBXTextBookmark */ = 94F155570E83EA1F001657CE /* PBXTextBookmark */; @@ -497,6 +497,7 @@ 94F89C9110B4C0B800556475 /* PBXTextBookmark */ = 94F89C9110B4C0B800556475 /* PBXTextBookmark */; 94F8E42E0DE6129D003F4F53 /* PBXTextBookmark */ = 94F8E42E0DE6129D003F4F53 /* PBXTextBookmark */; 94FAD00D11E7BDED009DD206 /* PBXTextBookmark */ = 94FAD00D11E7BDED009DD206 /* PBXTextBookmark */; + 94FE45BC1225DC52005A3A8A /* PBXTextBookmark */ = 94FE45BC1225DC52005A3A8A /* PBXTextBookmark */; 94FE71E81220876700417A56 /* PBXTextBookmark */ = 94FE71E81220876700417A56 /* PBXTextBookmark */; 94FE720B122089FC00417A56 /* PBXTextBookmark */ = 94FE720B122089FC00417A56 /* PBXTextBookmark */; 94FE723E12208E9300417A56 /* PBXTextBookmark */ = 94FE723E12208E9300417A56 /* PBXTextBookmark */; @@ -713,6 +714,38 @@ vrLen = 2243; vrLoc = 4977; }; + 940C2A271228C6F20009E415 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 949AD14911E542E8006D6BF4 /* SqueakPureObjc-InfoCOG.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleGetInfoString, + ); + name = "/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 940C2A281228C6F20009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */; + name = "sqSqueakOSXApplication.m: 249"; + rLen = 0; + rLoc = 7860; + rType = 0; + vrLen = 1349; + vrLoc = 7040; + }; + 940C2A3F1228C78C0009E415 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */; + name = "sqSqueakOSXApplication.m: 249"; + rLen = 0; + rLoc = 7873; + rType = 0; + vrLen = 1351; + vrLoc = 7017; + }; 940CE8540DFCE2D200EBA91B /* SqueakUIController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {905, 790}}"; @@ -728,17 +761,6 @@ sepNavWindowFrame = "{{15, 49}, {1346, 974}}"; }; }; - 940E861D1220A67600AAB6F5 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 949AD14911E542E8006D6BF4 /* SqueakPureObjc-InfoCOG.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = "/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist"; - rLen = 0; - rLoc = 9223372036854775808; - }; 940E86871220A79D00AAB6F5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 1D3623250D0F684500981E51 /* SqueakNoOGLIPhoneAppDelegate.m */; @@ -764,7 +786,7 @@ fRef = 947E647910AA100900D3B69E /* SqueakOSXAppDelegate.h */; name = "SqueakOSXAppDelegate.h: 49"; rLen = 8; - rLoc = 2121; + rLoc = 2151; rType = 0; vrLen = 1827; vrLoc = 645; @@ -935,11 +957,31 @@ sepNavWindowFrame = "{{15, 166}, {1288, 857}}"; }; }; + 941DE77F1227996A0027D899 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */; + name = "ObjectiveCPlugin.c: 1770"; + rLen = 0; + rLoc = 49226; + rType = 0; + vrLen = 1313; + vrLoc = 86; + }; + 941DE7801227996A0027D899 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */; + name = "sqSqueakOSXNSView.h: 34"; + rLen = 0; + rLoc = 1683; + rType = 0; + vrLen = 1981; + vrLoc = 777; + }; 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 27430}}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 27534}}"; sepNavSelRange = "{49226, 0}"; - sepNavVisRange = "{49390, 1351}"; + sepNavVisRange = "{86, 1313}"; sepNavWindowFrame = "{{710, 97}, {901, 833}}"; }; }; @@ -1433,16 +1475,6 @@ path = "/Volumes/pm/Mail/IMAP-johnmci@smalltalkconsulting.com@imap.gmail.com/[Gmail]/Sent Mail.imapmbox/Attachments/2958644/8/sqMacHostWindow.h"; sourceTree = "<absolute>"; }; - 942AC5E01225C266002E79AA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; - name = "SqueakOSXAppDelegate.m: 78"; - rLen = 0; - rLoc = 3104; - rType = 0; - vrLen = 1488; - vrLoc = 2422; - }; 942B77300EA7E642004B266D /* interp.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -1717,16 +1749,6 @@ vrLen = 2137; vrLoc = 5230; }; - 9441DB7011E6805300345F6C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */; - name = "sqSqueakOSXApplication.m: 262"; - rLen = 13; - rLoc = 8195; - rType = 0; - vrLen = 1962; - vrLoc = 6398; - }; 9441DB7111E6805300345F6C /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D5D80E044A9D000AD792 /* Queue.m */; @@ -1777,16 +1799,6 @@ vrLen = 2666; vrLoc = 947; }; - 9441DB7A11E6805300345F6C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; - name = "sqSqueakOSXNSView.m: 529"; - rLen = 2; - rLoc = 19260; - rType = 0; - vrLen = 1841; - vrLoc = 18350; - }; 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94E659140DDD03FE00358328 /* SoundGenerationPlugin.c */; @@ -1848,7 +1860,7 @@ ignoreCount = 0; lineNumber = 64; location = Squeak; - modificationTime = 304463420.339047; + modificationTime = 304662255.905671; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2007,10 +2019,10 @@ }; 9452D6070E044D2F000AD792 /* sqSqueakEventsAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1538, 1300}}"; + sepNavIntBoundsRect = "{{0, 0}, {1538, 1118}}"; sepNavSelRange = "{2120, 30}"; - sepNavVisRange = "{1307, 2218}"; - sepNavWindowFrame = "{{36, 4}, {1012, 1015}}"; + sepNavVisRange = "{690, 2332}"; + sepNavWindowFrame = "{{668, 4}, {1012, 1015}}"; }; }; 9452D7630E0452D3000AD792 /* sqiPhoneScreenAndWindow.h */ = { @@ -2265,7 +2277,7 @@ ignoreCount = 0; lineNumber = 101; location = Squeak; - modificationTime = 304463420.065413; + modificationTime = 304662255.678706; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2298,7 +2310,7 @@ ignoreCount = 0; lineNumber = 37; location = Squeak; - modificationTime = 304463420.0877531; + modificationTime = 304662255.72459; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2315,7 +2327,7 @@ ignoreCount = 0; lineNumber = 45; location = Squeak; - modificationTime = 304463420.145815; + modificationTime = 304662255.748367; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2332,7 +2344,7 @@ ignoreCount = 0; lineNumber = 50; location = Squeak; - modificationTime = 304463420.168305; + modificationTime = 304662255.793859; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2349,7 +2361,7 @@ ignoreCount = 0; lineNumber = 72; location = Squeak; - modificationTime = 304463420.228368; + modificationTime = 304662255.815886; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2366,7 +2378,7 @@ ignoreCount = 0; lineNumber = 88; location = Squeak; - modificationTime = 304463420.267176; + modificationTime = 304662255.865148; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2410,7 +2422,7 @@ hitCount = 0; ignoreCount = 0; lineNumber = 31; - modificationTime = 304463582.434054; + modificationTime = 304662349.994016; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2426,7 +2438,7 @@ hitCount = 0; ignoreCount = 0; lineNumber = 24; - modificationTime = 304463582.433993; + modificationTime = 304662349.99407; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2442,7 +2454,7 @@ hitCount = 0; ignoreCount = 0; lineNumber = 17; - modificationTime = 304463582.434035; + modificationTime = 304662349.99405; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -3374,33 +3386,33 @@ }; 947E647910AA100900D3B69E /* SqueakOSXAppDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 767}}"; - sepNavSelRange = "{2121, 8}"; - sepNavVisRange = "{645, 1827}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 767}}"; + sepNavSelRange = "{1850, 0}"; + sepNavVisRange = "{782, 1690}"; sepNavWindowFrame = "{{522, 48}, {1017, 978}}"; }; }; 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 2483}}"; - sepNavSelRange = "{3420, 0}"; - sepNavVisRange = "{2475, 1373}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 2496}}"; + sepNavSelRange = "{3115, 12}"; + sepNavVisRange = "{2551, 1299}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; 947E64CA10AA16FE00D3B69E /* sqSqueakOSXApplication.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1379, 891}}"; - sepNavSelRange = "{1983, 53}"; - sepNavVisRange = "{0, 2397}"; + sepNavSelRange = "{2392, 22}"; + sepNavVisRange = "{0, 2419}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1327, 3523}}"; - sepNavSelRange = "{4181, 0}"; - sepNavVisRange = "{3438, 1384}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 3679}}"; + sepNavSelRange = "{7873, 0}"; + sepNavVisRange = "{7017, 1351}"; sepNavWindowFrame = "{{522, 48}, {1017, 978}}"; }; }; @@ -3834,9 +3846,9 @@ }; 9494932E11E527180019BC29 /* sqUnixVMProfile.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 5304}}"; - sepNavSelRange = "{3180, 9}"; - sepNavVisRange = "{2500, 1312}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 5057}}"; + sepNavSelRange = "{7363, 3}"; + sepNavVisRange = "{6688, 1339}"; sepNavWindowFrame = "{{15, 4}, {1573, 1024}}"; }; }; @@ -3933,16 +3945,6 @@ vrLen = 2328; vrLoc = 2495; }; - 9499A91A1225C3B000022E3A /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; - name = "SqueakOSXAppDelegate.m: 90"; - rLen = 0; - rLoc = 3420; - rType = 0; - vrLen = 1373; - vrLoc = 2475; - }; 949AD35211E54A81006D6BF4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9424FF660DDCB1EF009912BF /* sqConfig.h */; @@ -4134,10 +4136,10 @@ }; 94A1B0060E0DBE2400EB5EFC /* sqSqueakMainApplication+events.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 845}}"; - sepNavSelRange = "{1935, 15}"; - sepNavVisRange = "{710, 1460}"; - sepNavWindowFrame = "{{38, 17}, {847, 985}}"; + sepNavIntBoundsRect = "{{0, 0}, {838, 988}}"; + sepNavSelRange = "{1893, 11}"; + sepNavVisRange = "{0, 2694}"; + sepNavWindowFrame = "{{357, 22}, {847, 985}}"; }; }; 94A1B02B0E0DC10D00EB5EFC /* sqSqueakSoundAPI.h */ = { @@ -4243,6 +4245,16 @@ sepNavVisRange = "{1158, 1564}"; }; }; + 94A3EDC8122842CD00DF449D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */; + name = "sqSqueakOSXNSView.m: 174"; + rLen = 0; + rLoc = 5911; + rType = 0; + vrLen = 1913; + vrLoc = 5772; + }; 94A3F91B11E6564F008113C6 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 949492C311E51C6B0019BC29 /* sqExternalSemaphores.c */; @@ -4505,9 +4517,9 @@ }; 94BCAD1C10AB942300F87527 /* sqSqueakOSXApplication+attributes.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 1833}}"; - sepNavSelRange = "{3050, 0}"; - sepNavVisRange = "{2495, 2328}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 1898}}"; + sepNavSelRange = "{2997, 3}"; + sepNavVisRange = "{2570, 2144}"; sepNavWindowFrame = "{{15, 45}, {1017, 978}}"; }; }; @@ -4688,17 +4700,17 @@ }; 94C2068810AF4F53002F4160 /* sqSqueakOSXNSView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1279, 1157}}"; - sepNavSelRange = "{2615, 10}"; - sepNavVisRange = "{777, 2940}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 1079}}"; + sepNavSelRange = "{1683, 0}"; + sepNavVisRange = "{777, 1981}"; sepNavWindowFrame = "{{15, 13}, {1326, 1010}}"; }; }; 94C2068910AF4F53002F4160 /* sqSqueakOSXNSView.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1629, 8723}}"; - sepNavSelRange = "{19260, 2}"; - sepNavVisRange = "{18350, 1841}"; + sepNavIntBoundsRect = "{{0, 0}, {1244, 10400}}"; + sepNavSelRange = "{5911, 0}"; + sepNavVisRange = "{5688, 1950}"; sepNavWindowFrame = "{{10, 7}, {1076, 1021}}"; }; }; @@ -4983,9 +4995,9 @@ }; 94C36A9310B09EE70041953A /* sqSqueakOSXApplication+events.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1533, 4810}}"; - sepNavSelRange = "{8852, 5}"; - sepNavVisRange = "{8007, 1415}"; + sepNavIntBoundsRect = "{{0, 0}, {1412, 4836}}"; + sepNavSelRange = "{5019, 0}"; + sepNavVisRange = "{4158, 1947}"; sepNavWindowFrame = "{{15, 4}, {1131, 1019}}"; }; }; @@ -5023,6 +5035,16 @@ sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; + 94C83E751228B6D10021DA2B /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9494932E11E527180019BC29 /* sqUnixVMProfile.c */; + name = "sqUnixVMProfile.c: 286"; + rLen = 3; + rLoc = 7363; + rType = 0; + vrLen = 1339; + vrLoc = 6688; + }; 94C887D410ADCC0D007CB39E /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94C887D510ADCC0D007CB39E /* NSThread.h */; @@ -5084,9 +5106,9 @@ }; 94C88BDD10AF3C52007CB39E /* sqSqueakOSXScreenAndWindow.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 676}}"; - sepNavSelRange = "{1951, 23}"; - sepNavVisRange = "{0, 2111}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 676}}"; + sepNavSelRange = "{965, 0}"; + sepNavVisRange = "{279, 1758}"; sepNavWindowFrame = "{{15, 4}, {1392, 1019}}"; }; }; @@ -6826,7 +6848,7 @@ ignoreCount = 0; lineNumber = 177; location = Squeak; - modificationTime = 304463420.3648299; + modificationTime = 304662255.943404; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -6854,7 +6876,7 @@ ignoreCount = 0; lineNumber = 191; location = Squeak; - modificationTime = 304463420.461111; + modificationTime = 304662255.976804; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -6868,16 +6890,6 @@ vrLen = 1411; vrLoc = 5596; }; - 94E8FB181225ABA900EECD29 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */; - name = "ObjectiveCPlugin.c: 1770"; - rLen = 0; - rLoc = 49226; - rType = 0; - vrLen = 1351; - vrLoc = 49390; - }; 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D5E40E044A9D000AD792 /* sqSqueakMainApplication.m */; @@ -6997,16 +7009,6 @@ vrLen = 1976; vrLoc = 4742; }; - 94EF701E11E57905003BA64D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494932E11E527180019BC29 /* sqUnixVMProfile.c */; - name = "sqUnixVMProfile.c: 308"; - rLen = 34; - rLoc = 7993; - rType = 0; - vrLen = 1246; - vrLoc = 0; - }; 94EF702B11E57954003BA64D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 942F761C0E0B6B6100848BF2 /* sqSqueakIPhoneApplication.m */; @@ -7333,6 +7335,16 @@ vrLen = 2027; vrLoc = 0; }; + 94FE45BC1225DC52005A3A8A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; + name = "SqueakOSXAppDelegate.m: 78"; + rLen = 12; + rLoc = 3115; + rType = 0; + vrLen = 1299; + vrLoc = 2551; + }; 94FE71E81220876700417A56 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9403774E121D9C5200ECC885 /* interp.c */; Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-08-28 04:28:15 UTC (rev 2264) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-08-28 04:28:39 UTC (rev 2265) @@ -37,6 +37,7 @@ 942ABE6F10AA23E20086D908 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 942ABE6E10AA23E20086D908 /* ApplicationServices.framework */; }; 942F75D30E0B67AD00848BF2 /* sqSqueakVmAndImagePathAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 942F75D20E0B67AD00848BF2 /* sqSqueakVmAndImagePathAPI.m */; }; 942F76320E0B6C7600848BF2 /* sqSqueakMainApplication+attributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 942F76310E0B6C7600848BF2 /* sqSqueakMainApplication+attributes.m */; }; + 9432A3831227937C0090298B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432A3821227937C0090298B /* OpenGL.framework */; }; 944069CF10E6B63200353B27 /* MacMenubarPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 944069CD10E6B63200353B27 /* MacMenubarPlugin.c */; }; 944895AE10F4081300FB3EC8 /* PharoV10.sources in Resources */ = {isa = PBXBuildFile; fileRef = 944895AD10F4081300FB3EC8 /* PharoV10.sources */; }; 9452D5E50E044A9D000AD792 /* Queue.m in Sources */ = {isa = PBXBuildFile; fileRef = 9452D5D80E044A9D000AD792 /* Queue.m */; }; @@ -431,6 +432,7 @@ 943001270E0D5D670040BB27 /* sqSqueakIPhoneApplication+imageReadWrite.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "sqSqueakIPhoneApplication+imageReadWrite.m"; sourceTree = "<group>"; }; 943001A30E0D600C0040BB27 /* sqSqueakIPhoneFileDirectoryInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSqueakIPhoneFileDirectoryInterface.h; sourceTree = "<group>"; }; 943001A40E0D600C0040BB27 /* sqSqueakIPhoneFileDirectoryInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sqSqueakIPhoneFileDirectoryInterface.m; sourceTree = "<group>"; }; + 9432A3821227937C0090298B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 944069CD10E6B63200353B27 /* MacMenubarPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MacMenubarPlugin.c; sourceTree = "<group>"; }; 944895AD10F4081300FB3EC8 /* PharoV10.sources */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PharoV10.sources; path = iPhone/PharoV10.sources; sourceTree = "<group>"; }; 9452BDC10F4095DE006410DE /* sqSqueakIPhoneApplication+Network.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sqSqueakIPhoneApplication+Network.h"; sourceTree = "<group>"; }; @@ -746,6 +748,7 @@ 947E62F710AA098300D3B69E /* SystemConfiguration.framework in Frameworks */, 942ABE6F10AA23E20086D908 /* ApplicationServices.framework in Frameworks */, 94C208F910AF7262002F4160 /* QuartzCore.framework in Frameworks */, + 9432A3831227937C0090298B /* OpenGL.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -865,6 +868,7 @@ 94577FC410684D7E0020840A /* SystemConfiguration.framework */, 942ABE6E10AA23E20086D908 /* ApplicationServices.framework */, 94C208F810AF7262002F4160 /* QuartzCore.framework */, + 9432A3821227937C0090298B /* OpenGL.framework */, ); name = Frameworks; sourceTree = "<group>";

1 0

[commit] r2264 - iOS
by commits＠squeakvm.org 28 Aug '10

28 Aug '10

Author: johnmci Date: 2010-08-27 21:28:15 -0700 (Fri, 27 Aug 2010) New Revision: 2264 Modified: trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.h trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m trunk/platforms/iOS/vm/Info-iPhone.plist trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m trunk/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m trunk/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m trunk/platforms/iOS/vm/SqueakPureObjc-Info 64*64.plist trunk/platforms/iOS/vm/SqueakPureObjc-Info.plist trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c trunk/platforms/iOS/vm/iPhone/sqPlatformSpecific.h Log: iOS The two major changes are: (a) We move to open/GL for drawing on os-x, this takes us from 29 to 40 fps . (b) We move to a single thread to avoid issues with FFI & Objective-C plugin calls sqSqueakScreenAndWindow.m sqSqueakOSXScreenAndWindow.m move ioForceDisplayUpdateActual logic to subclasses sqSqueakMainApplication+events..m/h sqSqueakOSXApplication+events.m/h sqSqueakOSXApplication.m/h Add pumpRunLoop by subclass for single threaded model. sqSqueakEventsAPI.m Add pumpRunLoop call sqSqueakOSXNSView.h/m Move to OpenGL fix for CNTRL-ARROW keys left/right sqSqueakOSXApplication+attributes.m version number changes SqueakOSXAppDelegate.m add singleThreadStart sqAllocateMemoryMac.c first two ignored parms were wrong. sqSqueakFileDirectoryInterface.m sqSqueakMainApplication+imageReadWrite.m sqSqueakOSXScreenAndWindow.h sqMacUnixExternalPrims.m SqueakOSXAppDelegate.h cleanup of warning messages Modified: trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m =================================================================== --- trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -272,6 +272,7 @@ return; //NSLog(@"%i sound stop force",ioMSecs()); OSStatus result = AudioQueueStop (self.outputAudioQueue,true); //This implicitly invokes AudioQueueReset +#pragma unused(result) } @@ -282,6 +283,7 @@ [self snd_Stop]; OSStatus result = AudioQueueDispose (self.outputAudioQueue,true); +#pragma unused(result) self.outputAudioQueue = nil; self.soundOutQueue = [Queue new]; return 1; Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -56,25 +56,11 @@ if ([getMainWindowDelegate() forceUpdateFlush]) { [getMainWindowDelegate() ioForceDisplayUpdate]; } - /* This the carbon logic model - described by http://developer.apple.com/qa/qa2001/qa1061.html - but fails on device, bug tracking number 5971848 */ - -/* extern struct VirtualMachine* interpreterProxy; + if (interpreterProxy->methodPrimitiveIndex() != 0) { - // limitDateForMode: - - BOOL processedEvent; - // NSDate *now = [[NSDate alloc] init]; - NSDate *now = [[NSDate alloc] initWithTimeIntervalSinceNow: 0.500]; - //processedEvent = [[NSRunLoop mainRunLoop] runMode: NSDefaultRunLoopMode beforeDate: now]; - - //[now release]; - [[NSRunLoop mainRunLoop] runUntilDate: now]; - [now release]; - } */ + [gDelegateApp.squeakApplication pumpRunLoop]; + } - if (gQuitNowRightNow) { ioExit(); //This might not return, might call exittoshell } Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -62,6 +62,7 @@ isDirectory: (sqInt *) isDirectory sizeIfFile: (squeakFileOffsetType *) sizeIfFile { #warning this is not implementation + return 0; } Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.h =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.h 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.h 2010-08-28 04:28:15 UTC (rev 2264) @@ -41,4 +41,5 @@ @interface sqSqueakMainApplication (events) - (void) ioGetNextEvent: (sqInputEvent *) evt; - (void) processAsOldEventOrComplexEvent: (id) event placeIn: (sqInputEvent *) evt; +- (void) pumpRunLoop; @end Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+events.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -40,6 +40,21 @@ @implementation sqSqueakMainApplication (events) +- (void) pumpRunLoop { + + /* This the carbon logic model + described by http://developer.apple.com/qa/qa2001/qa1061.html + but fails on device, bug tracking number 5971848 */ + + NSRunLoop *theRL = [NSRunLoop mainRunLoop]; + BOOL result = [theRL runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]]; + + // while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, TRUE) == kCFRunLoopRunHandledSource); + + // TEST WHICH IS BETTER? SInt32 what = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true); +#pragma unused(result) +} + - (void) ioGetNextEvent: (sqInputEvent *) evt { ioProcessEvents(); Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+imageReadWrite.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -52,7 +52,6 @@ return NO; } f = sqImageFileOpen(characterPathForImage, "rb"); - #warning sqGetAvailableMemory returns unsigned but readImageFromFileHeapSizeStartingAt is wrong readImageFromFileHeapSizeStartingAt(f, sqGetAvailableMemory(), (squeakFileOffsetType) 0); //This is a VM Callback sqImageFileClose(f); [pool drain]; Modified: trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m =================================================================== --- trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -108,8 +108,6 @@ } - (void) ioForceDisplayUpdateActual { - self.forceUpdateFlush = NO; - [[self getMainView] performSelectorOnMainThread: @selector(drawThelayers) withObject: nil waitUntilDone: YES]; } - (void) ioForceDisplayUpdate { Modified: trunk/platforms/iOS/vm/Info-iPhone.plist =================================================================== --- trunk/platforms/iOS/vm/Info-iPhone.plist 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/Info-iPhone.plist 2010-08-28 04:28:15 UTC (rev 2264) @@ -19,11 +19,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.3.1</string> + <string>2.3.2</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> - <string>2.3.1</string> + <string>2.3.2</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSMainNibFile</key> Modified: trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m =================================================================== --- trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -56,21 +56,8 @@ self.checkForFileNameOnFirstParm = YES; } -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - NSAutoreleasePool * pool = [NSAutoreleasePool new]; - gDelegateApp = self; - squeakApplication = [self makeApplicationInstance]; - sqSqueakOSXScreenAndWindow *windowHandler = [sqSqueakOSXScreenAndWindow new]; - windowHandler.mainViewOnWindow = self.mainView; - self.mainView.windowLogic = windowHandler; - windowHandler.windowIndex = 1; - [windowHandler.mainViewOnWindow initializeVariables]; - self.window.delegate = windowHandler; - - [self.squeakApplication setupEventQueue]; - +- (void) workerThreadStart { // Run the squeak process in a worker thread - NSThread* myThread = [[NSThread alloc] initWithTarget: self.squeakApplication selector: @selector(runSqueak) object:nil]; @@ -79,19 +66,34 @@ #endif [myThread start]; +} +- (void) singleThreadStart { /* This the carbon logic model described by http://developer.apple.com/qa/qa2001/qa1061.html */ - -/* [[NSRunLoop mainRunLoop] performSelector: @selector(runSqueak) - target: self.squeakApplication - argument: nil - order: 1 - modes: [NSArray arrayWithObject: NSDefaultRunLoopMode]]; -*/ + target: self.squeakApplication + argument: nil + order: 1 + modes: [NSArray arrayWithObject: NSDefaultRunLoopMode]]; +} + +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { + NSAutoreleasePool * pool = [NSAutoreleasePool new]; + gDelegateApp = self; + squeakApplication = [self makeApplicationInstance]; + sqSqueakOSXScreenAndWindow *windowHandler = [sqSqueakOSXScreenAndWindow new]; + windowHandler.mainViewOnWindow = self.mainView; + self.mainView.windowLogic = windowHandler; + windowHandler.windowIndex = 1; + [windowHandler.mainViewOnWindow initializeVariables]; + self.window.delegate = windowHandler; + + [self.squeakApplication setupEventQueue]; + [self singleThreadStart]; +// [self workerThreadStart]; [pool drain]; @@ -113,17 +115,16 @@ resetFrame.size.width = width; resetFrame.size.height = height; [gDelegateApp.window setAcceptsMouseMovedEvents: YES]; - [gDelegateApp.window useOptimizedDrawing: YES]; + [gDelegateApp.window useOptimizedDrawing: NO]; [gDelegateApp.window setTitle: [[self.squeakApplication.imageNameURL path] lastPathComponent]]; [gDelegateApp.window setRepresentedURL: self.squeakApplication.imageNameURL]; [gDelegateApp.window setInitialFirstResponder: gDelegateApp.mainView]; [gDelegateApp.window setShowsResizeIndicator: NO]; extern sqInt getFullScreenFlag(void); - #if (SQ_VI_BYTES_PER_WORD == 4) NSPanel *panel; if (sizeof(void*) == 8) { - panel= NSGetAlertPanel(@"About this Alpha Version of Cocoa Squeak 64/32 bits 5.7b2 (20)", + panel= NSGetAlertPanel(@"About this Alpha Version of Cocoa Squeak 64/32 bits 5.7b3 (21)", @"Only use this VM for testing, it lacks mac menu integration.", @"Dismiss", nil, @@ -137,13 +138,13 @@ #endif NSPanel *panel; if (sizeof(long) == 8) { - panel= NSGetAlertPanel(@"About this Alpha Version of Cocoa Squeak 64/64 bits 5.7b2 (20)", + panel= NSGetAlertPanel(@"About this Alpha Version of Cocoa Squeak 64/64 bits 5.7b3 (21)", @"Only use this VM for testing, it lacks mac menu integration.", @"Dismiss", nil, nil); } else { - panel= NSGetAlertPanel(@"About this Alpha Version of Cocoa Squeak 32/64 bits 5.7b2 (20)", + panel= NSGetAlertPanel(@"About this Alpha Version of Cocoa Squeak 32/64 bits 5.7b3 (21)", @"Only use this VM for testing, it lacks mac menu integration.", @"Dismiss", nil, @@ -180,6 +181,7 @@ OSErr err = LSOpenFromURLSpec(&launchSpec, NULL); // NSLog(@"error %i",err); +#pragma unused(err) } } Modified: trunk/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -205,6 +205,7 @@ if (!systemFolder) { struct FSRef frameworksFolderRef; OSErr err = FSFindFolder(kSystemDomain, kFrameworksFolderType, false, &frameworksFolderRef); +#pragma unused(err) NSURL *myURLRef = (NSURL *) CFURLCreateFromFSRef(kCFAllocatorDefault, &frameworksFolderRef); systemFolder = [[myURLRef path] retain]; CFRelease(myURLRef); Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -82,11 +82,13 @@ #if (SQ_VI_BYTES_PER_WORD == 4) #if STACKVM - return "Mac Cocoa Cog 5.8b3 21-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; + return "Mac Cocoa Cog 5.8b4 27-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; +// return "Mac Cocoa Cog 5.8b3 21-Aug-10 >5954D562-FB39-4195-9D19-EBB49FAECCF7<"; // return "Mac Cocoa Cog 5.8b2 08-Jul-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; // return "Mac Cocoa Cog 5.8b1 07-Jul-10 >529F6B5A-DC81-4C1F-81B6-3D99741B954A<"; #else - return "Mac Cocoa 5.7b2 08-Jul-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; + return "Mac Cocoa 5.7b3 27-Aug-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; +// return "Mac Cocoa 5.7b2 08-Jul-10 >7BCAB029-A835-4D12-946D-4AB7083D2955<"; // return "Mac Cocoa 5.7b1 15-Jun-10 >34286DE5-3BD3-40D8-9700-4C41C772B16B<"; #endif // return "Mac Cocoa 5.7b1 15-Jun-10 >34286DE5-3BD3-40D8-9700-4C41C772B16B<"; Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h 2010-08-28 04:28:15 UTC (rev 2264) @@ -36,6 +36,7 @@ */ // #import "sqSqueakOSXApplication.h" +#import "sqSqueakMainApplication+events.h" #import "sqSqueakOSXNSView.h" @interface sqSqueakOSXApplication (events) Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -106,6 +106,34 @@ @implementation sqSqueakOSXApplication (events) +- (void) pumpRunLoop { + [super pumpRunLoop]; + + NSEvent *event; + while (event = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: nil inMode: NSEventTrackingRunLoopMode dequeue: YES]) + [NSApp sendEvent: event]; + + + /* + http://www.cocoabuilder.com/archive/cocoa/228473-receiving-user-events-from… + The reason you have to do this and can't just run the runloop is + because the event loop is actually a separate concept from the + runloop. It's a bit confusing because the event loop is implemented + using the runloop, but if you just run the runloop on the main thread, + events won't get processed. You have to explicitly run this in order + to get them to be processed. + + Note that using the default runloop mode with this is generally a bad + idea. By running in the default mode you allow *everything* else to + run, which means that some other code might decide that *it* wants an + inner event loop as well. If you then want to quit before that other + code has finished, tough cookies. Much better to control things more + tightly by using a different runloop mode. + + */ + +} + - (void ) processAsOldEventOrComplexEvent: (id) event placeIn: (sqInputEvent *) evt { if ([[event objectAtIndex: 0] intValue] == 1) { [(NSData *)[event objectAtIndex: 1] getBytes: evt length: sizeof(sqInputEvent)]; Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2010-08-28 04:28:15 UTC (rev 2264) @@ -55,5 +55,5 @@ - (void) printUsage; - (void) printUsageNotes; - (BOOL)isImageFile:(NSString *)filePath; - +- (void) pumpRunLoop; @end Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.h 2010-08-28 04:28:15 UTC (rev 2264) @@ -43,7 +43,7 @@ @class sqSqueakOSXScreenAndWindow; #import "sq.h" -@interface sqSqueakOSXNSView : NSView <NSTextInputClient> { +@interface sqSqueakOSXNSView : NSOpenGLView <NSTextInputClient> { sqSqueakOSXScreenAndWindow *windowLogic; NSTrackingRectTag squeakTrackingRectForCursor; NSRange inputMark; @@ -56,11 +56,6 @@ NSMutableArray* dragItems; CGDisplayFadeReservationToken fadeToken; NSRect savedScreenBoundsAtTimeOfFullScreen; - CALayer *myLayer[4][4]; - BOOL dirty[4][4]; - CGRect frameForQuartz[4][4]; - CGFloat dividedWidth; - CGFloat dividedHeight; CGColorSpaceRef colorspace; unsigned int* colorMap32; } @@ -83,6 +78,8 @@ - (NSUInteger) countNumberOfNoneSqueakImageFilesInDraggedFiles: (id<NSDraggingInfo>)info; - (NSMutableArray *) filterOutSqueakImageFilesFromDraggedFiles: (id<NSDraggingInfo>)info; - (NSMutableArray *) filterSqueakImageFilesFromDraggedFiles: (id<NSDraggingInfo>)info; +-(void)setupOpenGL; +- (void) drawThelayers; @end #import "SqViewClut.h" Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -49,81 +49,40 @@ extern SqueakOSXAppDelegate *gDelegateApp; extern struct VirtualMachine* interpreterProxy; -@implementation sqSqueakOSXNSView -@synthesize squeakTrackingRectForCursor,lastSeenKeyBoardStrokeDetails, -lastSeenKeyBoardModifierDetails,dragInProgress,dragCount,dragItems,windowLogic,savedScreenBoundsAtTimeOfFullScreen; - static NSString *stringWithCharacter(unichar character) { return [NSString stringWithCharacters: &character length: 1]; } +@implementation sqSqueakOSXNSView +@synthesize squeakTrackingRectForCursor,lastSeenKeyBoardStrokeDetails, +lastSeenKeyBoardModifierDetails,dragInProgress,dragCount,dragItems,windowLogic,savedScreenBoundsAtTimeOfFullScreen; -static void MyProviderReleaseData ( - void *info, - const void *data, - size_t size - ) { - free((void*)data); ++ (NSOpenGLPixelFormat *)defaultPixelFormat { + NSOpenGLPixelFormatAttribute attrs[] = + { + NSOpenGLPFAAccelerated, + NSOpenGLPFANoRecovery, + 0 + }; + return[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]; } -- (void) initializeVariables { +- (void)awakeFromNib { + self = [self initWithFrame: self.frame pixelFormat: [[self class] defaultPixelFormat] ]; inputMark = NSMakeRange(NSNotFound, 0); inputSelection = NSMakeRange(0, 0); [self registerForDraggedTypes: [NSArray arrayWithObjects: NSFilenamesPboardType, nil]]; -// NSLog(@"registerForDraggedTypes"); + // NSLog(@"registerForDraggedTypes"); dragInProgress = NO; dragCount = 0; dragItems = NULL; colorspace = CGColorSpaceCreateDeviceRGB(); - [self setWantsLayer:YES]; [self initializeSqueakColorMap]; } -- (void)setFrameSize:(NSSize)newSize { - [super setFrameSize: newSize]; - - int dividedWidthInteger = dividedWidth = (newSize.width/4.0); - int dividedHeightInteger= dividedHeight = (newSize.height/4.0); - - int lastTileWidth = newSize.width - dividedWidthInteger*3; - int lastTileHeight = newSize.height - dividedHeightInteger*3; - - CALayer *setupLayer = [CALayer layer]; - [setupLayer setOpaque: YES]; - setupLayer.frame = CGRectMake(0.0f,0.0f, newSize.width, newSize.height); - [self setLayer: setupLayer]; - - int h,v; - for (v=0;v<4;v++) { - for (h=0;h<4;h++) { - setupLayer = [CALayer layer]; - [setupLayer setOpaque: YES]; - - CGFloat usableWidth = dividedWidthInteger; - CGFloat usableHeight = dividedHeightInteger; - if (v == 0) - usableHeight = lastTileHeight; - if (h == 3) - usableWidth = lastTileWidth; - - setupLayer.frame = frameForQuartz[v][h] = CGRectMake(dividedWidthInteger*h,dividedHeightInteger*(3-v), usableWidth, usableHeight); -// NSLog(@" vhxywh %i %i %f %f %f %f",v,h,setupLayer.frame.origin.x,setupLayer.frame.origin.y,setupLayer.frame.size.width,setupLayer.frame.size.height); - [self.layer addSublayer: setupLayer]; - myLayer[v][h] = setupLayer; - dirty[v][h] = NO; - } - } +- (void) initializeVariables { } -- (id)initWithFrame:(NSRect)frame { - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - [self initializeVariables]; - } - return self; -} - - (void) dealloc { [super dealloc]; free(colorMap32); @@ -165,105 +124,149 @@ [((sqSqueakOSXApplication*) gDelegateApp.squeakApplication).squeakCursor performSelectorOnMainThread: @selector(set) withObject: nil waitUntilDone: NO]; } -/* - if (depth == 32) { - return [super createImageFrom: dispBitsIndex - depth: depth - colorspace: colorspace - pitch: pitch - affectedT: affectedT - affectedB: affectedB - affectedL: affectedL - affectedR: affectedR - height: height - width: width]; - } else { - return [[self getMainView] computeBitmapFromBitsIndex: dispBitsIndex - width:width - height:height - depth:depth - left:affectedL - right:affectedR - top:affectedT - bottom:affectedB]; - } +- (void) drawImageUsingClip: (CGRect) clip { + NSRect what = *(NSRect *) &clip; + [self setNeedsDisplayInRect: what]; +} - */ +- (void) drawThelayers { + if([[self window] viewsNeedDisplay]) { + [self displayIfNeeded]; +// NSLog(@"drawTheLayers flushHappened"); + glFinish(); + } + if (!firstDrawCompleted) { + firstDrawCompleted = YES; + if (getFullScreenFlag() == 0) + [self.window makeKeyAndOrderFront: self]; + } +} - -- (CGImageRef) createImageFrom: (void *) dispBitsIndex affectedT: (int) affectedT affectedB: (int) affectedB affectedL: (int) affectedL - affectedR: (int) affectedR height: (int) height width: (int) width { - const size_t depth = 32; - void *tempMemory; +-(void)setupOpenGL { + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + glClearColor(1.0, 1.0, 1.0, 1.0); + glColor4f(1.0, 1.0, 1.0, 1.0); + glDisable(GL_TEXTURE_2D); - size_t pitch = ((((width)*(depth) + 31) >> 5) << 2); + glDisable(GL_DITHER); + glDisable(GL_ALPHA_TEST); + glDisable(GL_BLEND); + glDisable(GL_STENCIL_TEST); + glDisable(GL_FOG); + glDisable(GL_TEXTURE_2D); + glDisable(GL_DEPTH_TEST); + glPixelZoom(1.0,1.0); - size_t totalSize = pitch * (affectedB-affectedT)-affectedL*4; - tempMemory = malloc(totalSize); - memcpy(tempMemory,(void*)dispBitsIndex+ pitch*affectedT + affectedL*4,totalSize); - CGDataProviderRef provider = CGDataProviderCreateWithData (NULL,tempMemory,(size_t) totalSize,MyProviderReleaseData); + glEnable(GL_TEXTURE_RECTANGLE_ARB); + glEnable(GL_UNPACK_CLIENT_STORAGE_APPLE); + glEnable(GL_APPLE_texture_range); + glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_PRIORITY, 0.0); + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + glTexParameteri(GL_APPLE_texture_range, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE); + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); +} + +- (void)loadTexturesFrom: (void*) lastBitsIndex subRectangle: (NSRect) subRect { + static int first=YES; + + NSRect r=[self frame]; + [[self openGLContext] makeCurrentContext]; + [[self openGLContext] update]; + if(!first) { + GLuint dt = 1; + glDeleteTextures(1, &dt); + } + + glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 1); + + glViewport( subRect.origin.x,subRect.origin.y, subRect.size.width,subRect.size.height ); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); - CGImageRef image = CGImageCreate((size_t) affectedR-affectedL,(size_t) affectedB-affectedT, (size_t) 8 /* bitsPerComponent */, - (size_t) depth /* bitsPerPixel */, - (size_t) pitch, colorspace, - (CGBitmapInfo) kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host , - provider, NULL, (bool) 0, kCGRenderingIntentDefault); + glPixelStorei( GL_UNPACK_ROW_LENGTH, r.size.width ); + char *subimg = ((char*)lastBitsIndex) + (unsigned int)(subRect.origin.x + (r.size.height-subRect.origin.y-subRect.size.height)*r.size.width)*4; + glTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, subRect.size.width, subRect.size.height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, subimg ); + glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); +// NSLog(@" draw %f %f %f %f",subRect.origin.x,subRect.origin.y,subRect.size.width,subRect.size.height); - CGDataProviderRelease(provider); -// NSLog(@"cif pitch %i T %i L %i B %i R %i h %i w %i",pitch,affectedT,affectedL,affectedB,affectedR,height,width); - return image; } +-(void)defineQuad:(NSRect)r +{ + glBegin(GL_QUADS); + glTexCoord2f(0.0f, 0.0f); glVertex2f(-1.0f, 1.0f); + glTexCoord2f(0.0f, r.size.height); glVertex2f(-1.0f, -1.0f); + glTexCoord2f(r.size.width, r.size.height); glVertex2f(1.0f, -1.0f); + glTexCoord2f(r.size.width, 0.0f); glVertex2f(1.0f, 1.0f); + glEnd(); +} -- (void) drawImageUsingClip: (CGRect) clip { - int h,v; - for (v=0;v<4;v++) { - for (h=0;h<4;h++) { - dirty[v][h] = dirty[v][h] || CGRectIntersectsRect(myLayer[v][h].frame,clip); - } - } +- (void)update // moved or resized +{ + NSRect rect; + + [super update]; + + [[self openGLContext] makeCurrentContext]; + [[self openGLContext] update]; + + rect = [self bounds]; + + glViewport(0, 0, (int) rect.size.width, (int) rect.size.height); + + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + + [self setNeedsDisplay:true]; } +- (void)reshape // scrolled, moved or resized +{ + NSRect rect; + + [super reshape]; + + [[self openGLContext] makeCurrentContext]; + [[self openGLContext] update]; + + rect = [self bounds]; + + glViewport(0, 0, (int) rect.size.width, (int) rect.size.height); + + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + + [self setNeedsDisplay:true]; +} -- (void) drawThelayers { +-(void)drawRect:(NSRect)rect +{ +// NSLog(@" draw %f %f %f %f",rect.origin.x,rect.origin.y,rect.size.width,rect.size.height); sqInt formObj = interpreterProxy->displayObject(); sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); void* dispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); - CGRect rect; - [CATransaction begin]; - [CATransaction setValue: (id)kCFBooleanTrue forKey: kCATransactionDisableActions]; - int h,v; - for (v=0;v<4;v++) { - for (h=0;h<4;h++) { - if (dirty[v][h]) { - CGRect ff = myLayer[v][h].frame; - - rect.origin.x = myLayer[v][h].frame.origin.x; - rect.origin.y = self.frame.size.height-myLayer[v][h].frame.origin.y-myLayer[v][h].frame.size.height; - rect.size.height = myLayer[v][h].frame.size.height; - rect.size.width = myLayer[v][h].frame.size.width; - -// NSLog(@" dtl vhxywh %i %i %f %f %f %f",v,h,rect.origin.x,rect.origin.y,rect.size.width,rect.size.height); - CGImageRef x= [self createImageFrom: dispBitsIndex - affectedT: rect.origin.y - affectedB: rect.origin.y+rect.size.height - affectedL: rect.origin.x - affectedR: rect.origin.x+rect.size.width - height: (int) self.frame.size.height - width: (int) self.frame.size.width]; - myLayer[v][h].contents = (id)x; - CGImageRelease(x); - dirty[v][h] = NO; - } + static int inited=NO; + if ( dispBitsIndex ) { + [[self openGLContext] makeCurrentContext]; + if (!inited) { + [self setupOpenGL]; + inited=YES; } - } - [CATransaction commit]; - if (!firstDrawCompleted) { - firstDrawCompleted = YES; - if (getFullScreenFlag() == 0) - [self.window makeKeyAndOrderFront: self]; - } - + [self loadTexturesFrom:dispBitsIndex subRectangle: rect]; + [self defineQuad:rect]; + } } - (void)mouseEntered:(NSEvent *)theEvent { @@ -476,7 +479,10 @@ else encode( (isFunctionKey ? 1 : 28), (isFunctionKey ? 115 : 123), moveToLeftEndOfLine:) else encode( (isFunctionKey ? 4 : 29), (isFunctionKey ? 119 : 124), moveToRightEndOfLine:) - + + else encode( (isFunctionKey ? 1 : 28), (isFunctionKey ? 115 : 123), moveToLeftEndOfLineAndModifySelection:) + else encode( (isFunctionKey ? 4 : 29), (isFunctionKey ? 119 : 124), moveToRightEndOfLineAndModifySelection:) + else encode( 1, 115, scrollToBeginningOfDocument:) else encode( 4, 119, scrollToEndOfDocument:) @@ -627,6 +633,7 @@ launchSpec.asyncRefCon = NULL; OSErr err = LSOpenFromURLSpec(&launchSpec, NULL); +#pragma unused(err) } } @@ -711,3 +718,71 @@ } @end + + +/*GL_TEXTURE_RECTANGLE_ARB + glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, (int)r.size.width,(int)r.size.height, + 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (void*)lastBitsIndex); + */ + +/* glPixelStorei( GL_UNPACK_ROW_LENGTH, r.size.width ); + glPixelStorei( GL_UNPACK_SKIP_PIXELS, subRect.origin.x ); + glPixelStorei( GL_UNPACK_SKIP_ROWS, subRect.origin.y ); + glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, (int)subRect.size.width,(int)subRect.size.height,0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (void*)lastBitsIndex ); + + NSLog(@" draw %f %f %f %f",subRect.origin.x,subRect.origin.y,subRect.size.width,subRect.size.height); + + glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); + glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); + glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); + */ +/* void glTexImage2D( GLenum target, + GLint level, + GLint internalformat, + GLsizei width, + GLsizei height, + GLint border, + GLenum format, + GLenum type, + const GLvoid *pixels ); + + void glTexSubImage2D( GLenum target, + GLint level, + GLint xoffset, + GLint yoffset, + GLsizei width, + GLsizei height, + GLenum format, + GLenum type, + const GLvoid *pixels ) + + + glPixelStorei(GL_UNPACK_ROW_LENGTH, r.size.width); + glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, + 0, + (int) subRect.origin.x, + (int) subRect.origin.y, + (int) subRect.size.width, + (int) subRect.size.height, + GL_BGRA, + GL_UNSIGNED_INT_8_8_8_8_REV, + (void*)lastBitsIndex); + + glPixelStorei( GL_UNPACK_ROW_LENGTH, img_width ); + char *subimg = (char*)m_data + (sub_x + sub_y*img_width)*4; + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, sub_width, sub_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, subimg ); + glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); + + GLES for iphone + no GL_UNPACK_ROW_LENGTH. In which case, you could either (a) extract the subimage into a new buffer yourself, or (b)... + + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, sub_width, sub_height, 0, GL_RGBA, GL_UNSIGNED_BYTES, NULL ); + + for( int y = 0; y < sub_height; y++ ) + { + char *row = m_data + ((y + sub_y)*img_width + sub_x) * 4; + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, y, sub_width, 1, GL_RGBA, GL_UNSIGNED_BYTE, row ); + } + + */ Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m =================================================================== --- trunk/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m 2010-08-28 04:28:15 UTC (rev 2264) @@ -57,12 +57,6 @@ [super dealloc]; } -- (void) postIoForceDisplayUpdateUsingRectangle: (CGRect) retanglePending { - NSRect r; - memcpy(&r,&retanglePending,sizeof(NSRect)); - [[self getMainView] setNeedsDisplayInRect: r]; -} - - (void) ioSetFullScreen: (sqInt) fullScreen { [[self getMainView] ioSetFullScreen: fullScreen]; } @@ -73,5 +67,9 @@ return false; } +- (void) ioForceDisplayUpdateActual { + self.forceUpdateFlush = NO; + [[self getMainView] drawThelayers]; +} @end Modified: trunk/platforms/iOS/vm/SqueakPureObjc-Info 64*64.plist =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc-Info 64*64.plist 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/SqueakPureObjc-Info 64*64.plist 2010-08-28 04:28:15 UTC (rev 2264) @@ -460,7 +460,7 @@ <key>CFBundleName</key> <string>Squeak VM Host 64/64bits</string> <key>CFBundleGetInfoString</key> - <string>Squeak VM 5.7b1 64/64 bits http://www.squeak.org</string> + <string>Squeak VM 5.7b3 64/64 bits http://www.squeak.org</string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> <key>CFBundleIdentifier</key> @@ -470,11 +470,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>5.7b1</string> + <string>5.7b3</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> - <string>19.0</string> + <string>21.0</string> <key>LSBackgroundOnly</key> <false/> <key>LSMinimumSystemVersion</key> Modified: trunk/platforms/iOS/vm/SqueakPureObjc-Info.plist =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc-Info.plist 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/SqueakPureObjc-Info.plist 2010-08-28 04:28:15 UTC (rev 2264) @@ -350,7 +350,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> - <string>Squeak VM 5.7b2 http://www.squeak.org</string> + <string>Squeak VM 5.7b3 http://www.squeak.org</string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> <key>CFBundleIdentifier</key> @@ -362,11 +362,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>5.7b2</string> + <string>5.7b3</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> - <string>20.0</string> + <string>21.0</string> <key>LSBackgroundOnly</key> <false/> <key>LSMinimumSystemVersion</key> Modified: trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/SqueakPureObjc-InfoCOG.plist 2010-08-28 04:28:15 UTC (rev 2264) @@ -350,7 +350,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> - <string>Squeak VM 5.8b3 http://www.squeak.org</string> + <string>Squeak VM 5.8b4 http://www.squeak.org</string> <key>CFBundleIconFile</key> <string>Squeak.icns</string> <key>CFBundleIdentifier</key> @@ -362,11 +362,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>5.8b3</string> + <string>5.8b4</string> <key>CFBundleSignature</key> <string>FAST</string> <key>CFBundleVersion</key> - <string>21.0</string> + <string>22.0</string> <key>LSBackgroundOnly</key> <false/> <key>LSMinimumSystemVersion</key> Modified: trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c =================================================================== --- trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c 2010-08-28 04:28:15 UTC (rev 2264) @@ -80,7 +80,7 @@ static size_t pageSize; static size_t pageMask; - usqInt sqAllocateMemoryMac(sqInt minHeapSize, sqInt *desiredHeapSize, FILE * f,usqInt headersize) { + usqInt sqAllocateMemoryMac(usqInt desiredHeapSize, sqInt minHeapSize, FILE * f,usqInt headersize) { void *possibleLocation,*startOfAnonymousMemory; off_t fileSize; struct stat sb; Modified: trunk/platforms/iOS/vm/iPhone/sqPlatformSpecific.h =================================================================== --- trunk/platforms/iOS/vm/iPhone/sqPlatformSpecific.h 2010-08-25 21:48:56 UTC (rev 2263) +++ trunk/platforms/iOS/vm/iPhone/sqPlatformSpecific.h 2010-08-28 04:28:15 UTC (rev 2264) @@ -79,7 +79,7 @@ void sqFilenameFromString(char *buffer,sqInt fileIndex, long fileLength); #undef allocateMemoryMinimumImageFileHeaderSize #undef sqImageFileReadEntireImage -usqInt sqAllocateMemoryMac(sqInt minHeapSize, sqInt *desiredHeapSize, FILE * f,usqInt headersize); +usqInt sqAllocateMemoryMac(usqInt desiredHeapSize,sqInt minHeapSize, FILE * f,usqInt headersize); #define allocateMemoryMinimumImageFileHeaderSize(heapSize, minimumMemory, fileStream, headerSize) \ sqAllocateMemoryMac(heapSize, minimumMemory, fileStream, headerSize)

1 0

with permission I would like to claim slots 35 & 37 in the special objects array...
by Eliot Miranda 27 Aug '10

27 Aug '10

Hi All, these two slots are the unused MethodContext and BlockContext prototypes. They're either side of class BlockClosure. I'd like to use one of them for threaded callbacks (the foreign callback process slot, upon which a callback from a foreign thread can be run) and keep another in reserve. In Smalltalk these are indices 36 & 38 in SmalltalkImage>>recreateSpecialObjectsArray. Objections, encouragements, alternatives? best Eliot

5 4

[commit] r2263 - iOS update project with compiler option changes
by commits＠squeakvm.org 25 Aug '10

25 Aug '10

Author: johnmci Date: 2010-08-25 14:48:56 -0700 (Wed, 25 Aug 2010) New Revision: 2263 Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj Log: iOS update project with compiler option changes Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-08-25 21:48:36 UTC (rev 2262) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 2010-08-25 21:48:56 UTC (rev 2263) @@ -302,8 +302,6 @@ <key>Layout</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -355,8 +353,13 @@ <string>94C4B82D10C06F1800CD4F90</string> <string>947E647610AA0FF200D3B69E</string> <string>9452D5EF0E044AC2000AD792</string> + <string>9478E0220EC8D957007096A7</string> + <string>9478E0270EC8D957007096A7</string> <string>94E658DC0DDD03FE00358328</string> + <string>94E658DD0DDD03FE00358328</string> <string>94E658DF0DDD03FE00358328</string> + <string>94E658E20DDD03FE00358328</string> + <string>94210B270E956AC200C1A314</string> <string>94EF6CB911E55947003BA64D</string> <string>94EF6CBC11E55947003BA64D</string> <string>29B97317FDCFA39411CA2CEA</string> @@ -368,12 +371,12 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>136</integer> - <integer>134</integer> + <integer>181</integer> + <integer>179</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 0}, {443, 914}}</string> + <string>{{0, 2333}, {443, 914}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -410,7 +413,7 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>HostWindowPlugin.c</string> + <string>SqueakOSXAppDelegate.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -418,11 +421,11 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>HostWindowPlugin.c</string> + <string>SqueakOSXAppDelegate.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>94AF3A2012231A7200691409</string> + <string>9499A91A1225C3B000022E3A</string> <key>history</key> <array> <string>94BCE7390DDDEF8200F38F31</string> @@ -663,7 +666,6 @@ <string>94238E5E11E7B0EB004401BE</string> <string>94FAD00D11E7BDED009DD206</string> <string>94F1F15C11EB8AB5004B3AE3</string> - <string>94304DEB11EBE50A00765DA6</string> <string>940BCEBB11EC2D75007A3EE5</string> <string>9406B4DF11EC314E002670B7</string> <string>949F254511EC33FA00A34245</string> @@ -682,23 +684,27 @@ <string>949813161220A5A200A71D33</string> <string>940E861D1220A67600AAB6F5</string> <string>940E86871220A79D00AAB6F5</string> - <string>940E86881220A79D00AAB6F5</string> - <string>940E86891220A79D00AAB6F5</string> - <string>940E868A1220A79D00AAB6F5</string> - <string>940E868B1220A79D00AAB6F5</string> - <string>940E868C1220A79D00AAB6F5</string> - <string>940E868D1220A79D00AAB6F5</string> <string>940E86A11220A8D200AAB6F5</string> - <string>940E86A21220A8D200AAB6F5</string> <string>940E86A31220A8D200AAB6F5</string> - <string>940E86AC1220A91400AAB6F5</string> <string>940E86EE1220AF3D00AAB6F5</string> - <string>940E86FA1220B06300AAB6F5</string> - <string>942229691220C32800153913</string> - <string>9422297D1220C3AF00153913</string> <string>94838AAA1220CC9100FFD92B</string> <string>94AF3A1F12231A7200691409</string> - <string>94AF3A0212231A0B00691409</string> + <string>941991BA12245B21004EA3BA</string> + <string>9419928512246E07004EA3BA</string> + <string>942807EE1224862A0000DCFE</string> + <string>942807EF1224862A0000DCFE</string> + <string>942807F01224862A0000DCFE</string> + <string>942807F11224862A0000DCFE</string> + <string>942808081224885E0000DCFE</string> + <string>944F6CFF1224D54300DFC0CD</string> + <string>944F6D4D1225017700DFC0CD</string> + <string>94E8FA3C12258ED500EECD29</string> + <string>94E8FA5712258FA800EECD29</string> + <string>94E8FA731225913000EECD29</string> + <string>94E8FB181225ABA900EECD29</string> + <string>94E8FB6B1225BE3D00EECD29</string> + <string>94E8FB6C1225BE3D00EECD29</string> + <string>942AC5E01225C266002E79AA</string> </array> </dict> <key>SplitCount</key> @@ -710,14 +716,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1181, 844}}</string> + <string>{{0, 0}, {1181, 654}}</string> <key>RubberWindowFrame</key> <string>34 50 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>844pt</string> + <string>654pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -730,14 +736,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 849}, {1181, 83}}</string> + <string>{{0, 659}, {1181, 273}}</string> <key>RubberWindowFrame</key> <string>34 50 1646 973 0 0 1680 1028 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> - <string>83pt</string> + <string>273pt</string> </dict> </array> <key>Proportion</key> @@ -756,9 +762,9 @@ </array> <key>TableOfContents</key> <array> - <string>94AF3A2112231A7200691409</string> + <string>9499A90F1225C34100022E3A</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>94AF3A2212231A7200691409</string> + <string>9499A9101225C34100022E3A</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -879,7 +885,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>304290418.001508</real> + <real>304464816.21677101</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -894,13 +900,10 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>94AF3A2A12231A7200691409</string> - <string>94AF3A2B12231A7200691409</string> <string>1CD10A99069EF8BA00B06720</string> - <string>1C530D57069F1CE1000CFCEE</string> - <string>1C78EAAD065D492600B07095</string> <string>9424FF6E0DDCB226009912BF</string> <string>/Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/SqueakPureObjcCOGVM.xcodeproj</string> + <string>1C530D57069F1CE1000CFCEE</string> </array> <key>WindowString</key> <string>34 50 1646 973 0 0 1680 1028 </string> @@ -933,7 +936,7 @@ <key>Frame</key> <string>{{0, 0}, {1332, 523}}</string> <key>RubberWindowFrame</key> - <string>138 61 1332 919 0 0 1680 1028 </string> + <string>348 108 1332 919 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -959,7 +962,7 @@ <key>Frame</key> <string>{{0, 528}, {1332, 350}}</string> <key>RubberWindowFrame</key> - <string>138 61 1332 919 0 0 1680 1028 </string> + <string>348 108 1332 919 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> @@ -982,14 +985,14 @@ <key>TableOfContents</key> <array> <string>9424FF6E0DDCB226009912BF</string> - <string>94AF3A0012231A0B00691409</string> + <string>9499A9111225C34100022E3A</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.buildV3</string> <key>WindowString</key> - <string>138 61 1332 919 0 0 1680 1028 </string> + <string>348 108 1332 919 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>9424FF6E0DDCB226009912BF</string> <key>WindowToolIsVisible</key> @@ -1024,8 +1027,8 @@ <string>yes</string> <key>sizes</key> <array> - <string>{{0, 0}, {150, 491}}</string> - <string>{{150, 0}, {1226, 491}}</string> + <string>{{0, 0}, {150, 927}}</string> + <string>{{150, 0}, {1226, 927}}</string> </array> </dict> <key>VerticalSplitView</key> @@ -1040,8 +1043,8 @@ <string>yes</string> <key>sizes</key> <array> - <string>{{0, 0}, {1376, 491}}</string> - <string>{{0, 491}, {1376, 436}}</string> + <string>{{0, 0}, {1376, 927}}</string> + <string>{{0, 927}, {1376, 0}}</string> </array> </dict> </dict> @@ -1074,12 +1077,12 @@ <real>713</real> </array> <key>Frame</key> - <string>{{150, 0}, {1226, 491}}</string> + <string>{{150, 0}, {1226, 927}}</string> <key>RubberWindowFrame</key> - <string>299 60 1376 968 0 0 1680 1028 </string> + <string>304 60 1376 968 0 0 1680 1028 </string> </dict> <key>RubberWindowFrame</key> - <string>299 60 1376 968 0 0 1680 1028 </string> + <string>304 60 1376 968 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXDebugSessionModule</string> @@ -1102,18 +1105,18 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>94AF3A2312231A7200691409</string> + <string>9499A9121225C34100022E3A</string> <string>1C162984064C10D400B95A72</string> - <string>94AF3A2412231A7200691409</string> - <string>94AF3A2512231A7200691409</string> - <string>94AF3A2612231A7200691409</string> - <string>94AF3A2712231A7200691409</string> - <string>94AF3A2812231A7200691409</string> + <string>9499A9131225C34100022E3A</string> + <string>9499A9141225C34100022E3A</string> + <string>9499A9151225C34100022E3A</string> + <string>9499A9161225C34100022E3A</string> + <string>9499A9171225C34100022E3A</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> <key>WindowString</key> - <string>299 60 1376 968 0 0 1680 1028 </string> + <string>304 60 1376 968 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> @@ -1135,23 +1138,21 @@ <key>Dock</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> - <string>HostWindowPlugin.c</string> + <string></string> <key>StatusBarVisibility</key> <true/> </dict> <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1181, 484}}</string> + <string>{{0, 0}, {1181, 629}}</string> <key>RubberWindowFrame</key> - <string>263 45 1181 983 0 0 1680 1028 </string> + <string>499 45 1181 983 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -1160,9 +1161,11 @@ </dict> </array> <key>Proportion</key> - <string>484pt</string> + <string>629pt</string> </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1173,14 +1176,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 489}, {1181, 453}}</string> + <string>{{0, 634}, {1181, 308}}</string> <key>RubberWindowFrame</key> - <string>263 45 1181 983 0 0 1680 1028 </string> + <string>499 45 1181 983 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXProjectFindModule</string> <key>Proportion</key> - <string>453pt</string> + <string>308pt</string> </dict> </array> <key>Proportion</key> @@ -1198,17 +1201,17 @@ <key>TableOfContents</key> <array> <string>1C530D57069F1CE1000CFCEE</string> - <string>94AF3A0412231A0B00691409</string> - <string>94AF3A0512231A0B00691409</string> + <string>9499A91B1225C3B000022E3A</string> + <string>9499A91C1225C3B000022E3A</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> - <string>263 45 1181 983 0 0 1680 1028 </string> + <string>499 45 1181 983 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>Identifier</key> @@ -1241,7 +1244,7 @@ <key>Frame</key> <string>{{0, 0}, {1619, 787}}</string> <key>RubberWindowFrame</key> - <string>61 177 1619 828 0 0 1680 1028 </string> + <string>13 200 1619 828 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXDebugCLIModule</string> @@ -1264,17 +1267,17 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>94AF3A2912231A7200691409</string> + <string>94E8FA4A12258ED500EECD29</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.consoleV3</string> <key>WindowString</key> - <string>61 177 1619 828 0 0 1680 1028 </string> + <string>13 200 1619 828 0 0 1680 1028 </string> <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>FirstTimeWindowDisplayed</key> @@ -1356,7 +1359,7 @@ <key>PBXProjectModuleGUID</key> <string>1C78EAB2065D492600B07095</string> <key>PBXProjectModuleLabel</key> - <string>sqSqueakOSXApplication+attributes.m</string> + <string></string> <key>StatusBarVisibility</key> <true/> </dict> @@ -1378,7 +1381,7 @@ <key>ContentConfiguration</key> <dict> <key>PBXCVSModuleFilterTypeKey</key> - <integer>1030</integer> + <integer>1031</integer> <key>PBXCVSModuleTreeModuleColumnData</key> <dict> <key>PBXCVSModuleTreeModuleColumnWidthsKey</key> @@ -1405,7 +1408,7 @@ <key>PBXProjectModuleLabel</key> <string>SCM Results</string> <key>SCMActivityViewerShowingDefaultKey</key> - <string>{{0, 375}, {1582, 43}}</string> + <string>{{0, 353}, {1582, 65}}</string> </dict> <key>GeometryConfiguration</key> <dict> @@ -1435,7 +1438,7 @@ <key>TableOfContents</key> <array> <string>9488792B0E0F2F8000555242</string> - <string>94FE71D91220864200417A56</string> + <string>942AC5D81225C258002E79AA</string> <string>1C78EAB2065D492600B07095</string> <string>1CD052920623707200166675</string> </array> @@ -1461,8 +1464,6 @@ <key>Dock</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -1492,11 +1493,11 @@ <array> <string>1C77FABC04509CD000000102</string> <string>1C3E0DCA080725EA00A55177</string> + <string>1C3E0DCC080725EA11A45113</string> </array> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>1</integer> <integer>0</integer> </array> </array> @@ -1518,7 +1519,7 @@ <real>275</real> </array> <key>RubberWindowFrame</key> - <string>603 140 1661 888 0 0 1680 1028 </string> + <string>19 140 1661 888 0 0 1680 1028 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> @@ -1526,6 +1527,8 @@ <string>292pt</string> </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -1538,7 +1541,7 @@ <key>Frame</key> <string>{{297, 0}, {1364, 847}}</string> <key>RubberWindowFrame</key> - <string>603 140 1661 888 0 0 1680 1028 </string> + <string>19 140 1661 888 0 0 1680 1028 </string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -1565,19 +1568,19 @@ <true/> <key>TableOfContents</key> <array> - <string>940E868F1220A79D00AAB6F5</string> - <string>940E86901220A79D00AAB6F5</string> + <string>942807E41224861D0000DCFE</string> + <string>942807E51224861D0000DCFE</string> <string>1CE0B1FE06471DED0097A5F4</string> <string>1CA1AED706398EBD00589147</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.breakpointsV3</string> <key>WindowString</key> - <string>603 140 1661 888 0 0 1680 1028 </string> + <string>19 140 1661 888 0 0 1680 1028 </string> <key>WindowToolGUID</key> - <string>940E868F1220A79D00AAB6F5</string> + <string>942807E41224861D0000DCFE</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>Identifier</key> Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-08-25 21:48:36 UTC (rev 2262) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser 2010-08-25 21:48:56 UTC (rev 2263) @@ -23,11 +23,11 @@ ); }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeArchitecturePreference = armv7; - activeBuildConfigurationName = Debug; - activeExecutable = 9424FF3E0DDC8654009912BF /* Squeak */; - activeSDKPreference = iphoneos4.0; - activeTarget = 1D6058900D05DD3D006BFB54 /* SqueakNoOGLIPhone */; + activeArchitecturePreference = armv6; + activeBuildConfigurationName = Distribution; + activeExecutable = 947E62FD10AA098300D3B69E /* SqueakPureObjc */; + activeSDKPreference = macosx10.5; + activeTarget = 947E626F10AA098300D3B69E /* SqueakPureObjc */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* SqueakNoOGLIPhone */, ); @@ -41,15 +41,9 @@ 9458527F10F045FB001401E7 /* sqSqueakIPhoneClipboardAPI.m:31 */, 9458528110F045FC001401E7 /* sqSqueakIPhoneClipboardAPI.m:24 */, 9458528310F045FD001401E7 /* sqSqueakIPhoneClipboardAPI.m:17 */, - 94EF6FB511E57577003BA64D /* sqUnixHeartbeat.c:168 */, - 94E1BD9C11E5A94E00D5B92B /* sqMacV2Time.c:64 */, - 941A331211E63DE7004796BA /* sqUnixHeartbeat.c:68 */, - 9475A81411E6959C0010FB38 /* ObjectiveCPlugin.c:1770 */, - 94D1252311E6F03A00AAF81C /* aio.c:211 */, - 94D1254511E6F14C00AAF81C /* aio.c:276 */, - 9492B3E611F1679100EDB3D3 /* sqUnixHeartbeat.c:137 */, - 94FE71E61220871700417A56 /* gcc3x-interp.c:31091 */, - 940E871C1220B42B00AAB6F5 /* gcc3x-interp.c:34770 */, + 944F6D171224D7B300DFC0CD /* sqSqueakOSXApplication+imageReadWrite.m:64 */, + 94E8FA5112258F6F00EECD29 /* sqSqueakMainApplication.m:177 */, + 94E8FA6512258FDF00EECD29 /* sqMacV2Memory.c:191 */, ); codeSenseManager = 9424FF430DDC8673009912BF /* Code sense */; executables = ( @@ -121,7 +115,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 22, 300, - 830, + 829.58349609375, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, @@ -225,8 +219,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 304290226; - PBXWorkspaceStateSaveDate = 304290226; + PBXPerProjectTemplateStateSaveDate = 304464660; + PBXWorkspaceStateSaveDate = 304464660; }; perUserProjectItems = { 9402DDB610CE12A5005C2102 /* PBXTextBookmark */ = 9402DDB610CE12A5005C2102 /* PBXTextBookmark */; @@ -239,35 +233,32 @@ 940BCEBB11EC2D75007A3EE5 /* PBXTextBookmark */ = 940BCEBB11EC2D75007A3EE5 /* PBXTextBookmark */; 940E861D1220A67600AAB6F5 /* PlistBookmark */ = 940E861D1220A67600AAB6F5 /* PlistBookmark */; 940E86871220A79D00AAB6F5 /* PBXTextBookmark */ = 940E86871220A79D00AAB6F5 /* PBXTextBookmark */; - 940E86881220A79D00AAB6F5 /* PBXTextBookmark */ = 940E86881220A79D00AAB6F5 /* PBXTextBookmark */; - 940E86891220A79D00AAB6F5 /* PBXTextBookmark */ = 940E86891220A79D00AAB6F5 /* PBXTextBookmark */; - 940E868A1220A79D00AAB6F5 /* PBXTextBookmark */ = 940E868A1220A79D00AAB6F5 /* PBXTextBookmark */; - 940E868B1220A79D00AAB6F5 /* PBXTextBookmark */ = 940E868B1220A79D00AAB6F5 /* PBXTextBookmark */; - 940E868C1220A79D00AAB6F5 /* PBXTextBookmark */ = 940E868C1220A79D00AAB6F5 /* PBXTextBookmark */; - 940E868D1220A79D00AAB6F5 /* PBXTextBookmark */ = 940E868D1220A79D00AAB6F5 /* PBXTextBookmark */; 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */ = 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */; - 940E86A21220A8D200AAB6F5 /* PBXTextBookmark */ = 940E86A21220A8D200AAB6F5 /* PBXTextBookmark */; 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */ = 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */; - 940E86AC1220A91400AAB6F5 /* PBXTextBookmark */ = 940E86AC1220A91400AAB6F5 /* PBXTextBookmark */; 940E86EE1220AF3D00AAB6F5 /* PBXTextBookmark */ = 940E86EE1220AF3D00AAB6F5 /* PBXTextBookmark */; - 940E86FA1220B06300AAB6F5 /* PBXTextBookmark */ = 940E86FA1220B06300AAB6F5 /* PBXTextBookmark */; 941441FD10BC817D0088F8AC /* PBXTextBookmark */ = 941441FD10BC817D0088F8AC /* PBXTextBookmark */; 9414420110BC817D0088F8AC /* PBXTextBookmark */ = 9414420110BC817D0088F8AC /* PBXTextBookmark */; 9414425110BC8A620088F8AC /* PBXBookmark */ = 9414425110BC8A620088F8AC /* PBXBookmark */; + 941991BA12245B21004EA3BA /* PBXTextBookmark */ = 941991BA12245B21004EA3BA /* PBXTextBookmark */; + 9419928512246E07004EA3BA /* PlistBookmark */ = 9419928512246E07004EA3BA /* PlistBookmark */; 941A331D11E63E1A004796BA /* PBXTextBookmark */ = 941A331D11E63E1A004796BA /* PBXTextBookmark */; 941A331F11E63E1A004796BA /* PBXTextBookmark */ = 941A331F11E63E1A004796BA /* PBXTextBookmark */; 941A333A11E640EE004796BA /* PBXTextBookmark */ = 941A333A11E640EE004796BA /* PBXTextBookmark */; 941A33B411E64E46004796BA /* PBXTextBookmark */ = 941A33B411E64E46004796BA /* PBXTextBookmark */; 9421AB550FF1807D008F54E9 /* PBXTextBookmark */ = 9421AB550FF1807D008F54E9 /* PBXTextBookmark */; - 942229691220C32800153913 /* PBXTextBookmark */ = 942229691220C32800153913 /* PBXTextBookmark */; - 9422297D1220C3AF00153913 /* PBXTextBookmark */ = 9422297D1220C3AF00153913 /* PBXTextBookmark */; 94238E5E11E7B0EB004401BE /* PBXTextBookmark */ = 94238E5E11E7B0EB004401BE /* PBXTextBookmark */; + 942807EE1224862A0000DCFE /* PBXTextBookmark */ = 942807EE1224862A0000DCFE /* PBXTextBookmark */; + 942807EF1224862A0000DCFE /* PBXTextBookmark */ = 942807EF1224862A0000DCFE /* PBXTextBookmark */; + 942807F01224862A0000DCFE /* PBXTextBookmark */ = 942807F01224862A0000DCFE /* PBXTextBookmark */; + 942807F11224862A0000DCFE /* PBXTextBookmark */ = 942807F11224862A0000DCFE /* PBXTextBookmark */; + 942808081224885E0000DCFE /* PBXTextBookmark */ = 942808081224885E0000DCFE /* PBXTextBookmark */; 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */ = 9428BBAD10BB50E200DAD287 /* PBXTextBookmark */; 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */ = 9428BC5510BB74BF00DAD287 /* PBXTextBookmark */; 9428BC5710BB74BF00DAD287 /* PBXTextBookmark */ = 9428BC5710BB74BF00DAD287 /* PBXTextBookmark */; 9428BF3810BBC2ED00DAD287 /* PBXTextBookmark */ = 9428BF3810BBC2ED00DAD287 /* PBXTextBookmark */; 9428BF4F10BBCAAC00DAD287 /* PBXTextBookmark */ = 9428BF4F10BBCAAC00DAD287 /* PBXTextBookmark */; 942ABEC510AA34820086D908 /* PBXTextBookmark */ = 942ABEC510AA34820086D908 /* PBXTextBookmark */; + 942AC5E01225C266002E79AA /* PBXTextBookmark */ = 942AC5E01225C266002E79AA /* PBXTextBookmark */; 942B77330EA7E642004B266D /* PBXTextBookmark */ = 942B77330EA7E642004B266D /* PBXTextBookmark */; 942B77380EA7E642004B266D /* PBXTextBookmark */ = 942B77380EA7E642004B266D /* PBXTextBookmark */; 942B779B0EA7F2E0004B266D /* PBXTextBookmark */ = 942B779B0EA7F2E0004B266D /* PBXTextBookmark */; @@ -278,7 +269,6 @@ 9430325510BD0B6D0045D33B /* PBXTextBookmark */ = 9430325510BD0B6D0045D33B /* PBXTextBookmark */; 9430329A10BD103B0045D33B /* PBXTextBookmark */ = 9430329A10BD103B0045D33B /* PBXTextBookmark */; 9430329B10BD103B0045D33B /* PBXTextBookmark */ = 9430329B10BD103B0045D33B /* PBXTextBookmark */; - 94304DEB11EBE50A00765DA6 /* PlistBookmark */ = 94304DEB11EBE50A00765DA6 /* PlistBookmark */; 9441DB6E11E6805300345F6C /* PBXTextBookmark */ = 9441DB6E11E6805300345F6C /* PBXTextBookmark */; 9441DB6F11E6805300345F6C /* PBXTextBookmark */ = 9441DB6F11E6805300345F6C /* PBXTextBookmark */; 9441DB7011E6805300345F6C /* PBXTextBookmark */ = 9441DB7011E6805300345F6C /* PBXTextBookmark */; @@ -291,6 +281,8 @@ 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */ = 94476EC40EBFAB320095D6D7 /* PBXTextBookmark */; 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */ = 9448940B10F3E8FF00FB3EC8 /* PBXTextBookmark */; 9449ACA211EE4ECD00F667AC /* PBXTextBookmark */ = 9449ACA211EE4ECD00F667AC /* PBXTextBookmark */; + 944F6CFF1224D54300DFC0CD /* PBXTextBookmark */ = 944F6CFF1224D54300DFC0CD /* PBXTextBookmark */; + 944F6D4D1225017700DFC0CD /* PBXTextBookmark */ = 944F6D4D1225017700DFC0CD /* PBXTextBookmark */; 94547F160DE0AC7D00DD588F /* PBXTextBookmark */ = 94547F160DE0AC7D00DD588F /* PBXTextBookmark */; 945481A60DE2A79200DD588F /* PBXTextBookmark */ = 945481A60DE2A79200DD588F /* PBXTextBookmark */; 94554E670DF1171500FB176B /* PBXTextBookmark */ = 94554E670DF1171500FB176B /* PBXTextBookmark */; @@ -373,6 +365,7 @@ 9494944B11E52D570019BC29 /* PBXTextBookmark */ = 9494944B11E52D570019BC29 /* PBXTextBookmark */; 94977E7C11EE46BC002BC5E9 /* PBXTextBookmark */ = 94977E7C11EE46BC002BC5E9 /* PBXTextBookmark */; 949813161220A5A200A71D33 /* PBXTextBookmark */ = 949813161220A5A200A71D33 /* PBXTextBookmark */; + 9499A91A1225C3B000022E3A /* PBXTextBookmark */ = 9499A91A1225C3B000022E3A /* PBXTextBookmark */; 949AD35211E54A81006D6BF4 /* PBXTextBookmark */ = 949AD35211E54A81006D6BF4 /* PBXTextBookmark */; 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */ = 949AD36211E54AAA006D6BF4 /* PBXTextBookmark */; 949AD4BD11E552D7006D6BF4 /* PBXTextBookmark */ = 949AD4BD11E552D7006D6BF4 /* PBXTextBookmark */; @@ -385,9 +378,7 @@ 94A3F91B11E6564F008113C6 /* PBXTextBookmark */ = 94A3F91B11E6564F008113C6 /* PBXTextBookmark */; 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6A0E003879006A79E4 /* PBXTextBookmark */; 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */ = 94AB2E6C0E003879006A79E4 /* PBXTextBookmark */; - 94AF3A0212231A0B00691409 /* PBXTextBookmark */ = 94AF3A0212231A0B00691409 /* PBXTextBookmark */; 94AF3A1F12231A7200691409 /* PBXTextBookmark */ = 94AF3A1F12231A7200691409 /* PBXTextBookmark */; - 94AF3A2012231A7200691409 /* PBXTextBookmark */ = 94AF3A2012231A7200691409 /* PBXTextBookmark */; 94B1514E0DE2CE530059F208 /* PBXTextBookmark */ = 94B1514E0DE2CE530059F208 /* PBXTextBookmark */; 94B7898910C4F95E005EA70D /* PBXTextBookmark */ = 94B7898910C4F95E005EA70D /* PBXTextBookmark */; 94B88C530E81500200C98131 /* PBXTextBookmark */ = 94B88C530E81500200C98131 /* PBXTextBookmark */; @@ -472,6 +463,12 @@ 94E584FF10BF79AB0073FD63 /* PBXTextBookmark */ = 94E584FF10BF79AB0073FD63 /* PBXTextBookmark */; 94E5850010BF79AB0073FD63 /* PBXTextBookmark */ = 94E5850010BF79AB0073FD63 /* PBXTextBookmark */; 94E8EEEA11C94D5D0049D853 /* PBXTextBookmark */ = 94E8EEEA11C94D5D0049D853 /* PBXTextBookmark */; + 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */ = 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */; + 94E8FA5712258FA800EECD29 /* PBXTextBookmark */ = 94E8FA5712258FA800EECD29 /* PBXTextBookmark */; + 94E8FA731225913000EECD29 /* PBXTextBookmark */ = 94E8FA731225913000EECD29 /* PBXTextBookmark */; + 94E8FB181225ABA900EECD29 /* PBXTextBookmark */ = 94E8FB181225ABA900EECD29 /* PBXTextBookmark */; + 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */ = 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */; + 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */ = 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */; 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */; 94EE1DAA11E57FAB00DC6E8C /* PBXTextBookmark */ = 94EE1DAA11E57FAB00DC6E8C /* PBXTextBookmark */; 94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */ = 94EF6CFA11E55BAC003BA64D /* PBXTextBookmark */; @@ -603,12 +600,6 @@ name = interp.c; path = /Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/src/vm/interp.c; sourceTree = "<absolute>"; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1335, 359034}}"; - sepNavSelRange = "{76579, 16}"; - sepNavVisRange = "{75418, 2173}"; - sepNavWindowFrame = "{{38, 4}, {1382, 998}}"; - }; }; 940377A3121DA39E00ECC885 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -758,66 +749,6 @@ vrLen = 1304; vrLoc = 2031; }; - 940E86881220A79D00AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94584FD910F02378001401E7 /* sqMacExtendedClipboard.m */; - name = "sqMacExtendedClipboard.m: 101"; - rLen = 40; - rLoc = 3679; - rType = 0; - vrLen = 1663; - vrLoc = 2469; - }; - 940E86891220A79D00AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 945851EF10F03E60001401E7 /* sqMacExtendedClipboard.m */; - name = "sqMacExtendedClipboard.m: 88"; - rLen = 111; - rLoc = 3036; - rType = 0; - vrLen = 1576; - vrLoc = 1808; - }; - 940E868A1220A79D00AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9458525510F04339001401E7 /* sqSqueakIPhoneClipboardAPI.m */; - name = "sqSqueakIPhoneClipboardAPI.m: 17"; - rLen = 28; - rLoc = 398; - rType = 0; - vrLen = 1345; - vrLoc = 0; - }; - 940E868B1220A79D00AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9452D5D90E044A9D000AD792 /* sqMacV2Time.c */; - name = "sqMacV2Time.c: 64"; - rLen = 19; - rLoc = 2417; - rType = 0; - vrLen = 1495; - vrLoc = 1164; - }; - 940E868C1220A79D00AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */; - name = "ObjectiveCPlugin.c: 1770"; - rLen = 17; - rLoc = 49212; - rType = 0; - vrLen = 1154; - vrLoc = 48572; - }; - 940E868D1220A79D00AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 949493BF11E52ADE0019BC29 /* aio.c */; - name = "aio.c: 276"; - rLen = 16; - rLoc = 6537; - rType = 0; - vrLen = 903; - vrLoc = 5810; - }; 940E86A11220A8D200AAB6F5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94638B260EAFB77B00A3F155 /* iPhone.changes */; @@ -828,16 +759,6 @@ vrLen = 2130; vrLoc = 5075613; }; - 940E86A21220A8D200AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94D16CAF10BCF96B00A69A89 /* Credits.rtf */; - name = "Credits.rtf: 6"; - rLen = 0; - rLoc = 215; - rType = 0; - vrLen = 416; - vrLoc = 0; - }; 940E86A31220A8D200AAB6F5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 947E647910AA100900D3B69E /* SqueakOSXAppDelegate.h */; @@ -848,16 +769,6 @@ vrLen = 1827; vrLoc = 645; }; - 940E86AC1220A91400AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; - name = "SqueakOSXAppDelegate.m: 120"; - rLen = 0; - rLoc = 4452; - rType = 0; - vrLen = 2750; - vrLoc = 100; - }; 940E86EE1220AF3D00AAB6F5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9424FF5B0DDCB1C7009912BF /* sqGnu.h */; @@ -868,33 +779,6 @@ vrLen = 2508; vrLoc = 9372; }; - 940E86FA1220B06300AAB6F5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494928011E5178D0019BC29 /* gcc3x-cointerp.c */; - name = "gcc3x-cointerp.c: 40722"; - rLen = 85; - rLoc = 1214093; - rType = 0; - vrLen = 2102; - vrLoc = 1213104; - }; - 940E871C1220B42B00AAB6F5 /* gcc3x-interp.c:34770 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 94EF6CBE11E55947003BA64D /* gcc3x-interp.c */; - functionName = "printMemory()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 34770; - modificationTime = 304290353.867031; - originalNumberOfMultipleMatches = 1; - state = 0; - }; 9412CAE40E6C05EC00DB8625 /* sqSqueakInfoPlistInterface.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {831, 749}}"; @@ -971,23 +855,26 @@ sepNavVisRange = "{2526, 1527}"; }; }; - 941A331211E63DE7004796BA /* sqUnixHeartbeat.c:68 */ = { - isa = PBXFileBreakpoint; - actions = ( + 941991BA12245B21004EA3BA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94E658FA0DDD03FE00358328 /* HostWindowPlugin.c */; + name = "HostWindowPlugin.c: 144"; + rLen = 16; + rLoc = 3929; + rType = 0; + vrLen = 1887; + vrLoc = 2906; + }; + 9419928512246E07004EA3BA /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 941D1C9A0E696FC7005B77B3 /* Entitlements.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */; - functionName = "ioGetClockLogSizeUsecsIdxMsecsIdx()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 68; - location = Squeak; - modificationTime = 304290363.860277; - originalNumberOfMultipleMatches = 1; - state = 1; + name = /Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/Entitlements.plist; + rLen = 0; + rLoc = 9223372036854775808; }; 941A331D11E63E1A004796BA /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -1050,9 +937,9 @@ }; 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 27469}}"; - sepNavSelRange = "{49212, 17}"; - sepNavVisRange = "{48572, 1154}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 27430}}"; + sepNavSelRange = "{49226, 0}"; + sepNavVisRange = "{49390, 1351}"; sepNavWindowFrame = "{{710, 97}, {901, 833}}"; }; }; @@ -1066,26 +953,6 @@ vrLen = 1049; vrLoc = 0; }; - 942229691220C32800153913 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */; - name = "sqUnixHeartbeat.c: 292"; - rLen = 0; - rLoc = 8687; - rType = 0; - vrLen = 1547; - vrLoc = 7749; - }; - 9422297D1220C3AF00153913 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 9424FF670DDCB202009912BF /* sqMacV2Memory.c */; - name = "sqMacV2Memory.c: 131"; - rLen = 0; - rLoc = 5002; - rType = 0; - vrLen = 2213; - vrLoc = 3568; - }; 94238E5E11E7B0EB004401BE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D5DA0E044A9D000AD792 /* sqMacV2Time.h */; @@ -1103,7 +970,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 0; + breakpointsEnabled = 1; configStateDict = { "PBXLSLaunchAction-0" = { PBXLSLaunchAction = 0; @@ -1284,17 +1151,17 @@ }; 9424FF5C0DDCB1C7009912BF /* sqMemoryAccess.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {880, 2158}}"; - sepNavSelRange = "{707, 57}"; - sepNavVisRange = "{0, 1882}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 2171}}"; + sepNavSelRange = "{2839, 0}"; + sepNavVisRange = "{0, 0}"; sepNavWindowFrame = "{{15, 4}, {878, 1019}}"; }; }; 9424FF5D0DDCB1C7009912BF /* sq.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 7033}}"; - sepNavSelRange = "{18269, 35}"; - sepNavVisRange = "{17358, 1451}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 6955}}"; + sepNavSelRange = "{9365, 7}"; + sepNavVisRange = "{8588, 1527}"; sepNavWindowFrame = "{{73, 4}, {1326, 1010}}"; }; }; @@ -1308,9 +1175,9 @@ }; 9424FF600DDCB1C7009912BF /* sqVirtualMachine.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 6396}}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 6266}}"; sepNavSelRange = "{7931, 7}"; - sepNavVisRange = "{6886, 1119}"; + sepNavVisRange = "{0, 1399}"; }; }; 9424FF610DDCB1C7009912BF /* sqVirtualMachine.h */ = { @@ -1347,9 +1214,9 @@ }; 9424FF670DDCB202009912BF /* sqMacV2Memory.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 2548}}"; - sepNavSelRange = "{5002, 0}"; - sepNavVisRange = "{4353, 1152}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 2509}}"; + sepNavSelRange = "{7077, 0}"; + sepNavVisRange = "{5653, 1424}"; sepNavWindowFrame = "{{497, 1}, {905, 983}}"; }; }; @@ -1383,6 +1250,56 @@ sepNavVisRange = "{0, 571}"; }; }; + 942807EE1224862A0000DCFE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94584FD910F02378001401E7 /* sqMacExtendedClipboard.m */; + name = "sqMacExtendedClipboard.m: 101"; + rLen = 40; + rLoc = 3679; + rType = 0; + vrLen = 2397; + vrLoc = 1736; + }; + 942807EF1224862A0000DCFE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 945851EF10F03E60001401E7 /* sqMacExtendedClipboard.m */; + name = "sqMacExtendedClipboard.m: 88"; + rLen = 111; + rLoc = 3036; + rType = 0; + vrLen = 2240; + vrLoc = 1524; + }; + 942807F01224862A0000DCFE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9458525510F04339001401E7 /* sqSqueakIPhoneClipboardAPI.m */; + name = "sqSqueakIPhoneClipboardAPI.m: 17"; + rLen = 28; + rLoc = 398; + rType = 0; + vrLen = 1345; + vrLoc = 0; + }; + 942807F11224862A0000DCFE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 949493BF11E52ADE0019BC29 /* aio.c */; + name = "aio.c: 211"; + rLen = 7; + rLoc = 5142; + rType = 0; + vrLen = 1294; + vrLoc = 4481; + }; + 942808081224885E0000DCFE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9452D5D90E044A9D000AD792 /* sqMacV2Time.c */; + name = "sqMacV2Time.c: 29"; + rLen = 0; + rLoc = 1042; + rType = 0; + vrLen = 2080; + vrLoc = 3; + }; 9428BA9510BB440800DAD287 /* sqSqueakOSXClipboardAPI.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1215, 623}}"; @@ -1516,6 +1433,16 @@ path = "/Volumes/pm/Mail/IMAP-johnmci@smalltalkconsulting.com@imap.gmail.com/[Gmail]/Sent Mail.imapmbox/Attachments/2958644/8/sqMacHostWindow.h"; sourceTree = "<absolute>"; }; + 942AC5E01225C266002E79AA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; + name = "SqueakOSXAppDelegate.m: 78"; + rLen = 0; + rLoc = 3104; + rType = 0; + vrLen = 1488; + vrLoc = 2422; + }; 942B77300EA7E642004B266D /* interp.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -1749,17 +1676,6 @@ vrLen = 2612; vrLoc = 0; }; - 94304DEB11EBE50A00765DA6 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 941D1C9A0E696FC7005B77B3 /* Entitlements.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = /Users/johnmci/Documents/Squeak3.8.0/platforms/iOS/vm/Entitlements.plist; - rLen = 0; - rLoc = 9223372036854775808; - }; 943198450DDF4D9800EB8E60 /* sqUnixQuartz.m */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -1908,6 +1824,44 @@ vrLen = 1361; vrLoc = 9384; }; + 944F6CFF1224D54300DFC0CD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */; + name = "sqUnixHeartbeat.c: 291"; + rLen = 0; + rLoc = 8683; + rType = 0; + vrLen = 1184; + vrLoc = 7955; + }; + 944F6D171224D7B300DFC0CD /* sqSqueakOSXApplication+imageReadWrite.m:64 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 94C887FA10ADCEFC007CB39E /* sqSqueakOSXApplication+imageReadWrite.m */; + functionName = "-attempToOpenImageFromOpenPanel"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 64; + location = Squeak; + modificationTime = 304463420.339047; + originalNumberOfMultipleMatches = 1; + state = 1; + }; + 944F6D4D1225017700DFC0CD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94BCE6870DDDECB800F38F31 /* HostWindowPlugin.h */; + name = "HostWindowPlugin.h: 20"; + rLen = 21; + rLoc = 970; + rType = 0; + vrLen = 2546; + vrLoc = 0; + }; 9452BDC10F4095DE006410DE /* sqSqueakIPhoneApplication+Network.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1036, 652}}"; @@ -1940,9 +1894,9 @@ }; 9452D5D90E044A9D000AD792 /* sqMacV2Time.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 1950}}"; - sepNavSelRange = "{2417, 19}"; - sepNavVisRange = "{1164, 1495}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 2145}}"; + sepNavSelRange = "{1042, 0}"; + sepNavVisRange = "{3, 2080}"; sepNavWindowFrame = "{{86, 36}, {1441, 887}}"; }; }; @@ -1962,9 +1916,9 @@ }; 9452D5DC0E044A9D000AD792 /* sqSqueakFileDirectoryAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1533, 2691}}"; - sepNavSelRange = "{4819, 15}"; - sepNavVisRange = "{4041, 1408}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 2678}}"; + sepNavSelRange = "{4430, 0}"; + sepNavVisRange = "{3903, 1618}"; sepNavWindowFrame = "{{15, 43}, {1379, 980}}"; }; }; @@ -1986,9 +1940,9 @@ }; 9452D5DF0E044A9D000AD792 /* sqSqueakMainApp.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 2236}}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 2028}}"; sepNavSelRange = "{2637, 7}"; - sepNavVisRange = "{1974, 1343}"; + sepNavVisRange = "{2007, 1285}"; }; }; 9452D5E00E044A9D000AD792 /* sqSqueakMainApp.h */ = { @@ -2024,9 +1978,9 @@ }; 9452D5E40E044A9D000AD792 /* sqSqueakMainApplication.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1327, 3315}}"; - sepNavSelRange = "{4551, 0}"; - sepNavVisRange = "{4190, 676}"; + sepNavIntBoundsRect = "{{0, 0}, {1125, 3133}}"; + sepNavSelRange = "{3917, 9}"; + sepNavVisRange = "{3157, 1389}"; sepNavWindowFrame = "{{15, 40}, {905, 983}}"; }; }; @@ -2285,7 +2239,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1132, 1469}}"; sepNavSelRange = "{3679, 40}"; - sepNavVisRange = "{2469, 1663}"; + sepNavVisRange = "{1736, 2397}"; sepNavWindowFrame = "{{242, 4}, {1438, 968}}"; }; }; @@ -2311,7 +2265,7 @@ ignoreCount = 0; lineNumber = 101; location = Squeak; - modificationTime = 304290363.573497; + modificationTime = 304463420.065413; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2327,7 +2281,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1132, 1352}}"; sepNavSelRange = "{3036, 111}"; - sepNavVisRange = "{1808, 1576}"; + sepNavVisRange = "{1524, 2240}"; sepNavWindowFrame = "{{61, 13}, {1438, 968}}"; }; }; @@ -2344,7 +2298,7 @@ ignoreCount = 0; lineNumber = 37; location = Squeak; - modificationTime = 304290363.619149; + modificationTime = 304463420.0877531; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2361,7 +2315,7 @@ ignoreCount = 0; lineNumber = 45; location = Squeak; - modificationTime = 304290363.654928; + modificationTime = 304463420.145815; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2378,7 +2332,7 @@ ignoreCount = 0; lineNumber = 50; location = Squeak; - modificationTime = 304290363.682939; + modificationTime = 304463420.168305; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2395,7 +2349,7 @@ ignoreCount = 0; lineNumber = 72; location = Squeak; - modificationTime = 304290363.720711; + modificationTime = 304463420.228368; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2412,7 +2366,7 @@ ignoreCount = 0; lineNumber = 88; location = Squeak; - modificationTime = 304290363.765716; + modificationTime = 304463420.267176; originalNumberOfMultipleMatches = 1; state = 1; }; @@ -2425,7 +2379,7 @@ }; 9458525510F04339001401E7 /* sqSqueakIPhoneClipboardAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1377, 545}}"; + sepNavIntBoundsRect = "{{0, 0}, {1377, 808}}"; sepNavSelRange = "{398, 28}"; sepNavVisRange = "{0, 1345}"; }; @@ -2456,9 +2410,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 31; - modificationTime = 304290353.866848; + modificationTime = 304463582.434054; originalNumberOfMultipleMatches = 1; - state = 0; + state = 1; }; 9458528110F045FC001401E7 /* sqSqueakIPhoneClipboardAPI.m:24 */ = { isa = PBXFileBreakpoint; @@ -2472,9 +2426,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 24; - modificationTime = 304290353.866867; + modificationTime = 304463582.433993; originalNumberOfMultipleMatches = 1; - state = 0; + state = 1; }; 9458528310F045FD001401E7 /* sqSqueakIPhoneClipboardAPI.m:17 */ = { isa = PBXFileBreakpoint; @@ -2488,9 +2442,9 @@ hitCount = 0; ignoreCount = 0; lineNumber = 17; - modificationTime = 304290353.86688; + modificationTime = 304463582.434035; originalNumberOfMultipleMatches = 1; - state = 0; + state = 1; }; 945BA53B10B218F700C2020C /* math.h */ = { isa = PBXFileReference; @@ -2936,24 +2890,6 @@ rLen = 0; rLoc = 9223372036854775808; }; - 9475A81411E6959C0010FB38 /* ObjectiveCPlugin.c:1770 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */; - functionName = "primitivePerformSelector()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 1770; - location = Squeak; - modificationTime = 304290353.86698; - originalNumberOfMultipleMatches = 1; - state = 2; - }; 9475A83511E6B5D50010FB38 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9478E02B0EC8D957007096A7 /* squeakSUnitTester.m */; @@ -3361,15 +3297,18 @@ "b-unsigned char--[sqSqueakOSXNSView(BitmapConversion) extractPixels_16_to_32:srcPixelWidth:left:right:top:bottom:position:]" = 3; "bits-NSInteger-\U0001\U0000-[sqSqueakOSXApplication(cursor) setCursor:withMask:offsetX:offsetY:]" = 3; "currentVMEncoding-NSInteger-\U0001\U0000-[sqSqueakMainApplication(attributes) getAttribute:]" = 1; - "endAddr-long unsigned int-sqMakeMemoryNotExecutableFromTo" = 2; + "endAddr-long unsigned int-sqMakeMemoryNotExecutableFromTo" = 1; + "firstPage-long unsigned int-sqMakeMemoryNotExecutableFromTo" = 1; "g-unsigned char--[sqSqueakOSXNSView(BitmapConversion) extractPixels_16_to_32:srcPixelWidth:left:right:top:bottom:position:]" = 3; "inCommandID-MenuCommand-GetIndMenuItemWithCommandID" = 5; "inputCommandID-OSType-GetIndMenuItemWithCommandID" = 5; "mask-NSInteger-\U0001\U0000-[sqSqueakOSXApplication(cursor) setCursor:withMask:offsetX:offsetY:]" = 3; + memory = 1; "modifierFlags-NSUInteger--[sqSqueakOSXNSView doCommandBySelector:]" = 3; "modifierFlags-NSUInteger--[sqSqueakOSXNSView fakeKeyDownUp:]" = 1; "oop-usqInt-pointerForOop" = 1; "oop-usqInt-sweepPhase" = 2; + "ptr-char *-longAtPointerput" = 2; "r-unsigned char--[sqSqueakOSXNSView(BitmapConversion) extractPixels_16_to_32:srcPixelWidth:left:right:top:bottom:position:]" = 3; "rgb-short int--[sqSqueakOSXNSView(BitmapConversion) extractPixels_16_to_32:srcPixelWidth:left:right:top:bottom:position:]" = 3; "rgb-short unsigned int--[sqSqueakOSXNSView(BitmapConversion) extractPixels_16_to_32:srcPixelWidth:left:right:top:bottom:position:]" = 3; @@ -3443,9 +3382,9 @@ }; 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 2470}}"; - sepNavSelRange = "{4452, 0}"; - sepNavVisRange = "{100, 2750}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 2483}}"; + sepNavSelRange = "{3420, 0}"; + sepNavVisRange = "{2475, 1373}"; sepNavWindowFrame = "{{15, 4}, {1426, 1019}}"; }; }; @@ -3459,9 +3398,9 @@ }; 947E64CB10AA16FE00D3B69E /* sqSqueakOSXApplication.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 3497}}"; - sepNavSelRange = "{8195, 13}"; - sepNavVisRange = "{6398, 1962}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 3523}}"; + sepNavSelRange = "{4181, 0}"; + sepNavVisRange = "{3438, 1384}"; sepNavWindowFrame = "{{522, 48}, {1017, 978}}"; }; }; @@ -3801,24 +3740,6 @@ vrLen = 1506; vrLoc = 6448; }; - 9492B3E611F1679100EDB3D3 /* sqUnixHeartbeat.c:137 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */; - functionName = "updateMicrosecondClock()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 137; - location = Squeak; - modificationTime = 304290353.867011; - originalNumberOfMultipleMatches = 1; - state = 2; - }; 9493E98F10EE90BC000C4FB3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94360A8C10E84CC90060221A /* NSException.h */; @@ -3845,9 +3766,9 @@ }; 9494928011E5178D0019BC29 /* gcc3x-cointerp.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {2483, 575042}}"; - sepNavSelRange = "{1325796, 0}"; - sepNavVisRange = "{1259642, 827}"; + sepNavIntBoundsRect = "{{0, 0}, {1538, 574184}}"; + sepNavSelRange = "{677524, 25}"; + sepNavVisRange = "{0, 0}"; sepNavWindowFrame = "{{295, 4}, {1385, 1024}}"; }; }; @@ -3875,9 +3796,9 @@ }; 949492C311E51C6B0019BC29 /* sqExternalSemaphores.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1327, 3120}}"; - sepNavSelRange = "{4416, 0}"; - sepNavVisRange = "{3432, 1785}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 2925}}"; + sepNavSelRange = "{2737, 7}"; + sepNavVisRange = "{0, 2031}"; }; }; 949492C411E51C6B0019BC29 /* sqAtomicOps.h */ = { @@ -3898,10 +3819,10 @@ }; 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1327, 9295}}"; - sepNavSelRange = "{8687, 0}"; - sepNavVisRange = "{8293, 800}"; - sepNavWindowFrame = "{{712, 4}, {1573, 1024}}"; + sepNavIntBoundsRect = "{{0, 0}, {1327, 9100}}"; + sepNavSelRange = "{18414, 0}"; + sepNavVisRange = "{17993, 851}"; + sepNavWindowFrame = "{{966, 4}, {714, 1024}}"; }; }; 9494932D11E527180019BC29 /* sqUnixThreads.c */ = { @@ -3976,9 +3897,9 @@ }; 949493BF11E52ADE0019BC29 /* aio.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 5226}}"; - sepNavSelRange = "{6537, 16}"; - sepNavVisRange = "{5810, 903}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 5330}}"; + sepNavSelRange = "{5142, 7}"; + sepNavVisRange = "{4481, 1294}"; sepNavWindowFrame = "{{61, 148}, {901, 833}}"; }; }; @@ -4012,6 +3933,16 @@ vrLen = 2328; vrLoc = 2495; }; + 9499A91A1225C3B000022E3A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 947E647A10AA100900D3B69E /* SqueakOSXAppDelegate.m */; + name = "SqueakOSXAppDelegate.m: 90"; + rLen = 0; + rLoc = 3420; + rType = 0; + vrLen = 1373; + vrLoc = 2475; + }; 949AD35211E54A81006D6BF4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9424FF660DDCB1EF009912BF /* sqConfig.h */; @@ -4299,9 +4230,9 @@ }; 94A3488D0DDCCCC700D1D4A9 /* sqSqueakScreenAPI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1132, 1768}}"; - sepNavSelRange = "{2583, 34}"; - sepNavVisRange = "{1970, 1566}"; + sepNavIntBoundsRect = "{{0, 0}, {1283, 1768}}"; + sepNavSelRange = "{3470, 21}"; + sepNavVisRange = "{2583, 1200}"; sepNavWindowFrame = "{{21, 20}, {694, 1008}}"; }; }; @@ -4356,13 +4287,6 @@ path = "/Users/johnmci/Documents/SqueakBrowserPlugin/platforms/Mac OS/vm/npsqueak copy/npsqueak.c"; sourceTree = "<absolute>"; }; - 94AF3A0212231A0B00691409 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658FA0DDD03FE00358328 /* HostWindowPlugin.c */; - rLen = 16; - rLoc = 3929; - rType = 0; - }; 94AF3A1F12231A7200691409 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94A1B0050E0DBE2400EB5EFC /* sqSqueakMainApplication+events.h */; @@ -4373,16 +4297,6 @@ vrLen = 2005; vrLoc = 0; }; - 94AF3A2012231A7200691409 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 94E658FA0DDD03FE00358328 /* HostWindowPlugin.c */; - name = "HostWindowPlugin.c: 144"; - rLen = 16; - rLoc = 3929; - rType = 0; - vrLen = 1927; - vrLoc = 2866; - }; 94B1514E0DE2CE530059F208 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94B1514F0DE2CE530059F208 /* sqMacWindowUniversal.c */; @@ -4702,9 +4616,9 @@ }; 94BCE6870DDDECB800F38F31 /* HostWindowPlugin.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 897}}"; - sepNavSelRange = "{2994, 18}"; - sepNavVisRange = "{834, 2652}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 1040}}"; + sepNavSelRange = "{970, 21}"; + sepNavVisRange = "{0, 2546}"; sepNavWindowFrame = "{{15, 59}, {1394, 964}}"; }; }; @@ -5135,9 +5049,9 @@ }; 94C887FA10ADCEFC007CB39E /* sqSqueakOSXApplication+imageReadWrite.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 1781}}"; - sepNavSelRange = "{3878, 0}"; - sepNavVisRange = "{3106, 1733}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 1807}}"; + sepNavSelRange = "{2666, 0}"; + sepNavVisRange = "{1809, 1595}"; sepNavWindowFrame = "{{685, 4}, {878, 1019}}"; }; }; @@ -5285,42 +5199,6 @@ vrLen = 2321; vrLoc = 1767; }; - 94D1252311E6F03A00AAF81C /* aio.c:211 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 949493BF11E52ADE0019BC29 /* aio.c */; - functionName = "aioPoll()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 211; - location = Squeak; - modificationTime = 304290363.89664; - originalNumberOfMultipleMatches = 1; - state = 1; - }; - 94D1254511E6F14C00AAF81C /* aio.c:276 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 949493BF11E52ADE0019BC29 /* aio.c */; - functionName = "aioSleepForUsecs()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 276; - location = Squeak; - modificationTime = 304290353.867002; - originalNumberOfMultipleMatches = 1; - state = 2; - }; 94D16BFC10BCEFEE00A69A89 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94D16BFD10BCEFEE00A69A89 /* Document.m */; @@ -5394,9 +5272,9 @@ }; 94D16CAF10BCF96B00A69A89 /* Credits.rtf */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1140, 583}}"; - sepNavSelRange = "{215, 0}"; - sepNavVisRect = "{{0, 0}, {1140, 583}}"; + sepNavIntBoundsRect = "{{0, 0}, {1140, 649}}"; + sepNavSelRange = "{269, 0}"; + sepNavVisRect = "{{0, 0}, {1140, 649}}"; sepNavWindowFrame = "{{175, 9}, {878, 1019}}"; }; }; @@ -6000,23 +5878,6 @@ path = /Developer/SDKs/MacOSX10.6.sdk/usr/include/sys/mman.h; sourceTree = "<absolute>"; }; - 94E1BD9C11E5A94E00D5B92B /* sqMacV2Time.c:64 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 9452D5D90E044A9D000AD792 /* sqMacV2Time.c */; - hitCount = 0; - ignoreCount = 0; - lineNumber = 64; - location = Squeak; - modificationTime = 304290363.834203; - originalNumberOfMultipleMatches = 1; - state = 1; - }; 94E1BDAB11E5A9F400D5B92B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9452D5DF0E044A9D000AD792 /* sqSqueakMainApp.m */; @@ -6202,8 +6063,8 @@ }; 94E658E10DDD03FE00358328 /* interp.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 644}}"; - sepNavSelRange = "{208, 7}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 572}}"; + sepNavSelRange = "{161, 5}"; sepNavVisRange = "{0, 685}"; sepNavWindowFrame = "{{38, 14}, {799, 988}}"; }; @@ -6252,9 +6113,9 @@ }; 94E658F40DDD03FE00358328 /* FilePlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 14235}}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 14144}}"; sepNavSelRange = "{27580, 7}"; - sepNavVisRange = "{26797, 1763}"; + sepNavVisRange = "{26914, 1464}"; sepNavWindowFrame = "{{21, 20}, {694, 1008}}"; }; }; @@ -6274,9 +6135,9 @@ }; 94E658FA0DDD03FE00358328 /* HostWindowPlugin.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1482, 5226}}"; + sepNavIntBoundsRect = "{{0, 0}, {1433, 5148}}"; sepNavSelRange = "{3929, 16}"; - sepNavVisRange = "{3371, 1201}"; + sepNavVisRange = "{2906, 1887}"; }; }; 94E658FE0DDD03FE00358328 /* JPEGReaderPlugin.c */ = { @@ -6941,6 +6802,102 @@ path = "/Users/johnmci/Documents/Squeak3.8.0/History/4.2.4b1/platforms/unix/vm-display-Quartz/sqUnixQuartz.m"; sourceTree = "<absolute>"; }; + 94E8FA3C12258ED500EECD29 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94D16CAF10BCF96B00A69A89 /* Credits.rtf */; + name = "Credits.rtf: 9"; + rLen = 0; + rLoc = 269; + rType = 0; + vrLen = 425; + vrLoc = 0; + }; + 94E8FA5112258F6F00EECD29 /* sqSqueakMainApplication.m:177 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 9452D5E40E044A9D000AD792 /* sqSqueakMainApplication.m */; + functionName = "-runSqueak"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 177; + location = Squeak; + modificationTime = 304463420.3648299; + originalNumberOfMultipleMatches = 1; + state = 1; + }; + 94E8FA5712258FA800EECD29 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9494928011E5178D0019BC29 /* gcc3x-cointerp.c */; + name = "gcc3x-cointerp.c: 12727"; + rLen = 16; + rLoc = 412648; + rType = 0; + vrLen = 2071; + vrLoc = 1123634; + }; + 94E8FA6512258FDF00EECD29 /* sqMacV2Memory.c:191 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 9424FF670DDCB202009912BF /* sqMacV2Memory.c */; + functionName = "sqMakeMemoryExecutableFromTo()"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 191; + location = Squeak; + modificationTime = 304463420.461111; + originalNumberOfMultipleMatches = 1; + state = 1; + }; + 94E8FA731225913000EECD29 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9424FF670DDCB202009912BF /* sqMacV2Memory.c */; + name = "sqMacV2Memory.c: 201"; + rLen = 0; + rLoc = 7077; + rType = 0; + vrLen = 1411; + vrLoc = 5596; + }; + 94E8FB181225ABA900EECD29 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94210B280E956AC200C1A314 /* ObjectiveCPlugin.c */; + name = "ObjectiveCPlugin.c: 1770"; + rLen = 0; + rLoc = 49226; + rType = 0; + vrLen = 1351; + vrLoc = 49390; + }; + 94E8FB6B1225BE3D00EECD29 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 9452D5E40E044A9D000AD792 /* sqSqueakMainApplication.m */; + name = "sqSqueakMainApplication.m: 131"; + rLen = 9; + rLoc = 3895; + rType = 0; + vrLen = 1238; + vrLoc = 3417; + }; + 94E8FB6C1225BE3D00EECD29 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 94C887FA10ADCEFC007CB39E /* sqSqueakOSXApplication+imageReadWrite.m */; + name = "sqSqueakOSXApplication+imageReadWrite.m: 62"; + rLen = 0; + rLoc = 2666; + rType = 0; + vrLen = 1595; + vrLoc = 1809; + }; 94ED7EFA0E6C2ABE00F4DD03 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94ED7EFB0E6C2ABE00F4DD03 /* Document.m */; @@ -6970,15 +6927,15 @@ }; 94EF6CBE11E55947003BA64D /* gcc3x-interp.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 507455}}"; - sepNavSelRange = "{1008179, 11}"; - sepNavVisRange = "{1007942, 446}"; + sepNavIntBoundsRect = "{{0, 0}, {1020, 507611}}"; + sepNavSelRange = "{1007942, 17}"; + sepNavVisRange = "{1007136, 1464}"; sepNavWindowFrame = "{{512, 195}, {901, 833}}"; }; }; 94EF6CC011E55947003BA64D /* interp.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1368, 644}}"; + sepNavIntBoundsRect = "{{0, 0}, {1132, 597}}"; sepNavSelRange = "{134, 7}"; sepNavVisRange = "{0, 586}"; }; @@ -7030,24 +6987,6 @@ path = "/Volumes/330GB Photos/Cog/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c"; sourceTree = "<absolute>"; }; - 94EF6FB511E57577003BA64D /* sqUnixHeartbeat.c:168 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 9494932C11E527180019BC29 /* sqUnixHeartbeat.c */; - functionName = "ioHighResClock()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 168; - location = Squeak; - modificationTime = 304290363.79651; - originalNumberOfMultipleMatches = 1; - state = 1; - }; 94EF6FD211E57601003BA64D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 94E659100DDD03FE00358328 /* SocketPlugin.c */; @@ -7394,23 +7333,6 @@ vrLen = 2027; vrLoc = 0; }; - 94FE71E61220871700417A56 /* gcc3x-interp.c:31091 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - breakpointStyle = 0; - continueAfterActions = 0; - countType = 0; - delayBeforeContinue = 0; - fileReference = 94EF6CBE11E55947003BA64D /* gcc3x-interp.c */; - functionName = "primitiveSignalAtMilliseconds()"; - hitCount = 0; - ignoreCount = 0; - lineNumber = 31091; - modificationTime = 304290353.86702; - originalNumberOfMultipleMatches = 1; - state = 0; - }; 94FE71E81220876700417A56 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 9403774E121D9C5200ECC885 /* interp.c */; Modified: trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-08-25 21:48:36 UTC (rev 2262) +++ trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj 2010-08-25 21:48:56 UTC (rev 2263) @@ -2339,7 +2339,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = i386; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_DYNAMIC_NO_PIC = NO; @@ -2361,11 +2361,11 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = NO; INFOPLIST_FILE = "SqueakPureObjc-InfoCOG.plist"; MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; + PER_ARCH_CFLAGS_i386 = "-DLSB_FIRST"; PRODUCT_NAME = Squeak; - SDKROOT = macosx10.5; + SDKROOT = macosx10.6; }; name = Debug; }; @@ -2374,7 +2374,6 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = i386; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: John McIntosh (ET3XJAMU3R)"; COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_OPTIMIZATION_LEVEL = s; @@ -2393,10 +2392,9 @@ GCC_VERSION = ""; INFOPLIST_FILE = "SqueakPureObjc-InfoCOG.plist"; MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = NO; - PER_ARCH_CFLAGS_i386 = " -DLSB_FIRST -DUSE_INLINE_MEMORY_ACCESSORS"; + PER_ARCH_CFLAGS_i386 = "-DLSB_FIRST -mfpmath=sse -finline-functions -fomit-frame-pointer -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m "; PRODUCT_NAME = Squeak; - SDKROOT = macosx10.5; + SDKROOT = macosx10.6; }; name = Distribution; };

1 0

[commit] r2262 - iOS update credits.rtf, and ensure thread stack has 4x the size for CogVM JIT to work within.
by commits＠squeakvm.org 25 Aug '10

25 Aug '10

Author: johnmci Date: 2010-08-25 14:48:36 -0700 (Wed, 25 Aug 2010) New Revision: 2262 Modified: trunk/platforms/iOS/vm/OSX/Credits.rtf trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m Log: iOS update credits.rtf, and ensure thread stack has 4x the size for CogVM JIT to work within. Modified: trunk/platforms/iOS/vm/OSX/Credits.rtf =================================================================== --- trunk/platforms/iOS/vm/OSX/Credits.rtf 2010-08-25 05:26:42 UTC (rev 2261) +++ trunk/platforms/iOS/vm/OSX/Credits.rtf 2010-08-25 21:48:36 UTC (rev 2262) @@ -7,7 +7,7 @@ (ESUG) for funding the iPhone implementation,\ and the Cocoa OS-X rewrite for 64 bits.\ \ -Author: John M McIntosh.\ +OS-X & iOS port: John M McIntosh.\ Copyright (c) 2009-2010 Corporate Smalltalk Consulting Ltd.\ \ With some code by Ian Piumarta, \ Modified: trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m =================================================================== --- trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2010-08-25 05:26:42 UTC (rev 2261) +++ trunk/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2010-08-25 21:48:36 UTC (rev 2262) @@ -71,9 +71,14 @@ // Run the squeak process in a worker thread - [NSThread detachNewThreadSelector: @selector(runSqueak) - toTarget: self.squeakApplication - withObject: NULL]; + NSThread* myThread = [[NSThread alloc] initWithTarget: self.squeakApplication + selector: @selector(runSqueak) + object:nil]; +#if COGVM + [myThread setStackSize: [myThread stackSize]*4]; +#endif + + [myThread start]; /* This the carbon logic model described by http://developer.apple.com/qa/qa2001/qa1061.html */

1 0

Problem entering pt_BR.UTF-8 chars in cogvm
by Casimiro de Almeida Barreto 25 Aug '10

25 Aug '10

When using cogvm, typing ~a results in a? and not ã. Same with all accented characters. I tried all combinations of -encoding -texenc... This problem happens in vm running in Linux (Fedora 13). Best regards, CdAB

2 2

Re: Use of UTC and offset for system clock (was: [Vm-dev] Re: [squeak-dev] Daily Commit Log)]
by David T. Lewis 25 Aug '10

25 Aug '10

Eliot had intended to CC the list (personal communication) so I am forwarding his reply here: ----- Forwarded message from Eliot Miranda <eliot.miranda(a)gmail.com> ----- Date: Tue, 24 Aug 2010 12:09:18 -0700 Subject: Re: Use of UTC and offset for system clock (was: [Vm-dev] Re: [squeak-dev] Daily Commit Log) From: Eliot Miranda <eliot.miranda(a)gmail.com> To: "David T. Lewis" <lewis(a)mail.msen.com> On Tue, Aug 24, 2010 at 11:07 AM, David T. Lewis <lewis(a)mail.msen.com>wrote: > On Tue, Aug 24, 2010 at 09:43:54AM -0700, Eliot Miranda wrote: > > Hi David, > > > > On Tue, Aug 24, 2010 at 5:24 AM, David T. Lewis <lewis(a)mail.msen.com> > wrote: > > > > > Eliot, > > > > > > I am afraid that I may have misunderstood your original request > > > to retract the change. > > > > > > I assumed that you were refering to Time class>>primUtcWithOffset > > > that I had added to trunk (and I did remove that method), but > > > in rereading your note I think you may have been referring to > > > the earlier VMMaker updates that introduced the primitives > > > #primitiveMicrosecondClock and #primitiveUtcWithOffset. In > > > particular, #primitiveMicrosecondClock seems similar to the > > > Cog primitives, which include #primitiveUTCMicrosecondClock > > > and #primitiveLocalMicrosecondClock. > > > > > > Apologies for my misunderstanding, but can you please clarify > > > which methods you were suggesting should be retracted? > > > > > > Interpreter>>primitiveMicrosecondClock > > > Interpreter>>primitiveUtcWithOffset > > > Time class>>primMicrosecondClock > > > Time class>>primUtcWithOffset > > > > > > > If primitiveMicrosecondClock answers 64-bit UTC microseconds since 1901 > this > > is the same as Cog's primitiveUTCMicrosecondClock and should be retained. > > primitiveMicrosecondClock is like primitiveMillisecondClock in that > it answers a value that rolls over periodically, and it not a measure > of duration relative to any epoch. The extra precision is of course > meaningless for any individual call, but apparently is of value when > taken cumulatively for purposes of profiling. I will have to defer > to John as to whether it can or should be replaced by > primitiveUTCMicrosecondClock. > > In any case, the meanings of primitiveMicrosecondClock and > primitiveUTCMicrosecondClock are different, and I should think > that they could safely coexist as long as we give them detailed > method comments to explain the time basis for each. > Indeed. Except for me a clock that wraps at least every 1 hour 11 minutes and 35 seconds doesn't seem that easy to use ;) > As long as you have no objection, I strongly prefer to retain > primitiveUtcWithOffset in its current form, regardless of whether > it actually gets used for anything near term. It's something that > Lex Spoon proposed ten years ago and it's near and dear to my heart > after my experience implementing the TimeZoneDatabase. > That's no problem. > I note that I should change the primitive name in SqueakVM from > "primitiveUtcWithOffset" to "primitiveUTCWithOffset" for consistency. > Agreed. > > It also needs a 64-bit local microseconds since 1901 which would be the > > same as Cog's primitiveLocalMicrosecondClock and a > > primitiveSignalAtUTCMicroseconds which is for 64-bit microseconds since > 1901 > > what primitiveSignalAtMilliseconds is for 30-bit wrapping milliseconds > > (again see Cog). > > OK. And I would see no reason not to add these to the traditional SqueakVM > as well. If you have specific suggestions as to which of the new Cog > primitives should go into SqueakVM for consistency, that would help. > I am assuming that at some point we want the Squeak trunk to start making > use of the new Cog primitives, and that therefore they should also made > available in the traditional SqueakVM. > I would add all 4 of these new 64-bit time primitives to the existing VM, perhaps holding off to implement the idea of cacheing previous results to answer new result objects only when the time actually changes. The point being that such a single time basis has lots of benefits for image level code (see John's message later in this thread ;) ). > > > We then need to agree on some primitive numbers or > > primitive names. In Cog these three are > > > > (240 primitiveUTCMicrosecondClock) "was serial port primitive" > > (241 primitiveLocalMicrosecondClock) "was serial port primitive" > > (242 primitiveSignalAtUTCMicroseconds) > > > > Cog also has > > (243 primitiveUpdateTimezone) "primStringtranslatefromtotable" > > > > primitiveUpdateTimezone > > "Update the VMs notion of the current timezone. The VM sets its notion > > of the timezone once at start-up. If one wants the VM to keep its > notion > > up-to-date arrange to invoke this primitive periodically." > > self ioUpdateVMTimezone > > > > which causes the VM to reevaluate the delta between UTC and local > > microseconds. > > > > With these four one has a non-wrapping synchronised timebase with > > potentially microsecond resolution that marries well with Squeak's 64-bit > > integer support. This approach worked very well for VisualWorks where we > > got rid of lots of customer problems every 49.7 days (2^32 milliseconds). > > There has been some concern expressed about the performance impact of > long > > integers but at least in VW that simply wasn't an issue. > > > > At this point, primitiveMicrosecondClock and primitiveUtcWithOffset > are not numbered primitives, and I see no need for them to be numbered. > As far as I know, no one else has plans to consume additional primitive > numbers, so we are following your lead with respect to assigning > primitive numbers (and I should update the SqueakVM table accordingly). > Yes, we need to do a merge of the tables. I'm going to discuss this with John real soon now. > > Thanks, > Dave > > ----- End forwarded message -----

1 0

[commit] r2261 - iOS update iOS memory mprotect routines to match unix ones which now do page alignment to avoid failure on setting chuck of cog memory to read/write -execute
by commits＠squeakvm.org 25 Aug '10

25 Aug '10

Author: johnmci Date: 2010-08-24 22:26:42 -0700 (Tue, 24 Aug 2010) New Revision: 2261 Modified: trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c Log: iOS update iOS memory mprotect routines to match unix ones which now do page alignment to avoid failure on setting chuck of cog memory to read/write -execute Modified: trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c =================================================================== --- trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c 2010-08-25 01:35:31 UTC (rev 2260) +++ trunk/platforms/iOS/vm/iPhone/sqMacV2Memory.c 2010-08-25 05:26:42 UTC (rev 2261) @@ -77,12 +77,15 @@ #endif } +static size_t pageSize; +static size_t pageMask; + usqInt sqAllocateMemoryMac(sqInt minHeapSize, sqInt *desiredHeapSize, FILE * f,usqInt headersize) { void *possibleLocation,*startOfAnonymousMemory; off_t fileSize; struct stat sb; - size_t pageSize= getpagesize(); - size_t pageMask= ~(pageSize - 1); + pageSize= getpagesize(); + pageMask= ~(pageSize - 1); #define valign(x) ((x) & pageMask) #pragma unused(minHeapSize,desiredHeapSize) @@ -176,11 +179,14 @@ #endif #if COGVM +# define roundDownToPageBoundary(v) ((v)&pageMask) +# define roundUpToPageBoundary(v) (((v)+pageSize-1)&pageMask) void sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr) { - if (mprotect((void*)startAddr, - endAddr - startAddr + 1, + unsigned long firstPage = roundDownToPageBoundary(startAddr); + if (mprotect((void *)firstPage, + roundUpToPageBoundary(endAddr - firstPage), PROT_READ | PROT_WRITE | PROT_EXEC) < 0) perror("mprotect(x,y,PROT_READ | PROT_WRITE | PROT_EXEC)"); } @@ -188,8 +194,9 @@ void sqMakeMemoryNotExecutableFromTo(unsigned long startAddr, unsigned long endAddr) { - if (mprotect((void*)startAddr, - endAddr - startAddr + 1, + unsigned long firstPage = roundDownToPageBoundary(startAddr); + if (mprotect((void *)firstPage, + roundUpToPageBoundary(endAddr - firstPage), PROT_READ | PROT_WRITE) < 0) perror("mprotect(x,y,PROT_READ | PROT_WRITE)"); }

1 0

[BUG] CogVM crash on Windows
by Levente Uzonyi 25 Aug '10

25 Aug '10

Hi, evaluating [Display newDepth: x] where the value of x is 1, 4, 8 or 16 crashes the VM. No crash dump is written. If x is 2, -1, -2 or -4, then the image informs me that the depth is not available on the system. If x is -8 or -16 then the code works. For the x=16 case gdb shows the following: Program received signal SIGSEGV, Segmentation fault. reverse_image_words (dst=0x1450eca4, src=0x1450eca4, depth=0, width=1272, rect=0x561e60) at ../platforms/win32/vm/sqWin32Window.c:1875 1875 unsigned int value = *srcPixPtr++; (gdb) where #0 reverse_image_words (dst=0x1450eca4, src=0x1450eca4, depth=0, width=1272, rect=0x561e60) at ../platforms/win32/vm/sqWin32Window.c:1875 #1 0x0043f61a in ioShowDisplay (dispBits=340847780, width=1272, height=745, depth=16, affectedL=0, affectedR=1000, affectedT=0, affectedB=0) at ../platforms/win32/vm/sqWin32Window.c:2324 #2 0x00403270 in displayBitsOfLeftTopRightBottom (aForm=-719257650, l=0, t=0, r=1272, b=745) at ../src/vm/gcc3x-cointerp.c:13701 #3 0x00405ff9 in fullDisplayUpdate () at ../src/vm/gcc3x-cointerp.c:16777 #4 0x0044093a in MainWndProcW (hwnd=0xf05f6, message=15, wParam=0, lParam=0) at ../platforms/win32/vm/sqWin32Window.c:447 #5 0x75fef8d2 in USER32!GetMessageW () from /cygdrive/c/Windows/system32/user32.dll #6 0x75fef794 in USER32!GetWindowLongW () from /cygdrive/c/Windows/system32/user32.dll #7 0x004403dc in sqLaunchDrop () at ../platforms/win32/vm/sqWin32Window.c:2773 #8 0x75ff0817 in USER32!ReleaseDC () from /cygdrive/c/Windows/system32/user32.dll #9 0x75ff0a65 in USER32!GetWindowThreadProcessId () from /cygdrive/c/Windows/system32/user32.dll #10 0x776a99ce in ntdll!LdrEnumResources () from /cygdrive/c/Windows/system32/ntdll.dll #11 0x00ace008 in ?? () #12 0x00000018 in ?? () ---Type <return> to continue, or q <return> to quit--- #13 0x00ace058 in ?? () #14 0x776a9980 in ntdll!LdrDisableThreadCalloutsForDll () from /cygdrive/c/Windows/system32/ntdll.dll #15 0x0204c1d8 in ?? () #16 0x0000000f in ?? () #17 0x00000000 in ?? () (gdb) info registers eax 0xd520ffce -719257650 ecx 0x3 3 edx 0x0 0 ebx 0x1f4 500 esp 0xacd5b4 0xacd5b4 ebp 0x0 0x0 esi 0x1511a000 353476608 edi 0x1511a000 353476608 eip 0x43ed0c 0x43ed0c <reverse_image_words+353> eflags 0x10216 [ PF AF IF RF ] cs 0x1b 27 ss 0x23 35 ds 0x23 35 es 0x23 35 fs 0x3b 59 gs 0x0 0 It may be a compiler bug, because the 4.0.2 SqueakVM doesn't have this issue. It's a bit suspicious that depth is 0 here: #0 reverse_image_words (dst=0x1450eca4, src=0x1450eca4, depth=0, width=1272, rect=0x561e60) at ../platforms/win32/vm/sqWin32Window.c:1875 but the value of depth is known at compilation time (16), so it may be some compiler "magic". Here are the values of the variables in the method: (gdb) p dst $2 = (unsigned int *) 0x1450eca4 (gdb) p src $3 = (unsigned int *) 0x1450eca4 (gdb) p depth $4 = 0 (gdb) p width $5 = 1272 (gdb) p rect $6 = (RECT *) 0x561e60 (gdb) p rect->left $7 = 0 (gdb) p rect->right $8 = 1000 (gdb) p rect->top $9 = 0 (gdb) p rect->bottom $10 = 745 (gdb) p pitch $11 = 353476608 (gdb) p first $12 = 3 (gdb) p last No symbol "last" in current context. (gdb) p nWords $13 = 500 (gdb) p delta $14 = 0 (gdb) p yy $15 = 0 (gdb) p srcPixPtr $16 = (DWORD *) 0x1511a000 (gdb) p dstPixPtr $17 = (DWORD *) 0x1511a000 (gdb) p i $18 = -719257650 (gdb) p value $19 = 0 Cheers, Levente

3 3

[commit] r2260 - Fix win32 image byte/word reversal under gcc >= 3.x.
by commits＠squeakvm.org 25 Aug '10

25 Aug '10

Author: eliot Date: 2010-08-24 18:35:31 -0700 (Tue, 24 Aug 2010) New Revision: 2260 Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c Log: Fix win32 image byte/word reversal under gcc >= 3.x. Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Window.c 2010-08-25 00:41:22 UTC (rev 2259) +++ branches/Cog/platforms/win32/vm/sqWin32Window.c 2010-08-25 01:35:31 UTC (rev 2260) @@ -1778,8 +1778,8 @@ # if defined(__GNUC__) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) /* GCC generates *optimal* code with a little help */ # if __GNUC__ >= 3 -# define BYTE_SWAP(w) __asm__("bswap %%eax" : "=r" (w) : "r" (w)) -# define WORD_SWAP(w) __asm__("roll $16, %%eax" : "=r" (w) : "r" (w)) +# define BYTE_SWAP(w) __asm__("bswap %0" : "=r" (w) : "r" (w)) +# define WORD_SWAP(w) __asm__("roll $16, %0" : "=r" (w) : "r" (w)) # else # define BYTE_SWAP(w) __asm__("bswap %%eax" : "=eax" (w) : "eax" (w)) # define WORD_SWAP(w) __asm__("roll $16, %%eax" : "=eax" (w) : "eax" (w))

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2010