We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] proposed patch

wayland_compose_keys.diff (text/plain), 8.21 KB, created by chw on 2017-06-30 08:06:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: chw

Created: 2017-06-30 08:06:25 UTC

Size: 8.21 KB

patch

obsolete

>diff -r b3c92457f3d5 src/video/wayland/SDL_waylanddyn.h
>--- a/src/video/wayland/SDL_waylanddyn.h	Thu Jun 29 23:00:18 2017 +0200
>+++ b/src/video/wayland/SDL_waylanddyn.h	Fri Jun 30 10:07:47 2017 +0200
>@@ -38,6 +38,7 @@
> #include "wayland-cursor.h"
> #include "wayland-util.h"
> #include "xkbcommon/xkbcommon.h"
>+#include "xkbcommon/xkbcommon-compose.h"
> 
> #ifdef __cplusplus
> extern "C"
>diff -r b3c92457f3d5 src/video/wayland/SDL_waylandevents.c
>--- a/src/video/wayland/SDL_waylandevents.c	Thu Jun 29 23:00:18 2017 +0200
>+++ b/src/video/wayland/SDL_waylandevents.c	Fri Jun 30 10:07:47 2017 +0200
>@@ -46,6 +46,7 @@
> #include <poll.h>
> #include <unistd.h>
> #include <xkbcommon/xkbcommon.h>
>+#include <xkbcommon/xkbcommon-compose.h>
> 
> struct SDL_WaylandInput {
>     SDL_VideoData *display;
>@@ -67,6 +68,8 @@
>     struct {
>         struct xkb_keymap *keymap;
>         struct xkb_state *state;
>+        struct xkb_compose_table *compose_table;
>+        struct xkb_compose_state *compose_state;
>     } xkb;
> };
> 
>@@ -187,6 +190,9 @@
>     uint32_t sdl_button;
>     
>     if  (input->pointer_focus) {
>+
>+        Wayland_data_device_set_serial(input->data_device, serial); 
>+
>         switch (button) {
>             case BTN_LEFT:
>                 sdl_button = SDL_BUTTON_LEFT;
>@@ -209,8 +215,6 @@
>             default:
>                 return;
>         }
>-            
>-        Wayland_data_device_set_serial(input->data_device, serial); 
> 
>         SDL_SendMouseButton(window->sdlwindow, 0,
>                             state ? SDL_PRESSED : SDL_RELEASED, sdl_button);
>@@ -274,7 +278,7 @@
>                        uint32_t format, int fd, uint32_t size)
> {
>     struct SDL_WaylandInput *input = data;
>-    char *map_str;
>+    char *map_str, *locale;
> 
>     if (!data) {
>         close(fd);
>@@ -311,6 +315,30 @@
>         input->xkb.keymap = NULL;
>         return;
>     }
>+
>+    /*
>+     * See https://blogs.s-osg.org/compose-key-support-weston/
>+     * for further explanation.
>+     */
>+  
>+    /* Look up the preferred locale, falling back to "C" as default */
>+    if (!(locale = getenv("LC_ALL")))
>+        if (!(locale = getenv("LC_CTYPE")))
>+            if (!(locale = getenv("LANG")))
>+                locale = "C";
>+    /* Set up XKB compose table */
>+    input->xkb.compose_table = WAYLAND_xkb_compose_table_new_from_locale(input->display->xkb_context,
>+                                              locale, XKB_COMPOSE_COMPILE_NO_FLAGS);
>+    if (input->xkb.compose_table) {
>+        /* Set up XKB compose state */
>+        input->xkb.compose_state = WAYLAND_xkb_compose_state_new(input->xkb.compose_table,
>+                                              XKB_COMPOSE_STATE_NO_FLAGS);
>+        if (!input->xkb.compose_state) {
>+            fprintf(stderr, "could not create XKB compose state\n");
>+            WAYLAND_xkb_compose_table_unref(input->xkb.compose_table);
>+            input->xkb.compose_table = NULL;
>+        }
>+    }
> }
> 
> static void
>@@ -351,7 +379,8 @@
>     SDL_WindowData *window = input->keyboard_focus;
>     enum wl_keyboard_key_state state = state_w;
>     const xkb_keysym_t *syms;
>-    uint32_t scancode;
>+    xkb_keysym_t sym;
>+    uint32_t scancode = SDL_SCANCODE_UNKNOWN;
>     char text[8];
>     int size;
> 
>@@ -360,27 +389,57 @@
> 
>         // TODO when do we get WL_KEYBOARD_KEY_STATE_REPEAT?
>         if (scancode != SDL_SCANCODE_UNKNOWN)
>-            SDL_SendKeyboardKey(state == WL_KEYBOARD_KEY_STATE_PRESSED ?
>-                                SDL_PRESSED : SDL_RELEASED, scancode);
>+            if (window->keyboard_device != input || !input->xkb.state)
>+                SDL_SendKeyboardKey(state == WL_KEYBOARD_KEY_STATE_PRESSED ?
>+                                    SDL_PRESSED : SDL_RELEASED, scancode);
>     }
> 
>     if (!window || window->keyboard_device != input || !input->xkb.state)
>         return;
> 
>-    // TODO can this happen?
>-    if (WAYLAND_xkb_state_key_get_syms(input->xkb.state, key + 8, &syms) != 1)
>+    /*
>+     * See https://blogs.s-osg.org/compose-key-support-weston/
>+     * for further explanation.
>+     */
>+  
>+    sym = XKB_KEY_NoSymbol;
>+    size = WAYLAND_xkb_state_key_get_syms(input->xkb.state, key + 8, &syms);
>+    if (size == 1)
>+        sym = syms[0];
>+    if (sym == XKB_KEY_NoSymbol)
>+        goto sendKey;
>+    if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
>+        goto sendKey;
>+    if (WAYLAND_xkb_compose_state_feed(input->xkb.compose_state, sym) != XKB_COMPOSE_FEED_ACCEPTED)
>+        goto sendKey;
>+    switch (WAYLAND_xkb_compose_state_get_status(input->xkb.compose_state)) {
>+        case XKB_COMPOSE_COMPOSING:
>+            return;
>+        case XKB_COMPOSE_CANCELLED:
>+        default:
>+            sym = XKB_KEY_NoSymbol;
>+            break;
>+        case XKB_COMPOSE_NOTHING:
>+            break;
>+        case XKB_COMPOSE_COMPOSED:
>+            sym = WAYLAND_xkb_compose_state_get_one_sym(input->xkb.compose_state);
>+            break;
>+    }
>+sendKey:
>+    if (scancode != SDL_SCANCODE_UNKNOWN)
>+        SDL_SendKeyboardKey(state == WL_KEYBOARD_KEY_STATE_PRESSED ?
>+                            SDL_PRESSED : SDL_RELEASED, scancode);
>+    if (sym == XKB_KEY_NoSymbol)
>         return;
>+    if (state != WL_KEYBOARD_KEY_STATE_PRESSED)
>+        return;
>+    size = WAYLAND_xkb_keysym_to_utf8(sym, text, sizeof text);
>+    if (size > 0) {
>+        text[size] = 0;
> 
>-    if (state) {
>-        size = WAYLAND_xkb_keysym_to_utf8(syms[0], text, sizeof text);
>+        Wayland_data_device_set_serial(input->data_device, serial);
> 
>-        if (size > 0) {
>-            text[size] = 0;
>-
>-            Wayland_data_device_set_serial(input->data_device, serial);
>-
>-            SDL_SendKeyboardText(text);
>-        }
>+        SDL_SendKeyboardText(text);
>     }
> }
> 
>@@ -743,6 +802,12 @@
>     if (input->seat)
>         wl_seat_destroy(input->seat);
> 
>+    if (input->xkb.compose_state)
>+        WAYLAND_xkb_compose_state_unref(input->xkb.compose_state);
>+
>+    if (input->xkb.compose_table)
>+        WAYLAND_xkb_compose_table_unref(input->xkb.compose_table);
>+
>     if (input->xkb.state)
>         WAYLAND_xkb_state_unref(input->xkb.state);
> 
>diff -r b3c92457f3d5 src/video/wayland/SDL_waylandsym.h
>--- a/src/video/wayland/SDL_waylandsym.h	Thu Jun 29 23:00:18 2017 +0200
>+++ b/src/video/wayland/SDL_waylandsym.h	Fri Jun 30 10:07:47 2017 +0200
>@@ -117,6 +117,14 @@
>                       xkb_layout_index_t depressed_layout,\
>                       xkb_layout_index_t latched_layout,\
>                       xkb_layout_index_t locked_layout) )
>+SDL_WAYLAND_SYM(struct xkb_compose_table *, xkb_compose_table_new_from_locale, (struct xkb_context *,\
>+                      const char *locale, enum xkb_compose_compile_flags) )
>+SDL_WAYLAND_SYM(void, xkb_compose_table_unref, (struct xkb_compose_table *) )
>+SDL_WAYLAND_SYM(struct xkb_compose_state *, xkb_compose_state_new, (struct xkb_compose_table *, enum xkb_compose_state_flags) )
>+SDL_WAYLAND_SYM(void, xkb_compose_state_unref, (struct xkb_compose_state *) )
>+SDL_WAYLAND_SYM(enum xkb_compose_feed_result, xkb_compose_state_feed, (struct xkb_compose_state *, xkb_keysym_t) )
>+SDL_WAYLAND_SYM(enum xkb_compose_status, xkb_compose_state_get_status, (struct xkb_compose_state *) )
>+SDL_WAYLAND_SYM(xkb_keysym_t, xkb_compose_state_get_one_sym, (struct xkb_compose_state *) )
> 
> #undef SDL_WAYLAND_MODULE
> #undef SDL_WAYLAND_SYM
>diff -r b3c92457f3d5 src/video/wayland/SDL_waylandwindow.c
>--- a/src/video/wayland/SDL_waylandwindow.c	Thu Jun 29 23:00:18 2017 +0200
>+++ b/src/video/wayland/SDL_waylandwindow.c	Fri Jun 30 10:07:47 2017 +0200
>@@ -75,15 +75,15 @@
>         return;
>     }
> 
>+    WAYLAND_wl_egl_window_resize(wind->egl_window, width, height, 0, 0);
>+
>+    region = wl_compositor_create_region(wind->waylandData->compositor);
>+    wl_region_add(region, 0, 0, width, height);
>+    wl_surface_set_opaque_region(wind->surface, region);
>+    wl_region_destroy(region);
>+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, width, height);
>     window->w = width;
>     window->h = height;
>-    WAYLAND_wl_egl_window_resize(wind->egl_window, window->w, window->h, 0, 0);
>-
>-    region = wl_compositor_create_region(wind->waylandData->compositor);
>-    wl_region_add(region, 0, 0, window->w, window->h);
>-    wl_surface_set_opaque_region(wind->surface, region);
>-    wl_region_destroy(region);
>-    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, window->w, window->h);
> }
> 
> static void

Actions: View | Diff

Attachments on bug 3687: 2783

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.