weston-simple-im: Fold keyboard_input_handle_keymap() into event handler

diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c
index ebe3fee5303a418f87aa2a0fed8dd78a87363ff3..acd142f0d3be95e16fe0062f31c5280d37dfcda1 100644 (file)
--- a/clients/weston-simple-im.c
+++ b/clients/weston-simple-im.c
@@ -105,51 +105,6 @@ keyboard_input_create(struct xkb_context *xkb_context)
        return keyboard_input;
 }
 
-static void
-keyboard_input_handle_keymap(struct keyboard_input *keyboard_input,
-                            uint32_t format, int fd, uint32_t size)
-{
-       char *map_str;
-
-       if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
-               close(fd);
-               return;
-       }
-
-       map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
-       if (map_str == MAP_FAILED) {
-               close(fd);
-               return;
-       }
-
-       keyboard_input->keymap = xkb_map_new_from_string(keyboard_input->xkb_context,
-                                                        map_str,
-                                                        XKB_KEYMAP_FORMAT_TEXT_V1,
-                                                        0);
-
-       munmap(map_str, size);
-       close(fd);
-
-       if (!keyboard_input->keymap) {
-               fprintf(stderr, "failed to compile keymap\n");
-               return;
-       }
-
-       keyboard_input->state = xkb_state_new(keyboard_input->keymap);
-       if (!keyboard_input->state) {
-               fprintf(stderr, "failed to create XKB state\n");
-               xkb_map_unref(keyboard_input->keymap);
-               return;
-       }
-
-       keyboard_input->control_mask =
-               1 << xkb_map_mod_get_index(keyboard_input->keymap, "Control");
-       keyboard_input->alt_mask =
-               1 << xkb_map_mod_get_index(keyboard_input->keymap, "Mod1");
-       keyboard_input->shift_mask =
-               1 << xkb_map_mod_get_index(keyboard_input->keymap, "Shift");
-}
-
 static void
 keyboard_input_set_user_data(struct keyboard_input *keyboard_input, void *data)
 {
@@ -197,8 +152,47 @@ input_method_keyboard_keymap(void *data,
                             uint32_t size)
 {
        struct simple_im *keyboard = data;
+       struct keyboard_input *keyboard_input = keyboard->keyboard_input;
+       char *map_str;
+
+       if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
+               close(fd);
+               return;
+       }
+
+       map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+       if (map_str == MAP_FAILED) {
+               close(fd);
+               return;
+       }
+
+       keyboard_input->keymap =
+               xkb_map_new_from_string(keyboard_input->xkb_context,
+                                       map_str,
+                                       XKB_KEYMAP_FORMAT_TEXT_V1,
+                                       0);
+
+       munmap(map_str, size);
+       close(fd);
 
-       keyboard_input_handle_keymap(keyboard->keyboard_input, format, fd, size);
+       if (!keyboard_input->keymap) {
+               fprintf(stderr, "failed to compile keymap\n");
+               return;
+       }
+
+       keyboard_input->state = xkb_state_new(keyboard_input->keymap);
+       if (!keyboard_input->state) {
+               fprintf(stderr, "failed to create XKB state\n");
+               xkb_map_unref(keyboard_input->keymap);
+               return;
+       }
+
+       keyboard_input->control_mask =
+               1 << xkb_map_mod_get_index(keyboard_input->keymap, "Control");
+       keyboard_input->alt_mask =
+               1 << xkb_map_mod_get_index(keyboard_input->keymap, "Mod1");
+       keyboard_input->shift_mask =
+               1 << xkb_map_mod_get_index(keyboard_input->keymap, "Shift");
 }
 
 static void