Multiple changes to DisplayServerX11

- Travis: Change x11 to linuxbsd - SCons: Change x11 plataform to linuxbsd - Plugins: Remove ; to avoid fallthrough warning - DisplayServerX11: Implement set_icon - DisplayServerX11: Fix X11 bug when a window was erased from windows map, all the changes from that erased windows are sending to the main window - DisplayServerX11: Reorder create_window commands - DisplayServerX11: Change every Size2 to Size2i and Rect2 to Rect2i where it belongs + More X11 fixes which have been integrated directly back into reduz's original commits while rebasing the branch.
2025-11-14 13:41:12 +00:00 · 2020-03-12 20:12:34 -03:00
parent 9a5d15a2dc
commit f387b9b4f4
14 changed files with 157 additions and 65 deletions
--- a/platform/linuxbsd/display_server_x11.cpp
+++ b/platform/linuxbsd/display_server_x11.cpp
@@ -1079,7 +1079,7 @@ Size2i DisplayServerX11::window_get_real_size(WindowID p_window) const {
 			XFree(data);
 		}
 	}
-	return Size2(w, h);
+	return Size2i(w, h);
 }

 bool DisplayServerX11::window_is_maximize_allowed(WindowID p_window) const {
@@ -1214,7 +1214,7 @@ void DisplayServerX11::_set_wm_fullscreen(WindowID p_window, bool p_enabled) {

 	if (!p_enabled) {
 		// Reset the non-resizable flags if we un-set these before.
-		Size2 size = window_get_size(p_window);
+		Size2i size = window_get_size(p_window);
 		XSizeHints *xsh;
 		xsh = XAllocSizeHints();
 		if (window_get_flag(WINDOW_FLAG_RESIZE_DISABLED, p_window)) {
@@ -1225,12 +1225,12 @@ void DisplayServerX11::_set_wm_fullscreen(WindowID p_window, bool p_enabled) {
 			xsh->max_height = size.y;
 		} else {
 			xsh->flags = 0L;
-			if (wd.min_size != Size2()) {
+			if (wd.min_size != Size2i()) {
 				xsh->flags |= PMinSize;
 				xsh->min_width = wd.min_size.x;
 				xsh->min_height = wd.min_size.y;
 			}
-			if (wd.max_size != Size2()) {
+			if (wd.max_size != Size2i()) {
 				xsh->flags |= PMaxSize;
 				xsh->max_width = wd.max_size.x;
 				xsh->max_height = wd.max_size.y;
@@ -1471,7 +1471,7 @@ void DisplayServerX11::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 			XSizeHints *xsh;
 			xsh = XAllocSizeHints();
 			if (p_enabled) {
-				Size2 size = window_get_size(p_window);
+				Size2i size = window_get_size(p_window);

 				xsh->flags = PMinSize | PMaxSize;
 				xsh->min_width = size.x;
@@ -1480,12 +1480,12 @@ void DisplayServerX11::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 				xsh->max_height = size.y;
 			} else {
 				xsh->flags = 0L;
-				if (wd.min_size != Size2()) {
+				if (wd.min_size != Size2i()) {
 					xsh->flags |= PMinSize;
 					xsh->min_width = wd.min_size.x;
 					xsh->min_height = wd.min_size.y;
 				}
-				if (wd.max_size != Size2()) {
+				if (wd.max_size != Size2i()) {
 					xsh->flags |= PMaxSize;
 					xsh->max_width = wd.max_size.x;
 					xsh->max_height = wd.max_size.y;
@@ -1749,8 +1749,8 @@ void DisplayServerX11::cursor_set_custom_image(const RES &p_cursor, CursorShape
 		Ref<Texture2D> texture = p_cursor;
 		Ref<AtlasTexture> atlas_texture = p_cursor;
 		Ref<Image> image;
-		Size2 texture_size;
-		Rect2 atlas_rect;
+		Size2i texture_size;
+		Rect2i atlas_rect;

 		if (texture.is_valid()) {
 			image = texture->get_data();
@@ -2221,7 +2221,7 @@ void DisplayServerX11::_window_changed(XEvent *event) {

 	WindowID window_id = MAIN_WINDOW_ID;

-	//assign the event to the relevant window
+	// Assign the event to the relevant window
 	for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
 		if (event->xany.window == E->get().x11_window) {
 			window_id = E->key();
@@ -2230,6 +2230,9 @@ void DisplayServerX11::_window_changed(XEvent *event) {
 	}

 	WindowData &wd = windows[window_id];
+	if (wd.x11_window != event->xany.window) { // Check if the correct window
+		return;
+	}

 	if (wd.xic) {
 		//  Not portable.
@@ -2314,7 +2317,7 @@ void DisplayServerX11::process_events() {

 		WindowID window_id = MAIN_WINDOW_ID;

-		//assign the event to the relevant window
+		// Assign the event to the relevant window
 		for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
 			if (event.xany.window == E->get().x11_window) {
 				window_id = E->key();
@@ -2995,8 +2998,87 @@ void DisplayServerX11::set_context(Context p_context) {
 void DisplayServerX11::set_native_icon(const String &p_filename) {
 	WARN_PRINT("Native icon not supported by this display server.");
 }
+
+bool g_set_icon_error = false;
+int set_icon_errorhandler(Display *dpy, XErrorEvent *ev) {
+	g_set_icon_error = true;
+	return 0;
+}
+
 void DisplayServerX11::set_icon(const Ref<Image> &p_icon) {
-	WARN_PRINT("Icon not supported by this display server.");
+	_THREAD_SAFE_METHOD_
+
+	WindowData &wd = windows[MAIN_WINDOW_ID];
+
+	int (*oldHandler)(Display *, XErrorEvent *) = XSetErrorHandler(&set_icon_errorhandler);
+
+	Atom net_wm_icon = XInternAtom(x11_display, "_NET_WM_ICON", False);
+
+	if (p_icon.is_valid()) {
+		Ref<Image> img = p_icon->duplicate();
+		img->convert(Image::FORMAT_RGBA8);
+
+		while (true) {
+			int w = img->get_width();
+			int h = img->get_height();
+
+			if (g_set_icon_error) {
+				g_set_icon_error = false;
+
+				WARN_PRINT("Icon too large, attempting to resize icon.");
+
+				int new_width, new_height;
+				if (w > h) {
+					new_width = w / 2;
+					new_height = h * new_width / w;
+				} else {
+					new_height = h / 2;
+					new_width = w * new_height / h;
+				}
+
+				w = new_width;
+				h = new_height;
+
+				if (!w || !h) {
+					WARN_PRINT("Unable to set icon.");
+					break;
+				}
+
+				img->resize(w, h, Image::INTERPOLATE_CUBIC);
+			}
+
+			// We're using long to have wordsize (32Bit build -> 32 Bits, 64 Bit build -> 64 Bits
+			Vector<long> pd;
+
+			pd.resize(2 + w * h);
+
+			pd.write[0] = w;
+			pd.write[1] = h;
+
+			const uint8_t *r = img->get_data().ptr();
+
+			long *wr = &pd.write[2];
+			uint8_t const *pr = r;
+
+			for (int i = 0; i < w * h; i++) {
+				long v = 0;
+				//    A             R             G            B
+				v |= pr[3] << 24 | pr[0] << 16 | pr[1] << 8 | pr[2];
+				*wr++ = v;
+				pr += 4;
+			}
+
+			XChangeProperty(x11_display, wd.x11_window, net_wm_icon, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)pd.ptr(), pd.size());
+
+			if (!g_set_icon_error)
+				break;
+		}
+	} else {
+		XDeleteProperty(x11_display, wd.x11_window, net_wm_icon);
+	}
+
+	XFlush(x11_display);
+	XSetErrorHandler(oldHandler);
 }

 Vector<String> DisplayServerX11::get_rendering_drivers_func() {
@@ -3042,38 +3124,9 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, u
 		WindowData wd;
 		wd.x11_window = XCreateWindow(x11_display, RootWindow(x11_display, visualInfo->screen), p_rect.position.x, p_rect.position.y, p_rect.size.width, p_rect.size.height, 0, visualInfo->depth, InputOutput, visualInfo->visual, valuemask, &windowAttributes);

-		if (windows.size() > 0) {
-			//this is a sub window, don't let the window manager put it wherever it wants
-
-			XSizeHints my_hints = { 0 };
-
-			my_hints.flags = PPosition | PSize; /* I want to specify position and size */
-			my_hints.x = p_rect.position.x; /* The origin and size coords I want */
-			my_hints.y = p_rect.position.y;
-			my_hints.width = p_rect.size.width;
-			my_hints.height = p_rect.size.height;
-
-			XSetNormalHints(x11_display, wd.x11_window, &my_hints);
-			//its still not working :(
-		}
-		//set_class_hint(x11_display, wd.x11_window);
 		XMapWindow(x11_display, wd.x11_window);
-		XFlush(x11_display);
-
-		XSync(x11_display, False);
-		//XSetErrorHandler(oldHandler);
-
-		XFree(visualInfo);
-
-#if defined(VULKAN_ENABLED)
-		if (context_vulkan) {
-			Error err = context_vulkan->window_create(window_id_counter, wd.x11_window, x11_display, p_rect.size.width, p_rect.size.height);
-			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create a Vulkan window");
-		}
-#endif

 		//associate PID
-
 		// make PID known to X11
 		{
 			const long pid = OS::get_singleton()->get_process_id();
@@ -3152,6 +3205,41 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, u
 		id = window_id_counter++;

 		windows[id] = wd;
+
+		if (id != MAIN_WINDOW_ID) {
+			//this is a sub window, don't let the window manager put it wherever it wants
+			for (int i = 0; i < WINDOW_FLAG_MAX; i++) {
+				if (p_flags & (1 << i)) {
+					window_set_flag(WindowFlags(i), true, id);
+				}
+			}
+
+			XSizeHints my_hints = XSizeHints();
+
+			my_hints.flags = PPosition | PSize; /* I want to specify position and size */
+			my_hints.x = p_rect.position.x; /* The origin and size coords I want */
+			my_hints.y = p_rect.position.y;
+			my_hints.width = p_rect.size.width;
+			my_hints.height = p_rect.size.height;
+
+			XSetNormalHints(x11_display, wd.x11_window, &my_hints);
+			XMoveWindow(x11_display, wd.x11_window, p_rect.position.x, p_rect.position.y);
+		}
+
+#if defined(VULKAN_ENABLED)
+		if (context_vulkan) {
+			Error err = context_vulkan->window_create(id, wd.x11_window, x11_display, p_rect.size.width, p_rect.size.height);
+			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create a Vulkan window");
+		}
+#endif
+
+		//set_class_hint(x11_display, wd.x11_window);
+		XFlush(x11_display);
+
+		XSync(x11_display, False);
+		//XSetErrorHandler(oldHandler);
+
+		XFree(visualInfo);
 	}

 	WindowData &wd = windows[id];
@@ -3168,7 +3256,7 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, u
 		wd.size.width = xwa.width;
 		wd.size.height = xwa.height;

-		//print_line("created at rect: " + p_rect + " but at rect " + Rect2i(xwa.x, xwa.y, xwa.width, xwa.height));
+		print_line("created at rect: " + p_rect + " but at rect " + Rect2i(xwa.x, xwa.y, xwa.width, xwa.height));
 	}

 	//set cursor