diff --git a/src/syncterm/menu.c b/src/syncterm/menu.c index 561929ae0b10f3cfac7eef5ca3b9dfbb7887d21c..4ff1a2cb0772a45914cbc444fab9d40f1028c38b 100644 --- a/src/syncterm/menu.c +++ b/src/syncterm/menu.c @@ -45,27 +45,11 @@ void viewscroll(void) if(top>cterm->backpos) top=cterm->backpos; puttext(term.x-1,term.y-1,term.x+term.width-2,term.y+term.height-2,scrollback+(term.width*2*top)); - switch(cterm->emulation) { - case CTERM_EMULATION_ATASCII: - cputs("3crollback"); - break; - case CTERM_EMULATION_PETASCII: - cputs("SCROLLBACK"); - break; - default: - cputs("Scrollback"); - } + ciolib_xlat = TRUE; + cputs("Scrollback"); gotoxy(cterm->width-9,1); - switch(cterm->emulation) { - case CTERM_EMULATION_ATASCII: - cputs("3crollback"); - break; - case CTERM_EMULATION_PETASCII: - cputs("SCROLLBACK"); - break; - default: - cputs("Scrollback"); - } + cputs("Scrollback"); + ciolib_xlat = FALSE; gotoxy(1,1); key=getch(); switch(key) { diff --git a/src/syncterm/term.c b/src/syncterm/term.c index b3c56f781b4158c04dca4aa7e4f3a9e2602bbb79..91223cc5e075d51bdbc1208eb49bb978ce06d339 100644 --- a/src/syncterm/term.c +++ b/src/syncterm/term.c @@ -1906,16 +1906,12 @@ void font_control(struct bbslist *bbs) struct file_pick fpick; j=filepick(&uifc, "Load Font From File", &fpick, ".", NULL, 0); - if(j!=-1 && fpick.files>=1) { + if(j!=-1 && fpick.files>=1) loadfont(fpick.selected[0]); - uifc_old_font=getfont(); - } filepick_free(&fpick); } - else { + else setfont(i,FALSE,1); - uifc_old_font=getfont(); - } } break; } diff --git a/src/syncterm/uifcinit.h b/src/syncterm/uifcinit.h index cc1c1fba097d794c0d5521c785d20f87741607c3..c3dd0df5b5fe32cf52f518c105693689f9448f39 100644 --- a/src/syncterm/uifcinit.h +++ b/src/syncterm/uifcinit.h @@ -8,7 +8,6 @@ #include <uifc.h> extern uifcapi_t uifc; /* User Interface (UIFC) Library API */ -extern int uifc_old_font; /* Font to return to after exiting uifc */ int init_uifc(BOOL scrn, BOOL bottom); void uifcbail(void); void uifcmsg(char *msg, char *helpbuf); diff --git a/src/syncterm/window.c b/src/syncterm/window.c index c5aac40a29fd5a562467364850d62215738ed785..c337ad3ab5cb9a56a39d41ba04714492c654c520 100644 --- a/src/syncterm/window.c +++ b/src/syncterm/window.c @@ -13,26 +13,11 @@ int drawwin(void) char *p; char str[32]; int x,y,c; + int old_xlat; gettextinfo(&txtinfo); -#if 0 - switch(ciolib_to_screen(txtinfo.currmode)) { - case SCREEN_MODE_ATARI: - case SCREEN_MODE_ATARI_XEP80: - strcpy(str,"3ync4%2- "); - break; - case SCREEN_MODE_C64: - case SCREEN_MODE_C128_40: - case SCREEN_MODE_C128_80: - strcpy(str,"SYNCTERM "); - break; - default: - strcpy(str,"SyncTERM "); - } -#else strcpy(str," "); -#endif if(txtinfo.screenwidth < 80) term.width=40; @@ -73,6 +58,9 @@ int drawwin(void) winbuf[c++]=YELLOW|(BLUE<<4); } } + old_xlat = ciolib_xlat; + ciolib_xlat = TRUE; puttext(1,1,txtinfo.screenwidth,txtinfo.screenheight,winbuf); + ciolib_xlat = old_xlat; return(0); }