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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
3ccaee0
feat(mac): mcompile setup minimal VSCode project
SabinePlay Apr 18, 2024
d0e1467
feat(mac): some edits
SabinePlay Apr 18, 2024
b207248
feat(mac): new get_keyval_From_Keycode()
SabinePlay Apr 18, 2024
d6583f6
feat(mac): #ifndefs out to be used
SabinePlay Apr 18, 2024
b1caaa6
feat(mac): test rm
SabinePlay Apr 19, 2024
be0c9b4
feat(mac): remove files
SabinePlay Apr 19, 2024
aae9289
feat(mac): enable some functions/makros
SabinePlay Apr 19, 2024
0c7e55e
Revert "feat(mac): some edits"
SabineSIL Apr 19, 2024
11e7dde
feat(mac): open run()
SabineSIL Apr 19, 2024
7d42f66
feat(mac): open all functions that are easy to open
SabineSIL Apr 19, 2024
c19d0be
feat(mac): mcompile opened all non-deadkey-functions
SabineSIL Apr 27, 2024
7b05fa7
feat(mac):finish filling rgkey[] for non-deadkey
SabineSIL Apr 30, 2024
5139ba4
feat(mac): add function to test rgkey
SabineSIL May 2, 2024
6ae7927
feat(mac): Arrays for mapping VK<->SC
SabineSIL May 3, 2024
b0e338c
feat(mac): start dk
SabineSIL May 6, 2024
c206128
feat(mac): start dk fill All_Vector with dk
SabineSIL May 6, 2024
0ebc101
feat(mac): mac_KMX_ConvertDeadkey mostly finished
SabineSIL May 6, 2024
6d0bb71
Revert "feat(mac): adapt mac_KMX_get_KeyVal_From_KeyCode to use for dk"
SabineSIL May 7, 2024
456b851
feat(mac): set dk to 0
SabineSIL May 7, 2024
08a51b9
Delete mac/mcompile/x.bla
SabineSIL May 7, 2024
7eca5cb
Delete mac/mcompile/X_helpers.h
SabineSIL May 7, 2024
b90abe6
feat(mac): dk: mapping of shiftstates
SabineSIL May 13, 2024
86850d5
feat(mac): adapt order of keys for getDeadkeys to catch the most impo…
SabineSIL May 15, 2024
d69600b
feat(mac): tidy up
SabineSIL May 15, 2024
4a5e457
feat(mac): fill alDead OK
SabineSIL May 16, 2024
69a60c9
feat(mac): massive tidy up
SabineSIL May 17, 2024
362097d
feat(mac): work on K_84 <-> K_221 for ~
SabineSIL May 21, 2024
cc8cb5d
feat(mac): tidy up code:
SabineSIL May 21, 2024
b2d9e96
feat(mac): tidy up code:
SabineSIL May 21, 2024
71a5226
feat(mac): function header comments mcompile.cpp, mc_import_rules.cpp…
SabineSIL Jun 7, 2024
4db806a
Merge branch 'master' into feat/mac/mcompile_mac
jahorton Jun 19, 2024
f47a037
feat(mac): implement comments of PR9384
SabineSIL Jul 5, 2024
4040e95
feat(mac): implement comments of PR9384 on keymap
SabineSIL Jul 5, 2024
1c0a44f
feat(mac): add module, fun-comments
SabineSIL Jul 10, 2024
48f98cd
feat(mac): format documents
SabineSIL Jul 10, 2024
70b232a
feat(mac): comments from #9384
SabineSIL Jul 10, 2024
96870c4
feat(mac): comments from all other PR
SabineSIL Jul 11, 2024
927154c
# This is a combination of 8 commits.
SabineSIL Jul 11, 2024
a947992
feat(mac): still layout stuff
SabineSIL Jul 16, 2024
3528e71
Merge branch 'feat/mac/mcompile_mac' of https://github.com/keymanapp/…
SabineSIL Jul 18, 2024
f71c4aa
feat(mac): little edit
SabineSIL Jul 18, 2024
e29c51c
Merge branch 'feat/mac/mcompile-rework-keymap' into feat/mac/mcompile…
SabineSIL Jul 18, 2024
e545402
feat(mac): resolve conflicts
SabineSIL Jul 18, 2024
06d0783
feat(mac): remove all _S2
SabineSIL Jul 19, 2024
eae7666
feat(mac): ensureValidInputForKeyboardTranslation
SabineSIL Jul 19, 2024
cb31ceb
feat(mac): remove dublicate #include
SabineSIL Jul 19, 2024
63181e9
feat(mac): chande in u16tol
SabineSIL Jul 24, 2024
aa5ad7a
feat(mac): use new u16
SabineSIL Jul 25, 2024
4688e4d
feat(mac): remove RALT filter
SabineSIL Jul 25, 2024
365d62e
feat(mac): include comments from PR 12065
SabineSIL Aug 2, 2024
53ece79
feat(mac): swapped comments
SabineSIL Aug 6, 2024
ce662db
Merge branch 'master' into feat/mac/mcompile_mac
SabineSIL Aug 6, 2024
e889fd8
refactor(mac): use km_types from common
SabineSIL Aug 14, 2024
684a2df
Merge branch 'master' into feat/mac/mcompile_mac
mcdurdin Aug 14, 2024
b5ac6e4
Merge branch 'feat/mac/mcompile_mac' of https://github.com/keymanapp/…
SabineSIL Aug 14, 2024
e79c534
feat(mac): mcompile remove u16, kmx_file from mcompile-mac and use fr…
SabineSIL Aug 14, 2024
8c480ac
feat(mac): add build.sh
SabineSIL Aug 14, 2024
07edecd
chore(mac): disable optimization for mcompile
SabineSIL Aug 15, 2024
f810d53
Merge branch 'epic/linux-mcompile' into feat/mac/mcompile_mac
mcdurdin Aug 16, 2024
d926045
chore(mac): add mcompile to build.sh
SabineSIL Aug 16, 2024
a42427f
Merge branch 'feat/mac/mcompile_mac' of https://github.com/keymanapp/…
SabineSIL Aug 16, 2024
dd0ebc4
chore(mac): add backslash to build.sh
SabineSIL Aug 16, 2024
963bb52
chore(mac): change bitmapoffset + bitmapsize to prvent buffer problems
SabineSIL Aug 16, 2024
23c6692
chore(mac): change bitmapoffset + bitmapsize to prevent buffer problems
SabineSIL Aug 16, 2024
5f0612d
Merge branch 'feat/mac/mcompile_mac' of https://github.com/keymanapp/…
SabineSIL Sep 12, 2024
6a8c815
chore (mac): remove (w)main for windows/Linux; define arrays+variable…
SabineSIL Sep 12, 2024
f385652
chore (mac): mac_run and minor things (edits, comments,...)
SabineSIL Sep 12, 2024
c045b94
chore (mac): remove argc, use VK_SPACE, use _countof()
SabineSIL Sep 13, 2024
e449437
chore (mac): catch possible overflow of dk array; check for noErr in …
SabineSIL Sep 17, 2024
335bfb7
chore (mac): replace UniCharCount with const UniCharCount in datatype…
SabineSIL Sep 17, 2024
84b4391
chore (mac): marked another possible C++ -O1, -O2, -O3 standard-comp…
SabineSIL Sep 18, 2024
5ea67fc
chore (mac): marked another possible C++ -O1, -O2, -O3 standard-comp…
SabineSIL Sep 18, 2024
e6ea983
Merge branch 'feat/mac/mcompile_mac' of https://github.com/keymanapp/…
SabineSIL Sep 18, 2024
de7b654
feat (mac): set OPtimize Option to -O2; resolve problem in UCKeyTrans…
SabineSIL Oct 2, 2024
8fa7208
chore (common): move do_clean, do_configure, do_build and do_test to …
SabineSIL Oct 2, 2024
afc8229
chore (common): on mcompile-linux->move do_clean, do_configure, do_bu…
SabineSIL Oct 2, 2024
63cba7d
Merge branch 'chore/mac/mcompile_mac-CommonMesonPatterns' of https://…
SabineSIL Oct 4, 2024
92d5f93
feat (mac): use a vector instead of an array in mac_KMX_GetDeadkeys
SabineSIL Oct 7, 2024
b9bd855
feat (mac): new message if DoConvert fails
SabineSIL Oct 8, 2024
f079aae
feat (mac): new message if SaveKeyboard fails
SabineSIL Oct 8, 2024
0a3947e
Merge branch 'epic/linux-mcompile' into feat/mac/mcompile_mac
SabineSIL Oct 8, 2024
44a9fa9
Merge branch 'feat/mac/mcompile_mac' into chore/mac/mcompile_mac-Comm…
SabineSIL Oct 9, 2024
33dcf94
chore (common): rename do_clean, do_configure, do_build, do_test to d…
SabineSIL Oct 10, 2024
5e93570
Merge branch 'chore/mac/mcompile_mac-CommonMesonPatterns' of https://…
SabineSIL Oct 10, 2024
b0006ba
... Merge branch 'master' into chore/mac/mcompile_mac-CommonMesonPat…
SabineSIL Oct 10, 2024
496fe0d
Merge branch 'epic/linux-mcompile' into feat/mac/mcompile_mac
mcdurdin Oct 11, 2024
63b7200
Merge branch 'feat/mac/mcompile_mac' into chore/mac/mcompile_mac-Comm…
mcdurdin Oct 11, 2024
62380af
Update VERSION.md
mcdurdin Oct 11, 2024
960bbdc
Merge pull request #12496 from keymanapp/chore/mac/mcompile_mac-Commo…
SabineSIL Oct 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.0.126
18.0.126
3 changes: 0 additions & 3 deletions common/include/km_types.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#pragma once
#include <stdint.h>

#include <stdint.h>

/*
#if defined(_WIN32) || defined(_WIN64)
#define snprintf _snprintf
Expand Down
40 changes: 5 additions & 35 deletions linux/mcompile/keymap/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# adjust relative paths as necessary
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
. "${THIS_SCRIPT%/*}/../../../resources/build/meson-utils.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE

#. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
Expand All @@ -26,38 +27,7 @@ builder_describe_outputs \

TARGET_PATH="$THIS_SCRIPT_PATH/build"

do_clean() {
rm -rf "$THIS_SCRIPT_PATH/resources"
rm -rf "$TARGET_PATH"
}

do_configure() {
# Import our standard compiler defines; this is copied from
# /resources/build/meson/standard.meson.build by build.sh, because meson doesn't
# allow us to reference a file outside its root
mkdir -p "$THIS_SCRIPT_PATH/resources"
cp "$KEYMAN_ROOT/resources/build/meson/standard.meson.build" "$THIS_SCRIPT_PATH/resources/meson.build"

pushd "$THIS_SCRIPT_PATH" > /dev/null
# Additional arguments are used by Linux build, e.g. -Dprefix=${INSTALLDIR}
meson setup build --buildtype $BUILDER_CONFIGURATION "${builder_extra_params[@]}"
popd > /dev/null

}

do_build() {
pushd "$TARGET_PATH" > /dev/null
ninja
popd > /dev/null
}

do_test() {
pushd "$TARGET_PATH" > /dev/null
meson test "${builder_extra_params[@]}"
popd > /dev/null
}

builder_run_action clean do_clean
builder_run_action configure do_configure
builder_run_action build do_build
builder_run_action test do_test
builder_run_action clean do_meson_clean
builder_run_action configure do_meson_configure
builder_run_action build do_meson_build
builder_run_action test do_meson_test
1 change: 1 addition & 0 deletions mac/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ builder_describe "Builds Keyman for macOS." \
"install Installs result of Keyman4MacIM locally." \
":engine KeymanEngine4Mac" \
":app Keyman4MacIM" \
":mcompile mnemonic layout recompiler- mac" \
":testapp Keyman4Mac (test harness)" \
"--quick,-q Bypasses notarization for $(builder_term install)"

Expand Down
2 changes: 2 additions & 0 deletions mac/mcompile/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
resources/
build/
31 changes: 31 additions & 0 deletions mac/mcompile/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/usr/bin/env bash

## START STANDARD BUILD SCRIPT INCLUDE
# adjust relative paths as necessary
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
. "${THIS_SCRIPT%/*}/../../resources/build/meson-utils.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE

################################ Main script ################################

builder_describe \
"Mnemonic layout recompiler for macOS" \
"@/common/include" \
"clean" \
"configure" \
"build" \
"test"

builder_parse "$@"

builder_describe_outputs \
configure build/build.ninja \
build build/mcompile

TARGET_PATH="$THIS_SCRIPT_PATH/build"

builder_run_action clean do_meson_clean
builder_run_action configure do_meson_configure
builder_run_action build do_meson_build
builder_run_action test do_meson_test
Loading
Loading