more refactor

master
Stefan Dorn 2016-02-04 09:38:07 +00:00
parent e19ca08263
commit c695c37c40
2 changed files with 12 additions and 27 deletions

View File

@ -52,6 +52,7 @@ void kbfun_toggle(void) {
* active
*/
void kbfun_transparent(void) {
// TODO maybe re-implement this cleaner?
main_arg_trans_key_pressed = true;
main_arg_layer_offset++;
main_arg_layer = main_layers_peek(main_arg_layer_offset);

View File

@ -108,15 +108,7 @@ int main(void) {
// ----------------------------------------------------------------------------
/* ----------------------------------------------------------------------------
* Layer Functions
* ----------------------------------------------------------------------------
* We keep track of which layer is foremost by placing it on a stack. Layers
* may appear in the stack more than once. The base layer will always be
* layer-0.
*
* Implemented as a fixed size stack.
* ------------------------------------------------------------------------- */
// layer functions
// new array version
@ -188,6 +180,16 @@ void main_layers_disable(uint8_t layer) {
}
}
// return layer offset elements below the top
uint8_t main_layers_peek(uint8_t offset) {
// TODO remove this
if (offset <= layers_head) {
return layers_stack[layers_head - offset].layer;
}
return 0; // default, or error
}
// execute the keypress or keyrelease function (if it exists) of the key at the current possition
void main_exec_key(void) {
void (*key_function)(void) =
@ -216,24 +218,6 @@ void main_exec_key(void) {
// TODO remove all this
/*
* peek()
*
* Arguments
* - 'offset': the offset (down the stack) from the head element
*
* Returns
* - success: the layer-number of the requested element (which may be 0)
* - failure: 0 (default) (out of bounds)
*/
uint8_t main_layers_peek(uint8_t offset) {
if (offset <= layers_head) {
return layers_stack[layers_head - offset].layer;
}
return 0; // default, or error
}
/*
* push()
*