[BACK]Return to rlmbutil.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / readline

Diff for /embedaddon/readline/rlmbutil.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2014/07/30 08:16:45 version 1.1.1.2, 2021/03/17 01:01:01
Line 1 Line 1
 /* rlmbutil.h -- utility functions for multibyte characters. */  /* rlmbutil.h -- utility functions for multibyte characters. */
   
/* Copyright (C) 2001-2009 Free Software Foundation, Inc./* Copyright (C) 2001-2015 Free Software Foundation, Inc.
   
    This file is part of the GNU Readline Library (Readline), a library     This file is part of the GNU Readline Library (Readline), a library
    for reading lines of text with interactive input and history editing.           for reading lines of text with interactive input and history editing.      
Line 28 Line 28
 /* check multibyte capability for I18N code     */  /* check multibyte capability for I18N code     */
 /************************************************/  /************************************************/
   
/* For platforms which support the ISO C amendement 1 functionality we/* For platforms which support the ISO C amendment 1 functionality we
    support user defined character classes.  */     support user defined character classes.  */
    /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */     /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
 #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H) && defined (HAVE_LOCALE_H)  #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H) && defined (HAVE_LOCALE_H)
Line 123  extern int _rl_walphabetic PARAMS((wchar_t)); Line 123  extern int _rl_walphabetic PARAMS((wchar_t));
 #define MB_INVALIDCH(x)         ((x) == (size_t)-1 || (x) == (size_t)-2)  #define MB_INVALIDCH(x)         ((x) == (size_t)-1 || (x) == (size_t)-2)
 #define MB_NULLWCH(x)           ((x) == 0)  #define MB_NULLWCH(x)           ((x) == 0)
   
   /* Try and shortcut the printable ascii characters to cut down the number of
      calls to a libc wcwidth() */
   static inline int
   _rl_wcwidth (wc)
        wchar_t wc;
   {
     switch (wc)
       {
       case ' ': case '!': case '"': case '#': case '%':
       case '&': case '\'': case '(': case ')': case '*':
       case '+': case ',': case '-': case '.': case '/':
       case '0': case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9':
       case ':': case ';': case '<': case '=': case '>':
       case '?':
       case 'A': case 'B': case 'C': case 'D': case 'E':
       case 'F': case 'G': case 'H': case 'I': case 'J':
       case 'K': case 'L': case 'M': case 'N': case 'O':
       case 'P': case 'Q': case 'R': case 'S': case 'T':
       case 'U': case 'V': case 'W': case 'X': case 'Y':
       case 'Z':
       case '[': case '\\': case ']': case '^': case '_':
       case 'a': case 'b': case 'c': case 'd': case 'e':
       case 'f': case 'g': case 'h': case 'i': case 'j':
       case 'k': case 'l': case 'm': case 'n': case 'o':
       case 'p': case 'q': case 'r': case 's': case 't':
       case 'u': case 'v': case 'w': case 'x': case 'y':
       case 'z': case '{': case '|': case '}': case '~':
         return 1;
       default:
         return wcwidth (wc);
       }
   }
   
 /* Unicode combining characters range from U+0300 to U+036F */  /* Unicode combining characters range from U+0300 to U+036F */
 #define UNICODE_COMBINING_CHAR(x) ((x) >= 768 && (x) <= 879)  #define UNICODE_COMBINING_CHAR(x) ((x) >= 768 && (x) <= 879)
   
 #if defined (WCWIDTH_BROKEN)  #if defined (WCWIDTH_BROKEN)
#  define WCWIDTH(wc)   ((_rl_utf8locale && UNICODE_COMBINING_CHAR(wc)) ? 0 : wcwidth(wc))#  define WCWIDTH(wc)   ((_rl_utf8locale && UNICODE_COMBINING_CHAR(wc)) ? 0 : _rl_wcwidth(wc))
 #else  #else
#  define WCWIDTH(wc)   wcwidth(wc)#  define WCWIDTH(wc)   _rl_wcwidth(wc)
 #endif  #endif
   
   #if defined (WCWIDTH_BROKEN)
   #  define IS_COMBINING_CHAR(x)  (WCWIDTH(x) == 0 && iswcntrl(x) == 0)
   #else
   #  define IS_COMBINING_CHAR(x)  (WCWIDTH(x) == 0)
   #endif
   
   #define UTF8_SINGLEBYTE(c)      (((c) & 0x80) == 0)
   #define UTF8_MBFIRSTCHAR(c)     (((c) & 0xc0) == 0xc0)
   #define UTF8_MBCHAR(c)          (((c) & 0xc0) == 0x80)
   
 #else /* !HANDLE_MULTIBYTE */  #else /* !HANDLE_MULTIBYTE */
   
 #undef MB_LEN_MAX  #undef MB_LEN_MAX
Line 155  extern int _rl_walphabetic PARAMS((wchar_t)); Line 199  extern int _rl_walphabetic PARAMS((wchar_t));
   
 #define MB_INVALIDCH(x)         (0)  #define MB_INVALIDCH(x)         (0)
 #define MB_NULLWCH(x)           (0)  #define MB_NULLWCH(x)           (0)
   
   #define UTF8_SINGLEBYTE(c)      (1)
   
   #if !defined (HAVE_WCHAR_T) && !defined (wchar_t)
   #  define wchar_t int
   #endif
   
 #endif /* !HANDLE_MULTIBYTE */  #endif /* !HANDLE_MULTIBYTE */
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>