[Vm-dev] [commit][3333] JMM-don't put up alert panels,
ensure workerthread can run if needbe
commits at squeakvm.org
commits at squeakvm.org
Mon May 11 01:14:08 UTC 2015
Revision: 3333
Author: johnmci
Date: 2015-05-10 18:14:05 -0700 (Sun, 10 May 2015)
Log Message:
-----------
JMM-don't put up alert panels, ensure workerthread can run if needbe
Modified Paths:
--------------
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-05-11 00:44:48 UTC (rev 3332)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.pbxproj 2015-05-11 01:14:05 UTC (rev 3333)
@@ -118,7 +118,6 @@
9487746510C64DD800E4AEC5 /* sqSqueakMainApplication+screen.m in Sources */ = {isa = PBXBuildFile; fileRef = 94A0E9830DE5F1FE0071C8B9 /* sqSqueakMainApplication+screen.m */; };
9487746710C64DD800E4AEC5 /* sqVirtualMachine.c in Sources */ = {isa = PBXBuildFile; fileRef = 9424FF600DDCB1C7009912BF /* sqVirtualMachine.c */; };
9487746810C64DD800E4AEC5 /* Queue.m in Sources */ = {isa = PBXBuildFile; fileRef = 9452D5D80E044A9D000AD792 /* Queue.m */; };
- 9487746910C64DD800E4AEC5 /* sqMacV2Time.c in Sources */ = {isa = PBXBuildFile; fileRef = 9452D5D90E044A9D000AD792 /* sqMacV2Time.c */; };
9487746A10C64DD800E4AEC5 /* sqSqueakFileDirectoryAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 9452D5DC0E044A9D000AD792 /* sqSqueakFileDirectoryAPI.m */; };
9487746B10C64DD800E4AEC5 /* sqSqueakFileDirectoryInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 9452D5DE0E044A9D000AD792 /* sqSqueakFileDirectoryInterface.m */; };
9487746C10C64DD800E4AEC5 /* sqSqueakMainApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 9452D5DF0E044A9D000AD792 /* sqSqueakMainApp.m */; };
@@ -179,7 +178,6 @@
949382731B00176A00C802B2 /* sqUnixVMProfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 949382701B00176A00C802B2 /* sqUnixVMProfile.c */; };
949382751B0017CC00C802B2 /* aio.c in Sources */ = {isa = PBXBuildFile; fileRef = 949382741B0017CC00C802B2 /* aio.c */; };
949382771B001B9F00C802B2 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 949382761B001B9F00C802B2 /* Crashlytics.framework */; };
- 949382781B001C2900C802B2 /* CoreVM.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9422C3B61AFFFB3400448DC0 /* CoreVM.plist */; };
949382791B001C7A00C802B2 /* sqSqueakOSXInfoPlistInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 94BCAE6810ACA10100F87527 /* sqSqueakOSXInfoPlistInterface.m */; };
9493827A1B001C7E00C802B2 /* sqSqueakInfoPlistInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 9412CAE50E6C05EC00DB8625 /* sqSqueakInfoPlistInterface.m */; };
94B9533510E6BD7100DC476A /* MacMenuOS9ToOSX.m in Sources */ = {isa = PBXBuildFile; fileRef = 94B9533410E6BD7100DC476A /* MacMenuOS9ToOSX.m */; };
@@ -191,6 +189,7 @@
94C317621AD49A320096E59D /* SerialPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94C317601AD49A320096E59D /* SerialPlugin.c */; };
94C3176A1AD49B020096E59D /* sqUnixJoystickTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = 94C317661AD49B020096E59D /* sqUnixJoystickTablet.c */; };
94C3176C1AD49B020096E59D /* sqUnixLocale.c in Sources */ = {isa = PBXBuildFile; fileRef = 94C317681AD49B020096E59D /* sqUnixLocale.c */; };
+ 94CECF0D1B00253800E57F1B /* sqMacV2Time.c in Sources */ = {isa = PBXBuildFile; fileRef = 9452D5D90E044A9D000AD792 /* sqMacV2Time.c */; };
94D3654F10CEC86C00805023 /* BitMapConversionLogicFromX11.c in Sources */ = {isa = PBXBuildFile; fileRef = 94D3654E10CEC86C00805023 /* BitMapConversionLogicFromX11.c */; };
94D921551AC631AF00A5970F /* UUIDPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94E6591D0DDD03FE00358328 /* UUIDPlugin.c */; };
94D921561AC6320300A5970F /* SocketPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 94E659100DDD03FE00358328 /* SocketPlugin.c */; };
@@ -1843,7 +1842,6 @@
9487740210C64DD800E4AEC5 /* SqueakPlugin.icns in Resources */,
9422C3B91AFFFB6000448DC0 /* Images.xcassets in Resources */,
9487740310C64DD800E4AEC5 /* SqueakProject.icns in Resources */,
- 949382781B001C2900C802B2 /* CoreVM.plist in Resources */,
9487740410C64DD800E4AEC5 /* SqueakScript.icns in Resources */,
9487740510C64DD800E4AEC5 /* SqueakSources.icns in Resources */,
9487740610C64DD800E4AEC5 /* Credits.rtf in Resources */,
@@ -1952,6 +1950,7 @@
9487744F10C64DD800E4AEC5 /* jidctfst.c in Sources */,
9487745010C64DD800E4AEC5 /* jidctint.c in Sources */,
9487745110C64DD800E4AEC5 /* jidctred.c in Sources */,
+ 94CECF0D1B00253800E57F1B /* sqMacV2Time.c in Sources */,
949382421B000E1700C802B2 /* sqHeapMap.c in Sources */,
9463C1CD1AEE15BC009C5CE5 /* MiscPrimitivePlugin.c in Sources */,
9487745210C64DD800E4AEC5 /* jmemdatadst.c in Sources */,
@@ -1980,7 +1979,6 @@
9487746510C64DD800E4AEC5 /* sqSqueakMainApplication+screen.m in Sources */,
9487746710C64DD800E4AEC5 /* sqVirtualMachine.c in Sources */,
9487746810C64DD800E4AEC5 /* Queue.m in Sources */,
- 9487746910C64DD800E4AEC5 /* sqMacV2Time.c in Sources */,
9487746A10C64DD800E4AEC5 /* sqSqueakFileDirectoryAPI.m in Sources */,
9487746B10C64DD800E4AEC5 /* sqSqueakFileDirectoryInterface.m in Sources */,
9463C1D21AEE1618009C5CE5 /* StarSqueakPlugin.c in Sources */,
@@ -2091,7 +2089,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/uuid;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
SEPARATE_STRIP = YES;
VALID_ARCHS = x86_64;
@@ -2110,7 +2108,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/uuid;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "65867c1c-f0f6-4de4-84cd-3e77826cb368";
SEPARATE_STRIP = YES;
VALID_ARCHS = x86_64;
@@ -2149,6 +2147,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
INFOPLIST_FILE = "$(SRCROOT)/CoreVM.plist";
LD_GENERATE_MAP_FILE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = "";
PRODUCT_NAME = Squeak;
VALID_ARCHS = x86_64;
@@ -2184,6 +2183,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
INFOPLIST_FILE = "$(SRCROOT)/CoreVM.plist";
LD_GENERATE_MAP_FILE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = "";
PRODUCT_NAME = Squeak;
"PROVISIONING_PROFILE[sdk=macosx*]" = "3a8c5546-20a8-40a9-afb4-4218872c980c";
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/project.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 2015-05-11 00:44:48 UTC (rev 3332)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakPureObjcCog.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 2015-05-11 01:14:05 UTC (rev 3333)
@@ -2,4 +2,150 @@
<Bucket
type = "1"
version = "2.0">
+ <Breakpoints>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
+ timestampString = "452994389.12955"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "61"
+ endingLineNumber = "61"
+ landmarkName = "-initWithFrame:"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m"
+ timestampString = "452997671.589229"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "84"
+ endingLineNumber = "84"
+ landmarkName = "-getAttribute:"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m"
+ timestampString = "452998545.508416"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "771"
+ endingLineNumber = "771"
+ landmarkName = "-preDrawThelayers"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m"
+ timestampString = "452998560.740228"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "103"
+ endingLineNumber = "103"
+ landmarkName = "-preDrawThelayers"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m"
+ timestampString = "452998561.662078"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "111"
+ endingLineNumber = "111"
+ landmarkName = "-drawThelayers"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
+ timestampString = "452998565.700942"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "147"
+ endingLineNumber = "147"
+ landmarkName = "-drawThelayers"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
+ timestampString = "452999005.074078"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "137"
+ endingLineNumber = "137"
+ landmarkName = "-drawImageUsingClip:"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m"
+ timestampString = "452999020.475384"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "150"
+ endingLineNumber = "150"
+ landmarkName = "-drawThelayers"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ <BreakpointProxy
+ BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+ <BreakpointContent
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "../../platforms/iOS/vm/iPhone/Classes/SqueakUIViewCALayer.m"
+ timestampString = "452999105.187551"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "94"
+ endingLineNumber = "94"
+ landmarkName = "-drawImageUsingClip:"
+ landmarkType = "5">
+ </BreakpointContent>
+ </BreakpointProxy>
+ </Breakpoints>
</Bucket>
Modified: branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2015-05-11 00:44:48 UTC (rev 3332)
+++ branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2015-05-11 01:14:05 UTC (rev 3333)
@@ -136,7 +136,7 @@
#if COGVM
#error bad
#endif
- NSPanel *panel;
+/* NSPanel *panel;
if (sizeof(long) == 8) {
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.",
@@ -150,14 +150,15 @@
nil,
nil);
}
-
+*/
#endif
- NSRect frame= [panel frame];
+/* NSRect frame= [panel frame];
frame.size.width *= 1.5f;
[panel setFrame: frame display: NO];
[NSApp runModalForWindow: panel];
[panel close];
+*/
}
-(void) setupMainView {
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m 2015-05-11 00:44:48 UTC (rev 3332)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m 2015-05-11 01:14:05 UTC (rev 3333)
@@ -120,7 +120,9 @@
// At this point we did not find a file name in the resources or in the vm directory or via a set image name
if (!fileIsReadable) {
+ dispatch_sync(dispatch_get_main_queue(), ^{
[self attempToOpenImageFromOpenPanel];
+ });
}
return;
More information about the Vm-dev
mailing list