Hello community, here is the log from the commit of package libvterm for openSUSE:Factory checked in at 2016-08-26 23:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvterm (Old) and /work/SRC/openSUSE:Factory/.libvterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvterm" Changes: -------- --- /work/SRC/openSUSE:Factory/libvterm/libvterm.changes 2016-04-14 13:08:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvterm.new/libvterm.changes 2016-08-26 23:18:17.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 25 15:53:26 UTC 2016 - [email protected] + +- Version bump to 0~bzr684. + Changelog: + * Avoid "\e" because some C compilers don't like it + * Don't use wchar_t in unicode.c as it might not be big enough + * Remember to pass unicode codepoints in uint32_t rather than + int + +------------------------------------------------------------------- Old: ---- libvterm-0~bzr681.tar.xz New: ---- libvterm-0~bzr684.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvterm.spec ++++++ --- /var/tmp/diff_new_pack.n6Wwbz/_old 2016-08-26 23:18:18.000000000 +0200 +++ /var/tmp/diff_new_pack.n6Wwbz/_new 2016-08-26 23:18:18.000000000 +0200 @@ -18,7 +18,7 @@ %define sover 0 Name: libvterm -Version: 0~bzr681 +Version: 0~bzr684 Release: 0 Summary: An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator License: MIT ++++++ libvterm-0~bzr681.tar.xz -> libvterm-0~bzr684.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvterm-0~bzr681/src/keyboard.c new/libvterm-0~bzr684/src/keyboard.c --- old/libvterm-0~bzr681/src/keyboard.c 2016-04-10 00:17:10.000000000 +0200 +++ new/libvterm-0~bzr684/src/keyboard.c 2016-08-15 22:22:52.000000000 +0200 @@ -48,7 +48,7 @@ if(mod & VTERM_MOD_CTRL) c &= 0x1f; - vterm_push_output_sprintf(vt, "%s%c", mod & VTERM_MOD_ALT ? "\e" : "", c); + vterm_push_output_sprintf(vt, "%s%c", mod & VTERM_MOD_ALT ? ESC_S : "", c); } typedef struct { @@ -73,7 +73,7 @@ { KEYCODE_ENTER, '\r' }, // ENTER { KEYCODE_TAB, '\t' }, // TAB { KEYCODE_LITERAL, '\x7f' }, // BACKSPACE == ASCII DEL - { KEYCODE_LITERAL, '\e' }, // ESCAPE + { KEYCODE_LITERAL, '\x1b' }, // ESCAPE { KEYCODE_CSI_CURSOR, 'A' }, // UP { KEYCODE_CSI_CURSOR, 'B' }, // DOWN @@ -173,7 +173,7 @@ if(mod & (VTERM_MOD_SHIFT|VTERM_MOD_CTRL)) vterm_push_output_sprintf_ctrl(vt, C1_CSI, "%d;%du", k.literal, mod+1); else - vterm_push_output_sprintf(vt, mod & VTERM_MOD_ALT ? "\e%c" : "%c", k.literal); + vterm_push_output_sprintf(vt, mod & VTERM_MOD_ALT ? ESC_S "%c" : "%c", k.literal); break; case KEYCODE_SS3: case_SS3: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvterm-0~bzr681/src/unicode.c new/libvterm-0~bzr684/src/unicode.c --- old/libvterm-0~bzr681/src/unicode.c 2016-04-10 00:17:10.000000000 +0200 +++ new/libvterm-0~bzr684/src/unicode.c 2016-08-15 22:22:52.000000000 +0200 @@ -67,8 +67,6 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ -#include <wchar.h> - struct interval { int first; int last; @@ -129,7 +127,7 @@ /* auxiliary function for binary search in interval table */ -static int bisearch(wchar_t ucs, const struct interval *table, int max) { +static int bisearch(uint32_t ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -177,12 +175,12 @@ * ISO 8859-1 and WGL4 characters, Unicode control characters, * etc.) have a column width of 1. * - * This implementation assumes that wchar_t characters are encoded + * This implementation assumes that uint32_t characters are encoded * in ISO 10646. */ -static int mk_wcwidth(wchar_t ucs) +static int mk_wcwidth(uint32_t ucs) { /* test for 8-bit control characters */ if (ucs == 0) @@ -214,7 +212,7 @@ } -static int mk_wcswidth(const wchar_t *pwcs, size_t n) +static int mk_wcswidth(const uint32_t *pwcs, size_t n) { int w, width = 0; @@ -237,7 +235,7 @@ * the traditional terminal character-width behaviour. It is not * otherwise recommended for general use. */ -static int mk_wcwidth_cjk(wchar_t ucs) +static int mk_wcwidth_cjk(uint32_t ucs) { /* sorted list of non-overlapping intervals of East Asian Ambiguous * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */ @@ -305,7 +303,7 @@ } -static int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) +static int mk_wcswidth_cjk(const uint32_t *pwcs, size_t n) { int w, width = 0; @@ -321,12 +319,12 @@ // ################################ // ### The rest added by Paul Evans -INTERNAL int vterm_unicode_width(int codepoint) +INTERNAL int vterm_unicode_width(uint32_t codepoint) { return mk_wcwidth(codepoint); } -INTERNAL int vterm_unicode_is_combining(int codepoint) +INTERNAL int vterm_unicode_is_combining(uint32_t codepoint) { return bisearch(codepoint, combining, sizeof(combining) / sizeof(struct interval) - 1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvterm-0~bzr681/src/vterm.c new/libvterm-0~bzr684/src/vterm.c --- old/libvterm-0~bzr681/src/vterm.c 2016-04-10 00:17:10.000000000 +0200 +++ new/libvterm-0~bzr684/src/vterm.c 2016-08-15 22:22:52.000000000 +0200 @@ -158,7 +158,7 @@ size_t orig_cur = vt->outbuffer_cur; if(ctrl >= 0x80 && !vt->mode.ctrl8bit) - vterm_push_output_sprintf(vt, "\e%c", ctrl - 0x40); + vterm_push_output_sprintf(vt, ESC_S "%c", ctrl - 0x40); else vterm_push_output_sprintf(vt, "%c", ctrl); @@ -176,7 +176,7 @@ size_t orig_cur = vt->outbuffer_cur; if(!vt->mode.ctrl8bit) - vterm_push_output_sprintf(vt, "\e%c", C1_DCS - 0x40); + vterm_push_output_sprintf(vt, ESC_S "%c", C1_DCS - 0x40); else vterm_push_output_sprintf(vt, "%c", C1_DCS); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvterm-0~bzr681/src/vterm_internal.h new/libvterm-0~bzr684/src/vterm_internal.h --- old/libvterm-0~bzr681/src/vterm_internal.h 2016-04-10 00:17:10.000000000 +0200 +++ new/libvterm-0~bzr684/src/vterm_internal.h 2016-08-15 22:22:52.000000000 +0200 @@ -17,6 +17,8 @@ # define DEBUG_LOG(...) #endif +#define ESC_S "\x1b" + typedef struct VTermEncoding VTermEncoding; typedef struct { @@ -217,7 +219,7 @@ VTermEncoding *vterm_lookup_encoding(VTermEncodingType type, char designation); -int vterm_unicode_width(int codepoint); -int vterm_unicode_is_combining(int codepoint); +int vterm_unicode_width(uint32_t codepoint); +int vterm_unicode_is_combining(uint32_t codepoint); #endif
