From 3296f72a8d441c57cef6110f556782e15d5d7085 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Mon, 12 Sep 2016 17:22:51 -0400
Subject: [PATCH] Switched the laptop layout over to the new format.

---
 config/keyboard/desktop.conf |  3 +--
 config/keyboard/laptop.conf  | 51 ++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf
index 3f1753cb..9c23f5b3 100644
--- a/config/keyboard/desktop.conf
+++ b/config/keyboard/desktop.conf
@@ -1,5 +1,4 @@
-KEY_LEFTCTRL=shut_up
-KEY_RIGHTCTRL=shut_up
+KEY_CTRL=shut_up
 KEY_FENRIR,KEY_KP7=review_top
 KEY_KP8=curr_line
 KEY_KP7=prev_line
diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index f8ffdd51..4e578c6d 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -1,33 +1,32 @@
-#1-KEY_LEFTCTRL=shut_up
-1-KEY_RIGHTCTRL=shut_up
-#=review_top
-1-KEY_I=curr_line
-1-KEY_U=prev_line
-1-KEY_O=next_line
-1-KEY_K=curr_word
-1-KEY_J=prev_word
-1-KEY_L=next_word
-#=curr_word_phonetic
-1-KEY_COMMA=curr_char
-1-KEY_m=prev_char
-1-KEY_DOT=next_char
-#=curr_char_phonetic
-1-KEY_SLASH=exit_review
+-KEY_CTRL=shut_up
+KEY_FENRIR,KEY_SHIFT,KEY_U=review_top
+KEY_FENRIR,KEY_I=curr_line
+KEY_FENRIR,KEY_U=prev_line
+KEY_FENRIR,KEY_O=next_line
+KEY_FENRIR,KEY_K=curr_word
+KEY_FENRIR,KEY_J=prev_word
+KEY_FENRIR,KEY_L=next_word
+2,KEY_FENRIR,KEY_K=curr_word_phonetic
+KEY_FENRIR,KEY_COMMA=curr_char
+KEY_FENRIR,KEY_m=prev_char
+KEY_FENRIR,KEY_DOT=next_char
+2,KEY_FENRIR,KEY_COMMA=curr_char_phonetic
+KEY_FENRIR,KEY_SLASH=exit_review
 #=cursor_position
 #=curr_screen
 #=curr_screen_before_cursor
 #=curr_screen_after_cursor
 #=indent_curr_line
 #=last_incomming
-1-KEY_CAPSLOCK,1-KEY_F2=toggle_braille
-1-KEY_CAPSLOCK,1-KEY_F3=toggle_sound
-1-KEY_CAPSLOCK,1-KEY_F4=toggle_speech
+KEY_FENRIR,KEY_F2=toggle_braille
+KEY_FENRIR,KEY_F3=toggle_sound
+KEY_FENRIR,KEY_F4=toggle_speech
 #=toggle_auto_spell_check
 #=toggle_output
 #=toggle_auto_read
-#=quit_fenrir
-#=time
-#=date
+KEY_FENRIR,KEY_Q=quit_fenrir
+KEY_FENRIR,KEY_T=time
+2,KEY_FENRIR,KEY_T=date
 #=spell_check
 #=add_word_to_spell_check
 #=remove_word_from_spell_check
@@ -40,15 +39,15 @@
 #=dec_speech_pitch
 #=inc_sound_volume
 #=dec_sound_volume
-#=clear_clipboard
-#=remove_marks
+KEY_FENRIR,KEY_SHIFT,KEY_C=clear_clipboard
+KEY_FENRIR,KEY_SHIFT,KEY_X=remove_marks
 #=first_clipboard
 #=last_clipboard
 #=prev_clipboard
 #=next_clipboard
 #=curr_clipboard
-#=set_mark
+KEY_FENRIR,KEY_X=set_mark
 #=marked_text
-#=copy_marked_to_clipboard
+KEY_FENRIR,KEY_C=copy_marked_to_clipboard
 # linux only
-#=linux_paste_clipboard
+KEY_FENRIR,KEY_V=linux_paste_clipboard