summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emu/rendlay.cpp80
-rw-r--r--src/frontend/mame/clifront.cpp22
-rw-r--r--src/mame/drivers/micro20.cpp4
-rw-r--r--src/mame/layout/aim65_40.lay147
-rw-r--r--src/mame/layout/rocknms.lay4
-rw-r--r--src/mame/layout/stepstag.lay6
-rw-r--r--src/mame/layout/svmu.lay5
-rw-r--r--src/mame/layout/whousetc.lay266
-rw-r--r--src/osd/modules/netdev/taptun.cpp7
9 files changed, 310 insertions, 231 deletions
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp
index 1d5dd7eadd5..7a926ba8963 100644
--- a/src/emu/rendlay.cpp
+++ b/src/emu/rendlay.cpp
@@ -129,7 +129,7 @@ private:
, m_int_increment(i)
, m_shift(s)
, m_text_valid(true)
- , m_incrementing(true)
+ , m_generator(true)
{ }
entry(std::string &&name, std::string &&t, double i, int s)
: m_name(std::move(name))
@@ -137,7 +137,7 @@ private:
, m_float_increment(i)
, m_shift(s)
, m_text_valid(true)
- , m_incrementing(true)
+ , m_generator(true)
{ }
entry(entry &&) = default;
entry &operator=(entry &&) = default;
@@ -165,7 +165,7 @@ private:
}
std::string const &name() const { return m_name; }
- bool is_incrementing() const { return m_incrementing; }
+ bool is_generator() const { return m_generator; }
std::string const &get_text()
{
@@ -187,7 +187,7 @@ private:
void increment()
{
- if (is_incrementing())
+ if (is_generator())
{
// apply increment
if (m_float_increment)
@@ -342,7 +342,7 @@ private:
bool m_text_valid = false;
bool m_int_valid = false;
bool m_float_valid = false;
- bool m_incrementing = false;
+ bool m_generator = false;
};
using entry_vector = std::vector<entry>;
@@ -631,7 +631,7 @@ public:
throw layout_syntax_error("increment attribute must be a number");
}
- // don't allow incrementing parameters to be redefined
+ // don't allow generator parameters to be redefined
if (init)
{
entry_vector::iterator const pos(
@@ -641,7 +641,7 @@ public:
name,
[] (entry const &lhs, auto const &rhs) { return lhs.name() < rhs; }));
if ((m_entries.end() != pos) && (pos->name() == name))
- throw layout_syntax_error("incrementing parameters must be defined exactly once per scope");
+ throw layout_syntax_error("generator parameters must be defined exactly once per scope");
std::pair<char const *, char const *> const expanded(expand(start));
if (floatincrement)
@@ -668,8 +668,8 @@ public:
[] (entry const &lhs, auto const &rhs) { return lhs.name() < rhs; }));
if ((m_entries.end() == pos) || (pos->name() != name))
m_entries.emplace(pos, std::move(name), std::string(expanded.first, expanded.second));
- else if (pos->is_incrementing())
- throw layout_syntax_error("incrementing parameters must be defined exactly once per scope");
+ else if (pos->is_generator())
+ throw layout_syntax_error("generator parameters must be defined exactly once per scope");
else
pos->set(std::string(expanded.first, expanded.second));
}
@@ -677,8 +677,18 @@ public:
void increment_parameters()
{
- for (entry &e : m_entries)
- e.increment();
+ m_entries.erase(
+ std::remove_if(
+ m_entries.begin(),
+ m_entries.end(),
+ [] (entry &e)
+ {
+ if (!e.is_generator())
+ return true;
+ e.increment();
+ return false;
+ }),
+ m_entries.end());
}
char const *get_attribute_string(util::xml::data_node const &node, char const *name, char const *defvalue)
@@ -1188,24 +1198,24 @@ private:
ru_imgformat const format = render_detect_image(*m_file, m_dirname.c_str(), m_imagefile.c_str());
switch (format)
{
- case RENDUTIL_IMGFORMAT_ERROR:
- break;
-
- case RENDUTIL_IMGFORMAT_PNG:
- // load the basic bitmap
- m_hasalpha = render_load_png(m_bitmap, *m_file, m_dirname.c_str(), m_imagefile.c_str());
+ case RENDUTIL_IMGFORMAT_ERROR:
+ break;
- // load the alpha bitmap if specified
- if (m_bitmap.valid() && !m_alphafile.empty())
- render_load_png(m_bitmap, *m_file, m_dirname.c_str(), m_alphafile.c_str(), true);
- break;
+ case RENDUTIL_IMGFORMAT_PNG:
+ // load the basic bitmap
+ m_hasalpha = render_load_png(m_bitmap, *m_file, m_dirname.c_str(), m_imagefile.c_str());
+ break;
- default:
- // try JPG
- render_load_jpeg(m_bitmap, *m_file, m_dirname.c_str(), m_imagefile.c_str());
- break;
+ default:
+ // try JPG
+ render_load_jpeg(m_bitmap, *m_file, m_dirname.c_str(), m_imagefile.c_str());
+ break;
}
+ // load the alpha bitmap if specified
+ if (m_bitmap.valid() && !m_alphafile.empty())
+ render_load_png(m_bitmap, *m_file, m_dirname.c_str(), m_alphafile.c_str(), true);
+
// if we can't load the bitmap, allocate a dummy one and report an error
if (!m_bitmap.valid())
{
@@ -1399,31 +1409,31 @@ protected:
tempbitmap.fill(rgb_t(0xff,0x00,0x00,0x00));
// top bar
- draw_segment_horizontal(tempbitmap, 0 + 2*segwidth/3, bmwidth - 2*segwidth/3, 0 + segwidth/2, segwidth, (state & (1 << 0)) ? onpen : offpen);
+ draw_segment_horizontal(tempbitmap, 0 + 2*segwidth/3, bmwidth - 2*segwidth/3, 0 + segwidth/2, segwidth, BIT(state, 0) ? onpen : offpen);
// top-right bar
- draw_segment_vertical(tempbitmap, 0 + 2*segwidth/3, bmheight/2 - segwidth/3, bmwidth - segwidth/2, segwidth, (state & (1 << 1)) ? onpen : offpen);
+ draw_segment_vertical(tempbitmap, 0 + 2*segwidth/3, bmheight/2 - segwidth/3, bmwidth - segwidth/2, segwidth, BIT(state, 1) ? onpen : offpen);
// bottom-right bar
- draw_segment_vertical(tempbitmap, bmheight/2 + segwidth/3, bmheight - 2*segwidth/3, bmwidth - segwidth/2, segwidth, (state & (1 << 2)) ? onpen : offpen);
+ draw_segment_vertical(tempbitmap, bmheight/2 + segwidth/3, bmheight - 2*segwidth/3, bmwidth - segwidth/2, segwidth, BIT(state, 2) ? onpen : offpen);
// bottom bar
- draw_segment_horizontal(tempbitmap, 0 + 2*segwidth/3, bmwidth - 2*segwidth/3, bmheight - segwidth/2, segwidth, (state & (1 << 3)) ? onpen : offpen);
+ draw_segment_horizontal(tempbitmap, 0 + 2*segwidth/3, bmwidth - 2*segwidth/3, bmheight - segwidth/2, segwidth, BIT(state, 3) ? onpen : offpen);
// bottom-left bar
- draw_segment_vertical(tempbitmap, bmheight/2 + segwidth/3, bmheight - 2*segwidth/3, 0 + segwidth/2, segwidth, (state & (1 << 4)) ? onpen : offpen);
+ draw_segment_vertical(tempbitmap, bmheight/2 + segwidth/3, bmheight - 2*segwidth/3, 0 + segwidth/2, segwidth, BIT(state, 4) ? onpen : offpen);
// top-left bar
- draw_segment_vertical(tempbitmap, 0 + 2*segwidth/3, bmheight/2 - segwidth/3, 0 + segwidth/2, segwidth, (state & (1 << 5)) ? onpen : offpen);
+ draw_segment_vertical(tempbitmap, 0 + 2*segwidth/3, bmheight/2 - segwidth/3, 0 + segwidth/2, segwidth, BIT(state, 5) ? onpen : offpen);
// middle bar
- draw_segment_horizontal(tempbitmap, 0 + 2*segwidth/3, bmwidth - 2*segwidth/3, bmheight/2, segwidth, (state & (1 << 6)) ? onpen : offpen);
+ draw_segment_horizontal(tempbitmap, 0 + 2*segwidth/3, bmwidth - 2*segwidth/3, bmheight/2, segwidth, BIT(state, 6) ? onpen : offpen);
// apply skew
apply_skew(tempbitmap, 40);
// decimal point
- draw_segment_decimal(tempbitmap, bmwidth + segwidth/2, bmheight - segwidth/2, segwidth, (state & (1 << 7)) ? onpen : offpen);
+ draw_segment_decimal(tempbitmap, bmwidth + segwidth/2, bmheight - segwidth/2, segwidth, BIT(state, 7) ? onpen : offpen);
// resample to the target size
render_resample_argb_bitmap_hq(dest, tempbitmap, color());
@@ -2014,7 +2024,7 @@ protected:
tempbitmap.fill(rgb_t(0xff, 0x00, 0x00, 0x00));
for (int i = 0; i < m_dots; i++)
- draw_segment_decimal(tempbitmap, ((dotwidth/2 )+ (i * dotwidth)), bmheight/2, dotwidth, (state & (1 << i))?onpen:offpen);
+ draw_segment_decimal(tempbitmap, ((dotwidth / 2) + (i * dotwidth)), bmheight / 2, dotwidth, BIT(state, i) ? onpen : offpen);
// resample to the target size
render_resample_argb_bitmap_hq(dest, tempbitmap, color());
@@ -2155,7 +2165,7 @@ protected:
{
int basey;
- if (m_reelreversed==1)
+ if (m_reelreversed)
{
basey = bounds.top() + ((use_state)*(ourheight/num_shown)/(max_state_used/m_numstops)) + curry;
}
diff --git a/src/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp
index 60260556606..581d6edd62f 100644
--- a/src/frontend/mame/clifront.cpp
+++ b/src/frontend/mame/clifront.cpp
@@ -83,7 +83,7 @@ const options_entry cli_option_entries[] =
/* core commands */
{ nullptr, nullptr, OPTION_HEADER, "CORE COMMANDS" },
{ CLICOMMAND_HELP ";h;?", "0", OPTION_COMMAND, "show help message" },
- { CLICOMMAND_VALIDATE ";valid", "0", OPTION_COMMAND, "perform driver validation on game drivers" },
+ { CLICOMMAND_VALIDATE ";valid", "0", OPTION_COMMAND, "perform validation on system drivers and devices" },
/* configuration commands */
{ nullptr, nullptr, OPTION_HEADER, "CONFIGURATION COMMANDS" },
@@ -552,7 +552,7 @@ void cli_frontend::listcrc(const std::vector<std::string> &args)
// determine which drivers to output; return an error if none found
driver_enumerator drivlist(m_options, gamename);
if (drivlist.count() == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
// iterate through matches, and then through ROMs
while (drivlist.next())
@@ -720,7 +720,7 @@ void cli_frontend::listsamples(const std::vector<std::string> &args)
// determine which drivers to output; return an error if none found
driver_enumerator drivlist(m_options, gamename);
if (drivlist.count() == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
// iterate over drivers, looking for SAMPLES devices
bool first = true;
@@ -760,7 +760,7 @@ void cli_frontend::listdevices(const std::vector<std::string> &args)
// determine which drivers to output; return an error if none found
driver_enumerator drivlist(m_options, gamename);
if (drivlist.count() == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
// iterate over drivers, looking for SAMPLES devices
bool first = true;
@@ -845,7 +845,7 @@ void cli_frontend::listslots(const std::vector<std::string> &args)
// determine which drivers to output; return an error if none found
driver_enumerator drivlist(m_options, gamename);
if (drivlist.count() == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
// print header
printf("%-16s %-16s %-16s %s\n", "SYSTEM", "SLOT NAME", "SLOT OPTIONS", "SLOT DEVICE NAME");
@@ -913,7 +913,7 @@ void cli_frontend::listmedia(const std::vector<std::string> &args)
// determine which drivers to output; return an error if none found
driver_enumerator drivlist(m_options, gamename);
if (drivlist.count() == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
// print header
printf("%-16s %-16s %-10s %s\n", "SYSTEM", "MEDIA NAME", "(brief)", "IMAGE FILE EXTENSIONS SUPPORTED");
@@ -1114,7 +1114,7 @@ void cli_frontend::verifysamples(const std::vector<std::string> &args)
// return an error if none found
if (matched == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
// if we didn't get anything at all, display a generic end message
if (matched > 0 && correct == 0 && incorrect == 0)
@@ -1327,7 +1327,7 @@ void cli_frontend::listsoftware(const std::vector<std::string> &args)
// determine which drivers to output; return an error if none found
driver_enumerator drivlist(m_options, gamename);
if (drivlist.count() == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
while (drivlist.next())
{
@@ -1372,9 +1372,7 @@ void cli_frontend::verifysoftware(const std::vector<std::string> &args)
// determine which drivers to process; return an error if none found
driver_enumerator drivlist(m_options, gamename);
if (drivlist.count() == 0)
- {
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
- }
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
media_auditor auditor(drivlist);
util::ovectorstream summary_string;
@@ -1412,7 +1410,7 @@ void cli_frontend::verifysoftware(const std::vector<std::string> &args)
// return an error if none found
if (matched == 0)
- throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
+ throw emu_fatalerror(EMU_ERR_NO_SUCH_GAME, "No matching systems found for '%s'", gamename);
// if we didn't get anything at all, display a generic end message
if (matched > 0 && correct == 0 && incorrect == 0)
diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp
index 05b11e2b6a0..26ad1f003a7 100644
--- a/src/mame/drivers/micro20.cpp
+++ b/src/mame/drivers/micro20.cpp
@@ -30,8 +30,8 @@
class micro20_state : public driver_device
{
public:
- micro20_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ micro20_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, MAINCPU_TAG),
m_rom(*this, "bootrom"),
m_mainram(*this, "mainram"),
diff --git a/src/mame/layout/aim65_40.lay b/src/mame/layout/aim65_40.lay
index c0b90ebdfb3..e44100700f0 100644
--- a/src/mame/layout/aim65_40.lay
+++ b/src/mame/layout/aim65_40.lay
@@ -10,138 +10,39 @@
<element name="background">
<rect>
- <bounds left="0" top="0" right="1" bottom="1" />
<color red="0.0" green="0.0" blue="0.0" />
</rect>
</element>
- <view name="Default Layout">
-
+ <group name="displays">
<!-- Black background -->
<bezel element="background">
<bounds left="0" top="0" right="1205" bottom="60" />
</bezel>
- <bezel name="digit0" element="digit">
- <bounds left="5" top="5" right="30" bottom="55" />
- </bezel>
- <bezel name="digit1" element="digit">
- <bounds left="35" top="5" right="60" bottom="55" />
- </bezel>
- <bezel name="digit2" element="digit">
- <bounds left="65" top="5" right="90" bottom="55" />
- </bezel>
- <bezel name="digit3" element="digit">
- <bounds left="95" top="5" right="120" bottom="55" />
- </bezel>
- <bezel name="digit4" element="digit">
- <bounds left="125" top="5" right="150" bottom="55" />
- </bezel>
- <bezel name="digit5" element="digit">
- <bounds left="155" top="5" right="180" bottom="55" />
- </bezel>
- <bezel name="digit6" element="digit">
- <bounds left="185" top="5" right="210" bottom="55" />
- </bezel>
- <bezel name="digit7" element="digit">
- <bounds left="215" top="5" right="240" bottom="55" />
- </bezel>
- <bezel name="digit8" element="digit">
- <bounds left="245" top="5" right="270" bottom="55" />
- </bezel>
- <bezel name="digit9" element="digit">
- <bounds left="275" top="5" right="300" bottom="55" />
- </bezel>
- <bezel name="digit10" element="digit">
- <bounds left="305" top="5" right="330" bottom="55" />
- </bezel>
- <bezel name="digit11" element="digit">
- <bounds left="335" top="5" right="360" bottom="55" />
- </bezel>
- <bezel name="digit12" element="digit">
- <bounds left="365" top="5" right="390" bottom="55" />
- </bezel>
- <bezel name="digit13" element="digit">
- <bounds left="395" top="5" right="420" bottom="55" />
- </bezel>
- <bezel name="digit14" element="digit">
- <bounds left="425" top="5" right="450" bottom="55" />
- </bezel>
- <bezel name="digit15" element="digit">
- <bounds left="455" top="5" right="480" bottom="55" />
- </bezel>
- <bezel name="digit16" element="digit">
- <bounds left="485" top="5" right="510" bottom="55" />
- </bezel>
- <bezel name="digit17" element="digit">
- <bounds left="515" top="5" right="540" bottom="55" />
- </bezel>
- <bezel name="digit18" element="digit">
- <bounds left="545" top="5" right="570" bottom="55" />
- </bezel>
- <bezel name="digit19" element="digit">
- <bounds left="575" top="5" right="600" bottom="55" />
- </bezel>
- <bezel name="digit20" element="digit">
- <bounds left="605" top="5" right="630" bottom="55" />
- </bezel>
- <bezel name="digit21" element="digit">
- <bounds left="635" top="5" right="660" bottom="55" />
- </bezel>
- <bezel name="digit22" element="digit">
- <bounds left="665" top="5" right="690" bottom="55" />
- </bezel>
- <bezel name="digit23" element="digit">
- <bounds left="695" top="5" right="720" bottom="55" />
- </bezel>
- <bezel name="digit24" element="digit">
- <bounds left="725" top="5" right="750" bottom="55" />
- </bezel>
- <bezel name="digit25" element="digit">
- <bounds left="755" top="5" right="780" bottom="55" />
- </bezel>
- <bezel name="digit26" element="digit">
- <bounds left="785" top="5" right="810" bottom="55" />
- </bezel>
- <bezel name="digit27" element="digit">
- <bounds left="815" top="5" right="840" bottom="55" />
- </bezel>
- <bezel name="digit28" element="digit">
- <bounds left="845" top="5" right="870" bottom="55" />
- </bezel>
- <bezel name="digit29" element="digit">
- <bounds left="875" top="5" right="900" bottom="55" />
- </bezel>
- <bezel name="digit30" element="digit">
- <bounds left="905" top="5" right="930" bottom="55" />
- </bezel>
- <bezel name="digit31" element="digit">
- <bounds left="935" top="5" right="960" bottom="55" />
- </bezel>
- <bezel name="digit32" element="digit">
- <bounds left="965" top="5" right="990" bottom="55" />
- </bezel>
- <bezel name="digit33" element="digit">
- <bounds left="995" top="5" right="1020" bottom="55" />
- </bezel>
- <bezel name="digit34" element="digit">
- <bounds left="1025" top="5" right="1050" bottom="55" />
- </bezel>
- <bezel name="digit35" element="digit">
- <bounds left="1055" top="5" right="1080" bottom="55" />
- </bezel>
- <bezel name="digit36" element="digit">
- <bounds left="1085" top="5" right="1110" bottom="55" />
- </bezel>
- <bezel name="digit37" element="digit">
- <bounds left="1115" top="5" right="1140" bottom="55" />
- </bezel>
- <bezel name="digit38" element="digit">
- <bounds left="1145" top="5" right="1170" bottom="55" />
- </bezel>
- <bezel name="digit39" element="digit">
- <bounds left="1175" top="5" right="1200" bottom="55" />
- </bezel>
+ <!-- Forty multi-segment displays -->
+ <repeat count="40">
+ <param name="i" start="0" increment="1" />
+ <param name="x" start="5" increment="30" />
+ <bezel name="digit~i~" element="digit">
+ <bounds x="~x~" y="5" width="25" height="50" />
+ </bezel>
+ </repeat>
+ </group>
+
+ <view name="LED Displays">
+ <group ref="displays">
+ <bounds x="0" y="0" width="241" height="12" />
+ </group>
+ </view>
+
+ <view name="Terminal Below">
+ <group ref="displays">
+ <bounds x="0" y="0" width="241" height="12" />
+ </group>
+ <screen index="0">
+ <bounds x="0" y="12" width="241" height="180.75" />
+ </screen>
</view>
</mamelayout>
diff --git a/src/mame/layout/rocknms.lay b/src/mame/layout/rocknms.lay
index a8d892f3cb4..b6b053eacae 100644
--- a/src/mame/layout/rocknms.lay
+++ b/src/mame/layout/rocknms.lay
@@ -2,10 +2,10 @@
<mamelayout version="2">
<view name="Rockn Megasession Custom">
- <screen index="0">
+ <screen tag="lscreen">
<bounds x="0" y="0" width="12" height="9" />
</screen>
- <screen index="1">
+ <screen tag="rscreen">
<bounds x="0" y="9" width="12" height="16" />
</screen>
</view>
diff --git a/src/mame/layout/stepstag.lay b/src/mame/layout/stepstag.lay
index f51becc014f..0525d15a310 100644
--- a/src/mame/layout/stepstag.lay
+++ b/src/mame/layout/stepstag.lay
@@ -2,13 +2,13 @@
<mamelayout version="2">
<view name="Stepping Stage Custom">
- <screen index="0">
+ <screen tag="lscreen">
<bounds x="0" y="0" width="9" height="13.2" />
</screen>
- <screen index="1">
+ <screen tag="mscreen">
<bounds x="9.1" y="0" width="16" height="13.2" />
</screen>
- <screen index="2">
+ <screen tag="rscreen">
<bounds x="25.2" y="0" width="9" height="13.2" />
</screen>
</view>
diff --git a/src/mame/layout/svmu.lay b/src/mame/layout/svmu.lay
index f4419de1b90..cb14d4318c0 100644
--- a/src/mame/layout/svmu.lay
+++ b/src/mame/layout/svmu.lay
@@ -47,9 +47,4 @@
<bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" />
</screen>
</view>
- <view name="LCD Only">
- <screen index="0">
- <bounds left="0" top="0" right="~scr0width~" bottom="~scr0height~" />
- </screen>
- </view>
</mamelayout>
diff --git a/src/mame/layout/whousetc.lay b/src/mame/layout/whousetc.lay
index 8c621db3b54..6af99406950 100644
--- a/src/mame/layout/whousetc.lay
+++ b/src/mame/layout/whousetc.lay
@@ -17,10 +17,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="MODE">
<bounds left="0.1" top="0.35" right="0.9" bottom="0.65" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -32,14 +36,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="0.4" green="1.0" blue="1.0" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.27" green="0.67" blue="0.67" />
+ </rect>
<text string="TRAP">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -55,14 +67,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="0.4" green="1.0" blue="1.0" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.27" green="0.67" blue="0.67" />
+ </rect>
<text string="ARM">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -78,14 +98,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="0.4" green="1.0" blue="1.0" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.27" green="0.67" blue="0.67" />
+ </rect>
<text string="RESET">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -101,14 +129,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="0.4" green="1.0" blue="1.0" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.27" green="0.67" blue="0.67" />
+ </rect>
<text string="MNE">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -124,14 +160,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="0.4" green="1.0" blue="1.0" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.27" green="0.67" blue="0.67" />
+ </rect>
<text string="HARD">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -147,14 +191,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="0.4" green="1.0" blue="1.0" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.27" green="0.67" blue="0.67" />
+ </rect>
<text string="TRACE">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -170,14 +222,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="0.4" green="1.0" blue="1.0" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.27" green="0.67" blue="0.67" />
+ </rect>
<text string="REL">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -193,14 +253,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="1.0" green="0.8" blue="0.7" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.67" green="0.53" blue="0.47" />
+ </rect>
<text string="REC">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -216,14 +284,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="1.0" green="0.8" blue="0.7" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.67" green="0.53" blue="0.47" />
+ </rect>
<text string="SOFT">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -239,14 +315,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="1.0" green="0.8" blue="0.7" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.67" green="0.53" blue="0.47" />
+ </rect>
<text string="DISP">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -262,14 +346,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="1.0" green="0.8" blue="0.7" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.67" green="0.53" blue="0.47" />
+ </rect>
<text string="STEP">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -285,10 +377,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="←">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -304,10 +400,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="→">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -323,14 +423,22 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
<color red="1.0" green="1.0" blue="0.3" />
</rect>
- <rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.5" />
+ <color red="0.67" green="0.67" blue="0.2" />
+ </rect>
+ <rect state="0">
<bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
<color red="1.0" green="0.8" blue="0.7" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.5" right="0.95" bottom="0.95" />
+ <color red="0.67" green="0.53" blue="0.47" />
+ </rect>
<text string="X">
<bounds left="0.1" top="0.125" right="0.9" bottom="0.425" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -346,10 +454,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="ENTER">
<bounds left="0.1" top="0.35" right="0.9" bottom="0.65" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -361,10 +473,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="C">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -380,10 +496,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="D">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -399,10 +519,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="E">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -418,10 +542,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="F">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -437,10 +565,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="8">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -456,10 +588,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="9">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -475,10 +611,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="A">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -494,10 +634,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="B">
<bounds left="0.0" top="0.2" right="0.8" bottom="1.0" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -513,10 +657,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="4">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -528,10 +676,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="5">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -543,10 +695,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="6">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -558,10 +714,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="7">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -573,10 +733,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="0">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -588,10 +752,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="1">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -603,10 +771,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="2">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -618,10 +790,14 @@ Westinghouse Test Console Serial #5 layout
<bounds left="0" top="0" right="1" bottom="1" />
<color red="1.0" green="1.0" blue="1.0" />
</rect>
- <rect>
+ <rect state="0">
<bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
<color red="0.9" green="0.9" blue="0.9" />
</rect>
+ <rect state="1">
+ <bounds left="0.05" top="0.05" right="0.95" bottom="0.95" />
+ <color red="0.6" green="0.6" blue="0.6" />
+ </rect>
<text string="3">
<bounds left="0.1" top="0.1" right="0.9" bottom="0.9" />
<color red="0.0" green="0.0" blue="0.0" />
@@ -660,7 +836,7 @@ Westinghouse Test Console Serial #5 layout
<param name="col" start="~col~" increment="1" />
<param name="x" start="~x~" increment="110" />
<param name="mask" start="~mask~" lshift="1" />
- <bezel name="btn~row~~col~" element="btn~row~~col~" inputtag="row~row~" inputmask="~mask~">
+ <bezel element="btn~row~~col~" inputtag="row~row~" inputmask="~mask~">
<bounds x="~x~" y="~y~" width="80" height="80" />
</bezel>
</repeat>
diff --git a/src/osd/modules/netdev/taptun.cpp b/src/osd/modules/netdev/taptun.cpp
index b81ae99826c..b4d8b963c02 100644
--- a/src/osd/modules/netdev/taptun.cpp
+++ b/src/osd/modules/netdev/taptun.cpp
@@ -34,8 +34,7 @@ class taptun_module : public osd_module, public netdev_module
{
public:
- taptun_module()
- : osd_module(OSD_NETDEV_PROVIDER, "taptun"), netdev_module()
+ taptun_module() : osd_module(OSD_NETDEV_PROVIDER, "taptun"), netdev_module()
{
}
virtual ~taptun_module() { }
@@ -60,11 +59,11 @@ protected:
int recv_dev(uint8_t **buf);
private:
#if defined(WIN32)
- HANDLE m_handle;
+ HANDLE m_handle = INVALID_HANDLE_VALUE;
OVERLAPPED m_overlapped;
bool m_receive_pending;
#else
- int m_fd;
+ int m_fd = -1;
char m_ifname[10];
#endif
char m_mac[6];