X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=st.c;h=22a1ce6754a4269449b5269a08f2626e9d04efb7;hb=88429cdcbf937c4042cc315b31fcb8c662bd51fb;hp=2b4d52cf09bdaf81c5c3803daf579f879387122a;hpb=dc8c5c82aa14e75305bd5b0e42b4f8bba45702a8;p=st.git diff --git a/st.c b/st.c index 2b4d52c..22a1ce6 100644 --- a/st.c +++ b/st.c @@ -2431,11 +2431,9 @@ tcontrolcode(uchar ascii) { term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST); term.esc |= ESC_START; return; - case '\016': /* SO */ - term.charset = 0; - return; - case '\017': /* SI */ - term.charset = 1; + case '\016': /* SO (LS1 -- Locking shift 1) */ + case '\017': /* SI (LS0 -- Locking shift 0) */ + term.charset = 1 - (ascii - '\016'); return; case '\032': /* SUB */ tsetchar(question, &term.c.attr, term.c.x, term.c.y); @@ -2499,6 +2497,10 @@ eschandle(uchar ascii) { case 'k': /* old title set compatibility */ tstrsequence(ascii); return 0; + case 'n': /* LS2 -- Locking shift 2 */ + case 'o': /* LS3 -- Locking shift 3 */ + term.charset = 2 + (ascii - 'n'); + break; case '(': /* GZD4 -- set primary charset G0 */ case ')': /* G1D4 -- set secondary charset G1 */ case '*': /* G2D4 -- set tertiary charset G2 */ @@ -3064,10 +3066,10 @@ xunloadfonts(void) { xunloadfont(&dc.ibfont); } - void xzoom(const Arg *arg) { Arg larg; + larg.i = usedfontsize + arg->i; xzoomabs(&larg); } @@ -3084,6 +3086,7 @@ xzoomabs(const Arg *arg) { void xzoomreset(const Arg *arg) { Arg larg; + if(defaultfontsize > 0) { larg.i = defaultfontsize; xzoomabs(&larg);