From 5c693c75be711259ce770e76df58e925cbb89937 Mon Sep 17 00:00:00 2001 From: Norbert Warmuth Date: Sun, 31 May 1998 20:27:44 +0000 Subject: [PATCH] Sun May 31 22:02:33 1998 Norbert Warmuth * po/it.po: deleted additional "\n" in one msgstr Sun May 31 10:23:01 1998 Norbert Warmuth * key.c (define_sequence): If a sequence clashes the last definition made will be used. This makes it possible to override wrong definitions in terminfo/termcap database with learn keys (or the appropriate entries in mc.lib and ~/.mc/ini). * widget.c (show_hist): Don't display the listbox partly off screen (the left panel's history started in column - 2). * keyxdef.c: include tty.h instead of myslang.h as suggested by Tamasi Gyorgy Fri May 29 15:41:19 1998 Alexander V. Lukyanov * widget.c (update_input): this patch allows entering 8-bit characters in input fields without screwing attributes. (the same old sign extension...) Wed May 27 22:23:48 1998 Ed Cogburn * lib/xterm.ti: The 'xterm-color' definition needs 'sgr0'. The tic program from ncurses 4.2 doesn't like the xterm.ti file that comes with mc. Wed May 27 15:29:01 1998 Alexander V. Lukyanov * key.c (get_key_code): characters with high bit set were input as 0x80 char when use_8th_bit_as_meta was set --- lib/xterm.ti | 2 +- po/ChangeLog | 4 ++++ po/it.po | 3 +-- src/ChangeLog | 30 ++++++++++++++++++++++++++++++ src/key.c | 4 +++- src/keyxdef.c | 2 +- src/widget.c | 7 +++++-- 7 files changed, 45 insertions(+), 7 deletions(-) diff --git a/lib/xterm.ti b/lib/xterm.ti index 7adc00029..a4a5a36d7 100644 --- a/lib/xterm.ti +++ b/lib/xterm.ti @@ -115,7 +115,7 @@ xterm|vs100|xterm terminal emulator (X Window System), sgr0=\E[m^O, xterm-color|color-xterm|color xterm terminal emulator (X Window System), - use=xterm-basic, + use=xterm, colors#8, pairs#64, # Set all color pairs to the original ones diff --git a/po/ChangeLog b/po/ChangeLog index 23bd3b1a5..29596e469 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +Sun May 31 22:02:33 1998 Norbert Warmuth + + * it.po: deleted additional "\n" in one msgstr + Wed May 13 12:24:30 1998 Norbert Warmuth * Makefile.in.in: Don't depend on VPATH when checking the diff --git a/po/it.po b/po/it.po index cdd3468b3..588cc69a5 100644 --- a/po/it.po +++ b/po/it.po @@ -2155,9 +2155,8 @@ msgid "" " Help file format error\n" "\004" msgstr "" -"\n" " Errore nel formato del file di aiuto\n" -"" +"\004" #: src/help.c:320 msgid " Internal bug: Double start of link area " diff --git a/src/ChangeLog b/src/ChangeLog index 6364594cd..f837020ab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,33 @@ +Sun May 31 10:23:01 1998 Norbert Warmuth + + * key.c (define_sequence): If a sequence clashes the last + definition made will be used. This makes it possible to override + wrong definitions in terminfo/termcap database with learn keys (or + the appropriate entries in mc.lib and ~/.mc/ini). + + * widget.c (show_hist): Don't display the listbox partly + off screen (the left panel's history started in column - 2). + + * keyxdef.c: include tty.h instead of myslang.h as suggested by + Tamasi Gyorgy + +Fri May 29 15:41:19 1998 Alexander V. Lukyanov + + * widget.c (update_input): this patch allows entering 8-bit + characters in input fields without screwing attributes. (the + same old sign extension...) + +Wed May 27 22:23:48 1998 Ed Cogburn + + * lib/xterm.ti: The 'xterm-color' definition needs 'sgr0'. The tic + program from ncurses 4.2 doesn't like the xterm.ti file that comes + with mc. + +Wed May 27 15:29:01 1998 Alexander V. Lukyanov + + * key.c (get_key_code): characters with high bit set were input + as 0x80 char when use_8th_bit_as_meta was set + 1998-05-25 Miguel de Icaza * ext.h (MC_USER_EXT): New name for the per-user extension file diff --git a/src/key.c b/src/key.c index 3c73772e3..c3ed849c1 100644 --- a/src/key.c +++ b/src/key.c @@ -394,6 +394,8 @@ void define_sequence (int code, char *seq, int action) return; } else { /* The sequence clashes */ + base->code = code; + base->action = action; return; } } else { @@ -531,7 +533,7 @@ int get_key_code (int no_delay) parent = NULL; if ((c & 0x80) && use_8th_bit_as_meta) { - c &= ~0x7f; + c &= 0x7f; /* The first sequence defined starts with esc */ parent = keys; diff --git a/src/keyxdef.c b/src/keyxdef.c index 055552c76..39b254c42 100644 --- a/src/keyxdef.c +++ b/src/keyxdef.c @@ -40,7 +40,7 @@ #include #include "mouse.h" /* required before key.h */ #include "key.h" -#include "myslang.h" +#include "tty.h" #ifdef __QNX__ diff --git a/src/widget.c b/src/widget.c index f6783404c..9ec2c7d63 100644 --- a/src/widget.c +++ b/src/widget.c @@ -828,7 +828,7 @@ update_input (WInput *in, int clear_first) #ifndef HAVE_XVIEW int has_history = 0; int i, j; - char c; + unsigned char c; int buf_len = strlen (in->buffer); if (should_show_history_button (in)) @@ -1049,7 +1049,10 @@ char *show_hist (Hist *history, int widget_x, int widget_y) h = min(h, LINES - y); } - x = widget_x - 2; + if (widget_x > 2) + x = widget_x - 2; + else + x = 0; if ((w = maxlen + 4) + x > COLS) { w = min(w,COLS);