Add display/window/screen_id configuration

Author: marcelofg55

core/os/os.cpp

@@ -704,6 +704,17 @@ void OS::close_midi_inputs() {
 		MIDIDriver::get_singleton()->close();
 }
 
+int OS::_get_initial_screen_id() {
+	int screen_id = GLOBAL_DEF("display/window/screen_id", -1);
+	if (screen_id == -1) {
+		screen_id = get_current_screen();
+	} else if (screen_id >= get_screen_count()) {
+		screen_id = 0;
+	}
+
+	return screen_id;
+}
+
 OS::OS() {
 	void *volatile stack_bottom;
 

core/os/os.h

@@ -146,6 +146,8 @@ class OS {
 	void _ensure_user_data_dir();
 	virtual bool _check_internal_feature_support(const String &p_feature) = 0;
 
+	int _get_initial_screen_id();
+
 public:
 	typedef int64_t ProcessID;
 

doc/classes/ProjectSettings.xml

@@ -329,6 +329,9 @@
 		</member>
 		<member name="display/window/per_pixel_transparency_splash" type="bool" setter="" getter="">
 		</member>
+		<member name="display/window/screen_id" type="int" setter="" getter="">
+			Set the screen number, defaults to -1. If configured, use the 'No Management' option on 'run/window_placement/rect', otherwise the editor overrides this value.
+		</member>
 		<member name="display/window/size/always_on_top" type="bool" setter="" getter="">
 			Force the window to be always on top.
 		</member>

editor/editor_run.cpp

@@ -148,6 +148,9 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
 			args.push_back(itos(pos.x) + "," + itos(pos.y));
 			args.push_back("--fullscreen");
 		} break;
+		case 5: { // no management
+
+		} break;
 	}
 
 	if (p_breakpoints.size()) {

editor/editor_settings.cpp

@@ -497,7 +497,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("editors/poly_editor/show_previous_outline", true);
 
 	_initial_set("run/window_placement/rect", 1);
-	hints["run/window_placement/rect"] = PropertyInfo(Variant::INT, "run/window_placement/rect", PROPERTY_HINT_ENUM, "Top Left,Centered,Custom Position,Force Maximized,Force Fullscreen");
+	hints["run/window_placement/rect"] = PropertyInfo(Variant::INT, "run/window_placement/rect", PROPERTY_HINT_ENUM, "Top Left,Centered,Custom Position,Force Maximized,Force Fullscreen,No Management");
 	String screen_hints = "Same as Editor,Previous Monitor,Next Monitor";
 	for (int i = 0; i < OS::get_singleton()->get_screen_count(); i++) {
 		screen_hints += ",Monitor " + itos(i + 1);

main/main.cpp

@@ -892,6 +892,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	ProjectSettings::get_singleton()->set_custom_property_info("display/window/size/test_width", PropertyInfo(Variant::INT, "display/window/size/test_width", PROPERTY_HINT_RANGE, "0,7680,or_greater")); // 8K resolution
 	GLOBAL_DEF("display/window/size/test_height", 0);
 	ProjectSettings::get_singleton()->set_custom_property_info("display/window/size/test_height", PropertyInfo(Variant::INT, "display/window/size/test_height", PROPERTY_HINT_RANGE, "0,4320,or_greater")); // 8K resolution
+	GLOBAL_DEF("display/window/screen_id", -1);
 
 	if (use_custom_res) {
 

platform/osx/os_osx.mm

@@ -1235,11 +1235,16 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
 		styleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (p_desired.resizable ? NSWindowStyleMaskResizable : 0);
 	}
 
+	int screen_id = _get_initial_screen_id();
+	Size2 screen_size = get_screen_size(screen_id);
+	NSScreen *screen = [[NSScreen screens] objectAtIndex:screen_id];
+
 	window_object = [[GodotWindow alloc]
-			initWithContentRect:NSMakeRect(0, 0, p_desired.width, p_desired.height)
+			initWithContentRect:NSMakeRect((screen_size.x - p_desired.width) / 2, (screen_size.y - p_desired.height) / 2, p_desired.width, p_desired.height)
 					  styleMask:styleMask
 						backing:NSBackingStoreBuffered
-						  defer:NO];
+						  defer:NO
+						 screen:screen];
 
 	ERR_FAIL_COND_V(window_object == nil, ERR_UNAVAILABLE);
 
@@ -1251,7 +1256,6 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
 	float displayScale = 1.0;
 	if (is_hidpi_allowed()) {
 		// note that mainScreen is not screen #0 but the one with the keyboard focus.
-		NSScreen *screen = [NSScreen mainScreen];
 		if ([screen respondsToSelector:@selector(backingScaleFactor)]) {
 			displayScale = fmax(displayScale, [screen backingScaleFactor]);
 		}
@@ -1270,7 +1274,6 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
 	[window_object setContentView:window_view];
 	[window_object setDelegate:window_delegate];
 	[window_object setAcceptsMouseMovedEvents:YES];
-	[window_object center];
 
 	[window_object setRestorable:NO];
 
@@ -2640,6 +2643,7 @@ static int get_screen_index(NSScreen *screen) {
 	im_callback = NULL;
 	im_target = NULL;
 	layered_window = false;
+	window_object = 0;
 	autoreleasePool = [[NSAutoreleasePool alloc] init];
 
 	eventSource = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);

platform/windows/os_windows.cpp

@@ -1099,6 +1099,9 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
 	video_mode = p_desired;
 	//printf("**************** desired %s, mode %s\n", p_desired.fullscreen?"true":"false", video_mode.fullscreen?"true":"false");
 	RECT WindowRect;
+	int screen_id = _get_initial_screen_id();
+	Point2 screen_pos = get_screen_position(screen_id);
+	Size2 screen_size = get_screen_size(screen_id);
 
 	WindowRect.left = 0;
 	WindowRect.right = video_mode.width;
@@ -1141,35 +1144,9 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
 	pre_fs_valid = true;
 	if (video_mode.fullscreen) {
 
-		/* this returns DPI unaware size, commenting
-		DEVMODE current;
-		memset(&current, 0, sizeof(current));
-		EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &current);
+		WindowRect.right = screen_size.x;
+		WindowRect.bottom = screen_size.y;
 
-		WindowRect.right = current.dmPelsWidth;
-		WindowRect.bottom = current.dmPelsHeight;
-
-		*/
-
-		EnumSizeData data = { 0, 0, Size2() };
-		EnumDisplayMonitors(NULL, NULL, _MonitorEnumProcSize, (LPARAM)&data);
-
-		WindowRect.right = data.size.width;
-		WindowRect.bottom = data.size.height;
-
-		/*  DEVMODE dmScreenSettings;
-		memset(&dmScreenSettings,0,sizeof(dmScreenSettings));
-		dmScreenSettings.dmSize=sizeof(dmScreenSettings);
-		dmScreenSettings.dmPelsWidth	= video_mode.width;
-		dmScreenSettings.dmPelsHeight	= video_mode.height;
-		dmScreenSettings.dmBitsPerPel	= current.dmBitsPerPel;
-		dmScreenSettings.dmFields=DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
-
-		LONG err = ChangeDisplaySettings(&dmScreenSettings,CDS_FULLSCREEN);
-		if (err!=DISP_CHANGE_SUCCESSFUL) {
-
-			video_mode.fullscreen=false;
-		}*/
 		pre_fs_valid = false;
 	}
 
@@ -1233,8 +1210,8 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
 				dwExStyle,
 				L"Engine", L"",
 				dwStyle | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
-				(GetSystemMetrics(SM_CXSCREEN) - WindowRect.right) / 2,
-				(GetSystemMetrics(SM_CYSCREEN) - WindowRect.bottom) / 2,
+				screen_pos.x + (screen_size.x - WindowRect.right) / 2,
+				screen_pos.y + (screen_size.y - WindowRect.bottom) / 2,
 				WindowRect.right - WindowRect.left,
 				WindowRect.bottom - WindowRect.top,
 				NULL, NULL, hInstance, NULL);

platform/x11/context_gl_x11.cpp

@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "context_gl_x11.h"
+#include "core/project_settings.h"
 
 #ifdef X11_ENABLED
 #if defined(OPENGL_ENABLED)
@@ -190,7 +191,19 @@ Error ContextGL_X11::initialize() {
 	}
 
 	swa.colormap = XCreateColormap(x11_display, RootWindow(x11_display, vi->screen), vi->visual, AllocNone);
-	x11_window = XCreateWindow(x11_display, RootWindow(x11_display, vi->screen), 0, 0, OS::get_singleton()->get_video_mode().width, OS::get_singleton()->get_video_mode().height, 0, vi->depth, InputOutput, vi->visual, valuemask, &swa);
+	Point2 screen_pos = OS::get_singleton()->get_screen_position(screen_id);
+	Size2 screen_size = OS::get_singleton()->get_screen_size(screen_id);
+	int width = OS::get_singleton()->get_video_mode().width;
+	int height = OS::get_singleton()->get_video_mode().height;
+	int x = screen_pos.x + (screen_size.x - width) / 2;
+	int y = screen_pos.y + (screen_size.y - height) / 2;
+	x11_window = XCreateWindow(x11_display, RootWindow(x11_display, vi->screen), x, y, width, height, 0, vi->depth, InputOutput, vi->visual, valuemask, &swa);
+
+	XSizeHints xsh;
+	xsh.flags = PPosition;
+	xsh.x = x;
+	xsh.y = y;
+	XSetWMNormalHints(x11_display, x11_window, &xsh);
 
 	ERR_FAIL_COND_V(!x11_window, ERR_UNCONFIGURED);
 	set_class_hint(x11_display, x11_window);
@@ -254,13 +267,14 @@ bool ContextGL_X11::is_using_vsync() const {
 	return use_vsync;
 }
 
-ContextGL_X11::ContextGL_X11(::Display *p_x11_display, ::Window &p_x11_window, const OS::VideoMode &p_default_video_mode, ContextType p_context_type) :
+ContextGL_X11::ContextGL_X11(::Display *p_x11_display, ::Window &p_x11_window, const OS::VideoMode &p_default_video_mode, ContextType p_context_type, int p_screen_id) :
 		x11_window(p_x11_window) {
 
 	default_video_mode = p_default_video_mode;
 	x11_display = p_x11_display;
 
 	context_type = p_context_type;
+	screen_id = p_screen_id;
 
 	double_buffer = false;
 	direct_render = false;

platform/x11/context_gl_x11.h

@@ -60,6 +60,7 @@ class ContextGL_X11 : public ContextGL {
 	//::Colormap x11_colormap;
 	::Display *x11_display;
 	::Window &x11_window;
+	int screen_id;
 	bool double_buffer;
 	bool direct_render;
 	int glx_minor, glx_major;
@@ -78,7 +79,7 @@ class ContextGL_X11 : public ContextGL {
 	virtual void set_use_vsync(bool p_use);
 	virtual bool is_using_vsync() const;
 
-	ContextGL_X11(::Display *p_x11_display, ::Window &p_x11_window, const OS::VideoMode &p_default_video_mode, ContextType p_context_type);
+	ContextGL_X11(::Display *p_x11_display, ::Window &p_x11_window, const OS::VideoMode &p_default_video_mode, ContextType p_context_type, int p_screen_id);
 	virtual ~ContextGL_X11();
 };