summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-11 14:39:06 +0900
committertmk <nobody@nowhere>2013-03-11 14:39:06 +0900
commit1d5bbb55f28eb2e9eff0543753b8cb85f3b94282 (patch)
tree534a649228ca71c394a29ec38c4452804620c297 /common
parentfe2230cf60efdc5dafb85356e54b8b87cd52c3a3 (diff)
Fix legacy keymap support
- need to define USE_LEGACY_KEYMAP to use legacy keymap
Diffstat (limited to 'common')
-rw-r--r--common/keymap.c86
-rw-r--r--common/keymap.h21
2 files changed, 61 insertions, 46 deletions
diff --git a/common/keymap.c b/common/keymap.c
index aa8d944a79..ace3f49b69 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static action_t keycode_to_action(uint8_t keycode);
-#ifdef USE_KEYMAP_V2
+
/* converts key to action */
action_t action_for_key(uint8_t layer, key_t key)
{
@@ -38,42 +38,20 @@ action_t action_for_key(uint8_t layer, key_t key)
return keycode_to_action(keycode);
}
}
-#else
-/*
- * legacy keymap support
- */
-/* translation for legacy keymap */
-action_t action_for_key(uint8_t layer, key_t key)
-{
- /* convert from legacy keycode to action */
- /* layer 16-31 indicate 'overlay' but not supported in legacy keymap */
- uint8_t keycode = keymap_get_keycode((layer & OVERLAY_MASK), key.row, key.col);
- action_t action;
- switch (keycode) {
- case KC_FN0 ... KC_FN31:
- {
- uint8_t layer = keymap_fn_layer(FN_INDEX(keycode));
- uint8_t key = keymap_fn_keycode(FN_INDEX(keycode));
- if (key) {
- action.code = ACTION_KEYMAP_TAP_KEY(layer, key);
- } else {
- action.code = ACTION_KEYMAP_MOMENTARY(layer);
- }
- }
- return action;
- default:
- return keycode_to_action(keycode);
- }
-}
-#endif
+/* Macro */
__attribute__ ((weak))
-const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }
+const prog_macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+ return MACRO_NONE;
+}
+/* Function */
__attribute__ ((weak))
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}
-
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+}
@@ -83,14 +61,9 @@ static action_t keycode_to_action(uint8_t keycode)
action_t action;
switch (keycode) {
case KC_A ... KC_EXSEL:
+ case KC_LCTRL ... KC_RGUI:
action.code = ACTION_KEY(keycode);
break;
- case KC_LCTRL ... KC_LGUI:
- action.code = ACTION_LMOD(keycode);
- break;
- case KC_RCTRL ... KC_RGUI:
- action.code = ACTION_RMOD(keycode);
- break;
case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode));
break;
@@ -109,3 +82,40 @@ static action_t keycode_to_action(uint8_t keycode)
}
return action;
}
+
+
+
+#ifdef USE_LEGACY_KEYMAP
+/*
+ * Legacy keymap support
+ * Consider using new keymap API instead.
+ */
+__attribute__ ((weak))
+uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+{
+ return keymap_get_keycode(layer, key.row, key.col);
+}
+
+
+/* Legacy keymap support */
+__attribute__ ((weak))
+action_t keymap_fn_to_action(uint8_t keycode)
+{
+ action_t action = { .code = ACTION_NO };
+ switch (keycode) {
+ case KC_FN0 ... KC_FN31:
+ {
+ uint8_t layer = keymap_fn_layer(FN_INDEX(keycode));
+ uint8_t key = keymap_fn_keycode(FN_INDEX(keycode));
+ if (key) {
+ action.code = ACTION_KEYMAP_TAP_KEY(layer, key);
+ } else {
+ action.code = ACTION_KEYMAP_MOMENTARY(layer);
+ }
+ }
+ return action;
+ default:
+ return action;
+ }
+}
+#endif
diff --git a/common/keymap.h b/common/keymap.h
index 0c483483fb..7efd91f704 100644
--- a/common/keymap.h
+++ b/common/keymap.h
@@ -23,24 +23,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action.h"
-#ifdef USE_KEYMAP_V2
-/* translates key to keycode
- * layer: 0-15 for base layers
- * 16-31 for overlays
- */
+/* translates key to keycode */
uint8_t keymap_key_to_keycode(uint8_t layer, key_t key);
+
/* translates Fn keycode to action */
action_t keymap_fn_to_action(uint8_t keycode);
-#else
-#warning "You are using LEGACY KEYAMP. Consider using NEW KEYMAP."
+
+
+
+#ifdef USE_LEGACY_KEYMAP
/*
- * legacy keymap support
+ * Legacy keymap
+ * Consider using new keymap API above instead.
*/
/* keycode of key */
+__attribute__ ((deprecated))
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col);
+
/* layer to move during press Fn key */
+__attribute__ ((deprecated))
uint8_t keymap_fn_layer(uint8_t fn_bits);
+
/* keycode to send when release Fn key without using */
+__attribute__ ((deprecated))
uint8_t keymap_fn_keycode(uint8_t fn_bits);
#endif