From fa23256a4024745763e08cd101c8b553ff95434b Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 7 May 2012 21:55:40 -0400 Subject: [PATCH] Add support for HGR2 mode add demo title screen, plus update so generates 40COL slides properly. --- asoft_presenter.c | 33 +++++++++++++++++++++------- presenter_demo/Makefile | 8 +++---- presenter_demo/info | 1 + presenter_demo/slide_rapl_continued | 2 +- presenter_demo/slide_rapl_finish | 2 +- presenter_demo/slide_rapl_more | 2 +- presenter_demo/slide_title | 2 ++ presenter_demo/title.pcx | Bin 0 -> 6039 bytes 8 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 presenter_demo/slide_title create mode 100644 presenter_demo/title.pcx diff --git a/asoft_presenter.c b/asoft_presenter.c index 4b736c97..d541fe1d 100644 --- a/asoft_presenter.c +++ b/asoft_presenter.c @@ -149,7 +149,7 @@ static void generate_slide(int num, int max, char*filename) { int line_num; FILE *fff; - char string[BUFSIZ],*result; + char string[BUFSIZ],*result,type[BUFSIZ]; /* line numbers start at 100 and run LINES_PER_SLIDE per slide */ line_num=100+(num*LINES_PER_SLIDE); @@ -174,13 +174,30 @@ static void generate_slide(int num, int max, char*filename) { } else { - printf("%d VTAB 1\n",line_num); line_num++; - while(1) { - result=fgets(string,BUFSIZ,fff); - if (result==NULL) break; - string[strlen(string)-1]='\0'; - printf("%d PRINT \"%s\"\n",line_num,string); line_num++; - } + result=fgets(type,BUFSIZ,fff); + + if (strstr(type,"HGR2")) { + printf("%d HGR2\n",line_num); line_num++; + printf("%d PRINT CHR$(4);\"BLOAD TITLE.IMG,A$4000\"\n", + line_num); line_num++; + } + else if (strstr(type,"HGR")) { + + } + else if (strstr(type,"80COL")) { + + } + else if (strstr(type,"40COL")) { + + printf("%d VTAB 1\n",line_num); line_num++; + while(1) { + result=fgets(string,BUFSIZ,fff); + if (result==NULL) break; + string[strlen(string)-1]='\0'; + printf("%d PRINT \"%s\"\n",line_num,string); line_num++; + } + } + fclose(fff); } diff --git a/presenter_demo/Makefile b/presenter_demo/Makefile index 5c14f08f..52fcaab9 100644 --- a/presenter_demo/Makefile +++ b/presenter_demo/Makefile @@ -4,13 +4,13 @@ LFLAGS = all: presenter_demo.dsk -presenter_demo.dsk: PRESENTER_DEMO VINCE.IMG +presenter_demo.dsk: PRESENTER_DEMO TITLE.IMG ../dos33 presenter_demo.dsk SAVE A PRESENTER_DEMO - ../dos33 presenter_demo.dsk SAVE B VINCE.IMG + ../dos33 presenter_demo.dsk SAVE B TITLE.IMG -VINCE.IMG: vince.pcx ../pcx2hgr - ../pcx2hgr vince.pcx > VINCE.IMG +TITLE.IMG: title.pcx ../pcx2hgr + ../pcx2hgr title.pcx > TITLE.IMG PRESENTER_DEMO: demo.bas ../tokenize_asoft < demo.bas > PRESENTER_DEMO diff --git a/presenter_demo/info b/presenter_demo/info index 9589e24e..5029399d 100644 --- a/presenter_demo/info +++ b/presenter_demo/info @@ -12,4 +12,5 @@ slide_rapl_intro slide_rapl_continued slide_rapl_more slide_rapl_finish +slide_title END_SLIDES \ No newline at end of file diff --git a/presenter_demo/slide_rapl_continued b/presenter_demo/slide_rapl_continued index cd5bbf20..80b2969d 100644 --- a/presenter_demo/slide_rapl_continued +++ b/presenter_demo/slide_rapl_continued @@ -1,3 +1,3 @@ -40col +40COL RAPL CONTINUE * Is freally awesome diff --git a/presenter_demo/slide_rapl_finish b/presenter_demo/slide_rapl_finish index d9c104ea..03976c34 100644 --- a/presenter_demo/slide_rapl_finish +++ b/presenter_demo/slide_rapl_finish @@ -1,3 +1,3 @@ -40col +40COL RAPL LAST * Is really awesome diff --git a/presenter_demo/slide_rapl_more b/presenter_demo/slide_rapl_more index 488ebef6..bcdfb12b 100644 --- a/presenter_demo/slide_rapl_more +++ b/presenter_demo/slide_rapl_more @@ -1,3 +1,3 @@ -40col +40COL RAPL MORE * Is really awesome diff --git a/presenter_demo/slide_title b/presenter_demo/slide_title new file mode 100644 index 00000000..de4f8ce6 --- /dev/null +++ b/presenter_demo/slide_title @@ -0,0 +1,2 @@ +HGR2 +TITLE.IMG diff --git a/presenter_demo/title.pcx b/presenter_demo/title.pcx new file mode 100644 index 0000000000000000000000000000000000000000..23300e1218ef65a3f96f616a3597e62f40c33440 GIT binary patch literal 6039 zcmeI0-EJE<5QWJF3KT^jC2!P6YTv2A{>hf*G`TQ}+yo8aCXQ2}y{H>NDXN}thFo%2 zT31GUQy{ihOAcqwoEZ+uU48XM{4(h8+wgsO7N14hPx_1Bg{K=84~K9F&vo(rDYWqr zUW7~C`_RSry1xoz{7sTBb|)o=FogJE3T^0Re!3e&WEj-Ju3mVpE{WUdpVS(?w+V6M zt2{K}fB}FBQ81cVUnS2Nm$(x}&6{l=Y!G$bf5fn0R3*!bKYg@Q{Z^)2Nb# ztU!)r)j6_DkysdA9;7GJnG=__kw|HCPnpO7Sp|2{reDj{MYU$*E_#odVTi53%NwRO zdJ@TO4ZBsW8UyltaFMX!a5cwH5gY9ZdLyM?E||%qq|8_s;7!fgP~#3;zLX8@J4wFNSIEou(3Lxy+=iRM0GoPC;RcrhT|`w zS!e5%?+SBNwuw-1eb71Lsbq~o&S@@2bh|WQ+KuYloMmaz;lVt*n zlo9g4U8q^fq}ls46_QR0wyl|&rN&FapO#FTft98TS6rm-AgNMZ(QGhJTo#~7Is^6P zXoxl&(DVa18BcJV6rKVv9%fipxzOUcl(~gWQ5)N0=1BHbI8mJe)yIqGZw<$f_Q!E} zsGtUpFsKcjaxNM~7A%<@A$WvtP1_Mle+iJ|uUR}5!}NKFcqH?X_3irwbFKX~VR1vEk8J5#67GV) zvZ2n${G^{YJnJ*7{$aG!BTZ$)KtUiO_MfIe-E8ZPHoiZ$7E6&aK8dZ`hUCUJav$E# zJaNc)LA#A!E&Ul%j?~tJ*4rGbb3CD*xUZ<&$(;yUB86jVQ|AbMVoH)r6r$|i9N^NB zlrF;X+~LWIy|dipJTi^bv7eV5Y4!oB-Kz{wSK28#D>)Unt$~ef@jxlFxco)Rmzl48 z>blh!wV)MVcNj_|wh*lCC*2{u6UCd*Hk~K7*@mvsBYP7z%}?RAKbhk}Gk>k2POk`k zqfMt#BAPHZZ%|5AEuEc4#6S<#rlg+_DkX_!-pCs)cXn^|JBMAm-8vR(+QN{=AN+n& z1EO7gp6tO{V)SC!iFd!^WveK8RoQ5~2dzS|b*hNA;Z-w+EtH*L-fao`D%>=e;Q}{4 zII29jF2l=ar{KZ7wJF;+HVcZ)=Vm@_^C>M;&D)c2SfwP+FQcXAuU51QN`=o;@U$d& z7_J9*zGJ9vrJRSf!eqlo|D)ZdAn8N0MS&MZ{%H$eUljsz;T(uZ6l~8}8JDHZsUImA zzP=RB$C^J1?qZ=aTlR3F#thFfA8e|Wao#nB>J5P$0`HE?e13g6Xi~%VH~;3R#quNL M=ho*8{J%2rH+&5D(EtDd literal 0 HcmV?d00001