Xinqi Bao's Git
projects
/
st.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Fix bug restoring cursor position
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
8ef1346
..
67fa790
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-72,8
+72,6
@@
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
#define IS_SET(flag) (term.mode & (flag))
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
#define IS_SET(flag) (term.mode & (flag))
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
-#define X2COL(x) (((x) - borderpx)/xw.cw)
-#define Y2ROW(y) (((y) - borderpx)/xw.ch)
#define VT102ID "\033[?6c"
#define VT102ID "\033[?6c"
@@
-98,8
+96,7
@@
enum cursor_movement {
enum cursor_state {
CURSOR_DEFAULT = 0,
enum cursor_state {
CURSOR_DEFAULT = 0,
- CURSOR_HIDE = 1,
- CURSOR_WRAPNEXT = 2
+ CURSOR_WRAPNEXT = 1,
};
enum glyph_state {
};
enum glyph_state {
@@
-117,7
+114,8
@@
enum term_mode {
MODE_MOUSEMOTION = 64,
MODE_MOUSE = 32|64,
MODE_REVERSE = 128,
MODE_MOUSEMOTION = 64,
MODE_MOUSE = 32|64,
MODE_REVERSE = 128,
- MODE_KBDLOCK = 256
+ MODE_KBDLOCK = 256,
+ MODE_HIDE = 512
};
enum escape_state {
};
enum escape_state {
@@
-582,6
+580,22
@@
selinit(void) {
sel.xtarget = XA_STRING;
}
sel.xtarget = XA_STRING;
}
+static int
+x2col(int x) {
+ x -= borderpx;
+ x /= xw.cw;
+
+ return LIMIT(x, 0, term.col-1);
+}
+
+static int
+y2row(int y) {
+ y -= borderpx;
+ y /= xw.ch;
+
+ return LIMIT(y, 0, term.row-1);
+}
+
static inline bool
selected(int x, int y) {
int bx, ex;
static inline bool
selected(int x, int y) {
int bx, ex;
@@
-603,8
+617,9
@@
getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
if(b)
*b = e->xbutton.button;
if(b)
*b = e->xbutton.button;
- *x = X2COL(e->xbutton.x);
- *y = Y2ROW(e->xbutton.y);
+ *x = x2col(e->xbutton.x);
+ *y = y2row(e->xbutton.y);
+
sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
sel.b.y = MIN(sel.by, sel.ey);
sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
sel.b.y = MIN(sel.by, sel.ey);
sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
@@
-613,8
+628,8
@@
getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
void
mousereport(XEvent *e) {
void
mousereport(XEvent *e) {
- int x =
X2COL
(e->xbutton.x);
- int y =
Y2ROW
(e->xbutton.y);
+ int x =
x2col
(e->xbutton.x);
+ int y =
y2row
(e->xbutton.y);
int button = e->xbutton.button;
int state = e->xbutton.state;
char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
int button = e->xbutton.button;
int state = e->xbutton.state;
char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
@@
-656,8
+671,12
@@
bpress(XEvent *e) {
draw();
}
sel.mode = 1;
draw();
}
sel.mode = 1;
- sel.ex = sel.bx = X2COL(e->xbutton.x);
- sel.ey = sel.by = Y2ROW(e->xbutton.y);
+ sel.ex = sel.bx = x2col(e->xbutton.x);
+ sel.ey = sel.by = y2row(e->xbutton.y);
+ } else if(e->xbutton.button == Button4) {
+ ttywrite("\031", 1);
+ } else if(e->xbutton.button == Button5) {
+ ttywrite("\005", 1);
}
}
}
}
@@
-1445,8
+1464,8
@@
tsetmode(bool priv, bool set, int *args, int narg) {
case 0: /* Error (IGNORED) */
case 12: /* att610 -- Start blinking cursor (IGNORED) */
break;
case 0: /* Error (IGNORED) */
case 12: /* att610 -- Start blinking cursor (IGNORED) */
break;
- case 25:
- MODBIT(term.
c.state, !set, CURSOR
_HIDE);
+ case 25:
/* DECTCEM -- Text Cursor Enable Mode */
+ MODBIT(term.
mode, !set, MODE
_HIDE);
break;
case 1000: /* 1000,1002: enable xterm mouse report */
MODBIT(term.mode, set, MODE_MOUSEBTN);
break;
case 1000: /* 1000,1002: enable xterm mouse report */
MODBIT(term.mode, set, MODE_MOUSEBTN);
@@
-1819,8
+1838,8
@@
tputc(char *c, int len) {
}
}
/*
}
}
/*
- * 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
anything else
+ * because it can use some control codes as part of the sequence
.
*/
if(term.esc & ESC_STR) {
switch(ascii) {
*/
if(term.esc & ESC_STR) {
switch(ascii) {
@@
-1840,6
+1859,7
@@
tputc(char *c, int len) {
}
return;
}
}
return;
}
+
/*
* Actions of control codes must be performed as soon they arrive
* because they can be embedded inside a control sequence, and
/*
* Actions of control codes must be performed as soon they arrive
* because they can be embedded inside a control sequence, and
@@
-1880,11
+1900,11
@@
tputc(char *c, int len) {
case '\030': /* CAN */
csireset();
return;
case '\030': /* CAN */
csireset();
return;
-
case '\005':
/* ENQ (IGNORED) */
-
case '\000':
/* NUL (IGNORED) */
-
case '\021':
/* XON (IGNORED) */
-
case '\023':
/* XOFF (IGNORED) */
-
case 0177:
/* DEL (IGNORED) */
+
case '\005':
/* ENQ (IGNORED) */
+
case '\000':
/* NUL (IGNORED) */
+
case '\021':
/* XON (IGNORED) */
+
case '\023':
/* XOFF (IGNORED) */
+
case 0177:
/* DEL (IGNORED) */
return;
}
} else if(term.esc & ESC_START) {
return;
}
} else if(term.esc & ESC_START) {
@@
-2383,9
+2403,6
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
*temp, revfg, revbg;
XRenderColor colfg, colbg;
*temp, revfg, revbg;
XRenderColor colfg, colbg;
- if(base.mode & ATTR_REVERSE)
- temp = fg, fg = bg, bg = temp;
-
if(base.mode & ATTR_BOLD) {
if(BETWEEN(base.fg, 0, 7)) {
/* basic system colors */
if(base.mode & ATTR_BOLD) {
if(BETWEEN(base.fg, 0, 7)) {
/* basic system colors */
@@
-2408,7
+2425,7
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
if(base.mode & ATTR_ITALIC)
font = &dc.ifont;
if(base.mode & ATTR_ITALIC)
font = &dc.ifont;
- if(
base.mode & (ATTR_ITALIC|
ATTR_BOLD))
+ if(
(base.mode & ATTR_ITALIC) && (base.mode &
ATTR_BOLD))
font = &dc.ibfont;
if(IS_SET(MODE_REVERSE)) {
font = &dc.ibfont;
if(IS_SET(MODE_REVERSE)) {
@@
-2435,6
+2452,9
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
}
}
}
}
+ if(base.mode & ATTR_REVERSE)
+ temp = fg, fg = bg, bg = temp;
+
XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
&extents);
width = extents.xOff;
XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
&extents);
width = extents.xOff;
@@
-2485,7
+2505,7
@@
xdrawcursor(void) {
}
/* draw the new one */
}
/* draw the new one */
- if(!(
term.c.state & CURSOR_HIDE
)) {
+ if(!(
IS_SET(MODE_HIDE)
)) {
if(!(xw.state & WIN_FOCUSED))
g.bg = defaultucs;
if(!(xw.state & WIN_FOCUSED))
g.bg = defaultucs;
@@
-2679,6
+2699,9
@@
kpress(XEvent *ev) {
selpaste();
break;
case XK_Return:
selpaste();
break;
case XK_Return:
+ if(meta)
+ ttywrite("\033", 1);
+
if(IS_SET(MODE_CRLF)) {
ttywrite("\r\n", 2);
} else {
if(IS_SET(MODE_CRLF)) {
ttywrite("\r\n", 2);
} else {
@@
-2727,8
+2750,6
@@
cresize(int width, int height)
col = (xw.w - 2*borderpx) / xw.cw;
row = (xw.h - 2*borderpx) / xw.ch;
col = (xw.w - 2*borderpx) / xw.cw;
row = (xw.h - 2*borderpx) / xw.ch;
- if(col == term.col && row == term.row)
- return;
tresize(col, row);
xresize(col, row);
tresize(col, row);
xresize(col, row);