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.

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

feat(mac): mnemonic layout support 🐘 #11334

Merged
merged 89 commits into from
Oct 25, 2024

Commits on Apr 18, 2024

  1. Configuration menu
    Copy the full SHA
    3ccaee0 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. feat(mac): some edits

    SabinePlay authored and SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d0e1467 View commit details
    Browse the repository at this point in the history
  2. feat(mac): new get_keyval_From_Keycode()

    feat(mac): include km_types and u16
    
    feat(mac): include filesystem and some kmx
    
    feat(mac): include old functions in keymap
    
    feat(mac): include kmx_file, mc_kmxfile
    
    feat(mac): include deadkey, filesystem, km_types, import_rules,mc_kmxfile
    
    feat(mac): include functions in mcompile.cpp/h
    
    feat(mac): #includes out to be used
    SabinePlay authored and SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b207248 View commit details
    Browse the repository at this point in the history
  3. feat(mac): #ifndefs out to be used

    SabinePlay authored and SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d6583f6 View commit details
    Browse the repository at this point in the history
  4. feat(mac): test rm

    SabinePlay authored and SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b1caaa6 View commit details
    Browse the repository at this point in the history
  5. feat(mac): remove files

    SabinePlay authored and SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    be0c9b4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    aae9289 View commit details
    Browse the repository at this point in the history
  7. Revert "feat(mac): some edits"

    This reverts commit d32e352.
    
    # Conflicts:
    #	mac/mcompile/keymap.cpp
    #	mac/mcompile/keymap.h
    #	mac/mcompile/mcompile.cpp
    #	mac/mcompile/mcompile.h
    SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    0c7e55e View commit details
    Browse the repository at this point in the history
  8. feat(mac): open run()

    SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    11e7dde View commit details
    Browse the repository at this point in the history
  9. feat(mac): open all functions that are easy to open

    feat(mac): open more functions
    
    feat(mac): open DoConvert-InitializeUCHR
    
    feat(mac): open write_US_ToVector
    
    feat(mac): (temporarily) add mac_ to function names to be able to distinguish between linux-functions and mac functions if needed
    
    feat(mac): finished mac_createOneVectorFromBothKeyboards()
    
    feat(mac): started DoConvert
    
    feat(mac): mcompile tidy up
    SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7d42f66 View commit details
    Browse the repository at this point in the history
  10. feat(mac): mcompile opened all non-deadkey-functions

    feat(mac): mcompile tidy up
    SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c19d0be View commit details
    Browse the repository at this point in the history
  11. feat(mac):finish filling rgkey[] for non-deadkey

    feat(mac): mcompile new X_find_Shiftstates to verify shiftstates
    
    feat(mac): mcompile fill rgkey for base, shift, opt, shift+opt including CAPS
    
    feat(mac): mcompile fill rgkey prevent writing x01 into rgkey[]
    
    feat(mac): mcompile tidy up code
    SabineSIL committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7b05fa7 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Configuration menu
    Copy the full SHA
    5139ba4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6ae7927 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. feat(mac): start dk

    SabineSIL committed May 6, 2024
    Configuration menu
    Copy the full SHA
    b0e338c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c206128 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. feat(mac): mac_KMX_ConvertDeadkey mostly finished

    feat(mac): adapt mac_KMX_get_KeyVal_From_KeyCode to use for dk
    
    feat(mac): adapted mac_KMX_ConvertDeadkey
    
    feat(mac): tidy up
    SabineSIL committed May 7, 2024
    Configuration menu
    Copy the full SHA
    0ebc101 View commit details
    Browse the repository at this point in the history
  2. Revert "feat(mac): adapt mac_KMX_get_KeyVal_From_KeyCode to use for dk"

    This reverts commit 4aa217266fc3812b182aa71077c39bec237165a9.
    
    # Conflicts:
    #	mac/mcompile/keymap.cpp
    feat(mac): tidy up
    SabineSIL committed May 7, 2024
    Configuration menu
    Copy the full SHA
    6d0bb71 View commit details
    Browse the repository at this point in the history
  3. feat(mac): set dk to 0

    SabineSIL committed May 7, 2024
    Configuration menu
    Copy the full SHA
    456b851 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    08a51b9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7eca5cb View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Configuration menu
    Copy the full SHA
    b90abe6 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. feat(mac): adapt order of keys for getDeadkeys to catch the most impo…

    …rtant key combinatin for a dk combination
    SabineSIL committed May 15, 2024
    Configuration menu
    Copy the full SHA
    86850d5 View commit details
    Browse the repository at this point in the history
  2. feat(mac): tidy up

    SabineSIL committed May 15, 2024
    Configuration menu
    Copy the full SHA
    d69600b View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. feat(mac): fill alDead OK

    SabineSIL committed May 17, 2024
    Configuration menu
    Copy the full SHA
    4a5e457 View commit details
    Browse the repository at this point in the history
  2. feat(mac): massive tidy up

    SabineSIL committed May 17, 2024
    Configuration menu
    Copy the full SHA
    69a60c9 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Configuration menu
    Copy the full SHA
    362097d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. feat(mac): tidy up code:

    use shiftstates consistently;
    map shiftstates to mac shiftstates(mac, rgkey, win);
    remove unneccessary functions;
    rename functions to have more systematic
    consolidate order of parameters in functions;
    rename variables (casing), and also to clarify shiftstates;
    handle unused positions in USVirtualKeyToScanCode+ScanCodeToUSVirtualKey;
    use util_filesystem.cpp/h from Keyman instead of my own filesystem.cpp/h;
    remove deadkey.cpp/h;
    SabineSIL committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    cc8cb5d View commit details
    Browse the repository at this point in the history
  2. feat(mac): tidy up code:

    fixes #11334
    use shiftstates consistently;
    map shiftstates to mac shiftstates(mac, rgkey, win);
    remove unneccessary functions;
    rename functions to have more systematic
    consolidate order of parameters in functions;
    rename variables (casing), and also to clarify shiftstates;
    handle unused positions in USVirtualKeyToScanCode+ScanCodeToUSVirtualKey;
    use util_filesystem.cpp/h from Keyman instead of my own filesystem.cpp/h;
    remove deadkey.cpp/h;
    SabineSIL committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    b2d9e96 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Configuration menu
    Copy the full SHA
    71a5226 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Configuration menu
    Copy the full SHA
    4db806a View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Configuration menu
    Copy the full SHA
    f47a037 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4040e95 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Configuration menu
    Copy the full SHA
    1c0a44f View commit details
    Browse the repository at this point in the history
  2. feat(mac): format documents

    SabineSIL committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    48f98cd View commit details
    Browse the repository at this point in the history
  3. feat(mac): comments from #9384

    SabineSIL committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    70b232a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Configuration menu
    Copy the full SHA
    96870c4 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. # This is a combination of 8 commits.

    # This is the 1st commit message:
    
    feat(mac): remove unused func
    
    # This is the commit message #2:
    
    feat(mac): edit, remove unused code
    
    # This is the commit message #3:
    
    feat(mac): more edit
    
    # This is the commit message #4:
    
    feat(mac): comments keymap
    
    # This is the commit message #5:
    
    feat(mac): comments importRules
    
    # This is the commit message #6:
    
    feat(mac): comments
    
    # This is the commit message #7:
    
    feat(mac): more comments
    
    # This is the commit message #8:
    
    feat(mac): adapt data types return para
    SabineSIL committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    927154c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a947992 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge branch 'feat/mac/mcompile_mac' of https://github.com/keymanapp/…

    …keyman into feat/mac/mcompile_mac
    
    # Conflicts:
    #	mac/mcompile/keymap.cpp
    #	mac/mcompile/keymap.h
    #	mac/mcompile/mc_import_rules.cpp
    #	mac/mcompile/mc_import_rules.h
    #	mac/mcompile/mc_kmxfile.h
    #	mac/mcompile/mcompile.cpp
    #	mac/mcompile/mcompile.h
    #	mac/mcompile/util_filesystem.cpp
    
    Signed-off-by: Sabine <[email protected]>
    SabineSIL committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    3528e71 View commit details
    Browse the repository at this point in the history
  2. feat(mac): little edit

    SabineSIL committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f71c4aa View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feat/mac/mcompile-rework-keymap' into feat/mac/mcompile…

    …_mac
    
    # Conflicts:
    #	mac/mcompile/mc_import_rules.h
    #	mac/mcompile/mcompile.h
    SabineSIL committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    e29c51c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e545402 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. feat(mac): remove all _S2

    SabineSIL committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    06d0783 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eae7666 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cb31ceb View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. feat(mac): chande in u16tol

    SabineSIL committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    63181e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. feat(mac): use new u16

    SabineSIL committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    aa5ad7a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4688e4d View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Configuration menu
    Copy the full SHA
    365d62e View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Configuration menu
    Copy the full SHA
    53ece79 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce662db View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Configuration menu
    Copy the full SHA
    e889fd8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    684a2df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b5ac6e4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e79c534 View commit details
    Browse the repository at this point in the history
  5. feat(mac): add build.sh

    SabineSIL committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    8c480ac View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. chore(mac): disable optimization for mcompile

    See #11334 (comment)
    for details, but with anything other than -O0, the output is not correct
    
    This is intended to be a temporary workaround
    SabineSIL committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    07edecd View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Configuration menu
    Copy the full SHA
    f810d53 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d926045 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a42427f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dd0ebc4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    963bb52 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Configuration menu
    Copy the full SHA
    23c6692 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    5f0612d View commit details
    Browse the repository at this point in the history
  2. chore (mac): remove (w)main for windows/Linux; define arrays+variable…

    …s in *.cpp and declare as extern in *.h
    SabineSIL committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    6a8c815 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f385652 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Configuration menu
    Copy the full SHA
    c045b94 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. chore (mac): catch possible overflow of dk array; check for noErr in …

    …status = UCKeyTranslate(...)
    SabineSIL committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e449437 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    335bfb7 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. chore (mac): marked another possible C++ -O1, -O2, -O3 standard-compi…

    …lant problem using UCKeyTranslate
    SabineSIL committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    84b4391 View commit details
    Browse the repository at this point in the history
  2. chore (mac): marked another possible C++ -O1, -O2, -O3 standard-compl…

    …iant problem using UCKeyTranslate
    SabineSIL committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    5ea67fc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e6ea983 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. feat (mac): set OPtimize Option to -O2; resolve problem in UCKeyTrans…

    …late: check noErr only after 2nd use of UCKeyTranslate
    SabineSIL committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    de7b654 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8fa7208 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. chore (common): on mcompile-linux->move do_clean, do_configure, do_bu…

    …ild and do_test to meson-utils.inc.sh
    SabineSIL committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    afc8229 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'chore/mac/mcompile_mac-CommonMesonPatterns' of https://…

    …github.com/keymanapp/keyman into chore/mac/mcompile_mac-CommonMesonPatterns
    SabineSIL committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    63cba7d View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Configuration menu
    Copy the full SHA
    92d5f93 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Configuration menu
    Copy the full SHA
    b9bd855 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f079aae View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0a3947e View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Configuration menu
    Copy the full SHA
    44a9fa9 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Configuration menu
    Copy the full SHA
    33dcf94 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'chore/mac/mcompile_mac-CommonMesonPatterns' of https://…

    …github.com/keymanapp/keyman into chore/mac/mcompile_mac-CommonMesonPatterns
    SabineSIL committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5e93570 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b0006ba View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Configuration menu
    Copy the full SHA
    496fe0d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    63b7200 View commit details
    Browse the repository at this point in the history
  3. Update VERSION.md

    mcdurdin authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    62380af View commit details
    Browse the repository at this point in the history
  4. Merge pull request #12496 from keymanapp/chore/mac/mcompile_mac-Commo…

    …nMesonPatterns
    
    chore(common): consolidate common meson patterns and use 'c++17' in standard.meson.build  🐘
    SabineSIL authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    960bbdc View commit details
    Browse the repository at this point in the history