clients: merge ime-keyboard code to input-generator 69/280969/1
authorduna.oh <duna.oh@samsung.com>
Tue, 6 Sep 2022 07:07:03 +0000 (16:07 +0900)
committerTizen Window System <tizen.windowsystem@gmail.com>
Wed, 7 Sep 2022 08:07:11 +0000 (17:07 +0900)
Change-Id: I0e39cef61183833eaf7c06917a42285a2faa24f6

clients/ime-keyboard.c [deleted file]
clients/input-generator.c
clients/meson.build
packaging/libds-tizen.spec

diff --git a/clients/ime-keyboard.c b/clients/ime-keyboard.c
deleted file mode 100644 (file)
index 4d6346d..0000000
+++ /dev/null
@@ -1,957 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/epoll.h>
-
-#include <wayland-client.h>
-#include <xkbcommon/xkbcommon.h>
-#include <linux/input.h>
-
-#include <input-method-client-protocol.h>
-#include <text-client-protocol.h>
-
-#define MAX_STR 1024
-#define SIZE_EPOLL 16
-
-enum keyboard_state {
-    KEYBOARD_STATE_DEFAULT,
-    KEYBOARD_STATE_UPPERCASE,
-    KEYBOARD_STATE_SYMBOLS
-};
-
-struct display
-{
-    struct wl_display *display;
-    struct wl_registry *registry;
-    struct wl_compositor *compositor;
-    struct wl_event_queue *queue;
-
-    int run;
-    int fd_epoll;
-    int fd_display;
-
-    int enable_log;
-
-    struct zwp_input_method_manager_v1 *input_method_mgr;
-    struct zwp_input_method_v1 *input_method;
-    struct zwp_input_method_context_v1 *context;
-
-    char *preedit_string;
-    uint32_t preedit_style;
-    struct {
-        xkb_mod_mask_t shift_mask;
-    } keysym;
-    uint32_t serial;
-    uint32_t content_hint;
-    int32_t content_purpose;
-    char *preferred_language;
-    char *surrounding_text;
-    uint32_t surrounding_cursor;
-    enum keyboard_state state; //struct keyboard *keyboard;
-
-    //struct zwp_input_panel_surface_v1 *ips;
-};
-
-struct layout {
-    const struct key *keys;
-    uint32_t count;
-
-    uint32_t columns;
-    uint32_t rows;
-
-    const char *language;
-    uint32_t text_direction;
-};
-
-enum key_type {
-    keytype_default,
-    keytype_backspace,
-    keytype_enter,
-    keytype_space,
-    keytype_switch,
-    keytype_symbols,
-    keytype_tab,
-    keytype_arrow_up,
-    keytype_arrow_left,
-    keytype_arrow_right,
-    keytype_arrow_down,
-    keytype_style
-};
-
-struct key {
-    enum key_type key_type;
-
-    char *label;
-    char *uppercase;
-    char *symbol;
-
-    unsigned int width;
-};
-
-static const struct key normal_keys[] = {
-    { keytype_default, "q", "Q", "1", 1},
-    { keytype_default, "w", "W", "2", 1},
-    { keytype_default, "e", "E", "3", 1},
-    { keytype_default, "r", "R", "4", 1},
-    { keytype_default, "t", "T", "5", 1},
-    { keytype_default, "y", "Y", "6", 1},
-    { keytype_default, "u", "U", "7", 1},
-    { keytype_default, "i", "I", "8", 1},
-    { keytype_default, "o", "O", "9", 1},
-    { keytype_default, "p", "P", "0", 1},
-    { keytype_backspace, "<--", "<--", "<--", 2},
-
-    { keytype_tab, "->|", "->|", "->|", 1},
-    { keytype_default, "a", "A", "-", 1},
-    { keytype_default, "s", "S", "@", 1},
-    { keytype_default, "d", "D", "*", 1},
-    { keytype_default, "f", "F", "^", 1},
-    { keytype_default, "g", "G", ":", 1},
-    { keytype_default, "h", "H", ";", 1},
-    { keytype_default, "j", "J", "(", 1},
-    { keytype_default, "k", "K", ")", 1},
-    { keytype_default, "l", "L", "~", 1},
-    { keytype_enter, "Enter", "Enter", "Enter", 2},
-
-    { keytype_switch, "ABC", "abc", "ABC", 2},
-    { keytype_default, "z", "Z", "/", 1},
-    { keytype_default, "x", "X", "\'", 1},
-    { keytype_default, "c", "C", "\"", 1},
-    { keytype_default, "v", "V", "+", 1},
-    { keytype_default, "b", "B", "=", 1},
-    { keytype_default, "n", "N", "?", 1},
-    { keytype_default, "m", "M", "!", 1},
-    { keytype_default, ",", ",", "\\", 1},
-    { keytype_default, ".", ".", "|", 1},
-    { keytype_switch, "ABC", "abc", "ABC", 1},
-
-    { keytype_symbols, "?123", "?123", "abc", 1},
-    { keytype_space, "", "", "", 5},
-    { keytype_arrow_up, "/\\", "/\\", "/\\", 1},
-    { keytype_arrow_left, "<", "<", "<", 1},
-    { keytype_arrow_right, ">", ">", ">", 1},
-    { keytype_arrow_down, "\\/", "\\/", "\\/", 1},
-    { keytype_style, "", "", "", 2}
-};
-
-static const struct key numeric_keys[] = {
-    { keytype_default, "1", "1", "1", 1},
-    { keytype_default, "2", "2", "2", 1},
-    { keytype_default, "3", "3", "3", 1},
-    { keytype_default, "4", "4", "4", 1},
-    { keytype_default, "5", "5", "5", 1},
-    { keytype_default, "6", "6", "6", 1},
-    { keytype_default, "7", "7", "7", 1},
-    { keytype_default, "8", "8", "8", 1},
-    { keytype_default, "9", "9", "9", 1},
-    { keytype_default, "0", "0", "0", 1},
-    { keytype_backspace, "<--", "<--", "<--", 2},
-
-    { keytype_space, "", "", "", 4},
-    { keytype_enter, "Enter", "Enter", "Enter", 2},
-    { keytype_arrow_up, "/\\", "/\\", "/\\", 1},
-    { keytype_arrow_left, "<", "<", "<", 1},
-    { keytype_arrow_right, ">", ">", ">", 1},
-    { keytype_arrow_down, "\\/", "\\/", "\\/", 1},
-    { keytype_style, "", "", "", 2}
-};
-
-static const struct layout normal_layout = {
-    normal_keys,
-    sizeof(normal_keys) / sizeof(*normal_keys),
-    12,
-    4,
-    "en",
-    WL_TEXT_INPUT_TEXT_DIRECTION_LTR
-};
-
-static const struct layout numeric_layout = {
-    numeric_keys,
-    sizeof(numeric_keys) / sizeof(*numeric_keys),
-    12,
-    2,
-    "en",
-    WL_TEXT_INPUT_TEXT_DIRECTION_LTR
-};
-
-struct display data_wl;
-static void
-request_key(uint32_t time, const struct key *key, enum wl_pointer_button_state state);
-
-static void
-usage(void)
-{
-    printf(" This is virtual keyboard. (refer to weston/clients/keyboard.c)\n");
-    printf("\n");
-}
-
-static const struct layout *
-get_current_layout(void)
-{
-    switch (data_wl.content_purpose) {
-        case WL_TEXT_INPUT_CONTENT_PURPOSE_DIGITS:
-        case WL_TEXT_INPUT_CONTENT_PURPOSE_NUMBER:
-            return &numeric_layout;
-        default:
-            return &normal_layout;
-    }
-}
-
-static void
-stdin_read(void)
-{
-    int c;
-    char buf[MAX_STR] = {0, }, *tmp, *buf_ptr;
-    int count = 0;
-    static uint32_t time = 12345;
-    const struct layout *layout;
-    uint32_t key_type = 0, key_idx = 0;
-
-    while ((c = getchar()) != EOF) {
-        if (c == '\n') break;
-        if (count >= MAX_STR) break;
-
-        buf[count] = c;
-        count++;
-    }
-
-    count = 0;
-    tmp = strtok_r(buf, " ", &buf_ptr);
-    if (!tmp) return;
-
-    if (!strncmp(buf, "q", MAX_STR) || !strncmp(buf, "quit", MAX_STR)) {
-        data_wl.run = 0;
-    } else if (!strncmp(buf, "help", MAX_STR)) {
-        usage();
-    } else if (!strncmp(buf, "log", MAX_STR)) {
-        if (data_wl.enable_log)
-            printf("Disable detailed logs\n");
-        else
-            printf("Enable detailed logs\n");
-
-        data_wl.enable_log = !data_wl.enable_log;
-    } else if (!strncmp(tmp, "key", MAX_STR)) {
-        while (tmp) {
-            tmp = strtok_r(NULL, " ", &buf_ptr);
-            if (tmp) {
-                switch (count) {
-                    case 0:
-                        key_idx = atoi(tmp);
-                        break;
-                    case 1:
-                        key_type = atoi(tmp);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            count++;
-        }
-        if (data_wl.enable_log)
-            printf("request key() key_idx:%u, key_type:%u\n", key_idx, key_type);
-
-        layout = get_current_layout();
-        request_key(time++, &layout->keys[key_idx], key_type);
-
-    } else {
-        printf("Invalid arguments\n");
-        usage();
-    }
-}
-
-static const char *
-prev_utf8_char(const char *s, const char *p)
-{
-    for (--p; p >= s; --p) {
-        if ((*p & 0xc0) != 0x80)
-            return p;
-    }
-    return NULL;
-}
-
-static void
-delete_before_cursor(void)
-{
-    const char *start, *end;
-
-    if (!data_wl.surrounding_text) {
-        printf("delete_before_cursor: No surrounding text available\n");
-        return;
-    }
-
-    start = prev_utf8_char(data_wl.surrounding_text,
-                   data_wl.surrounding_text + data_wl.surrounding_cursor);
-    if (!start) {
-        printf("delete_before_cursor: No previous character to delete\n");
-        return;
-    }
-
-    end = data_wl.surrounding_text + data_wl.surrounding_cursor;
-
-    zwp_input_method_context_v1_delete_surrounding_text(data_wl.context,
-                                (start - data_wl.surrounding_text) - data_wl.surrounding_cursor,
-                                end - start);
-    zwp_input_method_context_v1_commit_string(data_wl.context,
-                          data_wl.serial,
-                          "");
-
-    /* Update surrounding text */
-    data_wl.surrounding_cursor = start - data_wl.surrounding_text;
-    data_wl.surrounding_text[data_wl.surrounding_cursor] = '\0';
-    if (*end)
-        memmove(data_wl.surrounding_text + data_wl.surrounding_cursor, end, strlen(end));
-}
-
-static char *
-append(char *s1, const char *s2)
-{
-    int len1, len2;
-    char *s = NULL;
-
-    len1 = strlen(s1);
-    len2 = strlen(s2);
-    s = realloc(s1, len1 + len2 + 1);
-    if (s == NULL) {
-        printf("alloc fail");
-        return NULL;
-    }
-    memcpy(s + len1, s2, len2);
-    s[len1 + len2] = '\0';
-
-    return s;
-}
-
-static void
-request_preedit(int32_t cursor)
-{
-    printf("request_preedit() preedit_string:%s\n", data_wl.preedit_string);
-    uint32_t index = strlen(data_wl.preedit_string);
-
-    if (!data_wl.context) return;
-
-    if (data_wl.preedit_style)
-        zwp_input_method_context_v1_preedit_styling(data_wl.context,
-                                0,
-                                strlen(data_wl.preedit_string),
-                                data_wl.preedit_style);
-    if (cursor > 0)
-        index = cursor;
-    zwp_input_method_context_v1_preedit_cursor(data_wl.context,
-                           index);
-    zwp_input_method_context_v1_preedit_string(data_wl.context,
-                           data_wl.serial,
-                           data_wl.preedit_string,
-                           data_wl.preedit_string);
-}
-
-static char *
-insert_text(const char *text, uint32_t offset, const char *insert)
-{
-    int tlen = strlen(text), ilen = strlen(insert);
-    char *new_text = NULL;
-
-    new_text = malloc(tlen + ilen + 1);
-    if (new_text == NULL) {
-        printf("alloc fail");
-        return NULL;
-    }
-
-    memcpy(new_text, text, offset);
-    memcpy(new_text + offset, insert, ilen);
-    memcpy(new_text + offset + ilen, text + offset, tlen - offset);
-    new_text[tlen + ilen] = '\0';
-
-    return new_text;
-}
-
-static void
-request_commit_string(void)
-{
-    char *surrounding_text;
-
-    printf("request_commit_string()\n");
-
-    if (!data_wl.preedit_string ||
-        strlen(data_wl.preedit_string) == 0)
-        return;
-    printf("request_commit_string() preedit_string:%s\n", data_wl.preedit_string);
-
-    if (!data_wl.context) return;
-
-    zwp_input_method_context_v1_cursor_position(data_wl.context,
-                            0, 0);
-    zwp_input_method_context_v1_commit_string(data_wl.context,
-                          data_wl.serial,
-                          data_wl.preedit_string);
-
-    if (data_wl.surrounding_text) {
-        surrounding_text = insert_text(data_wl.surrounding_text,
-                           data_wl.surrounding_cursor,
-                           data_wl.preedit_string);
-        free(data_wl.surrounding_text);
-        data_wl.surrounding_text = surrounding_text;
-        data_wl.surrounding_cursor += strlen(data_wl.preedit_string);
-    } else {
-        data_wl.surrounding_text = strdup(data_wl.preedit_string);
-        data_wl.surrounding_cursor = strlen(data_wl.preedit_string);
-    }
-
-    free(data_wl.preedit_string);
-    data_wl.preedit_string = strdup("");
-}
-
-static void
-request_key(uint32_t time, const struct key *key, enum wl_pointer_button_state state)
-{
-    const char *label = NULL;
-    static uint32_t serial = 9999;
-
-    switch(data_wl.state) {
-    case KEYBOARD_STATE_DEFAULT :
-        label = key->label;
-        break;
-    case KEYBOARD_STATE_UPPERCASE :
-        label = key->uppercase;
-        break;
-    case KEYBOARD_STATE_SYMBOLS :
-        label = key->symbol;
-        break;
-    default :
-        label = key->label;
-        break;
-    }
-
-    xkb_mod_mask_t mod_mask = data_wl.state == KEYBOARD_STATE_DEFAULT ? 0 : data_wl.keysym.shift_mask;
-    uint32_t key_state = (state == WL_POINTER_BUTTON_STATE_PRESSED) ? WL_KEYBOARD_KEY_STATE_PRESSED : WL_KEYBOARD_KEY_STATE_RELEASED;
-
-    printf("request_key() data_wl.state:%d, key->key_type:%d, pressed:%u, label:%s\n", data_wl.state, key->key_type, key_state, label);
-    switch (key->key_type) {
-        case keytype_default:
-            if (state != WL_POINTER_BUTTON_STATE_PRESSED)
-                break;
-
-            printf("request_key() keytype_default. append label(%s) to preedit_string(%s)\n", label, data_wl.preedit_string);
-            data_wl.preedit_string =
-                append(data_wl.preedit_string,
-                       label);
-            request_preedit(-1);
-            break;
-        case keytype_backspace:
-            if (state != WL_POINTER_BUTTON_STATE_PRESSED)
-                break;
-
-            if (strlen(data_wl.preedit_string) == 0) {
-                delete_before_cursor();
-            } else {
-                data_wl.preedit_string[strlen(data_wl.preedit_string) - 1] = '\0';
-                request_preedit(-1);
-            }
-            break;
-        case keytype_enter:
-            request_commit_string();
-
-            if (!data_wl.context) break;
-            zwp_input_method_context_v1_keysym(data_wl.context,
-                               serial++,
-                               time,
-                               XKB_KEY_Return, key_state, mod_mask);
-            break;
-        case keytype_space:
-            if (state != WL_POINTER_BUTTON_STATE_PRESSED)
-                break;
-            data_wl.preedit_string =
-                append(data_wl.preedit_string, " ");
-            request_commit_string();
-            break;
-        case keytype_switch:
-            if (state != WL_POINTER_BUTTON_STATE_PRESSED)
-                break;
-            switch(data_wl.state) {
-            case KEYBOARD_STATE_DEFAULT:
-                data_wl.state = KEYBOARD_STATE_UPPERCASE;
-                break;
-            case KEYBOARD_STATE_UPPERCASE:
-                data_wl.state = KEYBOARD_STATE_DEFAULT;
-                break;
-            case KEYBOARD_STATE_SYMBOLS:
-                data_wl.state = KEYBOARD_STATE_UPPERCASE;
-                break;
-            }
-            break;
-        case keytype_symbols:
-            if (state != WL_POINTER_BUTTON_STATE_PRESSED)
-                break;
-            switch(data_wl.state) {
-            case KEYBOARD_STATE_DEFAULT:
-                data_wl.state = KEYBOARD_STATE_SYMBOLS;
-                break;
-            case KEYBOARD_STATE_UPPERCASE:
-                data_wl.state = KEYBOARD_STATE_SYMBOLS;
-                break;
-            case KEYBOARD_STATE_SYMBOLS:
-                data_wl.state = KEYBOARD_STATE_DEFAULT;
-                break;
-            }
-            break;
-        case keytype_tab:
-            request_commit_string();
-            if (!data_wl.context) break;
-            zwp_input_method_context_v1_keysym(data_wl.context,
-                               serial++,
-                               time,
-                               XKB_KEY_Tab, key_state, mod_mask);
-            break;
-        case keytype_arrow_up:
-            request_commit_string();
-            if (!data_wl.context) break;
-            zwp_input_method_context_v1_keysym(data_wl.context,
-                               serial++,
-                               time,
-                               XKB_KEY_Up, key_state, mod_mask);
-            break;
-        case keytype_arrow_left:
-            request_commit_string();
-            if (!data_wl.context) break;
-            zwp_input_method_context_v1_keysym(data_wl.context,
-                               serial++,
-                               time,
-                               XKB_KEY_Left, key_state, mod_mask);
-            break;
-        case keytype_arrow_right:
-            request_commit_string();
-            if (!data_wl.context) break;
-            zwp_input_method_context_v1_keysym(data_wl.context,
-                               serial++,
-                               time,
-                               XKB_KEY_Right, key_state, mod_mask);
-            break;
-        case keytype_arrow_down:
-            request_commit_string();
-            if (!data_wl.context) break;
-            zwp_input_method_context_v1_keysym(data_wl.context,
-                               serial++,
-                               time,
-                               XKB_KEY_Down, key_state, mod_mask);
-            break;
-        case keytype_style:
-            if (state != WL_POINTER_BUTTON_STATE_PRESSED)
-                break;
-            data_wl.preedit_style = (data_wl.preedit_style + 1) % 8; /* TODO */
-            request_preedit(-1);
-            break;
-    }
-}
-
-static void
-im_context_cb_surrounding_text (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *text, uint32_t cursor, uint32_t anchor)
-{
-    printf("im_context_cb_surrounding_text\n");
-        free(data_wl.surrounding_text);
-    data_wl.surrounding_text = strdup(text);
-
-    data_wl.surrounding_cursor = cursor;
-}
-
-static void
-im_context_cb_reset (void *data, struct zwp_input_method_context_v1 *im_ctx)
-{
-    printf("im_context_cb_reset\n");
-    
-    if (strlen(data_wl.preedit_string)) {
-        free(data_wl.preedit_string);
-        data_wl.preedit_string = strdup("");
-    }
-}
-
-static void
-im_context_cb_content_type (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t hint, uint32_t purpose)
-{
-    printf("im_context_cb_content_type\n");
-
-    data_wl.content_hint = hint;
-    data_wl.content_purpose = purpose;
-}
-
-static void
-im_context_cb_invoke_action (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t button, uint32_t index)
-{
-    printf("im_context_cb_invoke_action\n");
-
-    if (button != BTN_LEFT)
-        return;
-
-    request_preedit(index);
-}
-
-static void
-im_context_cb_commit_state (void *data, struct zwp_input_method_context_v1 *context, uint32_t serial)
-{
-    printf("im_context_cb_commit_state\n");
-
-    const struct layout *layout;
-
-    data_wl.serial = serial;
-
-    layout = get_current_layout();
-
-    if (data_wl.surrounding_text)
-        printf("Surrounding text updated: %s\n", data_wl.surrounding_text);
-
-    if (!context) return;
-    zwp_input_method_context_v1_language(context,
-                         data_wl.serial,
-                         layout->language);
-    zwp_input_method_context_v1_text_direction(context,
-                           data_wl.serial,
-                           layout->text_direction);
-}
-
-static void
-im_context_cb_preferred_language (void *data, struct zwp_input_method_context_v1 *context, const char *language)
-{
-    printf("im_context_cb_preferred_language\n");
-
-    if (data_wl.preferred_language)
-        free(data_wl.preferred_language);
-
-    data_wl.preferred_language = NULL;
-
-    if (language)
-        data_wl.preferred_language = strdup(language);
-}
-
-static const struct zwp_input_method_context_v1_listener input_method_context_cb_listener = {
-    .surrounding_text = im_context_cb_surrounding_text,
-    .reset = im_context_cb_reset,
-    .content_type = im_context_cb_content_type,
-    .invoke_action = im_context_cb_invoke_action,
-    .commit_state = im_context_cb_commit_state,
-    .preferred_language = im_context_cb_preferred_language,
-    //for tizen only
-    .return_key_type = NULL,
-    .return_key_disabled = NULL,
-    .input_panel_data = NULL,
-    .bidi_direction = NULL,
-    .cursor_position = NULL,
-    .process_input_device_event = NULL,
-    .filter_key_event = NULL,
-    .capital_mode = NULL,
-    .prediction_hint = NULL,
-    .mime_type = NULL,
-    .finalized_content = NULL,
-    .prediction_hint_data = NULL,
-    .input_panel_enabled = NULL,
-};
-
-static void
-keysym_modifiers_add(struct wl_array *modifiers_map,
-             const char *name)
-{
-    size_t len = strlen(name) + 1;
-    char *p;
-
-    p = wl_array_add(modifiers_map, len);
-
-    if (p == NULL)
-        return;
-
-    strncpy(p, name, len);
-}
-
-static xkb_mod_index_t
-keysym_modifiers_get_index(struct wl_array *modifiers_map,
-               const char *name)
-{
-    xkb_mod_index_t index = 0;
-    char *p = modifiers_map->data;
-
-    while ((const char *)p < (const char *)(modifiers_map->data + modifiers_map->size)) {
-        if (strcmp(p, name) == 0)
-            return index;
-
-        index++;
-        p += strlen(p) + 1;
-    }
-
-    return XKB_MOD_INVALID;
-}
-
-xkb_mod_mask_t
-keysym_modifiers_get_mask(struct wl_array *modifiers_map,
-              const char *name)
-{
-    xkb_mod_index_t index = keysym_modifiers_get_index(modifiers_map, name);
-
-    if (index == XKB_MOD_INVALID)
-        return XKB_MOD_INVALID;
-
-    return 1 << index;
-}
-
-static void
-im_cb_activate (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *context)
-{
-    printf("im_cb_activate\n");
-
-    struct wl_array modifiers_map;
-    const struct layout *layout;
-
-    if (data_wl.context)
-        zwp_input_method_context_v1_destroy(data_wl.context);
-
-    if (data_wl.preedit_string)
-        free(data_wl.preedit_string);
-
-    data_wl.preedit_style = 0;
-    data_wl.preedit_string = strdup("");
-    data_wl.content_hint = 0;
-    data_wl.content_purpose = 0;
-    free(data_wl.preferred_language);
-    data_wl.preferred_language = NULL;
-    free(data_wl.surrounding_text);
-    data_wl.surrounding_text = NULL;
-
-    data_wl.serial = 0;
-
-    data_wl.context = context;
-    zwp_input_method_context_v1_add_listener(context,
-                         &input_method_context_cb_listener,
-                         NULL);
-
-    wl_array_init(&modifiers_map);
-    keysym_modifiers_add(&modifiers_map, "Shift");
-    keysym_modifiers_add(&modifiers_map, "Control");
-    keysym_modifiers_add(&modifiers_map, "Mod1");
-    zwp_input_method_context_v1_modifiers_map(context, &modifiers_map);
-    data_wl.keysym.shift_mask = keysym_modifiers_get_mask(&modifiers_map, "Shift");
-    wl_array_release(&modifiers_map);
-
-    layout = get_current_layout();
-
-    zwp_input_method_context_v1_language(context,
-                         data_wl.serial,
-                         layout->language);
-    zwp_input_method_context_v1_text_direction(context,
-                           data_wl.serial,
-                           layout->text_direction);
-}
-static void
-im_cb_deactivate (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx)
-{
-    printf("im_cb_deactivate\n");
-
-    if (!data_wl.context)
-        return;
-
-    zwp_input_method_context_v1_destroy(data_wl.context);
-    data_wl.context = NULL;
-}
-
-static void
-im_cb_destroy (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx)
-{
-    printf("im_cb_destroy\n");
-    zwp_input_method_v1_destroy(data_wl.input_method);
-    data_wl.input_method = NULL;
-}
-
-static const struct zwp_input_method_v1_listener input_method_cb_listener = {
-    .activate = im_cb_activate,
-    .deactivate = im_cb_deactivate,
-    //for tizen only
-    .destroy = im_cb_destroy,
-    .show_input_panel = NULL,
-    .hide_input_panel = NULL,
-    .open_connection = NULL,
-    .close_connection = NULL,
-    .set_text_input_id = NULL,
-};
-
-static void
-registry_handle_global(void * data, struct wl_registry * registry, uint32_t id,
-        const char * interface, uint32_t version)
-{
-    if (strcmp(interface, "wl_compositor") == 0) {
-        data_wl.compositor = wl_registry_bind(registry, id,
-                &wl_compositor_interface, version);
-        if (!data_wl.compositor) {
-            printf("Failed to bind compositor.\n");
-            return;
-        }
-        if (data_wl.enable_log)
-            printf("Success to bind compositor.\n");
-    } else if (!strcmp(interface, "zwp_input_method_manager_v1")) {
-        data_wl.input_method_mgr = wl_registry_bind(registry, id,
-                &zwp_input_method_manager_v1_interface, version);
-    } else if (!strcmp(interface, "zwp_input_method_v1")) {
-        data_wl.input_method = wl_registry_bind(registry, id,
-                &zwp_input_method_v1_interface, version);
-        zwp_input_method_v1_add_listener(data_wl.input_method,
-                         &input_method_cb_listener,
-                         NULL);
-
-        //TODO: delte this code. this job should be done in cb_activate
-        data_wl.preedit_string = strdup("");
-        data_wl.content_hint = 0;
-        data_wl.content_purpose = 0;
-        free(data_wl.preferred_language);
-        data_wl.preferred_language = NULL;
-        free(data_wl.surrounding_text);
-        data_wl.surrounding_text = NULL;
-        data_wl.serial = 0;
-    }
-}
-
-static void
-registry_handle_global_remove(void * data, struct wl_registry * registry, uint32_t id)
-{
-    if (data_wl.enable_log)
-        printf("registry is removed. id: %d !\n", id);
-}
-
-static const struct wl_registry_listener _registry_listener = {
-    registry_handle_global,
-    registry_handle_global_remove
-};
-
-static int
-wayland_init(void)
-{
-    memset(&data_wl, 0, sizeof(struct display));
-
-    data_wl.display = wl_display_connect(NULL);
-    if (!data_wl.display) {
-        printf("Failed to connect wayland display\n");
-        return 0;
-    }
-
-    data_wl.queue = wl_display_create_queue(data_wl.display);
-    if (!data_wl.queue) {
-        printf("Failed to create queue\n");
-        return 0;
-    }
-
-    data_wl.registry = wl_display_get_registry(data_wl.display);
-    if (!data_wl.registry) {
-        printf("Failed to get registry\n");
-        return 0;
-    }
-
-    wl_proxy_set_queue((struct wl_proxy*)data_wl.registry, data_wl.queue);
-    wl_registry_add_listener(data_wl.registry, &_registry_listener, NULL);
-
-    if (wl_display_dispatch_queue(data_wl.display, data_wl.queue) == -1) {
-        printf("Failed to dispatch display\n");
-        return 0;
-    }
-    if (wl_display_roundtrip_queue(data_wl.display, data_wl.queue) == -1) {
-        printf("Failed to roundtrip display\n");
-        return 0;
-    }
-
-    return 1;
-}
-
-static void
-wayland_deinit(void)
-{
-    if (data_wl.enable_log)
-        printf("Shutdown wayland system\n");
-
-    if (data_wl.queue) wl_event_queue_destroy(data_wl.queue);
-    if (data_wl.display) {
-        if (data_wl.input_method)
-            zwp_input_method_v1_destroy(data_wl.input_method);
-        zwp_input_method_manager_v1_destroy(data_wl.input_method_mgr);
-        wl_registry_destroy(data_wl.registry);
-        wl_display_flush(data_wl.display);
-        wl_display_disconnect(data_wl.display);
-    }
-}
-
-static int
-epoll_init(void)
-{
-    struct epoll_event ep[2];
-
-    data_wl.fd_epoll = epoll_create(SIZE_EPOLL);
-    if (data_wl.fd_epoll <= 0) {
-        printf("Failed to epoll create: %d\n", SIZE_EPOLL);
-        return 0;
-    }
-
-    data_wl.fd_display = wl_display_get_fd(data_wl.display);
-
-    memset(ep, 0, sizeof(struct epoll_event)*2);
-
-    ep[0].events = EPOLLIN | EPOLLERR | EPOLLHUP;
-    ep[0].data.fd = data_wl.fd_display;
-    epoll_ctl(data_wl.fd_epoll, EPOLL_CTL_ADD, data_wl.fd_display, &ep[0]);
-    ep[1].events = EPOLLIN | EPOLLERR | EPOLLHUP;
-    ep[1].data.fd = STDIN_FILENO;
-    epoll_ctl(data_wl.fd_epoll, EPOLL_CTL_ADD, 0, &ep[1]);
-
-    return 1;
-}
-
-static void
-mainloop(void)
-{
-    struct epoll_event ep[SIZE_EPOLL];
-    int res, count, i;
-
-    res = epoll_init();
-    if (!res) {
-        printf("Failed to init epoll\n");
-        return;
-    }
-
-    data_wl.run = 1;
-    while (data_wl.run) {
-        res = wl_display_dispatch_queue_pending(data_wl.display, data_wl.queue);
-        if (res < 0) {
-            printf("Failed to dispatch pending. result: %d\n", res);
-            data_wl.run = 0;
-            break;
-        }
-        res = wl_display_flush(data_wl.display);
-        if (res < 0) {
-            printf("Failed to flush display. result: %d\n", res);
-            data_wl.run = 0;
-            break;
-        }
-
-        count = epoll_wait(data_wl.fd_epoll, ep, SIZE_EPOLL, -1);
-        for (i = 0; i < count; i++) {
-            if (ep[i].events & EPOLLIN) {
-                if (ep[i].data.fd == data_wl.fd_display) {
-                    wl_display_dispatch_queue(data_wl.display, data_wl.queue);
-                } else {
-                    stdin_read();
-                }
-            }
-            if (ep[i].events & EPOLLERR) {
-                data_wl.run = 0;
-            }
-            if (ep[i].events & EPOLLHUP) {
-                data_wl.run = 0;
-            }
-        }
-    }
-}
-
-int
-main(int argc, char **argv)
-{
-    int res;
-
-    res = wayland_init();
-    if (!res) return 0;
-
-    mainloop();
-
-    wayland_deinit();
-
-    return 0;
-}
index 73b7ab4..cfa1800 100644 (file)
@@ -5,11 +5,22 @@
 #include <sys/epoll.h>
 
 #include <wayland-client.h>
+#include <xkbcommon/xkbcommon.h>
+//#include <linux/input.h>
+
+#include <input-method-client-protocol.h>
+#include <text-client-protocol.h>
 #include <tizen-extension-client-protocol.h>
 
 #define MAX_STR 1024
 #define SIZE_EPOLL 16
 
+enum keyboard_state {
+    KEYBOARD_STATE_DEFAULT,
+    KEYBOARD_STATE_UPPERCASE,
+    KEYBOARD_STATE_SYMBOLS
+};
+
 enum enum_key_type
 {
     KEY_UP = 0,
@@ -43,11 +54,158 @@ struct display
     int init;
 
     int enable_log;
+
+    struct zwp_input_method_manager_v1 *input_method_mgr;
+    struct zwp_input_method_v1 *input_method;
+    struct zwp_input_method_context_v1 *context;
+
+    char *preedit_string;
+    uint32_t preedit_style;
+    struct {
+        xkb_mod_mask_t shift_mask;
+    } keysym;
+    uint32_t serial;
+    uint32_t content_hint;
+    int32_t content_purpose;
+    char *preferred_language;
+    char *surrounding_text;
+    uint32_t surrounding_cursor;
+    enum keyboard_state state; //struct keyboard *keyboard;
+
+    //struct zwp_input_panel_surface_v1 *ips;
+};
+
+struct layout {
+    const struct key *keys;
+    uint32_t count;
+
+    uint32_t columns;
+    uint32_t rows;
+
+    const char *language;
+    uint32_t text_direction;
+};
+
+enum key_type {
+    keytype_default,
+    keytype_backspace,
+    keytype_enter,
+    keytype_space,
+    keytype_switch,
+    keytype_symbols,
+    keytype_tab,
+    keytype_arrow_up,
+    keytype_arrow_left,
+    keytype_arrow_right,
+    keytype_arrow_down,
+    keytype_style
+};
+
+struct key {
+    enum key_type key_type;
+
+    char *label;
+    char *uppercase;
+    char *symbol;
+
+    unsigned int width;
+};
+
+static const struct key normal_keys[] = {
+    { keytype_default, "q", "Q", "1", 1},
+    { keytype_default, "w", "W", "2", 1},
+    { keytype_default, "e", "E", "3", 1},
+    { keytype_default, "r", "R", "4", 1},
+    { keytype_default, "t", "T", "5", 1},
+    { keytype_default, "y", "Y", "6", 1},
+    { keytype_default, "u", "U", "7", 1},
+    { keytype_default, "i", "I", "8", 1},
+    { keytype_default, "o", "O", "9", 1},
+    { keytype_default, "p", "P", "0", 1},
+    { keytype_backspace, "<--", "<--", "<--", 2},
+
+    { keytype_tab, "->|", "->|", "->|", 1},
+    { keytype_default, "a", "A", "-", 1},
+    { keytype_default, "s", "S", "@", 1},
+    { keytype_default, "d", "D", "*", 1},
+    { keytype_default, "f", "F", "^", 1},
+    { keytype_default, "g", "G", ":", 1},
+    { keytype_default, "h", "H", ";", 1},
+    { keytype_default, "j", "J", "(", 1},
+    { keytype_default, "k", "K", ")", 1},
+    { keytype_default, "l", "L", "~", 1},
+    { keytype_enter, "Enter", "Enter", "Enter", 2},
+
+    { keytype_switch, "ABC", "abc", "ABC", 2},
+    { keytype_default, "z", "Z", "/", 1},
+    { keytype_default, "x", "X", "\'", 1},
+    { keytype_default, "c", "C", "\"", 1},
+    { keytype_default, "v", "V", "+", 1},
+    { keytype_default, "b", "B", "=", 1},
+    { keytype_default, "n", "N", "?", 1},
+    { keytype_default, "m", "M", "!", 1},
+    { keytype_default, ",", ",", "\\", 1},
+    { keytype_default, ".", ".", "|", 1},
+    { keytype_switch, "ABC", "abc", "ABC", 1},
+
+    { keytype_symbols, "?123", "?123", "abc", 1},
+    { keytype_space, "", "", "", 5},
+    { keytype_arrow_up, "/\\", "/\\", "/\\", 1},
+    { keytype_arrow_left, "<", "<", "<", 1},
+    { keytype_arrow_right, ">", ">", ">", 1},
+    { keytype_arrow_down, "\\/", "\\/", "\\/", 1},
+    { keytype_style, "", "", "", 2}
+};
+
+static const struct key numeric_keys[] = {
+    { keytype_default, "1", "1", "1", 1},
+    { keytype_default, "2", "2", "2", 1},
+    { keytype_default, "3", "3", "3", 1},
+    { keytype_default, "4", "4", "4", 1},
+    { keytype_default, "5", "5", "5", 1},
+    { keytype_default, "6", "6", "6", 1},
+    { keytype_default, "7", "7", "7", 1},
+    { keytype_default, "8", "8", "8", 1},
+    { keytype_default, "9", "9", "9", 1},
+    { keytype_default, "0", "0", "0", 1},
+    { keytype_backspace, "<--", "<--", "<--", 2},
+
+    { keytype_space, "", "", "", 4},
+    { keytype_enter, "Enter", "Enter", "Enter", 2},
+    { keytype_arrow_up, "/\\", "/\\", "/\\", 1},
+    { keytype_arrow_left, "<", "<", "<", 1},
+    { keytype_arrow_right, ">", ">", ">", 1},
+    { keytype_arrow_down, "\\/", "\\/", "\\/", 1},
+    { keytype_style, "", "", "", 2}
+};
+
+static const struct layout normal_layout = {
+    normal_keys,
+    sizeof(normal_keys) / sizeof(*normal_keys),
+    12,
+    4,
+    "en",
+    WL_TEXT_INPUT_TEXT_DIRECTION_LTR
+};
+
+static const struct layout numeric_layout = {
+    numeric_keys,
+    sizeof(numeric_keys) / sizeof(*numeric_keys),
+    12,
+    2,
+    "en",
+    WL_TEXT_INPUT_TEXT_DIRECTION_LTR
 };
 
 struct display data_wl;
 
 static void
+request_key(uint32_t time, const struct key *key, enum wl_keyboard_key_state state);
+
+static const struct layout *
+get_current_layout(void);
+
+static void
 usage(void)
 {
     printf("  Supported commands:  init  (Initialize input generator)\n");
@@ -104,6 +262,13 @@ usage(void)
     printf("  :     mouse 1 1 10 10\n");
     printf("  :     mouse 1 1 -10 -10\n");
     printf("  :     mouse 1 2 0 0\n");
+    printf("ime {key_idx} {type}\n");
+    printf("  : key_index\n");
+    printf("  : - keys = [q,w,e,r,t,,,]\n");
+    printf("  : type:\n");
+    printf("  : - default: down & up\n");
+    printf("  : - down: 1\n");
+    printf("  : - up: 0\n");
     printf("\n");
 }
 
@@ -305,6 +470,8 @@ stdin_read(void)
     char buf[MAX_STR] = {0, }, *tmp, *buf_ptr, key_name[MAX_STR] = {0, };
     int count = 0;
     int key_type = KEY_ALL, idx = 0, type = POINTER_ALL, x = 0, y = 0;
+    static uint32_t time = 12345;
+    const struct layout *layout;
 
     while ((c = getchar()) != EOF) {
         if (c == '\n') break;
@@ -405,6 +572,33 @@ stdin_read(void)
             count++;
         }
         mouse_generate(idx, type, x, y);
+    }  else if (!strncmp(tmp, "ime", MAX_STR)) {
+        while (tmp) {
+            tmp = strtok_r(NULL, " ", &buf_ptr);
+            if (tmp) {
+                switch (count) {
+                    case 0:
+                        idx = atoi(tmp);
+                        break;
+                    case 1:
+                        key_type = atoi(tmp);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            count++;
+        }
+        if (data_wl.enable_log)
+            printf("request key() key_idx:%u, key_type:%u\n", idx, key_type);
+
+        layout = get_current_layout();
+        if (key_type == KEY_ALL) {
+            request_key(time++, &layout->keys[idx], WL_KEYBOARD_KEY_STATE_PRESSED);
+            request_key(time++, &layout->keys[idx], WL_KEYBOARD_KEY_STATE_RELEASED);
+        }
+        else
+            request_key(time++, &layout->keys[idx], key_type);
     } else if (!strncmp(buf, "q", MAX_STR) || !strncmp(buf, "quit", MAX_STR)) {
         data_wl.run = 0;
     } else if (!strncmp(buf, "help", MAX_STR)) {
@@ -440,6 +634,526 @@ static const struct tizen_input_device_manager_listener _input_device_manager_li
     .block_expired = NULL,
 };
 
+static const struct layout *
+get_current_layout(void)
+{
+    switch (data_wl.content_purpose) {
+        case WL_TEXT_INPUT_CONTENT_PURPOSE_DIGITS:
+        case WL_TEXT_INPUT_CONTENT_PURPOSE_NUMBER:
+            return &numeric_layout;
+        default:
+            return &normal_layout;
+    }
+}
+
+static const char *
+prev_utf8_char(const char *s, const char *p)
+{
+    for (--p; p >= s; --p) {
+        if ((*p & 0xc0) != 0x80)
+            return p;
+    }
+    return NULL;
+}
+
+static void
+delete_before_cursor(void)
+{
+    const char *start, *end;
+
+    if (!data_wl.surrounding_text) {
+        printf("delete_before_cursor: No surrounding text available\n");
+        return;
+    }
+
+    start = prev_utf8_char(data_wl.surrounding_text,
+                   data_wl.surrounding_text + data_wl.surrounding_cursor);
+    if (!start) {
+        printf("delete_before_cursor: No previous character to delete\n");
+        return;
+    }
+
+    end = data_wl.surrounding_text + data_wl.surrounding_cursor;
+
+    zwp_input_method_context_v1_delete_surrounding_text(data_wl.context,
+                                (start - data_wl.surrounding_text) - data_wl.surrounding_cursor,
+                                end - start);
+    zwp_input_method_context_v1_commit_string(data_wl.context,
+                          data_wl.serial,
+                          "");
+
+    /* Update surrounding text */
+    data_wl.surrounding_cursor = start - data_wl.surrounding_text;
+    data_wl.surrounding_text[data_wl.surrounding_cursor] = '\0';
+    if (*end)
+        memmove(data_wl.surrounding_text + data_wl.surrounding_cursor, end, strlen(end));
+}
+
+static char *
+append(char *s1, const char *s2)
+{
+    int len1, len2;
+    char *s = NULL;
+
+    len1 = strlen(s1);
+    len2 = strlen(s2);
+    s = realloc(s1, len1 + len2 + 1);
+    if (s == NULL) {
+        printf("alloc fail");
+        return NULL;
+    }
+    memcpy(s + len1, s2, len2);
+    s[len1 + len2] = '\0';
+
+    return s;
+}
+
+static void
+request_preedit(int32_t cursor)
+{
+    printf("request_preedit() preedit_string:%s\n", data_wl.preedit_string);
+    uint32_t index = strlen(data_wl.preedit_string);
+
+    if (!data_wl.context) return;
+
+    if (data_wl.preedit_style)
+        zwp_input_method_context_v1_preedit_styling(data_wl.context,
+                                0,
+                                strlen(data_wl.preedit_string),
+                                data_wl.preedit_style);
+    if (cursor > 0)
+        index = cursor;
+    zwp_input_method_context_v1_preedit_cursor(data_wl.context,
+                           index);
+    zwp_input_method_context_v1_preedit_string(data_wl.context,
+                           data_wl.serial,
+                           data_wl.preedit_string,
+                           data_wl.preedit_string);
+}
+
+static char *
+insert_text(const char *text, uint32_t offset, const char *insert)
+{
+    int tlen = strlen(text), ilen = strlen(insert);
+    char *new_text = NULL;
+
+    new_text = malloc(tlen + ilen + 1);
+    if (new_text == NULL) {
+        printf("alloc fail");
+        return NULL;
+    }
+
+    memcpy(new_text, text, offset);
+    memcpy(new_text + offset, insert, ilen);
+    memcpy(new_text + offset + ilen, text + offset, tlen - offset);
+    new_text[tlen + ilen] = '\0';
+
+    return new_text;
+}
+
+static void
+request_commit_string(void)
+{
+    char *surrounding_text;
+
+    printf("request_commit_string()\n");
+
+    if (!data_wl.preedit_string ||
+        strlen(data_wl.preedit_string) == 0)
+        return;
+    printf("request_commit_string() preedit_string:%s\n", data_wl.preedit_string);
+
+    if (!data_wl.context) return;
+
+    zwp_input_method_context_v1_cursor_position(data_wl.context,
+                            0, 0);
+    zwp_input_method_context_v1_commit_string(data_wl.context,
+                          data_wl.serial,
+                          data_wl.preedit_string);
+
+    if (data_wl.surrounding_text) {
+        surrounding_text = insert_text(data_wl.surrounding_text,
+                           data_wl.surrounding_cursor,
+                           data_wl.preedit_string);
+        free(data_wl.surrounding_text);
+        data_wl.surrounding_text = surrounding_text;
+        data_wl.surrounding_cursor += strlen(data_wl.preedit_string);
+    } else {
+        data_wl.surrounding_text = strdup(data_wl.preedit_string);
+        data_wl.surrounding_cursor = strlen(data_wl.preedit_string);
+    }
+
+    free(data_wl.preedit_string);
+    data_wl.preedit_string = strdup("");
+}
+
+static void
+request_key(uint32_t time, const struct key *key, enum wl_keyboard_key_state state)
+{
+    const char *label = NULL;
+    static uint32_t serial = 9999;
+
+    switch(data_wl.state) {
+    case KEYBOARD_STATE_DEFAULT :
+        label = key->label;
+        break;
+    case KEYBOARD_STATE_UPPERCASE :
+        label = key->uppercase;
+        break;
+    case KEYBOARD_STATE_SYMBOLS :
+        label = key->symbol;
+        break;
+    default :
+        label = key->label;
+        break;
+    }
+
+    xkb_mod_mask_t mod_mask = data_wl.state == KEYBOARD_STATE_DEFAULT ? 0 : data_wl.keysym.shift_mask;
+    uint32_t key_state = (state == WL_KEYBOARD_KEY_STATE_PRESSED) ? WL_KEYBOARD_KEY_STATE_PRESSED : WL_KEYBOARD_KEY_STATE_RELEASED;
+
+    printf("request_key() data_wl.state:%d, key->key_type:%d, pressed:%u, label:%s\n", data_wl.state, key->key_type, key_state, label);
+    switch (key->key_type) {
+        case keytype_default:
+            if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
+                break;
+
+            printf("request_key() keytype_default. append label(%s) to preedit_string(%s)\n", label, data_wl.preedit_string);
+            data_wl.preedit_string =
+                append(data_wl.preedit_string,
+                       label);
+            request_preedit(-1);
+            break;
+        case keytype_backspace:
+            if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
+                break;
+
+            if (strlen(data_wl.preedit_string) == 0) {
+                delete_before_cursor();
+            } else {
+                data_wl.preedit_string[strlen(data_wl.preedit_string) - 1] = '\0';
+                request_preedit(-1);
+            }
+            break;
+        case keytype_enter:
+            request_commit_string();
+
+            if (!data_wl.context) break;
+            zwp_input_method_context_v1_keysym(data_wl.context,
+                               serial++,
+                               time,
+                               XKB_KEY_Return, key_state, mod_mask);
+            break;
+        case keytype_space:
+            if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
+                break;
+            data_wl.preedit_string =
+                append(data_wl.preedit_string, " ");
+            request_commit_string();
+            break;
+        case keytype_switch:
+            if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
+                break;
+            switch(data_wl.state) {
+            case KEYBOARD_STATE_DEFAULT:
+                data_wl.state = KEYBOARD_STATE_UPPERCASE;
+                break;
+            case KEYBOARD_STATE_UPPERCASE:
+                data_wl.state = KEYBOARD_STATE_DEFAULT;
+                break;
+            case KEYBOARD_STATE_SYMBOLS:
+                data_wl.state = KEYBOARD_STATE_UPPERCASE;
+                break;
+            }
+            break;
+        case keytype_symbols:
+            if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
+                break;
+            switch(data_wl.state) {
+            case KEYBOARD_STATE_DEFAULT:
+                data_wl.state = KEYBOARD_STATE_SYMBOLS;
+                break;
+            case KEYBOARD_STATE_UPPERCASE:
+                data_wl.state = KEYBOARD_STATE_SYMBOLS;
+                break;
+            case KEYBOARD_STATE_SYMBOLS:
+                data_wl.state = KEYBOARD_STATE_DEFAULT;
+                break;
+            }
+            break;
+        case keytype_tab:
+            request_commit_string();
+            if (!data_wl.context) break;
+            zwp_input_method_context_v1_keysym(data_wl.context,
+                               serial++,
+                               time,
+                               XKB_KEY_Tab, key_state, mod_mask);
+            break;
+        case keytype_arrow_up:
+            request_commit_string();
+            if (!data_wl.context) break;
+            zwp_input_method_context_v1_keysym(data_wl.context,
+                               serial++,
+                               time,
+                               XKB_KEY_Up, key_state, mod_mask);
+            break;
+        case keytype_arrow_left:
+            request_commit_string();
+            if (!data_wl.context) break;
+            zwp_input_method_context_v1_keysym(data_wl.context,
+                               serial++,
+                               time,
+                               XKB_KEY_Left, key_state, mod_mask);
+            break;
+        case keytype_arrow_right:
+            request_commit_string();
+            if (!data_wl.context) break;
+            zwp_input_method_context_v1_keysym(data_wl.context,
+                               serial++,
+                               time,
+                               XKB_KEY_Right, key_state, mod_mask);
+            break;
+        case keytype_arrow_down:
+            request_commit_string();
+            if (!data_wl.context) break;
+            zwp_input_method_context_v1_keysym(data_wl.context,
+                               serial++,
+                               time,
+                               XKB_KEY_Down, key_state, mod_mask);
+            break;
+        case keytype_style:
+            if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
+                break;
+            data_wl.preedit_style = (data_wl.preedit_style + 1) % 8; /* TODO */
+            request_preedit(-1);
+            break;
+    }
+}
+
+static void
+im_context_cb_surrounding_text (void *data, struct zwp_input_method_context_v1 *im_ctx, const char *text, uint32_t cursor, uint32_t anchor)
+{
+    printf("im_context_cb_surrounding_text\n");
+        free(data_wl.surrounding_text);
+    data_wl.surrounding_text = strdup(text);
+
+    data_wl.surrounding_cursor = cursor;
+}
+
+static void
+im_context_cb_reset (void *data, struct zwp_input_method_context_v1 *im_ctx)
+{
+    printf("im_context_cb_reset\n");
+
+    if (strlen(data_wl.preedit_string)) {
+        free(data_wl.preedit_string);
+        data_wl.preedit_string = strdup("");
+    }
+}
+
+static void
+im_context_cb_content_type (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t hint, uint32_t purpose)
+{
+    printf("im_context_cb_content_type\n");
+
+    data_wl.content_hint = hint;
+    data_wl.content_purpose = purpose;
+}
+
+static void
+im_context_cb_invoke_action (void *data, struct zwp_input_method_context_v1 *im_ctx, uint32_t button, uint32_t index)
+{
+    printf("im_context_cb_invoke_action\n");
+
+    //if (button != BTN_LEFT)
+    //    return;
+
+    request_preedit(index);
+}
+
+static void
+im_context_cb_commit_state (void *data, struct zwp_input_method_context_v1 *context, uint32_t serial)
+{
+    printf("im_context_cb_commit_state\n");
+
+    const struct layout *layout;
+
+    data_wl.serial = serial;
+
+    layout = get_current_layout();
+
+    if (data_wl.surrounding_text)
+        printf("Surrounding text updated: %s\n", data_wl.surrounding_text);
+
+    if (!context) return;
+    zwp_input_method_context_v1_language(context,
+                         data_wl.serial,
+                         layout->language);
+    zwp_input_method_context_v1_text_direction(context,
+                           data_wl.serial,
+                           layout->text_direction);
+}
+
+static void
+im_context_cb_preferred_language (void *data, struct zwp_input_method_context_v1 *context, const char *language)
+{
+    printf("im_context_cb_preferred_language\n");
+
+    if (data_wl.preferred_language)
+        free(data_wl.preferred_language);
+
+    data_wl.preferred_language = NULL;
+
+    if (language)
+        data_wl.preferred_language = strdup(language);
+}
+
+static const struct zwp_input_method_context_v1_listener input_method_context_cb_listener = {
+    .surrounding_text = im_context_cb_surrounding_text,
+    .reset = im_context_cb_reset,
+    .content_type = im_context_cb_content_type,
+    .invoke_action = im_context_cb_invoke_action,
+    .commit_state = im_context_cb_commit_state,
+    .preferred_language = im_context_cb_preferred_language,
+    //for tizen only
+    .return_key_type = NULL,
+    .return_key_disabled = NULL,
+    .input_panel_data = NULL,
+    .bidi_direction = NULL,
+    .cursor_position = NULL,
+    .process_input_device_event = NULL,
+    .filter_key_event = NULL,
+    .capital_mode = NULL,
+    .prediction_hint = NULL,
+    .mime_type = NULL,
+    .finalized_content = NULL,
+    .prediction_hint_data = NULL,
+    .input_panel_enabled = NULL,
+};
+
+static void
+keysym_modifiers_add(struct wl_array *modifiers_map,
+             const char *name)
+{
+    size_t len = strlen(name) + 1;
+    char *p;
+
+    p = wl_array_add(modifiers_map, len);
+
+    if (p == NULL)
+        return;
+
+    strncpy(p, name, len);
+}
+
+static xkb_mod_index_t
+keysym_modifiers_get_index(struct wl_array *modifiers_map,
+               const char *name)
+{
+    xkb_mod_index_t index = 0;
+    char *p = modifiers_map->data;
+
+    while ((const char *)p < (const char *)(modifiers_map->data + modifiers_map->size)) {
+        if (strcmp(p, name) == 0)
+            return index;
+
+        index++;
+        p += strlen(p) + 1;
+    }
+
+    return XKB_MOD_INVALID;
+}
+
+static xkb_mod_mask_t
+keysym_modifiers_get_mask(struct wl_array *modifiers_map,
+              const char *name)
+{
+    xkb_mod_index_t index = keysym_modifiers_get_index(modifiers_map, name);
+
+    if (index == XKB_MOD_INVALID)
+        return XKB_MOD_INVALID;
+
+    return 1 << index;
+}
+
+static void
+im_cb_activate (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *context)
+{
+    printf("im_cb_activate\n");
+
+    struct wl_array modifiers_map;
+    const struct layout *layout;
+
+    if (data_wl.context)
+        zwp_input_method_context_v1_destroy(data_wl.context);
+
+    if (data_wl.preedit_string)
+        free(data_wl.preedit_string);
+
+    data_wl.preedit_style = 0;
+    data_wl.preedit_string = strdup("");
+    data_wl.content_hint = 0;
+    data_wl.content_purpose = 0;
+    free(data_wl.preferred_language);
+    data_wl.preferred_language = NULL;
+    free(data_wl.surrounding_text);
+    data_wl.surrounding_text = NULL;
+
+    data_wl.serial = 0;
+
+    data_wl.context = context;
+    zwp_input_method_context_v1_add_listener(context,
+                         &input_method_context_cb_listener,
+                         NULL);
+
+    wl_array_init(&modifiers_map);
+    keysym_modifiers_add(&modifiers_map, "Shift");
+    keysym_modifiers_add(&modifiers_map, "Control");
+    keysym_modifiers_add(&modifiers_map, "Mod1");
+    zwp_input_method_context_v1_modifiers_map(context, &modifiers_map);
+    data_wl.keysym.shift_mask = keysym_modifiers_get_mask(&modifiers_map, "Shift");
+    wl_array_release(&modifiers_map);
+
+    layout = get_current_layout();
+
+    zwp_input_method_context_v1_language(context,
+                         data_wl.serial,
+                         layout->language);
+    zwp_input_method_context_v1_text_direction(context,
+                           data_wl.serial,
+                           layout->text_direction);
+}
+static void
+im_cb_deactivate (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx)
+{
+    printf("im_cb_deactivate\n");
+
+    if (!data_wl.context)
+        return;
+
+    zwp_input_method_context_v1_destroy(data_wl.context);
+    data_wl.context = NULL;
+}
+
+static void
+im_cb_destroy (void *data, struct zwp_input_method_v1 *input_method, struct zwp_input_method_context_v1 *im_ctx)
+{
+    printf("im_cb_destroy\n");
+    zwp_input_method_v1_destroy(data_wl.input_method);
+    data_wl.input_method = NULL;
+}
+
+static const struct zwp_input_method_v1_listener input_method_cb_listener = {
+    .activate = im_cb_activate,
+    .deactivate = im_cb_deactivate,
+    //for tizen only
+    .destroy = im_cb_destroy,
+    .show_input_panel = NULL,
+    .hide_input_panel = NULL,
+    .open_connection = NULL,
+    .close_connection = NULL,
+    .set_text_input_id = NULL,
+};
+
 static void
 registry_handle_global(void * data, struct wl_registry * registry, uint32_t id,
         const char * interface, uint32_t version)
@@ -448,11 +1162,11 @@ registry_handle_global(void * data, struct wl_registry * registry, uint32_t id,
         data_wl.compositor = wl_registry_bind(registry, id,
                 &wl_compositor_interface, version);
         if (!data_wl.compositor) {
-            printf("Failed to bind compositor.");
+            printf("Failed to bind compositor.\n");
             return;
         }
         if (data_wl.enable_log)
-            printf("Success to bind compositor.");
+            printf("Success to bind compositor.\n");
     } else if (strcmp(interface, "tizen_input_device_manager") == 0) {
         data_wl.devicemgr = wl_registry_bind(registry, id,
                 &tizen_input_device_manager_interface, version);
@@ -464,6 +1178,25 @@ registry_handle_global(void * data, struct wl_registry * registry, uint32_t id,
             printf("Success to bind tizen input device manager.");
         tizen_input_device_manager_add_listener(data_wl.devicemgr,
             &_input_device_manager_listener, data_wl.display);
+    } else if (!strcmp(interface, "zwp_input_method_manager_v1")) {
+        data_wl.input_method_mgr = wl_registry_bind(registry, id,
+                &zwp_input_method_manager_v1_interface, version);
+    } else if (!strcmp(interface, "zwp_input_method_v1")) {
+        data_wl.input_method = wl_registry_bind(registry, id,
+                &zwp_input_method_v1_interface, version);
+        zwp_input_method_v1_add_listener(data_wl.input_method,
+                         &input_method_cb_listener,
+                         NULL);
+
+        //TODO: delte this code. this job should be done in cb_activate
+        data_wl.preedit_string = strdup("");
+        data_wl.content_hint = 0;
+        data_wl.content_purpose = 0;
+        free(data_wl.preferred_language);
+        data_wl.preferred_language = NULL;
+        free(data_wl.surrounding_text);
+        data_wl.surrounding_text = NULL;
+        data_wl.serial = 0;
     }
 }
 
@@ -529,6 +1262,9 @@ wayland_deinit(void)
     if (data_wl.queue) wl_event_queue_destroy(data_wl.queue);
     if (data_wl.devicemgr) tizen_input_device_manager_destroy(data_wl.devicemgr);
     if (data_wl.display) {
+        if (data_wl.input_method)
+            zwp_input_method_v1_destroy(data_wl.input_method);
+        zwp_input_method_manager_v1_destroy(data_wl.input_method_mgr);
         wl_registry_destroy(data_wl.registry);
         wl_display_flush(data_wl.display);
         wl_display_disconnect(data_wl.display);
index 672792a..c825bce 100644 (file)
@@ -82,19 +82,7 @@ input_generator_deps = [
 
 executable('input-generator',
   input_generator_files,
-  dependencies: input_generator_deps,
-  install_dir: libds_tizen_bindir,
-  install: true,
-)
-
-ime_keyboard_files = ['ime-keyboard.c']
-ime_keyboard_deps = [
-  dependency('wayland-client', required: true),
-]
-
-executable('ime-keyboard',
-  ime_keyboard_files,
-  dependencies: [ime_keyboard_deps,
+  dependencies: [input_generator_deps,
   deps_libds_tizen_input_method,
   ],
   install_dir: libds_tizen_bindir,
index 53d3d2f..37f9559 100644 (file)
@@ -587,7 +587,6 @@ ninja -C builddir install
 %{_libdir}/libds-tizen-input-method.so
 %{_bindir}/libds-tizen-input-method-tests
 %{_bindir}/libds-tizen-input-method-manager-tests
-%{_bindir}/ime-keyboard
 
 %files hwc
 %manifest %{name}.manifest