From 26f9c7a748cbef3fa87ebf8442835d82b0e38b2d Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Thu, 26 Nov 2020 14:11:58 +0100
Subject: [PATCH] IMLAC: Fixes for the display.

Don't open a display window during power-on reset.

Change #ifdefs to USE_DISPLAY.
---
 imlac/imlac_crt.c | 12 ++++++------
 imlac/imlac_kbd.c |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/imlac/imlac_crt.c b/imlac/imlac_crt.c
index b3277f7d..59514a3b 100644
--- a/imlac/imlac_crt.c
+++ b/imlac/imlac_crt.c
@@ -47,7 +47,7 @@ static DEBTAB crt_deb[] = {
   { NULL, 0 }
 };
 
-#if defined(USE_SIM_VIDEO) && defined(HAVE_LIBSDL)
+#ifdef USE_DISPLAY
 #define CRT_DIS  0
 #else
 #define CRT_DIS  DEV_DIS
@@ -65,7 +65,7 @@ DEVICE crt_dev = {
 static t_stat
 crt_svc(UNIT *uptr)
 {
-#ifdef HAVE_LIBSDL
+#ifdef USE_DISPLAY
   imlac_cycle (100, 0);
   sim_activate_after (uptr, 100);
   if (crt_quit) {
@@ -84,8 +84,8 @@ static void crt_quit_callback (void)
 static t_stat
 crt_reset (DEVICE *dptr)
 {
-#ifdef HAVE_LIBSDL
-  if (dptr->flags & DEV_DIS) {
+#ifdef USE_DISPLAY
+  if (dptr->flags & DEV_DIS || (sim_switches & SWMASK('P')) != 0) {
     display_close (dptr);
     sim_cancel (&crt_unit);
   } else {
@@ -102,7 +102,7 @@ void
 crt_point (uint16 x, uint16 y)
 {
   sim_debug (DBG, &crt_dev, "Point %d,%d\n", x, y);
-#ifdef HAVE_LIBSDL
+#ifdef USE_DISPLAY
   if (crt_dev.flags & DEV_DIS)
     return;
   imlac_point ((x & 03777) >> 1, (y & 03777) >> 1);
@@ -113,7 +113,7 @@ void
 crt_line (uint16 x1, uint16 y1, uint16 x2, uint16 y2)
 {
   sim_debug (DBG, &crt_dev, "Line %d,%d - %d,%d\n", x1, y1, x2, y2);
-#ifdef HAVE_LIBSDL
+#ifdef USE_DISPLAY
   if (crt_dev.flags & DEV_DIS)
     return;
   imlac_line ((x1 & 03777) >> 1, (y1 & 03777) >> 1,
diff --git a/imlac/imlac_kbd.c b/imlac/imlac_kbd.c
index 1ee1bdf7..2db8730e 100644
--- a/imlac/imlac_kbd.c
+++ b/imlac/imlac_kbd.c
@@ -575,14 +575,14 @@ kbd_event (SIM_KEY_EVENT *ev)
 static t_stat
 kbd_reset (DEVICE *dptr)
 {
-#ifdef HAVE_LIBSDL
+#ifdef USE_DISPLAY
   vid_display_kb_event_process = NULL;
 #endif
   if (dptr->flags & DEV_DIS)
     return SCPE_OK;
 
   if (kbd_type == KBD_DISPLAY)
-#ifdef HAVE_LIBSDL
+#ifdef USE_DISPLAY
     vid_display_kb_event_process = kbd_event;
 #else
     ;