Hi all, here's a patch that changes occurences of long to uint_least32_t where it's being used to store UTF-32 codepoints, as was previously discussed. Other cases where long is used are preserved as is.
---
st.c | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/st.c b/st.c
index 3eb66fa..478783f 100644
--- a/st.c
+++ b/st.c
@@ -187,7 +187,7 @@ typedef XftDraw *Draw;
typedef XftColor Color;
typedef struct {
- long u; /* character code */
+ uint_least32_t u; /* character code */
ushort mode; /* attribute flags */
ushort fg; /* foreground */
ushort bg; /* background */
@@ -389,20 +389,20 @@ static void tmoveato(int, int);
static void tnew(int, int);
static void tnewline(int);
static void tputtab(int);
-static void tputc(long);
+static void tputc(uint_least32_t);
static void treset(void);
static void tresize(int, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(int *, int);
-static void tsetchar(long, Glyph *, int, int);
+static void tsetchar(uint_least32_t, Glyph *, int, int);
static void tsetscroll(int, int);
static void tswapscreen(void);
static void tsetdirt(int, int);
static void tsetdirtattr(int);
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
-static void techo(long);
+static void techo(uint_least32_t);
static void tcontrolcode(uchar );
static void tdectest(char );
static int32_t tdefcolor(int *, int *, int);
@@ -465,11 +465,11 @@ static int y2row(int);
static void getbuttoninfo(XEvent *);
static void mousereport(XEvent *);
-static size_t utf8decode(char *, long *, size_t);
-static long utf8decodebyte(char, size_t *);
-static size_t utf8encode(long, char *);
-static char utf8encodebyte(long, size_t);
-static size_t utf8validate(long *, size_t);
+static size_t utf8decode(char *, uint_least32_t *, size_t);
+static uint_least32_t utf8decodebyte(char, size_t *);
+static size_t utf8encode(uint_least32_t, char *);
+static char utf8encodebyte(uint_least32_t, size_t);
+static size_t utf8validate(uint_least32_t *, size_t);
static ssize_t xwrite(int, const char *, size_t);
static void *xmalloc(size_t);
@@ -524,8 +524,8 @@ static double defaultfontsize = 0;
static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
-static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
+static uint_least32_t utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800,
0x10000};
+static uint_least32_t utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF,
0x10FFFF};
/* Font Ring Cache */
enum {
@@ -538,7 +538,7 @@ enum {
typedef struct {
XftFont *font;
int flags;
- long unicodep;
+ uint_least32_t unicodep;
} Fontcache;
/* Fontcache is an array now. A new font will be appended to the array. */
@@ -586,9 +586,9 @@ xstrdup(char *s) {
}
size_t
-utf8decode(char *c, long *u, size_t clen) {
+utf8decode(char *c, uint_least32_t *u, size_t clen) {
size_t i, j, len, type;
- long udecoded;
+ uint_least32_t udecoded;
*u = UTF_INVALID;
if(!clen)
@@ -608,7 +608,7 @@ utf8decode(char *c, long *u, size_t clen) {
return len;
}
-long
+uint_least32_t
utf8decodebyte(char c, size_t *i) {
for(*i = 0; *i < LEN(utfmask); ++(*i))
if(((uchar)c & utfmask[*i]) == utfbyte[*i])
@@ -617,7 +617,7 @@ utf8decodebyte(char c, size_t *i) {
}
size_t
-utf8encode(long u, char *c) {
+utf8encode(uint_least32_t u, char *c) {
size_t len, i;
len = utf8validate(&u, 0);
@@ -632,12 +632,12 @@ utf8encode(long u, char *c) {
}
char
-utf8encodebyte(long u, size_t i) {
+utf8encodebyte(uint_least32_t u, size_t i) {
return utfbyte[i] | (u & ~utfmask[i]);
}
size_t
-utf8validate(long *u, size_t i) {
+utf8validate(uint_least32_t *u, size_t i) {
if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
*u = UTF_INVALID;
for(i = 1; *u > utfmax[i]; ++i)
@@ -1339,7 +1339,7 @@ ttyread(void) {
static int buflen = 0;
char *ptr;
int charsize; /* size of utf8 char in bytes */
- long unicodep;
+ uint_least32_t unicodep;
int ret;
/* append read bytes to unprocessed bytes */
@@ -1368,7 +1368,7 @@ ttywrite(const char *s, size_t n) {
void
ttysend(char *s, size_t n) {
int len;
- long u;
+ uint_least32_t u;
ttywrite(s, n);
if(IS_SET(MODE_ECHO))
@@ -1625,7 +1625,7 @@ tmoveto(int x, int y) {
}
void
-tsetchar(long u, Glyph *attr, int x, int y) {
+tsetchar(uint_least32_t u, Glyph *attr, int x, int y) {
static char *vt100_0[62] = { /* 0x41 - 0x7e */
"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
@@ -2440,7 +2440,7 @@ tputtab(int n) {
}
void
-techo(long u) {
+techo(uint_least32_t u) {
if(ISCONTROL(u)) { /* control code */
if(u & 0x80) {
u &= 0x7f;
@@ -2663,7 +2663,7 @@ eschandle(uchar ascii) {
}
void
-tputc(long u) {
+tputc(uint_least32_t u) {
char c[UTF_SIZ];
bool control;
int width, len;
@@ -3262,7 +3262,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen,
int bytelen) {
int frcflags, charexists;
int u8fl, u8fblen, u8cblen, doesexist;
char *u8c, *u8fs;
- long unicodep;
+ uint_least32_t unicodep;
Font *font = &dc.font;
FcResult fcres;
FcPattern *fcpattern, *fontpattern;
@@ -3805,7 +3805,7 @@ kpress(XEvent *ev) {
KeySym ksym;
char buf[32], *customkey;
int len;
- long c;
+ uint_least32_t c;
Status status;
Shortcut *bp;
--
2.3.6
signature.asc
Description: Digital signature
