diff --git a/build.macos32x86/common/Makefile.app b/build.macos32x86/common/Makefile.app
index 31c8f3571a..18ab55262a 100644
--- a/build.macos32x86/common/Makefile.app
+++ b/build.macos32x86/common/Makefile.app
@@ -155,13 +155,13 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings
@mkdir -p $(dir $@)
cp -p $< $@
-$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
@mkdir -p $(dir $@)
$(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
--minimum-deployment-target $(TARGET_VERSION_MIN) \
--auto-activate-custom-fonts --output-format human-readable-text \
--compile $(VMMENUNIB) \
- $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+ $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
@mkdir -p $(APP)/Contents/Resources
diff --git a/build.macos32x86/pharo.cog.spur.lowcode/Makefile b/build.macos32x86/pharo.cog.spur.lowcode/Makefile
index 17fbb905f9..03ecb532b1 100644
--- a/build.macos32x86/pharo.cog.spur.lowcode/Makefile
+++ b/build.macos32x86/pharo.cog.spur.lowcode/Makefile
@@ -11,7 +11,7 @@ APPNAMEDEF:=$(APPNAME)
APPIDENTIFIER:=org.pharo.$(APPNAME)
USEPLUGINASDYLIB:=TRUE
THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo
-
+
#CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES
# Now include the Makefile proper, which is common to all Mac OS builds.
diff --git a/build.macos32x86/pharo.cog.spur.minheadless/Makefile b/build.macos32x86/pharo.cog.spur.minheadless/Makefile
index acf8817649..4810cddab8 100644
--- a/build.macos32x86/pharo.cog.spur.minheadless/Makefile
+++ b/build.macos32x86/pharo.cog.spur.minheadless/Makefile
@@ -11,7 +11,7 @@ APPNAMEDEF:=$(APPNAME)
APPIDENTIFIER:=org.pharo.$(APPNAME)
USEPLUGINASDYLIB:=TRUE
THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo
-EXTRAVMLIBS=libsdl2
+EXTRAVMLIBS=libsdl2
# Now include the Makefile proper, which is common to all Mac OS builds.
#
diff --git a/build.macos32x86/pharo.cog.v3/Makefile b/build.macos32x86/pharo.cog.v3/Makefile
index 8c4103c8ce..2ff22fc3b8 100644
--- a/build.macos32x86/pharo.cog.v3/Makefile
+++ b/build.macos32x86/pharo.cog.v3/Makefile
@@ -10,7 +10,7 @@ APPNAME:=Pharo
APPNAMEDEF:=$(APPNAME)
APPIDENTIFIER:=org.pharo.$(APPNAME)
USEPLUGINASDYLIB:=TRUE
-THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo
+THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo
#CFLAGS=$(CFLAGS) -DNSZombieEnabled=YES
diff --git a/build.macos64x64/common/Makefile.app b/build.macos64x64/common/Makefile.app
index 31c8f3571a..18ab55262a 100644
--- a/build.macos64x64/common/Makefile.app
+++ b/build.macos64x64/common/Makefile.app
@@ -155,13 +155,13 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings
@mkdir -p $(dir $@)
cp -p $< $@
-$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
@mkdir -p $(dir $@)
$(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
--minimum-deployment-target $(TARGET_VERSION_MIN) \
--auto-activate-custom-fonts --output-format human-readable-text \
--compile $(VMMENUNIB) \
- $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
+ $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
@mkdir -p $(APP)/Contents/Resources
diff --git a/platforms/iOS/vm/English.lproj/MainMenu-cg.xib b/platforms/iOS/vm/English.lproj/Newspeak-MainMenu-cg.xib
similarity index 100%
rename from platforms/iOS/vm/English.lproj/MainMenu-cg.xib
rename to platforms/iOS/vm/English.lproj/Newspeak-MainMenu-cg.xib
diff --git a/platforms/iOS/vm/English.lproj/MainMenu-opengl.xib b/platforms/iOS/vm/English.lproj/Newspeak-MainMenu-opengl.xib
similarity index 100%
rename from platforms/iOS/vm/English.lproj/MainMenu-opengl.xib
rename to platforms/iOS/vm/English.lproj/Newspeak-MainMenu-opengl.xib
diff --git a/platforms/iOS/vm/English.lproj/MainMenu.xib b/platforms/iOS/vm/English.lproj/Newspeak-MainMenu.xib
similarity index 100%
rename from platforms/iOS/vm/English.lproj/MainMenu.xib
rename to platforms/iOS/vm/English.lproj/Newspeak-MainMenu.xib
diff --git a/platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib b/platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib
new file mode 100644
index 0000000000..0a872f1c70
--- /dev/null
+++ b/platforms/iOS/vm/English.lproj/Pharo-MainMenu-opengl.xib
@@ -0,0 +1,1261 @@
+
+
+
+ 1070
+ 14D136
+ 7702
+ 1347.57
+ 758.70
+
+
+ NSCustomObject
+ NSMenu
+ NSMenuItem
+ NSView
+ NSWindowTemplate
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+ NO
+
+ YES
+ 3
+
+ {12, 12}
+ {10, 2}
+
+
+
diff --git a/platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib b/platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib
new file mode 100644
index 0000000000..8895943ac0
--- /dev/null
+++ b/platforms/iOS/vm/English.lproj/Pharo-MainMenu.xib
@@ -0,0 +1,1261 @@
+
+
+
+ 1070
+ 14D136
+ 7702
+ 1347.57
+ 758.70
+
+
+ NSCustomObject
+ NSMenu
+ NSMenuItem
+ NSView
+ NSWindowTemplate
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+ NO
+
+ YES
+ 3
+
+ {12, 12}
+ {10, 2}
+
+
+
diff --git a/platforms/iOS/vm/English.lproj/Squeak-MainMenu-cg.xib b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-cg.xib
new file mode 100644
index 0000000000..dc0038e308
--- /dev/null
+++ b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-cg.xib
@@ -0,0 +1,1261 @@
+
+
+
+ 1070
+ 14D136
+ 7702
+ 1347.57
+ 758.70
+
+
+ NSCustomObject
+ NSMenu
+ NSMenuItem
+ NSView
+ NSWindowTemplate
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+ NO
+
+ YES
+ 3
+
+ {12, 12}
+ {10, 2}
+
+
+
diff --git a/platforms/iOS/vm/English.lproj/Squeak-MainMenu-opengl.xib b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-opengl.xib
new file mode 100644
index 0000000000..ddcd72047a
--- /dev/null
+++ b/platforms/iOS/vm/English.lproj/Squeak-MainMenu-opengl.xib
@@ -0,0 +1,1261 @@
+
+
+
+ 1070
+ 14D136
+ 7702
+ 1347.57
+ 758.70
+
+
+ NSCustomObject
+ NSMenu
+ NSMenuItem
+ NSView
+ NSWindowTemplate
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+ NO
+
+ YES
+ 3
+
+ {12, 12}
+ {10, 2}
+
+
+
diff --git a/platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib b/platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib
new file mode 100644
index 0000000000..49112af1fb
--- /dev/null
+++ b/platforms/iOS/vm/English.lproj/Squeak-MainMenu.xib
@@ -0,0 +1,1261 @@
+
+
+
+ 1070
+ 14D136
+ 7702
+ 1347.57
+ 758.70
+
+
+ NSCustomObject
+ NSMenu
+ NSMenuItem
+ NSView
+ NSWindowTemplate
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+ NO
+
+ YES
+ 3
+
+ {12, 12}
+ {10, 2}
+
+
+
diff --git a/platforms/iOS/vm/OSX/Pharo-Info.plist b/platforms/iOS/vm/OSX/Pharo-Info.plist
index 65ced06d76..33086028d6 100644
--- a/platforms/iOS/vm/OSX/Pharo-Info.plist
+++ b/platforms/iOS/vm/OSX/Pharo-Info.plist
@@ -534,5 +534,7 @@
SqueakUIFadeForFullScreenInSeconds
0.5
+ PharoHelpURL
+ https://www.pharo.org/documentation
diff --git a/platforms/iOS/vm/OSX/SqueakOSXApplication.m b/platforms/iOS/vm/OSX/SqueakOSXApplication.m
index ab4db8f752..f38feb817d 100644
--- a/platforms/iOS/vm/OSX/SqueakOSXApplication.m
+++ b/platforms/iOS/vm/OSX/SqueakOSXApplication.m
@@ -38,8 +38,12 @@ Some of this code was funded via a grant from the European Smalltalk User Group
#import "SqueakOSXApplication.h"
#import "sqSqueakOSXScreenAndWindow.h"
+#import "SqueakOSXAppDelegate.h"
+#import "sqSqueakOSXApplication.h"
-@implementation SqueakOSXApplication
+@implementation SqueakOSXApplication
+
+extern SqueakOSXAppDelegate *gDelegateApp;
-(void)sendEvent:(NSEvent*)anEvent
{
@@ -49,5 +53,27 @@ -(void)sendEvent:(NSEvent*)anEvent
} else {
[super sendEvent:anEvent];
}
-}
+}
+#ifdef PharoVM
+- (void)showHelp:(id)sender;
+{
+ NSBundle *mainBundle = [NSBundle mainBundle];
+ NSDictionary *infoDictionary = [mainBundle infoDictionary];
+
+ id urlString = infoDictionary[@"PharoHelpURL"];
+
+ if(urlString == Nil){
+ urlString = @"https://www.pharo.org";
+ }
+
+ NSURL *url = [NSURL URLWithString: urlString];
+ [[NSWorkspace sharedWorkspace] openURL: url];
+}
+#endif
+
+- (void)orderFrontStandardAboutPanel:(id)sender;
+{
+ [super orderFrontStandardAboutPanel: sender];
+ [gDelegateApp.squeakApplication setAboutWindow: [self keyWindow]];
+}
@end
diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m b/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
index d5995ff58d..e81f2a008e 100644
--- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
+++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
@@ -67,6 +67,20 @@ - (sqButton) resolveModifier:(sqModifier)modifier forMouseButton:(sqButton)mouse
@implementation sqSqueakOSXApplication (events)
+// This method filters the event that should not be processed by the Squeak Application.
+// This events are related to windows that are launched from a third party library (as SDL)
+// Check pumpRunLoopEventSendAndSignal:(BOOL)signal for more details.
+
+// The events processed by the VM are the ones in the main window or in the about window.
+- (BOOL) shouldFilterEvent: (NSEvent*)event {
+
+ sqSqueakOSXApplication * sqApplication = (sqSqueakOSXApplication*)gDelegateApp.squeakApplication;
+
+ return event.window
+ && event.window != gDelegateApp.window
+ && event.window != [sqApplication aboutWindow];
+}
+
- (void) pumpRunLoopEventSendAndSignal:(BOOL)signal {
#ifdef PharoVM
@@ -84,7 +98,7 @@ - (void) pumpRunLoopEventSendAndSignal:(BOOL)signal {
dequeue:YES])) {
// If the event is not a system event or an event of *this* window, queue the event
// Otherwise treat the event normally and send it to the app
- if (event.window && event.window != gDelegateApp.window){
+ if ([self shouldFilterEvent: event]){
[alienEventQueue addObject: event];
}else{
[NSApp sendEvent: event];
diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h
index 63dbf73773..d8c0eb6ae7 100644
--- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h
+++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h
@@ -41,9 +41,12 @@
#import "sqSqueakMainApplication.h"
@interface sqSqueakOSXApplication : sqSqueakMainApplication {
- NSCursor *squeakCursor;
+ NSWindow __weak *aboutWindow;
+ NSCursor *squeakCursor;
+
}
@property (nonatomic,strong) NSCursor *squeakCursor;
+@property (nonatomic,weak) NSWindow *aboutWindow;
- (int) parseArgument: (NSString *) argData peek: (char *) peek;
- (void) parseArgs: (NSArray *) args;
diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
index 140e468641..915bd49642 100644
--- a/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
+++ b/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
@@ -104,6 +104,7 @@ void mtfsfi(unsigned long long fpscr) {}
@implementation sqSqueakOSXApplication
@synthesize squeakCursor;
+@synthesize aboutWindow;
- (void) setupFloat {
fldcw(0x12bf); /* signed infinity, round to nearest, REAL8, disable intrs, disable signals */