pepper: API for setting keymap

    - using xkb_keymap in libxkbcommon

Change-Id: I573384b5973c239144e2219c492171715a687c74

diff --git a/configure.ac b/configure.ac
index c26a4ce..d63de54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ fi
 AC_SUBST(GCC_CFLAGS)
 
 # pepper
-PEPPER_REQUIRES="wayland-server pixman-1"
+PEPPER_REQUIRES="wayland-server pixman-1 xkbcommon"
 PKG_CHECK_MODULES(PEPPER, [$PEPPER_REQUIRES])
 
 PEPPER_DIR="-I\$(top_srcdir)/src/lib/pepper"

diff --git a/src/lib/pepper/keyboard.c b/src/lib/pepper/keyboard.c
index c64e079..444e5ce 100644 (file)
--- a/src/lib/pepper/keyboard.c
+++ b/src/lib/pepper/keyboard.c
@@ -1,3 +1,9 @@
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
 #include "pepper-internal.h"
 
 static void
@@ -11,12 +17,81 @@ static const struct wl_keyboard_interface keyboard_impl =
     keyboard_release,
 };
 
+static void
+clear_keymap(pepper_keyboard_t *keyboard)
+{
+    if (keyboard->keymap)
+    {
+        xkb_keymap_unref(keyboard->keymap);
+        keyboard->keymap = NULL;
+    }
+
+    if (keyboard->keymap_fd >= 0)
+    {
+        close(keyboard->keymap_fd);
+        keyboard->keymap_fd = -1;
+        keyboard->keymap_len = -1;
+    }
+
+    if (keyboard->pending_keymap)
+    {
+        xkb_keymap_unref(keyboard->pending_keymap);
+        keyboard->pending_keymap = NULL;
+    }
+}
+
+static void
+update_keymap(pepper_keyboard_t *keyboard)
+{
+    struct wl_resource             *resource;
+    char                           *keymap_str = NULL;
+    char                           *keymap_map = NULL;
+
+    if (keyboard->keymap)
+        xkb_keymap_unref(keyboard->keymap);
+
+    if (keyboard->keymap_fd)
+        close(keyboard->keymap_fd);
+
+    keyboard->keymap = xkb_keymap_ref(keyboard->pending_keymap);
+    xkb_keymap_unref(keyboard->pending_keymap);
+    keyboard->pending_keymap = NULL;
+
+    keymap_str = xkb_keymap_get_as_string(keyboard->keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
+    PEPPER_CHECK(keymap_str, goto error, "failed to get keymap string\n");
+
+    keyboard->keymap_len = strlen(keymap_str) + 1;
+    keyboard->keymap_fd = pepper_create_anonymous_file(keyboard->keymap_len);
+    PEPPER_CHECK(keyboard->keymap_fd, goto error, "failed to create keymap file\n");
+
+    keymap_map = mmap(NULL, keyboard->keymap_len, PROT_READ | PROT_WRITE, MAP_SHARED,
+                      keyboard->keymap_fd, 0);
+    PEPPER_CHECK(keymap_map, goto error, "failed to mmap for keymap\n");
+
+    strcpy(keymap_map, keymap_str);
+
+    wl_resource_for_each(resource, &keyboard->resource_list)
+        wl_keyboard_send_keymap(resource, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
+                                keyboard->keymap_fd, keyboard->keymap_len);
+    goto done;
+
+error:
+    clear_keymap(keyboard);
+
+done:
+    if (keymap_map)
+        munmap(keymap_map, keyboard->keymap_len);
+
+    if (keymap_str)
+        free(keymap_str);
+}
+
 void
 pepper_keyboard_handle_event(pepper_keyboard_t *keyboard, uint32_t id, pepper_input_event_t *event)
 {
-    uint32_t               *keys = keyboard->keys.data;
-    unsigned int            num_keys = keyboard->keys.size / sizeof(uint32_t);
-    unsigned int            i;
+    uint32_t       *keys = keyboard->keys.data;
+    unsigned int    num_keys = keyboard->keys.size / sizeof(uint32_t);
+    unsigned int    i;
 
     if (id != PEPPER_EVENT_KEYBOARD_KEY)
         return;
@@ -39,6 +114,9 @@ pepper_keyboard_handle_event(pepper_keyboard_t *keyboard, uint32_t id, pepper_in
     if (keyboard->grab)
         keyboard->grab->key(keyboard, keyboard->data, event->time, event->key, event->state);
 
+    if (keyboard->pending_keymap && (keyboard->keys.size == 0))
+        update_keymap(keyboard);
+
     pepper_object_emit_event(&keyboard->base, id, event);
 }
 
@@ -72,6 +150,8 @@ pepper_keyboard_create(pepper_seat_t *seat)
 void
 pepper_keyboard_destroy(pepper_keyboard_t *keyboard)
 {
+    clear_keymap(keyboard);
+
     if (keyboard->grab)
         keyboard->grab->cancel(keyboard, keyboard->data);
 
@@ -92,7 +172,7 @@ void
 pepper_keyboard_bind_resource(struct wl_client *client, struct wl_resource *resource, uint32_t id)
 {
     pepper_seat_t      *seat = (pepper_seat_t *)wl_resource_get_user_data(resource);
-    pepper_keyboard_t   *keyboard = seat->keyboard;
+    pepper_keyboard_t  *keyboard = seat->keyboard;
     struct wl_resource *res;
 
     if (!keyboard)
@@ -108,6 +188,20 @@ pepper_keyboard_bind_resource(struct wl_client *client, struct wl_resource *reso
     wl_list_insert(&keyboard->resource_list, wl_resource_get_link(res));
     wl_resource_set_implementation(res, &keyboard_impl, keyboard, unbind_resource);
 
+    /* TODO: send repeat info */
+
+    if (keyboard->keymap)
+    {
+        wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
+                                keyboard->keymap_fd, keyboard->keymap_len);
+    }
+    else
+    {
+        int fd = open("/dev/null", O_RDONLY);
+        wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP, fd, 0);
+        close(fd);
+    }
+
     if (!keyboard->focus)
         return;
 
@@ -270,3 +364,12 @@ pepper_keyboard_get_grab_data(pepper_keyboard_t *keyboard)
 {
     return keyboard->data;
 }
+
+PEPPER_API void
+pepper_keyboard_set_keymap(pepper_keyboard_t *keyboard, struct xkb_keymap *keymap)
+{
+    xkb_keymap_unref(keyboard->pending_keymap);
+    keyboard->pending_keymap = xkb_keymap_ref(keymap);
+    if (keyboard->keys.size == 0)
+        update_keymap(keyboard);
+}

diff --git a/src/lib/pepper/pepper-internal.h b/src/lib/pepper/pepper-internal.h
index f7f12e7..66ff3dc 100644 (file)
--- a/src/lib/pepper/pepper-internal.h
+++ b/src/lib/pepper/pepper-internal.h
@@ -264,6 +264,11 @@ struct pepper_keyboard
     void                           *data;
 
     struct wl_array                 keys;
+
+    struct xkb_keymap              *keymap;
+    int                             keymap_fd;
+    int                             keymap_len;
+    struct xkb_keymap              *pending_keymap;
 };
 
 pepper_keyboard_t *

diff --git a/src/lib/pepper/pepper.h b/src/lib/pepper/pepper.h
index 13d160b..17b23a7 100644 (file)
--- a/src/lib/pepper/pepper.h
+++ b/src/lib/pepper/pepper.h
@@ -8,6 +8,7 @@
 
 #include <time.h>
 #include <linux/input.h>
+#include <xkbcommon/xkbcommon.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -413,6 +414,9 @@ pepper_keyboard_get_grab(pepper_keyboard_t *keyboard);
 PEPPER_API void *
 pepper_keyboard_get_grab_data(pepper_keyboard_t *keyboard);
 
+PEPPER_API void
+pepper_keyboard_set_keymap(pepper_keyboard_t *keyboard, struct xkb_keymap *keymap);
+
 /* Touch. */
 struct pepper_touch_grab
 {