Skip to content

Instantly share code, notes, and snippets.

@jessfraz

jessfraz/solarized.patch

Created May 5, 2015 18:15
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jessfraz/ab9b03cbaa16cc908da2 to your computer and use it in GitHub Desktop.
Save jessfraz/ab9b03cbaa16cc908da2 to your computer and use it in GitHub Desktop.
Download ZIP
for st
Raw
solarized.patch
From ce5325a1a73e6117013de84b57588a4dd4f21734 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <princess@docker.com>
Date: Tue, 5 May 2015 11:14:04 -0700
Subject: [PATCH] solarized
---
config.def.h | 47 +-
st.c | 2415 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 1225 insertions(+), 1237 deletions(-)
diff --git a/config.def.h b/config.def.h
index bb5596e..37f128a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -61,30 +61,23 @@ static unsigned int tabspaces = 8;
/* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = {
- /* 8 normal colors */
- "black",
- "red3",
- "green3",
- "yellow3",
- "blue2",
- "magenta3",
- "cyan3",
- "gray90",
-
- /* 8 bright colors */
- "gray50",
- "red",
- "green",
- "yellow",
- "#5c5cff",
- "magenta",
- "cyan",
- "white",
-
- [255] = 0,
-
- /* more colors can be added after 255 to use with DefaultXX */
- "#cccccc",
+ /* solarized dark */
+ "#073642", /* 0: black */
+ "#dc322f", /* 1: red */
+ "#859900", /* 2: green */
+ "#b58900", /* 3: yellow */
+ "#268bd2", /* 4: blue */
+ "#d33682", /* 5: magenta */
+ "#2aa198", /* 6: cyan */
+ "#eee8d5", /* 7: white */
+ "#002b36", /* 8: brblack */
+ "#cb4b16", /* 9: brred */
+ "#586e75", /* 10: brgreen */
+ "#657b83", /* 11: bryellow */
+ "#839496", /* 12: brblue */
+ "#6c71c4", /* 13: brmagenta*/
+ "#93a1a1", /* 14: brcyan */
+ "#fdf6e3", /* 15: brwhite */
};
@@ -92,9 +85,9 @@ static const char *colorname[] = {
* Default colors (colorname index)
* foreground, background, cursor
*/
-static unsigned int defaultfg = 7;
-static unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
+static unsigned int defaultfg = 12;
+static unsigned int defaultbg = 8;
+static unsigned int defaultcs = 14;
/*
* Colors used, when the specific fg == defaultfg. So in reverse mode this
diff --git a/st.c b/st.c
index 3eb66fa..a0e8607 100644
--- a/st.c
+++ b/st.c
@@ -39,14 +39,13 @@ char *argv0;
#define Font Font_
#if defined(__linux)
- #include <pty.h>
+#include <pty.h>
#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
- #include <util.h>
+#include <util.h>
#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include <libutil.h>
+#include <libutil.h>
#endif
-
/* XEMBED messages */
#define XEMBED_FOCUS_IN 4
#define XEMBED_FOCUS_OUT 5
@@ -85,20 +84,19 @@ char *argv0;
#define TRUEGREEN(x) (((x) & 0xff00))
#define TRUEBLUE(x) (((x) & 0xff) << 8)
-
enum glyph_attribute {
- ATTR_NULL = 0,
- ATTR_BOLD = 1 << 0,
- ATTR_FAINT = 1 << 1,
- ATTR_ITALIC = 1 << 2,
+ ATTR_NULL = 0,
+ ATTR_BOLD = 1 << 0,
+ ATTR_FAINT = 1 << 1,
+ ATTR_ITALIC = 1 << 2,
ATTR_UNDERLINE = 1 << 3,
- ATTR_BLINK = 1 << 4,
- ATTR_REVERSE = 1 << 5,
+ ATTR_BLINK = 1 << 4,
+ ATTR_REVERSE = 1 << 5,
ATTR_INVISIBLE = 1 << 6,
- ATTR_STRUCK = 1 << 7,
- ATTR_WRAP = 1 << 8,
- ATTR_WIDE = 1 << 9,
- ATTR_WDUMMY = 1 << 10,
+ ATTR_STRUCK = 1 << 7,
+ ATTR_WRAP = 1 << 8,
+ ATTR_WIDE = 1 << 9,
+ ATTR_WDUMMY = 1 << 10,
};
enum cursor_movement {
@@ -107,35 +105,35 @@ enum cursor_movement {
};
enum cursor_state {
- CURSOR_DEFAULT = 0,
+ CURSOR_DEFAULT = 0,
CURSOR_WRAPNEXT = 1,
- CURSOR_ORIGIN = 2
+ CURSOR_ORIGIN = 2
};
enum term_mode {
- MODE_WRAP = 1 << 0,
- MODE_INSERT = 1 << 1,
- MODE_APPKEYPAD = 1 << 2,
- MODE_ALTSCREEN = 1 << 3,
- MODE_CRLF = 1 << 4,
- MODE_MOUSEBTN = 1 << 5,
+ MODE_WRAP = 1 << 0,
+ MODE_INSERT = 1 << 1,
+ MODE_APPKEYPAD = 1 << 2,
+ MODE_ALTSCREEN = 1 << 3,
+ MODE_CRLF = 1 << 4,
+ MODE_MOUSEBTN = 1 << 5,
MODE_MOUSEMOTION = 1 << 6,
- MODE_REVERSE = 1 << 7,
- MODE_KBDLOCK = 1 << 8,
- MODE_HIDE = 1 << 9,
- MODE_ECHO = 1 << 10,
- MODE_APPCURSOR = 1 << 11,
- MODE_MOUSESGR = 1 << 12,
- MODE_8BIT = 1 << 13,
- MODE_BLINK = 1 << 14,
- MODE_FBLINK = 1 << 15,
- MODE_FOCUS = 1 << 16,
- MODE_MOUSEX10 = 1 << 17,
- MODE_MOUSEMANY = 1 << 18,
- MODE_BRCKTPASTE = 1 << 19,
- MODE_PRINT = 1 << 20,
- MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
- |MODE_MOUSEMANY,
+ MODE_REVERSE = 1 << 7,
+ MODE_KBDLOCK = 1 << 8,
+ MODE_HIDE = 1 << 9,
+ MODE_ECHO = 1 << 10,
+ MODE_APPCURSOR = 1 << 11,
+ MODE_MOUSESGR = 1 << 12,
+ MODE_8BIT = 1 << 13,
+ MODE_BLINK = 1 << 14,
+ MODE_FBLINK = 1 << 15,
+ MODE_FOCUS = 1 << 16,
+ MODE_MOUSEX10 = 1 << 17,
+ MODE_MOUSEMANY = 1 << 18,
+ MODE_BRCKTPASTE = 1 << 19,
+ MODE_PRINT = 1 << 20,
+ MODE_MOUSE = MODE_MOUSEBTN | MODE_MOUSEMOTION | MODE_MOUSEX10
+ | MODE_MOUSEMANY,
};
enum charset {
@@ -149,12 +147,12 @@ enum charset {
};
enum escape_state {
- ESC_START = 1,
- ESC_CSI = 2,
- ESC_STR = 4, /* DCS, OSC, PM, APC */
+ ESC_START = 1,
+ ESC_CSI = 2,
+ ESC_STR = 4, /* DCS, OSC, PM, APC */
ESC_ALTCHARSET = 8,
- ESC_STR_END = 16, /* a final string was encountered */
- ESC_TEST = 32, /* Enter in test mode */
+ ESC_STR_END = 16, /* a final string was encountered */
+ ESC_TEST = 32, /* Enter in test mode */
};
enum window_state {
@@ -187,16 +185,16 @@ typedef XftDraw *Draw;
typedef XftColor Color;
typedef struct {
- long u; /* character code */
- ushort mode; /* attribute flags */
- ushort fg; /* foreground */
- ushort bg; /* background */
+ long u; /* character code */
+ ushort mode; /* attribute flags */
+ ushort fg; /* foreground */
+ ushort bg; /* background */
} Glyph;
typedef Glyph *Line;
typedef struct {
- Glyph attr; /* current char attributes */
+ Glyph attr; /* current char attributes */
int x;
int y;
char state;
@@ -205,40 +203,40 @@ typedef struct {
/* CSI Escape sequence structs */
/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
typedef struct {
- char buf[ESC_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
+ char buf[ESC_BUF_SIZ]; /* raw string */
+ int len; /* raw string length */
char priv;
int arg[ESC_ARG_SIZ];
- int narg; /* nb of args */
+ int narg; /* nb of args */
char mode[2];
} CSIEscape;
/* STR Escape sequence structs */
/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
typedef struct {
- char type; /* ESC type ... */
- char buf[STR_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
+ char type; /* ESC type ... */
+ char buf[STR_BUF_SIZ]; /* raw string */
+ int len; /* raw string length */
char *args[STR_ARG_SIZ];
- int narg; /* nb of args */
+ int narg; /* nb of args */
} STREscape;
/* Internal representation of the screen */
typedef struct {
- int row; /* nb row */
- int col; /* nb col */
- Line *line; /* screen */
- Line *alt; /* alternate screen */
- bool *dirty; /* dirtyness of lines */
- TCursor c; /* cursor */
- int top; /* top scroll limit */
- int bot; /* bottom scroll limit */
- int mode; /* terminal mode flags */
- int esc; /* escape state flags */
- char trantbl[4]; /* charset table translation */
- int charset; /* current charset */
- int icharset; /* selected charset for sequence */
- bool numlock; /* lock numbers in keyboard */
+ int row; /* nb row */
+ int col; /* nb col */
+ Line *line; /* screen */
+ Line *alt; /* alternate screen */
+ bool *dirty; /* dirtyness of lines */
+ TCursor c; /* cursor */
+ int top; /* top scroll limit */
+ int bot; /* bottom scroll limit */
+ int mode; /* terminal mode flags */
+ int esc; /* escape state flags */
+ char trantbl[4]; /* charset table translation */
+ int charset; /* current charset */
+ int icharset; /* selected charset for sequence */
+ bool numlock; /* lock numbers in keyboard */
bool *tabs;
} Term;
@@ -255,15 +253,15 @@ typedef struct {
Visual *vis;
XSetWindowAttributes attrs;
int scr;
- bool isfixed; /* is fixed geometry? */
- int l, t; /* left and top offset */
- int gm; /* geometry mask */
- int tw, th; /* tty width and height */
- int w, h; /* window width and height */
- int ch; /* char height */
- int cw; /* char width */
- char state; /* focus, redraw, visible */
- int cursor; /* cursor style */
+ bool isfixed; /* is fixed geometry? */
+ int l, t; /* left and top offset */
+ int gm; /* geometry mask */
+ int tw, th; /* tty width and height */
+ int w, h; /* window width and height */
+ int ch; /* char height */
+ int cw; /* char width */
+ char state; /* focus, redraw, visible */
+ int cursor; /* cursor style */
} XWindow;
typedef struct {
@@ -277,9 +275,9 @@ typedef struct {
uint mask;
char *s;
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
- signed char appkey; /* application keypad */
- signed char appcursor; /* application cursor */
- signed char crlf; /* crlf mode */
+ signed char appkey; /* application keypad */
+ signed char appcursor; /* application cursor */
+ signed char crlf; /* crlf mode */
} Key;
typedef struct {
@@ -314,7 +312,7 @@ typedef union {
typedef struct {
uint mod;
KeySym keysym;
- void (*func)(const Arg *);
+ void (*func) (const Arg *);
const Arg arg;
} Shortcut;
@@ -327,7 +325,7 @@ static void xzoom(const Arg *);
static void xzoomabs(const Arg *);
static void xzoomreset(const Arg *);
static void printsel(const Arg *);
-static void printscreen(const Arg *) ;
+static void printscreen(const Arg *);
static void toggleprinter(const Arg *);
/* Config.h for applying patches and the configuration. */
@@ -403,8 +401,8 @@ static void tsetdirtattr(int);
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
static void techo(long);
-static void tcontrolcode(uchar );
-static void tdectest(char );
+static void tcontrolcode(uchar);
+static void tdectest(char);
static int32_t tdefcolor(int *, int *, int);
static void tdeftran(char);
static inline bool match(uint, uint);
@@ -478,26 +476,23 @@ static char *xstrdup(char *);
static void usage(void);
-static void (*handler[LASTEvent])(XEvent *) = {
+static void (*handler[LASTEvent]) (XEvent *) = {
[KeyPress] = kpress,
- [ClientMessage] = cmessage,
- [ConfigureNotify] = resize,
- [VisibilityNotify] = visibility,
- [UnmapNotify] = unmap,
- [Expose] = expose,
- [FocusIn] = focus,
- [FocusOut] = focus,
- [MotionNotify] = bmotion,
- [ButtonPress] = bpress,
- [ButtonRelease] = brelease,
+ [ClientMessage] = cmessage,
+ [ConfigureNotify] = resize,
+ [VisibilityNotify] = visibility,
+ [UnmapNotify] = unmap,
+ [Expose] = expose,
+ [FocusIn] = focus,
+ [FocusOut] = focus,
+ [MotionNotify] = bmotion,
+ [ButtonPress] = bpress,[ButtonRelease] = brelease,
/*
* Uncomment if you want the selection to disappear when you select something
* different in another window.
*/
/* [SelectionClear] = selclear, */
- [SelectionNotify] = selnotify,
- [SelectionRequest] = selrequest,
-};
+[SelectionNotify] = selnotify,[SelectionRequest] = selrequest,};
/* Globals */
static DC dc;
@@ -516,16 +511,16 @@ static char *opt_embed = NULL;
static char *opt_class = NULL;
static char *opt_font = NULL;
static char *opt_line = NULL;
-static int oldbutton = 3; /* button event on startup: 3 = release */
+static int oldbutton = 3; /* button event on startup: 3 = release */
static char *usedfont = NULL;
static double usedfontsize = 0;
static double defaultfontsize = 0;
-static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
-static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
-static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
+static uchar utfbyte[UTF_SIZ + 1] = { 0x80, 0, 0xC0, 0xE0, 0xF0 };
+static uchar utfmask[UTF_SIZ + 1] = { 0xC0, 0x80, 0xE0, 0xF0, 0xF8 };
+static long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000 };
+static long utfmax[UTF_SIZ + 1] = { 0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF };
/* Font Ring Cache */
enum {
@@ -545,13 +540,13 @@ typedef struct {
static Fontcache frc[16];
static int frclen = 0;
-ssize_t
-xwrite(int fd, const char *s, size_t len) {
+ssize_t xwrite(int fd, const char *s, size_t len)
+{
size_t aux = len;
- while(len > 0) {
+ while (len > 0) {
ssize_t r = write(fd, s, len);
- if(r < 0)
+ if (r < 0)
return r;
len -= r;
s += r;
@@ -559,71 +554,71 @@ xwrite(int fd, const char *s, size_t len) {
return aux;
}
-void *
-xmalloc(size_t len) {
+void *xmalloc(size_t len)
+{
void *p = malloc(len);
- if(!p)
+ if (!p)
die("Out of memory\n");
return p;
}
-void *
-xrealloc(void *p, size_t len) {
- if((p = realloc(p, len)) == NULL)
+void *xrealloc(void *p, size_t len)
+{
+ if ((p = realloc(p, len)) == NULL)
die("Out of memory\n");
return p;
}
-char *
-xstrdup(char *s) {
- if((s = strdup(s)) == NULL)
+char *xstrdup(char *s)
+{
+ if ((s = strdup(s)) == NULL)
die("Out of memory\n");
return s;
}
-size_t
-utf8decode(char *c, long *u, size_t clen) {
+size_t utf8decode(char *c, long *u, size_t clen)
+{
size_t i, j, len, type;
long udecoded;
*u = UTF_INVALID;
- if(!clen)
+ if (!clen)
return 0;
udecoded = utf8decodebyte(c[0], &len);
- if(!BETWEEN(len, 1, UTF_SIZ))
+ if (!BETWEEN(len, 1, UTF_SIZ))
return 1;
- for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+ for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
- if(type != 0)
+ if (type != 0)
return j;
}
- if(j < len)
+ if (j < len)
return 0;
*u = udecoded;
utf8validate(u, len);
return len;
}
-long
-utf8decodebyte(char c, size_t *i) {
- for(*i = 0; *i < LEN(utfmask); ++(*i))
- if(((uchar)c & utfmask[*i]) == utfbyte[*i])
- return (uchar)c & ~utfmask[*i];
+long utf8decodebyte(char c, size_t * i)
+{
+ for (*i = 0; *i < LEN(utfmask); ++(*i))
+ if (((uchar) c & utfmask[*i]) == utfbyte[*i])
+ return (uchar) c & ~utfmask[*i];
return 0;
}
-size_t
-utf8encode(long u, char *c) {
+size_t utf8encode(long u, char *c)
+{
size_t len, i;
len = utf8validate(&u, 0);
- if(len > UTF_SIZ)
+ if (len > UTF_SIZ)
return 0;
- for(i = len - 1; i != 0; --i) {
+ for (i = len - 1; i != 0; --i) {
c[i] = utf8encodebyte(u, 0);
u >>= 6;
}
@@ -631,22 +626,21 @@ utf8encode(long u, char *c) {
return len;
}
-char
-utf8encodebyte(long u, size_t i) {
+char utf8encodebyte(long u, size_t i)
+{
return utfbyte[i] | (u & ~utfmask[i]);
}
-size_t
-utf8validate(long *u, size_t i) {
- if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+size_t utf8validate(long *u, size_t i)
+{
+ if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
*u = UTF_INVALID;
- for(i = 1; *u > utfmax[i]; ++i)
- ;
+ for (i = 1; *u > utfmax[i]; ++i) ;
return i;
}
-void
-selinit(void) {
+void selinit(void)
+{
memset(&sel.tclick1, 0, sizeof(sel.tclick1));
memset(&sel.tclick2, 0, sizeof(sel.tclick2));
sel.mode = SEL_IDLE;
@@ -654,44 +648,44 @@ selinit(void) {
sel.primary = NULL;
sel.clipboard = NULL;
sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
- if(sel.xtarget == None)
+ if (sel.xtarget == None)
sel.xtarget = XA_STRING;
}
-int
-x2col(int x) {
+int x2col(int x)
+{
x -= borderpx;
x /= xw.cw;
- return LIMIT(x, 0, term.col-1);
+ return LIMIT(x, 0, term.col - 1);
}
-int
-y2row(int y) {
+int y2row(int y)
+{
y -= borderpx;
y /= xw.ch;
- return LIMIT(y, 0, term.row-1);
+ return LIMIT(y, 0, term.row - 1);
}
-int
-tlinelen(int y) {
+int tlinelen(int y)
+{
int i = term.col;
- if(term.line[y][i - 1].mode & ATTR_WRAP)
+ if (term.line[y][i - 1].mode & ATTR_WRAP)
return i;
- while(i > 0 && term.line[y][i - 1].u == ' ')
+ while (i > 0 && term.line[y][i - 1].u == ' ')
--i;
return i;
}
-void
-selnormalize(void) {
+void selnormalize(void)
+{
int i;
- if(sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
+ if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
} else {
@@ -714,12 +708,12 @@ selnormalize(void) {
sel.ne.x = term.col - 1;
}
-bool
-selected(int x, int y) {
- if(sel.mode == SEL_EMPTY)
+bool selected(int x, int y)
+{
+ if (sel.mode == SEL_EMPTY)
return false;
- if(sel.type == SEL_RECTANGULAR)
+ if (sel.type == SEL_RECTANGULAR)
return BETWEEN(y, sel.nb.y, sel.ne.y)
&& BETWEEN(x, sel.nb.x, sel.ne.x);
@@ -728,13 +722,13 @@ selected(int x, int y) {
&& (y != sel.ne.y || x <= sel.ne.x);
}
-void
-selsnap(int *x, int *y, int direction) {
+void selsnap(int *x, int *y, int direction)
+{
int newx, newy, xt, yt;
bool delim, prevdelim;
Glyph *gp, *prevgp;
- switch(sel.snap) {
+ switch (sel.snap) {
case SNAP_WORD:
/*
* Snap around if the word wraps around at the end or
@@ -742,20 +736,20 @@ selsnap(int *x, int *y, int direction) {
*/
prevgp = &term.line[*y][*x];
prevdelim = ISDELIM(prevgp->u);
- for(;;) {
+ for (;;) {
newx = *x + direction;
newy = *y;
- if(!BETWEEN(newx, 0, term.col - 1)) {
+ if (!BETWEEN(newx, 0, term.col - 1)) {
newy += direction;
newx = (newx + term.col) % term.col;
if (!BETWEEN(newy, 0, term.row - 1))
break;
- if(direction > 0)
+ if (direction > 0)
yt = *y, xt = *x;
else
yt = newy, xt = newx;
- if(!(term.line[yt][xt].mode & ATTR_WRAP))
+ if (!(term.line[yt][xt].mode & ATTR_WRAP))
break;
}
@@ -764,8 +758,10 @@ selsnap(int *x, int *y, int direction) {
gp = &term.line[newy][newx];
delim = ISDELIM(gp->u);
- if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
- || (delim && gp->u != prevgp->u)))
+ if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+ || (delim
+ && gp->u !=
+ prevgp->u)))
break;
*x = newx;
@@ -781,17 +777,17 @@ selsnap(int *x, int *y, int direction) {
* previous line will be selected.
*/
*x = (direction < 0) ? 0 : term.col - 1;
- if(direction < 0) {
- for(; *y > 0; *y += direction) {
- if(!(term.line[*y-1][term.col-1].mode
- & ATTR_WRAP)) {
+ if (direction < 0) {
+ for (; *y > 0; *y += direction) {
+ if (!(term.line[*y - 1][term.col - 1].mode
+ & ATTR_WRAP)) {
break;
}
}
- } else if(direction > 0) {
- for(; *y < term.row-1; *y += direction) {
- if(!(term.line[*y][term.col-1].mode
- & ATTR_WRAP)) {
+ } else if (direction > 0) {
+ for (; *y < term.row - 1; *y += direction) {
+ if (!(term.line[*y][term.col - 1].mode
+ & ATTR_WRAP)) {
break;
}
}
@@ -800,8 +796,8 @@ selsnap(int *x, int *y, int direction) {
}
}
-void
-getbuttoninfo(XEvent *e) {
+void getbuttoninfo(XEvent * e)
+{
int type;
uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
@@ -812,70 +808,69 @@ getbuttoninfo(XEvent *e) {
selnormalize();
sel.type = SEL_REGULAR;
- for(type = 1; type < LEN(selmasks); ++type) {
- if(match(selmasks[type], state)) {
+ for (type = 1; type < LEN(selmasks); ++type) {
+ if (match(selmasks[type], state)) {
sel.type = type;
break;
}
}
}
-void
-mousereport(XEvent *e) {
+void mousereport(XEvent * e)
+{
int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
- button = e->xbutton.button, state = e->xbutton.state,
- len;
+ button = e->xbutton.button, state = e->xbutton.state, len;
char buf[40];
static int ox, oy;
/* from urxvt */
- if(e->xbutton.type == MotionNotify) {
- if(x == ox && y == oy)
+ if (e->xbutton.type == MotionNotify) {
+ if (x == ox && y == oy)
return;
- if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
+ if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
return;
/* MOUSE_MOTION: no reporting if no button is pressed */
- if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
+ if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
return;
button = oldbutton + 32;
ox = x;
oy = y;
} else {
- if(!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
+ if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
button = 3;
} else {
button -= Button1;
- if(button >= 3)
+ if (button >= 3)
button += 64 - 3;
}
- if(e->xbutton.type == ButtonPress) {
+ if (e->xbutton.type == ButtonPress) {
oldbutton = button;
ox = x;
oy = y;
- } else if(e->xbutton.type == ButtonRelease) {
+ } else if (e->xbutton.type == ButtonRelease) {
oldbutton = 3;
/* MODE_MOUSEX10: no button release reporting */
- if(IS_SET(MODE_MOUSEX10))
+ if (IS_SET(MODE_MOUSEX10))
return;
if (button == 64 || button == 65)
return;
}
}
- if(!IS_SET(MODE_MOUSEX10)) {
- button += ((state & ShiftMask ) ? 4 : 0)
- + ((state & Mod4Mask ) ? 8 : 0)
- + ((state & ControlMask) ? 16 : 0);
+ if (!IS_SET(MODE_MOUSEX10)) {
+ button += ((state & ShiftMask) ? 4 : 0)
+ + ((state & Mod4Mask) ? 8 : 0)
+ + ((state & ControlMask) ? 16 : 0);
}
- if(IS_SET(MODE_MOUSESGR)) {
+ if (IS_SET(MODE_MOUSESGR)) {
len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
- button, x+1, y+1,
- e->xbutton.type == ButtonRelease ? 'm' : 'M');
- } else if(x < 223 && y < 223) {
+ button, x + 1, y + 1,
+ e->xbutton.type == ButtonRelease ? 'm' : 'M');
+ } else if (x < 223 && y < 223) {
len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
- 32+button, 32+x+1, 32+y+1);
+ 32 + button, 32 + x + 1, 32 + y + 1);
} else {
return;
}
@@ -883,25 +878,25 @@ mousereport(XEvent *e) {
ttywrite(buf, len);
}
-void
-bpress(XEvent *e) {
+void bpress(XEvent * e)
+{
struct timespec now;
Mousekey *mk;
- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
mousereport(e);
return;
}
- for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
- if(e->xbutton.button == mk->b
- && match(mk->mask, e->xbutton.state)) {
+ for (mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
+ if (e->xbutton.button == mk->b
+ && match(mk->mask, e->xbutton.state)) {
ttysend(mk->s, strlen(mk->s));
return;
}
}
- if(e->xbutton.button == Button1) {
+ if (e->xbutton.button == Button1) {
clock_gettime(CLOCK_MONOTONIC, &now);
/* Clear previous selection, logically and visually. */
@@ -915,16 +910,16 @@ bpress(XEvent *e) {
* If the user clicks below predefined timeouts specific
* snapping behaviour is exposed.
*/
- if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+ if (TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
sel.snap = SNAP_LINE;
- } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+ } else if (TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
sel.snap = SNAP_WORD;
} else {
sel.snap = 0;
}
selnormalize();
- if(sel.snap != 0)
+ if (sel.snap != 0)
sel.mode = SEL_READY;
tsetdirt(sel.nb.y, sel.ne.y);
sel.tclick2 = sel.tclick1;
@@ -932,35 +927,35 @@ bpress(XEvent *e) {
}
}
-char *
-getsel(void) {
+char *getsel(void)
+{
char *str, *ptr;
int y, bufsize, lastx, linelen;
Glyph *gp, *last;
- if(sel.ob.x == -1)
+ if (sel.ob.x == -1)
return NULL;
- bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
+ bufsize = (term.col + 1) * (sel.ne.y - sel.nb.y + 1) * UTF_SIZ;
ptr = str = xmalloc(bufsize);
/* append every set & selected glyph to the selection */
- for(y = sel.nb.y; y <= sel.ne.y; y++) {
+ for (y = sel.nb.y; y <= sel.ne.y; y++) {
linelen = tlinelen(y);
- if(sel.type == SEL_RECTANGULAR) {
+ if (sel.type == SEL_RECTANGULAR) {
gp = &term.line[y][sel.nb.x];
lastx = sel.ne.x;
} else {
gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
- lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
+ lastx = (sel.ne.y == y) ? sel.ne.x : term.col - 1;
}
- last = &term.line[y][MIN(lastx, linelen-1)];
- while(last >= gp && last->u == ' ')
+ last = &term.line[y][MIN(lastx, linelen - 1)];
+ while (last >= gp && last->u == ' ')
--last;
- for( ; gp <= last; ++gp) {
- if(gp->mode & ATTR_WDUMMY)
+ for (; gp <= last; ++gp) {
+ if (gp->mode & ATTR_WDUMMY)
continue;
ptr += utf8encode(gp->u, ptr);
@@ -975,20 +970,21 @@ getsel(void) {
* st.
* FIXME: Fix the computer world.
*/
- if((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
+ if ((y < sel.ne.y || lastx >= linelen)
+ && !(last->mode & ATTR_WRAP))
*ptr++ = '\n';
}
*ptr = 0;
return str;
}
-void
-selcopy(Time t) {
+void selcopy(Time t)
+{
xsetsel(getsel(), t);
}
-void
-selnotify(XEvent *e) {
+void selnotify(XEvent * e)
+{
ulong nitems, ofs, rem;
int format;
uchar *data, *last, *repl;
@@ -998,12 +994,11 @@ selnotify(XEvent *e) {
ofs = 0;
xsev = &e->xselection;
if (xsev->property == None)
- return;
+ return;
do {
- if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
- BUFSIZ/4, False, AnyPropertyType,
- &type, &format, &nitems, &rem,
- &data)) {
+ if (XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
+ BUFSIZ / 4, False, AnyPropertyType,
+ &type, &format, &nitems, &rem, &data)) {
fprintf(stderr, "Clipboard allocation failed\n");
return;
}
@@ -1017,60 +1012,60 @@ selnotify(XEvent *e) {
*/
repl = data;
last = data + nitems * format / 8;
- while((repl = memchr(repl, '\n', last - repl))) {
+ while ((repl = memchr(repl, '\n', last - repl))) {
*repl++ = '\r';
}
- if(IS_SET(MODE_BRCKTPASTE))
+ if (IS_SET(MODE_BRCKTPASTE))
ttywrite("\033[200~", 6);
ttysend((char *)data, nitems * format / 8);
- if(IS_SET(MODE_BRCKTPASTE))
+ if (IS_SET(MODE_BRCKTPASTE))
ttywrite("\033[201~", 6);
XFree(data);
/* number of 32-bit chunks returned */
ofs += nitems * format / 32;
- } while(rem > 0);
+ } while (rem > 0);
}
-void
-selpaste(const Arg *dummy) {
+void selpaste(const Arg * dummy)
+{
XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
- xw.win, CurrentTime);
+ xw.win, CurrentTime);
}
-void
-clipcopy(const Arg *dummy) {
+void clipcopy(const Arg * dummy)
+{
Atom clipboard;
- if(sel.clipboard != NULL)
+ if (sel.clipboard != NULL)
free(sel.clipboard);
- if(sel.primary != NULL) {
+ if (sel.primary != NULL) {
sel.clipboard = xstrdup(sel.primary);
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
}
}
-void
-clippaste(const Arg *dummy) {
+void clippaste(const Arg * dummy)
+{
Atom clipboard;
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XConvertSelection(xw.dpy, clipboard, sel.xtarget, clipboard,
- xw.win, CurrentTime);
+ xw.win, CurrentTime);
}
-void
-selclear(XEvent *e) {
- if(sel.ob.x == -1)
+void selclear(XEvent * e)
+{
+ if (sel.ob.x == -1)
return;
sel.ob.x = -1;
tsetdirt(sel.nb.y, sel.ne.y);
}
-void
-selrequest(XEvent *e) {
+void selrequest(XEvent * e)
+{
XSelectionRequestEvent *xsre;
XSelectionEvent xev;
Atom xa_targets, string, clipboard;
@@ -1089,22 +1084,22 @@ selrequest(XEvent *e) {
xev.property = None;
xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
- if(xsre->target == xa_targets) {
+ if (xsre->target == xa_targets) {
/* respond with the supported type */
string = sel.xtarget;
XChangeProperty(xsre->display, xsre->requestor, xsre->property,
XA_ATOM, 32, PropModeReplace,
- (uchar *) &string, 1);
+ (uchar *) & string, 1);
xev.property = xsre->property;
- } else if(xsre->target == sel.xtarget || xsre->target == XA_STRING) {
+ } else if (xsre->target == sel.xtarget || xsre->target == XA_STRING) {
/*
* xith XA_STRING non ascii characters may be incorrect in the
* requestor. It is not our problem, use utf8.
*/
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
- if(xsre->selection == XA_PRIMARY) {
+ if (xsre->selection == XA_PRIMARY) {
seltext = sel.primary;
- } else if(xsre->selection == clipboard) {
+ } else if (xsre->selection == clipboard) {
seltext = sel.clipboard;
} else {
fprintf(stderr,
@@ -1112,22 +1107,23 @@ selrequest(XEvent *e) {
xsre->selection);
return;
}
- if(seltext != NULL) {
+ if (seltext != NULL) {
XChangeProperty(xsre->display, xsre->requestor,
xsre->property, xsre->target,
8, PropModeReplace,
- (uchar *)seltext, strlen(seltext));
+ (uchar *) seltext, strlen(seltext));
xev.property = xsre->property;
}
}
/* all done, send a notification to the listener */
- if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev))
+ if (!XSendEvent
+ (xsre->display, xsre->requestor, True, 0, (XEvent *) & xev))
fprintf(stderr, "Error sending SelectionNotify event\n");
}
-void
-xsetsel(char *str, Time t) {
+void xsetsel(char *str, Time t)
+{
free(sel.primary);
sel.primary = str;
@@ -1136,17 +1132,17 @@ xsetsel(char *str, Time t) {
selclear(0);
}
-void
-brelease(XEvent *e) {
- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+void brelease(XEvent * e)
+{
+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
mousereport(e);
return;
}
- if(e->xbutton.button == Button2) {
+ if (e->xbutton.button == Button2) {
selpaste(NULL);
- } else if(e->xbutton.button == Button1) {
- if(sel.mode == SEL_READY) {
+ } else if (e->xbutton.button == Button1) {
+ if (sel.mode == SEL_READY) {
getbuttoninfo(e);
selcopy(e->xbutton.time);
} else
@@ -1156,16 +1152,16 @@ brelease(XEvent *e) {
}
}
-void
-bmotion(XEvent *e) {
+void bmotion(XEvent * e)
+{
int oldey, oldex, oldsby, oldsey;
- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
mousereport(e);
return;
}
- if(!sel.mode)
+ if (!sel.mode)
return;
sel.mode = SEL_READY;
@@ -1175,12 +1171,12 @@ bmotion(XEvent *e) {
oldsey = sel.ne.y;
getbuttoninfo(e);
- if(oldey != sel.oe.y || oldex != sel.oe.x)
+ if (oldey != sel.oe.y || oldex != sel.oe.x)
tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
}
-void
-die(const char *errstr, ...) {
+void die(const char *errstr, ...)
+{
va_list ap;
va_start(ap, errstr);
@@ -1189,15 +1185,15 @@ die(const char *errstr, ...) {
exit(EXIT_FAILURE);
}
-void
-execsh(void) {
+void execsh(void)
+{
char **args, *sh, *prog;
const struct passwd *pw;
char buf[sizeof(long) * 8 + 1];
errno = 0;
- if((pw = getpwuid(getuid())) == NULL) {
- if(errno)
+ if ((pw = getpwuid(getuid())) == NULL) {
+ if (errno)
die("getpwuid:%s\n", strerror(errno));
else
die("who are you?\n");
@@ -1207,13 +1203,14 @@ execsh(void) {
sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
}
- if(opt_cmd)
+ if (opt_cmd)
prog = opt_cmd[0];
- else if(utmp)
+ else if (utmp)
prog = utmp;
else
prog = sh;
- args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL};
+ args = (opt_cmd) ? opt_cmd : (char *[]) {
+ prog, NULL};
snprintf(buf, sizeof(buf), "%lu", xw.win);
@@ -1238,15 +1235,15 @@ execsh(void) {
_exit(EXIT_FAILURE);
}
-void
-sigchld(int a) {
+void sigchld(int a)
+{
int stat, ret;
pid_t p;
- if((p = waitpid(pid, &stat, WNOHANG)) < 0)
+ if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
- if(pid != p)
+ if (pid != p)
return;
ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
@@ -1255,49 +1252,46 @@ sigchld(int a) {
exit(EXIT_SUCCESS);
}
-
-void
-stty(void)
+void stty(void)
{
char cmd[_POSIX_ARG_MAX], **p, *q, *s;
size_t n, siz;
- if((n = strlen(stty_args)) > sizeof(cmd)-1)
+ if ((n = strlen(stty_args)) > sizeof(cmd) - 1)
die("incorrect stty parameters\n");
memcpy(cmd, stty_args, n);
q = cmd + n;
siz = sizeof(cmd) - n;
- for(p = opt_cmd; p && (s = *p); ++p) {
- if((n = strlen(s)) > siz-1)
+ for (p = opt_cmd; p && (s = *p); ++p) {
+ if ((n = strlen(s)) > siz - 1)
die("stty parameter length too long\n");
*q++ = ' ';
q = memcpy(q, s, n);
q += n;
- siz-= n + 1;
+ siz -= n + 1;
}
*q = '\0';
if (system(cmd) != 0)
- perror("Couldn't call stty");
+ perror("Couldn't call stty");
}
-void
-ttynew(void) {
+void ttynew(void)
+{
int m, s;
- struct winsize w = {term.row, term.col, 0, 0};
+ struct winsize w = { term.row, term.col, 0, 0 };
- if(opt_io) {
+ if (opt_io) {
term.mode |= MODE_PRINT;
iofd = (!strcmp(opt_io, "-")) ?
- STDOUT_FILENO :
- open(opt_io, O_WRONLY | O_CREAT, 0666);
- if(iofd < 0) {
+ STDOUT_FILENO : open(opt_io, O_WRONLY | O_CREAT, 0666);
+ if (iofd < 0) {
fprintf(stderr, "Error opening %s:%s\n",
opt_io, strerror(errno));
}
}
if (opt_line) {
- if((cmdfd = open(opt_line, O_RDWR)) < 0)
+ if ((cmdfd = open(opt_line, O_RDWR)) < 0)
die("open line failed: %s\n", strerror(errno));
close(STDIN_FILENO);
dup(cmdfd);
@@ -1306,20 +1300,20 @@ ttynew(void) {
}
/* seems to work fine on linux, openbsd and freebsd */
- if(openpty(&m, &s, NULL, NULL, &w) < 0)
+ if (openpty(&m, &s, NULL, NULL, &w) < 0)
die("openpty failed: %s\n", strerror(errno));
- switch(pid = fork()) {
+ switch (pid = fork()) {
case -1:
die("fork failed\n");
break;
case 0:
close(iofd);
- setsid(); /* create a new process group */
+ setsid(); /* create a new process group */
dup2(s, STDIN_FILENO);
dup2(s, STDOUT_FILENO);
dup2(s, STDERR_FILENO);
- if(ioctl(s, TIOCSCTTY, NULL) < 0)
+ if (ioctl(s, TIOCSCTTY, NULL) < 0)
die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
close(s);
close(m);
@@ -1333,23 +1327,23 @@ ttynew(void) {
}
}
-void
-ttyread(void) {
+void ttyread(void)
+{
static char buf[BUFSIZ];
static int buflen = 0;
char *ptr;
- int charsize; /* size of utf8 char in bytes */
+ int charsize; /* size of utf8 char in bytes */
long unicodep;
int ret;
/* append read bytes to unprocessed bytes */
- if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
+ if ((ret = read(cmdfd, buf + buflen, LEN(buf) - buflen)) < 0)
die("Couldn't read from shell: %s\n", strerror(errno));
/* process every complete utf8 char */
buflen += ret;
ptr = buf;
- while((charsize = utf8decode(ptr, &unicodep, buflen))) {
+ while ((charsize = utf8decode(ptr, &unicodep, buflen))) {
tputc(unicodep);
ptr += charsize;
buflen -= charsize;
@@ -1359,45 +1353,46 @@ ttyread(void) {
memmove(buf, ptr, buflen);
}
-void
-ttywrite(const char *s, size_t n) {
- if(xwrite(cmdfd, s, n) == -1)
+void ttywrite(const char *s, size_t n)
+{
+ if (xwrite(cmdfd, s, n) == -1)
die("write error on tty: %s\n", strerror(errno));
}
-void
-ttysend(char *s, size_t n) {
+void ttysend(char *s, size_t n)
+{
int len;
long u;
ttywrite(s, n);
- if(IS_SET(MODE_ECHO))
- while((len = utf8decode(s, &u, n)) > 0) {
+ if (IS_SET(MODE_ECHO))
+ while ((len = utf8decode(s, &u, n)) > 0) {
techo(u);
n -= len;
s += len;
}
}
-void
-ttyresize(void) {
+void ttyresize(void)
+{
struct winsize w;
w.ws_row = term.row;
w.ws_col = term.col;
w.ws_xpixel = xw.tw;
w.ws_ypixel = xw.th;
- if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
- fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
+ if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
+ fprintf(stderr, "Couldn't set window size: %s\n",
+ strerror(errno));
}
-int
-tattrset(int attr) {
+int tattrset(int attr)
+{
int i, j;
- for(i = 0; i < term.row-1; i++) {
- for(j = 0; j < term.col-1; j++) {
- if(term.line[i][j].mode & attr)
+ for (i = 0; i < term.row - 1; i++) {
+ for (j = 0; j < term.col - 1; j++) {
+ if (term.line[i][j].mode & attr)
return 1;
}
}
@@ -1405,24 +1400,24 @@ tattrset(int attr) {
return 0;
}
-void
-tsetdirt(int top, int bot) {
+void tsetdirt(int top, int bot)
+{
int i;
- LIMIT(top, 0, term.row-1);
- LIMIT(bot, 0, term.row-1);
+ LIMIT(top, 0, term.row - 1);
+ LIMIT(bot, 0, term.row - 1);
- for(i = top; i <= bot; i++)
+ for (i = top; i <= bot; i++)
term.dirty[i] = 1;
}
-void
-tsetdirtattr(int attr) {
+void tsetdirtattr(int attr)
+{
int i, j;
- for(i = 0; i < term.row-1; i++) {
- for(j = 0; j < term.col-1; j++) {
- if(term.line[i][j].mode & attr) {
+ for (i = 0; i < term.row - 1; i++) {
+ for (j = 0; j < term.col - 1; j++) {
+ if (term.line[i][j].mode & attr) {
tsetdirt(i, i);
break;
}
@@ -1430,36 +1425,34 @@ tsetdirtattr(int attr) {
}
}
-void
-tfulldirt(void) {
- tsetdirt(0, term.row-1);
+void tfulldirt(void)
+{
+ tsetdirt(0, term.row - 1);
}
-void
-tcursor(int mode) {
+void tcursor(int mode)
+{
static TCursor c[2];
bool alt = IS_SET(MODE_ALTSCREEN);
- if(mode == CURSOR_SAVE) {
+ if (mode == CURSOR_SAVE) {
c[alt] = term.c;
- } else if(mode == CURSOR_LOAD) {
+ } else if (mode == CURSOR_LOAD) {
term.c = c[alt];
tmoveto(c[alt].x, c[alt].y);
}
}
-void
-treset(void) {
+void treset(void)
+{
uint i;
- term.c = (TCursor){{
- .mode = ATTR_NULL,
- .fg = defaultfg,
- .bg = defaultbg
- }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
+ term.c = (TCursor) { {
+ .mode = ATTR_NULL,.fg = defaultfg,.bg = defaultbg},.x = 0,.y =
+ 0,.state = CURSOR_DEFAULT};
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
- for(i = tabspaces; i < term.col; i += tabspaces)
+ for (i = tabspaces; i < term.col; i += tabspaces)
term.tabs[i] = 1;
term.top = 0;
term.bot = term.row - 1;
@@ -1467,25 +1460,28 @@ treset(void) {
memset(term.trantbl, CS_USA, sizeof(term.trantbl));
term.charset = 0;
- for(i = 0; i < 2; i++) {
+ for (i = 0; i < 2; i++) {
tmoveto(0, 0);
tcursor(CURSOR_SAVE);
- tclearregion(0, 0, term.col-1, term.row-1);
+ tclearregion(0, 0, term.col - 1, term.row - 1);
tswapscreen();
}
}
-void
-tnew(int col, int row) {
- term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
+void tnew(int col, int row)
+{
+ term = (Term) {
+ .c = {
+ .attr = {
+ .fg = defaultfg,.bg = defaultbg}}};
tresize(col, row);
term.numlock = 1;
treset();
}
-void
-tswapscreen(void) {
+void tswapscreen(void)
+{
Line *tmp = term.line;
term.line = term.alt;
@@ -1494,65 +1490,66 @@ tswapscreen(void) {
tfulldirt();
}
-void
-tscrolldown(int orig, int n) {
+void tscrolldown(int orig, int n)
+{
int i;
Line temp;
- LIMIT(n, 0, term.bot-orig+1);
+ LIMIT(n, 0, term.bot - orig + 1);
- tsetdirt(orig, term.bot-n);
- tclearregion(0, term.bot-n+1, term.col-1, term.bot);
+ tsetdirt(orig, term.bot - n);
+ tclearregion(0, term.bot - n + 1, term.col - 1, term.bot);
- for(i = term.bot; i >= orig+n; i--) {
+ for (i = term.bot; i >= orig + n; i--) {
temp = term.line[i];
- term.line[i] = term.line[i-n];
- term.line[i-n] = temp;
+ term.line[i] = term.line[i - n];
+ term.line[i - n] = temp;
}
selscroll(orig, n);
}
-void
-tscrollup(int orig, int n) {
+void tscrollup(int orig, int n)
+{
int i;
Line temp;
- LIMIT(n, 0, term.bot-orig+1);
+ LIMIT(n, 0, term.bot - orig + 1);
- tclearregion(0, orig, term.col-1, orig+n-1);
- tsetdirt(orig+n, term.bot);
+ tclearregion(0, orig, term.col - 1, orig + n - 1);
+ tsetdirt(orig + n, term.bot);
- for(i = orig; i <= term.bot-n; i++) {
+ for (i = orig; i <= term.bot - n; i++) {
temp = term.line[i];
- term.line[i] = term.line[i+n];
- term.line[i+n] = temp;
+ term.line[i] = term.line[i + n];
+ term.line[i + n] = temp;
}
selscroll(orig, -n);
}
-void
-selscroll(int orig, int n) {
- if(sel.ob.x == -1)
+void selscroll(int orig, int n)
+{
+ if (sel.ob.x == -1)
return;
- if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
- if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+ if (BETWEEN(sel.ob.y, orig, term.bot)
+ || BETWEEN(sel.oe.y, orig, term.bot)) {
+ if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
selclear(NULL);
return;
}
- if(sel.type == SEL_RECTANGULAR) {
- if(sel.ob.y < term.top)
+ if (sel.type == SEL_RECTANGULAR) {
+ if (sel.ob.y < term.top)
sel.ob.y = term.top;
- if(sel.oe.y > term.bot)
+ if (sel.oe.y > term.bot)
sel.oe.y = term.bot;
} else {
- if(sel.ob.y < term.top) {
+ if (sel.ob.y < term.top) {
sel.ob.y = term.top;
sel.ob.x = 0;
}
- if(sel.oe.y > term.bot) {
+ if (sel.oe.y > term.bot) {
sel.oe.y = term.bot;
sel.oe.x = term.col;
}
@@ -1561,11 +1558,11 @@ selscroll(int orig, int n) {
}
}
-void
-tnewline(int first_col) {
+void tnewline(int first_col)
+{
int y = term.c.y;
- if(y == term.bot) {
+ if (y == term.bot) {
tscrollup(term.top, 1);
} else {
y++;
@@ -1573,46 +1570,46 @@ tnewline(int first_col) {
tmoveto(first_col ? 0 : term.c.x, y);
}
-void
-csiparse(void) {
+void csiparse(void)
+{
char *p = csiescseq.buf, *np;
long int v;
csiescseq.narg = 0;
- if(*p == '?') {
+ if (*p == '?') {
csiescseq.priv = 1;
p++;
}
csiescseq.buf[csiescseq.len] = '\0';
- while(p < csiescseq.buf+csiescseq.len) {
+ while (p < csiescseq.buf + csiescseq.len) {
np = NULL;
v = strtol(p, &np, 10);
- if(np == p)
+ if (np == p)
v = 0;
- if(v == LONG_MAX || v == LONG_MIN)
+ if (v == LONG_MAX || v == LONG_MIN)
v = -1;
csiescseq.arg[csiescseq.narg++] = v;
p = np;
- if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+ if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
break;
p++;
}
csiescseq.mode[0] = *p++;
- csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0';
+ csiescseq.mode[1] = (p < csiescseq.buf + csiescseq.len) ? *p : '\0';
}
/* for absolute user moves, when decom is set */
-void
-tmoveato(int x, int y) {
- tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
+void tmoveato(int x, int y)
+{
+ tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top : 0));
}
-void
-tmoveto(int x, int y) {
+void tmoveto(int x, int y)
+{
int miny, maxy;
- if(term.c.state & CURSOR_ORIGIN) {
+ if (term.c.state & CURSOR_ORIGIN) {
miny = term.top;
maxy = term.bot;
} else {
@@ -1620,38 +1617,38 @@ tmoveto(int x, int y) {
maxy = term.row - 1;
}
term.c.state &= ~CURSOR_WRAPNEXT;
- term.c.x = LIMIT(x, 0, term.col-1);
+ term.c.x = LIMIT(x, 0, term.col - 1);
term.c.y = LIMIT(y, miny, maxy);
}
-void
-tsetchar(long u, Glyph *attr, int x, int y) {
- static char *vt100_0[62] = { /* 0x41 - 0x7e */
- "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
- 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
- 0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
- 0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
- "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
- "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
- "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
- "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+void tsetchar(long u, Glyph * attr, int x, int y)
+{
+ static char *vt100_0[62] = { /* 0x41 - 0x7e */
+ "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
+ 0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
+ "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
+ "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
+ "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+ "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
};
/*
* The table is proudly stolen from rxvt.
*/
- if(term.trantbl[term.charset] == CS_GRAPHIC0 &&
- BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
+ if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
+ BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
- if(term.line[y][x].mode & ATTR_WIDE) {
- if(x+1 < term.col) {
- term.line[y][x+1].u = ' ';
- term.line[y][x+1].mode &= ~ATTR_WDUMMY;
+ if (term.line[y][x].mode & ATTR_WIDE) {
+ if (x + 1 < term.col) {
+ term.line[y][x + 1].u = ' ';
+ term.line[y][x + 1].mode &= ~ATTR_WDUMMY;
}
- } else if(term.line[y][x].mode & ATTR_WDUMMY) {
- term.line[y][x-1].u = ' ';
- term.line[y][x-1].mode &= ~ATTR_WIDE;
+ } else if (term.line[y][x].mode & ATTR_WDUMMY) {
+ term.line[y][x - 1].u = ' ';
+ term.line[y][x - 1].mode &= ~ATTR_WIDE;
}
term.dirty[y] = 1;
@@ -1659,26 +1656,26 @@ tsetchar(long u, Glyph *attr, int x, int y) {
term.line[y][x].u = u;
}
-void
-tclearregion(int x1, int y1, int x2, int y2) {
+void tclearregion(int x1, int y1, int x2, int y2)
+{
int x, y, temp;
Glyph *gp;
- if(x1 > x2)
+ if (x1 > x2)
temp = x1, x1 = x2, x2 = temp;
- if(y1 > y2)
+ if (y1 > y2)
temp = y1, y1 = y2, y2 = temp;
- LIMIT(x1, 0, term.col-1);
- LIMIT(x2, 0, term.col-1);
- LIMIT(y1, 0, term.row-1);
- LIMIT(y2, 0, term.row-1);
+ LIMIT(x1, 0, term.col - 1);
+ LIMIT(x2, 0, term.col - 1);
+ LIMIT(y1, 0, term.row - 1);
+ LIMIT(y2, 0, term.row - 1);
- for(y = y1; y <= y2; y++) {
+ for (y = y1; y <= y2; y++) {
term.dirty[y] = 1;
- for(x = x1; x <= x2; x++) {
+ for (x = x1; x <= x2; x++) {
gp = &term.line[y][x];
- if(selected(x, y))
+ if (selected(x, y))
selclear(NULL);
gp->fg = term.c.attr.fg;
gp->bg = term.c.attr.bg;
@@ -1688,8 +1685,8 @@ tclearregion(int x1, int y1, int x2, int y2) {
}
}
-void
-tdeletechar(int n) {
+void tdeletechar(int n)
+{
int dst, src, size;
Glyph *line;
@@ -1701,11 +1698,11 @@ tdeletechar(int n) {
line = term.line[term.c.y];
memmove(&line[dst], &line[src], size * sizeof(Glyph));
- tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
+ tclearregion(term.col - n, term.c.y, term.col - 1, term.c.y);
}
-void
-tinsertblank(int n) {
+void tinsertblank(int n)
+{
int dst, src, size;
Glyph *line;
@@ -1720,25 +1717,25 @@ tinsertblank(int n) {
tclearregion(src, term.c.y, dst - 1, term.c.y);
}
-void
-tinsertblankline(int n) {
- if(BETWEEN(term.c.y, term.top, term.bot))
+void tinsertblankline(int n)
+{
+ if (BETWEEN(term.c.y, term.top, term.bot))
tscrolldown(term.c.y, n);
}
-void
-tdeleteline(int n) {
- if(BETWEEN(term.c.y, term.top, term.bot))
+void tdeleteline(int n)
+{
+ if (BETWEEN(term.c.y, term.top, term.bot))
tscrollup(term.c.y, n);
}
-int32_t
-tdefcolor(int *attr, int *npar, int l) {
+int32_t tdefcolor(int *attr, int *npar, int l)
+{
int32_t idx = -1;
uint r, g, b;
switch (attr[*npar + 1]) {
- case 2: /* direct color in RGB space */
+ case 2: /* direct color in RGB space */
if (*npar + 4 >= l) {
fprintf(stderr,
"erresc(38): Incorrect number of parameters (%d)\n",
@@ -1749,13 +1746,14 @@ tdefcolor(int *attr, int *npar, int l) {
g = attr[*npar + 3];
b = attr[*npar + 4];
*npar += 4;
- if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
- fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
- r, g, b);
+ if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255)
+ || !BETWEEN(b, 0, 255))
+ fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n", r,
+ g, b);
else
idx = TRUECOLOR(r, g, b);
break;
- case 5: /* indexed color */
+ case 5: /* indexed color */
if (*npar + 2 >= l) {
fprintf(stderr,
"erresc(38): Incorrect number of parameters (%d)\n",
@@ -1763,41 +1761,40 @@ tdefcolor(int *attr, int *npar, int l) {
break;
}
*npar += 2;
- if(!BETWEEN(attr[*npar], 0, 255))
- fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
+ if (!BETWEEN(attr[*npar], 0, 255))
+ fprintf(stderr, "erresc: bad fgcolor %d\n",
+ attr[*npar]);
else
idx = attr[*npar];
break;
- case 0: /* implemented defined (only foreground) */
- case 1: /* transparent */
- case 3: /* direct color in CMY space */
- case 4: /* direct color in CMYK space */
+ case 0: /* implemented defined (only foreground) */
+ case 1: /* transparent */
+ case 3: /* direct color in CMY space */
+ case 4: /* direct color in CMYK space */
default:
fprintf(stderr,
- "erresc(38): gfx attr %d unknown\n", attr[*npar]);
+ "erresc(38): gfx attr %d unknown\n", attr[*npar]);
break;
}
return idx;
}
-void
-tsetattr(int *attr, int l) {
+void tsetattr(int *attr, int l)
+{
int i;
int32_t idx;
- for(i = 0; i < l; i++) {
- switch(attr[i]) {
+ for (i = 0; i < l; i++) {
+ switch (attr[i]) {
case 0:
- term.c.attr.mode &= ~(
- ATTR_BOLD |
- ATTR_FAINT |
- ATTR_ITALIC |
- ATTR_UNDERLINE |
- ATTR_BLINK |
- ATTR_REVERSE |
- ATTR_INVISIBLE |
- ATTR_STRUCK );
+ term.c.attr.mode &= ~(ATTR_BOLD |
+ ATTR_FAINT |
+ ATTR_ITALIC |
+ ATTR_UNDERLINE |
+ ATTR_BLINK |
+ ATTR_REVERSE |
+ ATTR_INVISIBLE | ATTR_STRUCK);
term.c.attr.fg = defaultfg;
term.c.attr.bg = defaultbg;
break;
@@ -1813,9 +1810,9 @@ tsetattr(int *attr, int l) {
case 4:
term.c.attr.mode |= ATTR_UNDERLINE;
break;
- case 5: /* slow blink */
+ case 5: /* slow blink */
/* FALLTHROUGH */
- case 6: /* rapid blink */
+ case 6: /* rapid blink */
term.c.attr.mode |= ATTR_BLINK;
break;
case 7:
@@ -1863,13 +1860,13 @@ tsetattr(int *attr, int l) {
term.c.attr.bg = defaultbg;
break;
default:
- if(BETWEEN(attr[i], 30, 37)) {
+ if (BETWEEN(attr[i], 30, 37)) {
term.c.attr.fg = attr[i] - 30;
- } else if(BETWEEN(attr[i], 40, 47)) {
+ } else if (BETWEEN(attr[i], 40, 47)) {
term.c.attr.bg = attr[i] - 40;
- } else if(BETWEEN(attr[i], 90, 97)) {
+ } else if (BETWEEN(attr[i], 90, 97)) {
term.c.attr.fg = attr[i] - 90 + 8;
- } else if(BETWEEN(attr[i], 100, 107)) {
+ } else if (BETWEEN(attr[i], 100, 107)) {
term.c.attr.bg = attr[i] - 100 + 8;
} else {
fprintf(stderr,
@@ -1881,13 +1878,13 @@ tsetattr(int *attr, int l) {
}
}
-void
-tsetscroll(int t, int b) {
+void tsetscroll(int t, int b)
+{
int temp;
- LIMIT(t, 0, term.row-1);
- LIMIT(b, 0, term.row-1);
- if(t > b) {
+ LIMIT(t, 0, term.row - 1);
+ LIMIT(b, 0, term.row - 1);
+ if (t > b) {
temp = t;
t = b;
b = temp;
@@ -1896,106 +1893,106 @@ tsetscroll(int t, int b) {
term.bot = b;
}
-void
-tsetmode(bool priv, bool set, int *args, int narg) {
+void tsetmode(bool priv, bool set, int *args, int narg)
+{
int *lim, mode;
bool alt;
- for(lim = args + narg; args < lim; ++args) {
- if(priv) {
- switch(*args) {
- case 1: /* DECCKM -- Cursor key */
+ for (lim = args + narg; args < lim; ++args) {
+ if (priv) {
+ switch (*args) {
+ case 1: /* DECCKM -- Cursor key */
MODBIT(term.mode, set, MODE_APPCURSOR);
break;
- case 5: /* DECSCNM -- Reverse video */
+ case 5: /* DECSCNM -- Reverse video */
mode = term.mode;
MODBIT(term.mode, set, MODE_REVERSE);
- if(mode != term.mode)
+ if (mode != term.mode)
redraw();
break;
- case 6: /* DECOM -- Origin */
+ case 6: /* DECOM -- Origin */
MODBIT(term.c.state, set, CURSOR_ORIGIN);
tmoveato(0, 0);
break;
- case 7: /* DECAWM -- Auto wrap */
+ case 7: /* DECAWM -- Auto wrap */
MODBIT(term.mode, set, MODE_WRAP);
break;
- case 0: /* Error (IGNORED) */
- case 2: /* DECANM -- ANSI/VT52 (IGNORED) */
- case 3: /* DECCOLM -- Column (IGNORED) */
- case 4: /* DECSCLM -- Scroll (IGNORED) */
- case 8: /* DECARM -- Auto repeat (IGNORED) */
- case 18: /* DECPFF -- Printer feed (IGNORED) */
- case 19: /* DECPEX -- Printer extent (IGNORED) */
- case 42: /* DECNRCM -- National characters (IGNORED) */
- case 12: /* att610 -- Start blinking cursor (IGNORED) */
+ case 0: /* Error (IGNORED) */
+ case 2: /* DECANM -- ANSI/VT52 (IGNORED) */
+ case 3: /* DECCOLM -- Column (IGNORED) */
+ case 4: /* DECSCLM -- Scroll (IGNORED) */
+ case 8: /* DECARM -- Auto repeat (IGNORED) */
+ case 18: /* DECPFF -- Printer feed (IGNORED) */
+ case 19: /* DECPEX -- Printer extent (IGNORED) */
+ case 42: /* DECNRCM -- National characters (IGNORED) */
+ case 12: /* att610 -- Start blinking cursor (IGNORED) */
break;
- case 25: /* DECTCEM -- Text Cursor Enable Mode */
+ case 25: /* DECTCEM -- Text Cursor Enable Mode */
MODBIT(term.mode, !set, MODE_HIDE);
break;
- case 9: /* X10 mouse compatibility mode */
+ case 9: /* X10 mouse compatibility mode */
xsetpointermotion(0);
MODBIT(term.mode, 0, MODE_MOUSE);
MODBIT(term.mode, set, MODE_MOUSEX10);
break;
- case 1000: /* 1000: report button press */
+ case 1000: /* 1000: report button press */
xsetpointermotion(0);
MODBIT(term.mode, 0, MODE_MOUSE);
MODBIT(term.mode, set, MODE_MOUSEBTN);
break;
- case 1002: /* 1002: report motion on button press */
+ case 1002: /* 1002: report motion on button press */
xsetpointermotion(0);
MODBIT(term.mode, 0, MODE_MOUSE);
MODBIT(term.mode, set, MODE_MOUSEMOTION);
break;
- case 1003: /* 1003: enable all mouse motions */
+ case 1003: /* 1003: enable all mouse motions */
xsetpointermotion(set);
MODBIT(term.mode, 0, MODE_MOUSE);
MODBIT(term.mode, set, MODE_MOUSEMANY);
break;
- case 1004: /* 1004: send focus events to tty */
+ case 1004: /* 1004: send focus events to tty */
MODBIT(term.mode, set, MODE_FOCUS);
break;
- case 1006: /* 1006: extended reporting mode */
+ case 1006: /* 1006: extended reporting mode */
MODBIT(term.mode, set, MODE_MOUSESGR);
break;
case 1034:
MODBIT(term.mode, set, MODE_8BIT);
break;
- case 1049: /* swap screen & set/restore cursor as xterm */
+ case 1049: /* swap screen & set/restore cursor as xterm */
if (!allowaltscreen)
break;
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
/* FALLTHROUGH */
- case 47: /* swap screen */
+ case 47: /* swap screen */
case 1047:
if (!allowaltscreen)
break;
alt = IS_SET(MODE_ALTSCREEN);
- if(alt) {
- tclearregion(0, 0, term.col-1,
- term.row-1);
+ if (alt) {
+ tclearregion(0, 0, term.col - 1,
+ term.row - 1);
}
- if(set ^ alt) /* set is always 1 or 0 */
+ if (set ^ alt) /* set is always 1 or 0 */
tswapscreen();
- if(*args != 1049)
+ if (*args != 1049)
break;
/* FALLTHROUGH */
case 1048:
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
break;
- case 2004: /* 2004: bracketed paste mode */
+ case 2004: /* 2004: bracketed paste mode */
MODBIT(term.mode, set, MODE_BRCKTPASTE);
break;
- /* Not implemented mouse modes. See comments there. */
- case 1001: /* mouse highlight mode; can hang the
- terminal by design when implemented. */
- case 1005: /* UTF-8 mouse mode; will confuse
- applications not supporting UTF-8
- and luit. */
- case 1015: /* urxvt mangled mouse mode; incompatible
- and can be mistaken for other control
- codes. */
+ /* Not implemented mouse modes. See comments there. */
+ case 1001: /* mouse highlight mode; can hang the
+ terminal by design when implemented. */
+ case 1005: /* UTF-8 mouse mode; will confuse
+ applications not supporting UTF-8
+ and luit. */
+ case 1015: /* urxvt mangled mouse mode; incompatible
+ and can be mistaken for other control
+ codes. */
default:
fprintf(stderr,
"erresc: unknown private set/reset mode %d\n",
@@ -2003,19 +2000,19 @@ tsetmode(bool priv, bool set, int *args, int narg) {
break;
}
} else {
- switch(*args) {
- case 0: /* Error (IGNORED) */
+ switch (*args) {
+ case 0: /* Error (IGNORED) */
break;
- case 2: /* KAM -- keyboard action */
+ case 2: /* KAM -- keyboard action */
MODBIT(term.mode, set, MODE_KBDLOCK);
break;
- case 4: /* IRM -- Insertion-replacement */
+ case 4: /* IRM -- Insertion-replacement */
MODBIT(term.mode, set, MODE_INSERT);
break;
- case 12: /* SRM -- Send/Receive */
+ case 12: /* SRM -- Send/Receive */
MODBIT(term.mode, !set, MODE_ECHO);
break;
- case 20: /* LNM -- Linefeed/new line */
+ case 20: /* LNM -- Linefeed/new line */
MODBIT(term.mode, set, MODE_CRLF);
break;
default:
@@ -2028,33 +2025,33 @@ tsetmode(bool priv, bool set, int *args, int narg) {
}
}
-void
-csihandle(void) {
+void csihandle(void)
+{
char buf[40];
int len;
- switch(csiescseq.mode[0]) {
+ switch (csiescseq.mode[0]) {
default:
- unknown:
+ unknown:
fprintf(stderr, "erresc: unknown csi ");
csidump();
/* die(""); */
break;
- case '@': /* ICH -- Insert <n> blank char */
+ case '@': /* ICH -- Insert <n> blank char */
DEFAULT(csiescseq.arg[0], 1);
tinsertblank(csiescseq.arg[0]);
break;
- case 'A': /* CUU -- Cursor <n> Up */
+ case 'A': /* CUU -- Cursor <n> Up */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
+ tmoveto(term.c.x, term.c.y - csiescseq.arg[0]);
break;
- case 'B': /* CUD -- Cursor <n> Down */
- case 'e': /* VPR --Cursor <n> Down */
+ case 'B': /* CUD -- Cursor <n> Down */
+ case 'e': /* VPR --Cursor <n> Down */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
+ tmoveto(term.c.x, term.c.y + csiescseq.arg[0]);
break;
- case 'i': /* MC -- Media Copy */
- switch(csiescseq.arg[0]) {
+ case 'i': /* MC -- Media Copy */
+ switch (csiescseq.arg[0]) {
case 0:
tdump();
break;
@@ -2072,186 +2069,187 @@ csihandle(void) {
break;
}
break;
- case 'c': /* DA -- Device Attributes */
- if(csiescseq.arg[0] == 0)
+ case 'c': /* DA -- Device Attributes */
+ if (csiescseq.arg[0] == 0)
ttywrite(vtiden, sizeof(vtiden) - 1);
break;
- case 'C': /* CUF -- Cursor <n> Forward */
- case 'a': /* HPR -- Cursor <n> Forward */
+ case 'C': /* CUF -- Cursor <n> Forward */
+ case 'a': /* HPR -- Cursor <n> Forward */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
+ tmoveto(term.c.x + csiescseq.arg[0], term.c.y);
break;
- case 'D': /* CUB -- Cursor <n> Backward */
+ case 'D': /* CUB -- Cursor <n> Backward */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x-csiescseq.arg[0], term.c.y);
+ tmoveto(term.c.x - csiescseq.arg[0], term.c.y);
break;
- case 'E': /* CNL -- Cursor <n> Down and first col */
+ case 'E': /* CNL -- Cursor <n> Down and first col */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(0, term.c.y+csiescseq.arg[0]);
+ tmoveto(0, term.c.y + csiescseq.arg[0]);
break;
- case 'F': /* CPL -- Cursor <n> Up and first col */
+ case 'F': /* CPL -- Cursor <n> Up and first col */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(0, term.c.y-csiescseq.arg[0]);
+ tmoveto(0, term.c.y - csiescseq.arg[0]);
break;
- case 'g': /* TBC -- Tabulation clear */
- switch(csiescseq.arg[0]) {
- case 0: /* clear current tab stop */
+ case 'g': /* TBC -- Tabulation clear */
+ switch (csiescseq.arg[0]) {
+ case 0: /* clear current tab stop */
term.tabs[term.c.x] = 0;
break;
- case 3: /* clear all the tabs */
+ case 3: /* clear all the tabs */
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
break;
default:
goto unknown;
}
break;
- case 'G': /* CHA -- Move to <col> */
- case '`': /* HPA */
+ case 'G': /* CHA -- Move to <col> */
+ case '`': /* HPA */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(csiescseq.arg[0]-1, term.c.y);
+ tmoveto(csiescseq.arg[0] - 1, term.c.y);
break;
- case 'H': /* CUP -- Move to <row> <col> */
- case 'f': /* HVP */
+ case 'H': /* CUP -- Move to <row> <col> */
+ case 'f': /* HVP */
DEFAULT(csiescseq.arg[0], 1);
DEFAULT(csiescseq.arg[1], 1);
- tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
+ tmoveato(csiescseq.arg[1] - 1, csiescseq.arg[0] - 1);
break;
- case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
+ case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
DEFAULT(csiescseq.arg[0], 1);
tputtab(csiescseq.arg[0]);
break;
- case 'J': /* ED -- Clear screen */
+ case 'J': /* ED -- Clear screen */
selclear(NULL);
- switch(csiescseq.arg[0]) {
- case 0: /* below */
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
- if(term.c.y < term.row-1) {
- tclearregion(0, term.c.y+1, term.col-1,
- term.row-1);
+ switch (csiescseq.arg[0]) {
+ case 0: /* below */
+ tclearregion(term.c.x, term.c.y, term.col - 1,
+ term.c.y);
+ if (term.c.y < term.row - 1) {
+ tclearregion(0, term.c.y + 1, term.col - 1,
+ term.row - 1);
}
break;
- case 1: /* above */
- if(term.c.y > 1)
- tclearregion(0, 0, term.col-1, term.c.y-1);
+ case 1: /* above */
+ if (term.c.y > 1)
+ tclearregion(0, 0, term.col - 1, term.c.y - 1);
tclearregion(0, term.c.y, term.c.x, term.c.y);
break;
- case 2: /* all */
- tclearregion(0, 0, term.col-1, term.row-1);
+ case 2: /* all */
+ tclearregion(0, 0, term.col - 1, term.row - 1);
break;
default:
goto unknown;
}
break;
- case 'K': /* EL -- Clear line */
- switch(csiescseq.arg[0]) {
- case 0: /* right */
- tclearregion(term.c.x, term.c.y, term.col-1,
- term.c.y);
+ case 'K': /* EL -- Clear line */
+ switch (csiescseq.arg[0]) {
+ case 0: /* right */
+ tclearregion(term.c.x, term.c.y, term.col - 1,
+ term.c.y);
break;
- case 1: /* left */
+ case 1: /* left */
tclearregion(0, term.c.y, term.c.x, term.c.y);
break;
- case 2: /* all */
- tclearregion(0, term.c.y, term.col-1, term.c.y);
+ case 2: /* all */
+ tclearregion(0, term.c.y, term.col - 1, term.c.y);
break;
}
break;
- case 'S': /* SU -- Scroll <n> line up */
+ case 'S': /* SU -- Scroll <n> line up */
DEFAULT(csiescseq.arg[0], 1);
tscrollup(term.top, csiescseq.arg[0]);
break;
- case 'T': /* SD -- Scroll <n> line down */
+ case 'T': /* SD -- Scroll <n> line down */
DEFAULT(csiescseq.arg[0], 1);
tscrolldown(term.top, csiescseq.arg[0]);
break;
- case 'L': /* IL -- Insert <n> blank lines */
+ case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(csiescseq.arg[0], 1);
tinsertblankline(csiescseq.arg[0]);
break;
- case 'l': /* RM -- Reset Mode */
+ case 'l': /* RM -- Reset Mode */
tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg);
break;
- case 'M': /* DL -- Delete <n> lines */
+ case 'M': /* DL -- Delete <n> lines */
DEFAULT(csiescseq.arg[0], 1);
tdeleteline(csiescseq.arg[0]);
break;
- case 'X': /* ECH -- Erase <n> char */
+ case 'X': /* ECH -- Erase <n> char */
DEFAULT(csiescseq.arg[0], 1);
tclearregion(term.c.x, term.c.y,
- term.c.x + csiescseq.arg[0] - 1, term.c.y);
+ term.c.x + csiescseq.arg[0] - 1, term.c.y);
break;
- case 'P': /* DCH -- Delete <n> char */
+ case 'P': /* DCH -- Delete <n> char */
DEFAULT(csiescseq.arg[0], 1);
tdeletechar(csiescseq.arg[0]);
break;
- case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
+ case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
DEFAULT(csiescseq.arg[0], 1);
tputtab(-csiescseq.arg[0]);
break;
- case 'd': /* VPA -- Move to <row> */
+ case 'd': /* VPA -- Move to <row> */
DEFAULT(csiescseq.arg[0], 1);
- tmoveato(term.c.x, csiescseq.arg[0]-1);
+ tmoveato(term.c.x, csiescseq.arg[0] - 1);
break;
- case 'h': /* SM -- Set terminal mode */
+ case 'h': /* SM -- Set terminal mode */
tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
break;
- case 'm': /* SGR -- Terminal attribute (color) */
+ case 'm': /* SGR -- Terminal attribute (color) */
tsetattr(csiescseq.arg, csiescseq.narg);
break;
- case 'n': /* DSR – Device Status Report (cursor position) */
+ case 'n': /* DSR – Device Status Report (cursor position) */
if (csiescseq.arg[0] == 6) {
- len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
- term.c.y+1, term.c.x+1);
+ len = snprintf(buf, sizeof(buf), "\033[%i;%iR",
+ term.c.y + 1, term.c.x + 1);
ttywrite(buf, len);
}
break;
- case 'r': /* DECSTBM -- Set Scrolling Region */
- if(csiescseq.priv) {
+ case 'r': /* DECSTBM -- Set Scrolling Region */
+ if (csiescseq.priv) {
goto unknown;
} else {
DEFAULT(csiescseq.arg[0], 1);
DEFAULT(csiescseq.arg[1], term.row);
- tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
+ tsetscroll(csiescseq.arg[0] - 1, csiescseq.arg[1] - 1);
tmoveato(0, 0);
}
break;
- case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
+ case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
tcursor(CURSOR_SAVE);
break;
- case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
+ case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
tcursor(CURSOR_LOAD);
break;
case ' ':
switch (csiescseq.mode[1]) {
- case 'q': /* DECSCUSR -- Set Cursor Style */
- DEFAULT(csiescseq.arg[0], 1);
- if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
- goto unknown;
- }
- xw.cursor = csiescseq.arg[0];
- break;
- default:
+ case 'q': /* DECSCUSR -- Set Cursor Style */
+ DEFAULT(csiescseq.arg[0], 1);
+ if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
goto unknown;
+ }
+ xw.cursor = csiescseq.arg[0];
+ break;
+ default:
+ goto unknown;
}
break;
}
}
-void
-csidump(void) {
+void csidump(void)
+{
int i;
uint c;
printf("ESC[");
- for(i = 0; i < csiescseq.len; i++) {
+ for (i = 0; i < csiescseq.len; i++) {
c = csiescseq.buf[i] & 0xff;
- if(isprint(c)) {
+ if (isprint(c)) {
putchar(c);
- } else if(c == '\n') {
+ } else if (c == '\n') {
printf("(\\n)");
- } else if(c == '\r') {
+ } else if (c == '\r') {
printf("(\\r)");
- } else if(c == 0x1b) {
+ } else if (c == 0x1b) {
printf("(\\e)");
} else {
printf("(%02x)", c);
@@ -2260,38 +2258,39 @@ csidump(void) {
putchar('\n');
}
-void
-csireset(void) {
+void csireset(void)
+{
memset(&csiescseq, 0, sizeof(csiescseq));
}
-void
-strhandle(void) {
+void strhandle(void)
+{
char *p = NULL;
int j, narg, par;
- term.esc &= ~(ESC_STR_END|ESC_STR);
+ term.esc &= ~(ESC_STR_END | ESC_STR);
strparse();
par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
- switch(strescseq.type) {
- case ']': /* OSC -- Operating System Command */
- switch(par) {
+ switch (strescseq.type) {
+ case ']': /* OSC -- Operating System Command */
+ switch (par) {
case 0:
case 1:
case 2:
- if(narg > 1)
+ if (narg > 1)
xsettitle(strescseq.args[1]);
return;
- case 4: /* color set */
- if(narg < 3)
+ case 4: /* color set */
+ if (narg < 3)
break;
p = strescseq.args[2];
/* FALLTHROUGH */
- case 104: /* color reset, here p = NULL */
+ case 104: /* color reset, here p = NULL */
j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
- if(xsetcolorname(j, p)) {
- fprintf(stderr, "erresc: invalid color %s\n", p);
+ if (xsetcolorname(j, p)) {
+ fprintf(stderr, "erresc: invalid color %s\n",
+ p);
} else {
/*
* TODO if defaultbg color is changed, borders
@@ -2302,12 +2301,12 @@ strhandle(void) {
return;
}
break;
- case 'k': /* old title set compatibility */
+ case 'k': /* old title set compatibility */
xsettitle(strescseq.args[0]);
return;
- case 'P': /* DCS -- Device Control String */
- case '_': /* APC -- Application Program Command */
- case '^': /* PM -- Privacy Message */
+ case 'P': /* DCS -- Device Control String */
+ case '_': /* APC -- Application Program Command */
+ case '^': /* PM -- Privacy Message */
return;
}
@@ -2315,44 +2314,44 @@ strhandle(void) {
strdump();
}
-void
-strparse(void) {
+void strparse(void)
+{
int c;
char *p = strescseq.buf;
strescseq.narg = 0;
strescseq.buf[strescseq.len] = '\0';
- if(*p == '\0')
+ if (*p == '\0')
return;
- while(strescseq.narg < STR_ARG_SIZ) {
+ while (strescseq.narg < STR_ARG_SIZ) {
strescseq.args[strescseq.narg++] = p;
- while((c = *p) != ';' && c != '\0')
+ while ((c = *p) != ';' && c != '\0')
++p;
- if(c == '\0')
+ if (c == '\0')
return;
*p++ = '\0';
}
}
-void
-strdump(void) {
+void strdump(void)
+{
int i;
uint c;
printf("ESC%c", strescseq.type);
- for(i = 0; i < strescseq.len; i++) {
+ for (i = 0; i < strescseq.len; i++) {
c = strescseq.buf[i] & 0xff;
- if(c == '\0') {
+ if (c == '\0') {
return;
- } else if(isprint(c)) {
+ } else if (isprint(c)) {
putchar(c);
- } else if(c == '\n') {
+ } else if (c == '\n') {
printf("(\\n)");
- } else if(c == '\r') {
+ } else if (c == '\r') {
printf("(\\r)");
- } else if(c == 0x1b) {
+ } else if (c == 0x1b) {
printf("(\\e)");
} else {
printf("(%02x)", c);
@@ -2361,14 +2360,14 @@ strdump(void) {
printf("ESC\\\n");
}
-void
-strreset(void) {
+void strreset(void)
+{
memset(&strescseq, 0, sizeof(strescseq));
}
-void
-tprinter(char *s, size_t len) {
- if(iofd != -1 && xwrite(iofd, s, len) < 0) {
+void tprinter(char *s, size_t len)
+{
+ if (iofd != -1 && xwrite(iofd, s, len) < 0) {
fprintf(stderr, "Error writing in %s:%s\n",
opt_io, strerror(errno));
close(iofd);
@@ -2376,77 +2375,77 @@ tprinter(char *s, size_t len) {
}
}
-void
-toggleprinter(const Arg *arg) {
+void toggleprinter(const Arg * arg)
+{
term.mode ^= MODE_PRINT;
}
-void
-printscreen(const Arg *arg) {
+void printscreen(const Arg * arg)
+{
tdump();
}
-void
-printsel(const Arg *arg) {
+void printsel(const Arg * arg)
+{
tdumpsel();
}
-void
-tdumpsel(void) {
+void tdumpsel(void)
+{
char *ptr;
- if((ptr = getsel())) {
+ if ((ptr = getsel())) {
tprinter(ptr, strlen(ptr));
free(ptr);
}
}
-void
-tdumpline(int n) {
+void tdumpline(int n)
+{
char buf[UTF_SIZ];
Glyph *bp, *end;
bp = &term.line[n][0];
end = &bp[MIN(tlinelen(n), term.col) - 1];
- if(bp != end || bp->u != ' ') {
- for( ;bp <= end; ++bp)
+ if (bp != end || bp->u != ' ') {
+ for (; bp <= end; ++bp)
tprinter(buf, utf8encode(bp->u, buf));
}
tprinter("\n", 1);
}
-void
-tdump(void) {
+void tdump(void)
+{
int i;
- for(i = 0; i < term.row; ++i)
+ for (i = 0; i < term.row; ++i)
tdumpline(i);
}
-void
-tputtab(int n) {
+void tputtab(int n)
+{
uint x = term.c.x;
- if(n > 0) {
- while(x < term.col && n--)
- for(++x; x < term.col && !term.tabs[x]; ++x)
+ if (n > 0) {
+ while (x < term.col && n--)
+ for (++x; x < term.col && !term.tabs[x]; ++x)
/* nothing */ ;
- } else if(n < 0) {
- while(x > 0 && n++)
- for(--x; x > 0 && !term.tabs[x]; --x)
+ } else if (n < 0) {
+ while (x > 0 && n++)
+ for (--x; x > 0 && !term.tabs[x]; --x)
/* nothing */ ;
}
- term.c.x = LIMIT(x, 0, term.col-1);
+ term.c.x = LIMIT(x, 0, term.col - 1);
}
-void
-techo(long u) {
- if(ISCONTROL(u)) { /* control code */
- if(u & 0x80) {
+void techo(long u)
+{
+ if (ISCONTROL(u)) { /* control code */
+ if (u & 0x80) {
u &= 0x7f;
tputc('^');
tputc('[');
- } else if(u != '\n' && u != '\r' && u != '\t') {
+ } else if (u != '\n' && u != '\r' && u != '\t') {
u ^= 0x40;
tputc('^');
}
@@ -2454,44 +2453,44 @@ techo(long u) {
tputc(u);
}
-void
-tdeftran(char ascii) {
+void tdeftran(char ascii)
+{
static char cs[] = "0B";
- static int vcs[] = {CS_GRAPHIC0, CS_USA};
+ static int vcs[] = { CS_GRAPHIC0, CS_USA };
char *p;
- if((p = strchr(cs, ascii)) == NULL) {
+ if ((p = strchr(cs, ascii)) == NULL) {
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
} else {
term.trantbl[term.icharset] = vcs[p - cs];
}
}
-void
-tdectest(char c) {
+void tdectest(char c)
+{
int x, y;
- if(c == '8') { /* DEC screen alignment test. */
- for(x = 0; x < term.col; ++x) {
- for(y = 0; y < term.row; ++y)
+ if (c == '8') { /* DEC screen alignment test. */
+ for (x = 0; x < term.col; ++x) {
+ for (y = 0; y < term.row; ++y)
tsetchar('E', &term.c.attr, x, y);
}
}
}
-void
-tstrsequence(uchar c) {
+void tstrsequence(uchar c)
+{
switch (c) {
- case 0x90: /* DCS -- Device Control String */
+ case 0x90: /* DCS -- Device Control String */
c = 'P';
break;
- case 0x9f: /* APC -- Application Program Command */
+ case 0x9f: /* APC -- Application Program Command */
c = '_';
break;
- case 0x9e: /* PM -- Privacy Message */
+ case 0x9e: /* PM -- Privacy Message */
c = '^';
break;
- case 0x9d: /* OSC -- Operating System Command */
+ case 0x9d: /* OSC -- Operating System Command */
c = ']';
break;
}
@@ -2500,182 +2499,183 @@ tstrsequence(uchar c) {
term.esc |= ESC_STR;
}
-void
-tcontrolcode(uchar ascii) {
- switch(ascii) {
- case '\t': /* HT */
+void tcontrolcode(uchar ascii)
+{
+ switch (ascii) {
+ case '\t': /* HT */
tputtab(1);
return;
- case '\b': /* BS */
- tmoveto(term.c.x-1, term.c.y);
+ case '\b': /* BS */
+ tmoveto(term.c.x - 1, term.c.y);
return;
- case '\r': /* CR */
+ case '\r': /* CR */
tmoveto(0, term.c.y);
return;
- case '\f': /* LF */
- case '\v': /* VT */
- case '\n': /* LF */
+ case '\f': /* LF */
+ case '\v': /* VT */
+ case '\n': /* LF */
/* go to first col if the mode is set */
tnewline(IS_SET(MODE_CRLF));
return;
- case '\a': /* BEL */
- if(term.esc & ESC_STR_END) {
+ case '\a': /* BEL */
+ if (term.esc & ESC_STR_END) {
/* backwards compatibility to xterm */
strhandle();
} else {
- if(!(xw.state & WIN_FOCUSED))
+ if (!(xw.state & WIN_FOCUSED))
xseturgency(1);
if (bellvolume)
- XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
+ XkbBell(xw.dpy, xw.win, bellvolume,
+ (Atom) NULL);
}
break;
- case '\033': /* ESC */
+ case '\033': /* ESC */
csireset();
- term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
+ term.esc &= ~(ESC_CSI | ESC_ALTCHARSET | ESC_TEST);
term.esc |= ESC_START;
return;
- case '\016': /* SO (LS1 -- Locking shift 1) */
- case '\017': /* SI (LS0 -- Locking shift 0) */
+ case '\016': /* SO (LS1 -- Locking shift 1) */
+ case '\017': /* SI (LS0 -- Locking shift 0) */
term.charset = 1 - (ascii - '\016');
return;
- case '\032': /* SUB */
+ case '\032': /* SUB */
tsetchar('?', &term.c.attr, term.c.x, term.c.y);
- case '\030': /* CAN */
+ case '\030': /* CAN */
csireset();
break;
- 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;
- case 0x84: /* TODO: IND */
+ case 0x84: /* TODO: IND */
break;
- case 0x85: /* NEL -- Next line */
- tnewline(1); /* always go to first col */
+ case 0x85: /* NEL -- Next line */
+ tnewline(1); /* always go to first col */
break;
- case 0x88: /* HTS -- Horizontal tab stop */
+ case 0x88: /* HTS -- Horizontal tab stop */
term.tabs[term.c.x] = 1;
break;
- case 0x8d: /* TODO: RI */
- case 0x8e: /* TODO: SS2 */
- case 0x8f: /* TODO: SS3 */
- case 0x98: /* TODO: SOS */
+ case 0x8d: /* TODO: RI */
+ case 0x8e: /* TODO: SS2 */
+ case 0x8f: /* TODO: SS3 */
+ case 0x98: /* TODO: SOS */
break;
- case 0x9a: /* DECID -- Identify Terminal */
+ case 0x9a: /* DECID -- Identify Terminal */
ttywrite(vtiden, sizeof(vtiden) - 1);
break;
- case 0x9b: /* TODO: CSI */
- case 0x9c: /* TODO: ST */
+ case 0x9b: /* TODO: CSI */
+ case 0x9c: /* TODO: ST */
break;
- case 0x90: /* DCS -- Device Control String */
- case 0x9f: /* APC -- Application Program Command */
- case 0x9e: /* PM -- Privacy Message */
- case 0x9d: /* OSC -- Operating System Command */
+ case 0x90: /* DCS -- Device Control String */
+ case 0x9f: /* APC -- Application Program Command */
+ case 0x9e: /* PM -- Privacy Message */
+ case 0x9d: /* OSC -- Operating System Command */
tstrsequence(ascii);
return;
}
/* only CAN, SUB, \a and C1 chars interrupt a sequence */
- term.esc &= ~(ESC_STR_END|ESC_STR);
+ term.esc &= ~(ESC_STR_END | ESC_STR);
}
/*
* returns 1 when the sequence is finished and it hasn't to read
* more characters for this sequence, otherwise 0
*/
-int
-eschandle(uchar ascii) {
- switch(ascii) {
+int eschandle(uchar ascii)
+{
+ switch (ascii) {
case '[':
term.esc |= ESC_CSI;
return 0;
case '#':
term.esc |= ESC_TEST;
return 0;
- case 'P': /* DCS -- Device Control String */
- case '_': /* APC -- Application Program Command */
- case '^': /* PM -- Privacy Message */
- case ']': /* OSC -- Operating System Command */
- case 'k': /* old title set compatibility */
+ case 'P': /* DCS -- Device Control String */
+ case '_': /* APC -- Application Program Command */
+ case '^': /* PM -- Privacy Message */
+ case ']': /* OSC -- Operating System Command */
+ case 'k': /* old title set compatibility */
tstrsequence(ascii);
return 0;
- case 'n': /* LS2 -- Locking shift 2 */
- case 'o': /* LS3 -- Locking shift 3 */
+ 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 */
- case '+': /* G3D4 -- set quaternary charset G3 */
+ case '(': /* GZD4 -- set primary charset G0 */
+ case ')': /* G1D4 -- set secondary charset G1 */
+ case '*': /* G2D4 -- set tertiary charset G2 */
+ case '+': /* G3D4 -- set quaternary charset G3 */
term.icharset = ascii - '(';
term.esc |= ESC_ALTCHARSET;
return 0;
- case 'D': /* IND -- Linefeed */
- if(term.c.y == term.bot) {
+ case 'D': /* IND -- Linefeed */
+ if (term.c.y == term.bot) {
tscrollup(term.top, 1);
} else {
- tmoveto(term.c.x, term.c.y+1);
+ tmoveto(term.c.x, term.c.y + 1);
}
break;
- case 'E': /* NEL -- Next line */
- tnewline(1); /* always go to first col */
+ case 'E': /* NEL -- Next line */
+ tnewline(1); /* always go to first col */
break;
- case 'H': /* HTS -- Horizontal tab stop */
+ case 'H': /* HTS -- Horizontal tab stop */
term.tabs[term.c.x] = 1;
break;
- case 'M': /* RI -- Reverse index */
- if(term.c.y == term.top) {
+ case 'M': /* RI -- Reverse index */
+ if (term.c.y == term.top) {
tscrolldown(term.top, 1);
} else {
- tmoveto(term.c.x, term.c.y-1);
+ tmoveto(term.c.x, term.c.y - 1);
}
break;
- case 'Z': /* DECID -- Identify Terminal */
+ case 'Z': /* DECID -- Identify Terminal */
ttywrite(vtiden, sizeof(vtiden) - 1);
break;
- case 'c': /* RIS -- Reset to inital state */
+ case 'c': /* RIS -- Reset to inital state */
treset();
xresettitle();
xloadcols();
break;
- case '=': /* DECPAM -- Application keypad */
+ case '=': /* DECPAM -- Application keypad */
term.mode |= MODE_APPKEYPAD;
break;
- case '>': /* DECPNM -- Normal keypad */
+ case '>': /* DECPNM -- Normal keypad */
term.mode &= ~MODE_APPKEYPAD;
break;
- case '7': /* DECSC -- Save Cursor */
+ case '7': /* DECSC -- Save Cursor */
tcursor(CURSOR_SAVE);
break;
- case '8': /* DECRC -- Restore Cursor */
+ case '8': /* DECRC -- Restore Cursor */
tcursor(CURSOR_LOAD);
break;
- case '\\': /* ST -- String Terminator */
- if(term.esc & ESC_STR_END)
+ case '\\': /* ST -- String Terminator */
+ if (term.esc & ESC_STR_END)
strhandle();
break;
default:
fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
- (uchar) ascii, isprint(ascii)? ascii:'.');
+ (uchar) ascii, isprint(ascii) ? ascii : '.');
break;
}
return 1;
}
-void
-tputc(long u) {
+void tputc(long u)
+{
char c[UTF_SIZ];
bool control;
int width, len;
Glyph *gp;
len = utf8encode(u, c);
- if((width = wcwidth(u)) == -1) {
- memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
+ if ((width = wcwidth(u)) == -1) {
+ memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
width = 1;
}
- if(IS_SET(MODE_PRINT))
+ if (IS_SET(MODE_PRINT))
tprinter(c, len);
control = ISCONTROL(u);
@@ -2685,29 +2685,29 @@ tputc(long u) {
* receives a ESC, a SUB, a ST or any other C1 control
* character.
*/
- if(term.esc & ESC_STR) {
- if(u == '\a' || u == 030 || u == 032 || u == 033 ||
- ISCONTROLC1(u)) {
- term.esc &= ~(ESC_START|ESC_STR);
+ if (term.esc & ESC_STR) {
+ if (u == '\a' || u == 030 || u == 032 || u == 033 ||
+ ISCONTROLC1(u)) {
+ term.esc &= ~(ESC_START | ESC_STR);
term.esc |= ESC_STR_END;
- } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
+ } else if (strescseq.len + len < sizeof(strescseq.buf) - 1) {
memmove(&strescseq.buf[strescseq.len], c, len);
strescseq.len += len;
return;
} else {
- /*
- * Here is a bug in terminals. If the user never sends
- * some code to stop the str or esc command, then st
- * will stop responding. But this is better than
- * silently failing with unknown characters. At least
- * then users will report back.
- *
- * In the case users ever get fixed, here is the code:
- */
- /*
- * term.esc = 0;
- * strhandle();
- */
+ /*
+ * Here is a bug in terminals. If the user never sends
+ * some code to stop the str or esc command, then st
+ * will stop responding. But this is better than
+ * silently failing with unknown characters. At least
+ * then users will report back.
+ *
+ * In the case users ever get fixed, here is the code:
+ */
+ /*
+ * term.esc = 0;
+ * strhandle();
+ */
return;
}
}
@@ -2717,26 +2717,25 @@ tputc(long u) {
* because they can be embedded inside a control sequence, and
* they must not cause conflicts with sequences.
*/
- if(control) {
+ if (control) {
tcontrolcode(u);
/*
* control codes are not shown ever
*/
return;
- } else if(term.esc & ESC_START) {
- if(term.esc & ESC_CSI) {
+ } else if (term.esc & ESC_START) {
+ if (term.esc & ESC_CSI) {
csiescseq.buf[csiescseq.len++] = u;
- if(BETWEEN(u, 0x40, 0x7E)
- || csiescseq.len >= \
- sizeof(csiescseq.buf)-1) {
+ if (BETWEEN(u, 0x40, 0x7E)
+ || csiescseq.len >= sizeof(csiescseq.buf) - 1) {
term.esc = 0;
csiparse();
csihandle();
}
return;
- } else if(term.esc & ESC_ALTCHARSET) {
+ } else if (term.esc & ESC_ALTCHARSET) {
tdeftran(u);
- } else if(term.esc & ESC_TEST) {
+ } else if (term.esc & ESC_TEST) {
tdectest(u);
} else {
if (!eschandle(u))
@@ -2750,51 +2749,51 @@ tputc(long u) {
*/
return;
}
- if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+ if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
selclear(NULL);
gp = &term.line[term.c.y][term.c.x];
- if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+ if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
gp->mode |= ATTR_WRAP;
tnewline(1);
gp = &term.line[term.c.y][term.c.x];
}
- if(IS_SET(MODE_INSERT) && term.c.x+width < term.col)
- memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
+ if (IS_SET(MODE_INSERT) && term.c.x + width < term.col)
+ memmove(gp + width, gp,
+ (term.col - term.c.x - width) * sizeof(Glyph));
- if(term.c.x+width > term.col) {
+ if (term.c.x + width > term.col) {
tnewline(1);
gp = &term.line[term.c.y][term.c.x];
}
tsetchar(u, &term.c.attr, term.c.x, term.c.y);
- if(width == 2) {
+ if (width == 2) {
gp->mode |= ATTR_WIDE;
- if(term.c.x+1 < term.col) {
+ if (term.c.x + 1 < term.col) {
gp[1].u = '\0';
gp[1].mode = ATTR_WDUMMY;
}
}
- if(term.c.x+width < term.col) {
- tmoveto(term.c.x+width, term.c.y);
+ if (term.c.x + width < term.col) {
+ tmoveto(term.c.x + width, term.c.y);
} else {
term.c.state |= CURSOR_WRAPNEXT;
}
}
-void
-tresize(int col, int row) {
+void tresize(int col, int row)
+{
int i;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
bool *bp;
TCursor c;
- if(col < 1 || row < 1) {
- fprintf(stderr,
- "tresize: error resizing to %dx%d\n", col, row);
+ if (col < 1 || row < 1) {
+ fprintf(stderr, "tresize: error resizing to %dx%d\n", col, row);
return;
}
@@ -2803,7 +2802,7 @@ tresize(int col, int row) {
* tscrollup would work here, but we can optimize to
* memmove because we're freeing the earlier lines
*/
- for(i = 0; i <= term.c.y - row; i++) {
+ for (i = 0; i <= term.c.y - row; i++) {
free(term.line[i]);
free(term.alt[i]);
}
@@ -2812,51 +2811,51 @@ tresize(int col, int row) {
memmove(term.line, term.line + i, row * sizeof(Line));
memmove(term.alt, term.alt + i, row * sizeof(Line));
}
- for(i += row; i < term.row; i++) {
+ for (i += row; i < term.row; i++) {
free(term.line[i]);
free(term.alt[i]);
}
/* resize to new height */
term.line = xrealloc(term.line, row * sizeof(Line));
- term.alt = xrealloc(term.alt, row * sizeof(Line));
+ term.alt = xrealloc(term.alt, row * sizeof(Line));
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
/* resize each row to new width, zero-pad if needed */
- for(i = 0; i < minrow; i++) {
+ for (i = 0; i < minrow; i++) {
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
- term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
+ term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
}
/* allocate any new rows */
- for(/* i == minrow */; i < row; i++) {
+ for ( /* i == minrow */ ; i < row; i++) {
term.line[i] = xmalloc(col * sizeof(Glyph));
term.alt[i] = xmalloc(col * sizeof(Glyph));
}
- if(col > term.col) {
+ if (col > term.col) {
bp = term.tabs + term.col;
memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
- while(--bp > term.tabs && !*bp)
+ while (--bp > term.tabs && !*bp)
/* nothing */ ;
- for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
+ for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
*bp = 1;
}
/* update terminal size */
term.col = col;
term.row = row;
/* reset scrolling region */
- tsetscroll(0, row-1);
+ tsetscroll(0, row - 1);
/* make use of the LIMIT in tmoveto */
tmoveto(term.c.x, term.c.y);
/* Clearing both screens (it makes dirty all lines) */
c = term.c;
- for(i = 0; i < 2; i++) {
- if(mincol < col && 0 < minrow) {
+ for (i = 0; i < 2; i++) {
+ if (mincol < col && 0 < minrow) {
tclearregion(mincol, 0, col - 1, minrow - 1);
}
- if(0 < col && minrow < row) {
+ if (0 < col && minrow < row) {
tclearregion(0, minrow, col - 1, row - 1);
}
tswapscreen();
@@ -2865,75 +2864,76 @@ tresize(int col, int row) {
term.c = c;
}
-void
-xresize(int col, int row) {
+void xresize(int col, int row)
+{
xw.tw = MAX(1, col * xw.cw);
xw.th = MAX(1, row * xw.ch);
XFreePixmap(xw.dpy, xw.buf);
xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
- DefaultDepth(xw.dpy, xw.scr));
+ DefaultDepth(xw.dpy, xw.scr));
XftDrawChange(xw.draw, xw.buf);
xclear(0, 0, xw.w, xw.h);
}
-ushort
-sixd_to_16bit(int x) {
+ushort sixd_to_16bit(int x)
+{
return x == 0 ? 0 : 0x3737 + 0x2828 * x;
}
-bool
-xloadcolor(int i, const char *name, Color *ncolor) {
- XRenderColor color = { .alpha = 0xffff };
-
- if(!name) {
- if(BETWEEN(i, 16, 255)) { /* 256 color */
- if(i < 6*6*6+16) { /* same colors as xterm */
- color.red = sixd_to_16bit( ((i-16)/36)%6 );
- color.green = sixd_to_16bit( ((i-16)/6) %6 );
- color.blue = sixd_to_16bit( ((i-16)/1) %6 );
- } else { /* greyscale */
- color.red = 0x0808 + 0x0a0a * (i - (6*6*6+16));
+bool xloadcolor(int i, const char *name, Color * ncolor)
+{
+ XRenderColor color = {.alpha = 0xffff };
+
+ if (!name) {
+ if (BETWEEN(i, 16, 255)) { /* 256 color */
+ if (i < 6 * 6 * 6 + 16) { /* same colors as xterm */
+ color.red = sixd_to_16bit(((i - 16) / 36) % 6);
+ color.green = sixd_to_16bit(((i - 16) / 6) % 6);
+ color.blue = sixd_to_16bit(((i - 16) / 1) % 6);
+ } else { /* greyscale */
+ color.red =
+ 0x0808 + 0x0a0a * (i - (6 * 6 * 6 + 16));
color.green = color.blue = color.red;
}
return XftColorAllocValue(xw.dpy, xw.vis,
- xw.cmap, &color, ncolor);
+ xw.cmap, &color, ncolor);
} else
name = colorname[i];
}
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
}
-void
-xloadcols(void) {
+void xloadcols(void)
+{
int i;
static bool loaded;
Color *cp;
- if(loaded) {
+ if (loaded) {
for (cp = dc.col; cp < &dc.col[LEN(dc.col)]; ++cp)
XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
}
- for(i = 0; i < LEN(dc.col); i++)
- if(!xloadcolor(i, NULL, &dc.col[i])) {
- if(colorname[i])
- die("Could not allocate color '%s'\n", colorname[i]);
+ for (i = 0; i < LEN(dc.col); i++)
+ if (!xloadcolor(i, NULL, &dc.col[i])) {
+ if (colorname[i])
+ die("Could not allocate color '%s'\n",
+ colorname[i]);
else
die("Could not allocate color %d\n", i);
}
loaded = true;
}
-int
-xsetcolorname(int x, const char *name) {
+int xsetcolorname(int x, const char *name)
+{
Color ncolor;
- if(!BETWEEN(x, 0, LEN(dc.col)))
+ if (!BETWEEN(x, 0, LEN(dc.col)))
return 1;
-
- if(!xloadcolor(x, name, &ncolor))
+ if (!xloadcolor(x, name, &ncolor))
return 1;
XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
@@ -2941,30 +2941,29 @@ xsetcolorname(int x, const char *name) {
return 0;
}
-void
-xtermclear(int col1, int row1, int col2, int row2) {
+void xtermclear(int col1, int row1, int col2, int row2)
+{
XftDrawRect(xw.draw,
- &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
- borderpx + col1 * xw.cw,
- borderpx + row1 * xw.ch,
- (col2-col1+1) * xw.cw,
- (row2-row1+1) * xw.ch);
+ &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+ borderpx + col1 * xw.cw,
+ borderpx + row1 * xw.ch,
+ (col2 - col1 + 1) * xw.cw, (row2 - row1 + 1) * xw.ch);
}
/*
* Absolute coordinates.
*/
-void
-xclear(int x1, int y1, int x2, int y2) {
+void xclear(int x1, int y1, int x2, int y2)
+{
XftDrawRect(xw.draw,
- &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
- x1, y1, x2-x1, y2-y1);
+ &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+ x1, y1, x2 - x1, y2 - y1);
}
-void
-xhints(void) {
- XClassHint class = {opt_class ? opt_class : termname, termname};
- XWMHints wm = {.flags = InputHint, .input = 1};
+void xhints(void)
+{
+ XClassHint class = { opt_class ? opt_class : termname, termname };
+ XWMHints wm = {.flags = InputHint,.input = 1 };
XSizeHints *sizeh = NULL;
sizeh = XAllocSizeHints();
@@ -2976,12 +2975,12 @@ xhints(void) {
sizeh->width_inc = xw.cw;
sizeh->base_height = 2 * borderpx;
sizeh->base_width = 2 * borderpx;
- if(xw.isfixed == True) {
+ if (xw.isfixed == True) {
sizeh->flags |= PMaxSize | PMinSize;
sizeh->min_width = sizeh->max_width = xw.w;
sizeh->min_height = sizeh->max_height = xw.h;
}
- if(xw.gm & (XValue|YValue)) {
+ if (xw.gm & (XValue | YValue)) {
sizeh->flags |= USPosition | PWinGravity;
sizeh->x = xw.l;
sizeh->y = xw.t;
@@ -2989,13 +2988,13 @@ xhints(void) {
}
XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
- &class);
+ &class);
XFree(sizeh);
}
-int
-xgeommasktogravity(int mask) {
- switch(mask & (XNegative|YNegative)) {
+int xgeommasktogravity(int mask)
+{
+ switch (mask & (XNegative | YNegative)) {
case 0:
return NorthWestGravity;
case XNegative:
@@ -3006,16 +3005,16 @@ xgeommasktogravity(int mask) {
return SouthEastGravity;
}
-int
-xloadfont(Font *f, FcPattern *pattern) {
+int xloadfont(Font * f, FcPattern * pattern)
+{
FcPattern *match;
FcResult result;
match = FcFontMatch(NULL, pattern, &result);
- if(!match)
+ if (!match)
return 1;
- if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
+ if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(match);
return 1;
}
@@ -3034,23 +3033,23 @@ xloadfont(Font *f, FcPattern *pattern) {
return 0;
}
-void
-xloadfonts(char *fontstr, double fontsize) {
+void xloadfonts(char *fontstr, double fontsize)
+{
FcPattern *pattern;
FcResult r_sz, r_psz;
double fontval;
float ceilf(float);
- if(fontstr[0] == '-') {
+ if (fontstr[0] == '-') {
pattern = XftXlfdParse(fontstr, False, False);
} else {
- pattern = FcNameParse((FcChar8 *)fontstr);
+ pattern = FcNameParse((FcChar8 *) fontstr);
}
- if(!pattern)
+ if (!pattern)
die("st: can't open font %s\n", fontstr);
- if(fontsize > 1) {
+ if (fontsize > 1) {
FcPatternDel(pattern, FC_PIXEL_SIZE);
FcPatternDel(pattern, FC_SIZE);
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
@@ -3058,9 +3057,9 @@ xloadfonts(char *fontstr, double fontsize) {
} else {
r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval);
- if(r_psz == FcResultMatch) {
+ if (r_psz == FcResultMatch) {
usedfontsize = fontval;
- } else if(r_sz == FcResultMatch) {
+ } else if (r_sz == FcResultMatch) {
usedfontsize = -1;
} else {
/*
@@ -3076,14 +3075,14 @@ xloadfonts(char *fontstr, double fontsize) {
FcConfigSubstitute(0, pattern, FcMatchPattern);
FcDefaultSubstitute(pattern);
- if(xloadfont(&dc.font, pattern))
+ if (xloadfont(&dc.font, pattern))
die("st: can't open font %s\n", fontstr);
- if(usedfontsize < 0) {
+ if (usedfontsize < 0) {
FcPatternGetDouble(dc.font.match->pattern,
- FC_PIXEL_SIZE, 0, &fontval);
+ FC_PIXEL_SIZE, 0, &fontval);
usedfontsize = fontval;
- if(fontsize == 0)
+ if (fontsize == 0)
defaultfontsize = fontval;
}
@@ -3093,34 +3092,34 @@ xloadfonts(char *fontstr, double fontsize) {
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
- if(xloadfont(&dc.ifont, pattern))
+ if (xloadfont(&dc.ifont, pattern))
die("st: can't open font %s\n", fontstr);
FcPatternDel(pattern, FC_WEIGHT);
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
- if(xloadfont(&dc.ibfont, pattern))
+ if (xloadfont(&dc.ibfont, pattern))
die("st: can't open font %s\n", fontstr);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
- if(xloadfont(&dc.bfont, pattern))
+ if (xloadfont(&dc.bfont, pattern))
die("st: can't open font %s\n", fontstr);
FcPatternDestroy(pattern);
}
-void
-xunloadfont(Font *f) {
+void xunloadfont(Font * f)
+{
XftFontClose(xw.dpy, f->match);
FcPatternDestroy(f->pattern);
- if(f->set)
+ if (f->set)
FcFontSetDestroy(f->set);
}
-void
-xunloadfonts(void) {
+void xunloadfonts(void)
+{
/* Free the loaded fonts in the font cache. */
- while(frclen > 0)
+ while (frclen > 0)
XftFontClose(xw.dpy, frc[--frclen].font);
xunloadfont(&dc.font);
@@ -3129,16 +3128,16 @@ xunloadfonts(void) {
xunloadfont(&dc.ibfont);
}
-void
-xzoom(const Arg *arg) {
+void xzoom(const Arg * arg)
+{
Arg larg;
larg.i = usedfontsize + arg->i;
xzoomabs(&larg);
}
-void
-xzoomabs(const Arg *arg) {
+void xzoomabs(const Arg * arg)
+{
xunloadfonts();
xloadfonts(usedfont, arg->i);
cresize(0, 0);
@@ -3146,33 +3145,33 @@ xzoomabs(const Arg *arg) {
xhints();
}
-void
-xzoomreset(const Arg *arg) {
+void xzoomreset(const Arg * arg)
+{
Arg larg;
- if(defaultfontsize > 0) {
+ if (defaultfontsize > 0) {
larg.i = defaultfontsize;
xzoomabs(&larg);
}
}
-void
-xinit(void) {
+void xinit(void)
+{
XGCValues gcvalues;
Cursor cursor;
Window parent;
pid_t thispid = getpid();
- if(!(xw.dpy = XOpenDisplay(NULL)))
+ if (!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
/* font */
- if(!FcInit())
+ if (!FcInit())
die("Could not init fontconfig.\n");
- usedfont = (opt_font == NULL)? font : opt_font;
+ usedfont = (opt_font == NULL) ? font : opt_font;
xloadfonts(usedfont, 0);
/* colors */
@@ -3182,9 +3181,9 @@ xinit(void) {
/* adjust fixed window geometry */
xw.w = 2 * borderpx + term.col * xw.cw;
xw.h = 2 * borderpx + term.row * xw.ch;
- if(xw.gm & XNegative)
+ if (xw.gm & XNegative)
xw.l += DisplayWidth(xw.dpy, xw.scr) - xw.w - 2;
- if(xw.gm & YNegative)
+ if (xw.gm & YNegative)
xw.t += DisplayWidth(xw.dpy, xw.scr) - xw.h - 2;
/* Events */
@@ -3192,23 +3191,23 @@ xinit(void) {
xw.attrs.border_pixel = dc.col[defaultbg].pixel;
xw.attrs.bit_gravity = NorthWestGravity;
xw.attrs.event_mask = FocusChangeMask | KeyPressMask
- | ExposureMask | VisibilityChangeMask | StructureNotifyMask
- | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
+ | ExposureMask | VisibilityChangeMask | StructureNotifyMask
+ | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
xw.attrs.colormap = xw.cmap;
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
parent = XRootWindow(xw.dpy, xw.scr);
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
- xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
- xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- | CWEventMask | CWColormap, &xw.attrs);
+ xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr),
+ InputOutput, xw.vis,
+ CWBackPixel | CWBorderPixel | CWBitGravity |
+ CWEventMask | CWColormap, &xw.attrs);
memset(&gcvalues, 0, sizeof(gcvalues));
gcvalues.graphics_exposures = False;
- dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
- &gcvalues);
+ dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures, &gcvalues);
xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
- DefaultDepth(xw.dpy, xw.scr));
+ DefaultDepth(xw.dpy, xw.scr));
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
@@ -3216,29 +3215,31 @@ xinit(void) {
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
/* input methods */
- if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+ if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
XSetLocaleModifiers("@im=local");
- if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+ if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
XSetLocaleModifiers("@im=");
- if((xw.xim = XOpenIM(xw.dpy,
- NULL, NULL, NULL)) == NULL) {
+ if ((xw.xim = XOpenIM(xw.dpy,
+ NULL, NULL, NULL)) == NULL) {
die("XOpenIM failed. Could not open input"
- " device.\n");
+ " device.\n");
}
}
}
xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
- | XIMStatusNothing, XNClientWindow, xw.win,
- XNFocusWindow, xw.win, NULL);
- if(xw.xic == NULL)
+ | XIMStatusNothing, XNClientWindow, xw.win,
+ XNFocusWindow, xw.win, NULL);
+ if (xw.xic == NULL)
die("XCreateIC failed. Could not obtain input method.\n");
/* white cursor, black outline */
cursor = XCreateFontCursor(xw.dpy, XC_xterm);
XDefineCursor(xw.dpy, xw.win, cursor);
- XRecolorCursor(xw.dpy, cursor,
- &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
- &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
+ XRecolorCursor(xw.dpy, cursor, &(XColor) {
+ .red = 0xffff,.green = 0xffff,.blue = 0xffff}
+ , &(XColor) {
+ .red = 0x0000,.green = 0x0000,.blue = 0x0000}
+ );
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
@@ -3247,7 +3248,7 @@ xinit(void) {
xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
- PropModeReplace, (uchar *)&thispid, 1);
+ PropModeReplace, (uchar *) & thispid, 1);
xresettitle();
XMapWindow(xw.dpy, xw.win);
@@ -3255,8 +3256,8 @@ xinit(void) {
XSync(xw.dpy, False);
}
-void
-xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
+void xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen)
+{
int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
width = charlen * xw.cw, xp, i;
int frcflags, charexists;
@@ -3275,22 +3276,22 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
frcflags = FRC_NORMAL;
- if(base.mode & ATTR_ITALIC) {
- if(base.fg == defaultfg)
+ if (base.mode & ATTR_ITALIC) {
+ if (base.fg == defaultfg)
base.fg = defaultitalic;
font = &dc.ifont;
frcflags = FRC_ITALIC;
- } else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
- if(base.fg == defaultfg)
+ } else if ((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
+ if (base.fg == defaultfg)
base.fg = defaultitalic;
font = &dc.ibfont;
frcflags = FRC_ITALICBOLD;
- } else if(base.mode & ATTR_UNDERLINE) {
- if(base.fg == defaultfg)
+ } else if (base.mode & ATTR_UNDERLINE) {
+ if (base.fg == defaultfg)
base.fg = defaultunderline;
}
- if(IS_TRUECOL(base.fg)) {
+ if (IS_TRUECOL(base.fg)) {
colfg.alpha = 0xffff;
colfg.red = TRUERED(base.fg);
colfg.green = TRUEGREEN(base.fg);
@@ -3301,7 +3302,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
fg = &dc.col[base.fg];
}
- if(IS_TRUECOL(base.bg)) {
+ if (IS_TRUECOL(base.bg)) {
colbg.alpha = 0xffff;
colbg.green = TRUEGREEN(base.bg);
colbg.red = TRUERED(base.bg);
@@ -3312,15 +3313,15 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
bg = &dc.col[base.bg];
}
- if(base.mode & ATTR_BOLD) {
+ if (base.mode & ATTR_BOLD) {
/*
* change basic system colors [0-7]
* to bright system colors [8-15]
*/
- if(BETWEEN(base.fg, 0, 7) && !(base.mode & ATTR_FAINT))
- fg = &dc.col[base.fg + 8];
+ if (BETWEEN(base.fg, 0, 7) && !(base.mode & ATTR_FAINT))
+ fg = &dc.col[base.fg];
- if(base.mode & ATTR_ITALIC) {
+ if (base.mode & ATTR_ITALIC) {
font = &dc.ibfont;
frcflags = FRC_ITALICBOLD;
} else {
@@ -3329,8 +3330,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
}
}
- if(IS_SET(MODE_REVERSE)) {
- if(fg == &dc.col[defaultfg]) {
+ if (IS_SET(MODE_REVERSE)) {
+ if (fg == &dc.col[defaultfg]) {
fg = &dc.col[defaultbg];
} else {
colfg.red = ~fg->color.red;
@@ -3338,11 +3339,11 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
colfg.blue = ~fg->color.blue;
colfg.alpha = fg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
- &revfg);
+ &revfg);
fg = &revfg;
}
- if(bg == &dc.col[defaultbg]) {
+ if (bg == &dc.col[defaultbg]) {
bg = &dc.col[defaultfg];
} else {
colbg.red = ~bg->color.red;
@@ -3350,18 +3351,18 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
colbg.blue = ~bg->color.blue;
colbg.alpha = bg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
- &revbg);
+ &revbg);
bg = &revbg;
}
}
- if(base.mode & ATTR_REVERSE) {
+ if (base.mode & ATTR_REVERSE) {
temp = fg;
fg = bg;
bg = temp;
}
- if(base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) {
+ if (base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) {
colfg.red = fg->color.red / 2;
colfg.green = fg->color.green / 2;
colfg.blue = fg->color.blue / 2;
@@ -3369,24 +3370,24 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
fg = &revfg;
}
- if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
+ if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
fg = bg;
- if(base.mode & ATTR_INVISIBLE)
+ if (base.mode & ATTR_INVISIBLE)
fg = bg;
/* Intelligent cleaning up of the borders. */
- if(x == 0) {
- xclear(0, (y == 0)? 0 : winy, borderpx,
- winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
+ if (x == 0) {
+ xclear(0, (y == 0) ? 0 : winy, borderpx,
+ winy + xw.ch + ((y >= term.row - 1) ? xw.h : 0));
}
- if(x + charlen >= term.col) {
- xclear(winx + width, (y == 0)? 0 : winy, xw.w,
- ((y >= term.row-1)? xw.h : (winy + xw.ch)));
+ if (x + charlen >= term.col) {
+ xclear(winx + width, (y == 0) ? 0 : winy, xw.w,
+ ((y >= term.row - 1) ? xw.h : (winy + xw.ch)));
}
- if(y == 0)
+ if (y == 0)
xclear(winx, 0, winx + width, borderpx);
- if(y == term.row-1)
+ if (y == term.row - 1)
xclear(winx, winy + xw.ch, winx + width, xw.h);
/* Clean up the region we want to draw to. */
@@ -3399,7 +3400,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
r.width = width;
XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
- for(xp = winx; bytelen > 0;) {
+ for (xp = winx; bytelen > 0;) {
/*
* Search for the range in the to be printed string of glyphs
* that are in the main font. Then print that range. If
@@ -3410,54 +3411,55 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
u8fblen = 0;
u8fl = 0;
oneatatime = font->width != xw.cw;
- for(;;) {
+ for (;;) {
u8c = s;
u8cblen = utf8decode(s, &unicodep, UTF_SIZ);
s += u8cblen;
bytelen -= u8cblen;
- doesexist = XftCharExists(xw.dpy, font->match, unicodep);
- if(doesexist) {
- u8fl++;
- u8fblen += u8cblen;
- if(!oneatatime && bytelen > 0)
- continue;
+ doesexist =
+ XftCharExists(xw.dpy, font->match, unicodep);
+ if (doesexist) {
+ u8fl++;
+ u8fblen += u8cblen;
+ if (!oneatatime && bytelen > 0)
+ continue;
}
- if(u8fl > 0) {
+ if (u8fl > 0) {
XftDrawStringUtf8(xw.draw, fg,
- font->match, xp,
- winy + font->ascent,
- (FcChar8 *)u8fs,
- u8fblen);
+ font->match, xp,
+ winy + font->ascent,
+ (FcChar8 *) u8fs, u8fblen);
xp += xw.cw * u8fl;
}
break;
}
- if(doesexist) {
- if(oneatatime)
+ if (doesexist) {
+ if (oneatatime)
continue;
break;
}
/* Search the font cache. */
- for(i = 0; i < frclen; i++) {
- charexists = XftCharExists(xw.dpy, frc[i].font, unicodep);
+ for (i = 0; i < frclen; i++) {
+ charexists =
+ XftCharExists(xw.dpy, frc[i].font, unicodep);
/* Everything correct. */
- if(charexists && frc[i].flags == frcflags)
+ if (charexists && frc[i].flags == frcflags)
break;
/* We got a default font for a not found glyph. */
- if(!charexists && frc[i].flags == frcflags \
- && frc[i].unicodep == unicodep) {
+ if (!charexists && frc[i].flags == frcflags
+ && frc[i].unicodep == unicodep) {
break;
}
}
/* Nothing was found. */
- if(i >= frclen) {
- if(!font->set)
+ if (i >= frclen) {
+ if (!font->set)
font->set = FcFontSort(0, font->pattern,
- FcTrue, 0, &fcres);
+ FcTrue, 0, &fcres);
fcsets[0] = font->set;
/*
@@ -3471,29 +3473,26 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
fccharset = FcCharSetCreate();
FcCharSetAddChar(fccharset, unicodep);
- FcPatternAddCharSet(fcpattern, FC_CHARSET,
- fccharset);
- FcPatternAddBool(fcpattern, FC_SCALABLE,
- FcTrue);
+ FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
+ FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
- FcConfigSubstitute(0, fcpattern,
- FcMatchPattern);
+ FcConfigSubstitute(0, fcpattern, FcMatchPattern);
FcDefaultSubstitute(fcpattern);
fontpattern = FcFontSetMatch(0, fcsets, 1,
- fcpattern, &fcres);
+ fcpattern, &fcres);
/*
* Overwrite or create the new cache entry.
*/
- if(frclen >= LEN(frc)) {
+ if (frclen >= LEN(frc)) {
frclen = LEN(frc) - 1;
XftFontClose(xw.dpy, frc[frclen].font);
frc[frclen].unicodep = 0;
}
frc[frclen].font = XftFontOpenPattern(xw.dpy,
- fontpattern);
+ fontpattern);
frc[frclen].flags = frcflags;
frc[frclen].unicodep = unicodep;
@@ -3505,8 +3504,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
}
XftDrawStringUtf8(xw.draw, fg, frc[i].font,
- xp, winy + frc[i].font->ascent,
- (FcChar8 *)u8c, u8cblen);
+ xp, winy + frc[i].font->ascent,
+ (FcChar8 *) u8c, u8cblen);
xp += xw.cw * wcwidth(unicodep);
}
@@ -3518,26 +3517,26 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
* I have to repeat: Xft and Fontconfig are design failures.
*/
/*
- XftDrawStringUtf8(xw.draw, fg, font->set, winx,
- winy + font->ascent, (FcChar8 *)s, bytelen);
- */
+ XftDrawStringUtf8(xw.draw, fg, font->set, winx,
+ winy + font->ascent, (FcChar8 *)s, bytelen);
+ */
- if(base.mode & ATTR_UNDERLINE) {
+ if (base.mode & ATTR_UNDERLINE) {
XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
- width, 1);
+ width, 1);
}
- if(base.mode & ATTR_STRUCK) {
+ if (base.mode & ATTR_STRUCK) {
XftDrawRect(xw.draw, fg, winx, winy + 2 * font->ascent / 3,
- width, 1);
+ width, 1);
}
/* Reset clip to none. */
XftDrawSetClip(xw.draw, 0);
}
-void
-xdrawglyph(Glyph g, int x, int y) {
+void xdrawglyph(Glyph g, int x, int y)
+{
static char buf[UTF_SIZ];
size_t len = utf8encode(g.u, buf);
int width = g.mode & ATTR_WIDE ? 2 : 1;
@@ -3545,21 +3544,21 @@ xdrawglyph(Glyph g, int x, int y) {
xdraws(buf, g, x, y, width, len);
}
-void
-xdrawcursor(void) {
+void xdrawcursor(void)
+{
static int oldx = 0, oldy = 0;
int curx;
- Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs};
+ Glyph g = { ' ', ATTR_NULL, defaultbg, defaultcs };
- LIMIT(oldx, 0, term.col-1);
- LIMIT(oldy, 0, term.row-1);
+ LIMIT(oldx, 0, term.col - 1);
+ LIMIT(oldy, 0, term.row - 1);
curx = term.c.x;
/* adjust position if in dummy */
- if(term.line[oldy][oldx].mode & ATTR_WDUMMY)
+ if (term.line[oldy][oldx].mode & ATTR_WDUMMY)
oldx--;
- if(term.line[term.c.y][curx].mode & ATTR_WDUMMY)
+ if (term.line[term.c.y][curx].mode & ATTR_WDUMMY)
curx--;
g.u = term.line[term.c.y][term.c.x].u;
@@ -3567,161 +3566,154 @@ xdrawcursor(void) {
/* remove the old cursor */
xdrawglyph(term.line[oldy][oldx], oldx, oldy);
- if(IS_SET(MODE_HIDE))
+ if (IS_SET(MODE_HIDE))
return;
/* draw the new one */
- if(xw.state & WIN_FOCUSED) {
+ if (xw.state & WIN_FOCUSED) {
switch (xw.cursor) {
- case 0: /* Blinking Block */
- case 1: /* Blinking Block (Default) */
- case 2: /* Steady Block */
- if(IS_SET(MODE_REVERSE)) {
- g.mode |= ATTR_REVERSE;
- g.fg = defaultcs;
- g.bg = defaultfg;
- }
+ case 0: /* Blinking Block */
+ case 1: /* Blinking Block (Default) */
+ case 2: /* Steady Block */
+ if (IS_SET(MODE_REVERSE)) {
+ g.mode |= ATTR_REVERSE;
+ g.fg = defaultcs;
+ g.bg = defaultfg;
+ }
- g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
- xdrawglyph(g, term.c.x, term.c.y);
- break;
- case 3: /* Blinking Underline */
- case 4: /* Steady Underline */
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
- xw.cw, cursorthickness);
- break;
- case 5: /* Blinking bar */
- case 6: /* Steady bar */
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + term.c.y * xw.ch,
- cursorthickness, xw.ch);
- break;
+ g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
+ xdrawglyph(g, term.c.x, term.c.y);
+ break;
+ case 3: /* Blinking Underline */
+ case 4: /* Steady Underline */
+ XftDrawRect(xw.draw, &dc.col[defaultcs],
+ borderpx + curx * xw.cw,
+ borderpx + (term.c.y + 1) * xw.ch -
+ cursorthickness, xw.cw, cursorthickness);
+ break;
+ case 5: /* Blinking bar */
+ case 6: /* Steady bar */
+ XftDrawRect(xw.draw, &dc.col[defaultcs],
+ borderpx + curx * xw.cw,
+ borderpx + term.c.y * xw.ch,
+ cursorthickness, xw.ch);
+ break;
}
} else {
XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + term.c.y * xw.ch,
- xw.cw - 1, 1);
+ borderpx + curx * xw.cw,
+ borderpx + term.c.y * xw.ch, xw.cw - 1, 1);
XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + term.c.y * xw.ch,
- 1, xw.ch - 1);
+ borderpx + curx * xw.cw,
+ borderpx + term.c.y * xw.ch, 1, xw.ch - 1);
XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + (curx + 1) * xw.cw - 1,
- borderpx + term.c.y * xw.ch,
- 1, xw.ch - 1);
+ borderpx + (curx + 1) * xw.cw - 1,
+ borderpx + term.c.y * xw.ch, 1, xw.ch - 1);
XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + (term.c.y + 1) * xw.ch - 1,
- xw.cw, 1);
+ borderpx + curx * xw.cw,
+ borderpx + (term.c.y + 1) * xw.ch - 1, xw.cw, 1);
}
oldx = curx, oldy = term.c.y;
}
-
-void
-xsettitle(char *p) {
+void xsettitle(char *p)
+{
XTextProperty prop;
- Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
- &prop);
+ Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, &prop);
XSetWMName(xw.dpy, xw.win, &prop);
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
XFree(prop.value);
}
-void
-xresettitle(void) {
+void xresettitle(void)
+{
xsettitle(opt_title ? opt_title : "st");
}
-void
-redraw(void) {
+void redraw(void)
+{
tfulldirt();
draw();
}
-void
-draw(void) {
+void draw(void)
+{
drawregion(0, 0, term.col, term.row);
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
- xw.h, 0, 0);
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, 0, 0);
XSetForeground(xw.dpy, dc.gc,
- dc.col[IS_SET(MODE_REVERSE)?
- defaultfg : defaultbg].pixel);
+ dc.col[IS_SET(MODE_REVERSE) ?
+ defaultfg : defaultbg].pixel);
}
-void
-drawregion(int x1, int y1, int x2, int y2) {
+void drawregion(int x1, int y1, int x2, int y2)
+{
int ic, ib, x, y, ox;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
- if(!(xw.state & WIN_VISIBLE))
+ if (!(xw.state & WIN_VISIBLE))
return;
- for(y = y1; y < y2; y++) {
- if(!term.dirty[y])
+ for (y = y1; y < y2; y++) {
+ if (!term.dirty[y])
continue;
xtermclear(0, y, term.col, y);
term.dirty[y] = 0;
base = term.line[y][0];
ic = ib = ox = 0;
- for(x = x1; x < x2; x++) {
+ for (x = x1; x < x2; x++) {
new = term.line[y][x];
- if(new.mode == ATTR_WDUMMY)
+ if (new.mode == ATTR_WDUMMY)
continue;
- if(ena_sel && selected(x, y))
+ if (ena_sel && selected(x, y))
new.mode ^= ATTR_REVERSE;
- if(ib > 0 && (ATTRCMP(base, new)
- || ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+ if (ib > 0 && (ATTRCMP(base, new)
+ || ib >= DRAW_BUF_SIZ - UTF_SIZ)) {
xdraws(buf, base, ox, y, ic, ib);
ic = ib = 0;
}
- if(ib == 0) {
+ if (ib == 0) {
ox = x;
base = new;
}
- ib += utf8encode(new.u, buf+ib);
- ic += (new.mode & ATTR_WIDE)? 2 : 1;
+ ib += utf8encode(new.u, buf + ib);
+ ic += (new.mode & ATTR_WIDE) ? 2 : 1;
}
- if(ib > 0)
+ if (ib > 0)
xdraws(buf, base, ox, y, ic, ib);
}
xdrawcursor();
}
-void
-expose(XEvent *ev) {
+void expose(XEvent * ev)
+{
redraw();
}
-void
-visibility(XEvent *ev) {
+void visibility(XEvent * ev)
+{
XVisibilityEvent *e = &ev->xvisibility;
MODBIT(xw.state, e->state != VisibilityFullyObscured, WIN_VISIBLE);
}
-void
-unmap(XEvent *ev) {
+void unmap(XEvent * ev)
+{
xw.state &= ~WIN_VISIBLE;
}
-void
-xsetpointermotion(int set) {
+void xsetpointermotion(int set)
+{
MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
}
-void
-xseturgency(int add) {
+void xseturgency(int add)
+{
XWMHints *h = XGetWMHints(xw.dpy, xw.win);
MODBIT(h->flags, add, XUrgencyHint);
@@ -3729,68 +3721,69 @@ xseturgency(int add) {
XFree(h);
}
-void
-focus(XEvent *ev) {
+void focus(XEvent * ev)
+{
XFocusChangeEvent *e = &ev->xfocus;
- if(e->mode == NotifyGrab)
+ if (e->mode == NotifyGrab)
return;
- if(ev->type == FocusIn) {
+ if (ev->type == FocusIn) {
XSetICFocus(xw.xic);
xw.state |= WIN_FOCUSED;
xseturgency(0);
- if(IS_SET(MODE_FOCUS))
+ if (IS_SET(MODE_FOCUS))
ttywrite("\033[I", 3);
} else {
XUnsetICFocus(xw.xic);
xw.state &= ~WIN_FOCUSED;
- if(IS_SET(MODE_FOCUS))
+ if (IS_SET(MODE_FOCUS))
ttywrite("\033[O", 3);
}
}
-bool
-match(uint mask, uint state) {
+bool match(uint mask, uint state)
+{
return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
}
-void
-numlock(const Arg *dummy) {
+void numlock(const Arg * dummy)
+{
term.numlock ^= 1;
}
-char*
-kmap(KeySym k, uint state) {
+char *kmap(KeySym k, uint state)
+{
Key *kp;
int i;
/* Check for mapped keys out of X11 function keys. */
- for(i = 0; i < LEN(mappedkeys); i++) {
- if(mappedkeys[i] == k)
+ for (i = 0; i < LEN(mappedkeys); i++) {
+ if (mappedkeys[i] == k)
break;
}
- if(i == LEN(mappedkeys)) {
- if((k & 0xFFFF) < 0xFD00)
+ if (i == LEN(mappedkeys)) {
+ if ((k & 0xFFFF) < 0xFD00)
return NULL;
}
- for(kp = key; kp < key + LEN(key); kp++) {
- if(kp->k != k)
+ for (kp = key; kp < key + LEN(key); kp++) {
+ if (kp->k != k)
continue;
- if(!match(kp->mask, state))
+ if (!match(kp->mask, state))
continue;
- if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+ if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
continue;
- if(term.numlock && kp->appkey == 2)
+ if (term.numlock && kp->appkey == 2)
continue;
- if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
+ if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor >
+ 0)
continue;
- if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
+ if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
continue;
return kp->s;
@@ -3799,8 +3792,8 @@ kmap(KeySym k, uint state) {
return NULL;
}
-void
-kpress(XEvent *ev) {
+void kpress(XEvent * ev)
+{
XKeyEvent *e = &ev->xkey;
KeySym ksym;
char buf[32], *customkey;
@@ -3809,30 +3802,30 @@ kpress(XEvent *ev) {
Status status;
Shortcut *bp;
- if(IS_SET(MODE_KBDLOCK))
+ if (IS_SET(MODE_KBDLOCK))
return;
len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
/* 1. shortcuts */
- for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
- if(ksym == bp->keysym && match(bp->mod, e->state)) {
+ for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
+ if (ksym == bp->keysym && match(bp->mod, e->state)) {
bp->func(&(bp->arg));
return;
}
}
/* 2. custom keys from config.h */
- if((customkey = kmap(ksym, e->state))) {
+ if ((customkey = kmap(ksym, e->state))) {
ttysend(customkey, strlen(customkey));
return;
}
/* 3. composed string from input method */
- if(len == 0)
+ if (len == 0)
return;
- if(len == 1 && e->state & Mod1Mask) {
- if(IS_SET(MODE_8BIT)) {
- if(*buf < 0177) {
+ if (len == 1 && e->state & Mod1Mask) {
+ if (IS_SET(MODE_8BIT)) {
+ if (*buf < 0177) {
c = *buf | 0x80;
len = utf8encode(c, buf);
}
@@ -3845,34 +3838,33 @@ kpress(XEvent *ev) {
ttysend(buf, len);
}
-
-void
-cmessage(XEvent *e) {
+void cmessage(XEvent * e)
+{
/*
* See xembed specs
* http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
*/
- if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
- if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+ if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+ if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
xw.state |= WIN_FOCUSED;
xseturgency(0);
- } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+ } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
xw.state &= ~WIN_FOCUSED;
}
- } else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+ } else if (e->xclient.data.l[0] == xw.wmdeletewin) {
/* Send SIGHUP to shell */
kill(pid, SIGHUP);
exit(EXIT_SUCCESS);
}
}
-void
-cresize(int width, int height) {
+void cresize(int width, int height)
+{
int col, row;
- if(width != 0)
+ if (width != 0)
xw.w = width;
- if(height != 0)
+ if (height != 0)
xw.h = height;
col = (xw.w - 2 * borderpx) / xw.cw;
@@ -3883,16 +3875,16 @@ cresize(int width, int height) {
ttyresize();
}
-void
-resize(XEvent *e) {
- if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+void resize(XEvent * e)
+{
+ if (e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
return;
cresize(e->xconfigure.width, e->xconfigure.height);
}
-void
-run(void) {
+void run(void)
+{
XEvent ev;
int w = xw.w, h = xw.h;
fd_set rfd;
@@ -3903,11 +3895,11 @@ run(void) {
/* Waiting for window mapping */
do {
XNextEvent(xw.dpy, &ev);
- if(ev.type == ConfigureNotify) {
+ if (ev.type == ConfigureNotify) {
w = ev.xconfigure.width;
h = ev.xconfigure.height;
}
- } while(ev.type != MapNotify);
+ } while (ev.type != MapNotify);
ttynew();
cresize(w, h);
@@ -3915,72 +3907,75 @@ run(void) {
clock_gettime(CLOCK_MONOTONIC, &last);
lastblink = last;
- for(xev = actionfps;;) {
+ for (xev = actionfps;;) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- if(pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
- if(errno == EINTR)
+ if (pselect(MAX(xfd, cmdfd) + 1, &rfd, NULL, NULL, tv, NULL) <
+ 0) {
+ if (errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
}
- if(FD_ISSET(cmdfd, &rfd)) {
+ if (FD_ISSET(cmdfd, &rfd)) {
ttyread();
- if(blinktimeout) {
+ if (blinktimeout) {
blinkset = tattrset(ATTR_BLINK);
- if(!blinkset)
+ if (!blinkset)
MODBIT(term.mode, 0, MODE_BLINK);
}
}
- if(FD_ISSET(xfd, &rfd))
+ if (FD_ISSET(xfd, &rfd))
xev = actionfps;
clock_gettime(CLOCK_MONOTONIC, &now);
drawtimeout.tv_sec = 0;
- drawtimeout.tv_nsec = (1000 * 1E6)/ xfps;
+ drawtimeout.tv_nsec = (1000 * 1E6) / xfps;
tv = &drawtimeout;
dodraw = 0;
- if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
+ if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
tsetdirtattr(ATTR_BLINK);
term.mode ^= MODE_BLINK;
lastblink = now;
dodraw = 1;
}
deltatime = TIMEDIFF(now, last);
- if(deltatime > 1000 / (xev ? xfps : actionfps)) {
+ if (deltatime > 1000 / (xev ? xfps : actionfps)) {
dodraw = 1;
last = now;
}
- if(dodraw) {
- while(XPending(xw.dpy)) {
+ if (dodraw) {
+ while (XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
- if(XFilterEvent(&ev, None))
+ if (XFilterEvent(&ev, None))
continue;
- if(handler[ev.type])
- (handler[ev.type])(&ev);
+ if (handler[ev.type])
+ (handler[ev.type]) (&ev);
}
draw();
XFlush(xw.dpy);
- if(xev && !FD_ISSET(xfd, &rfd))
+ if (xev && !FD_ISSET(xfd, &rfd))
xev--;
- if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
- if(blinkset) {
- if(TIMEDIFF(now, lastblink) \
- > blinktimeout) {
+ if (!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+ if (blinkset) {
+ if (TIMEDIFF(now, lastblink)
+ > blinktimeout) {
drawtimeout.tv_nsec = 1000;
} else {
- drawtimeout.tv_nsec = (1E6 * \
- (blinktimeout - \
- TIMEDIFF(now,
- lastblink)));
+ drawtimeout.tv_nsec = (1E6 *
+ (blinktimeout
+ -
+ TIMEDIFF
+ (now,
+ lastblink)));
}
- drawtimeout.tv_sec = \
+ drawtimeout.tv_sec =
drawtimeout.tv_nsec / 1E9;
drawtimeout.tv_nsec %= (long)1E9;
} else {
@@ -3991,18 +3986,18 @@ run(void) {
}
}
-void
-usage(void) {
+void usage(void)
+{
die("%s " VERSION " (c) 2010-2015 st engineers\n"
- "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
- " [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n"
- " st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
- " [-i] [-t title] [-w windowid] [-l line] [stty_args ...]\n",
- argv0);
+ "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+ " [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n"
+ " st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+ " [-i] [-t title] [-w windowid] [-l line] [stty_args ...]\n",
+ argv0);
}
-int
-main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
uint cols = 80, rows = 24;
xw.l = xw.t = 0;
@@ -4010,48 +4005,49 @@ main(int argc, char *argv[]) {
xw.cursor = 0;
ARGBEGIN {
- case 'a':
+case 'a':
allowaltscreen = false;
break;
- case 'c':
+case 'c':
opt_class = EARGF(usage());
break;
- case 'e':
- if(argc > 1)
+case 'e':
+ if (argc > 1)
--argc, ++argv;
goto run;
- case 'f':
+case 'f':
opt_font = EARGF(usage());
break;
- case 'g':
+case 'g':
xw.gm = XParseGeometry(EARGF(usage()),
- &xw.l, &xw.t, &cols, &rows);
+ &xw.l, &xw.t, &cols, &rows);
break;
- case 'i':
+case 'i':
xw.isfixed = True;
break;
- case 'o':
+case 'o':
opt_io = EARGF(usage());
break;
- case 'l':
+case 'l':
opt_line = EARGF(usage());
break;
- case 't':
+case 't':
opt_title = EARGF(usage());
break;
- case 'w':
+case 'w':
opt_embed = EARGF(usage());
break;
- case 'v':
- default:
+case 'v':
+default:
usage();
- } ARGEND;
+ }
+ ARGEND;
-run:
- if(argc > 0) {
+ run:
+ if (argc > 0) {
/* eat all remaining arguments */
opt_cmd = argv;
- if(!opt_title && !opt_line)
+ if (!opt_title && !opt_line)
opt_title = basename(xstrdup(argv[0]));
}
setlocale(LC_CTYPE, "");
@@ -4063,4 +4059,3 @@ run:
return 0;
}
-
--
2.3.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment