diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | display.c | 6 | ||||
| -rw-r--r-- | fm.h | 8 | ||||
| -rw-r--r-- | terms.c | 10 |
4 files changed, 22 insertions, 13 deletions
@@ -1,6 +1,15 @@ +2001-11-21 Tsutomu Okada <okada@furuno.co.jp> + + * [w3m-dev 02472] cleanup CYGWIN macro + * display.c (displayBuffer): use __CYGWIN__ macro + * fm.h: ditto + * terms.c (refresh): add condition for isWinConsole which + defined only japanese cygwin environment + 2001-11-21 Akinori Ito <aito@fw.ipsj.or.jp> - * Homepage URLs and author's mail addresses in the documents + * [w3m-dev 02466] + Homepage URLs and author's mail addresses in the documents are changed. 2001-11-21 Fumitoshi UKAI <ukai@debian.or.jp> @@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.4 2001/11/20 16:46:32 ukai Exp $ */ +/* $Id: display.c,v 1.5 2001/11/21 09:09:10 ukai Exp $ */ #include <signal.h> #include "fm.h" @@ -233,11 +233,11 @@ displayBuffer(Buffer * buf, int mode) scroll(n); } else if (n < 0 && n > -LASTLINE) { -#if defined(CYGWIN) && LANG == JA +#if defined(__CYGWIN__) && LANG == JA move(LASTLINE + n + 1, 0); clrtoeolx(); refresh(); -#endif /* defined(CYGWIN) && LANG == JA */ +#endif /* defined(__CYGWIN__) && LANG == JA */ rscroll(-n); } redrawNLine(buf, n); @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.7 2001/11/20 16:46:33 ukai Exp $ */ +/* $Id: fm.h,v 1.8 2001/11/21 09:09:10 ukai Exp $ */ /* * w3m: WWW wo Miru utility * @@ -603,12 +603,12 @@ typedef struct http_request { */ extern int LINES, COLS; -#if defined(CYGWIN) && LANG == JA +#if defined(__CYGWIN__) && LANG == JA extern int isWinConsole; #define LASTLINE (LINES-(isWinConsole ? 2 : 1)) -#else /* not defined(CYGWIN) && LANG == JA */ +#else /* not defined(__CYGWIN__) || LANG != JA */ #define LASTLINE (LINES-1) -#endif /* not defined(CYGWIN) && LANG == JA */ +#endif /* not defined(__CYGWIN__) || LANG != JA */ global int Tabstop init(8); global int ShowEffect init(TRUE); @@ -1,4 +1,4 @@ -/* $Id: terms.c,v 1.9 2001/11/19 19:21:11 ukai Exp $ */ +/* $Id: terms.c,v 1.10 2001/11/21 09:09:10 ukai Exp $ */ /* * An original curses library for EUC-kanji by Akinori ITO, December 1989 * revised by Akinori ITO, January 1995 @@ -1089,13 +1089,13 @@ refresh(void) * avoid the scroll, I prohibit to draw character on * (COLS-1,LINES-1). */ -#if !defined( BG_COLOR ) || defined( CYGWIN ) -#ifdef CYGWIN +#if !defined(BG_COLOR) || defined(__CYGWIN__) +#if defined(__CYGWIN__) && LANG == JA if (isWinConsole) -#endif +#endif /* defined(__CYGWIN__) && LANG == JA */ if (line == LINES - 1 && col == COLS - 1) break; -#endif /* not BG_COLOR */ +#endif /* !defined(BG_COLOR) || defined(__CYGWIN__) */ if ((!(pr[col] & S_STANDOUT) && (mode & S_STANDOUT)) || (!(pr[col] & S_UNDERLINE) && (mode & S_UNDERLINE)) || (!(pr[col] & S_BOLD) && (mode & S_BOLD)) || |