Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Now clipping is more clear.
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
bca9dc7
..
7f53981
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-36,6
+36,7
@@
char *argv0;
#define Draw XftDraw *
#define Colour XftColor
#define Colourmap Colormap
#define Draw XftDraw *
#define Colour XftColor
#define Colourmap Colormap
+#define Rectangle XRectangle
#if defined(__linux)
#include <pty.h>
#if defined(__linux)
#include <pty.h>
@@
-85,6
+86,7
@@
enum glyph_attribute {
ATTR_GFX = 8,
ATTR_ITALIC = 16,
ATTR_BLINK = 32,
ATTR_GFX = 8,
ATTR_ITALIC = 16,
ATTR_BLINK = 32,
+ ATTR_WRAP = 64,
};
enum cursor_movement {
};
enum cursor_movement {
@@
-113,6
+115,7
@@
enum term_mode {
MODE_ECHO = 1024,
MODE_APPCURSOR = 2048,
MODE_MOUSESGR = 4096,
MODE_ECHO = 1024,
MODE_APPCURSOR = 2048,
MODE_MOUSESGR = 4096,
+ MODE_8BIT = 8192,
};
enum escape_state {
};
enum escape_state {
@@
-668,17
+671,15
@@
void
selsnap(int mode, int *x, int *y, int direction) {
switch(mode) {
case SNAP_WORD:
selsnap(int mode, int *x, int *y, int direction) {
switch(mode) {
case SNAP_WORD:
- while(*x > 0 && *x < term.col-1 && term.line[*y][*x + direction].c[0] != ' ') {
+ while(*x > 0 && *x < term.col-1
+ && term.line[*y][*x + direction].c[0] != ' ') {
*x += direction;
}
break;
*x += direction;
}
break;
-
case SNAP_LINE:
*x = (direction < 0) ? 0 : term.col - 1;
break;
case SNAP_LINE:
*x = (direction < 0) ? 0 : term.col - 1;
break;
-
default:
default:
- /* do nothing */
break;
}
}
break;
}
}
@@
-771,6
+772,7
@@
bpress(XEvent *e) {
mousereport(e);
} else if(e->xbutton.button == Button1) {
gettimeofday(&now, NULL);
mousereport(e);
} else if(e->xbutton.button == Button1) {
gettimeofday(&now, NULL);
+
/* Clear previous selection, logically and visually. */
if(sel.bx != -1) {
sel.bx = -1;
/* Clear previous selection, logically and visually. */
if(sel.bx != -1) {
sel.bx = -1;
@@
-781,14
+783,15
@@
bpress(XEvent *e) {
sel.type = SEL_REGULAR;
sel.ex = sel.bx = x2col(e->xbutton.x);
sel.ey = sel.by = y2row(e->xbutton.y);
sel.type = SEL_REGULAR;
sel.ex = sel.bx = x2col(e->xbutton.x);
sel.ey = sel.by = y2row(e->xbutton.y);
+
/*
* Snap handling.
* If user clicks are fasst enough (e.g. below timeouts),
/*
* Snap handling.
* If user clicks are fasst enough (e.g. below timeouts),
- * we ignore if his hand slipped left or down and accidentally selected more;
- * we are just snapping to whatever we're snapping.
+ * we ignore if his hand slipped left or down and accidentally
+ * selected more; we are just snapping to whatever we're
+ * snapping.
*/
if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
*/
if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
- /* Snap to line */
sel.snap = SNAP_LINE;
} else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
sel.snap = SNAP_WORD;
sel.snap = SNAP_LINE;
} else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
sel.snap = SNAP_WORD;
@@
-797,8
+800,15
@@
bpress(XEvent *e) {
}
selsnap(sel.snap, &sel.bx, &sel.by, -1);
selsnap(sel.snap, &sel.ex, &sel.ey, 1);
}
selsnap(sel.snap, &sel.bx, &sel.by, -1);
selsnap(sel.snap, &sel.ex, &sel.ey, 1);
- sel.b.x = sel.bx, sel.b.y = sel.by, sel.e.x = sel.ex, sel.e.y = sel.ey;
- /* Draw selection, unless it's regular and we don't want to make clicks visible */
+ sel.b.x = sel.bx;
+ sel.b.y = sel.by;
+ sel.e.x = sel.ex;
+ sel.e.y = sel.ey;
+
+ /*
+ * Draw selection, unless it's regular and we don't want to
+ * make clicks visible
+ */
if (sel.snap != 0) {
tsetdirt(sel.b.y, sel.e.y);
draw();
if (sel.snap != 0) {
tsetdirt(sel.b.y, sel.e.y);
draw();
@@
-834,9
+844,8
@@
selcopy(void) {
/* nothing */;
for(x = 0; gp <= last; x++, ++gp) {
/* nothing */;
for(x = 0; gp <= last; x++, ++gp) {
- if(!selected(x, y))
{
+ if(!selected(x, y))
continue;
continue;
- }
size = utf8size(gp->c);
memcpy(ptr, gp->c, size);
size = utf8size(gp->c);
memcpy(ptr, gp->c, size);
@@
-852,7
+861,7
@@
selcopy(void) {
* st.
* FIXME: Fix the computer world.
*/
* st.
* FIXME: Fix the computer world.
*/
- if(y < sel.e.y)
+ if(y < sel.e.y
&& !((gp-1)->mode & ATTR_WRAP)
)
*ptr++ = '\n';
}
*ptr = 0;
*ptr++ = '\n';
}
*ptr = 0;
@@
-1643,6
+1652,9
@@
tsetmode(bool priv, bool set, int *args, int narg) {
case 1006:
MODBIT(term.mode, set, MODE_MOUSESGR);
break;
case 1006:
MODBIT(term.mode, set, MODE_MOUSESGR);
break;
+ case 1034:
+ MODBIT(term.mode, set, MODE_8BIT);
+ break;
case 1049: /* = 1047 and 1048 */
case 47:
case 1047:
case 1049: /* = 1047 and 1048 */
case 47:
case 1047:
@@
-2266,8
+2278,10
@@
tputc(char *c, int len) {
return;
if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
return;
if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
- if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
- tnewline(1); /* always go to first col */
+ if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+ term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
+ tnewline(1);
+ }
if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
memmove(&term.line[term.c.y][term.c.x+1],
if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
memmove(&term.line[term.c.y][term.c.x+1],
@@
-2751,6
+2765,7
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
FcCharSet *fccharset;
Colour *fg, *bg, *temp, revfg, revbg;
XRenderColor colfg, colbg;
FcCharSet *fccharset;
Colour *fg, *bg, *temp, revfg, revbg;
XRenderColor colfg, colbg;
+ Rectangle r;
frcflags = FRC_NORMAL;
frcflags = FRC_NORMAL;
@@
-2839,6
+2854,13
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
/* Clean up the region we want to draw to. */
XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
/* Clean up the region we want to draw to. */
XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
+ /* Set the clip region because Xft is sometimes dirty. */
+ r.x = 0;
+ r.y = 0;
+ r.height = xw.ch;
+ r.width = width;
+ XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+
fcsets[0] = font->set;
for(xp = winx; bytelen > 0;) {
/*
fcsets[0] = font->set;
for(xp = winx; bytelen > 0;) {
/*
@@
-2872,6
+2894,7
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
(FcChar8 *)u8fs,
u8fblen);
xp += font->width * u8fl;
(FcChar8 *)u8fs,
u8fblen);
xp += font->width * u8fl;
+
}
break;
}
}
break;
}
@@
-2956,6
+2979,9
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
width, 1);
}
XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
width, 1);
}
+
+ /* Reset clip to none. */
+ XftDrawSetClip(xw.draw, 0);
}
void
}
void
@@
-3219,7
+3245,8
@@
kpress(XEvent *ev) {
XKeyEvent *e = &ev->xkey;
KeySym ksym;
char xstr[31], buf[32], *customkey, *cp = buf;
XKeyEvent *e = &ev->xkey;
KeySym ksym;
char xstr[31], buf[32], *customkey, *cp = buf;
- int len;
+ int len, ret;
+ long c;
Status status;
Shortcut *bp;
Status status;
Shortcut *bp;
@@
-3240,13
+3267,23
@@
kpress(XEvent *ev) {
if((customkey = kmap(ksym, e->state))) {
len = strlen(customkey);
memcpy(buf, customkey, len);
if((customkey = kmap(ksym, e->state))) {
len = strlen(customkey);
memcpy(buf, customkey, len);
- /*
2
. hardcoded (overrides X lookup) */
+ /*
3
. hardcoded (overrides X lookup) */
} else {
if(len == 0)
return;
} else {
if(len == 0)
return;
- if(len == 1 && e->state & Mod1Mask)
- *cp++ = '\033';
+ if(len == 1 && e->state & Mod1Mask) {
+ if(IS_SET(MODE_8BIT)) {
+ if(*xstr < 0177) {
+ c = *xstr | B7;
+ ret = utf8encode(&c, cp);
+ cp += ret;
+ len = 0;
+ }
+ } else {
+ *cp++ = '\033';
+ }
+ }
memcpy(cp, xstr, len);
len = cp - buf + len;
memcpy(cp, xstr, len);
len = cp - buf + len;