~petersanchez/st

4c6145f6c37e4ab4ba4fdefb20d41e4fcc65a97b — Markus F.X.J. Oberhumer 5 months ago c31e058
Mild const-correctness improvements.

Only touch a few things, the main focus is to
improve code readability.
3 files changed, 30 insertions(+), 28 deletions(-)

M st.c
M st.h
M x.c
M st.c => st.c +25 -23
@@ 191,20 191,20 @@ static void tnewline(int);
static void tputtab(int);
static void tputc(Rune);
static void treset(void);
static void tscrollup(int, int, int);
static void tscrolldown(int, int, int);
static void tsetattr(int *, int);
static void tsetchar(Rune, Glyph *, int, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(const int *, int);
static void tsetchar(Rune, const Glyph *, int, int);
static void tsetdirt(int, int);
static void tsetscroll(int, int);
static void tswapscreen(void);
static void tsetmode(int, int, int *, int);
static void tsetmode(int, int, const int *, int);
static int twrite(const char *, int, int);
static void tfulldirt(void);
static void tcontrolcode(uchar );
static void tdectest(char );
static void tdefutf8(char);
static int32_t tdefcolor(int *, int *, int);
static int32_t tdefcolor(const int *, int *, int);
static void tdeftran(char);
static void tstrsequence(uchar);



@@ 233,10 233,10 @@ static int iofd = 1;
static int cmdfd;
static pid_t pid;

static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
static Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
static const uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
static const Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};

ssize_t
xwrite(int fd, const char *s, size_t len)


@@ 276,12 276,14 @@ xrealloc(void *p, size_t len)
}

char *
xstrdup(char *s)
xstrdup(const char *s)
{
	if ((s = strdup(s)) == NULL)
	char *p;

	if ((p = strdup(s)) == NULL)
		die("strdup: %s\n", strerror(errno));

	return s;
	return p;
}

size_t


@@ 525,7 527,7 @@ selsnap(int *x, int *y, int direction)
{
	int newx, newy, xt, yt;
	int delim, prevdelim;
	Glyph *gp, *prevgp;
	const Glyph *gp, *prevgp;

	switch (sel.snap) {
	case SNAP_WORD:


@@ 598,7 600,7 @@ getsel(void)
{
	char *str, *ptr;
	int y, bufsize, lastx, linelen;
	Glyph *gp, *last;
	const Glyph *gp, *last;

	if (sel.ob.x == -1)
		return NULL;


@@ 765,7 767,7 @@ stty(char **args)
}

int
ttynew(char *line, char *cmd, char *out, char **args)
ttynew(const char *line, char *cmd, const char *out, char **args)
{
	int m, s;



@@ 1248,9 1250,9 @@ tmoveto(int x, int y)
}

void
tsetchar(Rune u, Glyph *attr, int x, int y)
tsetchar(Rune u, const Glyph *attr, int x, int y)
{
	static char *vt100_0[62] = { /* 0x41 - 0x7e */
	static const char *vt100_0[62] = { /* 0x41 - 0x7e */
		"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
		0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
		0, 0, 0, 0, 0, 0, 0, 0, /* P - W */


@@ 1362,7 1364,7 @@ tdeleteline(int n)
}

int32_t
tdefcolor(int *attr, int *npar, int l)
tdefcolor(const int *attr, int *npar, int l)
{
	int32_t idx = -1;
	uint r, g, b;


@@ 1412,7 1414,7 @@ tdefcolor(int *attr, int *npar, int l)
}

void
tsetattr(int *attr, int l)
tsetattr(const int *attr, int l)
{
	int i;
	int32_t idx;


@@ 1530,9 1532,9 @@ tsetscroll(int t, int b)
}

void
tsetmode(int priv, int set, int *args, int narg)
tsetmode(int priv, int set, const int *args, int narg)
{
	int alt, *lim;
	int alt; const int *lim;

	for (lim = args + narg; args < lim; ++args) {
		if (priv) {


@@ 2082,7 2084,7 @@ void
tdumpline(int n)
{
	char buf[UTF_SIZ];
	Glyph *bp, *end;
	const Glyph *bp, *end;

	bp = &term.line[n][0];
	end = &bp[MIN(tlinelen(n), term.col) - 1];

M st.h => st.h +2 -2
@@ 94,7 94,7 @@ void tnew(int, int);
void tresize(int, int);
void tsetdirtattr(int);
void ttyhangup(void);
int ttynew(char *, char *, char *, char **);
int ttynew(const char *, char *, const char *, char **);
size_t ttyread(void);
void ttyresize(int, int);
void ttywrite(const char *, size_t, int);


@@ 112,7 112,7 @@ size_t utf8encode(Rune, char *);

void *xmalloc(size_t);
void *xrealloc(void *, size_t);
char *xstrdup(char *);
char *xstrdup(const char *);

/* config.h globals */
extern char *utmp;

M x.c => x.c +3 -3
@@ 157,7 157,7 @@ static void xresize(int, int);
static void xhints(void);
static int xloadcolor(int, const char *, Color *);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
static void xloadfonts(const char *, double);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);


@@ 962,7 962,7 @@ xloadfont(Font *f, FcPattern *pattern)
}

void
xloadfonts(char *fontstr, double fontsize)
xloadfonts(const char *fontstr, double fontsize)
{
	FcPattern *pattern;
	double fontval;


@@ 970,7 970,7 @@ xloadfonts(char *fontstr, double fontsize)
	if (fontstr[0] == '-')
		pattern = XftXlfdParse(fontstr, False, False);
	else
		pattern = FcNameParse((FcChar8 *)fontstr);
		pattern = FcNameParse((const FcChar8 *)fontstr);

	if (!pattern)
		die("can't open font %s\n", fontstr);