Merge pull request #835 from Apprentice-Alchemist/patch-2

If MAP_SHARED fails for the keymap fd try MAP_PRIVATE.
Kode · Dec 18, 2023 · 158cf1a · 158cf1a
2 parents 38416f1 + 8752796
commit 158cf1a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Backends/System/Linux/Sources/kinc/backend/wayland/system.c.h b/Backends/System/Linux/Sources/kinc/backend/wayland/system.c.h
@@ -432,8 +432,12 @@ void wl_keyboard_handle_keymap(void *data, struct wl_keyboard *wl_keyboard, uint
 	case WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1: {
 		char *mapStr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
 		if (mapStr == MAP_FAILED) {
-			close(fd);
-			return;
+			mapStr = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+			if (mapStr == MAP_FAILED) {
+				kinc_log(KINC_LOG_LEVEL_ERROR, "Failed to map wayland keymap.");
+				close(fd);
+				return;
+			}
 		}
 		keyboard->keymap = wl_xkb.xkb_keymap_new_from_string(wl_ctx.xkb_context, mapStr, XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
 		munmap(mapStr, size);
@@ -1320,4 +1324,4 @@ void kinc_wl_mouse_set_position(int window_index, int x, int y) {
 void kinc_wl_mouse_get_position(int window_index, int *x, int *y) {
 	*x = wl_ctx.seat.mouse.x;
 	*y = wl_ctx.seat.mouse.y;
-}
+}