Commit 1d36a710 authored by Andreas Skyman's avatar Andreas Skyman Committed by ROOL
Browse files

Added Colemak (UK) keyboard layout

Detail:
  Added a new layout.ColemakUK
  Updated makefiles, and Source files with new target and dependency
  Added DrawFile describing the layout
Admin:
  Tested on IOMDHAL under RPCEmu and BCM2835 on Pi 3B and 1.

Version 1.00. Tagged as 'IntKey-1_00'
parent 7fd3c105
......@@ -37,7 +37,8 @@ NCCFLAGS = -I${APCSExportDir}/Lib -c -DUNIX
LAYOUTS = UK.s Italy.s Spain.s France.s Germany.s Esperanto.s Greece.s \
Swed-Finl.s Denmark.s Norway.s Iceland.s Turkey.s Russia.s \
Israel.s LatinAm.s Belgium.s Netherlands.s Japan.s \
Switzerland.s Wales.s USA.s DvorakUK.s DvorakUSA.s
Switzerland.s Wales.s USA.s DvorakUK.s DvorakUSA.s ColemakUK.s \
Pandora.s
${ROM_OBJECT}: ${LAYOUTS}
${LAYOUTS}: keygen
......
File added
......@@ -52,7 +52,7 @@ LAYOUTS = UK.s Italy.s Spain.s France.s Germany.s Esperanto.s Greece.s \
Swed-Finl.s Denmark.s Norway.s Iceland.s Turkey.s Russia.s \
Israel.s LatinAm.s Belgium.s Netherlands.s Japan.s \
Switzerland.s Wales.s USA.s Korea.s Korea2.s Taiwan.s \
DvorakUK.s DvorakUSA.s Pandora.s
DvorakUK.s DvorakUSA.s ColemakUK.s Pandora.s
${ROM_OBJECT}: ${LAYOUTS}
${LAYOUTS}: keygen
......
......@@ -135,6 +135,7 @@ Country_ISO9 * 88
Country_DvorakUK * 70
Country_DvorakUSA * 71
Country_ColemakUK * 72
MACRO
IKT $A, $B, $C, $D, $E, $F, $G, $H
......@@ -380,7 +381,7 @@ A1Key_Die Entry
ServiceTable
ASSERT Service_Reset < Service_International
ASSERT Service_International < Service_KeyHandler
ASSERT Service_International < Service_KeyHandler
DCD 0 ; flags
DCD Service2 - Module_BaseAddr
DCD Service_Reset
......@@ -495,7 +496,7 @@ SetUpKeyStructureAndHandlerIfUs Entry "r0,r1"
BEQ %FT07
MOV r1, r0
MOV r0, #13
SWI XOS_ReadSysInfo
SWI XOS_ReadSysInfo
BVS %FT50
MOV r0, r1
07
......@@ -782,6 +783,7 @@ IDDTable
& 9944, Country_DvorakUK
& 991, Country_DvorakUSA
& 19244, Country_ColemakUK ; 192 is &C0
& 1001, Country_ISO1
& 1002, Country_ISO2
......@@ -1230,7 +1232,7 @@ FindFN ROUT
ADD R3, R0, R8
TST R1, #KeyHandler_Flag_Wide
BNE FindFNWide
LDRB R8, [R3], #1 ; R8 = number of FN entries
TEQ R8, #0
BEQ NoFN
......
......@@ -53,6 +53,7 @@ GetOther SETS "GET Swed-Finl.s"
GET Taiwan.s
GET DvorakUK.s
GET DvorakUSA.s
GET ColemakUK.s
GET Pandora.s
]
END
......@@ -45,6 +45,7 @@ KeyStructureTable_PC
GetStruct Taiwan, PC, 54
GetStruct DvorakUK, PC, 70
GetStruct DvorakUSA, PC, 71
GetStruct ColemakUK, PC, 72
DCD -1,KeyStructPC1-KeyStructureTable_PC
......
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.99"
Module_Version SETA 99
Module_MajorVersion SETS "1.00"
Module_Version SETA 100
Module_MinorVersion SETS ""
Module_Date SETS "21 Jan 2018"
Module_ApplicationDate SETS "21-Jan-18"
Module_Date SETS "06 Feb 2021"
Module_ApplicationDate SETS "06-Feb-21"
Module_ComponentName SETS "IntKey"
Module_ComponentPath SETS "castle/RiscOS/Sources/Internat/IntKey"
Module_FullVersion SETS "0.99"
Module_HelpVersion SETS "0.99 (21 Jan 2018)"
Module_FullVersion SETS "1.00"
Module_HelpVersion SETS "1.00 (06 Feb 2021)"
END
/* (0.99)
/* (1.00)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.99
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Jan 2018
#define Module_MajorVersion_CMHG 1.00
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 Feb 2021
#define Module_MajorVersion "0.99"
#define Module_Version 99
#define Module_MajorVersion "1.00"
#define Module_Version 100
#define Module_MinorVersion ""
#define Module_Date "21 Jan 2018"
#define Module_Date "06 Feb 2021"
#define Module_ApplicationDate "21-Jan-18"
#define Module_ApplicationDate "06-Feb-21"
#define Module_ComponentName "IntKey"
#define Module_ComponentPath "castle/RiscOS/Sources/Internat/IntKey"
#define Module_FullVersion "0.99"
#define Module_HelpVersion "0.99 (21 Jan 2018)"
#define Module_LibraryVersionInfo "0:99"
#define Module_FullVersion "1.00"
#define Module_HelpVersion "1.00 (06 Feb 2021)"
#define Module_LibraryVersionInfo "1:0"
# Layout originally converted by keyconvert
#
# Default alphabet: Latin1
# Extra key 1D not fitted
# Extra key 4D fitted
# Extra key 6E not fitted
# Enter key in UK position
#
# 1D tweaked to match 4D
$Country 72
$Layer 0
%Include inc.Invariant
10
GRAVE ACCENT
NOT SIGN
-
-
VERTICAL LINE
BROKEN BAR
-
-
11
DIGIT ONE
EXCLAMATION MARK
FUNCTION KEY CTRL-A
FUNCTION KEY CTRL-A
INVERTED EXCLAMATION MARK
SUPERSCRIPT ONE
-
-
12
DIGIT TWO
QUOTATION MARK
FUNCTION KEY CTRL-B
FUNCTION KEY CTRL-B
SUPERSCRIPT TWO
DOUBLE LOW-9 QUOTATION MARK
-
-
13
DIGIT THREE
POUND SIGN
FUNCTION KEY CTRL-C
FUNCTION KEY CTRL-C
SUPERSCRIPT THREE
CURRENCY SIGN
-
-
14
DIGIT FOUR
DOLLAR SIGN
FUNCTION KEY CTRL-D
FUNCTION KEY CTRL-D
EURO SIGN
PER MILLE SIGN
-
-
15
DIGIT FIVE
PERCENT SIGN
FUNCTION KEY CTRL-E
FUNCTION KEY CTRL-E
EURO SIGN
YEN SIGN
-
-
16
DIGIT SIX
CIRCUMFLEX ACCENT
FUNCTION KEY CTRL-^
FUNCTION KEY CTRL-^
{LATIN SMALL LETTER H WITH STROKE
}LATIN CAPITAL LETTER H WITH STROKE
-
-
17
DIGIT SEVEN
AMPERSAND
FUNCTION KEY CTRL-G
FUNCTION KEY CTRL-G
{LATIN SMALL LETTER ETH
}LATIN CAPITAL LETTER ETH
-
-
18
DIGIT EIGHT
ASTERISK
FUNCTION KEY CTRL-H
FUNCTION KEY CTRL-H
{LATIN SMALL LETTER THORN
}LATIN CAPITAL LETTER THORN
-
-
19
DIGIT NINE
LEFT PARENTHESIS
FUNCTION KEY CTRL-I
FUNCTION KEY CTRL-I
LEFT SINGLE QUOTATION MARK
LEFT DOUBLE QUOTATION MARK
-
-
1A
DIGIT ZERO
RIGHT PARENTHESIS
FUNCTION KEY CTRL-@
FUNCTION KEY CTRL-@
RIGHT SINGLE QUOTATION MARK
RIGHT DOUBLE QUOTATION MARK
-
-
1B
HYPHEN-MINUS
LOW LINE
FUNCTION KEY CTRL-_
FUNCTION KEY CTRL-_
EN DASH
EM DASH
-
-
1C
EQUALS SIGN
PLUS SIGN
-
-
MULTIPLICATION SIGN
DIVISION SIGN
-
-
1D
REVERSE SOLIDUS
VERTICAL LINE
FUNCTION KEY CTRL-\
FUNCTION KEY CTRL-\
MIDDLE DOT
-
-
-
27
[LATIN SMALL LETTER Q
]LATIN CAPITAL LETTER Q
FUNCTION KEY CTRL-Q
FUNCTION KEY CTRL-Q
{LATIN SMALL LETTER A WITH DIAERESIS
}LATIN CAPITAL LETTER A WITH DIAERESIS
-
-
28
[LATIN SMALL LETTER W
]LATIN CAPITAL LETTER W
FUNCTION KEY CTRL-W
FUNCTION KEY CTRL-W
{LATIN SMALL LETTER A WITH RING ABOVE
}LATIN CAPITAL LETTER A WITH RING ABOVE
-
-
29
[LATIN SMALL LETTER F
]LATIN CAPITAL LETTER F
FUNCTION KEY CTRL-F
FUNCTION KEY CTRL-F
{LATIN SMALL LETTER A WITH TILDE
}LATIN CAPITAL LETTER A WITH TILDE
-
-
2A
[LATIN SMALL LETTER P
]LATIN CAPITAL LETTER P
FUNCTION KEY CTRL-P
FUNCTION KEY CTRL-P
{LATIN SMALL LETTER O WITH STROKE
}LATIN CAPITAL LETTER O WITH STROKE
-
-
2B
[LATIN SMALL LETTER G
]LATIN CAPITAL LETTER G
FUNCTION KEY CTRL-G
FUNCTION KEY CTRL-G
DEAD KEY OGONEK
DEAD KEY TILDE
-
-
2C
[LATIN SMALL LETTER J
]LATIN CAPITAL LETTER J
FUNCTION KEY CTRL-J
FUNCTION KEY CTRL-J
{LATIN SMALL LETTER D WITH STROKE
}LATIN CAPITAL LETTER D WITH STROKE
-
-
2D
[LATIN SMALL LETTER L
]LATIN CAPITAL LETTER L
FUNCTION KEY CTRL-L
FUNCTION KEY CTRL-L
{LATIN SMALL LETTER L WITH STROKE
}LATIN CAPITAL LETTER L WITH STROKE
-
-
2E
[LATIN SMALL LETTER U
]LATIN CAPITAL LETTER U
FUNCTION KEY CTRL-U
FUNCTION KEY CTRL-U
{LATIN SMALL LETTER U WITH ACUTE
}LATIN CAPITAL LETTER U WITH ACUTE
-
-
2F
[LATIN SMALL LETTER Y
]LATIN CAPITAL LETTER Y
FUNCTION KEY CTRL-Y
FUNCTION KEY CTRL-Y
{LATIN SMALL LETTER U WITH DIAERESIS
}LATIN CAPITAL LETTER U WITH DIAERESIS
-
-
30
SEMICOLON
COLON
-
-
{LATIN SMALL LETTER O WITH DIAERESIS
}LATIN CAPITAL LETTER O WITH DIAERESIS
-
-
31
LEFT SQUARE BRACKET
LEFT CURLY BRACKET
FUNCTION KEY CTRL-[
FUNCTION KEY CTRL-[
LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-
-
32
RIGHT SQUARE BRACKET
RIGHT CURLY BRACKET
FUNCTION KEY CTRL-]
FUNCTION KEY CTRL-]
RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-
-
33
NUMBER SIGN
TILDE
-
-
DEAD KEY GRAVE ACCENT
DEAD KEY BREVE
-
-
3C
[LATIN SMALL LETTER A
]LATIN CAPITAL LETTER A
FUNCTION KEY CTRL-A
FUNCTION KEY CTRL-A
{LATIN SMALL LETTER A WITH ACUTE
}LATIN CAPITAL LETTER A WITH ACUTE
-
-
3D
[LATIN SMALL LETTER R
]LATIN CAPITAL LETTER R
FUNCTION KEY CTRL-R
FUNCTION KEY CTRL-R
DEAD KEY GRAVE ACCENT
REGISTERED SIGN
-
-
3E
[LATIN SMALL LETTER S
]LATIN CAPITAL LETTER S
FUNCTION KEY CTRL-S
FUNCTION KEY CTRL-S
LATIN SMALL LETTER SHARP S
SECTION SIGN
-
-
3F
[LATIN SMALL LETTER T
]LATIN CAPITAL LETTER T
FUNCTION KEY CTRL-T
FUNCTION KEY CTRL-T
DEAD KEY ACUTE ACCENT
-
-
-
40
[LATIN SMALL LETTER D
]LATIN CAPITAL LETTER D
FUNCTION KEY CTRL-D
FUNCTION KEY CTRL-D
DEAD KEY DIAERESIS
HORIZONTAL ELLIPSIS
-
-
41
[LATIN SMALL LETTER H
]LATIN CAPITAL LETTER H
FUNCTION KEY CTRL-H
FUNCTION KEY CTRL-H
DEAD KEY CARON
TILDE
-
-
42
[LATIN SMALL LETTER N
]LATIN CAPITAL LETTER N
FUNCTION KEY CTRL-N
FUNCTION KEY CTRL-N
{LATIN SMALL LETTER N WITH TILDE
}LATIN CAPITAL LETTER N WITH TILDE
-
-
43
[LATIN SMALL LETTER E
]LATIN CAPITAL LETTER E
FUNCTION KEY CTRL-E
FUNCTION KEY CTRL-E
{LATIN SMALL LETTER E WITH ACUTE
}LATIN CAPITAL LETTER E WITH ACUTE
-
-
44
[LATIN SMALL LETTER I
]LATIN CAPITAL LETTER I
FUNCTION KEY CTRL-I
FUNCTION KEY CTRL-I
{LATIN SMALL LETTER I WITH ACUTE
}LATIN CAPITAL LETTER I WITH ACUTE
-
-
45
[LATIN SMALL LETTER O
]LATIN CAPITAL LETTER O
FUNCTION KEY CTRL-O
FUNCTION KEY CTRL-O
{LATIN SMALL LETTER O WITH ACUTE
}LATIN CAPITAL LETTER O WITH ACUTE
-
-
46
APOSTROPHE
COMMERCIAL AT
FUNCTION KEY CTRL-@
FUNCTION KEY CTRL-@
DEAD KEY CIRCUMFLEX ACCENT
DEAD KEY CARON
-
-
4D
REVERSE SOLIDUS
VERTICAL LINE
FUNCTION KEY CTRL-\
FUNCTION KEY CTRL-\
MIDDLE DOT
BROKEN BAR
-
-
4E
[LATIN SMALL LETTER Z
]LATIN CAPITAL LETTER Z
FUNCTION KEY CTRL-Z
FUNCTION KEY CTRL-Z
{LATIN SMALL LETTER AE
}LATIN CAPITAL LETTER AE
-
-
4F
[LATIN SMALL LETTER X
]LATIN CAPITAL LETTER X
FUNCTION KEY CTRL-X
FUNCTION KEY CTRL-X
DEAD KEY CIRCUMFLEX ACCENT
DEAD KEY CARON
-
-
50
[LATIN SMALL LETTER C
]LATIN CAPITAL LETTER C
FUNCTION KEY CTRL-C
FUNCTION KEY CTRL-C
{LATIN SMALL LETTER C WITH CEDILLA
}LATIN CAPITAL LETTER C WITH CEDILLA
-
-
51
[LATIN SMALL LETTER V
]LATIN CAPITAL LETTER V
FUNCTION KEY CTRL-V
FUNCTION KEY CTRL-V
{LATIN SMALL LIGATURE OE
}LATIN CAPITAL LIGATURE OE
-
-
52
[LATIN SMALL LETTER B
]LATIN CAPITAL LETTER B
FUNCTION KEY CTRL-B
FUNCTION KEY CTRL-B
DEAD KEY BREVE
TILDE
-
-
53
[LATIN SMALL LETTER K
]LATIN CAPITAL LETTER K
FUNCTION KEY CTRL-K
FUNCTION KEY CTRL-K
DEAD KEY RING ABOVE
DEGREE SIGN
-
-
54
[LATIN SMALL LETTER M
]LATIN CAPITAL LETTER M
FUNCTION KEY CTRL-M
FUNCTION KEY CTRL-M
DEAD KEY MACRON
MICRO SIGN
-
-
55
COMMA
LESS-THAN SIGN
-
-
DEAD KEY CEDILLA
DEAD KEY TILDE
-
-
56
FULL STOP
GREATER-THAN SIGN
-
-
DEAD KEY DOT ABOVE
HORIZONTAL ELLIPSIS
-
-
57
SOLIDUS
QUESTION MARK
-
-
INVERTED QUESTION MARK
TILDE
-
-
5F
SPACE
SPACE
SPACE
SPACE
NO-BREAK SPACE
NO-BREAK SPACE
-
-
# Remap Caps Lock to Backspace
5D
FUNCTION KEY BACKSPACE
FUNCTION KEY DELETE
-
-
SPECIAL KEY CAPS LOCK
SPECIAL KEY SHIFT-CAPS LOCK
-
-
%Include @ExtraKeys@
$EndLayer
%Include @FNKey@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment