[hackers] [st] Cleaning up lonely tabs. || Christoph Lohmann

From: <hg_AT_suckless.org>
Date: Sun, 2 Sep 2012 19:55:58 +0200 (CEST)

changeset: 260:dfa441b174d3
user: Christoph Lohmann <20h_AT_r-36.net>
date: Sun Sep 02 19:43:29 2012 +0200
files: st.c
description:
Cleaning up lonely tabs.


diff -r 9b5795712f55 -r dfa441b174d3 st.c
--- a/st.c Sun Sep 02 19:42:00 2012 +0200
+++ b/st.c Sun Sep 02 19:43:29 2012 +0200
_AT_@ -504,7 +504,7 @@
         int state = e->xbutton.state;
         char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
         static int ob, ox, oy;
-
+
         /* from urxvt */
         if(e->xbutton.type == MotionNotify) {
                 if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
_AT_@ -522,11 +522,11 @@
                         ox = x, oy = y;
                 }
         }
-
+
         buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
                 + (state & Mod4Mask ? 8 : 0)
                 + (state & ControlMask ? 16 : 0);
-
+
         ttywrite(buf, sizeof(buf));
 }
 
_AT_@ -751,7 +751,7 @@
 void
 ttynew(void) {
         int m, s;
-
+
         /* seems to work fine on linux, openbsd and freebsd */
         struct winsize w = {term.row, term.col, 0, 0};
         if(openpty(&m, &s, NULL, NULL, &w) < 0)
_AT_@ -910,11 +910,11 @@
 tscrolldown(int orig, int n) {
         int i;
         Line temp;
-
+
         LIMIT(n, 0, term.bot-orig+1);
 
         tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-
+
         for(i = term.bot; i >= orig+n; i--) {
                 temp = term.line[i];
                 term.line[i] = term.line[i-n];
_AT_@ -932,9 +932,9 @@
         int i;
         Line temp;
         LIMIT(n, 0, term.bot-orig+1);
-
+
         tclearregion(0, orig, term.col-1, orig+n-1);
-
+
         for(i = orig; i <= term.bot-n; i++) {
                  temp = term.line[i];
                  term.line[i] = term.line[i+n];
_AT_@ -951,7 +951,7 @@
 selscroll(int orig, int n) {
         if(sel.bx == -1)
                 return;
-
+
         if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
                 if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
                         sel.bx = -1;
_AT_@ -988,7 +988,7 @@
         csiescseq.narg = 0;
         if(*p == '?')
                 csiescseq.priv = 1, p++;
-
+
         while(p < csiescseq.buf+csiescseq.len) {
                 while(isdigit(*p)) {
                         csiescseq.arg[csiescseq.narg] *= 10;
_AT_@ -1047,7 +1047,7 @@
         int src = term.c.x + n;
         int dst = term.c.x;
         int size = term.col - src;
-
+
         term.dirty[term.c.y] = 1;
 
         if(src >= term.col) {
_AT_@ -1765,7 +1765,7 @@
                 } else
                         dc.col[i] = color.pixel;
         }
-
+
         /* load colors [16-255] ; same colors as xterm */
         for(i = 16, r = 0; r < 6; r++)
                 for(g = 0; g < 6; g++)
_AT_@ -1868,7 +1868,7 @@
         if(!(xw.dpy = XOpenDisplay(NULL)))
                 die("Can't open display\n");
         xw.scr = XDefaultScreen(xw.dpy);
-
+
         /* font */
         initfonts(FONT, BOLDFONT);
 
_AT_@ -1910,7 +1910,7 @@
                                            XNFocusWindow, xw.win, NULL);
         /* gc */
         dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
-
+
         /* white cursor, black outline */
         cursor = XCreateFontCursor(xw.dpy, XC_xterm);
         XDefineCursor(xw.dpy, xw.win, cursor);
_AT_@ -1932,7 +1932,7 @@
         int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
         XFontSet fontset = dc.font.set;
         int i;
-
+
         /* only switch default fg/bg if term is in RV mode */
         if(IS_SET(MODE_REVERSE)) {
                 if(fg == DefaultFG)
_AT_@ -1963,7 +1963,7 @@
         }
 
         XmbDrawImageString(xw.dpy, xw.buf, fontset, dc.gc, winx, winy, s, bytelen);
-
+
         if(base.mode & ATTR_UNDERLINE)
                 XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
_AT_@ -1982,10 +1982,10 @@
         static int oldy = 0;
         int sl;
         Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
-
+
         LIMIT(oldx, 0, term.col-1);
         LIMIT(oldy, 0, term.row-1);
-
+
         if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
                 memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
_AT_@ -2132,7 +2132,7 @@
         meta = e->state & Mod1Mask;
         shift = e->state & ShiftMask;
         len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
-
+
         /* 1. custom keys from config.h */
         if((customkey = kmap(ksym, e->state)))
                 ttywrite(customkey, strlen(customkey));
_AT_@ -2186,10 +2186,10 @@
 void
 resize(XEvent *e) {
         int col, row;
-
+
         if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
                 return;
-
+
         xw.w = e->xconfigure.width;
         xw.h = e->xconfigure.height;
         col = (xw.w - 2*BORDER) / xw.cw;
_AT_@ -2216,7 +2216,7 @@
         int xfd = XConnectionNumber(xw.dpy);
         struct timeval timeout = {0};
         bool stuff_to_print = 0;
-
+
         for(;;) {
                 FD_ZERO(&rfd);
                 FD_SET(cmdfd, &rfd);
_AT_@ -2251,7 +2251,7 @@
 int
 main(int argc, char *argv[]) {
         int i;
-
+
         for(i = 1; i < argc; i++) {
                 switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
                 case 't':
Received on Sun Sep 02 2012 - 19:55:58 CEST