mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 19:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "x11: Send key events for dead keys consumed by the IME"

Browse Source 
This and its related commits introduced some bugs and quirks such as duplicated and delayed/missed key events that can't be easily worked around, so revert this for now.

This reverts commit 47162a4168.

(cherry picked from commit 1eeffc5933)
This commit is contained in:
Frank Praznik
2025-05-12 19:16:31 -04:00
committed by Sam Lantinga
parent 6feb86be71
commit 2fff37fffc
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/x11/SDL_x11events.c
View File

@@ -987,18 +987,16 @@ void X11_HandleKeyEvent(SDL_VideoDevice *_this, SDL_WindowData *windowdata, SDL_
} }
} }
if (!handled_by_ime) {
if (pressed) { if (pressed) {
X11_HandleModifierKeys(videodata, scancode, true, true); X11_HandleModifierKeys(videodata, scancode, true, true);
SDL_SendKeyboardKeyIgnoreModifiers(timestamp, keyboardID, keycode, scancode, true); SDL_SendKeyboardKeyIgnoreModifiers(timestamp, keyboardID, keycode, scancode, true);
// Synthesize a text event if the IME didn't consume a printable character
if (*text && !(SDL_GetModState() & (SDL_KMOD_CTRL | SDL_KMOD_ALT))) { if (*text && !(SDL_GetModState() & (SDL_KMOD_CTRL | SDL_KMOD_ALT))) {
text[text_length] = '\0'; text[text_length] = '\0';
X11_ClearComposition(windowdata); X11_ClearComposition(windowdata);
SDL_SendKeyboardText(text); SDL_SendKeyboardText(text);
} }
X11_UpdateUserTime(windowdata, xevent->xkey.time);
} else { } else {
if (X11_KeyRepeat(display, xevent)) { if (X11_KeyRepeat(display, xevent)) {
// We're about to get a repeated key down, ignore the key up // We're about to get a repeated key down, ignore the key up
@@ -1008,6 +1006,11 @@ void X11_HandleKeyEvent(SDL_VideoDevice *_this, SDL_WindowData *windowdata, SDL_
X11_HandleModifierKeys(videodata, scancode, false, true); X11_HandleModifierKeys(videodata, scancode, false, true);
SDL_SendKeyboardKeyIgnoreModifiers(timestamp, keyboardID, keycode, scancode, false); SDL_SendKeyboardKeyIgnoreModifiers(timestamp, keyboardID, keycode, scancode, false);
} }
}
if (pressed) {
X11_UpdateUserTime(windowdata, xevent->xkey.time);
}
} }
void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *windowdata, SDL_MouseID mouseID, int button, float x, float y, unsigned long time) void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *windowdata, SDL_MouseID mouseID, int button, float x, float y, unsigned long time)