1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00

WIN32 port: introduced VT100 decoder. ELinks is able to display first page

of the document. Keyboard doesn't work, Windows style path either.
I tested it only under Wine.
This commit is contained in:
Witold Filipczyk 2006-05-20 14:05:45 +02:00 committed by Witold Filipczyk
parent 3dc145bde2
commit cbb507a6b5
7 changed files with 144 additions and 6 deletions

View File

@ -243,7 +243,7 @@ select_loop(void (*init)(void))
#endif #endif
if (has_timer) { if (has_timer) {
/* Be sure timeout is not negative. */ /* Be sure timeout is not negative. */
timeval_limit_to_zero(&t); timeval_limit_to_zero_or_one(&t);
timeout = (struct timeval *) &t; timeout = (struct timeval *) &t;
} }
@ -335,5 +335,10 @@ can_read(int fd)
int int
can_write(int fd) can_write(int fd)
{ {
#ifdef CONFIG_OS_WIN32
/* temporary hack. ELinks didn't start properly under Wine */
return 1;
#else
return can_read_or_write(fd, 1); return can_read_or_write(fd, 1);
#endif
} }

View File

@ -1,6 +1,6 @@
top_builddir=../../.. top_builddir=../../..
include $(top_builddir)/Makefile.config include $(top_builddir)/Makefile.config
OBJS = win32.o overrides.o OBJS = overrides.o vt100.o win32.o
include $(top_srcdir)/Makefile.lib include $(top_srcdir)/Makefile.lib

View File

@ -25,6 +25,7 @@
#include "intl/gettext/libintl.h" #include "intl/gettext/libintl.h"
#include "osdep/osdep.h" #include "osdep/osdep.h"
#include "osdep/win32/overrides.h" #include "osdep/win32/overrides.h"
#include "osdep/win32/vt100.h"
#include "osdep/win32/win32.h" #include "osdep/win32/win32.h"
#include "terminal/mouse.h" #include "terminal/mouse.h"
#include "terminal/terminal.h" #include "terminal/terminal.h"
@ -209,9 +210,11 @@ win32_write(int fd, const void *buf, unsigned len)
case FDT_TERMINAL: case FDT_TERMINAL:
if (isatty(STDOUT_FILENO) > 0) { if (isatty(STDOUT_FILENO) > 0) {
/* TODO: pass to VT100 decoder */ #if 0
WriteConsole ((HANDLE) fd, buf, len, &written, NULL); WriteConsole ((HANDLE) fd, buf, len, &written, NULL);
rc = written; rc = written;
#endif
rc = VT100_decode((HANDLE) fd, buf, len);
} else { } else {
/* stdout redirected */ /* stdout redirected */
rc = write(STDOUT_FILENO, buf, len); rc = write(STDOUT_FILENO, buf, len);

113
src/osdep/win32/vt100.c Normal file
View File

@ -0,0 +1,113 @@
/* VT 100 emulation */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "osdep/system.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/types.h>
#include "elinks.h"
#include "osdep/osdep.h"
#include "osdep/win32/win32.h"
int
VT100_decode(HANDLE fd, const void *b, int len)
{
static unsigned char intensity = 0;
static unsigned char fore = 7;
static unsigned char back = 0;
char *buf = (char *)b;
int length = len;
int i = 0;
while (1) {
if (len <= 0) return length;
for (i = 0; i < len && buf[i] != 27; i++);
if (i) {
DWORD w;
WriteConsole(fd, buf, i, &w, NULL);
len -= w;
if (len <= 0) return length;
buf += w;
}
if (!strncmp(buf, "\033)0\0337", 5)) {
buf += 5;
len -= 5;
continue;
}
if (!strncmp(buf, "\033[?47h", 6)) {
buf += 6;
len -= 6;
continue;
}
if (!strncmp(buf, "\033[?47l", 6)) {
buf += 6;
len -= 6;
continue;
}
if (!strncmp(buf, "\033[2J", 4)) {
/* Clear screen */
buf += 4;
len -= 4;
continue;
}
if (buf[1] == '[') {
char *tail;
char *begin;
char *end;
COORD pos;
buf += 2;
len -= 2;
int k = strspn(buf, "0123456789;");
if (!k) continue;
switch (buf[k]) {
case 'H':
pos.Y = (short)strtol(buf, &tail, 10) - 1;
pos.X = (short)strtol(tail + 1, NULL, 10) - 1;
SetConsoleCursorPosition(fd, pos);
break;
case 'm':
end = buf + k;
begin = tail = buf;
while (tail < end) {
static unsigned char kolors[8] = {0, 4, 2, 6, 1, 5, 3, 7};
unsigned char kod = (unsigned char)strtol(begin, &tail, 10);
begin = tail + 1;
if (kod == 0) {
intensity = 0;
} else if (kod == 1) {
intensity = 8;
} else if (kod >= 30 && kod <= 37) {
fore = kolors[kod - 30];
} else if (kod >= 40 && kod <= 47) {
back = kolors[kod - 40];
}
}
SetConsoleTextAttribute(fd, fore | intensity | back << 4);
break;
default:
break;
}
k++;
buf += k;
len -= k;
} else {
buf += 2;
len -= 2;
}
}
}

15
src/osdep/win32/vt100.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef EL__OSDEP_WIN32_VT100_H
#define EL__OSDEP_WIN32_VT100_H
#ifdef CONFIG_OS_WIN32
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
int VT100_decode(HANDLE, const void *, int);
#endif
#endif

View File

@ -198,10 +198,12 @@ timeval_is_positive(timeval_T *t)
/* Be sure timeval is not negative. */ /* Be sure timeval is not negative. */
void void
timeval_limit_to_zero(timeval_T *t) timeval_limit_to_zero_or_one(timeval_T *t)
{ {
if (t->sec < 0) t->sec = 0; if (t->sec < 0) t->sec = 0;
if (t->usec < 0) t->usec = 0; if (t->usec < 0) t->usec = 0;
/* Under Windows I got 300 seconds timeout, so 1 second should not hurt --witekfl */
if (t->sec > 1) t->sec = 1;
} }
/* Returns 1 if t1 > t2 /* Returns 1 if t1 > t2

View File

@ -37,7 +37,7 @@ milliseconds_T timeval_to_milliseconds(timeval_T *t);
long timeval_to_seconds(timeval_T *t); long timeval_to_seconds(timeval_T *t);
int timeval_is_positive(timeval_T *t); int timeval_is_positive(timeval_T *t);
void timeval_limit_to_zero(timeval_T *t); void timeval_limit_to_zero_or_one(timeval_T *t);
timeval_T *timeval_now(timeval_T *t); timeval_T *timeval_now(timeval_T *t);
timeval_T *timeval_sub(timeval_T *res, timeval_T *older, timeval_T *newer); timeval_T *timeval_sub(timeval_T *res, timeval_T *older, timeval_T *newer);
timeval_T *timeval_add(timeval_T *res, timeval_T *base, timeval_T *t); timeval_T *timeval_add(timeval_T *res, timeval_T *base, timeval_T *t);