From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 15 Mar 2017 20:58:17 +0000 (+0100)
Subject: - align to new neutrino.conf keywords
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=dc81034cdea0c2076325d70beb2b45ded65dd2ae;p=msgbox.git

- align to new neutrino.conf keywords
---

diff --git a/msgbox.c b/msgbox.c
index 5dbaab9..41b0b19 100644
--- a/msgbox.c
+++ b/msgbox.c
@@ -58,7 +58,7 @@ static char menucoltxt[][25]={
 	"Head_Text",
 	"Head"
 };
-static char spres[][5]={"","_crt","_lcd"};
+static char spres[][4]={"","crt","lcd"};
 
 char *line_buffer=NULL, *title=NULL, *icon=NULL;
 int size=24, type=0, timeout=0, refresh=3, flash=0, selection=0, tbuttons=0, buttons=0, bpline=3, echo=0, absolute=0, mute=1, header=1, cyclic=1;
@@ -485,7 +485,7 @@ void ShowUsage(void)
 
 int main (int argc, char **argv)
 {
-int ix,tv,found=0, spr;
+int ix,tv,found=0, spr, resolution;
 int dloop=1, rcc=-1;
 char rstr[BUFSIZE]={0}, *rptr=NULL, *aptr=NULL;
 time_t tm1,tm2;
@@ -737,19 +737,21 @@ FILE *fh;
 		}
 	
 		spr=Read_Neutrino_Cfg("screen_preset")+1;
-		sprintf(line_buffer,"screen_StartX%s",spres[spr]);
+		resolution=Read_Neutrino_Cfg("osd_resolution");
+
+		sprintf(line_buffer,"screen_StartX_%s_%d", spres[spr], resolution);
 		if((sx=Read_Neutrino_Cfg(line_buffer))<0)
 			sx=100;
 
-		sprintf(line_buffer,"screen_EndX%s",spres[spr]);
+		sprintf(line_buffer,"screen_EndX_%s_%d", spres[spr], resolution);
 		if((ex=Read_Neutrino_Cfg(line_buffer))<0)
 			ex=1180;
 
-		sprintf(line_buffer,"screen_StartY%s",spres[spr]);
+		sprintf(line_buffer,"screen_StartY_%s_%d", spres[spr], resolution);
 		if((sy=Read_Neutrino_Cfg(line_buffer))<0)
 			sy=100;
 
-		sprintf(line_buffer,"screen_EndY%s",spres[spr]);
+		sprintf(line_buffer,"screen_EndY_%s_%d", spres[spr], resolution);
 		if((ey=Read_Neutrino_Cfg(line_buffer))<0)
 			ey=620;