Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Applying the patch of Rafa Garcia Gallega <
[email protected]
> to
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
8c8efaf
..
3cd7831
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-123,6
+123,7
@@
enum escape_state {
ESC_STR = 4, /* DSC, OSC, PM, APC */
ESC_ALTCHARSET = 8,
ESC_STR_END = 16, /* a final string was encountered */
ESC_STR = 4, /* DSC, OSC, PM, APC */
ESC_ALTCHARSET = 8,
ESC_STR_END = 16, /* a final string was encountered */
+ ESC_TEST = 32, /* Enter in test mode */
};
enum window_state {
};
enum window_state {
@@
-289,7
+290,7
@@
static int tresize(int, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(int*, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(int*, int);
-static void tsetchar(char
*
);
+static void tsetchar(char
*, Glyph *, int, int
);
static void tsetscroll(int, int);
static void tswapscreen(void);
static void tsetdirt(int, int);
static void tsetscroll(int, int);
static void tswapscreen(void);
static void tsetdirt(int, int);
@@
-339,6
+340,7
@@
static int utf8encode(long *, char *);
static int utf8size(char *);
static int isfullutf8(char *, int);
static int utf8size(char *);
static int isfullutf8(char *, int);
+static ssize_t xwrite(int, char *, size_t);
static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
static void *xcalloc(size_t nmemb, size_t size);
static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
static void *xcalloc(size_t nmemb, size_t size);
@@
-378,6
+380,21
@@
static char *opt_embed = NULL;
static char *opt_class = NULL;
static char *opt_font = NULL;
static char *opt_class = NULL;
static char *opt_font = NULL;
+
+ssize_t
+xwrite(int fd, char *s, size_t len) {
+ size_t aux = len;
+
+ while(len > 0) {
+ ssize_t r = write(fd, s, len);
+ if(r < 0)
+ return r;
+ len -= r;
+ s += r;
+ }
+ return aux;
+}
+
void *
xmalloc(size_t len) {
void *p = malloc(len);
void *
xmalloc(size_t len) {
void *p = malloc(len);
@@
-661,7
+678,7
@@
bpress(XEvent *e) {
void
selcopy(void) {
void
selcopy(void) {
- char *str, *ptr
, *p
;
+ char *str, *ptr;
int x, y, bufsize, is_selected = 0, size;
Glyph *gp;
int x, y, bufsize, is_selected = 0, size;
Glyph *gp;
@@
-676,11
+693,12
@@
selcopy(void) {
for(x = 0; x < term.col; x++) {
gp = &term.line[y][x];
for(x = 0; x < term.col; x++) {
gp = &term.line[y][x];
- if(!(is_selected = selected(x, y)))
+ if(!(is_selected = selected(x, y))
+ || !(gp->state & GLYPH_SET)) {
continue;
continue;
- p = (gp->state & GLYPH_SET) ? gp->c : " ";
- size = utf8size(
p
);
- memcpy(ptr,
p
, size);
+ }
+ size = utf8size(
gp->c
);
+ memcpy(ptr,
gp->c
, size);
ptr += size;
}
/* \n at the end of every selected line except for the last one */
ptr += size;
}
/* \n at the end of every selected line except for the last one */
@@
-877,7
+895,7
@@
execsh(void) {
DEFAULT(envshell, SHELL);
putenv("TERM="TNAME);
DEFAULT(envshell, SHELL);
putenv("TERM="TNAME);
- args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
+ args = opt_cmd ? opt_cmd : (char
*[]){envshell, "-i", NULL};
execvp(args[0], args);
exit(EXIT_FAILURE);
}
execvp(args[0], args);
exit(EXIT_FAILURE);
}
@@
-925,13
+943,12
@@
ttynew(void) {
cmdfd = m;
signal(SIGCHLD, sigchld);
if(opt_io) {
cmdfd = m;
signal(SIGCHLD, sigchld);
if(opt_io) {
- if(!strcmp(opt_io, "-")) {
- iofd = STDOUT_FILENO;
- } else {
- if((iofd = open(opt_io, O_WRONLY | O_CREAT, 0666)) < 0) {
- fprintf(stderr, "Error opening %s:%s\n",
- opt_io, strerror(errno));
- }
+ iofd = (!strcmp(opt_io, "-")) ?
+ STDOUT_FILENO :
+ open(opt_io, O_WRONLY | O_CREAT, 0666);
+ if(iofd < 0) {
+ fprintf(stderr, "Error opening %s:%s\n",
+ opt_io, strerror(errno));
}
}
}
}
}
}
@@
-1182,8
+1199,8
@@
tmoveto(int x, int y) {
}
void
}
void
-tsetchar(char *c) {
- char *vt100_0[62] = { /* 0x41 - 0x7e */
+tsetchar(char *c
, 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 */
0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
@@
-1197,17
+1214,17
@@
tsetchar(char *c) {
/*
* The table is proudly stolen from rxvt.
*/
/*
* The table is proudly stolen from rxvt.
*/
- if(
term.c.attr.
mode & ATTR_GFX) {
+ if(
attr->
mode & ATTR_GFX) {
if(c[0] >= 0x41 && c[0] <= 0x7e
&& vt100_0[c[0] - 0x41]) {
c = vt100_0[c[0] - 0x41];
}
}
if(c[0] >= 0x41 && c[0] <= 0x7e
&& vt100_0[c[0] - 0x41]) {
c = vt100_0[c[0] - 0x41];
}
}
- term.dirty[
term.c.
y] = 1;
- term.line[
term.c.y][term.c.x] = term.c.
attr;
- memcpy(term.line[
term.c.y][term.c.
x].c, c, UTF_SIZ);
- term.line[
term.c.y][term.c.
x].state |= GLYPH_SET;
+ term.dirty[y] = 1;
+ term.line[
y][x] = *
attr;
+ memcpy(term.line[
y][
x].c, c, UTF_SIZ);
+ term.line[
y][
x].state |= GLYPH_SET;
}
void
}
void
@@
-1792,8
+1809,14
@@
tputc(char *c, int len) {
uchar ascii = *c;
bool control = ascii < '\x20' || ascii == 0177;
uchar ascii = *c;
bool control = ascii < '\x20' || ascii == 0177;
- if(iofd != -1)
- write(iofd, c, len);
+ if(iofd != -1) {
+ if (xwrite(iofd, c, len) < 0) {
+ fprintf(stderr, "Error writting in %s:%s\n",
+ opt_io, strerror(errno));
+ close(iofd);
+ iofd = -1;
+ }
+ }
/*
* STR sequences must be checked before of anything
* because it can use some control codes as part of the sequence
/*
* STR sequences must be checked before of anything
* because it can use some control codes as part of the sequence
@@
-1893,11
+1916,25
@@
tputc(char *c, int len) {
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
}
term.esc = 0;
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
}
term.esc = 0;
+ } else if(term.esc & ESC_TEST) {
+ if(ascii == '8') { /* DEC screen alignment test. */
+ char E[UTF_SIZ] = "E";
+ int x, y;
+
+ for(x = 0; x < term.col; ++x) {
+ for(y = 0; y < term.row; ++y)
+ tsetchar(E, &term.c.attr, x, y);
+ }
+ }
+ term.esc = 0;
} else {
switch(ascii) {
case '[':
term.esc |= ESC_CSI;
break;
} else {
switch(ascii) {
case '[':
term.esc |= ESC_CSI;
break;
+ case '#':
+ term.esc |= ESC_TEST;
+ break;
case 'P': /* DCS -- Device Control String */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
case 'P': /* DCS -- Device Control String */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
@@
-1988,7
+2025,7
@@
tputc(char *c, int len) {
sel.bx = -1;
if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
tnewline(1); /* always go to first col */
sel.bx = -1;
if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
tnewline(1); /* always go to first col */
- tsetchar(c);
+ tsetchar(c
, &term.c.attr, term.c.x, term.c.y
);
if(term.c.x+1 < term.col)
tmoveto(term.c.x+1, term.c.y);
else
if(term.c.x+1 < term.col)
tmoveto(term.c.x+1, term.c.y);
else