X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=42061b9809a3e4221fb6ac9564cf35057e6d4d60;hb=2696f8187509eb94644bbac5b05348e37c391bea;hp=dbbc1f69b66596683d4bf19d5f88e4c5d777b006;hpb=7474a2fc3785eb1aad00f8cf2b50711bbe1fff0b;p=st.git diff --git a/st.c b/st.c index dbbc1f6..42061b9 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)) @@ -74,7 +73,7 @@ #define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) -#define IS_SET(flag) (term.mode & (flag)) +#define IS_SET(flag) ((term.mode & (flag)) != 0) #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) #define VT102ID "\033[?6c" @@ -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,11 @@ selected(int x, int y) { } void -getbuttoninfo(XEvent *e, int *b, int *x, int *y) { - if(b) - *b = e->xbutton.button; +getbuttoninfo(XEvent *e) { + sel.alt = IS_SET(MODE_ALTSCREEN); - *x = x2col(e->xbutton.x); - *y = y2row(e->xbutton.y); + 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); @@ -727,7 +724,6 @@ selcopy(void) { } *ptr = 0; } - sel.alt = IS_SET(MODE_ALTSCREEN); xsetsel(str); } @@ -828,7 +824,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; @@ -874,16 +870,17 @@ bmotion(XEvent *e) { return; } - if(sel.mode) { - oldey = sel.ey; - oldex = sel.ex; - getbuttoninfo(e, NULL, &sel.ex, &sel.ey); + if(!sel.mode) + return; - if(oldey != sel.ey || oldex != sel.ex) { - starty = MIN(oldey, sel.ey); - endy = MAX(oldey, sel.ey); - tsetdirt(starty, endy); - } + oldey = sel.ey; + oldex = sel.ex; + getbuttoninfo(e); + + if(oldey != sel.ey || oldex != sel.ex) { + starty = MIN(oldey, sel.ey); + endy = MAX(oldey, sel.ey); + tsetdirt(starty, endy); } } @@ -1107,6 +1104,8 @@ 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(); @@ -1513,7 +1512,7 @@ tsetmode(bool priv, bool set, int *args, int narg) { case 1049: /* = 1047 and 1048 */ case 47: case 1047: { - alt = IS_SET(MODE_ALTSCREEN) != 0; + alt = IS_SET(MODE_ALTSCREEN); if(alt) tclearregion(0, 0, term.col-1, term.row-1); if(set ^ alt) /* set is always 1 or 0 */ @@ -2086,7 +2085,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 +2099,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 +2188,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 +2265,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 +2399,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; } @@ -2598,10 +2605,11 @@ drawregion(int x1, int y1, int x2, int y2) { int ic, ib, x, y, ox, sl; Glyph base, new; char buf[DRAW_BUF_SIZ]; - bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN) != 0; + bool ena_sel = sel.bx != -1; - if((sel.alt != 0) ^ alt) + if(sel.alt ^ IS_SET(MODE_ALTSCREEN)) ena_sel = 0; + if(!(xw.state & WIN_VISIBLE)) return; @@ -2688,29 +2696,62 @@ 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; } + if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) || - (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) { + (kp->appcursor > 0 + && !IS_SET(MODE_APPCURSOR))) { continue; } + if((kp->crlf < 0 && IS_SET(MODE_CRLF)) || (kp->crlf > 0 && !IS_SET(MODE_CRLF))) { continue; @@ -2718,6 +2759,7 @@ kmap(KeySym k, uint state) { return kp->s; } + return NULL; } @@ -2726,21 +2768,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; } } @@ -2794,8 +2835,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);