From d4b3fc2aa21d4524bbadcea2e527fb27b619d0a9 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Mon, 18 Aug 2014 14:21:57 +0200
Subject: qwerty control is a mod
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 res/keyboard/layout/common/base    |  1 -
 res/keyboard/layout/common/colemak | 72 +++++++++++++++++++-------------------
 res/keyboard/layout/common/control | 37 --------------------
 res/keyboard/layout/common/dvorak  | 72 +++++++++++++++++++-------------------
 res/keyboard/layout/common/qwerty  | 72 +++++++++++++++++++-------------------
 res/keyboard/mods/qwerty_control   | 37 ++++++++++++++++++++
 6 files changed, 145 insertions(+), 146 deletions(-)
 delete mode 100644 res/keyboard/layout/common/control
 create mode 100644 res/keyboard/mods/qwerty_control

diff --git a/res/keyboard/layout/common/base b/res/keyboard/layout/common/base
index 60f4323..40bca3a 100644
--- a/res/keyboard/layout/common/base
+++ b/res/keyboard/layout/common/base
@@ -1,5 +1,4 @@
 include "control_keys"
 include "keypad"
-include "control"
 include "../../compose/dead"
 
diff --git a/res/keyboard/layout/common/colemak b/res/keyboard/layout/common/colemak
index cf7b420..8025a7d 100644
--- a/res/keyboard/layout/common/colemak
+++ b/res/keyboard/layout/common/colemak
@@ -1,39 +1,39 @@
 include "latin"
 
-<-ctrl keycode 2> : <letter 1>
-<-ctrl keycode 3> : <letter 2>
-<-ctrl keycode 4> : <letter 3>
-<-ctrl keycode 5> : <letter 4>
-<-ctrl keycode 6> : <letter 5>
-<-ctrl keycode 7> : <letter 6>
-<-ctrl keycode 8> : <letter 7>
-<-ctrl keycode 9> : <letter 8>
-<-ctrl keycode 10> : <letter 9>
-<-ctrl keycode 11> : <letter 0>
-<-ctrl keycode 16> : <letter q>
-<-ctrl keycode 17> : <letter w>
-<-ctrl keycode 18> : <letter f>
-<-ctrl keycode 19> : <letter p>
-<-ctrl keycode 20> : <letter g>
-<-ctrl keycode 21> : <letter j>
-<-ctrl keycode 22> : <letter l>
-<-ctrl keycode 23> : <letter u>
-<-ctrl keycode 24> : <letter y>
-<-ctrl keycode 30> : <letter a>
-<-ctrl keycode 31> : <letter r>
-<-ctrl keycode 32> : <letter s>
-<-ctrl keycode 33> : <letter t>
-<-ctrl keycode 34> : <letter d>
-<-ctrl keycode 35> : <letter h>
-<-ctrl keycode 36> : <letter n>
-<-ctrl keycode 37> : <letter e>
-<-ctrl keycode 38> : <letter i>
-<-ctrl keycode 39> : <letter o>
-<-ctrl keycode 44> : <letter z>
-<-ctrl keycode 45> : <letter x>
-<-ctrl keycode 46> : <letter c>
-<-ctrl keycode 47> : <letter v>
-<-ctrl keycode 48> : <letter b>
-<-ctrl keycode 49> : <letter k>
-<-ctrl keycode 50> : <letter m>
+<keycode 2> : <letter 1>
+<keycode 3> : <letter 2>
+<keycode 4> : <letter 3>
+<keycode 5> : <letter 4>
+<keycode 6> : <letter 5>
+<keycode 7> : <letter 6>
+<keycode 8> : <letter 7>
+<keycode 9> : <letter 8>
+<keycode 10> : <letter 9>
+<keycode 11> : <letter 0>
+<keycode 16> : <letter q>
+<keycode 17> : <letter w>
+<keycode 18> : <letter f>
+<keycode 19> : <letter p>
+<keycode 20> : <letter g>
+<keycode 21> : <letter j>
+<keycode 22> : <letter l>
+<keycode 23> : <letter u>
+<keycode 24> : <letter y>
+<keycode 30> : <letter a>
+<keycode 31> : <letter r>
+<keycode 32> : <letter s>
+<keycode 33> : <letter t>
+<keycode 34> : <letter d>
+<keycode 35> : <letter h>
+<keycode 36> : <letter n>
+<keycode 37> : <letter e>
+<keycode 38> : <letter i>
+<keycode 39> : <letter o>
+<keycode 44> : <letter z>
+<keycode 45> : <letter x>
+<keycode 46> : <letter c>
+<keycode 47> : <letter v>
+<keycode 48> : <letter b>
+<keycode 49> : <letter k>
+<keycode 50> : <letter m>
 
diff --git a/res/keyboard/layout/common/control b/res/keyboard/layout/common/control
deleted file mode 100644
index 9c4da58..0000000
--- a/res/keyboard/layout/common/control
+++ /dev/null
@@ -1,37 +0,0 @@
-<ctrl keycode 2> : <letter 1>
-<ctrl keycode 3> : <letter 2>
-<ctrl keycode 4> : <letter 3>
-<ctrl keycode 5> : <letter 4>
-<ctrl keycode 6> : <letter 5>
-<ctrl keycode 7> : <letter 6>
-<ctrl keycode 8> : <letter 7>
-<ctrl keycode 9> : <letter 8>
-<ctrl keycode 10> : <letter 9>
-<ctrl keycode 11> : <letter 0>
-<ctrl keycode 16> : <letter q>
-<ctrl keycode 17> : <letter w>
-<ctrl keycode 18> : <letter e>
-<ctrl keycode 19> : <letter r>
-<ctrl keycode 20> : <letter t>
-<ctrl keycode 21> : <letter y>
-<ctrl keycode 22> : <letter u>
-<ctrl keycode 23> : <letter i>
-<ctrl keycode 24> : <letter o>
-<ctrl keycode 25> : <letter p>
-<ctrl keycode 30> : <letter a>
-<ctrl keycode 31> : <letter s>
-<ctrl keycode 32> : <letter d>
-<ctrl keycode 33> : <letter f>
-<ctrl keycode 34> : <letter g>
-<ctrl keycode 35> : <letter h>
-<ctrl keycode 36> : <letter j>
-<ctrl keycode 37> : <letter k>
-<ctrl keycode 38> : <letter l>
-<ctrl keycode 44> : <letter z>
-<ctrl keycode 45> : <letter x>
-<ctrl keycode 46> : <letter c>
-<ctrl keycode 47> : <letter v>
-<ctrl keycode 48> : <letter b>
-<ctrl keycode 49> : <letter n>
-<ctrl keycode 50> : <letter m>
-
diff --git a/res/keyboard/layout/common/dvorak b/res/keyboard/layout/common/dvorak
index 249ad68..e267701 100644
--- a/res/keyboard/layout/common/dvorak
+++ b/res/keyboard/layout/common/dvorak
@@ -1,39 +1,39 @@
 include "latin"
 
-<-ctrl keycode 2> : <letter 1>
-<-ctrl keycode 3> : <letter 2>
-<-ctrl keycode 4> : <letter 3>
-<-ctrl keycode 5> : <letter 4>
-<-ctrl keycode 6> : <letter 5>
-<-ctrl keycode 7> : <letter 6>
-<-ctrl keycode 8> : <letter 7>
-<-ctrl keycode 9> : <letter 8>
-<-ctrl keycode 10> : <letter 9>
-<-ctrl keycode 11> : <letter 0>
-<-ctrl keycode 19> : <letter p>
-<-ctrl keycode 20> : <letter y>
-<-ctrl keycode 21> : <letter f>
-<-ctrl keycode 22> : <letter g>
-<-ctrl keycode 23> : <letter c>
-<-ctrl keycode 24> : <letter r>
-<-ctrl keycode 25> : <letter l>
-<-ctrl keycode 30> : <letter a>
-<-ctrl keycode 31> : <letter o>
-<-ctrl keycode 32> : <letter e>
-<-ctrl keycode 33> : <letter u>
-<-ctrl keycode 34> : <letter i>
-<-ctrl keycode 35> : <letter d>
-<-ctrl keycode 36> : <letter h>
-<-ctrl keycode 37> : <letter t>
-<-ctrl keycode 38> : <letter n>
-<-ctrl keycode 39> : <letter s>
-<-ctrl keycode 45> : <letter q>
-<-ctrl keycode 46> : <letter j>
-<-ctrl keycode 47> : <letter k>
-<-ctrl keycode 48> : <letter x>
-<-ctrl keycode 49> : <letter b>
-<-ctrl keycode 50> : <letter m>
-<-ctrl keycode 51> : <letter w>
-<-ctrl keycode 52> : <letter v>
-<-ctrl keycode 53> : <letter z>
+<keycode 2> : <letter 1>
+<keycode 3> : <letter 2>
+<keycode 4> : <letter 3>
+<keycode 5> : <letter 4>
+<keycode 6> : <letter 5>
+<keycode 7> : <letter 6>
+<keycode 8> : <letter 7>
+<keycode 9> : <letter 8>
+<keycode 10> : <letter 9>
+<keycode 11> : <letter 0>
+<keycode 19> : <letter p>
+<keycode 20> : <letter y>
+<keycode 21> : <letter f>
+<keycode 22> : <letter g>
+<keycode 23> : <letter c>
+<keycode 24> : <letter r>
+<keycode 25> : <letter l>
+<keycode 30> : <letter a>
+<keycode 31> : <letter o>
+<keycode 32> : <letter e>
+<keycode 33> : <letter u>
+<keycode 34> : <letter i>
+<keycode 35> : <letter d>
+<keycode 36> : <letter h>
+<keycode 37> : <letter t>
+<keycode 38> : <letter n>
+<keycode 39> : <letter s>
+<keycode 45> : <letter q>
+<keycode 46> : <letter j>
+<keycode 47> : <letter k>
+<keycode 48> : <letter x>
+<keycode 49> : <letter b>
+<keycode 50> : <letter m>
+<keycode 51> : <letter w>
+<keycode 52> : <letter v>
+<keycode 53> : <letter z>
 
diff --git a/res/keyboard/layout/common/qwerty b/res/keyboard/layout/common/qwerty
index c144294..993ff10 100644
--- a/res/keyboard/layout/common/qwerty
+++ b/res/keyboard/layout/common/qwerty
@@ -1,39 +1,39 @@
 include "latin"
 
-<-ctrl keycode 2> : <letter 1>
-<-ctrl keycode 3> : <letter 2>
-<-ctrl keycode 4> : <letter 3>
-<-ctrl keycode 5> : <letter 4>
-<-ctrl keycode 6> : <letter 5>
-<-ctrl keycode 7> : <letter 6>
-<-ctrl keycode 8> : <letter 7>
-<-ctrl keycode 9> : <letter 8>
-<-ctrl keycode 10> : <letter 9>
-<-ctrl keycode 11> : <letter 0>
-<-ctrl keycode 16> : <letter q>
-<-ctrl keycode 17> : <letter w>
-<-ctrl keycode 18> : <letter e>
-<-ctrl keycode 19> : <letter r>
-<-ctrl keycode 20> : <letter t>
-<-ctrl keycode 21> : <letter y>
-<-ctrl keycode 22> : <letter u>
-<-ctrl keycode 23> : <letter i>
-<-ctrl keycode 24> : <letter o>
-<-ctrl keycode 25> : <letter p>
-<-ctrl keycode 30> : <letter a>
-<-ctrl keycode 31> : <letter s>
-<-ctrl keycode 32> : <letter d>
-<-ctrl keycode 33> : <letter f>
-<-ctrl keycode 34> : <letter g>
-<-ctrl keycode 35> : <letter h>
-<-ctrl keycode 36> : <letter j>
-<-ctrl keycode 37> : <letter k>
-<-ctrl keycode 38> : <letter l>
-<-ctrl keycode 44> : <letter z>
-<-ctrl keycode 45> : <letter x>
-<-ctrl keycode 46> : <letter c>
-<-ctrl keycode 47> : <letter v>
-<-ctrl keycode 48> : <letter b>
-<-ctrl keycode 49> : <letter n>
-<-ctrl keycode 50> : <letter m>
+<keycode 2> : <letter 1>
+<keycode 3> : <letter 2>
+<keycode 4> : <letter 3>
+<keycode 5> : <letter 4>
+<keycode 6> : <letter 5>
+<keycode 7> : <letter 6>
+<keycode 8> : <letter 7>
+<keycode 9> : <letter 8>
+<keycode 10> : <letter 9>
+<keycode 11> : <letter 0>
+<keycode 16> : <letter q>
+<keycode 17> : <letter w>
+<keycode 18> : <letter e>
+<keycode 19> : <letter r>
+<keycode 20> : <letter t>
+<keycode 21> : <letter y>
+<keycode 22> : <letter u>
+<keycode 23> : <letter i>
+<keycode 24> : <letter o>
+<keycode 25> : <letter p>
+<keycode 30> : <letter a>
+<keycode 31> : <letter s>
+<keycode 32> : <letter d>
+<keycode 33> : <letter f>
+<keycode 34> : <letter g>
+<keycode 35> : <letter h>
+<keycode 36> : <letter j>
+<keycode 37> : <letter k>
+<keycode 38> : <letter l>
+<keycode 44> : <letter z>
+<keycode 45> : <letter x>
+<keycode 46> : <letter c>
+<keycode 47> : <letter v>
+<keycode 48> : <letter b>
+<keycode 49> : <letter n>
+<keycode 50> : <letter m>
 
diff --git a/res/keyboard/mods/qwerty_control b/res/keyboard/mods/qwerty_control
new file mode 100644
index 0000000..9c4da58
--- /dev/null
+++ b/res/keyboard/mods/qwerty_control
@@ -0,0 +1,37 @@
+<ctrl keycode 2> : <letter 1>
+<ctrl keycode 3> : <letter 2>
+<ctrl keycode 4> : <letter 3>
+<ctrl keycode 5> : <letter 4>
+<ctrl keycode 6> : <letter 5>
+<ctrl keycode 7> : <letter 6>
+<ctrl keycode 8> : <letter 7>
+<ctrl keycode 9> : <letter 8>
+<ctrl keycode 10> : <letter 9>
+<ctrl keycode 11> : <letter 0>
+<ctrl keycode 16> : <letter q>
+<ctrl keycode 17> : <letter w>
+<ctrl keycode 18> : <letter e>
+<ctrl keycode 19> : <letter r>
+<ctrl keycode 20> : <letter t>
+<ctrl keycode 21> : <letter y>
+<ctrl keycode 22> : <letter u>
+<ctrl keycode 23> : <letter i>
+<ctrl keycode 24> : <letter o>
+<ctrl keycode 25> : <letter p>
+<ctrl keycode 30> : <letter a>
+<ctrl keycode 31> : <letter s>
+<ctrl keycode 32> : <letter d>
+<ctrl keycode 33> : <letter f>
+<ctrl keycode 34> : <letter g>
+<ctrl keycode 35> : <letter h>
+<ctrl keycode 36> : <letter j>
+<ctrl keycode 37> : <letter k>
+<ctrl keycode 38> : <letter l>
+<ctrl keycode 44> : <letter z>
+<ctrl keycode 45> : <letter x>
+<ctrl keycode 46> : <letter c>
+<ctrl keycode 47> : <letter v>
+<ctrl keycode 48> : <letter b>
+<ctrl keycode 49> : <letter n>
+<ctrl keycode 50> : <letter m>
+
-- 
cgit v1.2.3-70-g09d2