From 576dc93a10a2573677d3df9122f0584ca18fda81 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Tue, 21 Sep 2004 02:58:52 +0000
Subject: [PATCH] More MONO detection stuff, less OS-specific stuff.
---
src/uifc/uifc32.c | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/uifc/uifc32.c b/src/uifc/uifc32.c
index 644d323ea5..88a89616b0 100644
--- a/src/uifc/uifc32.c
+++ b/src/uifc/uifc32.c
@@ -146,9 +146,6 @@ int uifcini32(uifcapi_t* uifcapi)
{
int i;
struct text_info txtinfo;
-#ifdef _WIN32
- DWORD conmode;
-#endif
if(uifcapi==NULL || uifcapi->size!=sizeof(uifcapi_t))
return(-1);
@@ -247,16 +244,18 @@ int uifcini32(uifcapi_t* uifcapi)
if(!(api->mode&UIFC_COLOR)
&& (api->mode&UIFC_MONO
- || txtinfo.currmode==MONO || txtinfo.currmode==BW80)) {
+ || txtinfo.currmode==MONO || txtinfo.currmode==BW40 || txtinfo.currmode==BW80
+ || txtinfo.currmode==MONO14 || txtinfo.currmode==BW40X14 || txtinfo.currmode==BW80X14
+ || txtinfo.currmode==MONO21 || txtinfo.currmode==BW40X21 || txtinfo.currmode==BW80X21
+ || txtinfo.currmode==MONO28 || txtinfo.currmode==BW40X28 || txtinfo.currmode==BW80X28
+ || txtinfo.currmode==MONO43 || txtinfo.currmode==BW40X43 || txtinfo.currmode==BW80X43
+ || txtinfo.currmode==MONO50 || txtinfo.currmode==BW40X50 || txtinfo.currmode==BW80X50
+ || txtinfo.currmode==MONO60 || txtinfo.currmode==BW40X60 || txtinfo.currmode==BW80X60))
+ {
bclr=BLACK;
hclr=WHITE;
lclr=LIGHTGRAY;
cclr=LIGHTGRAY;
-#ifdef __unix__
- if(txtinfo.currmode==MONO)
- lbclr=WHITE|(BLACK<<4); /* no color on curses means no inverse either */
- else
-#endif
lbclr=BLACK|(LIGHTGRAY<<4); /* lightbar color */
} else {
bclr=BLUE;
@@ -328,18 +327,6 @@ void uifcbail(void)
textattr(LIGHTGRAY);
uifc_mouse_disable();
clrscr();
-#ifdef __unix__
- if(cio_api.mode==CIOLIB_MODE_CURSES) {
- nl();
- nocbreak();
- noraw();
- refresh();
- endwin();
-#ifdef XCURSES
- XCursesExit();
-#endif
- }
-#endif
FREE(blk_scrn);
FREE(tmp_buffer);
FREE(tmp_buffer2);
--
GitLab