mirror of
https://github.com/rkd77/elinks.git
synced 2024-11-03 08:07:17 -05:00
Merge with http://elinks.cz/elinks.git
This commit is contained in:
commit
416bd01269
@ -675,7 +675,7 @@ if test "$enable_guile" = "yes"; then
|
||||
cat <<EOF
|
||||
***********************************************************************
|
||||
The Guile support is incomplete and not so well integrated to ELinks
|
||||
yet. That means, ie., that you have no Guile console and there might
|
||||
yet. That means, e.g., that you have no Guile console and there might
|
||||
not be all the necessary hooks. Also, the Guile interface is not too
|
||||
well tested (success stories heartily welcomed!). See
|
||||
src/scripting/guile/README for further details and hints.
|
||||
@ -758,7 +758,7 @@ if test "$withval" != no; then
|
||||
cat <<EOF
|
||||
***********************************************************************
|
||||
The Python support is incomplete and not so well integrated to ELinks
|
||||
yet. That means, ie., that you have no Python console and there might
|
||||
yet. That means, e.g.., that you have no Python console and there might
|
||||
not be all the necessary hooks. Also, the Python interface is not too
|
||||
well tested (success stories heartily welcomed!).
|
||||
***********************************************************************
|
||||
|
@ -69,7 +69,7 @@ CONFIG_BOOKMARKS=yes
|
||||
### XBEL Bookmarks
|
||||
#
|
||||
# ELinks also supports universal XML bookmarks format called XBEL, also
|
||||
# supported by ie. Galeon, various "always-have-my-bookmarks" websites and
|
||||
# supported by e.g. Galeon, various "always-have-my-bookmarks" websites and
|
||||
# number of universal bookmark converters.
|
||||
#
|
||||
# Frequently, you know you will not need it, then you can of course happily
|
||||
@ -84,7 +84,7 @@ CONFIG_XBEL_BOOKMARKS=yes
|
||||
#
|
||||
# Support for HTTP cookies --- a data token which the server sends the client
|
||||
# once and then the client sends it back along each request to the server. This
|
||||
# mechanism is crucial for ie. keeping HTTP sessions (you "log in" to a site,
|
||||
# mechanism is crucial e.g. for keeping HTTP sessions (you "log in" to a site,
|
||||
# and from then on the site recognizes you usually because of the cookie), but
|
||||
# also for various banner systems, remembering values filled to various forms,
|
||||
# and so on. You can further tune the ELinks behaviour at runtime (whether to
|
||||
@ -515,7 +515,7 @@ CONFIG_EXMODE=no
|
||||
### LEDs
|
||||
#
|
||||
# These are the tiny LED-like indicators, shown at the bottom-right of the
|
||||
# screen as [-----]. They are used for indication of various states, ie.
|
||||
# screen as [-----]. They are used for indication of various states, e.g.
|
||||
# whether you are currently talking through a SSL-secured connection,
|
||||
# what is the current input mode (normal or insert), JavaScript errors etc.
|
||||
#
|
||||
|
@ -460,8 +460,6 @@ struct string *
|
||||
add_uri_to_string(struct string *string, struct uri *uri,
|
||||
enum uri_component components)
|
||||
{
|
||||
int add_host = 0;
|
||||
|
||||
/* Custom or unknown keep the URI untouched. */
|
||||
if (uri->protocol == PROTOCOL_UNKNOWN)
|
||||
return add_to_string(string, struri(uri));
|
||||
@ -488,7 +486,7 @@ add_uri_to_string(struct string *string, struct uri *uri,
|
||||
}
|
||||
|
||||
if (wants(URI_HOST) && uri->hostlen) {
|
||||
add_host = 1;
|
||||
int add_host = 1;
|
||||
|
||||
#ifdef CONFIG_IPV6
|
||||
/* Rationale for wants(URI_PORT): The [notation] was invented
|
||||
@ -552,7 +550,7 @@ add_uri_to_string(struct string *string, struct uri *uri,
|
||||
}
|
||||
|
||||
/* Only add slash if we need to separate */
|
||||
if ((wants(URI_DATA) || wants(URI_POST) || add_host)
|
||||
if ((wants(URI_DATA) || wants(URI_POST) || components == URI_HTTP_REFERRER_HOST)
|
||||
&& wants(~(URI_DATA | URI_PORT))
|
||||
&& get_protocol_need_slash_after_host(uri->protocol))
|
||||
add_char_to_string(string, '/');
|
||||
|
@ -37,7 +37,6 @@
|
||||
#include "util/string.h"
|
||||
#include "util/time.h"
|
||||
|
||||
|
||||
/* TODO: move stuff from here to itrm.{c,h} and mouse.{c,h} */
|
||||
|
||||
struct itrm *ditrm = NULL;
|
||||
@ -636,6 +635,7 @@ get_esc_code(unsigned char *str, int len, unsigned char *code, int *num)
|
||||
/* #define DEBUG_ITRM_QUEUE */
|
||||
|
||||
#ifdef DEBUG_ITRM_QUEUE
|
||||
#include <stdio.h>
|
||||
#include <ctype.h> /* isprint() isspace() */
|
||||
#endif
|
||||
|
||||
@ -680,6 +680,19 @@ decode_terminal_escape_sequence(struct itrm *itrm, struct term_event *ev)
|
||||
case 'H': kbd.key = KBD_HOME; break;
|
||||
case 'I': kbd.key = KBD_PAGE_UP; break;
|
||||
case 'G': kbd.key = KBD_PAGE_DOWN; break;
|
||||
/* Free BSD */
|
||||
/* case 'M': kbd.key = KBD_F1; break;*/
|
||||
case 'N': kbd.key = KBD_F2; break;
|
||||
case 'O': kbd.key = KBD_F3; break;
|
||||
case 'P': kbd.key = KBD_F4; break;
|
||||
case 'Q': kbd.key = KBD_F5; break;
|
||||
/* case 'R': kbd.key = KBD_F6; break;*/
|
||||
case 'S': kbd.key = KBD_F7; break;
|
||||
case 'T': kbd.key = KBD_F8; break;
|
||||
case 'U': kbd.key = KBD_F9; break;
|
||||
case 'V': kbd.key = KBD_F10; break;
|
||||
case 'W': kbd.key = KBD_F11; break;
|
||||
case 'X': kbd.key = KBD_F12; break;
|
||||
|
||||
case 'z': switch (v) {
|
||||
case 247: kbd.key = KBD_INS; break;
|
||||
@ -758,10 +771,13 @@ set_kbd_event(struct term_event *ev, int key, int modifier)
|
||||
key = KBD_TAB;
|
||||
break;
|
||||
|
||||
/* Free BSD uses ASCII_DEL on console */
|
||||
case ASCII_BS:
|
||||
case ASCII_DEL:
|
||||
key = KBD_BS;
|
||||
break;
|
||||
case ASCII_DEL:
|
||||
key = KBD_DEL;
|
||||
break;
|
||||
|
||||
case ASCII_LF:
|
||||
case ASCII_CR:
|
||||
|
Loading…
Reference in New Issue
Block a user