diff --git a/VAX/vax610_sysdev.c b/VAX/vax610_sysdev.c index 00c7f31d..de3c9f59 100644 --- a/VAX/vax610_sysdev.c +++ b/VAX/vax610_sysdev.c @@ -509,23 +509,23 @@ if ((cptr == NULL) || (!*cptr)) return SCPE_ARG; cptr = get_glyph (cptr, gbuf, 0); if (MATCH_CMD(gbuf, "MICROVAX") == 0) { - sys_model = 0; - vc_dev.flags = vc_dev.flags | DEV_DIS; /* disable QVSS */ - lk_dev.flags = lk_dev.flags | DEV_DIS; /* disable keyboard */ - vs_dev.flags = vs_dev.flags | DEV_DIS; /* disable mouse */ - strcpy (sim_name, "MicroVAX I (KA610)"); - reset_all (0); /* reset everything */ - } + sys_model = 0; + vc_dev.flags = vc_dev.flags | DEV_DIS; /* disable QVSS */ + lk_dev.flags = lk_dev.flags | DEV_DIS; /* disable keyboard */ + vs_dev.flags = vs_dev.flags | DEV_DIS; /* disable mouse */ + strcpy (sim_name, "MicroVAX I (KA610)"); + reset_all (0); /* reset everything */ + } else if (MATCH_CMD(gbuf, "VAXSTATION") == 0) { - sys_model = 1; - vc_dev.flags = vc_dev.flags & ~DEV_DIS; /* enable QVSS */ - lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */ - vs_dev.flags = vs_dev.flags & ~DEV_DIS; /* enable mouse */ - strcpy (sim_name, "VAXStation I (KA610)"); - reset_all (0); /* reset everything */ - } + sys_model = 1; + vc_dev.flags = vc_dev.flags & ~DEV_DIS; /* enable QVSS */ + lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */ + vs_dev.flags = vs_dev.flags & ~DEV_DIS; /* enable mouse */ + strcpy (sim_name, "VAXStation I (KA610)"); + reset_all (0); /* reset everything */ + } else - return SCPE_ARG; + return SCPE_ARG; return SCPE_OK; #else return SCPE_NOFNC; diff --git a/VAX/vax630_sysdev.c b/VAX/vax630_sysdev.c index 69a5e6a3..8ba3c985 100644 --- a/VAX/vax630_sysdev.c +++ b/VAX/vax630_sysdev.c @@ -969,23 +969,23 @@ if ((cptr == NULL) || (!*cptr)) return SCPE_ARG; cptr = get_glyph (cptr, gbuf, 0); if (MATCH_CMD(gbuf, "MICROVAX") == 0) { - sys_model = 0; - vc_dev.flags = vc_dev.flags | DEV_DIS; /* disable QVSS */ - lk_dev.flags = lk_dev.flags | DEV_DIS; /* disable keyboard */ - vs_dev.flags = vs_dev.flags | DEV_DIS; /* disable mouse */ - strcpy (sim_name, "MicroVAX II (KA630)"); - reset_all (0); /* reset everything */ - } + sys_model = 0; + vc_dev.flags = vc_dev.flags | DEV_DIS; /* disable QVSS */ + lk_dev.flags = lk_dev.flags | DEV_DIS; /* disable keyboard */ + vs_dev.flags = vs_dev.flags | DEV_DIS; /* disable mouse */ + strcpy (sim_name, "MicroVAX II (KA630)"); + reset_all (0); /* reset everything */ + } else if (MATCH_CMD(gbuf, "VAXSTATION") == 0) { - sys_model = 1; - vc_dev.flags = vc_dev.flags & ~DEV_DIS; /* enable QVSS */ - lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */ - vs_dev.flags = vs_dev.flags & ~DEV_DIS; /* enable mouse */ - strcpy (sim_name, "VAXStation II (KA630)"); - reset_all (0); /* reset everything */ - } + sys_model = 1; + vc_dev.flags = vc_dev.flags & ~DEV_DIS; /* enable QVSS */ + lk_dev.flags = lk_dev.flags & ~DEV_DIS; /* enable keyboard */ + vs_dev.flags = vs_dev.flags & ~DEV_DIS; /* enable mouse */ + strcpy (sim_name, "VAXStation II (KA630)"); + reset_all (0); /* reset everything */ + } else - return SCPE_ARG; + return SCPE_ARG; return SCPE_OK; #else return SCPE_NOFNC; diff --git a/VAX/vax_vc.c b/VAX/vax_vc.c index a496bdb4..8008c8c9 100644 --- a/VAX/vax_vc.c +++ b/VAX/vax_vc.c @@ -184,6 +184,8 @@ MTAB vc_mod[] = { &vc_set_enable, NULL, NULL, "Enable VCB01 (QVSS)" }, { MTAB_XTD|MTAB_VDV, 0, NULL, "DISABLE", &vc_set_enable, NULL, NULL, "Disable VCB01 (QVSS)" }, + { MTAB_XTD|MTAB_VDV, 0, "RELEASEKEY", NULL, + NULL, &vid_show_release_key, NULL, "Display the window focus release key" }, { MTAB_XTD|MTAB_VDV|MTAB_VALR, 004, "ADDRESS", "ADDRESS", &set_addr, &show_addr, NULL, "Bus address" }, { MTAB_XTD|MTAB_VDV|MTAB_VALR, 0, "VECTOR", "VECTOR", @@ -629,6 +631,14 @@ if (dptr->flags & DEV_DIS) r = vid_open (VC_XSIZE, VC_YSIZE); /* display size */ if (r != SCPE_OK) return r; +printf ("QVSS Display Created. "); +vid_show_release_key (stdout, NULL, 0, NULL); +printf ("\n"); +if (sim_log) { + fprintf (sim_log, "QVSS Display Created. "); + vid_show_release_key (sim_log, NULL, 0, NULL); + fprintf (sim_log, "\n"); + } sim_activate_abs (&vc_unit, tmxr_poll); return auto_config (NULL, 0); /* run autoconfig */ } diff --git a/sim_video.c b/sim_video.c index febe306d..7bfc5282 100644 --- a/sim_video.c +++ b/sim_video.c @@ -730,6 +730,17 @@ sprintf(SDLVersion, "SDL Version %d.%d.%d", ver->major, ver->minor, ver->patch); return (const char *)SDLVersion; } +t_stat vid_set_release_key (FILE* st, UNIT* uptr, int32 val, void* desc) +{ +return SCPE_NOFNC; +} + +t_stat vid_show_release_key (FILE* st, UNIT* uptr, int32 val, void* desc) +{ +fprintf (st, "ReleaseKey=Ctrl-Right-Shift"); +return SCPE_OK; +} + #else /* Non-implemented versions */ @@ -769,4 +780,16 @@ const char *vid_version (void) return "No Video Support"; } +t_stat vid_set_release_key (FILE* st, UNIT* uptr, int32 val, void* desc) +{ +return SCPE_NOFNC; +} + +t_stat vid_show_release_key (FILE* st, UNIT* uptr, int32 val, void* desc) +{ +fprintf (st, "no release key"); +return SCPE_OK; +} + + #endif diff --git a/sim_video.h b/sim_video.h index 87e66fbf..d2f2e35a 100644 --- a/sim_video.h +++ b/sim_video.h @@ -175,5 +175,7 @@ t_stat vid_poll_mouse (SIM_MOUSE_EVENT *ev); void vid_draw (int32 x, int32 y, int32 w, int32 h, uint8 *buf); void vid_refresh (void); const char *vid_version (void); +t_stat vid_set_release_key (FILE* st, UNIT* uptr, int32 val, void* desc); +t_stat vid_show_release_key (FILE* st, UNIT* uptr, int32 val, void* desc); #endif