To: vim_dev@googlegroups.com Subject: Patch 8.2.0550 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0550 Problem: Some changes in the libvterm upstream code. Solution: Include some changes. Files: src/libvterm/t/harness.c *** ../vim-8.2.0549/src/libvterm/t/harness.c 2020-04-11 21:42:45.048626553 +0200 --- src/libvterm/t/harness.c 2020-04-12 13:37:38.017852329 +0200 *************** *** 65,70 **** --- 65,85 ---- static VTermEncodingInstance encoding; + static void term_output(const char *s, size_t len, void *user) + { + size_t i; + + printf("output "); + for(i = 0; i < len; i++) + printf("%x%s", (unsigned char)s[i], i < len-1 ? "," : "\n"); + } + + static void printhex(const char *s, size_t len) + { + while(len--) + printf("%02x", (s++)[0]); + } + static int parser_text(const char bytes[], size_t len, void *user UNUSED) { size_t i; *************** *** 90,97 **** static int parser_escape(const char bytes[], size_t len, void *user UNUSED) { - size_t i; - if(bytes[0] >= 0x20 && bytes[0] < 0x30) { if(len < 2) return -1; --- 105,110 ---- *************** *** 102,109 **** } printf("escape "); ! for(i = 0; i < len; i++) ! printf("%02x", bytes[i]); printf("\n"); return len; --- 115,121 ---- } printf("escape "); ! printhex(bytes, len); printf("\n"); return len; *************** *** 142,152 **** static int parser_osc(const char *command, size_t cmdlen, void *user UNUSED) { - size_t i; printf("osc "); ! for(i = 0; i < cmdlen; i++) ! printf("%02x", command[i]); printf("\n"); return 1; --- 154,162 ---- static int parser_osc(const char *command, size_t cmdlen, void *user UNUSED) { printf("osc "); ! printhex(command, cmdlen); printf("\n"); return 1; *************** *** 154,164 **** static int parser_dcs(const char *command, size_t cmdlen, void *user UNUSED) { - size_t i; printf("dcs "); ! for(i = 0; i < cmdlen; i++) ! printf("%02x", command[i]); printf("\n"); return 1; --- 164,172 ---- static int parser_dcs(const char *command, size_t cmdlen, void *user UNUSED) { printf("dcs "); ! printhex(command, cmdlen); printf("\n"); return 1; *************** *** 928,940 **** outlen = vterm_output_get_buffer_current(vt); if(outlen > 0) { - size_t i; char outbuff[1024]; vterm_output_read(vt, outbuff, outlen); ! printf("output "); ! for(i = 0; i < outlen; i++) ! printf("%x%s", (unsigned char)outbuff[i], i < outlen-1 ? "," : "\n"); } printf(err ? "?\n" : "DONE\n"); --- 936,945 ---- outlen = vterm_output_get_buffer_current(vt); if(outlen > 0) { char outbuff[1024]; vterm_output_read(vt, outbuff, outlen); ! term_output(outbuff, outlen, NULL); } printf(err ? "?\n" : "DONE\n"); *** ../vim-8.2.0549/src/version.c 2020-04-12 12:54:23.027769131 +0200 --- src/version.c 2020-04-12 13:38:34.093742131 +0200 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 550, /**/ -- A year spent in artificial intelligence is enough to make one believe in God. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///