Adding hook to configure additional options in Windows.

This might fail if the VM is not prepared, so it is handling that scenario.
pharo-project · Oct 7, 2021 · 1abe32e · 1abe32e
1 parent e7b8327
commit 1abe32e
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 0 deletions.
diff --git a/src/OSWindow-Core/OSWindowDriver.class.st b/src/OSWindow-Core/OSWindowDriver.class.st
@@ -108,6 +108,10 @@ OSWindowDriver class >> shutDown: quitting [
 		ifTrue: [ ActiveWorld := nil ]
 ]
 
+{ #category : #events }
+OSWindowDriver >> afterMainPharoWindowCreated: aWindow [
+]
+
 { #category : #events }
 OSWindowDriver >> afterSetWindowTitle: windowTitle onWindow: osWindow [
 ]

diff --git a/src/OSWindow-Core/OSWorldRenderer.class.st b/src/OSWindow-Core/OSWorldRenderer.class.st
@@ -106,6 +106,7 @@ OSWorldRenderer >> doActivate [
 	attributes preferableDriver: driver.
 	osWindow := OSWindow createWithAttributes: attributes eventHandler: (OSWindowMorphicEventHandler for: world).
 
+	driver afterMainPharoWindowCreated: osWindow.
 	driver afterSetWindowTitle: Smalltalk image imageFile fullName onWindow: osWindow.
 
 	osWindow focus. 

diff --git a/src/OSWindow-SDL2/OSSDL2Driver.class.st b/src/OSWindow-SDL2/OSSDL2Driver.class.st
@@ -43,6 +43,14 @@ OSSDL2Driver class >> isVMDisplayUsingSDL2 [
 	^ false
 ]
 
+{ #category : #events }
+OSSDL2Driver >> afterMainPharoWindowCreated: osWindow [
+
+	OSPlatform current sdlPlatform 
+		afterMainPharoWindowCreated: osWindow
+
+]
+
 { #category : #events }
 OSSDL2Driver >> afterSetWindowTitle: windowTitle onWindow: osWindow [
 

diff --git a/src/OSWindow-SDL2/SDLAbstractPlatform.class.st b/src/OSWindow-SDL2/SDLAbstractPlatform.class.st
@@ -13,6 +13,12 @@ Class {
 	#category : #'OSWindow-SDL2-Bindings'
 }
 
+{ #category : #operations }
+SDLAbstractPlatform >> afterMainPharoWindowCreated: aOSSDLWindow [
+
+	self subclassResponsibility 
+]
+
 { #category : #operations }
 SDLAbstractPlatform >> afterSetWindowTitle: aString onWindow: aOSSDLWindow [
 

diff --git a/src/OSWindow-SDL2/SDLNullPlatform.class.st b/src/OSWindow-SDL2/SDLNullPlatform.class.st
@@ -7,6 +7,12 @@ Class {
 	#category : #'OSWindow-SDL2-Bindings'
 }
 
+{ #category : #operations }
+SDLNullPlatform >> afterMainPharoWindowCreated: aOSSDLWindow [
+
+
+]
+
 { #category : #operations }
 SDLNullPlatform >> afterSetWindowTitle: aString onWindow: aOSSDLWindow [
 ]

diff --git a/src/OSWindow-SDL2/SDLOSXPlatform.class.st b/src/OSWindow-SDL2/SDLOSXPlatform.class.st
@@ -7,6 +7,11 @@ Class {
 	#category : #'OSWindow-SDL2-Bindings'
 }
 
+{ #category : #operations }
+SDLOSXPlatform >> afterMainPharoWindowCreated: aOSSDLWindow [
+
+]
+
 { #category : #operations }
 SDLOSXPlatform >> afterSetWindowTitle: aString onWindow: aOSSDLWindow [
 

diff --git a/src/OSWindow-SDL2/SDLWindowsPlatform.class.st b/src/OSWindow-SDL2/SDLWindowsPlatform.class.st
@@ -7,6 +7,24 @@ Class {
 	#category : #'OSWindow-SDL2-Bindings'
 }
 
+{ #category : #'as yet unclassified' }
+SDLWindowsPlatform class >> enableDebugWindowMenu: hwnd [
+
+	self ffiCall: #(int enableDebugWindowMenu(void* hwnd)) module: 'PharoVMCore.dll'
+]
+
+{ #category : #operations }
+SDLWindowsPlatform >> afterMainPharoWindowCreated: aOSSDLWindow [
+
+	| sdlWindowInfo handle |
+	[	sdlWindowInfo := aOSSDLWindow backendWindow getWMInfo.
+		handle := sdlWindowInfo info win window.
+
+		self class enableDebugWindowMenu: handle ] 
+	onErrorDo: [ 
+		"There was an error installing the support for debug Window, the VM is not new enough." ].
+]
+
 { #category : #operations }
 SDLWindowsPlatform >> afterSetWindowTitle: aString onWindow: aOSSDLWindow [
 ]