Alexander/st
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed type for UTF-32 codepoints from long to uint_least32_t

Browse Source
This commit is contained in:
suigin 2015-05-05 13:13:21 -07:00 committed by Roberto E. Vargas Caballero
parent c990abfedf
commit 38af006b5e
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
st.c
View File

@ -183,11 +183,13 @@ typedef unsigned int uint;
typedef unsigned long ulong; typedef unsigned long ulong;
typedef unsigned short ushort; typedef unsigned short ushort;
typedef uint_least32_t Rune;
typedef XftDraw *Draw; typedef XftDraw *Draw;
typedef XftColor Color; typedef XftColor Color;
typedef struct { typedef struct {
long u; /* character code */ Rune u; /* character code */
ushort mode; /* attribute flags */ ushort mode; /* attribute flags */
ushort fg; /* foreground */ ushort fg; /* foreground */
ushort bg; /* background */ ushort bg; /* background */
@ -389,20 +391,20 @@ static void tmoveato(int, int);
static void tnew(int, int); static void tnew(int, int);
static void tnewline(int); static void tnewline(int);
static void tputtab(int); static void tputtab(int);
static void tputc(long); static void tputc(Rune);
static void treset(void); static void treset(void);
static void tresize(int, int); static void tresize(int, int);
static void tscrollup(int, int); static void tscrollup(int, int);
static void tscrolldown(int, int); static void tscrolldown(int, int);
static void tsetattr(int *, int); static void tsetattr(int *, int);
static void tsetchar(long, Glyph *, int, int); static void tsetchar(Rune, Glyph *, int, int);
static void tsetscroll(int, int); static void tsetscroll(int, int);
static void tswapscreen(void); static void tswapscreen(void);
static void tsetdirt(int, int); static void tsetdirt(int, int);
static void tsetdirtattr(int); static void tsetdirtattr(int);
static void tsetmode(bool, bool, int *, int); static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void); static void tfulldirt(void);
static void techo(long); static void techo(Rune);
static void tcontrolcode(uchar ); static void tcontrolcode(uchar );
static void tdectest(char ); static void tdectest(char );
static int32_t tdefcolor(int *, int *, int); static int32_t tdefcolor(int *, int *, int);
@ -465,11 +467,11 @@ static int y2row(int);
static void getbuttoninfo(XEvent *); static void getbuttoninfo(XEvent *);
static void mousereport(XEvent *); static void mousereport(XEvent *);
static size_t utf8decode(char *, long *, size_t); static size_t utf8decode(char *, Rune *, size_t);
static long utf8decodebyte(char, size_t *); static Rune utf8decodebyte(char, size_t *);
static size_t utf8encode(long, char *); static size_t utf8encode(Rune, char *);
static char utf8encodebyte(long, size_t); static char utf8encodebyte(Rune, size_t);
static size_t utf8validate(long *, size_t); static size_t utf8validate(Rune *, size_t);
static ssize_t xwrite(int, const char *, size_t); static ssize_t xwrite(int, const char *, size_t);
static void *xmalloc(size_t); static void *xmalloc(size_t);
@ -524,8 +526,8 @@ static double defaultfontsize = 0;
static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
static long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
/* Font Ring Cache */ /* Font Ring Cache */
enum { enum {
@ -538,7 +540,7 @@ enum {
typedef struct { typedef struct {
XftFont *font; XftFont *font;
int flags; int flags;
long unicodep; Rune unicodep;
} Fontcache; } Fontcache;
/* Fontcache is an array now. A new font will be appended to the array. */ /* Fontcache is an array now. A new font will be appended to the array. */
@ -586,9 +588,9 @@ xstrdup(char *s) {
} }
size_t size_t
utf8decode(char *c, long *u, size_t clen) { utf8decode(char *c, Rune *u, size_t clen) {
size_t i, j, len, type; size_t i, j, len, type;
long udecoded; Rune udecoded;
*u = UTF_INVALID; *u = UTF_INVALID;
if(!clen) if(!clen)
@ -608,7 +610,7 @@ utf8decode(char *c, long *u, size_t clen) {
return len; return len;
} }
long Rune
utf8decodebyte(char c, size_t *i) { utf8decodebyte(char c, size_t *i) {
for(*i = 0; *i < LEN(utfmask); ++(*i)) for(*i = 0; *i < LEN(utfmask); ++(*i))
if(((uchar)c & utfmask[*i]) == utfbyte[*i]) if(((uchar)c & utfmask[*i]) == utfbyte[*i])
@ -617,7 +619,7 @@ utf8decodebyte(char c, size_t *i) {
} }
size_t size_t
utf8encode(long u, char *c) { utf8encode(Rune u, char *c) {
size_t len, i; size_t len, i;
len = utf8validate(&u, 0); len = utf8validate(&u, 0);
@ -632,12 +634,12 @@ utf8encode(long u, char *c) {
} }
char char
utf8encodebyte(long u, size_t i) { utf8encodebyte(Rune u, size_t i) {
return utfbyte[i] | (u & ~utfmask[i]); return utfbyte[i] | (u & ~utfmask[i]);
} }
size_t size_t
utf8validate(long *u, size_t i) { utf8validate(Rune *u, size_t i) {
if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
*u = UTF_INVALID; *u = UTF_INVALID;
for(i = 1; *u > utfmax[i]; ++i) for(i = 1; *u > utfmax[i]; ++i)
@ -1339,7 +1341,7 @@ ttyread(void) {
static int buflen = 0; static int buflen = 0;
char *ptr; char *ptr;
int charsize; /* size of utf8 char in bytes */ int charsize; /* size of utf8 char in bytes */
long unicodep; Rune unicodep;
int ret; int ret;
/* append read bytes to unprocessed bytes */ /* append read bytes to unprocessed bytes */
@ -1368,7 +1370,7 @@ ttywrite(const char *s, size_t n) {
void void
ttysend(char *s, size_t n) { ttysend(char *s, size_t n) {
int len; int len;
long u; Rune u;
ttywrite(s, n); ttywrite(s, n);
if(IS_SET(MODE_ECHO)) if(IS_SET(MODE_ECHO))
@ -1625,7 +1627,7 @@ tmoveto(int x, int y) {
} }
void void
tsetchar(long u, Glyph *attr, int x, int y) { tsetchar(Rune u, Glyph *attr, int x, int y) {
static char *vt100_0[62] = { /* 0x41 - 0x7e */ static char *vt100_0[62] = { /* 0x41 - 0x7e */
"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */ "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */ 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
@ -2440,7 +2442,7 @@ tputtab(int n) {
} }
void void
techo(long u) { techo(Rune u) {
if(ISCONTROL(u)) { /* control code */ if(ISCONTROL(u)) { /* control code */
if(u & 0x80) { if(u & 0x80) {
u &= 0x7f; u &= 0x7f;
@ -2663,7 +2665,7 @@ eschandle(uchar ascii) {
} }
void void
tputc(long u) { tputc(Rune u) {
char c[UTF_SIZ]; char c[UTF_SIZ];
bool control; bool control;
int width, len; int width, len;
@ -3262,7 +3264,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
int frcflags, charexists; int frcflags, charexists;
int u8fl, u8fblen, u8cblen, doesexist; int u8fl, u8fblen, u8cblen, doesexist;
char *u8c, *u8fs; char *u8c, *u8fs;
long unicodep; Rune unicodep;
Font *font = &dc.font; Font *font = &dc.font;
FcResult fcres; FcResult fcres;
FcPattern *fcpattern, *fontpattern; FcPattern *fcpattern, *fontpattern;
@ -3805,7 +3807,7 @@ kpress(XEvent *ev) {
KeySym ksym; KeySym ksym;
char buf[32], *customkey; char buf[32], *customkey;
int len; int len;
long c; Rune c;
Status status; Status status;
Shortcut *bp; Shortcut *bp;