To: vim-dev@vim.org Subject: Patch 6.1b.014 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1b.014 Problem: EBCDIC: switching mouse events off causes garbage on screen. Positioning the cursor in the GUI causes garbage. Solution: Insert an ESC in the terminal code. (Ralf Schandl) Use "\b" instead of "\010" for KS_LE. Files: src/os_unix.c, src/term.c *** ../vim61b.013/src/os_unix.c Mon Mar 11 21:55:36 2002 --- src/os_unix.c Thu Mar 14 22:05:16 2002 *************** *** 2620,2627 **** else /* disable mouse events, could probably always send the same */ out_str_nf((char_u *) (xterm_mouse_vers > 1 ! ? IF_EB("\033[?1002l", "[?1002l") ! : IF_EB("\033[?1000l", "[?1000l"))); ison = on; } --- 2620,2627 ---- else /* disable mouse events, could probably always send the same */ out_str_nf((char_u *) (xterm_mouse_vers > 1 ! ? IF_EB("\033[?1002l", ESC_STR "[?1002l") ! : IF_EB("\033[?1000l", ESC_STR "[?1000l"))); ison = on; } *** ../vim61b.013/src/term.c Sat Mar 9 16:17:41 2002 --- src/term.c Thu Mar 14 22:21:46 2002 *************** *** 187,193 **** {(int)KS_VB, IF_EB("\033|f", ESC_STR "|f")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\010"}, /* cursor-left = BS */ {(int)KS_ND, "\014"}, /* cursor-right = CTRL-L */ # ifdef TERMINFO {(int)KS_CM, IF_EB("\033|%p1%d;%p2%dM", ESC_STR "|%p1%d;%p2%dM")}, --- 187,193 ---- {(int)KS_VB, IF_EB("\033|f", ESC_STR "|f")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\b"}, /* cursor-left = BS */ {(int)KS_ND, "\014"}, /* cursor-right = CTRL-L */ # ifdef TERMINFO {(int)KS_CM, IF_EB("\033|%p1%d;%p2%dM", ESC_STR "|%p1%d;%p2%dM")}, *************** *** 298,304 **** {(int)KS_CZR, "\033[0m"}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else --- 298,304 ---- {(int)KS_CZR, "\033[0m"}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else *************** *** 402,408 **** {(int)KS_OP, "\033[m"}, /* reset colors */ {(int)KS_MS, "y"}, /* safe to move cur in reverse mode */ {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else --- 402,408 ---- {(int)KS_OP, "\033[m"}, /* reset colors */ {(int)KS_MS, "y"}, /* safe to move cur in reverse mode */ {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else *************** *** 447,453 **** {(int)KS_MR, IF_EB("\033[7m", ESC_STR "[7m")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, IF_EB("\033[%i%p1%d;%p2%dH", ESC_STR "[%i%p1%d;%p2%dH")}, # else --- 447,453 ---- {(int)KS_MR, IF_EB("\033[7m", ESC_STR "[7m")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, IF_EB("\033[%i%p1%d;%p2%dH", ESC_STR "[%i%p1%d;%p2%dH")}, # else *************** *** 496,502 **** {(int)KS_OP, "\033[0m"}, /* reset colors */ {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else --- 496,502 ---- {(int)KS_OP, "\033[0m"}, /* reset colors */ {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else *************** *** 585,591 **** # endif {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, "\033|%i%p1%d;%p2%dH"}, # else --- 585,591 ---- # endif {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, "\033|%i%p1%d;%p2%dH"}, # else *************** *** 696,702 **** {(int)KS_MS, "y"}, /* save to move cur in reverse mode */ {(int)KS_UT, "y"}, ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, "\033|%i%p1%d;%p2%dH"},/* cursor motion */ # else --- 696,702 ---- {(int)KS_MS, "y"}, /* save to move cur in reverse mode */ {(int)KS_UT, "y"}, ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, "\033|%i%p1%d;%p2%dH"},/* cursor motion */ # else *************** *** 798,804 **** {(int)KS_MR, IF_EB("\033[7m", ESC_STR "[7m")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, IF_EB("\033[%i%p1%d;%p2%dH", ESC_STR "[%i%p1%d;%p2%dH")}, --- 798,804 ---- {(int)KS_MR, IF_EB("\033[7m", ESC_STR "[7m")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, IF_EB("\033[%i%p1%d;%p2%dH", ESC_STR "[%i%p1%d;%p2%dH")}, *************** *** 852,858 **** {(int)KS_CE, IF_EB("\033K", ESC_STR "K")}, {(int)KS_CD, IF_EB("\033J", ESC_STR "J")}, {(int)KS_CM, IF_EB("\033Y%+ %+ ", ESC_STR "Y%+ %+ ")}, ! {(int)KS_LE, "\010"}, # ifdef __MINT__ {(int)KS_AL, IF_EB("\033L", ESC_STR "L")}, {(int)KS_DL, IF_EB("\033M", ESC_STR "M")}, --- 852,858 ---- {(int)KS_CE, IF_EB("\033K", ESC_STR "K")}, {(int)KS_CD, IF_EB("\033J", ESC_STR "J")}, {(int)KS_CM, IF_EB("\033Y%+ %+ ", ESC_STR "Y%+ %+ ")}, ! {(int)KS_LE, "\b"}, # ifdef __MINT__ {(int)KS_AL, IF_EB("\033L", ESC_STR "L")}, {(int)KS_DL, IF_EB("\033M", ESC_STR "M")}, *************** *** 938,944 **** {(int)KS_US, IF_EB("\033[4m", ESC_STR "[4m")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, IF_EB("\033[%i%p1%d;%p2%dH", ESC_STR "[%i%p1%d;%p2%dH")}, --- 938,944 ---- {(int)KS_US, IF_EB("\033[4m", ESC_STR "[4m")}, {(int)KS_MS, "y"}, {(int)KS_UT, "y"}, ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, IF_EB("\033[%i%p1%d;%p2%dH", ESC_STR "[%i%p1%d;%p2%dH")}, *************** *** 1101,1107 **** # endif {(int)KS_MS, "y"}, /* guessed */ {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\010"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else --- 1101,1107 ---- # endif {(int)KS_MS, "y"}, /* guessed */ {(int)KS_UT, "y"}, /* guessed */ ! {(int)KS_LE, "\b"}, # ifdef TERMINFO {(int)KS_CM, "\033[%i%p1%d;%p2%dH"}, # else *** ../vim61b.013/src/version.c Fri Mar 15 21:50:36 2002 --- src/version.c Fri Mar 15 21:52:57 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 14, /**/ -- ARTHUR: Be quiet! DENNIS: Well you can't expect to wield supreme executive power just 'cause some watery tart threw a sword at you! ARTHUR: Shut up! DENNIS: I mean, if I went around sayin' I was an empereror just because some moistened bint had lobbed a scimitar at me they'd put me away! The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///