storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run make indent

Browse Source
This commit is contained in:
Fumitoshi UKAI
2001-12-14 17:40:09 +00:00
parent e67fb668cf
commit 6823531d6b
1 changed files with 134 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

257
terms.c
View File

@@ -1,4 +1,4 @@
/* $Id: terms.c,v 1.22 2001/12/12 17:04:21 ukai Exp $ */ /* $Id: terms.c,v 1.23 2001/12/14 17:40:09 ukai Exp $ */
/* /*
* An original curses library for EUC-kanji by Akinori ITO, December 1989 * An original curses library for EUC-kanji by Akinori ITO, December 1989
* revised by Akinori ITO, January 1995 * revised by Akinori ITO, January 1995
@@ -114,14 +114,14 @@ init_win32_console_handle(void)
static void static void
expand_win32_console_input_buffer(int n) expand_win32_console_input_buffer(int n)
{ {
if (nConIn + n >= nConInMax) { if (nConIn + n >= nConInMax) {
char *oldv; char *oldv;
nConInMax = ((nConIn + n) / 2 + 1) * 3; nConInMax = ((nConIn + n) / 2 + 1) * 3;
oldv = ConInV; oldv = ConInV;
ConInV = GC_MALLOC_ATOMIC(nConInMax); ConInV = GC_MALLOC_ATOMIC(nConInMax);
memcpy(ConInV, oldv, nConIn); memcpy(ConInV, oldv, nConIn);
} }
} }
static int static int
@@ -136,41 +136,47 @@ read_win32_console_input(void)
expand_win32_console_input_buffer(3); expand_win32_console_input_buffer(3);
if (ReadConsole(hConIn, &ConInV[nConIn], 1, &nevents, NULL)) { if (ReadConsole(hConIn, &ConInV[nConIn], 1, &nevents, NULL)) {
nConIn += nevents; nConIn += nevents;
return nevents; return nevents;
} }
break; break;
#ifdef USE_MOUSE #ifdef USE_MOUSE
case MOUSE_EVENT: case MOUSE_EVENT:
if ((lastConMouse.dwButtonState ^ rec.Event.MouseEvent.dwButtonState) & ~(~0 << 5)) { if ((lastConMouse.dwButtonState ^ rec.Event.MouseEvent.
int down; dwButtonState) & ~(~0 << 5)) {
MOUSE_EVENT_RECORD *mer; int down;
INPUT_RECORD dummy; MOUSE_EVENT_RECORD *mer;
INPUT_RECORD dummy;
expand_win32_console_input_buffer(6); expand_win32_console_input_buffer(6);
mer = &rec.Event.MouseEvent; mer = &rec.Event.MouseEvent;
ConInV[nConIn] = '\033'; ConInV[nConIn] = '\033';
ConInV[nConIn + 1] = '['; ConInV[nConIn + 1] = '[';
ConInV[nConIn + 2] = 'M'; ConInV[nConIn + 2] = 'M';
if (~(mer->dwButtonState) & lastConMouse.dwButtonState & ~(~0 << 5)) if (~(mer->dwButtonState) & lastConMouse.
ConInV[nConIn + 3] = MOUSE_BTN_UP + ' '; dwButtonState & ~(~0 << 5))
else if (!(down = mer->dwButtonState & ~lastConMouse.dwButtonState & ~(~0 << 5))) ConInV[nConIn + 3] = MOUSE_BTN_UP + ' ';
break; else if (!
else (down =
ConInV[nConIn + 3] = (down & (1 << 0) ? MOUSE_BTN1_DOWN : mer->dwButtonState & ~lastConMouse.
down & (1 << 1) ? MOUSE_BTN3_DOWN : dwButtonState & ~(~0 << 5)))
down & (1 << 2) ? MOUSE_BTN2_DOWN : break;
down & (1 << 3) ? MOUSE_BTN4_DOWN_XTERM : else
MOUSE_BTN5_DOWN_XTERM) + ' '; ConInV[nConIn + 3] = (down & (1 << 0) ? MOUSE_BTN1_DOWN :
down & (1 << 1) ? MOUSE_BTN3_DOWN :
down & (1 << 2) ? MOUSE_BTN2_DOWN :
down & (1 << 3) ?
MOUSE_BTN4_DOWN_XTERM :
MOUSE_BTN5_DOWN_XTERM) + ' ';
ConInV[nConIn + 4] = mer->dwMousePosition.X + '!'; ConInV[nConIn + 4] = mer->dwMousePosition.X + '!';
ConInV[nConIn + 5] = mer->dwMousePosition.Y + '!'; ConInV[nConIn + 5] = mer->dwMousePosition.Y + '!';
nConIn += 6; nConIn += 6;
lastConMouse = *mer; lastConMouse = *mer;
ReadConsoleInput(hConIn, &rec, 1, &nevents); ReadConsoleInput(hConIn, &rec, 1, &nevents);
return 6; return 6;
} }
#endif #endif
default: default:
@@ -190,110 +196,112 @@ read_win32_console(char *s, int n)
if (hConIn == INVALID_HANDLE_VALUE) if (hConIn == INVALID_HANDLE_VALUE)
return read(tty, s, n); return read(tty, s, n);
if (n > 0) if (n > 0)
for (;;) { for (;;) {
if (iConIn < nConIn) { if (iConIn < nConIn) {
if (n > nConIn - iConIn) if (n > nConIn - iConIn)
n = nConIn - iConIn; n = nConIn - iConIn;
memcpy(s, ConInV, n); memcpy(s, ConInV, n);
if ((iConIn += n) >= nConIn) if ((iConIn += n) >= nConIn)
iConIn = nConIn = 0; iConIn = nConIn = 0;
break; break;
} }
iConIn = nConIn = 0; iConIn = nConIn = 0;
while (!read_win32_console_input()) while (!read_win32_console_input()) ;
; }
}
return n; return n;
} }
static int static int
cmp_tv(const struct timeval *tv_a, const struct timeval *tv_b) cmp_tv(const struct timeval *tv_a, const struct timeval *tv_b)
{ {
return ((tv_a->tv_sec < tv_b->tv_sec) ? -1 : return ((tv_a->tv_sec < tv_b->tv_sec) ? -1 :
(tv_a->tv_sec > tv_b->tv_sec) ? 1 : (tv_a->tv_sec > tv_b->tv_sec) ? 1 :
(tv_a->tv_usec < tv_b->tv_usec) ? -1 : (tv_a->tv_usec < tv_b->tv_usec) ? -1 :
(tv_a->tv_usec > tv_b->tv_usec) ? 1 : (tv_a->tv_usec > tv_b->tv_usec) ? 1 : 0);
0);
} }
static int static int
subtract_tv(struct timeval *dst, const struct timeval *src) subtract_tv(struct timeval *dst, const struct timeval *src)
{ {
if ((dst->tv_usec -= src->tv_usec) < 0) { if ((dst->tv_usec -= src->tv_usec) < 0) {
--(dst->tv_sec); --(dst->tv_sec);
dst->tv_usec += 1000000; dst->tv_usec += 1000000;
} }
return ((dst->tv_sec -= src->tv_sec) < 0 ? -1 : return ((dst->tv_sec -= src->tv_sec) < 0 ? -1 :
!dst->tv_sec ? (dst->tv_usec < 0 ? -1 : !dst->tv_usec ? 0 : 1) : 1); !dst->tv_sec ? (dst->tv_usec <
0 ? -1 : !dst->tv_usec ? 0 : 1) : 1);
} }
int int
select_or_poll_win32_console(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tout) select_or_poll_win32_console(int n, fd_set * rfds, fd_set * wfds,
fd_set * efds, struct timeval *tout)
{ {
int m; int m;
DWORD nevents; DWORD nevents;
if ((m = select(n, rfds, wfds, efds, tout)) < 0) if ((m = select(n, rfds, wfds, efds, tout)) < 0)
return m; return m;
if (iConIn < nConIn) { if (iConIn < nConIn) {
FD_SET(tty, rfds); FD_SET(tty, rfds);
++m; ++m;
}
else {
iConIn = nConIn = 0;
while (GetNumberOfConsoleInputEvents(hConIn, &nevents) && nevents)
read_win32_console_input();
if (nConIn) {
FD_SET(tty, rfds);
++m;
} }
else {
iConIn = nConIn = 0;
while (GetNumberOfConsoleInputEvents(hConIn, &nevents) && nevents)
read_win32_console_input();
if (nConIn) {
FD_SET(tty, rfds);
++m;
}
}
return m;
}
int
select_win32_console(int n, fd_set * rfds, fd_set * wfds, fd_set * efds,
struct timeval *tout)
{
static struct timeval polltv = { 0, 1000000 / CLOCKS_PER_SEC };
int m;
struct timeval tv;
if (hConIn == INVALID_HANDLE_VALUE || tty < 0 || tty >= n || !rfds
|| !FD_ISSET(tty, rfds))
return select(n, rfds, wfds, efds, tout);
FD_CLR(tty, rfds);
if (tout) {
while (cmp_tv(tout, &polltv) > 0) {
tv = polltv;
if ((m = select_or_poll_win32_console(n, rfds, wfds, efds, &tv)))
return m;
subtract_tv(tout, &polltv);
} }
return m; return select_or_poll_win32_console(n, rfds, wfds, efds, tout);
}
int
select_win32_console(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tout)
{
static struct timeval polltv = {0, 1000000 / CLOCKS_PER_SEC};
int m;
struct timeval tv;
if (hConIn == INVALID_HANDLE_VALUE || tty < 0 || tty >= n || !rfds || !FD_ISSET(tty, rfds))
return select(n, rfds, wfds, efds, tout);
FD_CLR(tty, rfds);
if (tout) {
while (cmp_tv(tout, &polltv) > 0) {
tv = polltv;
if ((m = select_or_poll_win32_console(n, rfds, wfds, efds, &tv)))
return m;
subtract_tv(tout, &polltv);
} }
else
for (;;) {
tv = polltv;
return select_or_poll_win32_console(n, rfds, wfds, efds, tout); if ((m = select_or_poll_win32_console(n, rfds, wfds, efds, &tv)))
} return m;
else }
for (;;) {
tv = polltv;
if ((m = select_or_poll_win32_console(n, rfds, wfds, efds, &tv)))
return m;
}
} }
#endif #endif
@@ -470,13 +478,16 @@ static struct mouse_term_info {
char *term; char *term;
int flag; int flag;
} xterm_mouse_term[] = { } xterm_mouse_term[] = {
{"xterm", NEED_XTERM_ON|NEED_XTERM_OFF}, {
{"kterm", NEED_XTERM_ON|NEED_XTERM_OFF}, "xterm", NEED_XTERM_ON | NEED_XTERM_OFF}, {
{"rxvt", NEED_XTERM_ON|NEED_XTERM_OFF}, "kterm", NEED_XTERM_ON | NEED_XTERM_OFF}, {
"rxvt", NEED_XTERM_ON | NEED_XTERM_OFF},
#ifdef __CYGWIN__ #ifdef __CYGWIN__
{"cygwin", NEED_XTERM_ON}, {
"cygwin", NEED_XTERM_ON},
#endif #endif
{NULL, 0} {
NULL, 0}
}; };
#endif #endif
@@ -504,8 +515,8 @@ set_tty(void)
char *term = getenv("TERM"); char *term = getenv("TERM");
struct mouse_term_info *p; struct mouse_term_info *p;
for (p = xterm_mouse_term; p->term != NULL; p++) { for (p = xterm_mouse_term; p->term != NULL; p++) {
if (!strncmp(term, p->term, strlen(p->term))) { if (!strncmp(term, p->term, strlen(p->term))) {
is_xterm = p->flag; is_xterm = p->flag;
break; break;
} }
} }
@@ -1965,11 +1976,11 @@ sleep_till_anykey(int sec, int purge)
if ( if (
#ifdef __CYGWIN__ #ifdef __CYGWIN__
select_win32_console(tty + 1, &rfd, 0, 0, &tim) select_win32_console(tty + 1, &rfd, 0, 0, &tim)
#else #else
select(tty + 1, &rfd, 0, 0, &tim) select(tty + 1, &rfd, 0, 0, &tim)
#endif #endif
> 0 && purge) { > 0 && purge) {
c = getch(); c = getch();
if (c == ESC_CODE) if (c == ESC_CODE)
skip_escseq(); skip_escseq();