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

epic: linux and mac mcompile 🐘 #9390

Draft
wants to merge 471 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
471 commits
Select commit Hold shift + click to select a range
0675a5d
feat(linux): mcompile-dk remove unneccessary function
SabineSIL Feb 14, 2024
41e4803
feat(linux): mcompile-dk rename function
SabineSIL Feb 14, 2024
ed60382
feat(linux): mcompile-dk replace KMX_LogError
SabineSIL Feb 14, 2024
da4ea69
feat(linux): mcompile-dk remove helpers.cpp/h
SabineSIL Feb 15, 2024
d0c7d34
feat(linux): mcompile-dk remove mc_savekeyboard
SabineSIL Feb 15, 2024
c166bb4
Merge pull request #10749 from keymanapp/chore/merge-master-into-linu…
mcdurdin Feb 17, 2024
e2af2d0
feat(linux): mcompile-dk looking at this->SC() vs. KMX_get_KeyCodeUnd…
SabineSIL Feb 19, 2024
fb1ad0c
feat(linux): mcompile-dk LogErrror,naming,tidy up
SabineSIL Feb 20, 2024
76adcd0
feat(linux): mcompile-dk naming of Var,Function (KeyVal,KeyCode,VK)
SabineSIL Feb 20, 2024
002d9e1
feat(linux): mcompile-dk remove keymap in some functions
SabineSIL Feb 20, 2024
77d50ee
feat(linux): mcompile-dk combine KMX_get_KeyValUnderlying_From_KeyCod…
SabineSIL Feb 20, 2024
001dc52
feat(linux): mcompile-dk remove KMX_FillKeyState
SabineSIL Feb 20, 2024
aa36aad
feat(linux): mcompile-dk edit comments
SabineSIL Feb 20, 2024
4687fdc
feat(linux): mcompile-dk remove numpad, special shift states, sort_dk
SabineSIL Feb 26, 2024
78c4b58
feat(linux): mcompile-dk disable functions to calculate capslock and …
SabineSIL Feb 26, 2024
f6e887a
feat(linux): mcompile-dk remove comments
SabineSIL Feb 27, 2024
b0811ba
feat(linux): mcompile-dk capslock-equation added again. We need it! (…
SabineSIL Feb 27, 2024
754f13f
feat(linux): mcompile-dkcomments on capslock
SabineSIL Feb 27, 2024
08085e3
feat(linux): mcompile-dk comment out some #includes that are not needed
SabineSIL Feb 28, 2024
f04b1df
feat(linux): mcompile-dk disable KMX_VirtualKey(KMX_HKL hkl,UINT virt…
SabineSIL Feb 28, 2024
afb391f
feat(linux): mcompile-dk disable use of HKL
SabineSIL Feb 28, 2024
5d43f0a
feat(linux): mcompile-dk use const wchar_t* in LogError
SabineSIL Feb 29, 2024
cc7997e
feat(linux): mcompile-dk start replace wchar_t
SabineSIL Mar 1, 2024
901ff2b
feat(linux): mcompile-dk replace wchar_t create duplicate u16.functio…
SabineSIL Mar 1, 2024
7bb9798
feat(linux): mcompile-dk replace wchar_t disable some old wchar_t fun…
SabineSIL Mar 1, 2024
1c9f879
feat(linux): mcompile-dk replace wchar_t disable more old wchar_t fun…
SabineSIL Mar 1, 2024
106a572
Merge pull request #10910 from keymanapp/chore/merge-master-into-linu…
mcdurdin Mar 4, 2024
19e120d
feat(linux): mcompile-dk char16 works
SabineSIL Mar 5, 2024
99dd1fa
feat(linux): mcompile remove _16 where I do not need them
SabineSIL Mar 5, 2024
aa534f9
feat(linux): mcompile remove even more _16 where I do not need them
SabineSIL Mar 5, 2024
bca7bd6
feat(linux): mcompile rename functions with _16 back
SabineSIL Mar 5, 2024
2d364bf
feat(linux): mcompile-dk start replace wchar_t
SabineSIL Mar 1, 2024
7ea0cff
Merge branch 'feat/linux/mcompile-wchart_char16_changed16' into feat/…
SabineSIL Mar 7, 2024
a6cec09
feat(linux): mcompile-dk remove comments
SabineSIL Mar 14, 2024
89844cb
feat(linux): mcompile-dk very last edits
SabineSIL Mar 18, 2024
809bc35
feat(linux): mcompile-dk solve conflict in .gitignore
SabineSIL Mar 18, 2024
8562071
feat(linux): mcompile-dk still solve conflict in .gitignore
SabineSIL Mar 18, 2024
d85b1d9
Merge pull request #11149 from keymanapp/chore/merge-master-into-linu…
mcdurdin Apr 3, 2024
3ccaee0
feat(mac): mcompile setup minimal VSCode project
SabinePlay Apr 18, 2024
977007b
feat(linux): mcompile add line
SabineSIL Apr 29, 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
a385d48
Merge branch 'epic/linux-mcompile' into chore/merge-master-into-linux…
mcdurdin May 24, 2024
c5fe575
Merge pull request #11539 from keymanapp/chore/merge-master-into-linu…
mcdurdin May 24, 2024
6030379
Merge pull request #11728 from keymanapp/chore/merge-master-into-linu…
mcdurdin Jun 7, 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
55c70f7
feat(linux): mcompile.cpp edit some text
SabineSIL Jun 11, 2024
39c25c4
feat(linux): renaming symbols: mostly capital-non-capital at beginnin…
SabineSIL Jun 11, 2024
724e5b6
feat(linux): rename symbols more
SabineSIL Jun 14, 2024
a305176
Merge pull request #11761 from keymanapp/feat/linux/mcompile-renameSy…
SabineSIL Jun 14, 2024
4cf8043
feat(linux): rework deadkey.cpp/.h
SabineSIL Jun 17, 2024
fa19203
feat(linux): rework deadkey.cpp/.h format document
SabineSIL Jun 17, 2024
bfea2fa
feat(linux): change gitignore
SabineSIL Jun 17, 2024
433332d
feat(linux): undo changes in .gittignore
SabineSIL Jun 18, 2024
f724b4e
feat(linux): layout changes only
SabineSIL Jun 18, 2024
801baf5
feat(linux): remove comments
SabineSIL Jun 18, 2024
f07cb3a
feat(linux): change variable names
SabineSIL Jun 18, 2024
80390b6
feat(linux): start rework mc_import_rules
SabineSIL Jun 18, 2024
d2f031e
feat(linux): function ensureValidInputForKeyboardTranslation instead …
SabineSIL Jun 19, 2024
4db806a
Merge branch 'master' into feat/mac/mcompile_mac
jahorton Jun 19, 2024
ade07bb
feat(linux): move CODE__SIZE and #include <../../../../common/include…
SabineSIL Jun 19, 2024
e0bd714
feat(linux): edit nit picks
SabineSIL Jun 19, 2024
9da9c8b
feat(linux): change .clang-format
SabineSIL Jun 20, 2024
f22088c
Merge branch 'feat/linux/mcompile-rework_deadkey' into feat/linux/mco…
SabineSIL Jun 20, 2024
42186ff
Merge pull request #11813 from keymanapp/feat/linux/mcompile-rework_d…
SabineSIL Jun 20, 2024
404d888
feat(linux): work on 2nd round of comments on PR 11816
SabineSIL Jun 20, 2024
e4e05a7
feat(linux):check buffer size moved
SabineSIL Jun 21, 2024
0eb96a7
feat(linux):check buffer size moved
SabineSIL Jun 21, 2024
1ddbcf6
feat(linux):work on comments for keymap
SabineSIL Jun 21, 2024
f9c05b8
feat(linux): second round of comments for 11816
SabineSIL Jun 24, 2024
7051754
feat(linux): work on 2.nd round of comments 11816
SabineSIL Jun 24, 2024
252c409
feat(linux): comment and assert in KMX_ToUnicodeEx when surrogate pa…
SabineSIL Jun 24, 2024
0075b8f
feat(linux): createCompleteVector_US
SabineSIL Jun 24, 2024
2b59c3c
feat(linux): CodePointToU16String
SabineSIL Jun 24, 2024
adbd27a
Merge pull request #11846 from keymanapp/origin/feat/linux/mcompile-r…
SabineSIL Jun 25, 2024
bc5b502
feat(linux): comments for mc_kmxfile
SabineSIL Jun 25, 2024
e84c4be
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mco…
SabineSIL Jun 26, 2024
5e1001a
Merge pull request #11816 from keymanapp/feat/linux/mcompile-rework_m…
SabineSIL Jun 26, 2024
6e9396c
feat(linux): changes in file permission and other files
SabineSIL Jun 26, 2024
75c9850
feat(linux): remove x11 from meson.build
SabineSIL Jun 26, 2024
e8c8f16
feat(linux): add blanc lines to prevent github from stating "empty f…
SabineSIL Jun 26, 2024
98beb94
feat(linux): ... and remove again
SabineSIL Jun 26, 2024
5795625
feat(linux): ... and back in
SabineSIL Jun 26, 2024
fad203d
feat(linux): change mcompile.h
SabineSIL Jun 26, 2024
912b8ac
feat(linux): more comments on keymap
SabineSIL Jun 26, 2024
7a0fcd1
feat(linux): more comments for keymap 2
SabineSIL Jun 27, 2024
08f2b05
feat(linux): >= instead of > for comparison with gdk_level
SabineSIL Jun 27, 2024
a488f61
feat(linux): rework mcompile switch
SabineSIL Jun 28, 2024
967577e
Merge pull request #11880 from keymanapp/feat/linux/mcompile-rework_o…
SabineSIL Jun 28, 2024
6647932
feat(linux): move run, GetDeadkeys: declaration to fwd-decl in cpp`s
SabineSIL Jun 28, 2024
6966037
feat(linux): remove filesystem.h/cpp and move OpenFile() function to …
SabineSIL Jun 28, 2024
f6c5a4a
feat(linux): warning after Error, keycode_max
SabineSIL Jun 28, 2024
ec05b41
feat(linux): char-filenames, check parameters in run()
SabineSIL Jun 28, 2024
1c34bde
feat(linux): formatting
SabineSIL Jul 1, 2024
334ee3b
feat(linux): remove unused function
SabineSIL Jul 1, 2024
683c062
feat(linux): finish up comments on u16
SabineSIL Jul 1, 2024
536ef54
feat(linux): macro max to std::max; wprintf->printf in run()
SabineSIL Jul 2, 2024
d40ef15
feat(linux): prevent buffer overrun #11910
SabineSIL Jul 3, 2024
e9d158f
feat(linux): remaining comments on u16
SabineSIL Jul 3, 2024
e6b108a
feat(linux): macro max to std::max; wprintf->printf in run()
SabineSIL Jul 2, 2024
89f8ee7
feat(linux): run and DoConvert without argv_gdk
SabineSIL Jul 4, 2024
81abbaf
feat(linux): remove declaration of fun without definition
SabineSIL Jul 4, 2024
f6a969b
feat(linux): ensureValidInputForKeyboardTranslation
SabineSIL Jul 4, 2024
17eea39
feat(linux): ensureValidInputForKeyboardTranslation more
SabineSIL Jul 4, 2024
5a70d83
feat(linux): new fun convert_rgkey_Shiftstate_to_LinuxShiftstate()
SabineSIL Jul 4, 2024
83f079e
feat(linux): remove count
SabineSIL Jul 4, 2024
e6f212c
feat(linux): changes in convert_rgkey_Shiftstate_to_LinuxShiftstate
SabineSIL Jul 4, 2024
4424c23
Merge branch 'feat/linux/mcompile-rework_keymap_part2' into feat/linu…
SabineSIL Jul 4, 2024
236d4d8
Merge pull request #11887 from keymanapp/feat/linux/mcompile-rework_m…
SabineSIL Jul 4, 2024
c0b8372
Merge pull request #11886 from keymanapp/feat/linux/mcompile-rework_k…
SabineSIL Jul 4, 2024
90e53e8
Merge pull request #11895 from keymanapp/feat/linux/mcompile-rework_u16
SabineSIL Jul 4, 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
7e2d46e
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mco…
SabineSIL Jul 24, 2024
b7ddca8
Merge pull request #11936 from keymanapp/feat/linux/mcompile-rework_m…
SabineSIL Jul 24, 2024
aa5ad7a
feat(mac): use new u16
SabineSIL Jul 25, 2024
4688e4d
feat(mac): remove RALT filter
SabineSIL Jul 25, 2024
1828b46
feat(linux): start adding comments according to the new regulations
SabineSIL Jul 3, 2024
ddcd452
feat(linux): info for KMX_ToUnicodeEx
SabineSIL Jul 30, 2024
bf79287
feat(linux): remove Open_File for KMX_WCHAR ;capslock=1
SabineSIL Jul 30, 2024
2aacc78
feat(linux): use Shiftstate instead of int in ToUnicodeEx
SabineSIL Jul 30, 2024
03df66d
feat(linux): use u16.cpp/h from feat/linux/mcompile-comments
SabineSIL Jul 30, 2024
7ed711c
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mco…
SabineSIL Jul 30, 2024
56c6be2
feat(linux): comments of PR 12065
SabineSIL Aug 1, 2024
04e237d
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mco…
SabineSIL Aug 1, 2024
2b21d73
Apply suggestions from code review
SabineSIL Aug 1, 2024
e64c1ff
feat(linux): comment changes
SabineSIL Aug 1, 2024
fe6f828
Merge branch 'feat/linux/mcompile-DoConvert-read' into feat/linux/mco…
SabineSIL Aug 1, 2024
365d62e
feat(mac): include comments from PR 12065
SabineSIL Aug 2, 2024
0388967
feat(Linux): more comments PR 12065
SabineSIL Aug 2, 2024
2676fba
Merge pull request #12096 from keymanapp/chore/merge-master-into-linu…
mcdurdin Aug 5, 2024
690caec
feat(Linux): swap detailed comments <-> one-line comments
SabineSIL Aug 6, 2024
53ece79
feat(mac): swapped comments
SabineSIL Aug 6, 2024
ce662db
Merge branch 'master' into feat/mac/mcompile_mac
SabineSIL Aug 6, 2024
e0f4e50
feat(Linux): "a few minor things"
SabineSIL Aug 8, 2024
1719df2
feat(Linux): "more minor things"
SabineSIL Aug 8, 2024
ef4e47c
feat(Linux): layout mcompile
SabineSIL Aug 8, 2024
6382f3c
Merge pull request #12065 from keymanapp/feat/linux/mcompile-comments
SabineSIL Aug 8, 2024
9e1d2f9
feat(linux): u16: change parameter name; while loop
SabineSIL Aug 8, 2024
32a9110
Merge branch 'epic/linux-mcompile' into feat/linux/mcompile-DoConvert…
SabineSIL Aug 13, 2024
c5088cc
Merge pull request #12172 from keymanapp/chore/merge-master-into-linu…
mcdurdin Aug 13, 2024
dc97370
Merge branch 'epic/linux-mcompile' into feat/linux/mcompile-DoConvert…
mcdurdin Aug 13, 2024
58c1e50
chore(linux): remove mcompile-specific km_types.h
SabineSIL Aug 13, 2024
a77a0d3
chore(linux): undo changes in comments of VKScancodes
SabineSIL Aug 14, 2024
ad21aa0
chore(linux): add build.sh for mcompile-lin
SabineSIL Aug 14, 2024
fe21f86
Merge pull request #12179 from keymanapp/chore/merge-master-into-linu…
mcdurdin Aug 14, 2024
5a0a18c
Merge branch 'epic/linux-mcompile' into feat/linux/mcompile-DoConvert…
mcdurdin Aug 14, 2024
dd0ea90
feat(linux): remove local u16 and use km_u16
SabineSIL Aug 14, 2024
816175f
refactor(linux): remove meson.build
SabineSIL Aug 14, 2024
ba01abf
Merge pull request #12178 from keymanapp/feat/linux/mcompile-build.sh
mcdurdin Aug 14, 2024
d0d5aa3
Merge pull request #12180 from keymanapp/feat/linux/mcompile-replace_U16
SabineSIL Aug 14, 2024
2f0deef
Merge pull request #9384 from keymanapp/feat/linux/mcompile-DoConvert…
mcdurdin Aug 14, 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
15fa5ff
Merge pull request #12209 from keymanapp/chore/merge-master-into-linu…
mcdurdin Aug 16, 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
a4159de
chore(linux): add mcompile to linux build.sh
mcdurdin Aug 16, 2024
b10bba7
chore(linux): remove unused libxklavier dep
SabineSIL Aug 16, 2024
4c9d448
chore(linux): add utfcodec.cpp to mcompile
mcdurdin Aug 16, 2024
58af491
Merge pull request #12211 from keymanapp/chore/add-mcompile-to-linux-…
mcdurdin Aug 16, 2024
963bb52
chore(mac): change bitmapoffset + bitmapsize to prvent buffer problems
SabineSIL Aug 16, 2024
a883402
Merge pull request #12255 from keymanapp/chore/merge-master-into-linu…
mcdurdin Aug 22, 2024
cf7c1f6
Merge pull request #12319 from keymanapp/chore/merge-master-into-linu…
mcdurdin Aug 30, 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
07252be
Merge pull request #12413 from keymanapp/chore/merge-master-into-linu…
mcdurdin Sep 13, 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
7736780
chore(linux): implement all of Marcs changes from mcompile-mac into m…
SabineSIL Sep 18, 2024
057675d
chore(linux): name changes in comments
SabineSIL Sep 18, 2024
2ad66f6
chore(linux): add kbp->dpBitmapOffset, kbp->dwBitmapSize and calculat…
SabineSIL Sep 19, 2024
c8b084b
Merge remote-tracking branch 'origin/epic/linux-mcompile' into feat/l…
SabineSIL Sep 30, 2024
d8716d8
Merge pull request #12444 from keymanapp/feat/linux/mcompile-PR_11334
SabineSIL Sep 30, 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
d541351
Merge branch 'epic/linux-mcompile' into chore/merge-master-into-linux…
mcdurdin Oct 10, 2024
504c20b
Merge pull request #12532 from keymanapp/chore/merge-master-into-linu…
mcdurdin Oct 11, 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
b42d027
Merge branch 'epic/linux-mcompile' into chore/merge-master-into-linux…
mcdurdin Oct 25, 2024
f9e7db1
Merge pull request #11334 from keymanapp/feat/mac/mcompile_mac
SabineSIL Oct 25, 2024
19812d5
Merge branch 'epic/linux-mcompile' into chore/merge-master-into-linux…
mcdurdin Oct 25, 2024
fbacf20
Merge pull request #12577 from keymanapp/chore/merge-master-into-linu…
mcdurdin Oct 27, 2024
4aa01a7
Merge branch 'epic/linux-mcompile' into chore/merge-master-into-linux…
mcdurdin Nov 8, 2024
9d99fe1
Merge pull request #12652 from keymanapp/chore/merge-master-into-linu…
mcdurdin Nov 10, 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
1 change: 0 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,3 @@ TabWidth: 8
UseCRLF: false
UseTab: Never
...

2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.0.138
18.0.138
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
1 change: 1 addition & 0 deletions linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ builder_describe \
":engine=ibus-keyman ibus-keyman" \
":help Online documentation" \
":service=keyman-system-service keyman-system-service" \
":mcompile=mcompile/keymap mnemonic layout recompiler for Linux" \
"clean" \
"configure" \
"build" \
Expand Down
3 changes: 3 additions & 0 deletions linux/mcompile/Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This is a proposal to rewrite mcompile for Linux. For this we need to query the base keyboard data from the Linux platform, then rewriting the keyboard .kmx using the same approach as is done in mcompile for Windows, but working from the data from the x11 keyboard on Linux.

Ideally, we'd rewrite mcompile to be cross-platform (Windows, Linux, macOS), so that the keyboard interrogation would be separated from the .kmx rewriting, at least to some degree. Nevertheless it would probably be easiest to start from a standalone implementation.
2 changes: 2 additions & 0 deletions linux/mcompile/keymap/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
resources/
build/
7 changes: 7 additions & 0 deletions linux/mcompile/keymap/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This is a proposal to rewrite mcompile for Linux. For this we need to query the base keyboard data from the Linux platform, then rewriting the keyboard .kmx using the same approach as is done in mcompile for Windows, but working from the data from the x11 keyboard on Linux.

Ideally, we'd rewrite mcompile to be cross-platform (Windows, Linux, macOS), so that the keyboard interrogation would be separated from the .kmx rewriting, at least to some degree. Nevertheless it would probably be easiest to start from a standalone implementation.
Sample program that reads US basic keyboard and compares to key value group


# Keymap
33 changes: 33 additions & 0 deletions linux/mcompile/keymap/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/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

#. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"

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

builder_describe \
"Mnemonic layout recompiler for Linux" \
"@/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
331 changes: 331 additions & 0 deletions linux/mcompile/keymap/deadkey.cpp

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions linux/mcompile/keymap/deadkey.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

#pragma once
#ifndef DEADKEY_H
#define DEADKEY_H

#include "mc_import_rules.h"
#include <map>

/** @brief create a Vector of DeadKey containing all combinations of deadkey + character for ALL possible Linux keyboards */
std::vector<DeadKey*> create_deadkeys_by_basechar();

/** @brief filter entries for the currently used Linux Keyboard out of a vector of all existing deadKey combinations */
void refine_alDead(KMX_WCHAR dk, std::vector<DeadKey*>& dkVec, std::vector<DeadKey*>& r_All_Vec);

/** @brief check whether a deadkey already exists in the deadkey vector */
bool found_dk_inVector(KMX_WCHAR dk, std::vector<DeadKey*>& dkVec);

/** @brief find all deadkey combinations for a certain deadkey in a vector of all deadkey combinations */
bool query_dk_combinations_for_specific_dk(vec_dword_2D& r_dk_ComposeTable, KMX_DWORD dk, vec_dword_2D& dk_SingleTable);

/** @brief convert a character to the upper-case equivalent and find the corresponding shiftstate of the entered keyval */
KMX_DWORD KMX_change_keyname_to_capital(KMX_DWORD kVal, KMX_DWORD& shift, GdkKeymap* keymap);

/** @brief append a 1D-vector containing name, base character and unicode_value to a 2D-Vector */
void add_deadkey_combination(vec_dword_2D& dk_ComposeTable, std::string diacritic_name, std::string base_char, KMX_DWORD unicode_value);

/** @brief create a 2D-Vector containing all possible combinations of deadkey + character for all Linux keyboards */
void create_DKTable(vec_dword_2D& dk_ComposeTable);

#endif /*DEADKEY_H*/
Loading