nortti/links
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: nortti:autoconf
Branches Tags
nortti:upstream
nortti:graphics
nortti:autoconf
nortti:sortix
nortti:draw-consolidation
nortti:strikethrough
..
compare: nortti:upstream
Branches Tags
nortti:upstream
nortti:graphics
nortti:autoconf
nortti:sortix
nortti:draw-consolidation
nortti:strikethrough

1 commit
autoconf ... upstream

Author SHA1 Message Date
Juhani Krekelä
622a2d8cb9 Upstream Links 2.30 2024-08-26 19:03:41 +03:00
30 changed files with 8013 additions and 6077 deletions
Show stats Expand all files Collapse all files

8
.gitignore vendored
View file

@ -1,8 +0,0 @@
*.o
links
Makefile
config.cache
config.h
config.log
config.status
stamp-h

14
ChangeLog
View file

@ -1,3 +1,17 @@
=== RELEASE 2.30 ===
Sat Jul 27 18:41:39 CEST 2024 mikulas:
Disable asynchronous DNS on Windows because of some Cygwin bug
Sun Jul 21 19:58:03 CEST 2024 mikulas:
Fix the configure script to work with GCC 14
Sun Jul 21 17:22:30 CEST 2024 mikulas:
Fix window title on kwin
=== RELEASE 2.29 === === RELEASE 2.29 ===
Thu Mar 9 19:51:20 CET 2023 Florian Weimer <fweimer@redhat.com>: Thu Mar 9 19:51:20 CET 2023 Florian Weimer <fweimer@redhat.com>:

2
INSTALL
View file

@ -1,4 +1,4 @@
Links 2.29 -- How To Install Links 2.30 -- How To Install
---------------------------- ----------------------------
Follow this step-by-step: Follow this step-by-step:

2
Makefile.am
View file

@ -24,7 +24,7 @@ if JAVASCRIPT
links_LDADD=builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o links_LDADD=builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o
endif endif
links_SOURCES=af_unix.c avif.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c sortix.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc links_SOURCES=af_unix.c avif.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc
# builtin.c context.c ipret.c javascr.c javascript.c md5.c md5hl.c ns.c pomocny.c regexp.c md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h # builtin.c context.c ipret.c javascr.c javascript.c md5.c md5hl.c ns.c pomocny.c regexp.c md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h
dist-hook: dist-hook:

10
Makefile.in
View file

@ -35,6 +35,8 @@ mandir = @mandir@
includedir = @includedir@ includedir = @includedir@
oldincludedir = /usr/include oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
@ -76,7 +78,7 @@ bin_PROGRAMS = links
@HAIKU_GR_TRUE@links_LDADD = haiku.o @HAIKU_GR_TRUE@links_LDADD = haiku.o
@JAVASCRIPT_TRUE@links_LDADD = builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o @JAVASCRIPT_TRUE@links_LDADD = builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o
links_SOURCES = af_unix.c avif.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c sortix.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc links_SOURCES = af_unix.c avif.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
@ -99,13 +101,13 @@ finger.o fn_impl.o fontconf.o font_inc.o framebuf.o freetype.o ftp.o \
gif.o grx.o hpux.o html.o html_gr.o html_r.o html_tbl.o http.o https.o \ gif.o grx.o hpux.o html.o html_gr.o html_r.o html_tbl.o http.o https.o \
img.o imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o \ img.o imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o \
mailto.o main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o \ mailto.o main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o \
sched.o select.o session.o smb.o sortix.o string.o suffix.o svg.o svgalib.o \ sched.o select.o session.o smb.o string.o suffix.o svg.o svgalib.o \
terminal.o tiff.o types.o url.o view.o view_gr.o vms.o webp.o x.o xbm.o terminal.o tiff.o types.o url.o view.o view_gr.o vms.o webp.o x.o xbm.o
@ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o @ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o
@HAIKU_GR_TRUE@links_DEPENDENCIES = haiku.o
@JAVASCRIPT_TRUE@links_DEPENDENCIES = builtin.o context.o ipret.o \ @JAVASCRIPT_TRUE@links_DEPENDENCIES = builtin.o context.o ipret.o \
@JAVASCRIPT_TRUE@javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o \ @JAVASCRIPT_TRUE@javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o \
@JAVASCRIPT_TRUE@regexp.o @JAVASCRIPT_TRUE@regexp.o
@HAIKU_GR_TRUE@links_DEPENDENCIES = haiku.o
links_LDFLAGS = links_LDFLAGS =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -461,8 +463,6 @@ session.o: session.c links.h cfg.h config.h com-defs.h os_dep.h \
os_depx.h setup.h language.h codepage.h os_depx.h setup.h language.h codepage.h
smb.o: smb.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ smb.o: smb.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \
setup.h language.h codepage.h setup.h language.h codepage.h
sortix.o: sortix.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \
setup.h language.h codepage.h
string.o: string.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ string.o: string.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \
setup.h language.h codepage.h setup.h language.h codepage.h
suffix.o: suffix.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ suffix.o: suffix.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \

3
acconfig.h
View file

@ -229,9 +229,6 @@
/* */ /* */
#undef GRDRV_GRX #undef GRDRV_GRX
/* */
#undef GRDRV_SORTIX
/* Have freetype */ /* Have freetype */
#undef HAVE_FREETYPE #undef HAVE_FREETYPE

1
bfu.c
View file

@ -536,6 +536,7 @@ static void menu_func(struct window *win, struct links_event *ev, int fwd)
int f = 1; int f = 1;
struct window *w1; struct window *w1;
struct list_head *w1l; struct list_head *w1l;
f = f + 0; /* avoid warning */
foreachfrom(struct window, w1, w1l, win->term->windows, &win->list_entry) { foreachfrom(struct window, w1, w1l, win->term->windows, &win->list_entry) {
struct menu *m1; struct menu *m1;
if (w1->handler == mainmenu_func) { if (w1->handler == mainmenu_func) {

222
certs.inc
View file

File diff suppressed because one or more lines are too long

5779
certs/links.crt
View file

File diff suppressed because it is too large Load diff

4
config-vms.h
View file

@ -940,11 +940,11 @@
#define PACKAGE "links" #define PACKAGE "links"
/* Version number of package */ /* Version number of package */
#define VERSION "2.29" #define VERSION "2.30"
/* */ /* */
#define VERSION "2.29" #define VERSION "2.30"
/* */ /* */
/* #undef HAVE_OPENMP */ /* #undef HAVE_OPENMP */

15
config.h.in
View file

@ -224,9 +224,6 @@
/* Define if you have the dirfd function. */ /* Define if you have the dirfd function. */
#undef HAVE_DIRFD #undef HAVE_DIRFD
/* Define if you have the <display.h> header file. */
#undef HAVE_DISPLAY_H
/* Define if you have the event_base_free function. */ /* Define if you have the event_base_free function. */
#undef HAVE_EVENT_BASE_FREE #undef HAVE_EVENT_BASE_FREE
@ -611,9 +608,6 @@
/* Define if you have the <fontconfig/fontconfig.h> header file. */ /* Define if you have the <fontconfig/fontconfig.h> header file. */
#undef HAVE_FONTCONFIG_FONTCONFIG_H #undef HAVE_FONTCONFIG_FONTCONFIG_H
/* Define if you have the <framebuffer.h> header file. */
#undef HAVE_FRAMEBUFFER_H
/* Define if you have the <ft2build.h> header file. */ /* Define if you have the <ft2build.h> header file. */
#undef HAVE_FT2BUILD_H #undef HAVE_FT2BUILD_H
@ -782,9 +776,6 @@
/* Define if you have the <sys/ioctl.h> header file. */ /* Define if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H #undef HAVE_SYS_IOCTL_H
/* Define if you have the <sys/keycodes.h> header file. */
#undef HAVE_SYS_KEYCODES_H
/* Define if you have the <sys/mman.h> header file. */ /* Define if you have the <sys/mman.h> header file. */
#undef HAVE_SYS_MMAN_H #undef HAVE_SYS_MMAN_H
@ -875,9 +866,6 @@
/* Define if you have the bz2 library (-lbz2). */ /* Define if you have the bz2 library (-lbz2). */
#undef HAVE_LIBBZ2 #undef HAVE_LIBBZ2
/* Define if you have the display library (-ldisplay). */
#undef HAVE_LIBDISPLAY
/* Define if you have the dl library (-ldl). */ /* Define if you have the dl library (-ldl). */
#undef HAVE_LIBDL #undef HAVE_LIBDL
@ -1206,9 +1194,6 @@
/* */ /* */
#undef GRDRV_GRX #undef GRDRV_GRX
/* */
#undef GRDRV_SORTIX
/* Have freetype */ /* Have freetype */
#undef HAVE_FREETYPE #undef HAVE_FREETYPE

146
configure vendored
View file

@ -69,8 +69,6 @@ ac_help="$ac_help
--without-haiku compile without Haiku graphics driver" --without-haiku compile without Haiku graphics driver"
ac_help="$ac_help ac_help="$ac_help
--without-grx compile without DOS GRX graphics driver" --without-grx compile without DOS GRX graphics driver"
ac_help="$ac_help
--without-sortix compile without Sortix display(1) graphics driver"
ac_help="$ac_help ac_help="$ac_help
--with-x use the X Window System" --with-x use the X Window System"
ac_help="$ac_help ac_help="$ac_help
@ -126,7 +124,7 @@ libdir='${exec_prefix}/lib'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
infodir='${prefix}/info' infodir='${prefix}/info'
mandir='${prefix}/share/man' mandir='${prefix}/man'
# Initialize some other variables. # Initialize some other variables.
subdirs= subdirs=
@ -243,7 +241,7 @@ Directory and file names:
--includedir=DIR C header files in DIR [PREFIX/include] --includedir=DIR C header files in DIR [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
--infodir=DIR info documentation in DIR [PREFIX/info] --infodir=DIR info documentation in DIR [PREFIX/info]
--mandir=DIR man documentation in DIR [PREFIX/share/man] --mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..] --srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names --program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names
@ -775,7 +773,7 @@ fi
PACKAGE=links PACKAGE=links
VERSION=2.29 VERSION=2.30
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@ -1003,7 +1001,7 @@ cat > conftest.$ac_ext << EOF
#line 1004 "configure" #line 1004 "configure"
#include "confdefs.h" #include "confdefs.h"
main(){return(0);} int main(){return(0);}
EOF EOF
if { (eval echo configure:1009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes ac_cv_prog_cc_works=yes
@ -1262,6 +1260,7 @@ else
#line 1263 "configure" #line 1263 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#include <stdlib.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
@ -2056,7 +2055,7 @@ for ac_kw in inline __inline__ __inline; do
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
} $ac_kw foo() { } $ac_kw int foo() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@ -2322,8 +2321,9 @@ else
#line 2323 "configure" #line 2323 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
main() int main()
{ {
FILE *f=fopen("conftestval", "w"); FILE *f=fopen("conftestval", "w");
if (!f) exit(1); if (!f) exit(1);
@ -2362,8 +2362,9 @@ else
#line 2363 "configure" #line 2363 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
main() int main()
{ {
FILE *f=fopen("conftestval", "w"); FILE *f=fopen("conftestval", "w");
if (!f) exit(1); if (!f) exit(1);
@ -2402,8 +2403,9 @@ else
#line 2403 "configure" #line 2403 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
main() int main()
{ {
FILE *f=fopen("conftestval", "w"); FILE *f=fopen("conftestval", "w");
if (!f) exit(1); if (!f) exit(1);
@ -2443,8 +2445,9 @@ else
#line 2444 "configure" #line 2444 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
main() int main()
{ {
FILE *f=fopen("conftestval", "w"); FILE *f=fopen("conftestval", "w");
if (!f) exit(1); if (!f) exit(1);
@ -6437,7 +6440,7 @@ cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() int main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -7218,6 +7221,7 @@ echo "configure:7215: checking for OpenSSL" >&5
#line 7219 "configure" #line 7219 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
int main() { int main() {
SSL_CTX_new((void *)0) SSL_CTX_new((void *)0)
@ -7256,6 +7260,7 @@ echo "configure:7243: checking for OpenSSL" >&5
#line 7257 "configure" #line 7257 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
int main() { int main() {
SSL_CTX_new((void *)0) SSL_CTX_new((void *)0)
@ -8401,12 +8406,6 @@ if test "${with_grx+set}" = set; then
if test "$withval" = no; then disable_grx=yes; else disable_grx=no; fi if test "$withval" = no; then disable_grx=yes; else disable_grx=no; fi
fi fi
# Check whether --with-sortix or --without-sortix was given.
if test "${with_sortix+set}" = set; then
withval="$with_sortix"
if test "$withval" = no; then disable_sortix=yes; else disable_sortix=no; fi
fi
drivers="" drivers=""
@ -8942,7 +8941,7 @@ if test "$ac_x_libraries" = NO; then
# Check for the libraries. # Check for the libraries.
test -z "$x_direct_test_library" && x_direct_test_library=Xt test -z "$x_direct_test_library" && x_direct_test_library=Xt
test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc test -z "$x_direct_test_function" && x_direct_test_function='int XtMalloc'
# See if we find them without any special options. # See if we find them without any special options.
# Don't add to $LIBS permanently. # Don't add to $LIBS permanently.
@ -9767,7 +9766,7 @@ cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() int main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:9760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:9760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -9810,7 +9809,7 @@ cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() int main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:9803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:9803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -9854,7 +9853,7 @@ cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() int main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -10103,7 +10102,7 @@ cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() int main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -10146,7 +10145,7 @@ cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() int main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -10431,105 +10430,6 @@ EOF
fi fi
fi fi
if test "$disable_sortix" != yes; then
for ac_hdr in display.h framebuffer.h sys/keycodes.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:10432: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 10437 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:10442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
echo $ac_n "checking for display_connect_default in -ldisplay""... $ac_c" 1>&6
echo "configure:10469: checking for display_connect_default in -ldisplay" >&5
ac_lib_var=`echo display'_'display_connect_default | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldisplay $LIBS"
cat > conftest.$ac_ext <<EOF
#line 10477 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char display_connect_default();
int main() {
display_connect_default()
; return 0; }
EOF
if { (eval echo configure:10488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_lib=HAVE_LIB`echo display | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
LIBS="-ldisplay $LIBS"
else
echo "$ac_t""no" 1>&6
fi
if test "$ac_cv_header_display_h" = yes &&
test "$ac_cv_header_framebuffer_h" = yes &&
test "$ac_cv_header_sys_keycodes_h" = yes &&
test "$ac_cv_lib_display_display_connect_default" = yes; then
cat >> confdefs.h <<\EOF
#define GRDRV_SORTIX 1
EOF
drivers="$drivers sortix"
fi
fi
# Check whether --with-freetype or --without-freetype was given. # Check whether --with-freetype or --without-freetype was given.
if test "${with_freetype+set}" = set; then if test "${with_freetype+set}" = set; then

15
configure.in
View file

@ -5,7 +5,7 @@
AC_INIT(main.c) AC_INIT(main.c)
AM_INIT_AUTOMAKE(links, 2.29) AM_INIT_AUTOMAKE(links, 2.30)
ACLOCAL="./missing aclocal" ACLOCAL="./missing aclocal"
AUTOCONF="./missing autoconf" AUTOCONF="./missing autoconf"
@ -1050,7 +1050,6 @@ AC_ARG_WITH(windows, [ --without-windows compile without Windows graphics
AC_ARG_WITH(atheos, [ --without-atheos compile without Atheos graphics driver],[if test "$withval" = no; then disable_atheos=yes; else disable_atheos=no; fi]) AC_ARG_WITH(atheos, [ --without-atheos compile without Atheos graphics driver],[if test "$withval" = no; then disable_atheos=yes; else disable_atheos=no; fi])
AC_ARG_WITH(haiku, [ --without-haiku compile without Haiku graphics driver],[if test "$withval" = no; then disable_haiku=yes; else disable_haiku=no; fi]) AC_ARG_WITH(haiku, [ --without-haiku compile without Haiku graphics driver],[if test "$withval" = no; then disable_haiku=yes; else disable_haiku=no; fi])
AC_ARG_WITH(grx, [ --without-grx compile without DOS GRX graphics driver],[if test "$withval" = no; then disable_grx=yes; else disable_grx=no; fi]) AC_ARG_WITH(grx, [ --without-grx compile without DOS GRX graphics driver],[if test "$withval" = no; then disable_grx=yes; else disable_grx=no; fi])
AC_ARG_WITH(sortix, [ --without-sortix compile without Sortix display(1) graphics driver],[if test "$withval" = no; then disable_sortix=yes; else disable_sortix=no; fi])
drivers="" drivers=""
@ -1313,18 +1312,6 @@ if test "$disable_grx" != yes -a "$ac_cv_have_djgpp" = yes; then
fi fi
fi fi
if test "$disable_sortix" != yes; then
AC_CHECK_HEADERS(display.h framebuffer.h sys/keycodes.h)
AC_CHECK_LIB(display, display_connect_default)
if test "$ac_cv_header_display_h" = yes &&
test "$ac_cv_header_framebuffer_h" = yes &&
test "$ac_cv_header_sys_keycodes_h" = yes &&
test "$ac_cv_lib_display_display_connect_default" = yes; then
AC_DEFINE(GRDRV_SORTIX)
drivers="$drivers sortix"
fi
fi
AC_ARG_WITH(freetype, [ --without-freetype compile without freetype support],[if test "$withval" = no; then disable_freetype=yes; else disable_freetype=no; fi]) AC_ARG_WITH(freetype, [ --without-freetype compile without freetype support],[if test "$withval" = no; then disable_freetype=yes; else disable_freetype=no; fi])
font_rendering=INTERNAL font_rendering=INTERNAL

7
drivers.c
View file

@ -40,10 +40,6 @@ extern struct graphics_driver grx_driver;
#ifdef GRDRV_SDL #ifdef GRDRV_SDL
extern struct graphics_driver sdl_driver; extern struct graphics_driver sdl_driver;
#endif #endif
#ifdef GRDRV_SORTIX
extern struct graphics_driver sortix_driver;
#endif
/* /*
* On SPAD you must test first svgalib and then X (because X test is slow). * On SPAD you must test first svgalib and then X (because X test is slow).
@ -86,9 +82,6 @@ static struct graphics_driver *graphics_drivers[] = {
#endif #endif
#ifdef GRDRV_SDL #ifdef GRDRV_SDL
&sdl_driver, &sdl_driver,
#endif
#ifdef GRDRV_SORTIX
&sortix_driver,
#endif #endif
NULL NULL
}; };

4
intl/czech.lng
View file

@ -22,8 +22,8 @@ T_LINKS__LYNX_LIKE, "Links " VERSION_STRING "\n\nWWW browser",
T_VERSION, "Verze", T_VERSION, "Verze",
T_VERSION_INFORMATION, "Informace o verzi", T_VERSION_INFORMATION, "Informace o verzi",
T_LINKS_VERSION, "Verze Linksu", T_LINKS_VERSION, "Verze Linksu",
T_OPERATING_SYSTEM_TYPE, "Typ operaèního systému", T_OPERATING_SYSTEM_TYPE, "Typ systému",
T_OPERATING_SYSTEM_VERSION, "Verze operaèního systému", T_OPERATING_SYSTEM_VERSION, "Verze systému",
T_COMPILER, "Kompilátor", T_COMPILER, "Kompilátor",
T_WORD_SIZE, "Velikost slova", T_WORD_SIZE, "Velikost slova",
T_MEMORY, "Pamì»", T_MEMORY, "Pamì»",

10
intl/english.lng
View file

@ -22,8 +22,8 @@ T_LINKS__LYNX_LIKE, "Links " VERSION_STRING "\n\nText and graphics WWW browser",
T_VERSION, "Version", T_VERSION, "Version",
T_VERSION_INFORMATION, "Version information", T_VERSION_INFORMATION, "Version information",
T_LINKS_VERSION, "Links version", T_LINKS_VERSION, "Links version",
T_OPERATING_SYSTEM_TYPE, "Operating system type", T_OPERATING_SYSTEM_TYPE, "System type",
T_OPERATING_SYSTEM_VERSION, "Operating system version", T_OPERATING_SYSTEM_VERSION, "System version",
T_COMPILER, "Compiler", T_COMPILER, "Compiler",
T_WORD_SIZE, "Word size", T_WORD_SIZE, "Word size",
T_MEMORY, "Memory", T_MEMORY, "Memory",
@ -36,10 +36,10 @@ T_IPV6, "IPv6",
T_NOT_ENABLED_IN_SYSTEM, "Not enabled in system", T_NOT_ENABLED_IN_SYSTEM, "Not enabled in system",
T_LOCAL_NETWORK_ONLY, "Local network only", T_LOCAL_NETWORK_ONLY, "Local network only",
T_UTF8_TERMINAL, "UTF-8 terminal", T_UTF8_TERMINAL, "UTF-8 terminal",
T_COMPRESSION_METHODS, "Compression methods", T_COMPRESSION_METHODS, "Compression",
T_ENCRYPTION, "Encryption", T_ENCRYPTION, "Encryption",
T_NO_CERTIFICATE_VERIFICATION, "no certificate verification", T_NO_CERTIFICATE_VERIFICATION, "no certificate verification",
T_GPM_MOUSE_DRIVER, "GPM mouse driver", T_GPM_MOUSE_DRIVER, "Mouse driver",
T_XTERM_FOR_OS2, "Xterm for OS/2", T_XTERM_FOR_OS2, "Xterm for OS/2",
T_GRAPHICS_MODE, "Graphics mode", T_GRAPHICS_MODE, "Graphics mode",
T_IMAGE_LIBRARIES, "Image libraries", T_IMAGE_LIBRARIES, "Image libraries",
@ -51,7 +51,7 @@ T_DISABLED, "Disabled",
T_THREAD, "thread", T_THREAD, "thread",
T_THREADS, "threads", T_THREADS, "threads",
T_THREADS5, "threads", T_THREADS5, "threads",
T_CONFIGURATION_DIRECTORY, "Configuration directory", T_CONFIGURATION_DIRECTORY, "Home directory",
T_NONE, "None", T_NONE, "None",
T_KEYS, "Keys", T_KEYS, "Keys",
T_KEYS_DESC, "ESC display menu\n^C, q, Q quit\np, l scroll up, down\n[, ] scroll left, right\nup, down select link\nH, L select top/bottom link\n-> follow link\n<-, z go back\n', x go forward\nTAB switch frames\ng go to url\nG go to url based on current url\n^G go to url based on current link\n* toggle image displaying\n^W complete URL or search string\n^B,^X,^V,^K copy, cut, paste, cut line to/from clipboard\nAlt-1 .. Alt-9 switch virtual screens (svgalib and fb)", T_KEYS_DESC, "ESC display menu\n^C, q, Q quit\np, l scroll up, down\n[, ] scroll left, right\nup, down select link\nH, L select top/bottom link\n-> follow link\n<-, z go back\n', x go forward\nTAB switch frames\ng go to url\nG go to url based on current url\n^G go to url based on current link\n* toggle image displaying\n^W complete URL or search string\n^B,^X,^V,^K copy, cut, paste, cut line to/from clipboard\nAlt-1 .. Alt-9 switch virtual screens (svgalib and fb)",

3
language.c
View file

@ -2,7 +2,6 @@
* (c) 2002 Mikulas Patocka * (c) 2002 Mikulas Patocka
* This file is a part of the Links program, released under GPL. * This file is a part of the Links program, released under GPL.
*/ */
#include <langinfo.h>
#include "links.h" #include "links.h"
@ -131,8 +130,6 @@ int get_default_charset(void)
lang = cast_uchar getenv("LC_CTYPE"); lang = cast_uchar getenv("LC_CTYPE");
if (!lang) if (!lang)
lang = cast_uchar getenv("LANG"); lang = cast_uchar getenv("LANG");
if (!lang)
lang = cast_uchar nl_langinfo(CODESET);
if (!lang) { if (!lang) {
i = 0; i = 0;
goto ret_i; goto ret_i;

14
language.inc
View file

@ -4375,8 +4375,8 @@ static_const struct translation translation_czech [] = {
{ "Verze" }, { "Verze" },
{ "Informace o verzi" }, { "Informace o verzi" },
{ "Verze Linksu" }, { "Verze Linksu" },
{ "Typ opera\350n\355ho syst\351mu" }, { "Typ syst\351mu" },
{ "Verze opera\350n\355ho syst\351mu" }, { "Verze syst\351mu" },
{ "Kompil\341tor" }, { "Kompil\341tor" },
{ "Velikost slova" }, { "Velikost slova" },
{ "Pam\354\273" }, { "Pam\354\273" },
@ -6550,8 +6550,8 @@ static_const struct translation translation_english [] = {
{ "Version" }, { "Version" },
{ "Version information" }, { "Version information" },
{ "Links version" }, { "Links version" },
{ "Operating system type" }, { "System type" },
{ "Operating system version" }, { "System version" },
{ "Compiler" }, { "Compiler" },
{ "Word size" }, { "Word size" },
{ "Memory" }, { "Memory" },
@ -6564,10 +6564,10 @@ static_const struct translation translation_english [] = {
{ "Not enabled in system" }, { "Not enabled in system" },
{ "Local network only" }, { "Local network only" },
{ "UTF-8 terminal" }, { "UTF-8 terminal" },
{ "Compression methods" }, { "Compression" },
{ "Encryption" }, { "Encryption" },
{ "no certificate verification" }, { "no certificate verification" },
{ "GPM mouse driver" }, { "Mouse driver" },
{ "Xterm for OS/2" }, { "Xterm for OS/2" },
{ "Graphics mode" }, { "Graphics mode" },
{ "Image libraries" }, { "Image libraries" },
@ -6579,7 +6579,7 @@ static_const struct translation translation_english [] = {
{ "thread" }, { "thread" },
{ "threads" }, { "threads" },
{ "threads" }, { "threads" },
{ "Configuration directory" }, { "Home directory" },
{ "None" }, { "None" },
{ "Keys" }, { "Keys" },
{ "ESC display menu\n^C, q, Q quit\np, l scroll up, down\n[, ] scroll left, right\nup, down select link\nH, L select top/bottom link\n-> follow link\n<-, z go back\n', x go forward\nTAB switch frames\ng go to url\nG go to url based on current url\n^G go to url based on current link\n* toggle image displaying\n^W complete URL or search string\n^B,^X,^V,^K copy, cut, paste, cut line to/from clipboard\nAlt-1 .. Alt-9 switch virtual screens (svgalib and fb)" }, { "ESC display menu\n^C, q, Q quit\np, l scroll up, down\n[, ] scroll left, right\nup, down select link\nH, L select top/bottom link\n-> follow link\n<-, z go back\n', x go forward\nTAB switch frames\ng go to url\nG go to url based on current url\n^G go to url based on current link\n* toggle image displaying\n^W complete URL or search string\n^B,^X,^V,^K copy, cut, paste, cut line to/from clipboard\nAlt-1 .. Alt-9 switch virtual screens (svgalib and fb)" },

32
links.nsi
View file

@ -75,19 +75,19 @@ File links.crt
File links.exe File links.exe
File links-g.exe File links-g.exe
File dll\cygwin1.dll File dll\cygwin1.dll
File c:\cygwin\bin\cygEGL-1.dll
File c:\cygwin\bin\cygGL-1.dll
File c:\cygwin\bin\cygX11-6.dll File c:\cygwin\bin\cygX11-6.dll
File c:\cygwin\bin\cygX11-xcb-1.dll
File c:\cygwin\bin\cygXau-6.dll File c:\cygwin\bin\cygXau-6.dll
File c:\cygwin\bin\cygXdmcp-6.dll File c:\cygwin\bin\cygXdmcp-6.dll
File c:\cygwin\bin\cygXext-6.dll File c:\cygwin\bin\cygXext-6.dll
File c:\cygwin\bin\cygXrender-1.dll File c:\cygwin\bin\cygXrender-1.dll
File c:\cygwin\bin\cygbrotlidec-1.dll
File c:\cygwin\bin\cygbrotlicommon-1.dll
File c:\cygwin\bin\cygbz2-1.dll File c:\cygwin\bin\cygbz2-1.dll
File c:\cygwin\bin\cygcairo-2.dll File c:\cygwin\bin\cygcairo-2.dll
File c:\cygwin\bin\cygcroco-0.6-3.dll File c:\cygwin\bin\cygcroco-0.6-3.dll
File c:\cygwin\bin\cygcrypto-1.1.dll File c:\cygwin\bin\cygcrypto-1.0.0.dll
File c:\cygwin\bin\cygdatrie-1.dll File c:\cygwin\bin\cygdatrie-1.dll
File c:\cygwin\bin\cygdeflate-0.dll
File c:\cygwin\bin\cygevent-2-0-5.dll File c:\cygwin\bin\cygevent-2-0-5.dll
File c:\cygwin\bin\cygexpat-1.dll File c:\cygwin\bin\cygexpat-1.dll
File c:\cygwin\bin\cygffi-6.dll File c:\cygwin\bin\cygffi-6.dll
@ -96,6 +96,7 @@ File c:\cygwin\bin\cygfreetype-6.dll
File c:\cygwin\bin\cyggcc_s-1.dll File c:\cygwin\bin\cyggcc_s-1.dll
File c:\cygwin\bin\cyggdk_pixbuf-2.0-0.dll File c:\cygwin\bin\cyggdk_pixbuf-2.0-0.dll
File c:\cygwin\bin\cyggio-2.0-0.dll File c:\cygwin\bin\cyggio-2.0-0.dll
File c:\cygwin\bin\cygglapi-0.dll
File c:\cygwin\bin\cygglib-2.0-0.dll File c:\cygwin\bin\cygglib-2.0-0.dll
File c:\cygwin\bin\cyggmodule-2.0-0.dll File c:\cygwin\bin\cyggmodule-2.0-0.dll
File c:\cygwin\bin\cyggobject-2.0-0.dll File c:\cygwin\bin\cyggobject-2.0-0.dll
@ -114,18 +115,16 @@ File c:\cygwin\bin\cygpcre-1.dll
File c:\cygwin\bin\cygpixman-1-0.dll File c:\cygwin\bin\cygpixman-1-0.dll
File c:\cygwin\bin\cygpng16-16.dll File c:\cygwin\bin\cygpng16-16.dll
File c:\cygwin\bin\cygrsvg-2-2.dll File c:\cygwin\bin\cygrsvg-2-2.dll
File c:\cygwin\bin\cygssl-1.1.dll File c:\cygwin\bin\cygssl-1.0.0.dll
File c:\cygwin\bin\cygstdc++-6.dll File c:\cygwin\bin\cygstdc++-6.dll
File c:\cygwin\bin\cygthai-0.dll File c:\cygwin\bin\cygthai-0.dll
File c:\cygwin\bin\cygtiff-6.dll File c:\cygwin\bin\cygtiff-6.dll
File c:\cygwin\bin\cyguuid-1.dll
File c:\cygwin\bin\cygwebp-7.dll
File c:\cygwin\bin\cygxcb-1.dll File c:\cygwin\bin\cygxcb-1.dll
File c:\cygwin\bin\cygxcb-glx-0.dll
File c:\cygwin\bin\cygxcb-render-0.dll File c:\cygwin\bin\cygxcb-render-0.dll
File c:\cygwin\bin\cygxcb-shm-0.dll File c:\cygwin\bin\cygxcb-shm-0.dll
File c:\cygwin\bin\cygxml2-2.dll File c:\cygwin\bin\cygxml2-2.dll
File c:\cygwin\bin\cygz.dll File c:\cygwin\bin\cygz.dll
File c:\cygwin\bin\cygzstd-1.dll
;Store installation folder ;Store installation folder
WriteRegStr HKCU "Software\Links" "" $INSTDIR WriteRegStr HKCU "Software\Links" "" $INSTDIR
@ -169,19 +168,20 @@ Delete "$INSTDIR\README"
Delete "$INSTDIR\links.crt" Delete "$INSTDIR\links.crt"
Delete "$INSTDIR\links.exe" Delete "$INSTDIR\links.exe"
Delete "$INSTDIR\links-g.exe" Delete "$INSTDIR\links-g.exe"
Delete "$INSTDIR\cygwin1.dll"
Delete "$INSTDIR\cygEGL-1.dll"
Delete "$INSTDIR\cygGL-1.dll"
Delete "$INSTDIR\cygX11-6.dll" Delete "$INSTDIR\cygX11-6.dll"
Delete "$INSTDIR\cygX11-xcb-1.dll"
Delete "$INSTDIR\cygXau-6.dll" Delete "$INSTDIR\cygXau-6.dll"
Delete "$INSTDIR\cygXdmcp-6.dll" Delete "$INSTDIR\cygXdmcp-6.dll"
Delete "$INSTDIR\cygXext-6.dll" Delete "$INSTDIR\cygXext-6.dll"
Delete "$INSTDIR\cygXrender-1.dll" Delete "$INSTDIR\cygXrender-1.dll"
Delete "$INSTDIR\cygbrotlicommon-1.dll"
Delete "$INSTDIR\cygbrotlidec-1.dll"
Delete "$INSTDIR\cygbz2-1.dll" Delete "$INSTDIR\cygbz2-1.dll"
Delete "$INSTDIR\cygcairo-2.dll" Delete "$INSTDIR\cygcairo-2.dll"
Delete "$INSTDIR\cygcroco-0.6-3.dll" Delete "$INSTDIR\cygcroco-0.6-3.dll"
Delete "$INSTDIR\cygcrypto-1.1.dll" Delete "$INSTDIR\cygcrypto-1.0.0.dll"
Delete "$INSTDIR\cygdatrie-1.dll" Delete "$INSTDIR\cygdatrie-1.dll"
Delete "$INSTDIR\cygdeflate-0.dll"
Delete "$INSTDIR\cygevent-2-0-5.dll" Delete "$INSTDIR\cygevent-2-0-5.dll"
Delete "$INSTDIR\cygexpat-1.dll" Delete "$INSTDIR\cygexpat-1.dll"
Delete "$INSTDIR\cygffi-6.dll" Delete "$INSTDIR\cygffi-6.dll"
@ -190,6 +190,7 @@ Delete "$INSTDIR\cygfreetype-6.dll"
Delete "$INSTDIR\cyggcc_s-1.dll" Delete "$INSTDIR\cyggcc_s-1.dll"
Delete "$INSTDIR\cyggdk_pixbuf-2.0-0.dll" Delete "$INSTDIR\cyggdk_pixbuf-2.0-0.dll"
Delete "$INSTDIR\cyggio-2.0-0.dll" Delete "$INSTDIR\cyggio-2.0-0.dll"
Delete "$INSTDIR\cygglapi-0.dll"
Delete "$INSTDIR\cygglib-2.0-0.dll" Delete "$INSTDIR\cygglib-2.0-0.dll"
Delete "$INSTDIR\cyggmodule-2.0-0.dll" Delete "$INSTDIR\cyggmodule-2.0-0.dll"
Delete "$INSTDIR\cyggobject-2.0-0.dll" Delete "$INSTDIR\cyggobject-2.0-0.dll"
@ -208,19 +209,16 @@ Delete "$INSTDIR\cygpcre-1.dll"
Delete "$INSTDIR\cygpixman-1-0.dll" Delete "$INSTDIR\cygpixman-1-0.dll"
Delete "$INSTDIR\cygpng16-16.dll" Delete "$INSTDIR\cygpng16-16.dll"
Delete "$INSTDIR\cygrsvg-2-2.dll" Delete "$INSTDIR\cygrsvg-2-2.dll"
Delete "$INSTDIR\cygssl-1.1.dll" Delete "$INSTDIR\cygssl-1.0.0.dll"
Delete "$INSTDIR\cygstdc++-6.dll" Delete "$INSTDIR\cygstdc++-6.dll"
Delete "$INSTDIR\cygthai-0.dll" Delete "$INSTDIR\cygthai-0.dll"
Delete "$INSTDIR\cygtiff-6.dll" Delete "$INSTDIR\cygtiff-6.dll"
Delete "$INSTDIR\cyguuid-1.dll"
Delete "$INSTDIR\cygwebp-7.dll"
Delete "$INSTDIR\cygwin1.dll"
Delete "$INSTDIR\cygxcb-1.dll" Delete "$INSTDIR\cygxcb-1.dll"
Delete "$INSTDIR\cygxcb-glx-0.dll"
Delete "$INSTDIR\cygxcb-render-0.dll" Delete "$INSTDIR\cygxcb-render-0.dll"
Delete "$INSTDIR\cygxcb-shm-0.dll" Delete "$INSTDIR\cygxcb-shm-0.dll"
Delete "$INSTDIR\cygxml2-2.dll" Delete "$INSTDIR\cygxml2-2.dll"
Delete "$INSTDIR\cygz.dll" Delete "$INSTDIR\cygz.dll"
Delete "$INSTDIR\cygzstd-1.dll"
Delete "$INSTDIR\.links\*" Delete "$INSTDIR\.links\*"
RMDir "$INSTDIR\.links" RMDir "$INSTDIR\.links"

2
links.wis
View file

@ -1,7 +1,7 @@
<WARPIN> <WARPIN>
<HEAD> <HEAD>
<PCK INDEX="1" <PCK INDEX="1"
PACKAGEID="Mikulas Patocka\Links\Base package\2\29" PACKAGEID="Mikulas Patocka\Links\Base package\2\30"
TARGET="?:\Links" TARGET="?:\Links"
SELECT SELECT
TITLE="Links" TITLE="Links"

16
links64.nsi
View file

@ -85,14 +85,15 @@ File c:\cygwin64\bin\cygbrotlicommon-1.dll
File c:\cygwin64\bin\cygbz2-1.dll File c:\cygwin64\bin\cygbz2-1.dll
File c:\cygwin64\bin\cygcairo-2.dll File c:\cygwin64\bin\cygcairo-2.dll
File c:\cygwin64\bin\cygcroco-0.6-3.dll File c:\cygwin64\bin\cygcroco-0.6-3.dll
File c:\cygwin64\bin\cygcrypto-1.1.dll File c:\cygwin64\bin\cygcrypto-3.dll
File c:\cygwin64\bin\cygdatrie-1.dll File c:\cygwin64\bin\cygdatrie-1.dll
File c:\cygwin64\bin\cygdeflate-0.dll File c:\cygwin64\bin\cygdeflate-0.dll
File c:\cygwin64\bin\cygexpat-1.dll File c:\cygwin64\bin\cygexpat-1.dll
File c:\cygwin64\bin\cygevent-2-1-7.dll File c:\cygwin64\bin\cygevent-2-1-7.dll
File c:\cygwin64\bin\cygffi-6.dll File c:\cygwin64\bin\cygffi-8.dll
File c:\cygwin64\bin\cygfontconfig-1.dll File c:\cygwin64\bin\cygfontconfig-1.dll
File c:\cygwin64\bin\cygfreetype-6.dll File c:\cygwin64\bin\cygfreetype-6.dll
File c:\cygwin64\bin\cygfribidi-0.dll
File c:\cygwin64\bin\cyggcc_s-seh-1.dll File c:\cygwin64\bin\cyggcc_s-seh-1.dll
File c:\cygwin64\bin\cyggdk_pixbuf-2.0-0.dll File c:\cygwin64\bin\cyggdk_pixbuf-2.0-0.dll
File c:\cygwin64\bin\cyggio-2.0-0.dll File c:\cygwin64\bin\cyggio-2.0-0.dll
@ -115,7 +116,7 @@ File c:\cygwin64\bin\cygpixman-1-0.dll
File c:\cygwin64\bin\cygpng16-16.dll File c:\cygwin64\bin\cygpng16-16.dll
File c:\cygwin64\bin\cygrsvg-2-2.dll File c:\cygwin64\bin\cygrsvg-2-2.dll
File c:\cygwin64\bin\cygsharpyuv-0.dll File c:\cygwin64\bin\cygsharpyuv-0.dll
File c:\cygwin64\bin\cygssl-1.1.dll File c:\cygwin64\bin\cygssl-3.dll
File c:\cygwin64\bin\cygstdc++-6.dll File c:\cygwin64\bin\cygstdc++-6.dll
File c:\cygwin64\bin\cygthai-0.dll File c:\cygwin64\bin\cygthai-0.dll
File c:\cygwin64\bin\cygtiff-7.dll File c:\cygwin64\bin\cygtiff-7.dll
@ -170,6 +171,7 @@ Delete "$INSTDIR\README"
Delete "$INSTDIR\links.crt" Delete "$INSTDIR\links.crt"
Delete "$INSTDIR\links.exe" Delete "$INSTDIR\links.exe"
Delete "$INSTDIR\links-g.exe" Delete "$INSTDIR\links-g.exe"
Delete "$INSTDIR\cygwin1.dll"
Delete "$INSTDIR\cygX11-6.dll" Delete "$INSTDIR\cygX11-6.dll"
Delete "$INSTDIR\cygXau-6.dll" Delete "$INSTDIR\cygXau-6.dll"
Delete "$INSTDIR\cygXdmcp-6.dll" Delete "$INSTDIR\cygXdmcp-6.dll"
@ -180,14 +182,15 @@ Delete "$INSTDIR\cygbrotlidec-1.dll"
Delete "$INSTDIR\cygbz2-1.dll" Delete "$INSTDIR\cygbz2-1.dll"
Delete "$INSTDIR\cygcairo-2.dll" Delete "$INSTDIR\cygcairo-2.dll"
Delete "$INSTDIR\cygcroco-0.6-3.dll" Delete "$INSTDIR\cygcroco-0.6-3.dll"
Delete "$INSTDIR\cygcrypto-1.1.dll" Delete "$INSTDIR\cygcrypto-3.dll"
Delete "$INSTDIR\cygdatrie-1.dll" Delete "$INSTDIR\cygdatrie-1.dll"
Delete "$INSTDIR\cygdeflate-0.dll" Delete "$INSTDIR\cygdeflate-0.dll"
Delete "$INSTDIR\cygevent-2-1-7.dll" Delete "$INSTDIR\cygevent-2-1-7.dll"
Delete "$INSTDIR\cygexpat-1.dll" Delete "$INSTDIR\cygexpat-1.dll"
Delete "$INSTDIR\cygffi-6.dll" Delete "$INSTDIR\cygffi-8.dll"
Delete "$INSTDIR\cygfontconfig-1.dll" Delete "$INSTDIR\cygfontconfig-1.dll"
Delete "$INSTDIR\cygfreetype-6.dll" Delete "$INSTDIR\cygfreetype-6.dll"
Delete "$INSTDIR\cygfribidi-0.dll"
Delete "$INSTDIR\cyggcc_s-seh-1.dll" Delete "$INSTDIR\cyggcc_s-seh-1.dll"
Delete "$INSTDIR\cyggdk_pixbuf-2.0-0.dll" Delete "$INSTDIR\cyggdk_pixbuf-2.0-0.dll"
Delete "$INSTDIR\cyggio-2.0-0.dll" Delete "$INSTDIR\cyggio-2.0-0.dll"
@ -210,13 +213,12 @@ Delete "$INSTDIR\cygpixman-1-0.dll"
Delete "$INSTDIR\cygpng16-16.dll" Delete "$INSTDIR\cygpng16-16.dll"
Delete "$INSTDIR\cygrsvg-2-2.dll" Delete "$INSTDIR\cygrsvg-2-2.dll"
Delete "$INSTDIR\cygsharpyuv-0.dll" Delete "$INSTDIR\cygsharpyuv-0.dll"
Delete "$INSTDIR\cygssl-1.1.dll" Delete "$INSTDIR\cygssl-3.dll"
Delete "$INSTDIR\cygstdc++-6.dll" Delete "$INSTDIR\cygstdc++-6.dll"
Delete "$INSTDIR\cygthai-0.dll" Delete "$INSTDIR\cygthai-0.dll"
Delete "$INSTDIR\cygtiff-7.dll" Delete "$INSTDIR\cygtiff-7.dll"
Delete "$INSTDIR\cyguuid-1.dll" Delete "$INSTDIR\cyguuid-1.dll"
Delete "$INSTDIR\cygwebp-7.dll" Delete "$INSTDIR\cygwebp-7.dll"
Delete "$INSTDIR\cygwin1.dll"
Delete "$INSTDIR\cygxcb-1.dll" Delete "$INSTDIR\cygxcb-1.dll"
Delete "$INSTDIR\cygxcb-render-0.dll" Delete "$INSTDIR\cygxcb-render-0.dll"
Delete "$INSTDIR\cygxcb-shm-0.dll" Delete "$INSTDIR\cygxcb-shm-0.dll"

2
os_dep.h
View file

@ -90,7 +90,7 @@ static inline int dir_sep(unsigned char x) { return x == '/' || x == '\\'; }
static inline int dir_sep(unsigned char x) { return x == '/' || x == '\\'; } static inline int dir_sep(unsigned char x) { return x == '/' || x == '\\'; }
#define NEWLINE "\r\n" #define NEWLINE "\r\n"
/*#define NO_ASYNC_LOOKUP*/ #define NO_ASYNC_LOOKUP /* Cygwin 3.5.3 has some bug that async lookup doesn't work when started from a detached thread */
#define SYSTEM_ID SYS_WIN_32 #define SYSTEM_ID SYS_WIN_32
#define SYSTEM_NAME "Win32" #define SYSTEM_NAME "Win32"
#define DEFAULT_SHELL "cmd.exe" #define DEFAULT_SHELL "cmd.exe"

6
rebuild
View file

@ -123,10 +123,14 @@ LC_ALL=
. .
/DELETE1/-1,/DELETE1/d /DELETE1/-1,/DELETE1/d
/DELETE2/-1,/DELETE2/d /DELETE2/-1,/DELETE2/d
,s/^main/int main/
,s/XtMalloc/'int XtMalloc'/
,s/foo()/int foo()/
w w
q q
EOS EOS
sed -i '/^#include <stdio.h>/a#include <stdlib.h>' configure
sed -i '/^#include <ctype.h>/a#include <stdlib.h>' configure
else else
exit exit
fi fi

9
sortix.c
View file

@ -1,9 +0,0 @@
#include "cfg.h"
#ifdef GRDRV_SORTIX
#include "links.h"
struct graphics_driver sortix_driver;
#endif /* GRDRV_SORTIX */

2
string.c
View file

@ -85,7 +85,7 @@ void add_bytes_to_str(unsigned char **s, int *l, unsigned char *a, size_t ll)
(defined(__ARM_ARCH) && __ARM_ARCH < 5) || \ (defined(__ARM_ARCH) && __ARM_ARCH < 5) || \
(defined(__sparc__) && (!defined(__VIS__) || __VIS__ < 0x300)) ||\ (defined(__sparc__) && (!defined(__VIS__) || __VIS__ < 0x300)) ||\
defined(__hppa) || \ defined(__hppa) || \
defined(__riscv) || \ (defined(__riscv) && !defined(__riscv_zbb)) || \
defined(__sh__)) defined(__sh__))
if (!(sizeof(unsigned) & (sizeof(unsigned) - 1))) { if (!(sizeof(unsigned) & (sizeof(unsigned) - 1))) {
new_length = 2U << ((sizeof(unsigned) * 8 - 1) new_length = 2U << ((sizeof(unsigned) * 8 - 1)

1537
suffix.inc
View file

File diff suppressed because it is too large Load diff

6100
suffix/public_suffix_list.dat
View file

File diff suppressed because it is too large Load diff

1
terminal.c
View file

@ -969,6 +969,7 @@ static void redraw_screen(struct terminal *term)
int l = 0; int l = 0;
int print_next = 0; int print_next = 0;
struct term_spec *s; struct term_spec *s;
n_chars = n_chars + 0; /* avoid warning */
NO_GFX; NO_GFX;
if (!term->dirty || (term->master && is_blocked())) return; if (!term->dirty || (term->master && is_blocked())) return;
a = init_str(); a = init_str();

5
tix.port
View file

@ -1,5 +0,0 @@
NAME=links
BUILD_LIBRARIES='libssl libbrotli? libevent? liblzip? liblzma? libz? libzstd?'
BUILD_SYSTEM=configure
LOCATION_INDEPENDENT=true
LICENSE=GPL-2.0-or-later

119
x.c
View file

@ -217,13 +217,15 @@ static GC x_normal_gc = 0, x_copy_gc = 0, x_drawbitmap_gc = 0, x_scroll_gc = 0;
static long x_normal_gc_color; static long x_normal_gc_color;
static struct rect x_scroll_gc_rect; static struct rect x_scroll_gc_rect;
static Colormap x_default_colormap, x_colormap; static Colormap x_default_colormap, x_colormap;
static Atom x_delete_window_atom, x_wm_protocols_atom, x_sel_atom, x_targets_atom, x_utf8_string_atom; static Atom x_delete_window_atom, x_wm_protocols_atom, x_sel_atom, x_targets_atom, x_utf8_string_atom, x__net_supporting_wm_check, x__net_wm_name;
static Pixmap x_icon = 0; static Pixmap x_icon = 0;
#ifdef X_INPUT_METHOD #ifdef X_INPUT_METHOD
static XIM xim = NULL; static XIM xim = NULL;
#endif #endif
static int prefer_utf8_window_title;
extern struct graphics_driver x_driver; extern struct graphics_driver x_driver;
static unsigned char *x_driver_param = NULL; static unsigned char *x_driver_param = NULL;
@ -1526,6 +1528,49 @@ static void x_process_events(void *data)
#endif #endif
} }
static unsigned_char_p x_get_property_string(Window w, Atom prop, Atom type, Bool del)
{
unsigned_char_p buffer;
unsigned long pty_size, pty_items;
int pty_format, ret;
Atom pty_type;
/* Get size and type of property */
ret = XGetWindowProperty(
x_display,
w,
prop,
0,
0,
False,
AnyPropertyType,
&pty_type,
&pty_format,
&pty_items,
&pty_size,
&buffer);
/*debug("1: %d %d %d %ld %ld %p", ret, pty_type, pty_format, pty_items, pty_size, buffer);*/
if (ret != Success || !buffer) return NULL;
XFree(buffer);
ret = XGetWindowProperty(
x_display,
w,
prop,
0,
(long)pty_size,
del,
AnyPropertyType,
&pty_type,
&pty_format,
&pty_items,
&pty_size,
&buffer
);
/*debug("2: %d %d %d %ld %ld %p", ret, pty_type, pty_format, pty_items, pty_size, buffer);*/
if (ret != Success || !buffer) return NULL;
return buffer;
}
static void x_after_fork(void) static void x_after_fork(void)
{ {
@ -1809,15 +1854,40 @@ visual_found:
gcv.fill_style = FillSolid; gcv.fill_style = FillSolid;
gcv.background = x_black_pixel; gcv.background = x_black_pixel;
x_delete_window_atom = XInternAtom(x_display,"WM_DELETE_WINDOW", False); x_delete_window_atom = XInternAtom(x_display, "WM_DELETE_WINDOW", False);
x_wm_protocols_atom = XInternAtom(x_display,"WM_PROTOCOLS", False); x_wm_protocols_atom = XInternAtom(x_display, "WM_PROTOCOLS", False);
x_sel_atom = XInternAtom(x_display, "SEL_PROP", False); x_sel_atom = XInternAtom(x_display, "SEL_PROP", False);
x_targets_atom = XInternAtom(x_display, "TARGETS", False); x_targets_atom = XInternAtom(x_display, "TARGETS", False);
x_utf8_string_atom = XInternAtom(x_display, "UTF8_STRING", False); x_utf8_string_atom = XInternAtom(x_display, "UTF8_STRING", False);
x__net_supporting_wm_check = XInternAtom(x_display, "_NET_SUPPORTING_WM_CHECK", False);
x__net_wm_name = XInternAtom(x_display, "_NET_WM_NAME", False);
if (x_have_palette) win_attr.colormap = x_colormap; if (x_have_palette) win_attr.colormap = x_colormap;
else win_attr.colormap = x_default_colormap; else win_attr.colormap = x_default_colormap;
prefer_utf8_window_title = 0;
#if defined(HAVE_XSUPPORTSLOCALE) && defined(HAVE_XMBTEXTLISTTOTEXTPROPERTY) && X_HAVE_UTF8_STRING
{
unsigned_char_p buffer;
Window win;
buffer = x_get_property_string(x_root_window, x__net_supporting_wm_check, XA_WINDOW, False);
if (!buffer)
goto skip_wm_name;
win = *(Window *)buffer;
XFree(buffer);
x_prepare_for_failure(X_GetProperty);
buffer = x_get_property_string(win, x__net_wm_name, AnyPropertyType, False);
if (x_test_for_failure())
goto skip_wm_name;
if (!buffer)
goto skip_wm_name;
if (!strcasecmp(cast_const_char buffer, "kwin"))
prefer_utf8_window_title = 1;
XFree(buffer);
}
skip_wm_name:
#endif
fake_window = XCreateWindow( fake_window = XCreateWindow(
x_display, x_display,
x_root_window, x_root_window,
@ -2751,7 +2821,7 @@ retry_encode_ascii:
if (XSupportsLocale()) { if (XSupportsLocale()) {
ret = XmbTextListToTextProperty(x_display, &xx_str, 1, XStdICCTextStyle, &windowName); ret = XmbTextListToTextProperty(x_display, &xx_str, 1, XStdICCTextStyle, &windowName);
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
if (ret > 0) { if (ret > 0 || (!ret && prefer_utf8_window_title)) {
XFree(windowName.value); XFree(windowName.value);
ret = XmbTextListToTextProperty(x_display, &xx_str, 1, XUTF8StringStyle, &windowName); ret = XmbTextListToTextProperty(x_display, &xx_str, 1, XUTF8StringStyle, &windowName);
if (ret < 0) { if (ret < 0) {
@ -2916,48 +2986,13 @@ static unsigned char *x_get_clipboard_text(void)
} }
if (event.xselection.property) { if (event.xselection.property) {
unsigned_char_p buffer; unsigned_char_p buffer;
unsigned long pty_size, pty_items;
int pty_format, ret;
Atom pty_type;
if (event.xselection.target != type_atom) goto no_new_sel; if (event.xselection.target != type_atom) goto no_new_sel;
if (event.xselection.property != x_sel_atom) goto no_new_sel; if (event.xselection.property != x_sel_atom) goto no_new_sel;
buffer = x_get_property_string(fake_window, event.xselection.property, True, AnyPropertyType);
/* Get size and type of property */ if (!buffer)
ret = XGetWindowProperty( goto no_new_sel;
x_display,
fake_window,
event.xselection.property,
0,
0,
False,
AnyPropertyType,
&pty_type,
&pty_format,
&pty_items,
&pty_size,
&buffer);
if (ret != Success) goto no_new_sel;
XFree(buffer);
ret = XGetWindowProperty(
x_display,
fake_window,
event.xselection.property,
0,
(long)pty_size,
True,
AnyPropertyType,
&pty_type,
&pty_format,
&pty_items,
&pty_size,
&buffer
);
if (ret != Success) goto no_new_sel;
pty_size = (pty_format>>3) * pty_items;
x_clear_clipboard(); x_clear_clipboard();
if (type_atom == x_utf8_string_atom) { if (type_atom == x_utf8_string_atom) {