X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/16ccf344deccbae53865b6efbe9dc23ebdceccb7..172f65436ce14a52842d67b862fdc45f8ff3ada3:/st.c?ds=inline
diff --git a/st.c b/st.c
index 932253c..671b386 100644
--- a/st.c
+++ b/st.c
@@ -59,13 +59,12 @@
#define STR_ARG_SIZ 16
#define DRAW_BUF_SIZ 20*1024
#define UTF_SIZ 4
-#define XK_NO_MOD UINT_MAX
-#define XK_ANY_MOD 0
+#define XK_ANY_MOD UINT_MAX
+#define XK_NO_MOD 0
#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
/* macros */
-#define CLEANMASK(mask) (mask & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define SERRNO strerror(errno)
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) < (b) ? (b) : (a))
@@ -90,10 +89,6 @@ enum glyph_attribute {
};
enum cursor_movement {
- CURSOR_UP,
- CURSOR_DOWN,
- CURSOR_LEFT,
- CURSOR_RIGHT,
CURSOR_SAVE,
CURSOR_LOAD
};
@@ -199,6 +194,7 @@ typedef struct {
int bot; /* bottom scroll limit */
int mode; /* terminal mode flags */
int esc; /* escape state flags */
+ bool numlock; /* lock numbers in keyboard */
bool *tabs;
} Term;
@@ -266,6 +262,7 @@ typedef struct {
/* function definitions used in config.h */
static void xzoom(const Arg *);
static void selpaste(const Arg *);
+static void numlock(const Arg *);
/* Config.h for applying patches and the configuration. */
#include "config.h"
@@ -329,6 +326,7 @@ static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
static void techo(char *, int);
+static inline bool match(uint, uint);
static void ttynew(void);
static void ttyread(void);
static void ttyresize(void);
@@ -625,12 +623,9 @@ selected(int x, int y) {
}
void
-getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
- if(b)
- *b = e->xbutton.button;
-
- *x = x2col(e->xbutton.x);
- *y = y2row(e->xbutton.y);
+getbuttoninfo(XEvent *e) {
+ sel.ex = x2col(e->xbutton.x);
+ sel.ey = y2row(e->xbutton.y);
sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
sel.b.y = MIN(sel.by, sel.ey);
@@ -828,7 +823,7 @@ brelease(XEvent *e) {
selpaste(NULL);
} else if(e->xbutton.button == Button1) {
sel.mode = 0;
- getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+ getbuttoninfo(e);
term.dirty[sel.ey] = 1;
if(sel.bx == sel.ex && sel.by == sel.ey) {
sel.bx = -1;
@@ -877,7 +872,7 @@ bmotion(XEvent *e) {
if(sel.mode) {
oldey = sel.ey;
oldex = sel.ex;
- getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+ getbuttoninfo(e);
if(oldey != sel.ey || oldex != sel.ex) {
starty = MIN(oldey, sel.ey);
@@ -1107,6 +1102,7 @@ tnew(int col, int row) {
term.alt [row] = xmalloc(term.col * sizeof(Glyph));
term.dirty[row] = 0;
}
+ term.numlock = 1;
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
/* setup screen */
treset();
@@ -2086,7 +2082,7 @@ tputc(char *c, int len) {
}
}
/*
- * All characters which forms part of a sequence are not
+ * All characters which form part of a sequence are not
* printed
*/
return;
@@ -2100,11 +2096,19 @@ 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 */
+
+ if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
+ memmove(&term.line[term.c.y][term.c.x+1],
+ &term.line[term.c.y][term.c.x],
+ (term.col - term.c.x - 1) * sizeof(Glyph));
+ }
+
tsetchar(c, &term.c.attr, term.c.x, term.c.y);
- if(term.c.x+1 < term.col)
+ if(term.c.x+1 < term.col) {
tmoveto(term.c.x+1, term.c.y);
- else
+ } else {
term.c.state |= CURSOR_WRAPNEXT;
+ }
}
int
@@ -2181,8 +2185,8 @@ tresize(int col, int row) {
void
xresize(int col, int row) {
- xw.tw = MAX(1, 2*borderpx + col * xw.cw);
- xw.th = MAX(1, 2*borderpx + row * xw.ch);
+ xw.tw = MAX(1, col * xw.cw);
+ xw.th = MAX(1, row * xw.ch);
XftDrawChange(xw.draw, xw.buf);
}
@@ -2258,8 +2262,8 @@ xhints(void) {
sizeh->width = xw.w;
sizeh->height_inc = xw.ch;
sizeh->width_inc = xw.cw;
- sizeh->base_height = 2*borderpx;
- sizeh->base_width = 2*borderpx;
+ sizeh->base_height = 2 * borderpx;
+ sizeh->base_width = 2 * borderpx;
} else {
sizeh->flags = PMaxSize | PMinSize;
sizeh->min_width = sizeh->max_width = xw.fw;
@@ -2392,8 +2396,8 @@ xinit(void) {
xw.w = xw.fw;
} else {
/* window - default size */
- xw.h = 2*borderpx + term.row * xw.ch;
- xw.w = 2*borderpx + term.col * xw.cw;
+ xw.h = 2 * borderpx + term.row * xw.ch;
+ xw.w = 2 * borderpx + term.col * xw.cw;
xw.fx = 0;
xw.fy = 0;
}
@@ -2688,25 +2692,54 @@ focus(XEvent *ev) {
}
}
+inline bool
+match(uint mask, uint state) {
+ if(mask == XK_NO_MOD && state)
+ return false;
+ if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
+ return false;
+ if((state & mask) != state)
+ return false;
+ return true;
+}
+
+void
+numlock(const Arg *dummy)
+{
+ term.numlock ^= 1;
+}
+
char*
kmap(KeySym k, uint state) {
uint mask;
Key *kp;
+ int i;
+
+ /* Check for mapped keys out of X11 function keys. */
+ for(i = 0; i < LEN(mappedkeys); i++) {
+ if(mappedkeys[i] == k)
+ break;
+ }
+ if(i == LEN(mappedkeys)) {
+ if((k & 0xFFFF) < 0xFF00)
+ return NULL;
+ }
- state &= ~Mod2Mask;
for(kp = key; kp < key + LEN(key); kp++) {
mask = kp->mask;
if(kp->k != k)
continue;
- if((state & mask) != mask &&
- (mask == XK_NO_MOD && state)) {
+ if(!match(mask, state))
continue;
- }
- if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
- (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {
+ if(kp->appkey > 0) {
+ if(!IS_SET(MODE_APPKEYPAD))
+ continue;
+ if(term.numlock && kp->appkey == 2)
+ continue;
+ } else if (kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
continue;
}
@@ -2731,21 +2764,20 @@ kpress(XEvent *ev) {
XKeyEvent *e = &ev->xkey;
KeySym ksym;
char xstr[31], buf[32], *customkey, *cp = buf;
- int len, i;
+ int len;
Status status;
+ Shortcut *bp;
if (IS_SET(MODE_KBDLOCK))
return;
len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
-
+ e->state &= ~Mod2Mask;
/* 1. shortcuts */
- for(i = 0; i < LEN(shortcuts); i++) {
- if((ksym == shortcuts[i].keysym)
- && (CLEANMASK(shortcuts[i].mod) == \
- CLEANMASK(e->state))
- && shortcuts[i].func) {
- shortcuts[i].func(&(shortcuts[i].arg));
+ for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
+ if(ksym == bp->keysym && match(bp->mod, e->state)) {
+ bp->func(&(bp->arg));
+ return;
}
}
@@ -2799,8 +2831,8 @@ cresize(int width, int height)
if(height != 0)
xw.h = 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;
tresize(col, row);
xresize(col, row);