From dba7e57eaff6567d4b9d3968711435f9aa42e89f Mon Sep 17 00:00:00 2001
From: Roman Moravcik <roman.moravcik@gmail.com>
Date: Thu, 25 Mar 2010 09:24:52 +0100
Subject: [PATCH] Reorganized numbers and symbols tabs, removed space key and
 added capslock and backspace keys in Czech and Russian on-screen keyboard
 layouts.

---
 keyboards/cz-qwerty.def   | 140 +++++++++++++++++++++++-----------------------
 keyboards/cz-qwertz.def   | 140 +++++++++++++++++++++++-----------------------
 keyboards/ru-phonetic.def | 124 ++++++++++++++++++++--------------------
 keyboards/ru-windows.def  | 132 ++++++++++++++++++++++---------------------
 4 files changed, 274 insertions(+), 262 deletions(-)

diff --git a/keyboards/cz-qwerty.def b/keyboards/cz-qwerty.def
index 4f1e1ee..86f6f0a 100644
--- a/keyboards/cz-qwerty.def
+++ b/keyboards/cz-qwerty.def
@@ -11,8 +11,6 @@ size	1	{ width 50 height 35 textpos 26 left 0 top 0 }
 size	2	{ width 55 height 35 textpos 26 left 0 top 0 }
 size	3	{ width 72 height 55 textpos 41 left 0 top 0 }
 size	4	{ width 143 height 55 textpos 41 left 0 top 0 }
-size	5	{ width 24 height 35 textpos 26 left 0 top 0 }
-size	6	{ width 188 height 55 textpos 26 left 0 top 0 }
 }
 
 kbd_normal {
@@ -21,7 +19,7 @@ lowercase {
 	default_size 0
 	row {
 	key q alpha size 2
-	key w alpha tele
+	key w alpha
 	key e alpha hexa
 	key r alpha
 	key t alpha
@@ -54,10 +52,10 @@ lowercase {
 	key b alpha hexa
 	key n alpha
 	key m alpha
-	key , special tele
-	key . special tele
-	key / special tele
-	key ? special tele size 1
+	key , special
+	key . special
+	key / special
+	key ? special size 1
 	}
 }
 lowercase_num {
@@ -89,7 +87,7 @@ uppercase {
 	default_size 0
 	row {
 	key Q alpha size 2
-	key W alpha tele
+	key W alpha
 	key E alpha hexa
 	key R alpha
 	key T alpha
@@ -147,7 +145,7 @@ uppercase_num {
 	key 9 num hexa tele
 	}
 	row {
-	key ° special
+	key ° alpha dead
 	key 0 num hexa tele
 	key % special
 	}
@@ -186,6 +184,7 @@ lowercase {
 	key ˇ alpha special dead
 	}
 	row {
+	capslock
 	key z alpha
 	key x alpha
 	key c alpha hexa
@@ -193,8 +192,9 @@ lowercase {
 	key b alpha hexa
 	key n alpha
 	key m alpha
-	white size 6
-	slide special { key . key , key ? key ! key - key _ key & key | key \ key / key < key > }
+	key ? special
+	key . special
+	backspace
 	}
 }
 uppercase {
@@ -228,6 +228,7 @@ uppercase {
 	key ˇ alpha special dead
 	}
 	row {
+	capslock
 	key Z alpha
 	key X alpha
 	key C alpha hexa
@@ -235,52 +236,53 @@ uppercase {
 	key B alpha hexa
 	key N alpha
 	key M alpha
-	white size 6
-	slide special { key . key , key ? key ! key - key _ key & key | key \ key / key < key > }
+	key ! special
+	key , special
+	backspace
 	}
 }
 special {
-	name "1!+"
+	name "1#+"
 	margin 0 0 0 0
 	default_size 3
 	row {
 	key 1 num hexa tele
 	key 2 num hexa tele
 	key 3 num hexa tele
-	key " special
-	key + tele special
-	key - special
-	key = special
-	key _ special
-	key & special
-	key @ special
-	key ~ special
-	}
-	row {
 	key 4 num hexa tele
 	key 5 num hexa tele
 	key 6 num hexa tele
-	key ' special
-	key : special
-	key ; special
-	key ! special
-	key ( special
-	key ) special
-	key / special
-	key \ special
-	}
-	row {
 	key 7 num hexa tele
 	key 8 num hexa tele
 	key 9 num hexa tele
 	key 0 num hexa tele
-	key . special
-	key , special
-	key ? special
-	key £ special
+	key = special
+	}
+	row {
+	key + special tele
+	key - special num
+	key _ special
+	key # special tele
+	key * special tele
+	key % special
 	key € special
-	key < special
-	key > special
+	key £ special
+	key $ special
+	key ¥ special
+	key ¤ special
+	}
+	row {
+	capslock
+	key , special
+	key . special
+	key @ special
+	key / special
+	key \ special
+	key ~ alpha special dead
+	key ^ alpha special dead
+	key ( special
+	key ) special
+	backspace
 	}
 }
 special {
@@ -288,43 +290,43 @@ special {
 	margin 0 0 0 0
 	default_size 3
 	row {
-	key # tele special
-	key % special
-	key ¤ special
-	key $ special
-	key ¥ special
-	key ^ special
-	key | special
-	key [ special
-	key ] special
-	key { special
-	key } special
+	key ´ alpha special dead
+	key ` alpha special dead
+	key ¨ alpha special dead
+	key ^ alpha special dead
+	key ~ alpha special dead
+	key ' special
+	key " special
+	key „ special
+	key “ special
+	key ° special
+	key & special
 	}
 	row {
-	key ¡ special
-	key ¿ special
-	key § special
-	key * tele special
-	key ¨ special
-	key ° special
-	key · special
 	key ± special
+	key § special
 	key ½ special
+	key ¹ special
+	key ² special
+	key ³ special
+	key < special
+	key > special
 	key « special
 	key » special
+	key | special
 	}
 	row {
-	key ¢ special
-	key ß alpha
-	key ç special
-	key ´ special
-	key ` special
-	key “ special
-	key ” special
-	key ‘ special
-	key ’ special
-	key ™ special
-	key © special
+	capslock
+	key ; special
+	key : special
+	key [ special
+	key ] special
+	key { special
+	key } special
+	key ç alpha
+	key ¡ special
+	key ¿ special
+	backspace
 	}
 }
 }
diff --git a/keyboards/cz-qwertz.def b/keyboards/cz-qwertz.def
index b0c0287..ebb3bac 100644
--- a/keyboards/cz-qwertz.def
+++ b/keyboards/cz-qwertz.def
@@ -11,8 +11,6 @@ size	1	{ width 50 height 35 textpos 26 left 0 top 0 }
 size	2	{ width 55 height 35 textpos 26 left 0 top 0 }
 size	3	{ width 72 height 55 textpos 41 left 0 top 0 }
 size	4	{ width 143 height 55 textpos 41 left 0 top 0 }
-size	5	{ width 24 height 35 textpos 26 left 0 top 0 }
-size	6	{ width 188 height 55 textpos 26 left 0 top 0 }
 }
 
 kbd_normal {
@@ -21,7 +19,7 @@ lowercase {
 	default_size 0
 	row {
 	key q alpha size 2
-	key w alpha tele
+	key w alpha
 	key e alpha hexa
 	key r alpha
 	key t alpha
@@ -54,10 +52,10 @@ lowercase {
 	key b alpha hexa
 	key n alpha
 	key m alpha
-	key , special tele
-	key . special tele
-	key / special tele
-	key ? special tele size 1
+	key , special
+	key . special
+	key / special
+	key ? special size 1
 	}
 }
 lowercase_num {
@@ -89,7 +87,7 @@ uppercase {
 	default_size 0
 	row {
 	key Q alpha size 2
-	key W alpha tele
+	key W alpha
 	key E alpha hexa
 	key R alpha
 	key T alpha
@@ -147,7 +145,7 @@ uppercase_num {
 	key 9 num hexa tele
 	}
 	row {
-	key ° special
+	key ° alpha dead
 	key 0 num hexa tele
 	key % special
 	}
@@ -186,6 +184,7 @@ lowercase {
 	key ˇ alpha special dead
 	}
 	row {
+	capslock
 	key y alpha
 	key x alpha
 	key c alpha hexa
@@ -193,8 +192,9 @@ lowercase {
 	key b alpha hexa
 	key n alpha
 	key m alpha
-	white size 6
-	slide special { key . key , key ? key ! key - key _ key & key | key \ key / key < key > }
+	key ? special
+	key . special
+	backspace
 	}
 }
 uppercase {
@@ -228,6 +228,7 @@ uppercase {
 	key ˇ alpha special dead
 	}
 	row {
+	capslock
 	key Y alpha
 	key X alpha
 	key C alpha hexa
@@ -235,52 +236,53 @@ uppercase {
 	key B alpha hexa
 	key N alpha
 	key M alpha
-	white size 6
-	slide special { key . key , key ? key ! key - key _ key & key | key \ key / key < key > }
+	key ! special
+	key , special
+	backspace
 	}
 }
 special {
-	name "1!+"
+	name "1#+"
 	margin 0 0 0 0
 	default_size 3
 	row {
 	key 1 num hexa tele
 	key 2 num hexa tele
 	key 3 num hexa tele
-	key " special
-	key + tele special
-	key - special
-	key = special
-	key _ special
-	key & special
-	key @ special
-	key ~ special
-	}
-	row {
 	key 4 num hexa tele
 	key 5 num hexa tele
 	key 6 num hexa tele
-	key ' special
-	key : special
-	key ; special
-	key ! special
-	key ( special
-	key ) special
-	key / special
-	key \ special
-	}
-	row {
 	key 7 num hexa tele
 	key 8 num hexa tele
 	key 9 num hexa tele
 	key 0 num hexa tele
-	key . special
-	key , special
-	key ? special
-	key £ special
+	key = special
+	}
+	row {
+	key + special tele
+	key - special num
+	key _ special
+	key # special tele
+	key * special tele
+	key % special
 	key € special
-	key < special
-	key > special
+	key £ special
+	key $ special
+	key ¥ special
+	key ¤ special
+	}
+	row {
+	capslock
+	key , special
+	key . special
+	key @ special
+	key / special
+	key \ special
+	key ~ alpha special dead
+	key ^ alpha special dead
+	key ( special
+	key ) special
+	backspace
 	}
 }
 special {
@@ -288,43 +290,43 @@ special {
 	margin 0 0 0 0
 	default_size 3
 	row {
-	key # tele special
-	key % special
-	key ¤ special
-	key $ special
-	key ¥ special
-	key ^ special
-	key | special
-	key [ special
-	key ] special
-	key { special
-	key } special
+	key ´ alpha special dead
+	key ` alpha special dead
+	key ¨ alpha special dead
+	key ^ alpha special dead
+	key ~ alpha special dead
+	key ' special
+	key " special
+	key „ special
+	key “ special
+	key ° special
+	key & special
 	}
 	row {
-	key ¡ special
-	key ¿ special
-	key § special
-	key * tele special
-	key ¨ special
-	key ° special
-	key · special
 	key ± special
+	key § special
 	key ½ special
+	key ¹ special
+	key ² special
+	key ³ special
+	key < special
+	key > special
 	key « special
 	key » special
+	key | special
 	}
 	row {
-	key ¢ special
-	key ß alpha
-	key ç special
-	key ´ special
-	key ` special
-	key “ special
-	key ” special
-	key ‘ special
-	key ’ special
-	key ™ special
-	key © special
+	capslock
+	key ; special
+	key : special
+	key [ special
+	key ] special
+	key { special
+	key } special
+	key ç alpha
+	key ¡ special
+	key ¿ special
+	backspace
 	}
 }
 }
diff --git a/keyboards/ru-phonetic.def b/keyboards/ru-phonetic.def
index 681201a..ba82a6b 100644
--- a/keyboards/ru-phonetic.def
+++ b/keyboards/ru-phonetic.def
@@ -181,9 +181,10 @@ lowercase {
 	key к alpha
 	key л alpha
 	key щ alpha
-	key ю alpha
+	key э alpha
 	}
 	row {
+	capslock
 	key з alpha
 	key ь alpha
 	key ц alpha
@@ -191,8 +192,9 @@ lowercase {
 	key б alpha
 	key н alpha
 	key м alpha
-	white size 4
+	key ю alpha
 	slide special size 3 { key . key , key - key ! key ? key & key ; key : key _ key @ }
+	backspace
 	}
 }
 uppercase {
@@ -223,9 +225,10 @@ uppercase {
 	key К alpha
 	key Л alpha
 	key Щ alpha
-	key Ю alpha
+	key Э alpha
 	}
 	row {
+	capslock
 	key З alpha
 	key Ь alpha
 	key Ц alpha
@@ -233,96 +236,97 @@ uppercase {
 	key Б alpha
 	key Н alpha
 	key М alpha
-	white size 4
+	key Ю alpha
 	slide special size 3 { key . key , key - key ! key ? key & key ; key : key _ key @ }
+	backspace
 	}
 }
 special {
-	name "1+ё"
+	name "1#+"
 	margin 0 0 0 0
 	default_size 3
 	row {
 	key 1 num hexa tele
 	key 2 num hexa tele
 	key 3 num hexa tele
-	key ? special
-	key Ф alpha
-	key ф alpha
-	key Ґ alpha
-	key ґ alpha
-	key І alpha
-	key і alpha
-	key € special
-	}
-	row {
 	key 4 num hexa tele
 	key 5 num hexa tele
 	key 6 num hexa tele
-	key + special tele
-	key Э alpha
-	key э alpha
-	key Є alpha
-	key є alpha
-	key Ї alpha
-	key ї alpha
-	key £ special
-	}
-	row {
 	key 7 num hexa tele
 	key 8 num hexa tele
 	key 9 num hexa tele
 	key 0 num hexa tele
-	key Ё alpha
+	key = special
+	}
+	row {
+	key + special tele
+	key - special num
+	key * special tele
+	key / special
+	key % special
+	key ( special
+	key ) special
+	key ? special
+	key ; special
+	key : special
+	key " special
+	}
+	row {
+	capslock
 	key ё alpha
-	key Ъ alpha
+	key ґ alpha
+	key і alpha
+	key ї alpha
+	key є alpha
 	key ъ alpha
-	key ў alpha
-	key $ special
-	key ¥ special
+	key ! special
+	key , special
+	key . special
+	backspace
 	}
 }
 special {
-	name "*!@"
+	name "1+ё"
 	margin 0 0 0 0
 	default_size 3
 	row {
+	key $ special
+	key € special
+	key £ special
+	key ¥ special
+	key № alpha
+	key § special
 	key # special tele
-	key % special
-	key Nº special
-	key < special
-	key > special
-	key ^ special
-	key | special
-	key [ special
-	key ] special
-	key { special
-	key } special
-	}
-	row {
-	key = special
-	key ! special
 	key & special
-	key @ special
-	key ~ special
-	key * special tele
-	key ± special
-	key ( special
-	key ) special
-	key / special
+	key © special
+	key ў special
 	key \ special
 	}
 	row {
+	key ^ special
 	key _ special
-	key ´ special
-	key ` special
-	key “ special
-	key ” special
-	key ‘ special
-	key ’ special
+	key | special
+	key < special
+	key > special
+	key { special
+	key } special
+	key ~ alpha special dead
 	key « special
 	key » special
-	key ™ special
-	key © special
+	key ' special
+	}
+	row {
+	capslock
+	key Ё alpha
+	key Ґ alpha
+	key І alpha
+	key Ї alpha
+	key Є alpha
+	key Ъ alpha
+	key ` special
+	key [ special
+	key ] special
+	backspace
 	}
 }
 }
diff --git a/keyboards/ru-windows.def b/keyboards/ru-windows.def
index e941756..45a4f11 100644
--- a/keyboards/ru-windows.def
+++ b/keyboards/ru-windows.def
@@ -171,6 +171,7 @@ lowercase {
 	key х alpha
 	}
 	row {
+	key ф alpha
 	key ы alpha
 	key в alpha
 	key а alpha
@@ -180,10 +181,10 @@ lowercase {
 	key л alpha
 	key д alpha
 	key ж alpha
-	key б alpha
-	key ю alpha
+	key э alpha
 	}
 	row {
+	capslock
 	key я alpha
 	key ч alpha
 	key с alpha
@@ -191,8 +192,9 @@ lowercase {
 	key и alpha
 	key т alpha
 	key ь alpha
-	white size 4
-	slide special size 3 { key . key , key - key ! key ? key & key ; key : key _ key @ }
+	key б alpha
+	key ю alpha
+	backspace
 	}
 }
 uppercase {
@@ -213,6 +215,7 @@ uppercase {
 	key Х alpha
 	}
 	row {
+	key Ф alpha
 	key Ы alpha
 	key В alpha
 	key А alpha
@@ -222,10 +225,10 @@ uppercase {
 	key Л alpha
 	key Д alpha
 	key Ж alpha
-	key Б alpha
-	key Ю alpha
+	key Э alpha
 	}
 	row {
+	capslock
 	key Я alpha
 	key Ч alpha
 	key С alpha
@@ -233,96 +236,97 @@ uppercase {
 	key И alpha
 	key Т alpha
 	key Ь alpha
-	white size 4
-	slide special size 3 { key . key , key - key ! key ? key & key ; key : key _ key @ }
+	key Б alpha
+	key Ю alpha
+	backspace
 	}
 }
 special {
-	name "1+ё"
+	name "1#+"
 	margin 0 0 0 0
 	default_size 3
 	row {
 	key 1 num hexa tele
 	key 2 num hexa tele
 	key 3 num hexa tele
-	key ? special
-	key Ф alpha
-	key ф alpha
-	key Ґ alpha
-	key ґ alpha
-	key І alpha
-	key і alpha
-	key € special
-	}
-	row {
 	key 4 num hexa tele
 	key 5 num hexa tele
 	key 6 num hexa tele
-	key + special tele
-	key Э alpha
-	key э alpha
-	key Є alpha
-	key є alpha
-	key Ї alpha
-	key ї alpha
-	key £ special
-	}
-	row {
 	key 7 num hexa tele
 	key 8 num hexa tele
 	key 9 num hexa tele
 	key 0 num hexa tele
-	key Ё alpha
+	key = special
+	}
+	row {
+	key + special tele
+	key - special num
+	key * special tele
+	key / special
+	key % special
+	key ( special
+	key ) special
+	key ? special
+	key ; special
+	key : special
+	key " special
+	}
+	row {
+	capslock
 	key ё alpha
-	key Ъ alpha
+	key ґ alpha
+	key і alpha
+	key ї alpha
+	key є alpha
 	key ъ alpha
-	key ў alpha
-	key $ special
-	key ¥ special
+	key ! special
+	key , special
+	key . special
+	backspace
 	}
 }
 special {
-	name "*!@"
+	name "1+ё"
 	margin 0 0 0 0
 	default_size 3
 	row {
+	key $ special
+	key € special
+	key £ special
+	key ¥ special
+	key № alpha
+	key § special
 	key # special tele
-	key % special
-	key Nº special
-	key < special
-	key > special
-	key ^ special
-	key | special
-	key [ special
-	key ] special
-	key { special
-	key } special
-	}
-	row {
-	key = special
-	key ! special
 	key & special
-	key @ special
-	key ~ special
-	key * special tele
-	key ± special
-	key ( special
-	key ) special
-	key / special
+	key © special
+	key ў special
 	key \ special
 	}
 	row {
+	key ^ special
 	key _ special
-	key ´ special
-	key ` special
-	key “ special
-	key ” special
-	key ‘ special
-	key ’ special
+	key | special
+	key < special
+	key > special
+	key { special
+	key } special
+	key ~ alpha special dead
 	key « special
 	key » special
-	key ™ special
-	key © special
+	key ' special
+	}
+	row {
+	capslock
+	key Ё alpha
+	key Ґ alpha
+	key І alpha
+	key Ї alpha
+	key Є alpha
+	key Ъ alpha
+	key ` special
+	key [ special
+	key ] special
+	backspace
 	}
 }
 }
-- 
2.11.4.GIT