input: Revert the send unique keymap file descriptors to clients

This reverts commit 76829fc4eaea329d2a525c3978271e13bd76c078.
It break the build of the wayland-ivi-extension.

Upstream-Status: Inappropriate [i.MX-specific]

Signed-off-by: Yong Gan <yong.gan@nxp.com>

libweston/compositor.h

diff --git a/libweston/compositor.h b/libweston/compositor.h
index b9de5ef..4cd143a 100644
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -714,8 +714,9 @@
 
 struct weston_xkb_info {
 	struct xkb_keymap *keymap;
+	int keymap_fd;
 	size_t keymap_size;
-	char *keymap_string;
+	char *keymap_area;
 	int32_t ref_count;
 	xkb_mod_index_t shift_mod;
 	xkb_mod_index_t caps_mod;

libweston/input.c

diff --git a/libweston/input.c b/libweston/input.c
index 6579592..ad1dfeb 100644
--- a/libweston/input.c
+++ b/libweston/input.c
@@ -2084,31 +2084,11 @@
 weston_keyboard_send_keymap(struct weston_keyboard *kbd, struct wl_resource *resource)
 {
 	struct weston_xkb_info *xkb_info = kbd->xkb_info;
-	void *area;
-	int fd;
 
-	fd = os_create_anonymous_file(xkb_info->keymap_size);
-	if (fd < 0) {
-		weston_log("creating a keymap file for %lu bytes failed: %m\n",
-			   (unsigned long) xkb_info->keymap_size);
-		return;
-	}
-
-	area = mmap(NULL, xkb_info->keymap_size, PROT_READ | PROT_WRITE,
-		    MAP_SHARED, fd, 0);
-	if (area == MAP_FAILED) {
-		weston_log("failed to mmap() %lu bytes\n",
-			   (unsigned long) xkb_info->keymap_size);
-		goto err_mmap;
-	}
-	strcpy(area, xkb_info->keymap_string);
-	munmap(area, xkb_info->keymap_size);
 	wl_keyboard_send_keymap(resource,
 				WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
-				fd,
+				xkb_info->keymap_fd,
 				xkb_info->keymap_size);
-err_mmap:
-	close(fd);
 }
 
 static void
@@ -3146,8 +3126,10 @@
 
 	xkb_keymap_unref(xkb_info->keymap);
 
-	if (xkb_info->keymap_string)
-		free(xkb_info->keymap_string);
+	if (xkb_info->keymap_area)
+		munmap(xkb_info->keymap_area, xkb_info->keymap_size);
+	if (xkb_info->keymap_fd >= 0)
+		close(xkb_info->keymap_fd);
 	free(xkb_info);
 }
 
@@ -3175,6 +3157,8 @@
 	xkb_info->keymap = xkb_keymap_ref(keymap);
 	xkb_info->ref_count = 1;
 
+	char *keymap_str;
+
 	xkb_info->shift_mod = xkb_keymap_mod_get_index(xkb_info->keymap,
 						       XKB_MOD_NAME_SHIFT);
 	xkb_info->caps_mod = xkb_keymap_mod_get_index(xkb_info->keymap,
@@ -3199,16 +3183,38 @@
 	xkb_info->scroll_led = xkb_keymap_led_get_index(xkb_info->keymap,
 							XKB_LED_NAME_SCROLL);
 
-	xkb_info->keymap_string = xkb_keymap_get_as_string(xkb_info->keymap,
-							   XKB_KEYMAP_FORMAT_TEXT_V1);
-	if (xkb_info->keymap_string == NULL) {
+	keymap_str = xkb_keymap_get_as_string(xkb_info->keymap,
+					      XKB_KEYMAP_FORMAT_TEXT_V1);
+	if (keymap_str == NULL) {
 		weston_log("failed to get string version of keymap\n");
 		goto err_keymap;
 	}
-	xkb_info->keymap_size = strlen(xkb_info->keymap_string) + 1;
+	xkb_info->keymap_size = strlen(keymap_str) + 1;
+
+	xkb_info->keymap_fd = os_create_anonymous_file(xkb_info->keymap_size);
+	if (xkb_info->keymap_fd < 0) {
+		weston_log("creating a keymap file for %lu bytes failed: %m\n",
+			(unsigned long) xkb_info->keymap_size);
+		goto err_keymap_str;
+	}
+
+	xkb_info->keymap_area = mmap(NULL, xkb_info->keymap_size,
+				     PROT_READ | PROT_WRITE,
+				     MAP_SHARED, xkb_info->keymap_fd, 0);
+	if (xkb_info->keymap_area == MAP_FAILED) {
+		weston_log("failed to mmap() %lu bytes\n",
+			(unsigned long) xkb_info->keymap_size);
+		goto err_dev_zero;
+	}
+	strcpy(xkb_info->keymap_area, keymap_str);
+	free(keymap_str);
 
 	return xkb_info;
 
+err_dev_zero:
+	close(xkb_info->keymap_fd);
+err_keymap_str:
+	free(keymap_str);
 err_keymap:
 	xkb_keymap_unref(xkb_info->keymap);
 	free(xkb_info);