1
0
Fork 0

Unicodemap keycodes rename (#21092)

This commit is contained in:
Ryan 2023-06-02 02:25:08 +10:00 committed by GitHub
parent 45c9bc4e55
commit a4ed6ad0f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 358 additions and 360 deletions

View file

@ -31,7 +31,7 @@
#define UCM_NAME(name, code) UCM_ ## name,
#define UCM_ENTRY(name, code) [UCM_ ## name] = code,
#define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
#define UCM_KEYCODE(name, code) name = UM(UCM_ ## name),
#if defined(UNICODE_ENABLE)
enum unicode_keycodes {

View file

@ -2,7 +2,6 @@
#include "quantum.h"
/* use X(n) to call the */
#ifdef UNICODEMAP_ENABLE
enum unicode_name {
OKOK, //

View file

@ -152,13 +152,13 @@ NOTE: These are all the same length. If you do a search/replace
#endif
#ifdef UNICODEMAP_ENABLE
# define _______________UNICODE_L1__________________ X(SMRK), X(THINK), X(CLOWN), X(HUNDR), X(BANG)
# define _______________UNICODE_L2__________________ X(GRIN), X(MONKEY), X(OKOK), X(EGGPL), X(LIT)
# define _______________UNICODE_L3__________________ X(WEARY), X(UNAMU), X(EFFU), X(MONOCL), X(IRONY)
# define _______________UNICODE_L1__________________ UM(SMRK), UM(THINK), UM(CLOWN), UM(HUNDR), UM(BANG)
# define _______________UNICODE_L2__________________ UM(GRIN), UM(MONKEY), UM(OKOK), UM(EGGPL), UM(LIT)
# define _______________UNICODE_L3__________________ UM(WEARY), UM(UNAMU), UM(EFFU), UM(MONOCL), UM(IRONY)
# define _______________UNICODE_R1__________________ X(DRUG0), X(THUP), X(INUP), X(DIZZY), X(COOL)
# define _______________UNICODE_R2__________________ X(FIST0), X(FIST2), X(FIST3), X(FIST1), X(OKOK)
# define _______________UNICODE_R3__________________ X(MNDBLWN), X(THDN), X(SPOCK), X(HOLE), X(DASH)
# define _______________UNICODE_R1__________________ UM(DRUG0), UM(THUP), UM(INUP), UM(DIZZY), UM(COOL)
# define _______________UNICODE_R2__________________ UM(FIST0), UM(FIST2), UM(FIST3), UM(FIST1), UM(OKOK)
# define _______________UNICODE_R3__________________ UM(MNDBLWN), UM(THDN), UM(SPOCK), UM(HOLE), UM(DASH)
#endif
#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5

View file

@ -216,7 +216,7 @@
#define UCM_NAME(name, code) UCM_ ## name, // UCM_LALP,
#define UCM_ENTRY(name, code) [UCM_ ## name] = code, // [UCM_LALP] = 0x03B1,
#define UCM_KEYCODE(name, code) name = X(UCM_ ## name), // LALP = X(UCM_LALP)
#define UCM_KEYCODE(name, code) name = UM(UCM_ ## name), // LALP = UM(UCM_LALP)
#if defined(UNICODE_ENABLE)
enum unicode_keycodes {
@ -235,61 +235,61 @@ enum unicode_keycodes {
#endif
#define ALPHA XP(LALP, UALP)
#define BETA XP(LBET, UBET)
#define GAMMA XP(LGAM, UGAM)
#define DELTA XP(LDEL, UDEL)
#define EPSLN XP(LEPS, UEPS)
#define ZETA XP(LZET, UZET)
#define ETA XP(LETA, UETA)
#define THETA XP(LTHE, UTHE)
#define IOTA XP(LIOT, UIOT)
#define KAPPA XP(LKAP, UKAP)
#define LAMBD XP(LLAM, ULAM)
#define GMU XP(LMU, UMU)
#define NU XP(LNU, UNU)
#define XI XP(LXI, UXI)
#define OMCRN XP(LOMI, UOMI)
#define PI XP(LPI, UPI)
#define RHO XP(LRHO, URHO)
#define SIGMA XP(LSIG, USIG)
#define TAU XP(LTAU, UTAU)
#define UPSLN XP(LUPS, UUPS)
#define PHI XP(LPHI, UPHI)
#define CHI XP(LCHI, UCHI)
#define PSI XP(LPSI, UPSI)
#define OMEGA XP(LOME, UOME)
#define ALPHA UP(LALP, UALP)
#define BETA UP(LBET, UBET)
#define GAMMA UP(LGAM, UGAM)
#define DELTA UP(LDEL, UDEL)
#define EPSLN UP(LEPS, UEPS)
#define ZETA UP(LZET, UZET)
#define ETA UP(LETA, UETA)
#define THETA UP(LTHE, UTHE)
#define IOTA UP(LIOT, UIOT)
#define KAPPA UP(LKAP, UKAP)
#define LAMBD UP(LLAM, ULAM)
#define GMU UP(LMU, UMU)
#define NU UP(LNU, UNU)
#define XI UP(LXI, UXI)
#define OMCRN UP(LOMI, UOMI)
#define PI UP(LPI, UPI)
#define RHO UP(LRHO, URHO)
#define SIGMA UP(LSIG, USIG)
#define TAU UP(LTAU, UTAU)
#define UPSLN UP(LUPS, UUPS)
#define PHI UP(LPHI, UPHI)
#define CHI UP(LCHI, UCHI)
#define PSI UP(LPSI, UPSI)
#define OMEGA UP(LOME, UOME)
#define AH XP(LAH, UAH)
#define BE XP(LBE, UBE)
#define VE XP(LVE, UVE)
#define GHE XP(LGHE, UGHE)
#define DE XP(LDE, UDE)
#define IE XP(LIE, UIE)
#define IO XP(LIO, UIO)
#define ZHE XP(LZHE, UZHE)
#define ZE XP(LZE, UZE)
#define IH XP(LIH, UIH)
#define SIH XP(LSIH, USIH)
#define KA XP(LKA, UKA)
#define EL XP(LEL, UEL)
#define EM XP(LEM, UEM)
#define EN XP(LEN, UEN)
#define OH XP(LOH, UOH)
#define PE XP(LPE, UPE)
#define ER XP(LER, UER)
#define ES XP(LES, UES)
#define TE XP(LTE, UTE)
#define UU XP(LUU, UUU)
#define EF XP(LEF, UEF)
#define HA XP(LHA, UHA)
#define TSE XP(LTSE, UTSE)
#define CHE XP(LCHE, UCHE)
#define SHA XP(LSHA, USHA)
#define SCHA XP(LSCHA, USCHA)
#define HARD XP(LHARD, UHARD)
#define YERU XP(LYERU, UYERU)
#define SOFT XP(LSOFT, USOFT)
#define EH XP(LEH, UEH)
#define YU XP(LYU, UYU)
#define YA XP(LYA, UYA)
#define AH UP(LAH, UAH)
#define BE UP(LBE, UBE)
#define VE UP(LVE, UVE)
#define GHE UP(LGHE, UGHE)
#define DE UP(LDE, UDE)
#define IE UP(LIE, UIE)
#define IO UP(LIO, UIO)
#define ZHE UP(LZHE, UZHE)
#define ZE UP(LZE, UZE)
#define IH UP(LIH, UIH)
#define SIH UP(LSIH, USIH)
#define KA UP(LKA, UKA)
#define EL UP(LEL, UEL)
#define EM UP(LEM, UEM)
#define EN UP(LEN, UEN)
#define OH UP(LOH, UOH)
#define PE UP(LPE, UPE)
#define ER UP(LER, UER)
#define ES UP(LES, UES)
#define TE UP(LTE, UTE)
#define UU UP(LUU, UUU)
#define EF UP(LEF, UEF)
#define HA UP(LHA, UHA)
#define TSE UP(LTSE, UTSE)
#define CHE UP(LCHE, UCHE)
#define SHA UP(LSHA, USHA)
#define SCHA UP(LSCHA, USCHA)
#define HARD UP(LHARD, UHARD)
#define YERU UP(LYERU, UYERU)
#define SOFT UP(LSOFT, USOFT)
#define EH UP(LEH, UEH)
#define YU UP(LYU, UYU)
#define YA UP(LYA, UYA)

View file

@ -74,13 +74,13 @@ const uint32_t unicode_map[] PROGMEM = {
};
// Accents
#define A_GRV XP(aGRV, AGRV)
#define A_UML XP(aUML, AUML)
#define E_GRV XP(eGRV, EGRV)
#define E_ACT XP(eACT, EACT)
#define I_GRV XP(iGRV, IGRV)
#define I_CIR XP(iCIR, ICIR)
#define O_GRV XP(oGRV, OGRV)
#define O_UML XP(oUML, OUML)
#define U_GRV XP(uGRV, UGRV)
#define U_UML XP(uUML, UUML)
#define A_GRV UP(aGRV, AGRV)
#define A_UML UP(aUML, AUML)
#define E_GRV UP(eGRV, EGRV)
#define E_ACT UP(eACT, EACT)
#define I_GRV UP(iGRV, IGRV)
#define I_CIR UP(iCIR, ICIR)
#define O_GRV UP(oGRV, OGRV)
#define O_UML UP(oUML, OUML)
#define U_GRV UP(uGRV, UGRV)
#define U_UML UP(uUML, UUML)

View file

@ -28,14 +28,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define G_LWR LT(_LOWER, KC_G)
#if defined(UNICODEMAP_ENABLE)
# define CSHAPES XP(CCIR,CKEY)
# define CUIDADO XP(CUI,HAS)
# define NOPENAH XP(NOPE,STOP)
# define MUSIC_A XP(M4,M8)
# define MUSIC_B XP(M8B,M16)
# define SMILE XP(SMB,SMW)
# define STARS XP(STB,STW)
# define YEPYEP XP(CHEK,HUN)
# define CSHAPES UP(CCIR,CKEY)
# define CUIDADO UP(CUI,HAS)
# define NOPENAH UP(NOPE,STOP)
# define MUSIC_A UP(M4,M8)
# define MUSIC_B UP(M8B,M16)
# define SMILE UP(SMB,SMW)
# define STARS UP(STB,STW)
# define YEPYEP UP(CHEK,HUN)
#endif
/* _QWERTY
@ -70,10 +70,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* RCtlRAltRGui FLIP M M M
*
*/
#define ____65_RAISE_______________ROW1 KC_GRV, X(IBNG), X(IRNY), _______, X(CENT), _______, _______, _______, STARS, _______, SMILE, X(NEG), CSHAPES, KC_DEL, KC_HOME
#define ____65_RAISE_______________ROW2 _______, _______, WAT, X(LEXI), RUPA, TADA, YUNO, _______, X(LELM), X(OM), _______, MUSIC_A, MUSIC_B, _______, KC_INS
#define ____65_RAISE_______________ROW3 _______, X(LALL), X(EFF), DICE, FART, _______, HUGS, JOY, KISS, LOD, _______, NOPENAH, YEPYEP, KC_END
#define ____65_RAISE_______________ROW4 OS_RSFT, CUIDADO, X(ECKS), CATS, DOMO, BUGS, X(NUM), MUSIC, DANCE, X(LPRO), SHRUG, KC_BTN1, KC_MS_U, KC_BTN2
#define ____65_RAISE_______________ROW1 KC_GRV, UM(IBNG), UM(IRNY), _______, UM(CENT), _______, _______, _______, STARS, _______, SMILE, UM(NEG), CSHAPES, KC_DEL, KC_HOME
#define ____65_RAISE_______________ROW2 _______, _______, WAT, UM(LEXI), RUPA, TADA, YUNO, _______, UM(LELM), UM(OM), _______, MUSIC_A, MUSIC_B, _______, KC_INS
#define ____65_RAISE_______________ROW3 _______, UM(LALL), UM(EFF), DICE, FART, _______, HUGS, JOY, KISS, LOD, _______, NOPENAH, YEPYEP, KC_END
#define ____65_RAISE_______________ROW4 OS_RSFT, CUIDADO, UM(ECKS), CATS, DOMO, BUGS, UM(NUM), MUSIC, DANCE, UM(LPRO), SHRUG, KC_BTN1, KC_MS_U, KC_BTN2
#define ____65_RAISE_______________ROW5 OS_RCTL, OS_RALT, OS_RGUI, FLIP, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
/* _LOWER

View file

@ -25,7 +25,7 @@ enum unicode_names {
SURPRISE,
};
# define X_BUL (XP(BUL1, BUL2))
# define X_DASH (XP(EMDASH, ENDASH))
# define X_BUL (UP(BUL1, BUL2))
# define X_DASH (UP(EMDASH, ENDASH))
#endif

View file

@ -101,8 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
register_code(KC_LPRN);
unregister_code(KC_LPRN);
register_code(X(0x00B0));
unregister_code(X(0x00B0));
register_unicode(0x00B0);
UC(0x256F);
PROCESS_UNICODE(UC(0x00B0));

View file

@ -2,7 +2,6 @@
#include "quantum.h"
/* use X(n) to call the */
#ifdef UNICODEMAP_ENABLE
enum unicode_name {
OKOK, //

View file

@ -118,13 +118,13 @@ NOTE: These are all the same length. If you do a search/replace
#endif
#ifdef UNICODEMAP_ENABLE
#define _______________UNICODE_L1__________________ X(SMRK), X(THINK), X(CLOWN), X(HUNDR), X(BANG)
#define _______________UNICODE_L2__________________ X(GRIN), X(MONKEY), X(OKOK), X(EGGPL), X(LIT)
#define _______________UNICODE_L3__________________ X(WEARY), X(UNAMU), X(EFFU), X(MONOCL), X(IRONY)
#define _______________UNICODE_L1__________________ UM(SMRK), UM(THINK), UM(CLOWN), UM(HUNDR), UM(BANG)
#define _______________UNICODE_L2__________________ UM(GRIN), UM(MONKEY), UM(OKOK), UM(EGGPL), UM(LIT)
#define _______________UNICODE_L3__________________ UM(WEARY), UM(UNAMU), UM(EFFU), UM(MONOCL), UM(IRONY)
#define _______________UNICODE_R1__________________ X(DRUG0), X(THUP), X(INUP), X(DIZZY), X(COOL)
#define _______________UNICODE_R2__________________ X(FIST0), X(FIST2),X(FIST3),X(FIST1), X(OKOK)
#define _______________UNICODE_R3__________________ X(MNDBLWN), X(THDN), X(SPOCK),X(HOLE), X(DASH)
#define _______________UNICODE_R1__________________ UM(DRUG0), UM(THUP), UM(INUP), UM(DIZZY), UM(COOL)
#define _______________UNICODE_R2__________________ UM(FIST0), UM(FIST2),UM(FIST3),UM(FIST1), UM(OKOK)
#define _______________UNICODE_R3__________________ UM(MNDBLWN), UM(THDN), UM(SPOCK),UM(HOLE), UM(DASH)
#endif
#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5