浏览代码

[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys

Brendan Johan Lee 8 年之前
父节点
当前提交
13fa63b192

二进制
keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-base-layout.png


二进制
keyboards/ergodox/keymaps/deadcyclo/images/deadcyclo-layer-3-navigation.png


+ 21 - 21
keyboards/ergodox/keymaps/deadcyclo/keymap.c

@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
  * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
  * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
  * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |Grv/L1|  '"  |AltShf| Lalt | Ralt |                                       | Lalt | Ralt |   [  |   ]  | ~/L1 |
+ *   |Grv/L1|  UNI |AltShf| Lalt | Ralt |                                       | Lalt | Ralt |   [  |  UNI | ~/L1 |
  *   `----------------------------------'                                       `----------------------------------'
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        ,-------------.       ,-------------.
  *                                        | App  | Home |       | PgUp |  Ins   |
  *                                        | App  | Home |       | PgUp |  Ins   |
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         LT(SYMB,KC_TAB),        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
         LT(SYMB,KC_TAB),        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
         KC_LCTL,        LT(MDIA, KC_A),         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LCTL,        LT(MDIA, KC_A),         KC_S,   KC_D,   KC_F,   KC_G,
         KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
         KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_RALT,KC_LALT,
+        LT(SYMB,KC_GRV),LCTL(LSFT(KC_U)),      LALT(KC_LSFT),  KC_RALT,KC_LALT,
                                               ALT_T(KC_APP),  KC_HOME,
                                               ALT_T(KC_APP),  KC_HOME,
                                                               KC_END,
                                                               KC_END,
                                                KC_SPC,KC_TAB,KC_LBRC,
                                                KC_SPC,KC_TAB,KC_LBRC,
@@ -74,12 +74,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	TG(SYMB),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             LT(SYMB, KC_BSLS),
 	TG(SYMB),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             LT(SYMB, KC_BSLS),
 	KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),CTL_T(KC_QUOT),
 	KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),CTL_T(KC_QUOT),
              MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
              MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
-		KC_LALT,  KC_RALT,KC_LBRC,KC_RBRC,          LT(SYMB,KC_TILD),
+		KC_LALT,  KC_RALT,KC_LBRC,LCTL(LSFT(KC_U)),          LT(SYMB,KC_TILD),
              KC_PGUP,        KC_INS,
              KC_PGUP,        KC_INS,
              KC_PGDN,
              KC_PGDN,
              KC_RBRC,KC_BSPC, KC_ENT
              KC_RBRC,KC_BSPC, KC_ENT
     ),
     ),
-/* Keymap 1: Symbol Layer
+/* Keymap 1: Symbol Layer LCTL(LSFT(KC_U))
  *                                                  
  *                                                  
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
  * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
@@ -166,18 +166,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 3: Unicode
 /* Keymap 3: Unicode
  *
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        | VER  |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |        |  ┌   |  ┐   |  └   |  ┘   |  │   |  ─   |           |  ╔   |  ╗   |  ╚   |  ╝   |  ║   |  ═   |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        | shrug| yay  | hug  | smile|smile2|      |           |      |  ■   |  λ   |  →   |  ➙   |  ▻   |        |
+ * |        | shrug| yay  | hug  | smile|smile2|      |           |      |  ■   |  λ   |  →   |  ➙   |  ▻   |       |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | hmm1 | hmm2 | bear1| bear2| fuu  |------|           |------|  ☺   |  ☻   |  ☹   |  ♡   |  ♥   |        |
+ * |        | hmm1 | hmm2 | bear1| bear2| fuu  |------|           |------|  ☺   |  ☻   |  ☹   |  ♡   |  ♥   |       |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | eggy1| eggy2| face1| face2| uhu  |      |           |      |  ❤   |      |      |      |      |        |
+ * |        | eggy1| eggy2| face1| face2| uhu  |      |           |      |  ❤   |  ☐   |  ☑   |  ☒   |  ✓   |  ▄     |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      | smrk1| smrk2| love |      |                                       |      |      |      |      |      |
+ *   |      | smrk1| smrk2| love | VER  |                                       |  ✔   |  ✗   |  ✘   |  ●   |  ▀   |
  *   `----------------------------------'                                       `----------------------------------'
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
+ *                                        |      |      |       |   ▒  |  ▓   |
  *                                 ,------|------|------|       |------+------+------.
  *                                 ,------|------|------|       |------+------+------.
  *                                 |      |      |      |       |      |      |      |
  *                                 |      |      |      |       |      |      |      |
  *                                 |      |      |------|       |------|      |      |
  *                                 |      |      |------|       |------|      |      |
@@ -186,23 +186,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  */
 // Unicode
 // Unicode
 [NAVG] = KEYMAP(
 [NAVG] = KEYMAP(
-       KC_TRNS, VRSN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, UC(0x250c), UC(0x2510), UC(0x2514), UC(0x2518), UC(0x2502), UC(0x2500),
        KC_TRNS, SHRUG, YAY, HUG, SMILE, SMILE2, KC_TRNS,
        KC_TRNS, SHRUG, YAY, HUG, SMILE, SMILE2, KC_TRNS,
        KC_TRNS, HMM1, HMM2, BEAR1, BEAR2, FUU,
        KC_TRNS, HMM1, HMM2, BEAR1, BEAR2, FUU,
        KC_TRNS, EGGY1, EGGY2, FACE1, FACE2, UHU, KC_TRNS,
        KC_TRNS, EGGY1, EGGY2, FACE1, FACE2, UHU, KC_TRNS,
-       KC_TRNS, SMRK1, SMRK2, LOVE, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
+       KC_TRNS, SMRK1, SMRK2, LOVE, VRSN,
+		KC_TRNS, KC_TRNS,
                                                     KC_TRNS,
                                                     KC_TRNS,
                                   KC_TRNS, KC_TRNS, KC_TRNS,
                                   KC_TRNS, KC_TRNS, KC_TRNS,
     // right hand
     // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  UC(0x25a0), UC(0x03bb), UC(0x2192), UC(0x2799), UC(0x25bb), KC_TRNS,
-                 UC(0x263a), UC(0x263b), UC(0x2639), UC(0x2661), UC(0x2665), KC_TRNS,
-       KC_TRNS,  UC(0x2764), KC_TRNS, KC_MPRV, KC_TRNS, KC_TRNS, KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
+       UC(0x2554),  UC(0x2557), UC(0x255a), UC(0x255d), UC(0x2551), UC(0x2550), KC_TRNS,
+       KC_TRNS,  UC(0x25a0), UC(0x03bb), UC(0x2192), UC(0x2799), UC(0x25bb), UC(0x2588),
+                 UC(0x263a), UC(0x263b), UC(0x2639), UC(0x2661), UC(0x2665), UC(0x2591),
+       KC_TRNS,  UC(0x2764), UC(0x2610), UC(0x2611), UC(0x2612), UC(0x2713), UC(0x2584),
+       UC(0x2714), UC(0x2717), UC(0x2718), UC(0x25cf), UC(0x2580),
+		UC(0x2592), UC(0x2593),
+		KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS
 ),
 ),
 };
 };
 
 

+ 5 - 2
keyboards/ergodox/keymaps/deadcyclo/readme.md

@@ -28,6 +28,10 @@ TOG, are dual purpose. Hence for example the top left key produces ESC
 if tapped, and temporarilly toggles L3 when hold down. The two center
 if tapped, and temporarilly toggles L3 when hold down. The two center
 L1 TOG keys toggle L1 on and off for more permanent layer toggling.
 L1 TOG keys toggle L1 on and off for more permanent layer toggling.
 
 
+The UNI keys enter the linux ibus unicode composer mode
+(ie. Ctrl+Shift+u). Use this to enter unicode characters. Hit the key,
+type in the unicode hex value, and hit enter.
+
 ## Layer 1 - Symbols and RGB
 ## Layer 1 - Symbols and RGB
 
 
 [![Layer 1 - Symbols and RGB](images/deadcyclo-layer-1-symbols.png)](http://www.keyboard-layout-editor.com/#/gists/96714e198054c9115bafb5267cc6bc73)
 [![Layer 1 - Symbols and RGB](images/deadcyclo-layer-1-symbols.png)](http://www.keyboard-layout-editor.com/#/gists/96714e198054c9115bafb5267cc6bc73)
@@ -58,12 +62,11 @@ The unicode layer provides keys for directly typing unicode (utf-8)
 - 24.01.2017 Added support for Ergodox Shine. Added secondary L2 switch key on left hand
 - 24.01.2017 Added support for Ergodox Shine. Added secondary L2 switch key on left hand
 - 24.01.2017 Added unicode keys. Added shrug hug and yay. Moved Navigation to layer 2
 - 24.01.2017 Added unicode keys. Added shrug hug and yay. Moved Navigation to layer 2
 - 25.01.2017 Added lots of new emojis and some unicode keys
 - 25.01.2017 Added lots of new emojis and some unicode keys
+- 27.01.2017 Added new unicode keys and shortcut for ibus unicode composer key (CTRL+SHIFT+U)
 
 
 # TODO
 # TODO
 
 
-- Add support for unicode by name? (See algernon layout for example)
 - Add macros for lots of stuff. (Lastpass cli, pushbullet cli, other push service cli, linode cli, more?)
 - Add macros for lots of stuff. (Lastpass cli, pushbullet cli, other push service cli, linode cli, more?)
 - Make macros for gnu screen and i3wm
 - Make macros for gnu screen and i3wm
 - Look into the app launch macros in algernon keymap
 - Look into the app launch macros in algernon keymap
-- Make other smileys like shrug and yay ¯\_(ツ)_/¯ and \o/ and others (see amon others [http://dongerlist.com](http://dongerlist.com)