Skip to content
Snippets Groups Projects
Commit 835a8cc1 authored by deuce's avatar deuce
Browse files

Font support requires conio support.

parent 26bf5826
Branches
Tags
No related merge requests found
...@@ -1414,7 +1414,7 @@ char *cterm_write(struct cterminal * cterm, const unsigned char *buf, int buflen ...@@ -1414,7 +1414,7 @@ char *cterm_write(struct cterminal * cterm, const unsigned char *buf, int buflen
if(cterm->font_size) { if(cterm->font_size) {
cterm->fontbuf[cterm->font_read++]=ch[0]; cterm->fontbuf[cterm->font_read++]=ch[0];
if(cterm->font_read == cterm->font_size) { if(cterm->font_read == cterm->font_size) {
// TODO: Need to make this bit optional... #ifndef CTERM_WITHOUT_CONIO
char *buf; char *buf;
if((buf=(char *)malloc(cterm->font_size))!=NULL) { if((buf=(char *)malloc(cterm->font_size))!=NULL) {
...@@ -1444,6 +1444,7 @@ char *cterm_write(struct cterminal * cterm, const unsigned char *buf, int buflen ...@@ -1444,6 +1444,7 @@ char *cterm_write(struct cterminal * cterm, const unsigned char *buf, int buflen
else else
FREE_AND_NULL(buf); FREE_AND_NULL(buf);
} }
#ifndef CTERM_WITHOUT_CONIO
cterm->font_size=0; cterm->font_size=0;
} }
} }
...@@ -2112,12 +2113,14 @@ void cterm_end(struct cterminal *cterm) ...@@ -2112,12 +2113,14 @@ void cterm_end(struct cterminal *cterm)
int i; int i;
cterm_closelog(cterm); cterm_closelog(cterm);
#ifndef CTERM_WITHOUT_CONIO
for(i=CONIO_FIRST_FREE_FONT; i < 256; i++) { for(i=CONIO_FIRST_FREE_FONT; i < 256; i++) {
FREE_AND_NULL(conio_fontdata[i].eight_by_sixteen); FREE_AND_NULL(conio_fontdata[i].eight_by_sixteen);
FREE_AND_NULL(conio_fontdata[i].eight_by_fourteen); FREE_AND_NULL(conio_fontdata[i].eight_by_fourteen);
FREE_AND_NULL(conio_fontdata[i].eight_by_eight); FREE_AND_NULL(conio_fontdata[i].eight_by_eight);
FREE_AND_NULL(conio_fontdata[i].desc); FREE_AND_NULL(conio_fontdata[i].desc);
} }
#endif
if(cterm->playnote_thread_running) { if(cterm->playnote_thread_running) {
if(sem_trywait(&cterm->playnote_thread_terminated)==-1) { if(sem_trywait(&cterm->playnote_thread_terminated)==-1) {
listSemPost(&cterm->notes); listSemPost(&cterm->notes);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment