encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Reuse KeySymToUcs4 to replicate X11 keymap behavior

This commit is contained in:
Ethan Lee 2021-09-23 14:07:38 -04:00 committed by Sam Lantinga
parent 1a4e2e5ef7
commit 7ed415d2ed
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video/x11/imKStoUCS.c → src/events/imKStoUCS.c
View File

@ -24,10 +24,9 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
#include "../../SDL_internal.h" #include "../SDL_internal.h"
#if SDL_VIDEO_DRIVER_X11 #if SDL_VIDEO_DRIVER_X11 || SDL_VIDEO_DRIVER_WAYLAND
#include <X11/X.h>
#include "imKStoUCS.h" #include "imKStoUCS.h"
static unsigned short const keysym_to_unicode_1a1_1ff[] = { static unsigned short const keysym_to_unicode_1a1_1ff[] = {
@ -294,7 +293,7 @@ static unsigned short const keysym_to_unicode_20a0_20ac[] = {
}; };
unsigned int unsigned int
X11_KeySymToUcs4(KeySym keysym) SDL_KeySymToUcs4(Uint32 keysym)
{ {
/* 'Unicode keysym' */ /* 'Unicode keysym' */
if ((keysym & 0xff000000) == 0x01000000) if ((keysym & 0xff000000) == 0x01000000)

2
src/video/x11/imKStoUCS.h → src/events/imKStoUCS.h
View File

@ -27,6 +27,6 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
extern unsigned int X11_KeySymToUcs4(KeySym keysym); extern unsigned int SDL_KeySymToUcs4(Uint32 keysym);
#endif /* _imKStoUCS_h */ #endif /* _imKStoUCS_h */

3
src/video/wayland/SDL_waylandevents.c
View File

@ -60,6 +60,7 @@
#include <unistd.h> #include <unistd.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-compose.h> #include <xkbcommon/xkbcommon-compose.h>
#include "../../events/imKStoUCS.h"
/* Weston uses a ratio of 10 units per scroll tick */ /* Weston uses a ratio of 10 units per scroll tick */
#define WAYLAND_WHEEL_AXIS_UNIT 10 #define WAYLAND_WHEEL_AXIS_UNIT 10
@ -870,7 +871,7 @@ Wayland_keymap_iter(struct xkb_keymap *keymap, xkb_keycode_t key, void *data)
} }
if (WAYLAND_xkb_keymap_key_get_syms_by_level(keymap, key, sdlKeymap->layout, 0, &syms) > 0) { if (WAYLAND_xkb_keymap_key_get_syms_by_level(keymap, key, sdlKeymap->layout, 0, &syms) > 0) {
uint32_t keycode = WAYLAND_xkb_keysym_to_utf32(syms[0]); uint32_t keycode = SDL_KeySymToUcs4(syms[0]);
if (keycode) { if (keycode) {
sdlKeymap->keymap[scancode] = keycode; sdlKeymap->keymap[scancode] = keycode;
} else { } else {

4
src/video/x11/SDL_x11keyboard.c
View File

@ -31,7 +31,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include "imKStoUCS.h" #include "../../events/imKStoUCS.h"
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
#include <locale.h> #include <locale.h>
@ -205,7 +205,7 @@ X11_KeyCodeToUcs4(_THIS, KeyCode keycode, unsigned char group)
return 0; return 0;
} }
return X11_KeySymToUcs4(keysym); return SDL_KeySymToUcs4(keysym);
} }
KeySym KeySym