Skip to content

Commit 70f3d22

Browse files
devinackerdevinacker
authored
update element order in four more Yamaha keyboard layouts (#14194)
1 parent 1c5fd70 commit 70f3d22

File tree

4 files changed

+119
-239
lines changed

4 files changed

+119
-239
lines changed

‎src/mame/layout/dx100.lay‎

Lines changed: 28 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -785,36 +785,6 @@ license:CC0-1.0
785785
<rect state="0"><bounds x="0" y="0" width="45" height="504" /><color red="1.0" green="1.0" blue="1.0" /></rect>
786786
<rect state="1"><bounds x="0" y="0" width="45" height="504" /><color red="0.9" green="0.9" blue="0.9" /></rect>
787787
</element>
788-
<element name="whitekey-l" defstate="0">
789-
<rect state="0"><bounds x="0" y="0" width="45" height="280" /><color red="1.0" green="1.0" blue="1.0" /></rect>
790-
<rect state="0"><bounds x="0" y="280" width="79" height="224" /><color red="1.0" green="1.0" blue="1.0" /></rect>
791-
<rect state="1"><bounds x="0" y="0" width="45" height="280" /><color red="0.9" green="0.9" blue="0.9" /></rect>
792-
<rect state="1"><bounds x="0" y="280" width="79" height="224" /><color red="0.9" green="0.9" blue="0.9" /></rect>
793-
</element>
794-
<element name="whitekey-m" defstate="0">
795-
<rect state="0"><bounds x="13" y="0" width="53" height="280" /><color red="1.0" green="1.0" blue="1.0" /></rect>
796-
<rect state="0"><bounds x="0" y="280" width="79" height="224" /><color red="1.0" green="1.0" blue="1.0" /></rect>
797-
<rect state="1"><bounds x="13" y="0" width="53" height="280" /><color red="0.9" green="0.9" blue="0.9" /></rect>
798-
<rect state="1"><bounds x="0" y="280" width="79" height="224" /><color red="0.9" green="0.9" blue="0.9" /></rect>
799-
</element>
800-
<element name="whitekey-lm" defstate="0">
801-
<rect state="0"><bounds x="10" y="0" width="44" height="280" /><color red="1.0" green="1.0" blue="1.0" /></rect>
802-
<rect state="0"><bounds x="0" y="280" width="79" height="224" /><color red="1.0" green="1.0" blue="1.0" /></rect>
803-
<rect state="1"><bounds x="10" y="0" width="44" height="280" /><color red="0.9" green="0.9" blue="0.9" /></rect>
804-
<rect state="1"><bounds x="0" y="280" width="79" height="224" /><color red="0.9" green="0.9" blue="0.9" /></rect>
805-
</element>
806-
<element name="whitekey-rm" defstate="0">
807-
<rect state="0"><bounds x="22" y="0" width="44" height="280" /><color red="1.0" green="1.0" blue="1.0" /></rect>
808-
<rect state="0"><bounds x="0" y="280" width="79" height="224" /><color red="1.0" green="1.0" blue="1.0" /></rect>
809-
<rect state="1"><bounds x="22" y="0" width="44" height="280" /><color red="0.9" green="0.9" blue="0.9" /></rect>
810-
<rect state="1"><bounds x="0" y="280" width="79" height="224" /><color red="0.9" green="0.9" blue="0.9" /></rect>
811-
</element>
812-
<element name="whitekey-r" defstate="0">
813-
<rect state="0"><bounds x="34" y="0" width="45" height="280" /><color red="1.0" green="1.0" blue="1.0" /></rect>
814-
<rect state="0"><bounds x="0" y="280" width="79" height="224" /><color red="1.0" green="1.0" blue="1.0" /></rect>
815-
<rect state="1"><bounds x="34" y="0" width="45" height="280" /><color red="0.9" green="0.9" blue="0.9" /></rect>
816-
<rect state="1"><bounds x="0" y="280" width="79" height="224" /><color red="0.9" green="0.9" blue="0.9" /></rect>
817-
</element>
818788
<element name="blackkey" defstate="0">
819789
<rect state="0"><bounds x="0" y="0" width="44" height="272" /><color red="0.0" green="0.0" blue="0.0" /></rect>
820790
<rect state="0"><bounds x="4" y="0" width="36" height="268" /><color red="0.1" green="0.1" blue="0.1" /></rect>
@@ -833,60 +803,60 @@ license:CC0-1.0
833803
-->
834804

835805
<!-- octave 0 -->
806+
<element ref="whitekey" inputtag="P6_15" inputmask="0x01"><bounds x="574" y="504" width="79" height="504" /></element>
807+
<element ref="whitekey" inputtag="P6_5" inputmask="0x02"><bounds x="656" y="504" width="79" height="504" /></element>
808+
<element ref="whitekey" inputtag="P6_7" inputmask="0x02"><bounds x="738" y="504" width="79" height="504" /></element>
809+
<element ref="whitekey" inputtag="P6_8" inputmask="0x02"><bounds x="820" y="504" width="79" height="504" /></element>
810+
<element ref="whitekey" inputtag="P6_10" inputmask="0x02"><bounds x="902" y="504" width="79" height="504" /></element>
811+
<element ref="whitekey" inputtag="P6_12" inputmask="0x02"><bounds x="984" y="504" width="79" height="504" /></element>
812+
<element ref="whitekey" inputtag="P6_14" inputmask="0x02"><bounds x="1066" y="504" width="79" height="504" /></element>
836813
<element ref="blackkey" inputtag="P6_4" inputmask="0x02"><bounds x="622" y="504" width="44" height="272" /></element>
837814
<element ref="blackkey" inputtag="P6_6" inputmask="0x02"><bounds x="725" y="504" width="44" height="272" /></element>
838815
<element ref="blackkey" inputtag="P6_9" inputmask="0x02"><bounds x="865" y="504" width="44" height="272" /></element>
839816
<element ref="blackkey" inputtag="P6_11" inputmask="0x02"><bounds x="959" y="504" width="44" height="272" /></element>
840817
<element ref="blackkey" inputtag="P6_13" inputmask="0x02"><bounds x="1053" y="504" width="44" height="272" /></element>
841-
<element ref="whitekey-l" inputtag="P6_15" inputmask="0x01"><bounds x="574" y="504" width="79" height="504" /></element>
842-
<element ref="whitekey-m" inputtag="P6_5" inputmask="0x02"><bounds x="656" y="504" width="79" height="504" /></element>
843-
<element ref="whitekey-r" inputtag="P6_7" inputmask="0x02"><bounds x="738" y="504" width="79" height="504" /></element>
844-
<element ref="whitekey-l" inputtag="P6_8" inputmask="0x02"><bounds x="820" y="504" width="79" height="504" /></element>
845-
<element ref="whitekey-lm" inputtag="P6_10" inputmask="0x02"><bounds x="902" y="504" width="79" height="504" /></element>
846-
<element ref="whitekey-rm" inputtag="P6_12" inputmask="0x02"><bounds x="984" y="504" width="79" height="504" /></element>
847-
<element ref="whitekey-r" inputtag="P6_14" inputmask="0x02"><bounds x="1066" y="504" width="79" height="504" /></element>
848818

849819
<!-- octave 1 -->
820+
<element ref="whitekey" inputtag="P6_15" inputmask="0x02"><bounds x="1148" y="504" width="79" height="504" /></element>
821+
<element ref="whitekey" inputtag="P6_5" inputmask="0x04"><bounds x="1230" y="504" width="79" height="504" /></element>
822+
<element ref="whitekey" inputtag="P6_7" inputmask="0x04"><bounds x="1312" y="504" width="79" height="504" /></element>
823+
<element ref="whitekey" inputtag="P6_8" inputmask="0x04"><bounds x="1394" y="504" width="79" height="504" /></element>
824+
<element ref="whitekey" inputtag="P6_10" inputmask="0x04"><bounds x="1476" y="504" width="79" height="504" /></element>
825+
<element ref="whitekey" inputtag="P6_12" inputmask="0x04"><bounds x="1558" y="504" width="79" height="504" /></element>
826+
<element ref="whitekey" inputtag="P6_14" inputmask="0x04"><bounds x="1640" y="504" width="79" height="504" /></element>
850827
<element ref="blackkey" inputtag="P6_4" inputmask="0x04"><bounds x="1196" y="504" width="44" height="272" /></element>
851828
<element ref="blackkey" inputtag="P6_6" inputmask="0x04"><bounds x="1299" y="504" width="44" height="272" /></element>
852829
<element ref="blackkey" inputtag="P6_9" inputmask="0x04"><bounds x="1439" y="504" width="44" height="272" /></element>
853830
<element ref="blackkey" inputtag="P6_11" inputmask="0x04"><bounds x="1533" y="504" width="44" height="272" /></element>
854831
<element ref="blackkey" inputtag="P6_13" inputmask="0x04"><bounds x="1627" y="504" width="44" height="272" /></element>
855-
<element ref="whitekey-l" inputtag="P6_15" inputmask="0x02"><bounds x="1148" y="504" width="79" height="504" /></element>
856-
<element ref="whitekey-m" inputtag="P6_5" inputmask="0x04"><bounds x="1230" y="504" width="79" height="504" /></element>
857-
<element ref="whitekey-r" inputtag="P6_7" inputmask="0x04"><bounds x="1312" y="504" width="79" height="504" /></element>
858-
<element ref="whitekey-l" inputtag="P6_8" inputmask="0x04"><bounds x="1394" y="504" width="79" height="504" /></element>
859-
<element ref="whitekey-lm" inputtag="P6_10" inputmask="0x04"><bounds x="1476" y="504" width="79" height="504" /></element>
860-
<element ref="whitekey-rm" inputtag="P6_12" inputmask="0x04"><bounds x="1558" y="504" width="79" height="504" /></element>
861-
<element ref="whitekey-r" inputtag="P6_14" inputmask="0x04"><bounds x="1640" y="504" width="79" height="504" /></element>
862832

863833
<!-- octave 2 -->
834+
<element ref="whitekey" inputtag="P6_15" inputmask="0x04"><bounds x="1722" y="504" width="79" height="504" /></element>
835+
<element ref="whitekey" inputtag="P6_5" inputmask="0x08"><bounds x="1804" y="504" width="79" height="504" /></element>
836+
<element ref="whitekey" inputtag="P6_7" inputmask="0x08"><bounds x="1886" y="504" width="79" height="504" /></element>
837+
<element ref="whitekey" inputtag="P6_8" inputmask="0x08"><bounds x="1968" y="504" width="79" height="504" /></element>
838+
<element ref="whitekey" inputtag="P6_10" inputmask="0x08"><bounds x="2050" y="504" width="79" height="504" /></element>
839+
<element ref="whitekey" inputtag="P6_12" inputmask="0x08"><bounds x="2132" y="504" width="79" height="504" /></element>
840+
<element ref="whitekey" inputtag="P6_14" inputmask="0x08"><bounds x="2214" y="504" width="79" height="504" /></element>
864841
<element ref="blackkey" inputtag="P6_4" inputmask="0x08"><bounds x="1770" y="504" width="44" height="272" /></element>
865842
<element ref="blackkey" inputtag="P6_6" inputmask="0x08"><bounds x="1873" y="504" width="44" height="272" /></element>
866843
<element ref="blackkey" inputtag="P6_9" inputmask="0x08"><bounds x="2013" y="504" width="44" height="272" /></element>
867844
<element ref="blackkey" inputtag="P6_11" inputmask="0x08"><bounds x="2107" y="504" width="44" height="272" /></element>
868845
<element ref="blackkey" inputtag="P6_13" inputmask="0x08"><bounds x="2201" y="504" width="44" height="272" /></element>
869-
<element ref="whitekey-l" inputtag="P6_15" inputmask="0x04"><bounds x="1722" y="504" width="79" height="504" /></element>
870-
<element ref="whitekey-m" inputtag="P6_5" inputmask="0x08"><bounds x="1804" y="504" width="79" height="504" /></element>
871-
<element ref="whitekey-r" inputtag="P6_7" inputmask="0x08"><bounds x="1886" y="504" width="79" height="504" /></element>
872-
<element ref="whitekey-l" inputtag="P6_8" inputmask="0x08"><bounds x="1968" y="504" width="79" height="504" /></element>
873-
<element ref="whitekey-lm" inputtag="P6_10" inputmask="0x08"><bounds x="2050" y="504" width="79" height="504" /></element>
874-
<element ref="whitekey-rm" inputtag="P6_12" inputmask="0x08"><bounds x="2132" y="504" width="79" height="504" /></element>
875-
<element ref="whitekey-r" inputtag="P6_14" inputmask="0x08"><bounds x="2214" y="504" width="79" height="504" /></element>
876846

877847
<!-- octave 3 -->
848+
<element ref="whitekey" inputtag="P6_15" inputmask="0x08"><bounds x="2296" y="504" width="79" height="504" /></element>
849+
<element ref="whitekey" inputtag="P6_5" inputmask="0x10"><bounds x="2378" y="504" width="79" height="504" /></element>
850+
<element ref="whitekey" inputtag="P6_7" inputmask="0x10"><bounds x="2460" y="504" width="79" height="504" /></element>
851+
<element ref="whitekey" inputtag="P6_8" inputmask="0x10"><bounds x="2542" y="504" width="79" height="504" /></element>
852+
<element ref="whitekey" inputtag="P6_10" inputmask="0x10"><bounds x="2624" y="504" width="79" height="504" /></element>
853+
<element ref="whitekey" inputtag="P6_12" inputmask="0x10"><bounds x="2706" y="504" width="79" height="504" /></element>
854+
<element ref="whitekey" inputtag="P6_14" inputmask="0x10"><bounds x="2788" y="504" width="79" height="504" /></element>
878855
<element ref="blackkey" inputtag="P6_4" inputmask="0x10"><bounds x="2344" y="504" width="44" height="272" /></element>
879856
<element ref="blackkey" inputtag="P6_6" inputmask="0x10"><bounds x="2447" y="504" width="44" height="272" /></element>
880857
<element ref="blackkey" inputtag="P6_9" inputmask="0x10"><bounds x="2587" y="504" width="44" height="272" /></element>
881858
<element ref="blackkey" inputtag="P6_11" inputmask="0x10"><bounds x="2681" y="504" width="44" height="272" /></element>
882859
<element ref="blackkey" inputtag="P6_13" inputmask="0x10"><bounds x="2775" y="504" width="44" height="272" /></element>
883-
<element ref="whitekey-l" inputtag="P6_15" inputmask="0x08"><bounds x="2296" y="504" width="79" height="504" /></element>
884-
<element ref="whitekey-m" inputtag="P6_5" inputmask="0x10"><bounds x="2378" y="504" width="79" height="504" /></element>
885-
<element ref="whitekey-r" inputtag="P6_7" inputmask="0x10"><bounds x="2460" y="504" width="79" height="504" /></element>
886-
<element ref="whitekey-l" inputtag="P6_8" inputmask="0x10"><bounds x="2542" y="504" width="79" height="504" /></element>
887-
<element ref="whitekey-lm" inputtag="P6_10" inputmask="0x10"><bounds x="2624" y="504" width="79" height="504" /></element>
888-
<element ref="whitekey-rm" inputtag="P6_12" inputmask="0x10"><bounds x="2706" y="504" width="79" height="504" /></element>
889-
<element ref="whitekey-r" inputtag="P6_14" inputmask="0x10"><bounds x="2788" y="504" width="79" height="504" /></element>
890860

891861
<!-- final key -->
892862
<element ref="whitekey" inputtag="P6_15" inputmask="0x10"><bounds x="2870" y="504" width="79" height="504" /></element>

0 commit comments

Comments
 (0)