From 6baec0fffdc1e48d228dfc0a73b98a4ecf6d4caf Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 9 Apr 2019 08:57:19 -0700 Subject: Remove Userspace folders --- users/edvorakjp/edvorakjp.c | 32 ----------- users/edvorakjp/edvorakjp.h | 70 ----------------------- users/edvorakjp/edvorakjp_process_record.c | 89 ------------------------------ users/edvorakjp/edvorakjp_status.c | 64 --------------------- users/edvorakjp/edvorakjp_tap_dance.c | 73 ------------------------ users/edvorakjp/readme.md | 67 ---------------------- users/edvorakjp/rules.mk | 7 --- 7 files changed, 402 deletions(-) delete mode 100644 users/edvorakjp/edvorakjp.c delete mode 100644 users/edvorakjp/edvorakjp.h delete mode 100644 users/edvorakjp/edvorakjp_process_record.c delete mode 100644 users/edvorakjp/edvorakjp_status.c delete mode 100644 users/edvorakjp/edvorakjp_tap_dance.c delete mode 100644 users/edvorakjp/readme.md delete mode 100644 users/edvorakjp/rules.mk (limited to 'users/edvorakjp') diff --git a/users/edvorakjp/edvorakjp.c b/users/edvorakjp/edvorakjp.c deleted file mode 100644 index 892ce4be3b..0000000000 --- a/users/edvorakjp/edvorakjp.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "edvorakjp.h" - -void matrix_init_user(void) { - edvorakjp_status_init(); - matrix_init_keymap(); -} - -__attribute__ ((weak)) -void matrix_init_keymap() {} - -uint32_t layer_state_set_user(uint32_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - return layer_state_set_keymap(state); -} - -__attribute__ ((weak)) -uint32_t layer_state_set_keymap(uint32_t state) { - return state; -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return process_record_keymap(keycode, record) &&\ - process_record_edvorakjp_swap_scln(keycode, record) &&\ - process_record_edvorakjp_config(keycode, record) &&\ - process_record_layer(keycode, record) &&\ - process_record_ime(keycode, record); -} - -__attribute__ ((weak)) -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} diff --git a/users/edvorakjp/edvorakjp.h b/users/edvorakjp/edvorakjp.h deleted file mode 100644 index 688cdeffb3..0000000000 --- a/users/edvorakjp/edvorakjp.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef EDVORAKJP -#define EDVORAKJP - -#include "quantum.h" -#include "action_layer.h" - -#define EECONFIG_EDVORAK (uint8_t *)20 - -extern keymap_config_t keymap_config; - -enum edvorakjp_layers { - _EDVORAK = 0, - _LOWER, - _RAISE, - _ADJUST, - _EXTRA, -}; - -enum edvorakjp_keycodes { - EDVORAK = SAFE_RANGE, - LOWER, - RAISE, - KC_MAC, - KC_WIN, - KC_JPN, - KC_ENG, - NEW_SAFE_RANGE -}; - -#define KC_LC(k) LCTL_T(KC_##k) -#define KC_LS(k) LSFT_T(KC_##k) -#define KC_LA(k) LALT_T(KC_##k) -#define KC_LG(k) LGUI_T(KC_##k) -#define KC_RC(k) RCTL_T(KC_##k) -#define KC_RS(k) RSFT_T(KC_##k) -#define KC_RG(k) RGUI_T(KC_##k) -#define KC_RA(k) RALT_T(KC_##k) - -enum tap_dance_code { - TD_LOWER = 0, - TD_RAISE -}; - -// base -void dvorakj_layer_off(void); -void matrix_init_user(void); -void matrix_init_keymap(void); -uint32_t layer_state_set_user(uint32_t state); -uint32_t layer_state_set_keymap(uint32_t state); -bool process_record_user(uint16_t keycode, keyrecord_t *record); -bool process_record_keymap(uint16_t keycode, keyrecord_t *record); - -// status -void edvorakjp_status_init(void); -bool get_enable_kc_lang(void); -void set_enable_kc_lang(bool new_state); -bool get_japanese_mode(void); -void set_japanese_mode(bool new_state); - -/* - * Each process_record_* methods defined here are - * return false if processed, or return true if not processed. - * You can add your original macros in process_record_keymap() in keymap.c. - */ -bool process_record_edvorakjp_swap_scln(uint16_t keycode, keyrecord_t *record); -bool process_record_edvorakjp_config(uint16_t keycode, keyrecord_t *record); -bool process_record_layer(uint16_t keycode, keyrecord_t *record); -bool process_record_ime(uint16_t keycode, keyrecord_t *record); - -#endif // EDVORAKJP diff --git a/users/edvorakjp/edvorakjp_process_record.c b/users/edvorakjp/edvorakjp_process_record.c deleted file mode 100644 index ecc8db9363..0000000000 --- a/users/edvorakjp/edvorakjp_process_record.c +++ /dev/null @@ -1,89 +0,0 @@ -#include "edvorakjp.h" - -#if TAP_DANCE_ENABLE != yes -static uint16_t time_on_pressed; -#endif -/* - * Each process_record_* methods defined here are - * return false if handle edvorak_keycodes, or return true others. - */ -bool process_record_edvorakjp_swap_scln(uint16_t keycode, keyrecord_t *record) { -#ifdef SWAP_SCLN - static const uint8_t shift_bits = MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT); - static uint8_t last_mods_status; - if (keycode == KC_SCLN) { - if (record->event.pressed) { - last_mods_status = get_mods(); - - // invert shift_bits - if (last_mods_status & shift_bits) { - set_mods(last_mods_status & ~shift_bits); - } else { - set_mods(last_mods_status | MOD_BIT(KC_LSFT)); - } - } else { - set_mods(last_mods_status); - last_mods_status = 0; - } - } -#endif - return true; -} - -bool process_record_edvorakjp_config(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_MAC: - case KC_WIN: - if (record->event.pressed) { - set_enable_kc_lang(keycode == KC_MAC); - } - return false; - } - return true; -} - -bool process_record_layer(uint16_t keycode, keyrecord_t *record) { -#if TAP_DANCE_ENABLE != yes - switch (keycode) { - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - time_on_pressed = record->event.time; - } else { - layer_off(_LOWER); - - if (TIMER_DIFF_16(record->event.time, time_on_pressed) < TAPPING_TERM) { - set_japanese_mode(false); - } - time_on_pressed = 0; - } - return false; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - time_on_pressed = record->event.time; - } else { - layer_off(_RAISE); - - if (TIMER_DIFF_16(record->event.time, time_on_pressed) < TAPPING_TERM) { - set_japanese_mode(true); - } - time_on_pressed = 0; - } - return false; - } -#endif - return true; -} - -bool process_record_ime(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case KC_JPN: - case KC_ENG: - if (record->event.pressed) { - set_japanese_mode(keycode == KC_JPN); - } - return false; - } - return true; -} diff --git a/users/edvorakjp/edvorakjp_status.c b/users/edvorakjp/edvorakjp_status.c deleted file mode 100644 index 128fc3bd28..0000000000 --- a/users/edvorakjp/edvorakjp_status.c +++ /dev/null @@ -1,64 +0,0 @@ -#include "eeprom.h" -#include "edvorakjp.h" - -typedef union { - uint8_t raw; - struct { - bool enable_kc_lang; // for macOS - }; -} edvorakjp_config_t; -static edvorakjp_config_t edvorakjp_config; - -typedef struct { - bool japanese_mode; -} edvorakjp_state_t; -static edvorakjp_state_t edvorakjp_state; - -/* - * private methods - */ -uint8_t eeconfig_read_edvorakjp(void) { - return eeprom_read_byte(EECONFIG_EDVORAK); -} - -void eeconfig_update_edvorakjp(uint8_t val) { - eeprom_update_byte(EECONFIG_EDVORAK, val); -} - -/* - * public methods - */ -void edvorakjp_status_init(void) { - edvorakjp_state.japanese_mode = false; - edvorakjp_config.raw = eeconfig_read_edvorakjp(); -} - -bool get_enable_kc_lang(void) { - return edvorakjp_config.enable_kc_lang; -} - -void set_enable_kc_lang(bool new_state) { - edvorakjp_config.enable_kc_lang = new_state; - eeconfig_update_edvorakjp(edvorakjp_config.raw); -} - -bool get_japanese_mode(void) { - return edvorakjp_state.japanese_mode; -} - -void set_japanese_mode(bool new_state) { - edvorakjp_state.japanese_mode = new_state; - if (edvorakjp_state.japanese_mode) { - if (edvorakjp_config.enable_kc_lang) { - SEND_STRING(SS_TAP(X_LANG1)); - } else { - SEND_STRING(SS_LALT("`")); - } - } else { - if (edvorakjp_config.enable_kc_lang) { - SEND_STRING(SS_TAP(X_LANG2)); - } else { - SEND_STRING(SS_LALT("`")); - } - } -} diff --git a/users/edvorakjp/edvorakjp_tap_dance.c b/users/edvorakjp/edvorakjp_tap_dance.c deleted file mode 100644 index d5369f9266..0000000000 --- a/users/edvorakjp/edvorakjp_tap_dance.c +++ /dev/null @@ -1,73 +0,0 @@ -#include "edvorakjp.h" -#include "process_keycode/process_tap_dance.h" - -enum tap_state { - NONE = 0, - SINGLE_TAP = 1, - DOUBLE_TAP = 2, - HOLD -}; - -typedef struct { - uint8_t lower; - uint8_t raise; -} td_status_t; -static td_status_t td_status = {NONE, NONE}; - -int cur_dance(qk_tap_dance_state_t *state) { - if (state->interrupted || !state->pressed) { - return state->count == 1 ? SINGLE_TAP : DOUBLE_TAP; - } else { - return HOLD; - } -} - -void td_lower_finished(qk_tap_dance_state_t *state, void *user_data) { - td_status.lower = cur_dance(state); - switch(td_status.lower) { - case SINGLE_TAP: - set_japanese_mode(false); - break; - case DOUBLE_TAP: - set_japanese_mode(false); - register_code(KC_ESC); - break; - case HOLD: - break; - } - layer_on(_LOWER); -} - -void td_lower_reset(qk_tap_dance_state_t *state, void *user_data) { - if (td_status.lower == DOUBLE_TAP) { - unregister_code(KC_ESC); - } - layer_off(_LOWER); - td_status.lower = NONE; -} - -void td_raise_finished(qk_tap_dance_state_t *state, void *user_data) { - td_status.raise = cur_dance(state); - switch(td_status.raise) { - case DOUBLE_TAP: - // same as single - case SINGLE_TAP: - set_japanese_mode(true); - break; - case HOLD: - break; - } - layer_on(_RAISE); -} - -void td_raise_reset(qk_tap_dance_state_t *state, void *user_data) { - layer_off(_RAISE); - td_status.raise = NONE; -} - -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_LOWER] = - ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_lower_finished, td_lower_reset, 100), - [TD_RAISE] = - ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_raise_finished, td_raise_reset, 100) -}; diff --git a/users/edvorakjp/readme.md b/users/edvorakjp/readme.md deleted file mode 100644 index 679d84b3de..0000000000 --- a/users/edvorakjp/readme.md +++ /dev/null @@ -1,67 +0,0 @@ -# edvorakjp - -epaew's Enhanced Dvorak layout for Japanese Programmer - -## Layout overview -This is a sample. You can swap any symbol keys and modifier keys. - -- Basic layout (for ansi) -``` - //+----+----+----+----+----+----+----+----+----+----+----+----+----+---------+ - ` , ! , @ , # , $ , % , ^ , & , * , ( , ) , [ , ] , BSPC , - //+----+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+-------+ - TAB , ' , , , . , Y , Q , F , G , R , W , P , / , = , \ , - //+------++---++---++---++---++---++---++---++---++---++---++---++---+-------+ - CAPS , A , O , E , I , U , D , T , N , S , M , - , ENT , - //+-------+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-----------+ - LSFT , : , X , C , V , Z , H , J , K , L , B , RSFT , - //+------+--+---++----++---+----+----+----+----+-+--+---++----++------+------+ - LCTL , LGUI , LALT , SPACE , RALT , RGUI , MENU , RCTL - //+------+------+------+-------------------------+------+------+------+------+ -``` - - And you can see [my iris keyboard layout](../../keyboards/iris/keymaps/edvorakjp/keymap.c) for sample implementation, too. - -## for Japanese - -- 日本語入力用のキーを追加 - - IME 切り替えキー - - 長押しでレイヤー切り替え、短押しでIME切り替え - - macOS(かな/英数)、Windows(Alt+\`)の両方に対応 -- Define some custom keys for typing Japanese - - IME switching - - act as LOWER/RAISE when hold, act as IME switching when tapped - - for macOS(かな/英数), for Windows(Alt+\`) - -## for Programmer - -- Dvorak 配列をベースに、ショートカットでよく利用される XCV は QWERTY 配列の位置を維持 -- 一部にVimユーザ用のキー配置を実施 - - HJKL キーを横並びで配置 - - Shift押下時と非押下時で、";"キーの挙動を入れ替え - （`config.h` 内で `#define SWAP_SCLN` の宣言が必要です） -- デフォルトレイヤーには、数字キーの代わりに記号 `!@#$%^&*()` を配置 - -- mainly based on Dvorak layout, but XCV is available in the same position of QWERTY layout -- for Vim users - - HJKL is lining side by side - - swap the ";" key behavior. i.e. send ":" normally and send ";" when you hold shift. - (need `#define SWAP_SCLN` in your `config.h`) -- we can type `!@#$%^&*()` keys without shift keys in base layer - -## License - -Copyright 2018 Ryo Maeda epaew.333@gmail.com @epaew - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . diff --git a/users/edvorakjp/rules.mk b/users/edvorakjp/rules.mk deleted file mode 100644 index 587c3b8d2e..0000000000 --- a/users/edvorakjp/rules.mk +++ /dev/null @@ -1,7 +0,0 @@ -SRC += edvorakjp.c \ - edvorakjp_process_record.c \ - edvorakjp_status.c - -ifeq ($(TAP_DANCE_ENABLE), yes) -SRC += edvorakjp_tap_dance.c -endif -- cgit v1.2.3