--- nono/lib/monitor_id.cpp 2026/04/29 17:05:44 1.1.1.11 +++ nono/lib/monitor_id.cpp 2026/04/29 17:05:48 1.1.1.12 @@ -4,6 +4,7 @@ /*static*/ const std::vector MonitorManager::info { + { ID_MONITOR_zeroth_dummy_for_wxmac, }, { ID_MONITOR_ACCSTAT, VMCap::NONE, { "accstat" } }, { ID_MONITOR_AREASET, VMCap::NONE, { "areaset" } }, { ID_MONITOR_ATC0, VMCap::NONE, { "atc0" } }, @@ -36,6 +37,7 @@ MonitorManager::info { { ID_MONITOR_KEYBOARD, VMCap::NONE, { "keyboard" } }, { ID_MONITOR_LANCE, VMCap::NONE, { "lance" } }, { ID_MONITOR_LCD, VMCap::NONE, { "lcd" } }, + { ID_MONITOR_LOG, VMCap::NONE, { "log" } }, { ID_MONITOR_LUNAVC, VMCap::NONE, { "video" } }, { ID_MONITOR_MAINBUS, VMCap::NONE, { "mainbus" } }, { ID_MONITOR_MEMDUMP0, VMCap::NONE, { "memdump0" } }, @@ -95,15 +97,14 @@ MonitorManager::info { { ID_SUBWIN_CACHE7, VMCap::M88K, { "cache7" } }, { ID_SUBWIN_DIPSW, VMCap::LUNA|VMCap::NEWS, { "dipsw" } }, { ID_SUBWIN_EXHIST, VMCap::ALL, { "exhist" } }, + { ID_SUBWIN_GVRAM, VMCap::X68030, { "gvram" } }, { ID_SUBWIN_LCDPANEL, VMCap::LUNA, { "lcdpanel" } }, - { ID_SUBWIN_LOG, VMCap::ALL, { "log" } }, { ID_SUBWIN_LOGSETTING, VMCap::ALL, { "logsetting" } }, { ID_SUBWIN_LUNAFB, VMCap::LUNA, { "bitmap" } }, { ID_SUBWIN_NEWSIO, VMCap::NEWS, { "newsio" } }, - { ID_SUBWIN_PALETTE, VMCap::LUNA, { "palette" } }, + { ID_SUBWIN_PALETTE, VMCap::LUNA|VMCap::X68030, { "palette" } }, { ID_SUBWIN_ROM, VMCap::LUNA|VMCap::X68030, { "rom" } }, { ID_SUBWIN_SOFTKEY, VMCap::LUNA|VMCap::X68030, { "softkey" } }, - { ID_SUBWIN_TEXTPAL, VMCap::X68030, { "textpalette", "palette" } }, { ID_SUBWIN_TVRAM, VMCap::X68030, { "tvram" } }, { ID_SUBWIN_VECTOR, VMCap::ALL, { "vector" } }, { ID_SUBWIN_X68KIO, VMCap::X68030, { "x68kio" } }, @@ -147,6 +148,7 @@ Monitor::idtext { { ID_MONITOR_DMAC, "ID_MONITOR_DMAC" }, { ID_SUBWIN_EXHIST, "ID_SUBWIN_EXHIST" }, { ID_MONITOR_FDC, "ID_MONITOR_FDC" }, + { ID_SUBWIN_GVRAM, "ID_SUBWIN_GVRAM" }, { ID_MONITOR_HOSTCOM0, "ID_MONITOR_HOSTCOM0" }, { ID_MONITOR_HOSTCOM1, "ID_MONITOR_HOSTCOM1" }, { ID_MONITOR_HOSTCOM2, "ID_MONITOR_HOSTCOM2" }, @@ -157,7 +159,7 @@ Monitor::idtext { { ID_MONITOR_LANCE, "ID_MONITOR_LANCE" }, { ID_MONITOR_LCD, "ID_MONITOR_LCD" }, { ID_SUBWIN_LCDPANEL, "ID_SUBWIN_LCDPANEL" }, - { ID_SUBWIN_LOG, "ID_SUBWIN_LOG" }, + { ID_MONITOR_LOG, "ID_MONITOR_LOG" }, { ID_SUBWIN_LOGSETTING, "ID_SUBWIN_LOGSETTING" }, { ID_SUBWIN_LUNAFB, "ID_SUBWIN_LUNAFB" }, { ID_MONITOR_LUNAVC, "ID_MONITOR_LUNAVC" }, @@ -191,7 +193,6 @@ Monitor::idtext { { ID_MONITOR_SSG, "ID_MONITOR_SSG" }, { ID_MONITOR_SYSCLK, "ID_MONITOR_SYSCLK" }, { ID_MONITOR_SYSPORT, "ID_MONITOR_SYSPORT" }, - { ID_SUBWIN_TEXTPAL, "ID_SUBWIN_TEXTPAL" }, { ID_SUBWIN_TVRAM, "ID_SUBWIN_TVRAM" }, { ID_SUBWIN_VECTOR, "ID_SUBWIN_VECTOR" }, { ID_MONITOR_VIRTIO_BLOCK0, "ID_MONITOR_VIRTIO_BLOCK0" },