summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Devin Acker <d@revenant1.net>2025-09-14 09:37:44 -0400
committer GitHub <noreply@github.com>2025-09-14 23:37:44 +1000
commitfd516c5f058cb65543772553b06d2b483b6c19b4 (patch)
tree6601b076a8b2a9a13fe3234f58e89286750b39b4
parent14e0c4eac5f61548e1d6fac8b05ecceca1f4f29a (diff)
Updated element order for various Casio and Yamaha keyboard layouts. (#14166)
This fixes hit testing after priority was changed to match visual stack (see GitHub #14113).
-rw-r--r--src/mame/layout/ap10.lay212
-rw-r--r--src/mame/layout/ct8000.lay128
-rw-r--r--src/mame/layout/ctk530.lay156
-rw-r--r--src/mame/layout/cz1.lay152
-rw-r--r--src/mame/layout/cz101.lay128
-rw-r--r--src/mame/layout/cz230s.lay128
-rw-r--r--src/mame/layout/psr110.lay128
-rw-r--r--src/mame/layout/psr150.lay152
-rw-r--r--src/mame/layout/psr180.lay152
-rw-r--r--src/mame/layout/psr75.lay128
-rw-r--r--src/mame/layout/psr76.lay128
-rw-r--r--src/mame/layout/pss11.lay92
-rw-r--r--src/mame/layout/pss12.lay94
-rw-r--r--src/mame/layout/pss21.lay104
-rw-r--r--src/mame/layout/pss31.lay128
-rw-r--r--src/mame/layout/pss6.lay94
16 files changed, 809 insertions, 1295 deletions
diff --git a/src/mame/layout/ap10.lay b/src/mame/layout/ap10.lay
index 63611491d45..2cf5e325089 100644
--- a/src/mame/layout/ap10.lay
+++ b/src/mame/layout/ap10.lay
@@ -61,42 +61,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-a0" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="66" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="66" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -165,110 +129,110 @@ license:CC0-1.0
<element ref="keyfill"><bounds x="72" y="98" width="4284" height="524" /></element>
<!-- octave 0 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x02"><bounds x="151" y="108" width="44" height="324" /></element>
- <element ref="whitekey-a0" inputtag="maincpu:kbd:FI0" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI0" inputmask="0x04"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x04"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x02"><bounds x="151" y="108" width="44" height="324" /></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x10"><bounds x="294" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x40"><bounds x="397" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x02"><bounds x="537" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x08"><bounds x="631" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x20"><bounds x="725" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI0" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI0" inputmask="0x20"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI0" inputmask="0x80"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI1" inputmask="0x01"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI1" inputmask="0x04"><bounds x="574" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI1" inputmask="0x10"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI1" inputmask="0x40"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x20"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x80"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x01"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x04"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x10"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x40"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x10"><bounds x="294" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x40"><bounds x="397" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x02"><bounds x="537" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x08"><bounds x="631" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x20"><bounds x="725" y="108" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x01"><bounds x="868" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x04"><bounds x="971" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x20"><bounds x="1111" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x80"><bounds x="1205" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x02"><bounds x="1299" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI1" inputmask="0x80"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI2" inputmask="0x02"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI2" inputmask="0x08"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI2" inputmask="0x10"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI2" inputmask="0x40"><bounds x="1148" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI3" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI3" inputmask="0x04"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x80"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x02"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x08"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x10"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x40"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x04"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x01"><bounds x="868" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x04"><bounds x="971" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x20"><bounds x="1111" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x80"><bounds x="1205" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x02"><bounds x="1299" y="108" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x10"><bounds x="1442" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x40"><bounds x="1545" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x02"><bounds x="1685" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x08"><bounds x="1779" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x20"><bounds x="1873" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI3" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI3" inputmask="0x20"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI3" inputmask="0x80"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI4" inputmask="0x01"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI4" inputmask="0x04"><bounds x="1722" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI4" inputmask="0x10"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI4" inputmask="0x40"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x20"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x80"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x01"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x04"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x10"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x40"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x10"><bounds x="1442" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x40"><bounds x="1545" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x02"><bounds x="1685" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x08"><bounds x="1779" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x20"><bounds x="1873" y="108" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x01"><bounds x="2016" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x04"><bounds x="2119" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x20"><bounds x="2259" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x80"><bounds x="2353" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x02"><bounds x="2447" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI4" inputmask="0x80"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI5" inputmask="0x02"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI5" inputmask="0x08"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI5" inputmask="0x10"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI5" inputmask="0x40"><bounds x="2296" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI6" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI6" inputmask="0x04"><bounds x="2460" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x80"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x02"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x08"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x10"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x40"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x04"><bounds x="2460" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x01"><bounds x="2016" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x04"><bounds x="2119" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x20"><bounds x="2259" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x80"><bounds x="2353" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x02"><bounds x="2447" y="108" width="44" height="324" /></element>
<!-- octave 5 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x10"><bounds x="2590" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x40"><bounds x="2693" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x02"><bounds x="2833" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x08"><bounds x="2927" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x20"><bounds x="3021" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI6" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI6" inputmask="0x20"><bounds x="2624" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI6" inputmask="0x80"><bounds x="2706" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI7" inputmask="0x01"><bounds x="2788" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI7" inputmask="0x04"><bounds x="2870" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI7" inputmask="0x10"><bounds x="2952" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI7" inputmask="0x40"><bounds x="3034" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x20"><bounds x="2624" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x80"><bounds x="2706" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x01"><bounds x="2788" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x04"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x10"><bounds x="2952" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x40"><bounds x="3034" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x10"><bounds x="2590" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x40"><bounds x="2693" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x02"><bounds x="2833" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x08"><bounds x="2927" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x20"><bounds x="3021" y="108" width="44" height="324" /></element>
<!-- octave 6 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x01"><bounds x="3164" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x04"><bounds x="3267" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x20"><bounds x="3407" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x80"><bounds x="3501" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI9" inputmask="0x02"><bounds x="3595" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI7" inputmask="0x80"><bounds x="3116" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI8" inputmask="0x02"><bounds x="3198" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI8" inputmask="0x08"><bounds x="3280" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI8" inputmask="0x10"><bounds x="3362" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI8" inputmask="0x40"><bounds x="3444" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI9" inputmask="0x01"><bounds x="3526" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI9" inputmask="0x04"><bounds x="3608" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x80"><bounds x="3116" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI8" inputmask="0x02"><bounds x="3198" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI8" inputmask="0x08"><bounds x="3280" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI8" inputmask="0x10"><bounds x="3362" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI8" inputmask="0x40"><bounds x="3444" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI9" inputmask="0x01"><bounds x="3526" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI9" inputmask="0x04"><bounds x="3608" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x01"><bounds x="3164" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x04"><bounds x="3267" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x20"><bounds x="3407" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI8" inputmask="0x80"><bounds x="3501" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI9" inputmask="0x02"><bounds x="3595" y="108" width="44" height="324" /></element>
<!-- octave 7 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI9" inputmask="0x10"><bounds x="3738" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI9" inputmask="0x40"><bounds x="3841" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI10" inputmask="0x02"><bounds x="3981" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI10" inputmask="0x08"><bounds x="4075" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI10" inputmask="0x20"><bounds x="4169" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI9" inputmask="0x08"><bounds x="3690" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI9" inputmask="0x20"><bounds x="3772" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI9" inputmask="0x80"><bounds x="3854" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI10" inputmask="0x01"><bounds x="3936" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI10" inputmask="0x04"><bounds x="4018" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI10" inputmask="0x10"><bounds x="4100" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI10" inputmask="0x40"><bounds x="4182" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI9" inputmask="0x08"><bounds x="3690" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI9" inputmask="0x20"><bounds x="3772" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI9" inputmask="0x80"><bounds x="3854" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI10" inputmask="0x01"><bounds x="3936" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI10" inputmask="0x04"><bounds x="4018" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI10" inputmask="0x10"><bounds x="4100" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI10" inputmask="0x40"><bounds x="4182" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI9" inputmask="0x10"><bounds x="3738" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI9" inputmask="0x40"><bounds x="3841" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI10" inputmask="0x02"><bounds x="3981" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI10" inputmask="0x08"><bounds x="4075" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI10" inputmask="0x20"><bounds x="4169" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="maincpu:kbd:FI10" inputmask="0x80"><bounds x="4264" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI10" inputmask="0x80"><bounds x="4264" y="108" width="79" height="504" /></element>
</group>
<view name="Keyboard">
diff --git a/src/mame/layout/ct8000.lay b/src/mame/layout/ct8000.lay
index 2a15d103903..a57d71ebc37 100644
--- a/src/mame/layout/ct8000.lay
+++ b/src/mame/layout/ct8000.lay
@@ -162,36 +162,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -258,63 +228,63 @@ license:CC0-1.0
<element ref="keyfill"><bounds x="72" y="0" width="2396" height="524" /></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KC0" inputmask="0x02"><bounds x="130" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC0" inputmask="0x08"><bounds x="233" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC1" inputmask="0x01"><bounds x="373" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC1" inputmask="0x04"><bounds x="467" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC1" inputmask="0x10"><bounds x="561" y="10" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KC0" inputmask="0x01"><bounds x="82" y="10" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KC0" inputmask="0x04"><bounds x="164" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC0" inputmask="0x10"><bounds x="246" y="10" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KC0" inputmask="0x20"><bounds x="328" y="10" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KC1" inputmask="0x02"><bounds x="410" y="10" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KC1" inputmask="0x08"><bounds x="492" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC1" inputmask="0x20"><bounds x="574" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x01"><bounds x="82" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x04"><bounds x="164" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x10"><bounds x="246" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x20"><bounds x="328" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC1" inputmask="0x02"><bounds x="410" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC1" inputmask="0x08"><bounds x="492" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC1" inputmask="0x20"><bounds x="574" y="10" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KC0" inputmask="0x02"><bounds x="130" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC0" inputmask="0x08"><bounds x="233" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC1" inputmask="0x01"><bounds x="373" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC1" inputmask="0x04"><bounds x="467" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC1" inputmask="0x10"><bounds x="561" y="10" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KC2" inputmask="0x02"><bounds x="704" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC2" inputmask="0x08"><bounds x="807" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC3" inputmask="0x01"><bounds x="947" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC3" inputmask="0x04"><bounds x="1041" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC3" inputmask="0x10"><bounds x="1135" y="10" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KC2" inputmask="0x01"><bounds x="656" y="10" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KC2" inputmask="0x04"><bounds x="738" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC2" inputmask="0x10"><bounds x="820" y="10" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KC2" inputmask="0x20"><bounds x="902" y="10" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KC3" inputmask="0x02"><bounds x="984" y="10" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KC3" inputmask="0x08"><bounds x="1066" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC3" inputmask="0x20"><bounds x="1148" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x01"><bounds x="656" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x04"><bounds x="738" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x10"><bounds x="820" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x20"><bounds x="902" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC3" inputmask="0x02"><bounds x="984" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC3" inputmask="0x08"><bounds x="1066" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC3" inputmask="0x20"><bounds x="1148" y="10" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KC2" inputmask="0x02"><bounds x="704" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC2" inputmask="0x08"><bounds x="807" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC3" inputmask="0x01"><bounds x="947" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC3" inputmask="0x04"><bounds x="1041" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC3" inputmask="0x10"><bounds x="1135" y="10" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KC4" inputmask="0x02"><bounds x="1278" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC4" inputmask="0x08"><bounds x="1381" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC5" inputmask="0x01"><bounds x="1521" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC5" inputmask="0x04"><bounds x="1615" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC5" inputmask="0x10"><bounds x="1709" y="10" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KC4" inputmask="0x01"><bounds x="1230" y="10" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KC4" inputmask="0x04"><bounds x="1312" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC4" inputmask="0x10"><bounds x="1394" y="10" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KC4" inputmask="0x20"><bounds x="1476" y="10" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KC5" inputmask="0x02"><bounds x="1558" y="10" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KC5" inputmask="0x08"><bounds x="1640" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC5" inputmask="0x20"><bounds x="1722" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x01"><bounds x="1230" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x04"><bounds x="1312" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x10"><bounds x="1394" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x20"><bounds x="1476" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC5" inputmask="0x02"><bounds x="1558" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC5" inputmask="0x08"><bounds x="1640" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC5" inputmask="0x20"><bounds x="1722" y="10" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KC4" inputmask="0x02"><bounds x="1278" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC4" inputmask="0x08"><bounds x="1381" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC5" inputmask="0x01"><bounds x="1521" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC5" inputmask="0x04"><bounds x="1615" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC5" inputmask="0x10"><bounds x="1709" y="10" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KC6" inputmask="0x02"><bounds x="1852" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC6" inputmask="0x08"><bounds x="1955" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC7" inputmask="0x01"><bounds x="2095" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC7" inputmask="0x04"><bounds x="2189" y="10" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KC7" inputmask="0x10"><bounds x="2283" y="10" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KC6" inputmask="0x01"><bounds x="1804" y="10" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KC6" inputmask="0x04"><bounds x="1886" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC6" inputmask="0x10"><bounds x="1968" y="10" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KC6" inputmask="0x20"><bounds x="2050" y="10" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KC7" inputmask="0x02"><bounds x="2132" y="10" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KC7" inputmask="0x08"><bounds x="2214" y="10" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KC7" inputmask="0x20"><bounds x="2296" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x01"><bounds x="1804" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x04"><bounds x="1886" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x10"><bounds x="1968" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x20"><bounds x="2050" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC7" inputmask="0x02"><bounds x="2132" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC7" inputmask="0x08"><bounds x="2214" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC7" inputmask="0x20"><bounds x="2296" y="10" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KC6" inputmask="0x02"><bounds x="1852" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC6" inputmask="0x08"><bounds x="1955" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC7" inputmask="0x01"><bounds x="2095" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC7" inputmask="0x04"><bounds x="2189" y="10" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KC7" inputmask="0x10"><bounds x="2283" y="10" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KC8" inputmask="0x01"><bounds x="2378" y="10" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KC8" inputmask="0x01"><bounds x="2378" y="10" width="79" height="504" /></element>
</group>
<group name="key_labels">
diff --git a/src/mame/layout/ctk530.lay b/src/mame/layout/ctk530.lay
index e660dc21bce..a7d20d9cb82 100644
--- a/src/mame/layout/ctk530.lay
+++ b/src/mame/layout/ctk530.lay
@@ -116,36 +116,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -266,77 +236,77 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="960" y="50" width="140" height="35"/></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x02"><bounds x="130" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x08"><bounds x="233" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x40"><bounds x="373" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x01"><bounds x="467" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x04"><bounds x="561" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI0" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI0" inputmask="0x04"><bounds x="164" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI0" inputmask="0x10"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI0" inputmask="0x20"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI0" inputmask="0x80"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI1" inputmask="0x02"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI1" inputmask="0x08"><bounds x="574" y="108" width="79" height="504" /></element>
-
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x04"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x10"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x20"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI0" inputmask="0x80"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x02"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x08"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x02"><bounds x="130" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x08"><bounds x="233" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI0" inputmask="0x40"><bounds x="373" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x01"><bounds x="467" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x04"><bounds x="561" y="108" width="44" height="324" /></element>
+
<!-- octave 3 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x20"><bounds x="704" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x80"><bounds x="807" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x04"><bounds x="947" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x10"><bounds x="1041" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x40"><bounds x="1135" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI1" inputmask="0x10"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI1" inputmask="0x40"><bounds x="738" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI2" inputmask="0x01"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI2" inputmask="0x02"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI2" inputmask="0x08"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI2" inputmask="0x20"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI2" inputmask="0x80"><bounds x="1148" y="108" width="79" height="504" /></element>
-
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x10"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI1" inputmask="0x40"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x01"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x02"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x08"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x20"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI2" inputmask="0x80"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x20"><bounds x="704" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI1" inputmask="0x80"><bounds x="807" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x04"><bounds x="947" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x10"><bounds x="1041" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI2" inputmask="0x40"><bounds x="1135" y="108" width="44" height="324" /></element>
+
<!-- octave 4 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x02"><bounds x="1278" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x08"><bounds x="1381" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x40"><bounds x="1521" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x01"><bounds x="1615" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x04"><bounds x="1709" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI3" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI3" inputmask="0x04"><bounds x="1312" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI3" inputmask="0x10"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI3" inputmask="0x20"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI3" inputmask="0x80"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI4" inputmask="0x02"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI4" inputmask="0x08"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x04"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x10"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x20"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI3" inputmask="0x80"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x02"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x08"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x02"><bounds x="1278" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x08"><bounds x="1381" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI3" inputmask="0x40"><bounds x="1521" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x01"><bounds x="1615" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x04"><bounds x="1709" y="108" width="44" height="324" /></element>
<!-- octave 5 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x20"><bounds x="1852" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x80"><bounds x="1955" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x04"><bounds x="2095" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x10"><bounds x="2189" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x40"><bounds x="2283" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI4" inputmask="0x10"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI4" inputmask="0x40"><bounds x="1886" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI5" inputmask="0x01"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI5" inputmask="0x02"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI5" inputmask="0x08"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI5" inputmask="0x20"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI5" inputmask="0x80"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x10"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI4" inputmask="0x40"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x01"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x02"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x08"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x20"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI5" inputmask="0x80"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x20"><bounds x="1852" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI4" inputmask="0x80"><bounds x="1955" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x04"><bounds x="2095" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x10"><bounds x="2189" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI5" inputmask="0x40"><bounds x="2283" y="108" width="44" height="324" /></element>
<!-- octave 6 -->
- <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x08"><bounds x="2529" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x40"><bounds x="2669" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x01"><bounds x="2763" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x04"><bounds x="2857" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI6" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="maincpu:kbd:FI6" inputmask="0x04"><bounds x="2460" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI6" inputmask="0x10"><bounds x="2542" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="maincpu:kbd:FI6" inputmask="0x20"><bounds x="2624" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="maincpu:kbd:FI6" inputmask="0x80"><bounds x="2706" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="maincpu:kbd:FI7" inputmask="0x02"><bounds x="2788" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="maincpu:kbd:FI7" inputmask="0x08"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x04"><bounds x="2460" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x10"><bounds x="2542" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x20"><bounds x="2624" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI6" inputmask="0x80"><bounds x="2706" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x02"><bounds x="2788" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x08"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x08"><bounds x="2529" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI6" inputmask="0x40"><bounds x="2669" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x01"><bounds x="2763" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="maincpu:kbd:FI7" inputmask="0x04"><bounds x="2857" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x10"><bounds x="2952" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="maincpu:kbd:FI7" inputmask="0x10"><bounds x="2952" y="108" width="79" height="504" /></element>
</group>
<!-- speaker grill -->
diff --git a/src/mame/layout/cz1.lay b/src/mame/layout/cz1.lay
index 6454435abe1..5629dda46c2 100644
--- a/src/mame/layout/cz1.lay
+++ b/src/mame/layout/cz1.lay
@@ -643,36 +643,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -685,77 +655,77 @@ license:CC0-1.0
<element ref="keyfill"><bounds x="72" y="98" width="2970" height="524" /></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="kbd:KI38" inputmask="1"><bounds x="130" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI37" inputmask="1"><bounds x="233" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI35" inputmask="2"><bounds x="373" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI34" inputmask="2"><bounds x="467" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI33" inputmask="2"><bounds x="561" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI38" inputmask="2"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="kbd:KI37" inputmask="2"><bounds x="164" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI36" inputmask="2"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI36" inputmask="1"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="kbd:KI35" inputmask="1"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="kbd:KI34" inputmask="1"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI33" inputmask="1"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI38" inputmask="2"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI37" inputmask="2"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI36" inputmask="2"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI36" inputmask="1"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI35" inputmask="1"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI34" inputmask="1"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI33" inputmask="1"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="kbd:KI38" inputmask="1"><bounds x="130" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI37" inputmask="1"><bounds x="233" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI35" inputmask="2"><bounds x="373" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI34" inputmask="2"><bounds x="467" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI33" inputmask="2"><bounds x="561" y="108" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="kbd:KI32" inputmask="1"><bounds x="704" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI31" inputmask="1"><bounds x="807" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI29" inputmask="2"><bounds x="947" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI28" inputmask="2"><bounds x="1041" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI27" inputmask="2"><bounds x="1135" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI32" inputmask="2"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="kbd:KI31" inputmask="2"><bounds x="738" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI30" inputmask="2"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI30" inputmask="1"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="kbd:KI29" inputmask="1"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="kbd:KI28" inputmask="1"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI27" inputmask="1"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI32" inputmask="2"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI31" inputmask="2"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI30" inputmask="2"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI30" inputmask="1"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI29" inputmask="1"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI28" inputmask="1"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI27" inputmask="1"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="kbd:KI32" inputmask="1"><bounds x="704" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI31" inputmask="1"><bounds x="807" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI29" inputmask="2"><bounds x="947" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI28" inputmask="2"><bounds x="1041" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI27" inputmask="2"><bounds x="1135" y="108" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="kbd:KI26" inputmask="1"><bounds x="1278" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI25" inputmask="1"><bounds x="1381" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI23" inputmask="2"><bounds x="1521" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI22" inputmask="2"><bounds x="1615" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI21" inputmask="2"><bounds x="1709" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI26" inputmask="2"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="kbd:KI25" inputmask="2"><bounds x="1312" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI24" inputmask="2"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI24" inputmask="1"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="kbd:KI23" inputmask="1"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="kbd:KI22" inputmask="1"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI21" inputmask="1"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI26" inputmask="2"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI25" inputmask="2"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI24" inputmask="2"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI24" inputmask="1"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI23" inputmask="1"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI22" inputmask="1"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI21" inputmask="1"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="kbd:KI26" inputmask="1"><bounds x="1278" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI25" inputmask="1"><bounds x="1381" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI23" inputmask="2"><bounds x="1521" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI22" inputmask="2"><bounds x="1615" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI21" inputmask="2"><bounds x="1709" y="108" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="kbd:KI20" inputmask="1"><bounds x="1852" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI19" inputmask="1"><bounds x="1955" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI17" inputmask="2"><bounds x="2095" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI16" inputmask="2"><bounds x="2189" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI15" inputmask="2"><bounds x="2283" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI20" inputmask="2"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="kbd:KI19" inputmask="2"><bounds x="1886" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI18" inputmask="2"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI18" inputmask="1"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="kbd:KI17" inputmask="1"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="kbd:KI16" inputmask="1"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI15" inputmask="1"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI20" inputmask="2"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI19" inputmask="2"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI18" inputmask="2"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI18" inputmask="1"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI17" inputmask="1"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI16" inputmask="1"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI15" inputmask="1"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="kbd:KI20" inputmask="1"><bounds x="1852" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI19" inputmask="1"><bounds x="1955" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI17" inputmask="2"><bounds x="2095" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI16" inputmask="2"><bounds x="2189" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI15" inputmask="2"><bounds x="2283" y="108" width="44" height="324" /></element>
<!-- octave 5 -->
- <element ref="blackkey" inputtag="kbd:KI14" inputmask="1"><bounds x="2426" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI13" inputmask="1"><bounds x="2529" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI11" inputmask="2"><bounds x="2669" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI10" inputmask="2"><bounds x="2763" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="kbd:KI9" inputmask="2"><bounds x="2857" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI14" inputmask="2"><bounds x="2378" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="kbd:KI13" inputmask="2"><bounds x="2460" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI12" inputmask="2"><bounds x="2542" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="kbd:KI12" inputmask="1"><bounds x="2624" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="kbd:KI11" inputmask="1"><bounds x="2706" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="kbd:KI10" inputmask="1"><bounds x="2788" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="kbd:KI9" inputmask="1"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI14" inputmask="2"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI13" inputmask="2"><bounds x="2460" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI12" inputmask="2"><bounds x="2542" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI12" inputmask="1"><bounds x="2624" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI11" inputmask="1"><bounds x="2706" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI10" inputmask="1"><bounds x="2788" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI9" inputmask="1"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="kbd:KI14" inputmask="1"><bounds x="2426" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI13" inputmask="1"><bounds x="2529" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI11" inputmask="2"><bounds x="2669" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI10" inputmask="2"><bounds x="2763" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="kbd:KI9" inputmask="2"><bounds x="2857" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="kbd:KI8" inputmask="2"><bounds x="2952" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="kbd:KI8" inputmask="2"><bounds x="2952" y="108" width="79" height="504" /></element>
</group>
<group name="left">
diff --git a/src/mame/layout/cz101.lay b/src/mame/layout/cz101.lay
index 4bdcaac94e6..3d3036603c3 100644
--- a/src/mame/layout/cz101.lay
+++ b/src/mame/layout/cz101.lay
@@ -569,36 +569,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="79" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="79" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="252" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="248" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -611,63 +581,63 @@ license:CC0-1.0
<element ref="keyfill"><bounds x="72" y="98" width="2396" height="444" /></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="kc0" inputmask="0x02"><bounds x="130" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc0" inputmask="0x08"><bounds x="233" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc1" inputmask="0x01"><bounds x="373" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc1" inputmask="0x04"><bounds x="467" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc1" inputmask="0x10"><bounds x="561" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="kc0" inputmask="0x01"><bounds x="82" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="kc0" inputmask="0x04"><bounds x="164" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc0" inputmask="0x10"><bounds x="246" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="kc0" inputmask="0x20"><bounds x="328" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="kc1" inputmask="0x02"><bounds x="410" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="kc1" inputmask="0x08"><bounds x="492" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc1" inputmask="0x20"><bounds x="574" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc0" inputmask="0x01"><bounds x="82" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc0" inputmask="0x04"><bounds x="164" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc0" inputmask="0x10"><bounds x="246" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc0" inputmask="0x20"><bounds x="328" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc1" inputmask="0x02"><bounds x="410" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc1" inputmask="0x08"><bounds x="492" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc1" inputmask="0x20"><bounds x="574" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="kc0" inputmask="0x02"><bounds x="130" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc0" inputmask="0x08"><bounds x="233" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc1" inputmask="0x01"><bounds x="373" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc1" inputmask="0x04"><bounds x="467" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc1" inputmask="0x10"><bounds x="561" y="108" width="44" height="252" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="kc2" inputmask="0x02"><bounds x="704" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc2" inputmask="0x08"><bounds x="807" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc3" inputmask="0x01"><bounds x="947" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc3" inputmask="0x04"><bounds x="1041" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc3" inputmask="0x10"><bounds x="1135" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="kc2" inputmask="0x01"><bounds x="656" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="kc2" inputmask="0x04"><bounds x="738" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc2" inputmask="0x10"><bounds x="820" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="kc2" inputmask="0x20"><bounds x="902" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="kc3" inputmask="0x02"><bounds x="984" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="kc3" inputmask="0x08"><bounds x="1066" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc3" inputmask="0x20"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc2" inputmask="0x01"><bounds x="656" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc2" inputmask="0x04"><bounds x="738" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc2" inputmask="0x10"><bounds x="820" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc2" inputmask="0x20"><bounds x="902" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc3" inputmask="0x02"><bounds x="984" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc3" inputmask="0x08"><bounds x="1066" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc3" inputmask="0x20"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="kc2" inputmask="0x02"><bounds x="704" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc2" inputmask="0x08"><bounds x="807" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc3" inputmask="0x01"><bounds x="947" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc3" inputmask="0x04"><bounds x="1041" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc3" inputmask="0x10"><bounds x="1135" y="108" width="44" height="252" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="kc4" inputmask="0x02"><bounds x="1278" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc4" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc5" inputmask="0x01"><bounds x="1521" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc5" inputmask="0x04"><bounds x="1615" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc5" inputmask="0x10"><bounds x="1709" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="kc4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="kc4" inputmask="0x04"><bounds x="1312" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc4" inputmask="0x10"><bounds x="1394" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="kc4" inputmask="0x20"><bounds x="1476" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="kc5" inputmask="0x02"><bounds x="1558" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="kc5" inputmask="0x08"><bounds x="1640" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc5" inputmask="0x20"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc4" inputmask="0x04"><bounds x="1312" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc4" inputmask="0x10"><bounds x="1394" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc4" inputmask="0x20"><bounds x="1476" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc5" inputmask="0x02"><bounds x="1558" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc5" inputmask="0x08"><bounds x="1640" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc5" inputmask="0x20"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="kc4" inputmask="0x02"><bounds x="1278" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc4" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc5" inputmask="0x01"><bounds x="1521" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc5" inputmask="0x04"><bounds x="1615" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc5" inputmask="0x10"><bounds x="1709" y="108" width="44" height="252" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="kc6" inputmask="0x02"><bounds x="1852" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc6" inputmask="0x08"><bounds x="1955" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc7" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc7" inputmask="0x04"><bounds x="2189" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="kc7" inputmask="0x10"><bounds x="2283" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="kc6" inputmask="0x01"><bounds x="1804" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="kc6" inputmask="0x04"><bounds x="1886" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc6" inputmask="0x10"><bounds x="1968" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="kc6" inputmask="0x20"><bounds x="2050" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="kc7" inputmask="0x02"><bounds x="2132" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="kc7" inputmask="0x08"><bounds x="2214" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="kc7" inputmask="0x20"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc6" inputmask="0x01"><bounds x="1804" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc6" inputmask="0x04"><bounds x="1886" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc6" inputmask="0x10"><bounds x="1968" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc6" inputmask="0x20"><bounds x="2050" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc7" inputmask="0x02"><bounds x="2132" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc7" inputmask="0x08"><bounds x="2214" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc7" inputmask="0x20"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="kc6" inputmask="0x02"><bounds x="1852" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc6" inputmask="0x08"><bounds x="1955" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc7" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc7" inputmask="0x04"><bounds x="2189" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="kc7" inputmask="0x10"><bounds x="2283" y="108" width="44" height="252" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="kc8" inputmask="0x01"><bounds x="2378" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="kc8" inputmask="0x01"><bounds x="2378" y="108" width="79" height="424" /></element>
</group>
<group name="left">
diff --git a/src/mame/layout/cz230s.lay b/src/mame/layout/cz230s.lay
index dcb71e735e1..d0ca5ebba3f 100644
--- a/src/mame/layout/cz230s.lay
+++ b/src/mame/layout/cz230s.lay
@@ -465,36 +465,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="79" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="79" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="252" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="248" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -507,63 +477,63 @@ license:CC0-1.0
<element ref="keyfill"><bounds x="72" y="98" width="2396" height="444" /></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KC0" inputmask="0x02"><bounds x="130" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC0" inputmask="0x08"><bounds x="233" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC1" inputmask="0x01"><bounds x="373" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC1" inputmask="0x04"><bounds x="467" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC1" inputmask="0x10"><bounds x="561" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KC0" inputmask="0x01"><bounds x="82" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KC0" inputmask="0x04"><bounds x="164" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC0" inputmask="0x10"><bounds x="246" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KC0" inputmask="0x20"><bounds x="328" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KC1" inputmask="0x02"><bounds x="410" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KC1" inputmask="0x08"><bounds x="492" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC1" inputmask="0x20"><bounds x="574" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x01"><bounds x="82" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x04"><bounds x="164" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x10"><bounds x="246" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC0" inputmask="0x20"><bounds x="328" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC1" inputmask="0x02"><bounds x="410" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC1" inputmask="0x08"><bounds x="492" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC1" inputmask="0x20"><bounds x="574" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KC0" inputmask="0x02"><bounds x="130" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC0" inputmask="0x08"><bounds x="233" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC1" inputmask="0x01"><bounds x="373" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC1" inputmask="0x04"><bounds x="467" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC1" inputmask="0x10"><bounds x="561" y="108" width="44" height="252" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KC2" inputmask="0x02"><bounds x="704" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC2" inputmask="0x08"><bounds x="807" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC3" inputmask="0x01"><bounds x="947" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC3" inputmask="0x04"><bounds x="1041" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC3" inputmask="0x10"><bounds x="1135" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KC2" inputmask="0x01"><bounds x="656" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KC2" inputmask="0x04"><bounds x="738" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC2" inputmask="0x10"><bounds x="820" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KC2" inputmask="0x20"><bounds x="902" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KC3" inputmask="0x02"><bounds x="984" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KC3" inputmask="0x08"><bounds x="1066" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC3" inputmask="0x20"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x01"><bounds x="656" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x04"><bounds x="738" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x10"><bounds x="820" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC2" inputmask="0x20"><bounds x="902" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC3" inputmask="0x02"><bounds x="984" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC3" inputmask="0x08"><bounds x="1066" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC3" inputmask="0x20"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KC2" inputmask="0x02"><bounds x="704" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC2" inputmask="0x08"><bounds x="807" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC3" inputmask="0x01"><bounds x="947" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC3" inputmask="0x04"><bounds x="1041" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC3" inputmask="0x10"><bounds x="1135" y="108" width="44" height="252" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KC4" inputmask="0x02"><bounds x="1278" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC4" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC5" inputmask="0x01"><bounds x="1521" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC5" inputmask="0x04"><bounds x="1615" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC5" inputmask="0x10"><bounds x="1709" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KC4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KC4" inputmask="0x04"><bounds x="1312" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC4" inputmask="0x10"><bounds x="1394" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KC4" inputmask="0x20"><bounds x="1476" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KC5" inputmask="0x02"><bounds x="1558" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KC5" inputmask="0x08"><bounds x="1640" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC5" inputmask="0x20"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x04"><bounds x="1312" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x10"><bounds x="1394" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC4" inputmask="0x20"><bounds x="1476" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC5" inputmask="0x02"><bounds x="1558" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC5" inputmask="0x08"><bounds x="1640" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC5" inputmask="0x20"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KC4" inputmask="0x02"><bounds x="1278" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC4" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC5" inputmask="0x01"><bounds x="1521" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC5" inputmask="0x04"><bounds x="1615" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC5" inputmask="0x10"><bounds x="1709" y="108" width="44" height="252" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KC6" inputmask="0x02"><bounds x="1852" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC6" inputmask="0x08"><bounds x="1955" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC7" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC7" inputmask="0x04"><bounds x="2189" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KC7" inputmask="0x10"><bounds x="2283" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KC6" inputmask="0x01"><bounds x="1804" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KC6" inputmask="0x04"><bounds x="1886" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC6" inputmask="0x10"><bounds x="1968" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KC6" inputmask="0x20"><bounds x="2050" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KC7" inputmask="0x02"><bounds x="2132" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KC7" inputmask="0x08"><bounds x="2214" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KC7" inputmask="0x20"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x01"><bounds x="1804" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x04"><bounds x="1886" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x10"><bounds x="1968" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC6" inputmask="0x20"><bounds x="2050" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC7" inputmask="0x02"><bounds x="2132" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC7" inputmask="0x08"><bounds x="2214" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC7" inputmask="0x20"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KC6" inputmask="0x02"><bounds x="1852" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC6" inputmask="0x08"><bounds x="1955" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC7" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC7" inputmask="0x04"><bounds x="2189" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KC7" inputmask="0x10"><bounds x="2283" y="108" width="44" height="252" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KC8" inputmask="0x01"><bounds x="2378" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KC8" inputmask="0x01"><bounds x="2378" y="108" width="79" height="424" /></element>
</group>
<group name="panel">
diff --git a/src/mame/layout/psr110.lay b/src/mame/layout/psr110.lay
index fd9d8814805..f9e98840439 100644
--- a/src/mame/layout/psr110.lay
+++ b/src/mame/layout/psr110.lay
@@ -71,36 +71,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -201,63 +171,63 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="980" y="70" width="500" height="25"/></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="130" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="233" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="373" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="467" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY6" inputmask="0x20"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY5" inputmask="0x02"><bounds x="164" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x10"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY4" inputmask="0x01"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY4" inputmask="0x04"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x10"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x20"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x02"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x10"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x01"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x04"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x10"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="130" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="233" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="373" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="467" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="704" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="807" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="947" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1041" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x20"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY3" inputmask="0x02"><bounds x="738" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x10"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY2" inputmask="0x01"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY2" inputmask="0x04"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x10"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x04"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x10"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="704" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="807" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="947" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1041" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="1278" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x04"><bounds x="1381" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="1521" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x02"><bounds x="1615" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x20"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY1" inputmask="0x02"><bounds x="1312" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x10"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY0" inputmask="0x01"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY0" inputmask="0x04"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x10"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x20"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x02"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x04"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x10"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="1278" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x04"><bounds x="1381" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="1521" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x02"><bounds x="1615" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY8" inputmask="0x01"><bounds x="1852" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x04"><bounds x="1955" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x20"><bounds x="2095" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x02"><bounds x="2189" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY0" inputmask="0x20"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY8" inputmask="0x02"><bounds x="1886" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY8" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY8" inputmask="0x10"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY7" inputmask="0x01"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY7" inputmask="0x04"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY7" inputmask="0x10"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x20"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x02"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x10"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x01"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x04"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x10"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x01"><bounds x="1852" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x04"><bounds x="1955" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x20"><bounds x="2095" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x02"><bounds x="2189" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY7" inputmask="0x20"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x20"><bounds x="2378" y="108" width="79" height="504" /></element>
</group>
<view name="Keyboard">
diff --git a/src/mame/layout/psr150.lay b/src/mame/layout/psr150.lay
index 76f6415ea79..74cfcd10a60 100644
--- a/src/mame/layout/psr150.lay
+++ b/src/mame/layout/psr150.lay
@@ -88,36 +88,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -230,77 +200,77 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="980" y="70" width="500" height="25"/></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="130" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="233" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x01"><bounds x="373" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="467" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY9" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY4" inputmask="0x20"><bounds x="164" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x04"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY5" inputmask="0x02"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY5" inputmask="0x10"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x04"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY9" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x04"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x02"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x10"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x04"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="130" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="233" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x01"><bounds x="373" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="467" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY6" inputmask="0x02"><bounds x="704" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x10"><bounds x="807" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x01"><bounds x="947" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY10" inputmask="0x20"><bounds x="1041" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY10" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x01"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY6" inputmask="0x20"><bounds x="738" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY6" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY6" inputmask="0x04"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY10" inputmask="0x02"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY10" inputmask="0x10"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY10" inputmask="0x04"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x01"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x20"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x04"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x02"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x10"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x04"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x02"><bounds x="704" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x10"><bounds x="807" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x01"><bounds x="947" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY10" inputmask="0x20"><bounds x="1041" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY10" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY7" inputmask="0x02"><bounds x="1278" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x10"><bounds x="1381" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x01"><bounds x="1521" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x20"><bounds x="1615" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY10" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY7" inputmask="0x20"><bounds x="1312" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY7" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY7" inputmask="0x04"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY2" inputmask="0x02"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY2" inputmask="0x10"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x04"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x20"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x04"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x02"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x10"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x04"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x02"><bounds x="1278" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x10"><bounds x="1381" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x01"><bounds x="1521" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x20"><bounds x="1615" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="1852" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x10"><bounds x="1955" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="2095" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="2189" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x01"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY1" inputmask="0x20"><bounds x="1886" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x04"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY3" inputmask="0x02"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY3" inputmask="0x10"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x04"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x20"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x04"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x04"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="1852" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x10"><bounds x="1955" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="2095" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="2189" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
<!-- octave 5 -->
- <element ref="blackkey" inputtag="KEY8" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x10"><bounds x="2529" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x01"><bounds x="2669" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="2763" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY8" inputmask="0x20"><bounds x="2460" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY8" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY8" inputmask="0x04"><bounds x="2624" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY0" inputmask="0x02"><bounds x="2706" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY0" inputmask="0x10"><bounds x="2788" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x04"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x20"><bounds x="2460" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x04"><bounds x="2624" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x02"><bounds x="2706" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x10"><bounds x="2788" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x04"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x10"><bounds x="2529" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x01"><bounds x="2669" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="2763" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="2952" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="2952" y="108" width="79" height="504" /></element>
</group>
<!-- speaker grill -->
diff --git a/src/mame/layout/psr180.lay b/src/mame/layout/psr180.lay
index a82f91e1fd3..1fd7dac5c4e 100644
--- a/src/mame/layout/psr180.lay
+++ b/src/mame/layout/psr180.lay
@@ -245,36 +245,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -375,77 +345,77 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="980" y="630" width="500" height="25"/></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="130" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="233" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="373" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="467" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x04"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY4" inputmask="0x20"><bounds x="164" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x01"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY3" inputmask="0x02"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY3" inputmask="0x10"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x01"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x04"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x01"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x01"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="130" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="233" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="373" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="467" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="704" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="807" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="947" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="1041" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x04"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY2" inputmask="0x20"><bounds x="738" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x01"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY0" inputmask="0x02"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY0" inputmask="0x10"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x01"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x04"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x20"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x02"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x10"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="704" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="807" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="947" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="1041" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY6" inputmask="0x02"><bounds x="1278" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x10"><bounds x="1381" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x04"><bounds x="1521" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x20"><bounds x="1615" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY0" inputmask="0x04"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY6" inputmask="0x20"><bounds x="1312" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY6" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY6" inputmask="0x01"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY7" inputmask="0x02"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY7" inputmask="0x10"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY7" inputmask="0x01"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x04"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x20"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x01"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x02"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x10"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x01"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x02"><bounds x="1278" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x10"><bounds x="1381" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x04"><bounds x="1521" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x20"><bounds x="1615" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY5" inputmask="0x02"><bounds x="1852" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x10"><bounds x="1955" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="2095" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x20"><bounds x="2189" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY7" inputmask="0x04"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY5" inputmask="0x20"><bounds x="1886" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x01"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY8" inputmask="0x02"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY8" inputmask="0x10"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY8" inputmask="0x01"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x04"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x20"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x01"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x02"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x10"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x01"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x02"><bounds x="1852" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x10"><bounds x="1955" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="2095" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x20"><bounds x="2189" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
<!-- octave 5 -->
- <element ref="blackkey" inputtag="KEY9" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY9" inputmask="0x10"><bounds x="2529" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY9" inputmask="0x04"><bounds x="2669" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY10" inputmask="0x20"><bounds x="2763" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY10" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY8" inputmask="0x04"><bounds x="2378" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY9" inputmask="0x20"><bounds x="2460" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY9" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY9" inputmask="0x01"><bounds x="2624" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY10" inputmask="0x02"><bounds x="2706" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY10" inputmask="0x10"><bounds x="2788" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY10" inputmask="0x01"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x04"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY9" inputmask="0x20"><bounds x="2460" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY9" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY9" inputmask="0x01"><bounds x="2624" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x02"><bounds x="2706" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x10"><bounds x="2788" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x01"><bounds x="2870" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY9" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY9" inputmask="0x10"><bounds x="2529" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY9" inputmask="0x04"><bounds x="2669" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY10" inputmask="0x20"><bounds x="2763" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY10" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY10" inputmask="0x04"><bounds x="2952" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY10" inputmask="0x04"><bounds x="2952" y="108" width="79" height="504" /></element>
</group>
<!-- speaker grill -->
diff --git a/src/mame/layout/psr75.lay b/src/mame/layout/psr75.lay
index 997504b30a5..6446e49c914 100644
--- a/src/mame/layout/psr75.lay
+++ b/src/mame/layout/psr75.lay
@@ -64,36 +64,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -183,63 +153,63 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="980" y="70" width="500" height="25"/></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="130" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="233" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="373" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="467" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="561" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY0" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY1" inputmask="0x10"><bounds x="164" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x04"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x02"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY2" inputmask="0x20"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY2" inputmask="0x08"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x02"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x04"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x02"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x20"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x08"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x02"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="130" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="233" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="373" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="467" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="561" y="108" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="704" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="807" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="947" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="1041" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="1135" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x01"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY3" inputmask="0x10"><bounds x="738" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x04"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x02"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY4" inputmask="0x20"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY4" inputmask="0x08"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x02"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x04"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x08"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x02"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="704" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="807" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="947" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="1041" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="1135" y="108" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="1278" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="1381" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="1521" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x10"><bounds x="1615" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x04"><bounds x="1709" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY5" inputmask="0x10"><bounds x="1312" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x04"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x02"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY6" inputmask="0x20"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY6" inputmask="0x08"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY6" inputmask="0x02"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x10"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x04"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x02"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x20"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x08"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x02"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="1278" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="1381" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="1521" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x10"><bounds x="1615" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x04"><bounds x="1709" y="108" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY7" inputmask="0x20"><bounds x="1852" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="1955" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x01"><bounds x="2095" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x10"><bounds x="2189" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x04"><bounds x="2283" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY6" inputmask="0x01"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY7" inputmask="0x10"><bounds x="1886" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY7" inputmask="0x04"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY7" inputmask="0x02"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY8" inputmask="0x20"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY8" inputmask="0x08"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY8" inputmask="0x02"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x01"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x10"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x04"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x02"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x20"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x08"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x02"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x20"><bounds x="1852" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="1955" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x01"><bounds x="2095" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x10"><bounds x="2189" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x04"><bounds x="2283" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY8" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
</group>
<!-- speaker grill -->
diff --git a/src/mame/layout/psr76.lay b/src/mame/layout/psr76.lay
index a7dea8610dd..6850569d872 100644
--- a/src/mame/layout/psr76.lay
+++ b/src/mame/layout/psr76.lay
@@ -235,36 +235,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="332" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="332" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="332" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="332" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="324" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="320" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -354,63 +324,63 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="980" y="70" width="500" height="25"/></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KEY6" inputmask="0x01"><bounds x="130" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x04"><bounds x="233" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x20"><bounds x="373" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x02"><bounds x="467" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x20"><bounds x="82" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY6" inputmask="0x02"><bounds x="164" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY6" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY6" inputmask="0x10"><bounds x="328" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY8" inputmask="0x01"><bounds x="410" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY8" inputmask="0x04"><bounds x="492" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY8" inputmask="0x10"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="82" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x02"><bounds x="164" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x08"><bounds x="246" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x10"><bounds x="328" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x01"><bounds x="410" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x04"><bounds x="492" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x10"><bounds x="574" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x01"><bounds x="130" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x04"><bounds x="233" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x20"><bounds x="373" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x02"><bounds x="467" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x08"><bounds x="561" y="108" width="44" height="324" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="704" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="807" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="947" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1041" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY8" inputmask="0x20"><bounds x="656" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY3" inputmask="0x02"><bounds x="738" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x10"><bounds x="902" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY2" inputmask="0x01"><bounds x="984" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY2" inputmask="0x04"><bounds x="1066" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x10"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x20"><bounds x="656" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="738" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x08"><bounds x="820" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="902" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="984" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x04"><bounds x="1066" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x10"><bounds x="1148" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="704" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="807" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="947" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1041" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1135" y="108" width="44" height="324" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY0" inputmask="0x01"><bounds x="1278" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x04"><bounds x="1381" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="1521" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x02"><bounds x="1615" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x20"><bounds x="1230" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY0" inputmask="0x02"><bounds x="1312" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY0" inputmask="0x10"><bounds x="1476" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY5" inputmask="0x01"><bounds x="1558" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY5" inputmask="0x04"><bounds x="1640" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x10"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x20"><bounds x="1230" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x02"><bounds x="1312" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x08"><bounds x="1394" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x10"><bounds x="1476" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x01"><bounds x="1558" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x04"><bounds x="1640" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x10"><bounds x="1722" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x01"><bounds x="1278" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x04"><bounds x="1381" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="1521" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x02"><bounds x="1615" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="1709" y="108" width="44" height="324" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY7" inputmask="0x01"><bounds x="1852" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x04"><bounds x="1955" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x20"><bounds x="2095" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="2189" y="108" width="44" height="324" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x20"><bounds x="1804" y="108" width="79" height="504" /></element>
- <element ref="whitekey-m" inputtag="KEY7" inputmask="0x02"><bounds x="1886" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY7" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
- <element ref="whitekey-l" inputtag="KEY7" inputmask="0x10"><bounds x="2050" y="108" width="79" height="504" /></element>
- <element ref="whitekey-lm" inputtag="KEY1" inputmask="0x01"><bounds x="2132" y="108" width="79" height="504" /></element>
- <element ref="whitekey-rm" inputtag="KEY1" inputmask="0x04"><bounds x="2214" y="108" width="79" height="504" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x10"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x20"><bounds x="1804" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x02"><bounds x="1886" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x08"><bounds x="1968" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x10"><bounds x="2050" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x01"><bounds x="2132" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x04"><bounds x="2214" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="2296" y="108" width="79" height="504" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x01"><bounds x="1852" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x04"><bounds x="1955" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x20"><bounds x="2095" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="2189" y="108" width="44" height="324" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="2283" y="108" width="44" height="324" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY1" inputmask="0x20"><bounds x="2378" y="108" width="79" height="504" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x20"><bounds x="2378" y="108" width="79" height="504" /></element>
</group>
<view name="Keyboard">
diff --git a/src/mame/layout/pss11.lay b/src/mame/layout/pss11.lay
index 9d52a573690..d12bf55104e 100644
--- a/src/mame/layout/pss11.lay
+++ b/src/mame/layout/pss11.lay
@@ -64,36 +64,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="79" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="79" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="252" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="248" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -183,41 +153,41 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="1557" y="70" width="500" height="25"/></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="947" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="1041" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="1135" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x02"><bounds x="902" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY4" inputmask="0x20"><bounds x="984" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY4" inputmask="0x08"><bounds x="1066" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x02"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x02"><bounds x="902" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="984" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x08"><bounds x="1066" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x02"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="947" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="1041" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="1135" y="108" width="44" height="252" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="1278" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="1521" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="1615" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="1709" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY3" inputmask="0x10"><bounds x="1312" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x04"><bounds x="1394" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x02"><bounds x="1476" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY2" inputmask="0x20"><bounds x="1558" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY2" inputmask="0x08"><bounds x="1640" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x02"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x01"><bounds x="1230" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="1312" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x04"><bounds x="1394" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="1476" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x20"><bounds x="1558" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x08"><bounds x="1640" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x02"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="1278" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="1521" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="1615" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="1709" y="108" width="44" height="252" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="1852" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="1955" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x10"><bounds x="2189" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x04"><bounds x="2283" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x01"><bounds x="1804" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY1" inputmask="0x10"><bounds x="1886" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x04"><bounds x="1968" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x02"><bounds x="2050" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY0" inputmask="0x20"><bounds x="2132" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY0" inputmask="0x08"><bounds x="2214" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x02"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="1804" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="1886" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x04"><bounds x="1968" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x02"><bounds x="2050" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x20"><bounds x="2132" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x08"><bounds x="2214" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x02"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="1852" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="1955" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x10"><bounds x="2189" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x04"><bounds x="2283" y="108" width="44" height="252" /></element>
<!-- final key -->
<element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="2378" y="108" width="79" height="424" /></element>
diff --git a/src/mame/layout/pss12.lay b/src/mame/layout/pss12.lay
index 696e1957f49..e597977a1f2 100644
--- a/src/mame/layout/pss12.lay
+++ b/src/mame/layout/pss12.lay
@@ -203,36 +203,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="79" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="79" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="252" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="248" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -385,44 +355,44 @@ license:CC0-1.0
<element ref="keyfill"><bounds x="892" y="98" width="1576" height="444" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="947" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="1041" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="1135" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY0" inputmask="0x10"><bounds x="902" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY1" inputmask="0x01"><bounds x="984" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY1" inputmask="0x04"><bounds x="1066" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x10"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x10"><bounds x="902" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x01"><bounds x="984" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x04"><bounds x="1066" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x20"><bounds x="947" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="1041" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x08"><bounds x="1135" y="108" width="44" height="252" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY2" inputmask="0x01"><bounds x="1278" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="1381" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x20"><bounds x="1521" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x02"><bounds x="1615" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="1709" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x20"><bounds x="1230" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY2" inputmask="0x02"><bounds x="1312" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x08"><bounds x="1394" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x10"><bounds x="1476" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY3" inputmask="0x01"><bounds x="1558" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY3" inputmask="0x04"><bounds x="1640" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x10"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x20"><bounds x="1230" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x02"><bounds x="1312" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x08"><bounds x="1394" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x10"><bounds x="1476" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x01"><bounds x="1558" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x04"><bounds x="1640" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x01"><bounds x="1278" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="1381" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x20"><bounds x="1521" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x02"><bounds x="1615" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x08"><bounds x="1709" y="108" width="44" height="252" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY4" inputmask="0x01"><bounds x="1852" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="1955" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x20"><bounds x="2095" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x02"><bounds x="2189" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="2283" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x20"><bounds x="1804" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY4" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x08"><bounds x="1968" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x10"><bounds x="2050" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY5" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY5" inputmask="0x04"><bounds x="2214" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x10"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x20"><bounds x="1804" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x08"><bounds x="1968" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x10"><bounds x="2050" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x04"><bounds x="2214" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x10"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x01"><bounds x="1852" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x04"><bounds x="1955" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x20"><bounds x="2095" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x02"><bounds x="2189" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x08"><bounds x="2283" y="108" width="44" height="252" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY5" inputmask="0x20"><bounds x="2378" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x20"><bounds x="2378" y="108" width="79" height="424" /></element>
</group>
<view name="Keyboard">
diff --git a/src/mame/layout/pss21.lay b/src/mame/layout/pss21.lay
index 2f61c89768e..492b8a8a0af 100644
--- a/src/mame/layout/pss21.lay
+++ b/src/mame/layout/pss21.lay
@@ -70,36 +70,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="79" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="79" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="252" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="248" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -198,49 +168,49 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="1320" y="70" width="500" height="25"/></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="704" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="807" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="947" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="1041" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x08"><bounds x="1135" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY6" inputmask="0x20"><bounds x="656" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY5" inputmask="0x02"><bounds x="738" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x08"><bounds x="820" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x10"><bounds x="902" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY4" inputmask="0x01"><bounds x="984" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY4" inputmask="0x04"><bounds x="1066" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x10"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x20"><bounds x="656" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x02"><bounds x="738" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x08"><bounds x="820" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x10"><bounds x="902" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x01"><bounds x="984" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x04"><bounds x="1066" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x10"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="704" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="807" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="947" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="1041" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x08"><bounds x="1135" y="108" width="44" height="252" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="1278" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="1381" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="1521" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1615" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1709" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x20"><bounds x="1230" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY3" inputmask="0x02"><bounds x="1312" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x08"><bounds x="1394" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x10"><bounds x="1476" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY2" inputmask="0x01"><bounds x="1558" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY2" inputmask="0x04"><bounds x="1640" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x10"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="1230" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="1312" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x08"><bounds x="1394" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="1476" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="1558" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x04"><bounds x="1640" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x10"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="1278" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="1381" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="1521" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1615" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1709" y="108" width="44" height="252" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="1852" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x04"><bounds x="1955" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="2095" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x02"><bounds x="2189" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="2283" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x20"><bounds x="1804" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY1" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x08"><bounds x="1968" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x10"><bounds x="2050" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY0" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY0" inputmask="0x04"><bounds x="2214" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x10"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x20"><bounds x="1804" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x08"><bounds x="1968" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="2050" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x04"><bounds x="2214" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x10"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="1852" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x04"><bounds x="1955" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="2095" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x02"><bounds x="2189" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="2283" y="108" width="44" height="252" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY0" inputmask="0x20"><bounds x="2378" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x20"><bounds x="2378" y="108" width="79" height="424" /></element>
</group>
<view name="Keyboard">
diff --git a/src/mame/layout/pss31.lay b/src/mame/layout/pss31.lay
index 4a8c868cfd4..acff807f363 100644
--- a/src/mame/layout/pss31.lay
+++ b/src/mame/layout/pss31.lay
@@ -70,36 +70,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="79" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="79" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="252" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="248" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -198,63 +168,63 @@ license:CC0-1.0
<element ref="chord_keys"><bounds x="980" y="70" width="500" height="25"/></element>
<!-- octave 1 -->
- <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="130" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="233" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="373" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="467" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x08"><bounds x="561" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY6" inputmask="0x20"><bounds x="82" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY5" inputmask="0x02"><bounds x="164" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x08"><bounds x="246" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY5" inputmask="0x10"><bounds x="328" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY4" inputmask="0x01"><bounds x="410" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY4" inputmask="0x04"><bounds x="492" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x10"><bounds x="574" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY6" inputmask="0x20"><bounds x="82" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x02"><bounds x="164" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x08"><bounds x="246" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x10"><bounds x="328" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x01"><bounds x="410" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x04"><bounds x="492" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x10"><bounds x="574" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x01"><bounds x="130" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x04"><bounds x="233" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY5" inputmask="0x20"><bounds x="373" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x02"><bounds x="467" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x08"><bounds x="561" y="108" width="44" height="252" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="704" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="807" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="947" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1041" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1135" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x20"><bounds x="656" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY3" inputmask="0x02"><bounds x="738" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY3" inputmask="0x08"><bounds x="820" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x10"><bounds x="902" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY2" inputmask="0x01"><bounds x="984" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY2" inputmask="0x04"><bounds x="1066" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY2" inputmask="0x10"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x20"><bounds x="656" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x02"><bounds x="738" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x08"><bounds x="820" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="902" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x01"><bounds x="984" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x04"><bounds x="1066" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x10"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x01"><bounds x="704" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x04"><bounds x="807" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x20"><bounds x="947" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x02"><bounds x="1041" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1135" y="108" width="44" height="252" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="1278" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x04"><bounds x="1381" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="1521" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x02"><bounds x="1615" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1709" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY2" inputmask="0x20"><bounds x="1230" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY1" inputmask="0x02"><bounds x="1312" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x08"><bounds x="1394" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY1" inputmask="0x10"><bounds x="1476" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY0" inputmask="0x01"><bounds x="1558" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY0" inputmask="0x04"><bounds x="1640" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x10"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x20"><bounds x="1230" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x02"><bounds x="1312" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x08"><bounds x="1394" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="1476" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="1558" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x04"><bounds x="1640" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x10"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x01"><bounds x="1278" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x04"><bounds x="1381" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x20"><bounds x="1521" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x02"><bounds x="1615" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1709" y="108" width="44" height="252" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY8" inputmask="0x01"><bounds x="1852" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x04"><bounds x="1955" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY8" inputmask="0x20"><bounds x="2095" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x02"><bounds x="2189" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="2283" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY0" inputmask="0x20"><bounds x="1804" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY8" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY8" inputmask="0x08"><bounds x="1968" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY8" inputmask="0x10"><bounds x="2050" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY7" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY7" inputmask="0x04"><bounds x="2214" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY7" inputmask="0x10"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x20"><bounds x="1804" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x08"><bounds x="1968" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY8" inputmask="0x10"><bounds x="2050" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x04"><bounds x="2214" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x10"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x01"><bounds x="1852" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x04"><bounds x="1955" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY8" inputmask="0x20"><bounds x="2095" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x02"><bounds x="2189" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY7" inputmask="0x08"><bounds x="2283" y="108" width="44" height="252" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY7" inputmask="0x20"><bounds x="2378" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x20"><bounds x="2378" y="108" width="79" height="424" /></element>
</group>
<view name="Keyboard">
diff --git a/src/mame/layout/pss6.lay b/src/mame/layout/pss6.lay
index 89095f3c053..2fcf9ca8b3b 100644
--- a/src/mame/layout/pss6.lay
+++ b/src/mame/layout/pss6.lay
@@ -178,36 +178,6 @@ license:CC0-1.0
<rect state="0"><bounds x="0" y="0" width="79" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
<rect state="1"><bounds x="0" y="0" width="79" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
</element>
- <element name="whitekey-l" defstate="0">
- <rect state="0"><bounds x="0" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="0" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-m" defstate="0">
- <rect state="0"><bounds x="13" y="0" width="53" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="13" y="0" width="53" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-lm" defstate="0">
- <rect state="0"><bounds x="10" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="10" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-rm" defstate="0">
- <rect state="0"><bounds x="22" y="0" width="44" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="22" y="0" width="44" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
- <element name="whitekey-r" defstate="0">
- <rect state="0"><bounds x="34" y="0" width="45" height="252" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="0"><bounds x="0" y="252" width="79" height="172" /><color red="1.0" green="1.0" blue="1.0" /></rect>
- <rect state="1"><bounds x="34" y="0" width="45" height="252" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- <rect state="1"><bounds x="0" y="252" width="79" height="172" /><color red="0.9" green="0.9" blue="0.9" /></rect>
- </element>
<element name="blackkey" defstate="0">
<rect state="0"><bounds x="0" y="0" width="44" height="252" /><color red="0.0" green="0.0" blue="0.0" /></rect>
<rect state="0"><bounds x="4" y="0" width="36" height="248" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -349,44 +319,44 @@ license:CC0-1.0
<element ref="keyfill"><bounds x="892" y="98" width="1576" height="444" /></element>
<!-- octave 2 -->
- <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="947" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="1041" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x10"><bounds x="1135" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY0" inputmask="0x20"><bounds x="902" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY3" inputmask="0x10"><bounds x="984" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY1" inputmask="0x10"><bounds x="1066" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x08"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x20"><bounds x="902" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x10"><bounds x="984" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x10"><bounds x="1066" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x08"><bounds x="1148" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x10"><bounds x="947" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x10"><bounds x="1041" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x10"><bounds x="1135" y="108" width="44" height="252" /></element>
<!-- octave 3 -->
- <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1278" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="1521" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY0" inputmask="0x04"><bounds x="1615" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x02"><bounds x="1709" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x08"><bounds x="1230" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY1" inputmask="0x08"><bounds x="1312" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY4" inputmask="0x04"><bounds x="1394" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY3" inputmask="0x04"><bounds x="1476" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY1" inputmask="0x04"><bounds x="1558" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY7" inputmask="0x02"><bounds x="1640" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY5" inputmask="0x02"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x08"><bounds x="1230" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x08"><bounds x="1312" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x04"><bounds x="1394" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x04"><bounds x="1476" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x04"><bounds x="1558" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x02"><bounds x="1640" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x02"><bounds x="1722" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x08"><bounds x="1278" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x08"><bounds x="1381" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x04"><bounds x="1521" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY0" inputmask="0x04"><bounds x="1615" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x02"><bounds x="1709" y="108" width="44" height="252" /></element>
<!-- octave 4 -->
- <element ref="blackkey" inputtag="KEY3" inputmask="0x02"><bounds x="1852" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="1955" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY6" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY4" inputmask="0x01"><bounds x="2189" y="108" width="44" height="252" /></element>
- <element ref="blackkey" inputtag="KEY2" inputmask="0x01"><bounds x="2283" y="108" width="44" height="252" /></element>
- <element ref="whitekey-l" inputtag="KEY4" inputmask="0x02"><bounds x="1804" y="108" width="79" height="424" /></element>
- <element ref="whitekey-m" inputtag="KEY2" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY0" inputmask="0x02"><bounds x="1968" y="108" width="79" height="424" /></element>
- <element ref="whitekey-l" inputtag="KEY7" inputmask="0x01"><bounds x="2050" y="108" width="79" height="424" /></element>
- <element ref="whitekey-lm" inputtag="KEY5" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
- <element ref="whitekey-rm" inputtag="KEY3" inputmask="0x01"><bounds x="2214" y="108" width="79" height="424" /></element>
- <element ref="whitekey-r" inputtag="KEY1" inputmask="0x01"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY4" inputmask="0x02"><bounds x="1804" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY2" inputmask="0x02"><bounds x="1886" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x02"><bounds x="1968" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY7" inputmask="0x01"><bounds x="2050" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY5" inputmask="0x01"><bounds x="2132" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY3" inputmask="0x01"><bounds x="2214" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY1" inputmask="0x01"><bounds x="2296" y="108" width="79" height="424" /></element>
+ <element ref="blackkey" inputtag="KEY3" inputmask="0x02"><bounds x="1852" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY1" inputmask="0x02"><bounds x="1955" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY6" inputmask="0x01"><bounds x="2095" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY4" inputmask="0x01"><bounds x="2189" y="108" width="44" height="252" /></element>
+ <element ref="blackkey" inputtag="KEY2" inputmask="0x01"><bounds x="2283" y="108" width="44" height="252" /></element>
<!-- final key -->
- <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="2378" y="108" width="79" height="424" /></element>
+ <element ref="whitekey" inputtag="KEY0" inputmask="0x01"><bounds x="2378" y="108" width="79" height="424" /></element>
</group>
<view name="Keyboard">