From 9d73dbb9bf524cf9ecfdfb2065758f5d8b51aa87 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 9 Feb 2015 07:34:23 +0000
Subject: [PATCH] More use of XLAT mode. Background, blank status bar, an
"Scrollback" indicators use it now.
---
src/syncterm/menu.c | 24 ++++--------------------
src/syncterm/term.c | 8 ++------
src/syncterm/uifcinit.h | 1 -
src/syncterm/window.c | 20 ++++----------------
4 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/src/syncterm/menu.c b/src/syncterm/menu.c
index 561929ae0b..4ff1a2cb07 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 b3c56f781b..91223cc5e0 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 cc1c1fba09..c3dd0df5b5 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 c5aac40a29..c337ad3ab5 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);
}
--
GitLab