Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add native Windows IME support #4941

Merged
merged 21 commits into from
Jan 11, 2022
Merged

Add native Windows IME support #4941

merged 21 commits into from
Jan 11, 2022

Commits on Dec 17, 2021

  1. Add code path for handling window messages 

    Some IME messages didn't get sent trough `SDL_SetWindowsMessageHook`, so this alternative is required.
    @Susko3
    Susko3 committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    eb44a5c View commit details
    Browse the repository at this point in the history

  2. Add Windows-native IME support

    @Susko3
    Susko3 committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    06d5682 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2021

  1. Fix license header

    @Susko3
    Susko3 committed Dec 18, 2021
    Configuration menu
    Copy the full SHA
    ebd1927 View commit details
    Browse the repository at this point in the history

  2. Fix formatting

    @Susko3
    Susko3 committed Dec 18, 2021
    Configuration menu
    Copy the full SHA
    ee996dc View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2021

  1. Refactor to use SafeHandle

    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    d33430b View commit details
    Browse the repository at this point in the history

  2. Mark CompositionString enum as [Flags] so lParam can be better … 

    …described
    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    c246b54 View commit details
    Browse the repository at this point in the history

  3. Move SDL_SysWMmsg struct to separate file

    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    9b15289 View commit details
    Browse the repository at this point in the history

  4. Fix typo

    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    951950a View commit details
    Browse the repository at this point in the history

  5. Also block SDL IME results when there is an ongoing composition

    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    3904c6a View commit details
    Browse the repository at this point in the history

  6. Always block SDL events based on recent IME result instead of matchin… 

    …g strings
    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    255eb9c View commit details
    Browse the repository at this point in the history

  7. Simplify Windows' HandleTextInputEvent since we don't have to check… 

    … the text
    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    9acca41 View commit details
    Browse the repository at this point in the history

  8. Add OnSDLEvent, invoked on every SDL event before it's posted to th… 

    …e queue

Also changes Marshal.PtrToStructure so the nullref check isn't needed.
    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    f103959 View commit details
    Browse the repository at this point in the history

  9. Migrate Windows IME handling to the new OnSDLEvent 

    The hack for getting the result is no longer needed since the events are now
handled before being posted in the queue (early enough so that internal IME
state is preserved).

Tested to work as expected with the edge case mentioned in the (now removed) comment.
    @Susko3
    Susko3 committed Dec 19, 2021
    Configuration menu
    Copy the full SHA
    d3652ae View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. Update imeCompositionActive inline with how windows sends IME messages

    @Susko3
    Susko3 committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    0662152 View commit details
    Browse the repository at this point in the history

  2. Throw if InputContextHandle is disposed

    @Susko3
    Susko3 committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    66e36eb View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary imeCompositionActive assignments 

    Windows properly sends the IME messages, so we don't have to worry about it
accidentally remaining active.
    @Susko3
    Susko3 committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    3f30afd View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. Move SDL event handling into private helper

    @Susko3
    Susko3 committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    305ac93 View commit details
    Browse the repository at this point in the history

  2. Add IME handling region

    @Susko3
    Susko3 committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    102087b View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2022

  1. Merge branch 'master' into windows-ime

    @peppy
    peppy committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    a5c3967 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Merge branch 'master' into windows-ime

    @peppy
    peppy committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    fd2a77c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into windows-ime

    @peppy
    peppy committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    7873330 View commit details
    Browse the repository at this point in the history