Skip to content

Better azerty macos compatibility in emulated mode #73

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

Open
niiico69 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Better azerty macos compatibility in emulated mode #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faf9b5b
feat(azerty): émulation ErgoL complète sur hôte macOS « Français »
niiico69 Jun 17, 2026
a6ec4cc
refactor(hold_taps): TWO_LEVEL_KEY pour les morphs rangée-num ErgoL
niiico69 Jun 17, 2026
8569396
refactor(hold_taps): TWO_LEVEL_KEY pour les morphs rangée-num ErgoL
niiico69 Jun 17, 2026
4eb8b87
Merge remote-tracking branch 'refs/remotes/origin/pr/macos-ergol' int…
niiico69 Jun 18, 2026
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
89 changes: 80 additions & 9 deletions include/aekeynox/aliases/azerty.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,52 @@
#define S_DOT &kp LS(COMMA)
#define S_MONEY &kp RA(E)

// macOS "Français" (Apple) : rangée num + bas diffèrent du PC AZERTY.
// Vérifié au Visualiseur de clavier. ponytail: couche Option ({}[]\|#@^`~ €) encore TODO (manque capture ⌥⇧).
#ifdef MACOS
#undef S_MINUS
#define S_MINUS &kp EQUAL // "-" sur la touche = (PC: N6)
#undef S_UNDER
#define S_UNDER &kp LS(EQUAL) // "_" (PC: N8)
#undef S_EQUAL
#define S_EQUAL &kp FSLH // "=" sur la touche /? (PC: EQUAL)
#undef S_PLUS
#define S_PLUS &kp LS(FSLH) // "+"
#undef S_EXCL
#define S_EXCL &kp N8 // "!" sur N8 (PC: FSLH)
#undef S_STAR
#define S_STAR &kp LS(RBKT) // "*" = Shift+$ (PC: BSLH)
// couche Option
#undef S_LBRC
#define S_LBRC &kp RA(N5) // "{" = ⌥5
#undef S_RBRC
#define S_RBRC &kp RA(MINUS) // "}" = ⌥-
#undef S_LBKT
#define S_LBKT &kp SA(N5) // "[" = ⌥⇧5
#undef S_RBKT
#define S_RBKT &kp SA(MINUS) // "]" = ⌥⇧-
#undef S_PIPE
#define S_PIPE &kp SA(L) // "|" = ⌥⇧L
#undef S_CARET
#define S_CARET &digraph LBKT SPACE // "^" (touche morte) + espace
#undef S_TILDE
#define S_TILDE &digraph RA(N) SPACE // "~" = ⌥n (morte) + espace
#undef S_LT
#define S_LT &kp GRAVE // "<" (touche <> = GRAVE)
#undef S_GT
#define S_GT &kp LS(GRAVE) // ">"
#undef S_AT
#define S_AT &kp NUBS // "@" (touche @# = NUBS)
#undef S_HASH
#define S_HASH &kp PIPE2 // "#" = ⇧@
#undef S_BSLH
#define S_BSLH &kp SA(DOT) // "\" = ⌥⇧ sur ":"
#undef S_MONEY
#define S_MONEY &kp RA(RBKT) // "€" = ⌥$
#undef S_GRAVE
#define S_GRAVE &digraph NUHS SPACE // "`" morte (touche ISO après ù) + espace
#endif

// GRAVE and TILDE are no dead keys on Linux
#ifdef LINUX
#undef S_GRAVE
Expand Down Expand Up @@ -144,9 +190,9 @@
#elifdef MACOS
#define C_OE &kp RA(O) // œ
#define SC_OE &kp SA(O) // œ
#define C_AE &kp RA(Z) // æ
#define SC_AE &kp SA(Z) // æ
#define C_SZ &kp RA(S) // ß
#define C_AE &kp RA(Q) // æ
#define SC_AE &kp SA(Q) // Æ
#define C_SZ &kp RA(B) // ß
#elifdef ENABLE_CP1252_ALT_CODES
#define C_OE CP1252_LOWERCASE_OE // œ
#define SC_OE CP1252_UPPERCASE_OE // Œ
Expand All @@ -160,9 +206,12 @@
#define SC_AE &digraph LS(O) LS(E)
#define C_SZ &digraph S S
#endif
#if defined LINUX || defined MACOS
#ifdef LINUX
#define C_NTLD &kp N // XXX
#define SC_NTLD &kp LS(N) // XXX
#elifdef MACOS
#define C_NTLD &digraph RA(N) N // ñ
#define SC_NTLD &digraph RA(N) LS(N) // Ñ
#else
#define C_NTLD &digraph RA(N2) N // ñ
#define SC_NTLD &digraph RA(N2) LS(N) // ñ
Expand All @@ -183,7 +232,14 @@
#define C_LGQT CP1252_LEFT_GUILLEMET // «
#define C_RGQT CP1252_RIGHT_GUILLEMET // »
#define C_APOS CP1252_RIGHT_SINGLE_QUOTE // ’
#else // macOS or Windows without alt-codes
#elifdef MACOS
#define C_LODQT &none
#define C_LDQT &none
#define C_RDQT &none
#define C_LGQT &kp RA(N7) // « = ⌥7
#define C_RGQT &kp SA(N7) // » = ⌥⇧7
#define C_APOS &kp N4 // '
#else // Windows without alt-codes
#define C_LODQT &none
#define C_LDQT &none
#define C_RDQT &none
Expand All @@ -200,6 +256,13 @@
#define C_BLLT CP1252_BULLET // •
#define C_MDOT CP1252_MIDDLE_DOT // ·
#define C_NBSP CP1252_NO_BREAK_SPACE
#elifdef MACOS
#define C_MDASH &kp SA(EQUAL) // —
#define C_NDASH &kp RA(EQUAL) // –
#define C_ELLIP &kp RA(COMMA) // … (⌥;)
#define C_BLLT &kp SA(COMMA) // •
#define C_MDOT S_DOT // .
#define C_NBSP &kp RA (SPACE)
#else // unsupported
#define C_NDASH &digraph N6 N6 // --
#define C_MDASH &digraph N6 N6 // --
Expand All @@ -221,16 +284,24 @@
#define C_FEM CP1252_FEMININE_ORDINAL // ª
#define C_MASC CP1252_MASCULINE_ORDINAL // º
#else // macOS or Windows without alt-codes
#define C_LCXE &none
#define C_KRAMQ &none
#define C_LCXE &kp RA(8) // ¡
#define C_KRAMQ &kp SA(M) // ¿
#define C_FEM &none
#define C_MASC &none
#endif

// math
#define C_DEG &kp UNDER // °
#define C_MICRO &kp PIPE // µ
#define C_EURO &kp RA(E) // €
#ifdef MACOS
#define C_MICRO &kp RA(SEMI) // µ
#else
#define C_MICRO &kp PIPE // µ
#endif
#ifdef MACOS
#define C_EURO &kp RA(RBKT) // € = ⌥$
#else
#define C_EURO &kp RA(E) // €
#endif
#ifdef LINUX
#define C_CENT &kp RA(C) // ¢
#define C_MULT &kp SA(COMMA) // ×
Expand Down
38 changes: 38 additions & 0 deletions include/aekeynox/hold_taps.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,41 @@
};
};
};

// Pavé num (NavNum/NumRow) : chiffre en tap, symbole rangée-num ErgoL en Shift.
#if defined(KB_EMULATION_ERGOL) && defined(KB_LAYOUT_AZERTY)
/ {
behaviors {
TWO_LEVEL_KEY(nm1, &kp LS(N1), C_EURO)
TWO_LEVEL_KEY(nm2, &kp LS(N2), C_LGQT)
TWO_LEVEL_KEY(nm3, &kp LS(N3), C_RGQT)
TWO_LEVEL_KEY(nm4, &kp LS(N4), S_DLLR)
TWO_LEVEL_KEY(nm5, &kp LS(N5), S_PRCNT)
TWO_LEVEL_KEY(nm6, &kp LS(N6), S_CARET)
TWO_LEVEL_KEY(nm7, &kp LS(N7), S_AMPS)
TWO_LEVEL_KEY(nm8, &kp LS(N8), S_STAR)
TWO_LEVEL_KEY(nm9, &kp LS(N9), S_HASH)
TWO_LEVEL_KEY(nm0, &kp LS(N0), S_AT)
};
};
#undef S_N1
#define S_N1 &nm1
#undef S_N2
#define S_N2 &nm2
#undef S_N3
#define S_N3 &nm3
#undef S_N4
#define S_N4 &nm4
#undef S_N5
#define S_N5 &nm5
#undef S_N6
#define S_N6 &nm6
#undef S_N7
#define S_N7 &nm7
#undef S_N8
#define S_N8 &nm8
#undef S_N9
#define S_N9 &nm9
#undef S_N0
#define S_N0 &nm0
#endif
5 changes: 5 additions & 0 deletions include/aekeynox/mappings.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@
OMIT_IF_NO_REF caps: caps {
compatible = "zmk,behavior-macro-one-param";
#binding-cells = <1>;
#ifdef MACOS
tap-ms = <120>; // macOS ignore un CapsLock trop bref (anti-rebond)
wait-ms = <40>;
#else
tap-ms = <0>;
wait-ms = <0>;
#endif
bindings
= <&kp CAPS>
, <&macro_param_1to1 &kp MACRO_PLACEHOLDER>
Expand Down