Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Implementing italic-bold. This will require an increase of the avgWdth.
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
4e208d4
..
2e1ac67
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-77,6
+77,7
@@
enum glyph_attribute {
ATTR_BOLD = 4,
ATTR_GFX = 8,
ATTR_ITALIC = 16,
ATTR_BOLD = 4,
ATTR_GFX = 8,
ATTR_ITALIC = 16,
+ ATTR_BLINK = 32,
};
enum cursor_movement {
};
enum cursor_movement {
@@
-239,7
+240,7
@@
typedef struct {
short lbearing;
short rbearing;
XFontSet set;
short lbearing;
short rbearing;
XFontSet set;
- } font, bfont, ifont;
+ } font, bfont, ifont
, ibfont
;
} DC;
static void die(const char*, ...);
} DC;
static void die(const char*, ...);
@@
-291,10
+292,11
@@
static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xclear(int, int, int, int);
static void xdraws(char *, Glyph, int, int, int, int);
static void xhints(void);
static void xclear(int, int, int, int);
-static void xcopy();
+static void xcopy(
void
);
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
static void xdrawcursor(void);
static void xinit(void);
static void xloadcols(void);
+static void xresettitle(void);
static void xseturgency(int);
static void xsetsel(char*);
static void xresize(int, int);
static void xseturgency(int);
static void xsetsel(char*);
static void xresize(int, int);
@@
-311,12
+313,13
@@
static void brelease(XEvent *);
static void bpress(XEvent *);
static void bmotion(XEvent *);
static void selnotify(XEvent *);
static void bpress(XEvent *);
static void bmotion(XEvent *);
static void selnotify(XEvent *);
+static void selclear(XEvent *);
static void selrequest(XEvent *);
static void selinit(void);
static inline bool selected(int, int);
static void selcopy(void);
static void selrequest(XEvent *);
static void selinit(void);
static inline bool selected(int, int);
static void selcopy(void);
-static void selpaste();
+static void selpaste(
void
);
static void selscroll(int, int);
static int utf8decode(char *, long *);
static void selscroll(int, int);
static int utf8decode(char *, long *);
@@
-324,6
+327,9
@@
static int utf8encode(long *, char *);
static int utf8size(char *);
static int isfullutf8(char *, int);
static int utf8size(char *);
static int isfullutf8(char *, int);
+static void *xmalloc(size_t);
+static void *xrealloc(void *, size_t);
+
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
[ClientMessage] = cmessage,
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
[ClientMessage] = cmessage,
@@
-336,6
+342,7
@@
static void (*handler[LASTEvent])(XEvent *) = {
[MotionNotify] = bmotion,
[ButtonPress] = bpress,
[ButtonRelease] = brelease,
[MotionNotify] = bmotion,
[ButtonPress] = bpress,
[ButtonRelease] = brelease,
+ [SelectionClear] = selclear,
[SelectionNotify] = selnotify,
[SelectionRequest] = selrequest,
};
[SelectionNotify] = selnotify,
[SelectionRequest] = selrequest,
};
@@
-349,13
+356,28
@@
static STREscape strescseq;
static int cmdfd;
static pid_t pid;
static Selection sel;
static int cmdfd;
static pid_t pid;
static Selection sel;
-static
FILE *fileio
;
+static
int iofd = -1
;
static char **opt_cmd = NULL;
static char *opt_io = NULL;
static char *opt_title = NULL;
static char *opt_embed = NULL;
static char *opt_class = NULL;
static char **opt_cmd = NULL;
static char *opt_io = NULL;
static char *opt_title = NULL;
static char *opt_embed = NULL;
static char *opt_class = NULL;
+void *
+xmalloc(size_t len) {
+ void *p = malloc(len);
+ if(!p)
+ die("Out of memory");
+ return p;
+}
+
+void *
+xrealloc(void *p, size_t len) {
+ if((p = realloc(p, len)) == NULL)
+ die("Out of memory");
+ return p;
+}
+
int
utf8decode(char *s, long *u) {
uchar c;
int
utf8decode(char *s, long *u) {
uchar c;
@@
-562,7
+584,7
@@
selcopy(void) {
else {
bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
else {
bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
- ptr = str = malloc(bufsize);
+ ptr = str =
x
malloc(bufsize);
/* append every set & selected glyph to the selection */
for(y = 0; y < term.row; y++) {
/* append every set & selected glyph to the selection */
for(y = 0; y < term.row; y++) {
@@
-612,6
+634,14
@@
selpaste() {
XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
}
XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
}
+void selclear(XEvent *e) {
+ if(sel.bx == -1)
+ return;
+ sel.bx = -1;
+ tsetdirt(sel.b.y, sel.e.y);
+ draw();
+}
+
void
selrequest(XEvent *e) {
XSelectionRequestEvent *xsre;
void
selrequest(XEvent *e) {
XSelectionRequestEvent *xsre;
@@
-744,6
+774,13
@@
execsh(void) {
unsetenv("LINES");
unsetenv("TERMCAP");
unsetenv("LINES");
unsetenv("TERMCAP");
+ signal(SIGCHLD, SIG_DFL);
+ signal(SIGHUP, SIG_DFL);
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, SIG_DFL);
+ signal(SIGTERM, SIG_DFL);
+ signal(SIGALRM, SIG_DFL);
+
DEFAULT(envshell, SHELL);
putenv("TERM="TNAME);
args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
DEFAULT(envshell, SHELL);
putenv("TERM="TNAME);
args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
@@
-790,9
+827,15
@@
ttynew(void) {
close(s);
cmdfd = m;
signal(SIGCHLD, sigchld);
close(s);
cmdfd = m;
signal(SIGCHLD, sigchld);
- if(opt_io && !(fileio = fopen(opt_io, "w"))) {
- fprintf(stderr, "Error opening %s:%s\n",
- opt_io, strerror(errno));
+ 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));
+ }
+ }
}
}
}
}
}
}
@@
-901,14
+944,14
@@
void
tnew(int col, int row) {
/* set screen size */
term.row = row, term.col = col;
tnew(int col, int row) {
/* set screen size */
term.row = row, term.col = col;
- term.line = malloc(term.row * sizeof(Line));
- term.alt = malloc(term.row * sizeof(Line));
- term.dirty = malloc(term.row * sizeof(*term.dirty));
- term.tabs = malloc(term.col * sizeof(*term.tabs));
+ term.line =
x
malloc(term.row * sizeof(Line));
+ term.alt =
x
malloc(term.row * sizeof(Line));
+ term.dirty =
x
malloc(term.row * sizeof(*term.dirty));
+ term.tabs =
x
malloc(term.col * sizeof(*term.tabs));
for(row = 0; row < term.row; row++) {
for(row = 0; row < term.row; row++) {
- term.line[row] = malloc(term.col * sizeof(Glyph));
- term.alt [row] = malloc(term.col * sizeof(Glyph));
+ term.line[row] =
x
malloc(term.col * sizeof(Glyph));
+ term.alt [row] =
x
malloc(term.col * sizeof(Glyph));
term.dirty[row] = 0;
}
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
term.dirty[row] = 0;
}
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
@@
-1116,7
+1159,8
@@
tsetattr(int *attr, int l) {
for(i = 0; i < l; i++) {
switch(attr[i]) {
case 0:
for(i = 0; i < l; i++) {
switch(attr[i]) {
case 0:
- term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD);
+ term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
+ | ATTR_ITALIC | ATTR_BLINK);
term.c.attr.fg = DefaultFG;
term.c.attr.bg = DefaultBG;
break;
term.c.attr.fg = DefaultFG;
term.c.attr.bg = DefaultBG;
break;
@@
-1129,9
+1173,13
@@
tsetattr(int *attr, int l) {
case 4:
term.c.attr.mode |= ATTR_UNDERLINE;
break;
case 4:
term.c.attr.mode |= ATTR_UNDERLINE;
break;
+ case 5:
+ term.c.attr.mode |= ATTR_BLINK;
+ break;
case 7:
term.c.attr.mode |= ATTR_REVERSE;
break;
case 7:
term.c.attr.mode |= ATTR_REVERSE;
break;
+ case 21:
case 22:
term.c.attr.mode &= ~ATTR_BOLD;
break;
case 22:
term.c.attr.mode &= ~ATTR_BOLD;
break;
@@
-1141,6
+1189,9
@@
tsetattr(int *attr, int l) {
case 24:
term.c.attr.mode &= ~ATTR_UNDERLINE;
break;
case 24:
term.c.attr.mode &= ~ATTR_UNDERLINE;
break;
+ case 25:
+ term.c.attr.mode &= ~ATTR_BLINK;
+ break;
case 27:
term.c.attr.mode &= ~ATTR_REVERSE;
break;
case 27:
term.c.attr.mode &= ~ATTR_REVERSE;
break;
@@
-1180,7
+1231,7
@@
tsetattr(int *attr, int l) {
else if(BETWEEN(attr[i], 90, 97))
term.c.attr.fg = attr[i] - 90 + 8;
else if(BETWEEN(attr[i], 100, 107))
else if(BETWEEN(attr[i], 90, 97))
term.c.attr.fg = attr[i] - 90 + 8;
else if(BETWEEN(attr[i], 100, 107))
- term.c.attr.
f
g = attr[i] - 100 + 8;
+ term.c.attr.
b
g = attr[i] - 100 + 8;
else
fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
break;
else
fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
break;
@@
-1492,6
+1543,9
@@
strhandle(void) {
break;
}
break;
break;
}
break;
+ case 'k': /* old title set compatibility */
+ XStoreName(xw.dpy, xw.win, strescseq.buf);
+ break;
case 'P': /* DSC -- Device Control String */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
case 'P': /* DSC -- Device Control String */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
@@
-1554,8
+1608,8
@@
void
tputc(char *c) {
char ascii = *c;
tputc(char *c) {
char ascii = *c;
- if(
fileio
)
-
putc(ascii, fileio
);
+ if(
iofd != -1
)
+
write(iofd, c, 1
);
if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
@@
-1605,6
+1659,7
@@
tputc(char *c) {
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
case ']': /* OSC -- Operating System Command */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
case ']': /* OSC -- Operating System Command */
+ case 'k': /* old title set compatibility */
strreset();
strescseq.type = ascii;
term.esc |= ESC_STR;
strreset();
strescseq.type = ascii;
term.esc |= ESC_STR;
@@
-1637,6
+1692,7
@@
tputc(char *c) {
case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
+ xresettitle();
break;
case '=': /* DECPAM -- Application keypad */
term.mode |= MODE_APPKEYPAD;
break;
case '=': /* DECPAM -- Application keypad */
term.mode |= MODE_APPKEYPAD;
@@
-1667,6
+1723,8
@@
tputc(char *c) {
if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
switch(ascii) {
if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
switch(ascii) {
+ case '\0': /* padding character, do nothing */
+ break;
case '\t':
tputtab(1);
break;
case '\t':
tputtab(1);
break;
@@
-1731,16
+1789,16
@@
tresize(int col, int row) {
}
/* resize to new height */
}
/* resize to new height */
- term.line = realloc(term.line, row * sizeof(Line));
- term.alt = realloc(term.alt, row * sizeof(Line));
- term.dirty = realloc(term.dirty, row * sizeof(*term.dirty));
- term.tabs = realloc(term.tabs, col * sizeof(*term.tabs));
+ term.line =
x
realloc(term.line, row * sizeof(Line));
+ term.alt =
x
realloc(term.alt, row * sizeof(Line));
+ term.dirty =
x
realloc(term.dirty, row * sizeof(*term.dirty));
+ term.tabs =
x
realloc(term.tabs, col * sizeof(*term.tabs));
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
term.dirty[i] = 1;
/* resize each row to new width, zero-pad if needed */
for(i = 0; i < minrow; i++) {
term.dirty[i] = 1;
- term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
- term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph));
+ term.line[i] =
x
realloc(term.line[i], col * sizeof(Glyph));
+ term.alt[i] =
x
realloc(term.alt[i], col * sizeof(Glyph));
for(x = mincol; x < col; x++) {
term.line[i][x].state = 0;
term.alt[i][x].state = 0;
for(x = mincol; x < col; x++) {
term.line[i][x].state = 0;
term.alt[i][x].state = 0;
@@
-1887,13
+1945,15
@@
xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
}
void
}
void
-initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
+initfonts(char *fontstr, char *bfontstr, char *ifontstr
, char *ibfontstr
) {
if((dc.font.set = xinitfont(fontstr)) == NULL)
die("Can't load font %s\n", fontstr);
if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
die("Can't load bfont %s\n", bfontstr);
if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
die("Can't load ifont %s\n", ifontstr);
if((dc.font.set = xinitfont(fontstr)) == NULL)
die("Can't load font %s\n", fontstr);
if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
die("Can't load bfont %s\n", bfontstr);
if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
die("Can't load ifont %s\n", ifontstr);
+ if((dc.ibfont.set = xinitfont(ibfontstr)) == NULL)
+ die("Can't load ibfont %s\n", ibfontstr);
xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
&dc.font.lbearing, &dc.font.rbearing);
xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
&dc.font.lbearing, &dc.font.rbearing);
@@
-1901,6
+1961,8
@@
initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
&dc.bfont.lbearing, &dc.bfont.rbearing);
xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
&dc.ifont.lbearing, &dc.ifont.rbearing);
&dc.bfont.lbearing, &dc.bfont.rbearing);
xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
&dc.ifont.lbearing, &dc.ifont.rbearing);
+ xgetfontinfo(dc.ibfont.set, &dc.ibfont.ascent, &dc.ibfont.descent,
+ &dc.ibfont.lbearing, &dc.ibfont.rbearing);
}
void
}
void
@@
-1914,6
+1976,17
@@
xinit(void) {
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
+ /* font */
+ initfonts(FONT, BOLDFONT, ITALICFONT, ITALICBOLDFONT);
+
+ /* XXX: Assuming same size for bold font */
+ xw.cw = dc.font.rbearing - dc.font.lbearing;
+ xw.ch = dc.font.ascent + dc.font.descent;
+
+ /* colors */
+ xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
+ xloadcols();
+
/* adjust fixed window geometry */
if(xw.isfixed) {
sw = DisplayWidth(xw.dpy, xw.scr);
/* adjust fixed window geometry */
if(xw.isfixed) {
sw = DisplayWidth(xw.dpy, xw.scr);
@@
-1933,24
+2006,12
@@
xinit(void) {
xw.fy = 0;
}
xw.fy = 0;
}
- /* font */
- initfonts(FONT, BOLDFONT, ITALICFONT);
-
- /* XXX: Assuming same size for bold font */
- xw.cw = dc.font.rbearing - dc.font.lbearing;
- xw.ch = dc.font.ascent + dc.font.descent;
-
- /* colors */
- xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
- xloadcols();
-
attrs.background_pixel = dc.col[DefaultBG];
attrs.border_pixel = dc.col[DefaultBG];
attrs.bit_gravity = NorthWestGravity;
attrs.event_mask = FocusChangeMask | KeyPressMask
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
attrs.background_pixel = dc.col[DefaultBG];
attrs.border_pixel = dc.col[DefaultBG];
attrs.bit_gravity = NorthWestGravity;
attrs.event_mask = FocusChangeMask | KeyPressMask
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
- | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
- | EnterWindowMask | LeaveWindowMask;
+ | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
attrs.colormap = xw.cmap;
parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
attrs.colormap = xw.cmap;
parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
@@
-1980,7
+2041,7
@@
xinit(void) {
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
-
XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"
);
+
xresettitle(
);
XMapWindow(xw.dpy, xw.win);
xhints();
XSync(xw.dpy, 0);
XMapWindow(xw.dpy, xw.win);
xhints();
XSync(xw.dpy, 0);
@@
-2011,6
+2072,8
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
if(base.mode & ATTR_ITALIC)
fontset = dc.ifont.set;
if(base.mode & ATTR_ITALIC)
fontset = dc.ifont.set;
+ if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
+ fontset = dc.ibfont.set;
XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
@@
-2036,7
+2099,6
@@
void
xcopy() {
XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
XdbeSwapBuffers(xw.dpy, swpinfo, 1);
xcopy() {
XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
XdbeSwapBuffers(xw.dpy, swpinfo, 1);
-
}
void
}
void
@@
-2077,6
+2139,11
@@
xdrawcursor(void) {
xcopy();
}
xcopy();
}
+void
+xresettitle(void) {
+ XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+}
+
void
redraw(void) {
struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
void
redraw(void) {
struct timespec tv = {0, REDRAW_TIMEOUT * 1000};