shagi
/
qmk_firmare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added support for a new layer with window management with win-arrow keys

This commit is contained in:
Sadek Baroudi 2021-03-30 15:56:42 -07:00
parent 77869a7d37
commit c0b3f44128
8 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keyboards/crkbd/keymaps/sadekbaroudi/keymap.c
View File

@ -39,9 +39,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
) \
LAYOUT_wrapper( \
_______, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, LT(_MOUSE, K2A), _______, \
_______, K01, K02, K03, K04, K05, K06, K07, LT(_WINNAV,K08), K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, LT(_MOUSE, K2A), _______, \
KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
)
/* Re-pass though to allow templates to be used */
@ -99,7 +99,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, __________________MOUSE_2__________________, ___________________BLANK___________________, _______,
_______, __________________MOUSE_3__________________, ___________________BLANK___________________, _______,
_______, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN3, KC_MS_BTN2, _______
),
[_WINNAV] = LAYOUT_wrapper(
_______, __________________WIN_NAV_1________________, ___________________BLANK___________________, _______,
_______, __________________WIN_NAV_2________________, ___________________BLANK___________________, _______,
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
_______, _______, _______, _______, _______, _______
)
};

10
keyboards/preonic/keymaps/sadekbaroudi/keymap.c
View File

@ -31,7 +31,7 @@
) \
LAYOUT_ortho_5x12_wrapper( \
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
_______, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, _______, \
_______, K01, K02, K03, K04, K05, K06, K07, LT(_WINNAV,K08), K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, LT(_MOUSE, K2A), _______, \
_______, _______, _______, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______, _______, _______ \
@ -98,6 +98,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, __________________MOUSE_2__________________, ___________________BLANK___________________, _______,
_______, __________________MOUSE_3__________________, ___________________BLANK___________________, _______,
_______, _______, _______, _______, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN3, KC_MS_BTN2, _______, _______, _______, _______
),
[_WINNAV] = LAYOUT_wrapper(
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
_______, __________________WIN_NAV_1________________, ___________________BLANK___________________, _______,
_______, __________________WIN_NAV_2________________, ___________________BLANK___________________, _______,
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______
)
};

13
keyboards/reviung39/keymaps/sadekbaroudi/keymap.c
View File

@ -37,9 +37,9 @@
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
) \
LAYOUT_wrapper( \
_______, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, _______, \
KC_TAB, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), KC_QUOT, \
KC_DEL, K21, K22, K23, K24, K25, K26, K27, K28, K29, LT(_MOUSE, K2A), _______, \
_______, K01, K02, K03, K04, K05, K06, K07, LT(_WINNAV,K08), K09, K0A, _______, \
KC_TAB, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, K16, RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), KC_QUOT, \
KC_DEL, K21, K22, K23, K24, K25, K26, K27, K28, K29, LT(_MOUSE, K2A), _______, \
LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE) \
)
/* Re-pass though to allow templates to be used */
@ -98,6 +98,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, __________________MOUSE_2__________________, ___________________BLANK___________________, _______,
_______, __________________MOUSE_3__________________, ___________________BLANK___________________, _______,
KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2
),
[_WINNAV] = LAYOUT_wrapper(
_______, __________________WIN_NAV_1________________, ___________________BLANK___________________, _______,
_______, __________________WIN_NAV_2________________, ___________________BLANK___________________, _______,
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
_______, _______, _______
)
};

9
users/sadekbaroudi/process_records.h
View File

@ -33,15 +33,6 @@ enum userspace_custom_keycodes {
bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
/*
#define GO_NAVIGATION LT(_NAVIGATION,KC_ENT)
#define GO_SYMBOLS LT(_SYMBOLS,KC_SPACE)
#define GO_FUNCTION LT(_FUNCTION,KC_BSPC)
#define GO_MOUSE MO(_MOUSE)
#define GO_MEDIA MO(_MEDIA)
#define GO_RGB LT(_RGB,KC_QUOT)
*/
#define KC_SEC1 KC_SECRET_1
#define KC_SEC2 KC_SECRET_2
#define KC_SEC3 KC_SECRET_3

3
users/sadekbaroudi/rgb_stuff.c
View File

@ -121,6 +121,9 @@ layer_state_t layer_state_set_rgb_light(layer_state_t state) {
case _MEDIA:
rgblight_set_hsv_and_mode(16, 255, 255, mode); // orange
break;
case _WINNAV:
rgblight_set_hsv_and_mode(HSV_WHITE, mode);
break;
default:
rgblight_set_hsv_and_mode(HSV_SPRINGGREEN, mode);
break;

6
users/sadekbaroudi/sadekbaroudi.c
View File

@ -106,7 +106,6 @@ __attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state)
// on layer change, no matter where the change was initiated
// Then runs keymap's layer change check
layer_state_t layer_state_set_user(layer_state_t state) {
//state = update_tri_layer_state(state, _NAVIGATION, _SYMBOLS, _MEDIA);
#if defined(RGBLIGHT_ENABLE)
state = layer_state_set_rgb_light(state);
#endif // RGBLIGHT_ENABLE
@ -118,11 +117,6 @@ __attribute__((weak)) layer_state_t default_layer_state_set_keymap(layer_state_t
// Runs state check and changes underglow color and animation
layer_state_t default_layer_state_set_user(layer_state_t state) {
state = default_layer_state_set_keymap(state);
#if 0
# if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
state = default_layer_state_set_rgb(state);
# endif // RGBLIGHT_ENABLE
#endif
return state;
}

3
users/sadekbaroudi/sadekbaroudi.h
View File

@ -37,7 +37,8 @@ enum userspace_layers {
_SYMBOLS,
_FUNCTION,
_MEDIA,
_MOUSE
_MOUSE,
_WINNAV
};
void matrix_init_keymap(void);

4
users/sadekbaroudi/wrappers.h
View File

@ -46,9 +46,11 @@ NOTE: These are all the same length. If you do a search/replace
#define _________________META_NAV_1________________ KC_ESC, KC_PGUP, KC_UP, KC_PGDN, _______
#define _________________META_NAV_2________________ KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
#define _________________META_NAV_L1_______________ KC_CAPS, KC_GRV, LCTL(LSFT(KC_TAB)), LCTL(LGUI(KC_LEFT)), _______
#define _________________META_NAV_L1_______________ KC_CAPS, KC_GRV, LCTL(LSFT(KC_TAB)), LCTL(LGUI(KC_LEFT)), _______
#define _________________META_NAV_R1_______________ _______, LCTL(LGUI(KC_RIGHT)), LCTL(KC_TAB), _______, KC_BSLS
#define __________________WIN_NAV_1________________ _______, _______, LGUI(KC_UP), _______, _______
#define __________________WIN_NAV_2________________ _______, LGUI(KC_LEFT), LGUI(KC_DOWN), LGUI(KC_RGHT), _______
#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G