Avoid crash if attempting to access graphical viewer moder when running in curses (text only)

mywave82 · mywave82 · commit 04a2f5c5998a · 2023-05-12T22:25:52.000+02:00
diff --git a/cpiface/cpidots.c b/cpiface/cpidots.c
@@ -447,6 +447,15 @@ static void dotSetMode(void)
 	plPrepareDotsScr();
 }
 
+static int dotCan (struct cpifaceSessionAPI_t *cpifaceSession)
+{
+	if (cpifaceSession->console->VidType == vidNorm)
+	{
+		return 0;
+	}
+	return 1;
+}
+
 static int dotIProcessKey (struct cpifaceSessionAPI_t *cpifaceSession, uint16_t key)
 {
 	switch (key)
@@ -464,8 +473,13 @@ static int dotIProcessKey (struct cpifaceSessionAPI_t *cpifaceSession, uint16_t
 	return 1;
 }
 
-static int plDotsEvent (struct cpifaceSessionAPI_t *cpifaceSession, int ignore)
+static int plDotsEvent (struct cpifaceSessionAPI_t *cpifaceSession, int ev)
 {
+	switch (ev)
+	{
+		case cpievInit:
+			return dotCan (cpifaceSession);
+	}
 	return 1;
 }
 
diff --git a/cpiface/cpigraph.c b/cpiface/cpigraph.c
@@ -623,8 +623,14 @@ static void strDraw (struct cpifaceSessionAPI_t *cpifaceSession)
 
 static int strCan (struct cpifaceSessionAPI_t *cpifaceSession)
 {
+	if (cpifaceSession->console->VidType == vidNorm)
+	{
+		return 0;
+	}
 	if ((!cpifaceSession->GetLChanSample) && (!cpifaceSession->GetMasterSample))
+	{
 		return 0;
+	}
 	return 1;
 }
 
diff --git a/cpiface/cpikube.c b/cpiface/cpikube.c
@@ -533,6 +533,10 @@ static int wuerfelEvent (struct cpifaceSessionAPI_t *cpifaceSession, int ev)
 				/* fprintf(stderr, __FILE__ ": no wuerfel animations found\n"); */
 				return 0;
 			}
+			if (!vga13)
+			{
+				return 0;
+			}
 			return 1;
 		case cpievDoneAll:
 			plCloseWuerfel();
diff --git a/cpiface/cpiphase.c b/cpiface/cpiphase.c
@@ -415,8 +415,14 @@ static void scoSetMode (struct cpifaceSessionAPI_t *cpifaceSession)
 
 static int scoCan (struct cpifaceSessionAPI_t *cpifaceSession)
 {
+	if (cpifaceSession->console->VidType == vidNorm)
+	{
+		return 0;
+	}
 	if (!cpifaceSession->GetLChanSample && !cpifaceSession->GetPChanSample && (!cpifaceSession->GetMasterSample))
+	{
 		return 0;
+	}
 	return 1;
 }
 
diff --git a/cpiface/cpiscope.c b/cpiface/cpiscope.c
@@ -475,8 +475,14 @@ static void scoSetMode (struct cpifaceSessionAPI_t *cpifaceSession)
 
 static int scoCan (struct cpifaceSessionAPI_t *cpifaceSession)
 {
+	if (cpifaceSession->console->VidType == vidNorm)
+	{
+		return 0;
+	}
 	if ((!cpifaceSession->GetLChanSample) && (!cpifaceSession->GetPChanSample) && (!cpifaceSession->GetMasterSample))
+	{
 		return 0;
+	}
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -447,6 +447,15 @@ static void dotSetMode(void)`
`447`	`447`	`plPrepareDotsScr();`
`448`	`448`	`}`
`449`	`449`
	`450`	`+static int dotCan (struct cpifaceSessionAPI_t *cpifaceSession)`
	`451`	`+{`
	`452`	`+ if (cpifaceSession->console->VidType == vidNorm)`
	`453`	`+ {`
	`454`	`+ return 0;`
	`455`	`+ }`
	`456`	`+ return 1;`
	`457`	`+}`
	`458`	`+`
`450`	`459`	`static int dotIProcessKey (struct cpifaceSessionAPI_t *cpifaceSession, uint16_t key)`
`451`	`460`	`{`
`452`	`461`	`switch (key)`
`@@ -464,8 +473,13 @@ static int dotIProcessKey (struct cpifaceSessionAPI_t *cpifaceSession, uint16_t`
`464`	`473`	`return 1;`
`465`	`474`	`}`
`466`	`475`
`467`		`-static int plDotsEvent (struct cpifaceSessionAPI_t *cpifaceSession, int ignore)`
	`476`	`+static int plDotsEvent (struct cpifaceSessionAPI_t *cpifaceSession, int ev)`
`468`	`477`	`{`
	`478`	`+ switch (ev)`
	`479`	`+ {`
	`480`	`+ case cpievInit:`
	`481`	`+ return dotCan (cpifaceSession);`
	`482`	`+ }`
`469`	`483`	`return 1;`
`470`	`484`	`}`
`471`	`485`
Original file line number	Diff line number	Diff line change
`@@ -623,8 +623,14 @@ static void strDraw (struct cpifaceSessionAPI_t *cpifaceSession)`
`623`	`623`
`624`	`624`	`static int strCan (struct cpifaceSessionAPI_t *cpifaceSession)`
`625`	`625`	`{`
	`626`	`+ if (cpifaceSession->console->VidType == vidNorm)`
	`627`	`+ {`
	`628`	`+ return 0;`
	`629`	`+ }`
`626`	`630`	`if ((!cpifaceSession->GetLChanSample) && (!cpifaceSession->GetMasterSample))`
	`631`	`+ {`
`627`	`632`	`return 0;`
	`633`	`+ }`
`628`	`634`	`return 1;`
`629`	`635`	`}`
`630`	`636`
Original file line number	Diff line number	Diff line change
`@@ -415,8 +415,14 @@ static void scoSetMode (struct cpifaceSessionAPI_t *cpifaceSession)`
`415`	`415`
`416`	`416`	`static int scoCan (struct cpifaceSessionAPI_t *cpifaceSession)`
`417`	`417`	`{`
	`418`	`+ if (cpifaceSession->console->VidType == vidNorm)`
	`419`	`+ {`
	`420`	`+ return 0;`
	`421`	`+ }`
`418`	`422`	`if (!cpifaceSession->GetLChanSample && !cpifaceSession->GetPChanSample && (!cpifaceSession->GetMasterSample))`
	`423`	`+ {`
`419`	`424`	`return 0;`
	`425`	`+ }`
`420`	`426`	`return 1;`
`421`	`427`	`}`
`422`	`428`
Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,14 @@ static void scoSetMode (struct cpifaceSessionAPI_t *cpifaceSession)`
`475`	`475`
`476`	`476`	`static int scoCan (struct cpifaceSessionAPI_t *cpifaceSession)`
`477`	`477`	`{`
	`478`	`+ if (cpifaceSession->console->VidType == vidNorm)`
	`479`	`+ {`
	`480`	`+ return 0;`
	`481`	`+ }`
`478`	`482`	`if ((!cpifaceSession->GetLChanSample) && (!cpifaceSession->GetPChanSample) && (!cpifaceSession->GetMasterSample))`
	`483`	`+ {`
`479`	`484`	`return 0;`
	`485`	`+ }`
`480`	`486`	`return 1;`
`481`	`487`	`}`
`482`	`488`