summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <koverstreet@google.com>2013-03-16 15:47:30 -0700
committerKent Overstreet <koverstreet@google.com>2013-03-16 15:56:57 -0700
commit83c293e4846acf1830ab5c556d1b45c175b340b7 (patch)
tree8300e601dbd7127c711fb700aac8dbf6ca80c4da
parent026d6496f1fb2cc3713a412265905aa02790b044 (diff)
indent -kr -i8
Diffstat
-rw-r--r--config.def.h396
-rw-r--r--st.c2048
2 files changed, 1247 insertions, 1197 deletions
diff --git a/config.def.h b/config.def.h
index 34884c0..75787d1 100644
--- a/config.def.h
+++ b/config.def.h
@@ -5,7 +5,8 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
-static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static char font[] =
+ "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
static int borderpx = 2;
static char shell[] = "/bin/sh";
@@ -66,12 +67,12 @@ static unsigned int defaultucs = 257;
#define MODKEY Mod1Mask
static Shortcut shortcuts[] = {
- /* modifier key function argument */
- { MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
- { MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
- { ShiftMask, XK_Insert, selpaste, {.i = 0} },
- { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
- { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
+ /* modifier key function argument */
+ {MODKEY | ShiftMask, XK_Prior, xzoom, {.i = +1}},
+ {MODKEY | ShiftMask, XK_Next, xzoom, {.i = -1}},
+ {ShiftMask, XK_Insert, selpaste, {.i = 0}},
+ {MODKEY | ShiftMask, XK_Insert, clippaste, {.i = 0}},
+ {MODKEY, XK_Num_Lock, numlock, {.i = 0}},
};
/*
@@ -114,196 +115,196 @@ uint ignoremod = XK_SWITCH_MOD;
/* key, mask, output, keypad, cursor, crlf */
static Key key[] = {
/* keysym mask string keypad cursor crlf */
- { XK_KP_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
- { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
- { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
- { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0},
- { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
- { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
- { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0, 0},
- { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
- { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
- { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0, 0},
- { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
- { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
- { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0, 0},
- { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
- { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
- { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
- { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
- { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0},
- { XK_KP_End, ControlMask, "\033[J", -1, 0, 0},
- { XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0},
- { XK_KP_End, ShiftMask, "\033[K", -1, 0, 0},
- { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0, 0},
- { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
- { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
- { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
- { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
- { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0, 0},
- { XK_KP_Insert, ControlMask, "\033[L", -1, 0, 0},
- { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
- { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
- { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
- { XK_KP_Delete, ControlMask, "\033[2J", -1, 0, 0},
- { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
- { XK_KP_Delete, ShiftMask, "\033[2K", +1, 0, 0},
- { XK_KP_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
- { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
- { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
- { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
- { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
- { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
- { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0, -1},
- { XK_KP_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1},
- { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0, 0},
- { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0, 0},
- { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0, 0},
- { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0, 0},
- { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0, 0},
- { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0, 0},
- { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0, 0},
- { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0, 0},
- { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0, 0},
- { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0, 0},
- { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0, 0},
- { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0, 0},
- { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0, 0},
- { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
- { XK_Up, ShiftMask, "\033[1;2A", 0, 0, 0},
- { XK_Up, ControlMask, "\033[1;5A", 0, 0, 0},
- { XK_Up, Mod1Mask, "\033[1;3A", 0, 0, 0},
- { XK_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
- { XK_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
- { XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0},
- { XK_Down, ControlMask, "\033[1;5B", 0, 0, 0},
- { XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0},
- { XK_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
- { XK_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
- { XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0},
- { XK_Left, ControlMask, "\033[1;5D", 0, 0, 0},
- { XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0},
- { XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
- { XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
- { XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0},
- { XK_Right, ControlMask, "\033[1;5C", 0, 0, 0},
- { XK_Right, Mod1Mask, "\033[1;3C", 0, 0, 0},
- { XK_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
- { XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
- { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 0},
- { XK_Return, Mod1Mask, "\033\r", 0, 0, -1},
- { XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1},
- { XK_Return, XK_ANY_MOD, "\r", 0, 0, -1},
- { XK_Return, XK_ANY_MOD, "\r\n", 0, 0, +1},
- { XK_Insert, ShiftMask, "\033[4l", -1, 0, 0},
- { XK_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
- { XK_Insert, ControlMask, "\033[L", -1, 0, 0},
- { XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
- { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
- { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
- { XK_Delete, ControlMask, "\033[2J", -1, 0, 0},
- { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
- { XK_Delete, ShiftMask, "\033[2K", +1, 0, 0},
- { XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
- { XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
- { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
- { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
- { XK_End, ControlMask, "\033[J", -1, 0, 0},
- { XK_End, ControlMask, "\033[1;5F", +1, 0, 0},
- { XK_End, ShiftMask, "\033[K", -1, 0, 0},
- { XK_End, ShiftMask, "\033[1;2F", +1, 0, 0},
- { XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
- { XK_Prior, XK_NO_MOD, "\033[5~", 0, 0, 0},
- { XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
- { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
- { XK_F1, XK_NO_MOD, "\033OP" , 0, 0, 0},
- { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0, 0},
- { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0, 0},
- { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0, 0},
- { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0, 0},
- { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0, 0},
- { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0, 0},
- { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0, 0},
- { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0, 0},
- { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0, 0},
- { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0, 0},
- { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0, 0},
- { XK_F3, XK_NO_MOD, "\033OR" , 0, 0, 0},
- { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0, 0},
- { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0, 0},
- { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0, 0},
- { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0, 0},
- { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0},
- { XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0},
- { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0},
- { XK_F4, /* F28 */ ShiftMask, "\033[1;5S", 0, 0, 0},
- { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0},
- { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0},
- { XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0},
- { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0, 0},
- { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0, 0},
- { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0, 0},
- { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0, 0},
- { XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0},
- { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0, 0},
- { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0, 0},
- { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0, 0},
- { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0, 0},
- { XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0},
- { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0, 0},
- { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0, 0},
- { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0, 0},
- { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0, 0},
- { XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0},
- { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0, 0},
- { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0, 0},
- { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0, 0},
- { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0, 0},
- { XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0},
- { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0, 0},
- { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0, 0},
- { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0, 0},
- { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0, 0},
- { XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0},
- { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0, 0},
- { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0, 0},
- { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0, 0},
- { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0, 0},
- { XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0},
- { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0, 0},
- { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0, 0},
- { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0, 0},
- { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0, 0},
- { XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0},
- { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0, 0},
- { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0, 0},
- { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0, 0},
- { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0, 0},
- { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0, 0},
- { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0, 0},
- { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0, 0},
- { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0, 0},
- { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0, 0},
- { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0, 0},
- { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0, 0},
- { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0, 0},
- { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0, 0},
- { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0, 0},
- { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0, 0},
- { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0, 0},
- { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0, 0},
- { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0, 0},
- { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0, 0},
- { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0, 0},
- { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0, 0},
- { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0, 0},
- { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0, 0},
- { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0, 0},
- { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0, 0},
- { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0, 0},
- { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0, 0},
+ {XK_KP_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
+ {XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
+ {XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
+ {XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0},
+ {XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
+ {XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
+ {XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0, 0},
+ {XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
+ {XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
+ {XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0, 0},
+ {XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
+ {XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
+ {XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0, 0},
+ {XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
+ {XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
+ {XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
+ {XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
+ {XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0},
+ {XK_KP_End, ControlMask, "\033[J", -1, 0, 0},
+ {XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0},
+ {XK_KP_End, ShiftMask, "\033[K", -1, 0, 0},
+ {XK_KP_End, ShiftMask, "\033[1;2F", +1, 0, 0},
+ {XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
+ {XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
+ {XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
+ {XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
+ {XK_KP_Insert, ShiftMask, "\033[4l", -1, 0, 0},
+ {XK_KP_Insert, ControlMask, "\033[L", -1, 0, 0},
+ {XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
+ {XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
+ {XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
+ {XK_KP_Delete, ControlMask, "\033[2J", -1, 0, 0},
+ {XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
+ {XK_KP_Delete, ShiftMask, "\033[2K", +1, 0, 0},
+ {XK_KP_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
+ {XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
+ {XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
+ {XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
+ {XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
+ {XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
+ {XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0, -1},
+ {XK_KP_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1},
+ {XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0, 0},
+ {XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0, 0},
+ {XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0, 0},
+ {XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0, 0},
+ {XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0, 0},
+ {XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0, 0},
+ {XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0, 0},
+ {XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0, 0},
+ {XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0, 0},
+ {XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0, 0},
+ {XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0, 0},
+ {XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0, 0},
+ {XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0, 0},
+ {XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
+ {XK_Up, ShiftMask, "\033[1;2A", 0, 0, 0},
+ {XK_Up, ControlMask, "\033[1;5A", 0, 0, 0},
+ {XK_Up, Mod1Mask, "\033[1;3A", 0, 0, 0},
+ {XK_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
+ {XK_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
+ {XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0},
+ {XK_Down, ControlMask, "\033[1;5B", 0, 0, 0},
+ {XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0},
+ {XK_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
+ {XK_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
+ {XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0},
+ {XK_Left, ControlMask, "\033[1;5D", 0, 0, 0},
+ {XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0},
+ {XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
+ {XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
+ {XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0},
+ {XK_Right, ControlMask, "\033[1;5C", 0, 0, 0},
+ {XK_Right, Mod1Mask, "\033[1;3C", 0, 0, 0},
+ {XK_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
+ {XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
+ {XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 0},
+ {XK_Return, Mod1Mask, "\033\r", 0, 0, -1},
+ {XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1},
+ {XK_Return, XK_ANY_MOD, "\r", 0, 0, -1},
+ {XK_Return, XK_ANY_MOD, "\r\n", 0, 0, +1},
+ {XK_Insert, ShiftMask, "\033[4l", -1, 0, 0},
+ {XK_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
+ {XK_Insert, ControlMask, "\033[L", -1, 0, 0},
+ {XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
+ {XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
+ {XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
+ {XK_Delete, ControlMask, "\033[2J", -1, 0, 0},
+ {XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
+ {XK_Delete, ShiftMask, "\033[2K", +1, 0, 0},
+ {XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
+ {XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
+ {XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
+ {XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
+ {XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
+ {XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
+ {XK_End, ControlMask, "\033[J", -1, 0, 0},
+ {XK_End, ControlMask, "\033[1;5F", +1, 0, 0},
+ {XK_End, ShiftMask, "\033[K", -1, 0, 0},
+ {XK_End, ShiftMask, "\033[1;2F", +1, 0, 0},
+ {XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
+ {XK_Prior, XK_NO_MOD, "\033[5~", 0, 0, 0},
+ {XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
+ {XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
+ {XK_F1, XK_NO_MOD, "\033OP", 0, 0, 0},
+ {XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0, 0},
+ {XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0, 0},
+ {XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0, 0},
+ {XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0, 0},
+ {XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0, 0},
+ {XK_F2, XK_NO_MOD, "\033OQ", 0, 0, 0},
+ {XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0, 0},
+ {XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0, 0},
+ {XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0, 0},
+ {XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0, 0},
+ {XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0, 0},
+ {XK_F3, XK_NO_MOD, "\033OR", 0, 0, 0},
+ {XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0, 0},
+ {XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0, 0},
+ {XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0, 0},
+ {XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0, 0},
+ {XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0},
+ {XK_F4, XK_NO_MOD, "\033OS", 0, 0, 0},
+ {XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0},
+ {XK_F4, /* F28 */ ShiftMask, "\033[1;5S", 0, 0, 0},
+ {XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0},
+ {XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0},
+ {XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0},
+ {XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0, 0},
+ {XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0, 0},
+ {XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0, 0},
+ {XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0, 0},
+ {XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0},
+ {XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0, 0},
+ {XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0, 0},
+ {XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0, 0},
+ {XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0, 0},
+ {XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0},
+ {XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0, 0},
+ {XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0, 0},
+ {XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0, 0},
+ {XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0, 0},
+ {XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0},
+ {XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0, 0},
+ {XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0, 0},
+ {XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0, 0},
+ {XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0, 0},
+ {XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0},
+ {XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0, 0},
+ {XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0, 0},
+ {XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0, 0},
+ {XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0, 0},
+ {XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0},
+ {XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0, 0},
+ {XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0, 0},
+ {XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0, 0},
+ {XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0, 0},
+ {XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0},
+ {XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0, 0},
+ {XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0, 0},
+ {XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0, 0},
+ {XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0, 0},
+ {XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0},
+ {XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0, 0},
+ {XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0, 0},
+ {XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0, 0},
+ {XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0, 0},
+ {XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0, 0},
+ {XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0, 0},
+ {XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0, 0},
+ {XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0, 0},
+ {XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0, 0},
+ {XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0, 0},
+ {XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0, 0},
+ {XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0, 0},
+ {XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0, 0},
+ {XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0, 0},
+ {XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0, 0},
+ {XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0, 0},
+ {XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0, 0},
+ {XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0, 0},
+ {XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0, 0},
+ {XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0, 0},
+ {XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0, 0},
+ {XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0, 0},
+ {XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0, 0},
+ {XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0, 0},
+ {XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0, 0},
+ {XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0, 0},
+ {XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0, 0},
};
/*
@@ -317,4 +318,3 @@ static Key key[] = {
static uint selmasks[] = {
[SEL_RECTANGULAR] = Mod1Mask,
};
-
diff --git a/st.c b/st.c
index fc9ed70..f9c594e 100644
--- a/st.c
+++ b/st.c
@@ -34,11 +34,11 @@
#define Colourmap Colormap
#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
#define USAGE \
@@ -61,7 +61,7 @@
#define XK_NO_MOD 0
#define XK_SWITCH_MOD (1<<13)
-#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
+#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
/* macros */
#define SERRNO strerror(errno)
@@ -78,13 +78,13 @@
#define VT102ID "\033[?6c"
enum glyph_attribute {
- ATTR_NULL = 0,
- ATTR_REVERSE = 1,
+ ATTR_NULL = 0,
+ ATTR_REVERSE = 1,
ATTR_UNDERLINE = 2,
- ATTR_BOLD = 4,
- ATTR_GFX = 8,
- ATTR_ITALIC = 16,
- ATTR_BLINK = 32,
+ ATTR_BOLD = 4,
+ ATTR_GFX = 8,
+ ATTR_ITALIC = 16,
+ ATTR_BLINK = 32,
};
enum cursor_movement {
@@ -93,45 +93,45 @@ enum cursor_movement {
};
enum cursor_state {
- CURSOR_DEFAULT = 0,
+ CURSOR_DEFAULT = 0,
CURSOR_WRAPNEXT = 1,
- CURSOR_ORIGIN = 2
+ CURSOR_ORIGIN = 2
};
enum glyph_state {
- GLYPH_SET = 1,
+ GLYPH_SET = 1,
GLYPH_DIRTY = 2
};
enum term_mode {
- MODE_WRAP = 1,
- MODE_INSERT = 2,
- MODE_APPKEYPAD = 4,
- MODE_ALTSCREEN = 8,
- MODE_CRLF = 16,
- MODE_MOUSEBTN = 32,
+ MODE_WRAP = 1,
+ MODE_INSERT = 2,
+ MODE_APPKEYPAD = 4,
+ MODE_ALTSCREEN = 8,
+ MODE_CRLF = 16,
+ MODE_MOUSEBTN = 32,
MODE_MOUSEMOTION = 64,
- MODE_MOUSE = 32|64,
- MODE_REVERSE = 128,
- MODE_KBDLOCK = 256,
- MODE_HIDE = 512,
- MODE_ECHO = 1024,
- MODE_APPCURSOR = 2048,
- MODE_MOUSESGR = 4096,
+ MODE_MOUSE = 32 | 64,
+ MODE_REVERSE = 128,
+ MODE_KBDLOCK = 256,
+ MODE_HIDE = 512,
+ MODE_ECHO = 1024,
+ MODE_APPCURSOR = 2048,
+ MODE_MOUSESGR = 4096,
};
enum escape_state {
- ESC_START = 1,
- ESC_CSI = 2,
- ESC_STR = 4, /* DSC, OSC, PM, APC */
+ ESC_START = 1,
+ ESC_CSI = 2,
+ ESC_STR = 4, /* DSC, 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 {
WIN_VISIBLE = 1,
- WIN_REDRAW = 2,
+ WIN_REDRAW = 2,
WIN_FOCUSED = 4
};
@@ -142,7 +142,8 @@ enum selection_type {
/* bit macro */
#undef B0
-enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
+enum { B0 = 1, B1 = 2, B2 = 4, B3 = 8, B4 = 16, B5 = 32, B6 = 64, B7 = 128
+};
typedef unsigned char uchar;
typedef unsigned int uint;
@@ -150,17 +151,17 @@ typedef unsigned long ulong;
typedef unsigned short ushort;
typedef struct {
- char c[UTF_SIZ]; /* character code */
- uchar mode; /* attribute flags */
- ushort fg; /* foreground */
- ushort bg; /* background */
- uchar state; /* state flags */
+ char c[UTF_SIZ]; /* character code */
+ uchar mode; /* attribute flags */
+ ushort fg; /* foreground */
+ ushort bg; /* background */
+ uchar state; /* state flags */
} Glyph;
typedef Glyph *Line;
typedef struct {
- Glyph attr; /* current char attributes */
+ Glyph attr; /* current char attributes */
int x;
int y;
char state;
@@ -169,37 +170,37 @@ typedef struct {
/* CSI Escape sequence structs */
/* ESC '[' [[ [<priv>] <arg> [;]] <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;
} 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 */
- 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 */
+ bool numlock; /* lock numbers in keyboard */
bool *tabs;
} Term;
@@ -215,13 +216,13 @@ typedef struct {
Draw draw;
Visual *vis;
int scr;
- bool isfixed; /* is fixed geometry? */
- int fx, fy, fw, fh; /* fixed geometry */
- 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 */
+ bool isfixed; /* is fixed geometry? */
+ int fx, fy, fw, fh; /* fixed geometry */
+ 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 */
} XWindow;
typedef struct {
@@ -229,9 +230,9 @@ typedef struct {
uint mask;
char s[ESC_BUF_SIZ];
/* 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;
/* TODO: use better name for vars... */
@@ -260,7 +261,7 @@ typedef union {
typedef struct {
unsigned int mod;
KeySym keysym;
- void (*func)(const Arg *);
+ void (*func) (const Arg *);
const Arg arg;
} Shortcut;
@@ -326,7 +327,7 @@ static void treset(void);
static int tresize(int, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
-static void tsetattr(int*, int);
+static void tsetattr(int *, int);
static void tsetchar(char *, Glyph *, int, int);
static void tsetscroll(int, int);
static void tswapscreen(void);
@@ -353,7 +354,7 @@ static void xloadfonts(char *, int);
static void xsettitle(char *);
static void xresettitle(void);
static void xseturgency(int);
-static void xsetsel(char*);
+static void xsetsel(char *);
static void xtermclear(int, int, int, int);
static void xunloadfonts(void);
static void xresize(int, int);
@@ -389,22 +390,21 @@ static void *xmalloc(size_t);
static void *xrealloc(void *, size_t);
static void *xcalloc(size_t, size_t);
-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,
- [SelectionClear] = selclear,
- [SelectionNotify] = selnotify,
- [SelectionRequest] = selrequest,
-};
+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,
+ [SelectionClear] = selclear,
+ [SelectionNotify] = selnotify,
+ [SelectionRequest] = selrequest,};
/* Globals */
static DC dc;
@@ -448,13 +448,13 @@ typedef struct {
static Fontcache frc[1024];
static int frccur = -1, frclen = 0;
-ssize_t
-xwrite(int fd, char *s, size_t len) {
+ssize_t xwrite(int fd, 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;
@@ -462,108 +462,107 @@ xwrite(int fd, 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;
}
-void *
-xcalloc(size_t nmemb, size_t size) {
+void *xcalloc(size_t nmemb, size_t size)
+{
void *p = calloc(nmemb, size);
- if(!p)
+ if (!p)
die("Out of memory\n");
return p;
}
-int
-utf8decode(char *s, long *u) {
+int utf8decode(char *s, long *u)
+{
uchar c;
int i, n, rtn;
rtn = 1;
c = *s;
- if(~c & B7) { /* 0xxxxxxx */
+ if (~c & B7) { /* 0xxxxxxx */
*u = c;
return rtn;
- } else if((c & (B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
- *u = c&(B4|B3|B2|B1|B0);
+ } else if ((c & (B7 | B6 | B5)) == (B7 | B6)) { /* 110xxxxx */
+ *u = c & (B4 | B3 | B2 | B1 | B0);
n = 1;
- } else if((c & (B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
- *u = c&(B3|B2|B1|B0);
+ } else if ((c & (B7 | B6 | B5 | B4)) == (B7 | B6 | B5)) { /* 1110xxxx */
+ *u = c & (B3 | B2 | B1 | B0);
n = 2;
- } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
- *u = c & (B2|B1|B0);
+ } else if ((c & (B7 | B6 | B5 | B4 | B3)) == (B7 | B6 | B5 | B4)) { /* 11110xxx */
+ *u = c & (B2 | B1 | B0);
n = 3;
} else {
goto invalid;
}
- for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
+ for (i = n, ++s; i > 0; --i, ++rtn, ++s) {
c = *s;
- if((c & (B7|B6)) != B7) /* 10xxxxxx */
+ if ((c & (B7 | B6)) != B7) /* 10xxxxxx */
goto invalid;
*u <<= 6;
- *u |= c & (B5|B4|B3|B2|B1|B0);
+ *u |= c & (B5 | B4 | B3 | B2 | B1 | B0);
}
- if((n == 1 && *u < 0x80) ||
- (n == 2 && *u < 0x800) ||
- (n == 3 && *u < 0x10000) ||
- (*u >= 0xD800 && *u <= 0xDFFF)) {
+ if ((n == 1 && *u < 0x80) ||
+ (n == 2 && *u < 0x800) ||
+ (n == 3 && *u < 0x10000) || (*u >= 0xD800 && *u <= 0xDFFF)) {
goto invalid;
}
return rtn;
-invalid:
+ invalid:
*u = 0xFFFD;
return rtn;
}
-int
-utf8encode(long *u, char *s) {
+int utf8encode(long *u, char *s)
+{
uchar *sp;
ulong uc;
int i, n;
- sp = (uchar *)s;
+ sp = (uchar *) s;
uc = *u;
- if(uc < 0x80) {
- *sp = uc; /* 0xxxxxxx */
+ if (uc < 0x80) {
+ *sp = uc; /* 0xxxxxxx */
return 1;
- } else if(*u < 0x800) {
- *sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
+ } else if (*u < 0x800) {
+ *sp = (uc >> 6) | (B7 | B6); /* 110xxxxx */
n = 1;
- } else if(uc < 0x10000) {
- *sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
+ } else if (uc < 0x10000) {
+ *sp = (uc >> 12) | (B7 | B6 | B5); /* 1110xxxx */
n = 2;
- } else if(uc <= 0x10FFFF) {
- *sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
+ } else if (uc <= 0x10FFFF) {
+ *sp = (uc >> 18) | (B7 | B6 | B5 | B4); /* 11110xxx */
n = 3;
} else {
goto invalid;
}
- for(i=n,++sp; i>0; --i,++sp)
- *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
+ for (i = n, ++sp; i > 0; --i, ++sp)
+ *sp = ((uc >> 6 * (i - 1)) & (B5 | B4 | B3 | B2 | B1 | B0)) | B7; /* 10xxxxxx */
- return n+1;
-invalid:
+ return n + 1;
+ invalid:
/* U+FFFD */
*s++ = '\xEF';
*s++ = '\xBF';
@@ -574,104 +573,103 @@ invalid:
/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
UTF-8 otherwise return 0 */
-int
-isfullutf8(char *s, int b) {
+int isfullutf8(char *s, int b)
+{
uchar *c1, *c2, *c3;
- c1 = (uchar *)s;
- c2 = (uchar *)++s;
- c3 = (uchar *)++s;
- if(b < 1) {
+ c1 = (uchar *) s;
+ c2 = (uchar *)++ s;
+ c3 = (uchar *)++ s;
+ if (b < 1) {
return 0;
- } else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) {
+ } else if ((*c1 & (B7 | B6 | B5)) == (B7 | B6) && b == 1) {
return 0;
- } else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
- ((b == 1) ||
- ((b == 2) && (*c2&(B7|B6)) == B7))) {
+ } else if ((*c1 & (B7 | B6 | B5 | B4)) == (B7 | B6 | B5) &&
+ ((b == 1) || ((b == 2) && (*c2 & (B7 | B6)) == B7))) {
return 0;
- } else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
- ((b == 1) ||
- ((b == 2) && (*c2&(B7|B6)) == B7) ||
- ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7))) {
+ } else if ((*c1 & (B7 | B6 | B5 | B4 | B3)) == (B7 | B6 | B5 | B4)
+ && ((b == 1) || ((b == 2) && (*c2 & (B7 | B6)) == B7)
+ || ((b == 3) && (*c2 & (B7 | B6)) == B7
+ && (*c3 & (B7 | B6)) == B7))) {
return 0;
} else {
return 1;
}
}
-int
-utf8size(char *s) {
+int utf8size(char *s)
+{
uchar c = *s;
- if(~c&B7) {
+ if (~c & B7) {
return 1;
- } else if((c&(B7|B6|B5)) == (B7|B6)) {
+ } else if ((c & (B7 | B6 | B5)) == (B7 | B6)) {
return 2;
- } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) {
+ } else if ((c & (B7 | B6 | B5 | B4)) == (B7 | B6 | B5)) {
return 3;
} else {
return 4;
}
}
-void
-selinit(void) {
+void selinit(void)
+{
memset(&sel.tclick1, 0, sizeof(sel.tclick1));
memset(&sel.tclick2, 0, sizeof(sel.tclick2));
sel.mode = 0;
sel.bx = -1;
sel.clip = NULL;
sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
- if(sel.xtarget == None)
+ if (sel.xtarget == None)
sel.xtarget = XA_STRING;
}
-static int
-x2col(int x) {
+static int x2col(int x)
+{
x -= borderpx;
x /= xw.cw;
- return LIMIT(x, 0, term.col-1);
+ return LIMIT(x, 0, term.col - 1);
}
-static int
-y2row(int y) {
+static int y2row(int y)
+{
y -= borderpx;
y /= xw.ch;
- return LIMIT(y, 0, term.row-1);
+ return LIMIT(y, 0, term.row - 1);
}
-static inline bool
-selected(int x, int y) {
+static inline bool selected(int x, int y)
+{
int bx, ex;
- if(sel.ey == y && sel.by == y) {
+ if (sel.ey == y && sel.by == y) {
bx = MIN(sel.bx, sel.ex);
ex = MAX(sel.bx, sel.ex);
return BETWEEN(x, bx, ex);
}
return ((sel.b.y < y && y < sel.e.y)
- || (y == sel.e.y && x <= sel.e.x))
- || (y == sel.b.y && x >= sel.b.x
- && (x <= sel.e.x || sel.b.y != sel.e.y));
- switch(sel.type) {
+ || (y == sel.e.y && x <= sel.e.x))
+ || (y == sel.b.y && x >= sel.b.x
+ && (x <= sel.e.x || sel.b.y != sel.e.y));
+ switch (sel.type) {
case SEL_REGULAR:
return ((sel.b.y < y && y < sel.e.y)
|| (y == sel.e.y && x <= sel.e.x))
- || (y == sel.b.y && x >= sel.b.x
- && (x <= sel.e.x || sel.b.y != sel.e.y));
+ || (y == sel.b.y && x >= sel.b.x
+ && (x <= sel.e.x || sel.b.y != sel.e.y));
case SEL_RECTANGULAR:
return ((sel.b.y <= y && y <= sel.e.y)
&& (sel.b.x <= x && x <= sel.e.x));
};
}
-void
-getbuttoninfo(XEvent *e) {
+void getbuttoninfo(XEvent *e)
+{
int type;
- uint state = e->xbutton.state &~Button1Mask;
+ uint state = e->xbutton.state & ~Button1Mask;
sel.alt = IS_SET(MODE_ALTSCREEN);
@@ -684,54 +682,54 @@ getbuttoninfo(XEvent *e) {
sel.e.y = MAX(sel.by, sel.ey);
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 ob, ox, oy;
/* from urxvt */
- if(e->xbutton.type == MotionNotify) {
- if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
+ if (e->xbutton.type == MotionNotify) {
+ if (!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
return;
button = ob + 32;
ox = x, oy = y;
- } else if(!IS_SET(MODE_MOUSESGR)
- && (e->xbutton.type == ButtonRelease
- || button == AnyButton)) {
+ } else if (!IS_SET(MODE_MOUSESGR)
+ && (e->xbutton.type == ButtonRelease
+ || button == AnyButton)) {
button = 3;
} else {
button -= Button1;
- if(button >= 3)
+ if (button >= 3)
button += 64 - 3;
- if(e->xbutton.type == ButtonPress) {
+ if (e->xbutton.type == ButtonPress) {
ob = button;
ox = x, oy = y;
}
}
- button += (state & ShiftMask ? 4 : 0)
- + (state & Mod4Mask ? 8 : 0)
- + (state & ControlMask ? 16 : 0);
+ button += (state & ShiftMask ? 4 : 0)
+ + (state & Mod4Mask ? 8 : 0)
+ + (state & ControlMask ? 16 : 0);
len = 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;
}
@@ -739,12 +737,12 @@ mousereport(XEvent *e) {
ttywrite(buf, len);
}
-void
-bpress(XEvent *e) {
- if(IS_SET(MODE_MOUSE)) {
+void bpress(XEvent *e)
+{
+ if (IS_SET(MODE_MOUSE)) {
mousereport(e);
- } else if(e->xbutton.button == Button1) {
- if(sel.bx != -1) {
+ } else if (e->xbutton.button == Button1) {
+ if (sel.bx != -1) {
sel.bx = -1;
tsetdirt(sel.b.y, sel.e.y);
draw();
@@ -753,36 +751,37 @@ bpress(XEvent *e) {
sel.type = SEL_REGULAR;
sel.ex = sel.bx = x2col(e->xbutton.x);
sel.ey = sel.by = y2row(e->xbutton.y);
- } else if(e->xbutton.button == Button4) {
+ } else if (e->xbutton.button == Button4) {
ttywrite("\031", 1);
- } else if(e->xbutton.button == Button5) {
+ } else if (e->xbutton.button == Button5) {
ttywrite("\005", 1);
}
}
-void
-selcopy(void) {
+void selcopy(void)
+{
char *str, *ptr, *p;
int x, y, bufsize, is_selected = 0, size;
Glyph *gp, *last;
- if(sel.bx == -1) {
+ if (sel.bx == -1) {
str = NULL;
} else {
- bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+ bufsize =
+ (term.col + 1) * (sel.e.y - sel.b.y + 1) * UTF_SIZ;
ptr = str = xmalloc(bufsize);
/* append every set & selected glyph to the selection */
- for(y = sel.b.y; y < sel.e.y + 1; y++) {
+ for (y = sel.b.y; y < sel.e.y + 1; y++) {
is_selected = 0;
gp = &term.line[y][0];
last = gp + term.col;
- while(--last >= gp && !(last->state & GLYPH_SET))
- /* nothing */;
+ while (--last >= gp && !(last->state & GLYPH_SET))
+ /* nothing */ ;
- for(x = 0; gp <= last; x++, ++gp) {
- if(!selected(x, y)) {
+ for (x = 0; gp <= last; x++, ++gp) {
+ if (!selected(x, y)) {
continue;
} else {
is_selected = 1;
@@ -794,7 +793,7 @@ selcopy(void) {
ptr += size;
}
/* \n at the end of every selected line except for the last one */
- if(is_selected && y < sel.e.y)
+ if (is_selected && y < sel.e.y)
*ptr++ = '\r';
}
*ptr = 0;
@@ -802,8 +801,8 @@ selcopy(void) {
xsetsel(str);
}
-void
-selnotify(XEvent *e) {
+void selnotify(XEvent *e)
+{
ulong nitems, ofs, rem;
int format;
uchar *data;
@@ -811,9 +810,10 @@ selnotify(XEvent *e) {
ofs = 0;
do {
- if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
- False, AnyPropertyType, &type, &format,
- &nitems, &rem, &data)) {
+ if (XGetWindowProperty
+ (xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ / 4, False,
+ AnyPropertyType, &type, &format, &nitems, &rem,
+ &data)) {
fprintf(stderr, "Clipboard allocation failed\n");
return;
}
@@ -821,34 +821,34 @@ selnotify(XEvent *e) {
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
-clippaste(const Arg *dummy) {
+void clippaste(const Arg *dummy)
+{
Atom clipboard;
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY,
- xw.win, CurrentTime);
+ xw.win, CurrentTime);
}
-void
-selclear(XEvent *e) {
- if(sel.bx == -1)
+void selclear(XEvent *e)
+{
+ if (sel.bx == -1)
return;
sel.bx = -1;
tsetdirt(sel.b.y, sel.e.y);
}
-void
-selrequest(XEvent *e) {
+void selrequest(XEvent *e)
+{
XSelectionRequestEvent *xsre;
XSelectionEvent xev;
Atom xa_targets, string;
@@ -863,27 +863,29 @@ 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);
+ XChangeProperty(xsre->display, xsre->requestor,
+ xsre->property, XA_ATOM, 32,
+ PropModeReplace, (uchar *) & string, 1);
xev.property = xsre->property;
- } else if(xsre->target == sel.xtarget && sel.clip != NULL) {
- XChangeProperty(xsre->display, xsre->requestor, xsre->property,
- xsre->target, 8, PropModeReplace,
- (uchar *) sel.clip, strlen(sel.clip));
+ } else if (xsre->target == sel.xtarget && sel.clip != NULL) {
+ XChangeProperty(xsre->display, xsre->requestor,
+ xsre->property, xsre->target, 8,
+ PropModeReplace, (uchar *) sel.clip,
+ strlen(sel.clip));
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) {
+void xsetsel(char *str)
+{
/* register the selection for both the clipboard and the primary */
Atom clipboard;
@@ -896,41 +898,53 @@ xsetsel(char *str) {
XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
}
-void
-brelease(XEvent *e) {
+void brelease(XEvent *e)
+{
struct timeval now;
- if(IS_SET(MODE_MOUSE)) {
+ if (IS_SET(MODE_MOUSE)) {
mousereport(e);
return;
}
- if(e->xbutton.button == Button2) {
+ if (e->xbutton.button == Button2) {
selpaste(NULL);
- } else if(e->xbutton.button == Button1) {
+ } else if (e->xbutton.button == Button1) {
sel.mode = 0;
getbuttoninfo(e);
term.dirty[sel.ey] = 1;
- if(sel.bx == sel.ex && sel.by == sel.ey) {
+ if (sel.bx == sel.ex && sel.by == sel.ey) {
sel.bx = -1;
gettimeofday(&now, NULL);
- if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+ if (TIMEDIFF(now, sel.tclick2) <=
+ tripleclicktimeout) {
/* triple click on the line */
sel.b.x = sel.bx = 0;
sel.e.x = sel.ex = term.col;
sel.b.y = sel.e.y = sel.ey;
selcopy();
- } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+ } else if (TIMEDIFF(now, sel.tclick1) <=
+ doubleclicktimeout) {
/* double click to select word */
sel.bx = sel.ex;
- while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
- term.line[sel.ey][sel.bx-1].c[0] != ' ') {
+ while (sel.bx > 0
+ && term.line[sel.ey][sel.bx -
+ 1].state &
+ GLYPH_SET
+ && term.line[sel.ey][sel.bx -
+ 1].c[0] !=
+ ' ') {
sel.bx--;
}
sel.b.x = sel.bx;
- while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&
- term.line[sel.ey][sel.ex+1].c[0] != ' ') {
+ while (sel.ex < term.col - 1
+ && term.line[sel.ey][sel.ex +
+ 1].state &
+ GLYPH_SET
+ && term.line[sel.ey][sel.ex +
+ 1].c[0] !=
+ ' ') {
sel.ex++;
}
sel.e.x = sel.ex;
@@ -946,16 +960,16 @@ brelease(XEvent *e) {
gettimeofday(&sel.tclick1, NULL);
}
-void
-bmotion(XEvent *e) {
+void bmotion(XEvent *e)
+{
int oldey, oldex, oldsby, oldsey;
- if(IS_SET(MODE_MOUSE)) {
+ if (IS_SET(MODE_MOUSE)) {
mousereport(e);
return;
}
- if(!sel.mode)
+ if (!sel.mode)
return;
oldey = sel.ey;
@@ -964,13 +978,13 @@ bmotion(XEvent *e) {
oldsey = sel.e.y;
getbuttoninfo(e);
- if(oldey != sel.ey || oldex != sel.ex) {
+ if (oldey != sel.ey || oldex != sel.ex) {
tsetdirt(MIN(sel.b.y, oldsby), MAX(sel.e.y, oldsey));
}
}
-void
-die(const char *errstr, ...) {
+void die(const char *errstr, ...)
+{
va_list ap;
va_start(ap, errstr);
@@ -979,8 +993,8 @@ die(const char *errstr, ...) {
exit(EXIT_FAILURE);
}
-void
-execsh(void) {
+void execsh(void)
+{
char **args;
char *envshell = getenv("SHELL");
const struct passwd *pass = getpwuid(getuid());
@@ -990,7 +1004,7 @@ execsh(void) {
unsetenv("LINES");
unsetenv("TERMCAP");
- if(pass) {
+ if (pass) {
setenv("LOGNAME", pass->pw_name, 1);
setenv("USER", pass->pw_name, 1);
setenv("SHELL", pass->pw_shell, 0);
@@ -1009,44 +1023,45 @@ execsh(void) {
DEFAULT(envshell, shell);
setenv("TERM", termname, 1);
- args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};
+ args = opt_cmd ? opt_cmd : (char *[]) {
+ envshell, "-i", NULL};
execvp(args[0], args);
exit(EXIT_FAILURE);
}
-void
-sigchld(int a) {
+void sigchld(int a)
+{
int stat = 0;
- if(waitpid(pid, &stat, 0) < 0)
- die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+ if (waitpid(pid, &stat, 0) < 0)
+ die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
- if(WIFEXITED(stat)) {
+ if (WIFEXITED(stat)) {
exit(WEXITSTATUS(stat));
} else {
exit(EXIT_FAILURE);
}
}
-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 };
/* 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", SERRNO);
- switch(pid = fork()) {
+ switch (pid = fork()) {
case -1:
die("fork failed\n");
break;
case 0:
- 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", SERRNO);
close(s);
close(m);
@@ -1056,11 +1071,11 @@ ttynew(void) {
close(s);
cmdfd = m;
signal(SIGCHLD, sigchld);
- if(opt_io) {
+ if (opt_io) {
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));
}
@@ -1068,33 +1083,33 @@ ttynew(void) {
}
}
-void
-dump(char c) {
+void dump(char c)
+{
static int col;
- fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
- if(++col % 10 == 0)
+ fprintf(stderr, " %02x '%c' ", c, isprint(c) ? c : '.');
+ if (++col % 10 == 0)
fprintf(stderr, "\n");
}
-void
-ttyread(void) {
+void ttyread(void)
+{
static char buf[BUFSIZ];
static int buflen = 0;
char *ptr;
char s[UTF_SIZ];
- int charsize; /* size of utf8 char in bytes */
+ int charsize; /* size of utf8 char in bytes */
long utf8c;
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", SERRNO);
/* process every complete utf8 char */
buflen += ret;
ptr = buf;
- while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
+ while (buflen >= UTF_SIZ || isfullutf8(ptr, buflen)) {
charsize = utf8decode(ptr, &utf8c);
utf8encode(&utf8c, s);
tputc(s, charsize);
@@ -1106,87 +1121,85 @@ ttyread(void) {
memmove(buf, ptr, buflen);
}
-void
-ttywrite(const char *s, size_t n) {
- if(write(cmdfd, s, n) == -1)
+void ttywrite(const char *s, size_t n)
+{
+ if (write(cmdfd, s, n) == -1)
die("write error on tty: %s\n", SERRNO);
}
-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)
+ if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
-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
-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;
- if(mode == CURSOR_SAVE) {
+ if (mode == CURSOR_SAVE) {
c = term.c;
- } else if(mode == CURSOR_LOAD) {
+ } else if (mode == CURSOR_LOAD) {
term.c = c;
tmoveto(c.x, c.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;
term.mode = MODE_WRAP;
- tclearregion(0, 0, term.col-1, term.row-1, 0);
+ tclearregion(0, 0, term.col - 1, term.row - 1, 0);
tmoveto(0, 0);
tcursor(CURSOR_SAVE);
}
-void
-tnew(int col, int row) {
+void tnew(int col, int row)
+{
/* set screen size */
term.row = row;
term.col = col;
term.line = xmalloc(term.row * sizeof(Line));
- term.alt = xmalloc(term.row * sizeof(Line));
+ term.alt = xmalloc(term.row * sizeof(Line));
term.dirty = xmalloc(term.row * sizeof(*term.dirty));
term.tabs = xmalloc(term.col * sizeof(*term.tabs));
- for(row = 0; row < term.row; row++) {
+ for (row = 0; row < term.row; row++) {
term.line[row] = xmalloc(term.col * sizeof(Glyph));
- term.alt [row] = xmalloc(term.col * sizeof(Glyph));
+ term.alt[row] = xmalloc(term.col * sizeof(Glyph));
term.dirty[row] = 0;
}
@@ -1196,8 +1209,8 @@ tnew(int col, int row) {
treset();
}
-void
-tswapscreen(void) {
+void tswapscreen(void)
+{
Line *tmp = term.line;
term.line = term.alt;
@@ -1206,72 +1219,73 @@ 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);
- tclearregion(0, term.bot-n+1, term.col-1, term.bot, 0);
+ tclearregion(0, term.bot - n + 1, term.col - 1, term.bot, 0);
- 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;
term.dirty[i] = 1;
- term.dirty[i-n] = 1;
+ term.dirty[i - n] = 1;
}
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, 0);
+ tclearregion(0, orig, term.col - 1, orig + n - 1, 0);
- for(i = orig; i <= term.bot-n; i++) {
- temp = term.line[i];
- term.line[i] = term.line[i+n];
- term.line[i+n] = temp;
+ 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.dirty[i] = 1;
- term.dirty[i+n] = 1;
+ term.dirty[i] = 1;
+ term.dirty[i + n] = 1;
}
selscroll(orig, -n);
}
-void
-selscroll(int orig, int n) {
- if(sel.bx == -1)
+void selscroll(int orig, int n)
+{
+ if (sel.bx == -1)
return;
- if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
- if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
+ if (BETWEEN(sel.by, orig, term.bot)
+ || BETWEEN(sel.ey, orig, term.bot)) {
+ if ((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
sel.bx = -1;
return;
}
- switch(sel.type) {
+ switch (sel.type) {
case SEL_REGULAR:
- if(sel.by < term.top) {
+ if (sel.by < term.top) {
sel.by = term.top;
sel.bx = 0;
}
- if(sel.ey > term.bot) {
+ if (sel.ey > term.bot) {
sel.ey = term.bot;
sel.ex = term.col;
}
break;
case SEL_RECTANGULAR:
- if(sel.by < term.top)
+ if (sel.by < term.top)
sel.by = term.top;
- if(sel.ey > term.bot)
+ if (sel.ey > term.bot)
sel.ey = term.bot;
break;
};
@@ -1280,11 +1294,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++;
@@ -1292,28 +1306,28 @@ 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++;
}
@@ -1321,48 +1335,47 @@ csiparse(void) {
}
/* 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 {
miny = 0;
maxy = term.row - 1;
}
- LIMIT(x, 0, term.col-1);
+ LIMIT(x, 0, term.col - 1);
LIMIT(y, miny, maxy);
term.c.state &= ~CURSOR_WRAPNEXT;
term.c.x = x;
term.c.y = y;
}
-void
-tsetchar(char *c, 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(char *c, 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(attr->mode & ATTR_GFX) {
- if(c[0] >= 0x41 && c[0] <= 0x7e
- && vt100_0[c[0] - 0x41]) {
+ if (attr->mode & ATTR_GFX) {
+ if (c[0] >= 0x41 && c[0] <= 0x7e && vt100_0[c[0] - 0x41]) {
c = vt100_0[c[0] - 0x41];
}
}
@@ -1373,24 +1386,24 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
term.line[y][x].state |= GLYPH_SET;
}
-void
-tclearregion(int x1, int y1, int x2, int y2, int bce) {
+void tclearregion(int x1, int y1, int x2, int y2, int bce)
+{
int x, y, temp;
- 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++) {
- if(bce) {
+ for (x = x1; x <= x2; x++) {
+ if (bce) {
term.line[y][x] = term.c.attr;
memcpy(term.line[y][x].c, " ", 2);
term.line[y][x].state |= GLYPH_SET;
@@ -1401,67 +1414,70 @@ tclearregion(int x1, int y1, int x2, int y2, int bce) {
}
}
-void
-tdeletechar(int n) {
+void tdeletechar(int n)
+{
int src = term.c.x + n;
int dst = term.c.x;
int size = term.col - src;
term.dirty[term.c.y] = 1;
- if(src >= term.col) {
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 0);
+ if (src >= term.col) {
+ tclearregion(term.c.x, term.c.y, term.col - 1, term.c.y,
+ 0);
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
- size * sizeof(Glyph));
- tclearregion(term.col-n, term.c.y, term.col-1, term.c.y, 0);
+ size * sizeof(Glyph));
+ tclearregion(term.col - n, term.c.y, term.col - 1, term.c.y, 0);
}
-void
-tinsertblank(int n) {
+void tinsertblank(int n)
+{
int src = term.c.x;
int dst = src + n;
int size = term.col - dst;
term.dirty[term.c.y] = 1;
- if(dst >= term.col) {
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 0);
+ if (dst >= term.col) {
+ tclearregion(term.c.x, term.c.y, term.col - 1, term.c.y,
+ 0);
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
- size * sizeof(Glyph));
+ size * sizeof(Glyph));
tclearregion(src, term.c.y, dst - 1, term.c.y, 0);
}
-void
-tinsertblankline(int n) {
- if(term.c.y < term.top || term.c.y > term.bot)
+void tinsertblankline(int n)
+{
+ if (term.c.y < term.top || term.c.y > term.bot)
return;
tscrolldown(term.c.y, n);
}
-void
-tdeleteline(int n) {
- if(term.c.y < term.top || term.c.y > term.bot)
+void tdeleteline(int n)
+{
+ if (term.c.y < term.top || term.c.y > term.bot)
return;
tscrollup(term.c.y, n);
}
-void
-tsetattr(int *attr, int l) {
+void tsetattr(int *attr, int l)
+{
int i;
- 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_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
- | ATTR_ITALIC | ATTR_BLINK);
+ term.c.attr.mode &=
+ ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD |
+ ATTR_ITALIC | ATTR_BLINK);
term.c.attr.fg = defaultfg;
term.c.attr.bg = defaultbg;
break;
@@ -1474,8 +1490,8 @@ tsetattr(int *attr, int l) {
case 4:
term.c.attr.mode |= ATTR_UNDERLINE;
break;
- case 5: /* slow blink */
- case 6: /* rapid blink */
+ case 5: /* slow blink */
+ case 6: /* rapid blink */
term.c.attr.mode |= ATTR_BLINK;
break;
case 7:
@@ -1499,9 +1515,9 @@ tsetattr(int *attr, int l) {
term.c.attr.mode &= ~ATTR_REVERSE;
break;
case 38:
- if(i + 2 < l && attr[i + 1] == 5) {
+ if (i + 2 < l && attr[i + 1] == 5) {
i += 2;
- if(BETWEEN(attr[i], 0, 255)) {
+ if (BETWEEN(attr[i], 0, 255)) {
term.c.attr.fg = attr[i];
} else {
fprintf(stderr,
@@ -1518,9 +1534,9 @@ tsetattr(int *attr, int l) {
term.c.attr.fg = defaultfg;
break;
case 48:
- if(i + 2 < l && attr[i + 1] == 5) {
+ if (i + 2 < l && attr[i + 1] == 5) {
i += 2;
- if(BETWEEN(attr[i], 0, 255)) {
+ if (BETWEEN(attr[i], 0, 255)) {
term.c.attr.bg = attr[i];
} else {
fprintf(stderr,
@@ -1537,13 +1553,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,
@@ -1555,13 +1571,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;
@@ -1572,45 +1588,45 @@ tsetscroll(int t, int b) {
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-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) {
+ for (lim = args + narg; args < lim; ++args) {
+ if (priv) {
+ switch (*args) {
break;
- case 1: /* DECCKM -- Cursor key */
+ 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(REDRAW_TIMEOUT);
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 1000: /* 1000,1002: enable xterm mouse report */
+ case 1000: /* 1000,1002: enable xterm mouse report */
MODBIT(term.mode, set, MODE_MOUSEBTN);
MODBIT(term.mode, 0, MODE_MOUSEMOTION);
break;
@@ -1621,19 +1637,21 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 1006:
MODBIT(term.mode, set, MODE_MOUSESGR);
break;
- case 1049: /* = 1047 and 1048 */
+ case 1049: /* = 1047 and 1048 */
case 47:
- case 1047: {
- alt = IS_SET(MODE_ALTSCREEN);
- if(alt) {
- tclearregion(0, 0, term.col-1,
- term.row-1, 0);
+ case 1047:{
+ alt = IS_SET(MODE_ALTSCREEN);
+ if (alt) {
+ tclearregion(0, 0,
+ term.col - 1,
+ term.row - 1,
+ 0);
+ }
+ if (set ^ alt) /* set is always 1 or 0 */
+ tswapscreen();
+ if (*args != 1049)
+ break;
}
- if(set ^ alt) /* set is always 1 or 0 */
- tswapscreen();
- if(*args != 1049)
- break;
- }
/* pass through */
case 1048:
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
@@ -1645,19 +1663,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:
@@ -1669,193 +1687,199 @@ tsetmode(bool priv, bool set, int *args, int narg) {
}
}
}
+
#undef MODBIT
-void
-csihandle(void) {
- switch(csiescseq.mode) {
+void csihandle(void)
+{
+ switch (csiescseq.mode) {
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 'c': /* DA -- Device Attributes */
- if(csiescseq.arg[0] == 0)
+ case 'c': /* DA -- Device Attributes */
+ if (csiescseq.arg[0] == 0)
ttywrite(VT102ID, sizeof(VT102ID) - 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 */
- memset(term.tabs, 0, term.col * sizeof(*term.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);
- while(csiescseq.arg[0]--)
+ while (csiescseq.arg[0]--)
tputtab(1);
break;
- case 'J': /* ED -- Clear screen */
+ case 'J': /* ED -- Clear screen */
sel.bx = -1;
- switch(csiescseq.arg[0]) {
- case 0: /* below */
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 1);
- if(term.c.y < term.row-1) {
- tclearregion(0, term.c.y+1, term.col-1,
- term.row-1, 1);
+ switch (csiescseq.arg[0]) {
+ case 0: /* below */
+ tclearregion(term.c.x, term.c.y, term.col - 1,
+ term.c.y, 1);
+ if (term.c.y < term.row - 1) {
+ tclearregion(0, term.c.y + 1, term.col - 1,
+ term.row - 1, 1);
}
break;
- case 1: /* above */
- if(term.c.y > 1)
- tclearregion(0, 0, term.col-1, term.c.y-1, 1);
+ case 1: /* above */
+ if (term.c.y > 1)
+ tclearregion(0, 0, term.col - 1,
+ term.c.y - 1, 1);
tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
break;
- case 2: /* all */
- tclearregion(0, 0, term.col-1, term.row-1, 1);
+ case 2: /* all */
+ tclearregion(0, 0, term.col - 1, term.row - 1, 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, 1);
+ 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, 1);
break;
- case 1: /* left */
+ case 1: /* left */
tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
break;
- case 2: /* all */
- tclearregion(0, term.c.y, term.col-1, term.c.y, 1);
+ case 2: /* all */
+ tclearregion(0, term.c.y, term.col - 1, term.c.y,
+ 1);
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, 1);
+ term.c.x + csiescseq.arg[0] - 1, term.c.y, 1);
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);
- while(csiescseq.arg[0]--)
+ while (csiescseq.arg[0]--)
tputtab(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 '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;
}
}
-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);
@@ -1864,37 +1888,38 @@ 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 i, j, narg;
strparse();
narg = strescseq.narg;
- switch(strescseq.type) {
- case ']': /* OSC -- Operating System Command */
- switch(i = atoi(strescseq.args[0])) {
+ switch (strescseq.type) {
+ case ']': /* OSC -- Operating System Command */
+ switch (i = atoi(strescseq.args[0])) {
case 0:
case 1:
case 2:
- if(narg > 1)
+ if (narg > 1)
xsettitle(strescseq.args[1]);
break;
- case 4: /* color set */
- if(narg < 3)
+ case 4: /* color set */
+ if (narg < 3)
break;
p = strescseq.args[2];
/* fall through */
- 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);
+ fprintf(stderr,
+ "erresc: invalid color %s\n", p);
} else {
/*
* TODO if defaultbg color is changed, borders
@@ -1909,12 +1934,12 @@ strhandle(void) {
break;
}
break;
- case 'k': /* old title set compatibility */
+ case 'k': /* old title set compatibility */
xsettitle(strescseq.args[0]);
break;
- case 'P': /* DSC -- Device Control String */
- case '_': /* APC -- Application Program Command */
- case '^': /* PM -- Privacy Message */
+ case 'P': /* DSC -- Device Control String */
+ case '_': /* APC -- Application Program Command */
+ case '^': /* PM -- Privacy Message */
default:
fprintf(stderr, "erresc: unknown str ");
strdump();
@@ -1923,33 +1948,33 @@ strhandle(void) {
}
}
-void
-strparse(void) {
+void strparse(void)
+{
char *p = strescseq.buf;
strescseq.narg = 0;
strescseq.buf[strescseq.len] = '\0';
- while(p && strescseq.narg < STR_ARG_SIZ)
+ while (p && strescseq.narg < STR_ARG_SIZ)
strescseq.args[strescseq.narg++] = strsep(&p, ";");
}
-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);
@@ -1958,39 +1983,39 @@ strdump(void) {
printf("ESC\\\n");
}
-void
-strreset(void) {
+void strreset(void)
+{
memset(&strescseq, 0, sizeof(strescseq));
}
-void
-tputtab(bool forward) {
+void tputtab(bool forward)
+{
uint x = term.c.x;
- if(forward) {
- if(x == term.col)
+ if (forward) {
+ if (x == term.col)
return;
- for(++x; x < term.col && !term.tabs[x]; ++x)
+ for (++x; x < term.col && !term.tabs[x]; ++x)
/* nothing */ ;
} else {
- if(x == 0)
+ if (x == 0)
return;
- for(--x; x > 0 && !term.tabs[x]; --x)
+ for (--x; x > 0 && !term.tabs[x]; --x)
/* nothing */ ;
}
tmoveto(x, term.c.y);
}
-void
-techo(char *buf, int len) {
- for(; len > 0; buf++, len--) {
+void techo(char *buf, int len)
+{
+ for (; len > 0; buf++, len--) {
char c = *buf;
- if(c == '\033') { /* escape */
+ if (c == '\033') { /* escape */
tputc("^", 1);
tputc("[", 1);
- } else if(c < '\x20') { /* control code */
- if(c != '\n' && c != '\r' && c != '\t') {
+ } else if (c < '\x20') { /* control code */
+ if (c != '\n' && c != '\r' && c != '\t') {
c |= '\x40';
tputc("^", 1);
}
@@ -1999,17 +2024,17 @@ techo(char *buf, int len) {
break;
}
}
- if(len)
+ if (len)
tputc(buf, len);
}
-void
-tputc(char *c, int len) {
+void tputc(char *c, int len)
+{
uchar ascii = *c;
bool control = ascii < '\x20' || ascii == 0177;
- if(iofd != -1) {
- if(xwrite(iofd, c, len) < 0) {
+ if (iofd != -1) {
+ if (xwrite(iofd, c, len) < 0) {
fprintf(stderr, "Error writing in %s:%s\n",
opt_io, strerror(errno));
close(iofd);
@@ -2021,33 +2046,35 @@ tputc(char *c, int len) {
* STR sequences must be checked before anything else
* because it can use some control codes as part of the sequence.
*/
- if(term.esc & ESC_STR) {
- switch(ascii) {
+ if (term.esc & ESC_STR) {
+ switch (ascii) {
case '\033':
term.esc = ESC_START | ESC_STR_END;
break;
- case '\a': /* backwards compatibility to xterm */
+ case '\a': /* backwards compatibility to xterm */
term.esc = 0;
strhandle();
break;
default:
- if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
- memmove(&strescseq.buf[strescseq.len], c, len);
+ if (strescseq.len + len <
+ sizeof(strescseq.buf) - 1) {
+ memmove(&strescseq.buf[strescseq.len], c,
+ len);
strescseq.len += len;
} 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;
@@ -2058,13 +2085,13 @@ tputc(char *c, int len) {
* because they can be embedded inside a control sequence, and
* they must not cause conflicts with sequences.
*/
- if(control) {
- switch(ascii) {
+ if (control) {
+ switch (ascii) {
case '\t': /* HT */
tputtab(1);
return;
case '\b': /* BS */
- tmoveto(term.c.x-1, term.c.y);
+ tmoveto(term.c.x - 1, term.c.y);
return;
case '\r': /* CR */
tmoveto(0, term.c.y);
@@ -2076,7 +2103,7 @@ tputc(char *c, int len) {
tnewline(IS_SET(MODE_CRLF));
return;
case '\a': /* BEL */
- if(!(xw.state & WIN_FOCUSED))
+ if (!(xw.state & WIN_FOCUSED))
xseturgency(1);
return;
case '\033': /* ESC */
@@ -2103,129 +2130,133 @@ tputc(char *c, int len) {
case 0177: /* DEL (IGNORED) */
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++] = ascii;
- if(BETWEEN(ascii, 0x40, 0x7E)
- || csiescseq.len >= \
- sizeof(csiescseq.buf)-1) {
+ if (BETWEEN(ascii, 0x40, 0x7E)
+ || csiescseq.len >= sizeof(csiescseq.buf) - 1) {
term.esc = 0;
csiparse();
csihandle();
}
- } else if(term.esc & ESC_STR_END) {
+ } else if (term.esc & ESC_STR_END) {
term.esc = 0;
- if(ascii == '\\')
+ if (ascii == '\\')
strhandle();
- } else if(term.esc & ESC_ALTCHARSET) {
- switch(ascii) {
- case '0': /* Line drawing set */
+ } else if (term.esc & ESC_ALTCHARSET) {
+ switch (ascii) {
+ case '0': /* Line drawing set */
term.c.attr.mode |= ATTR_GFX;
break;
- case 'B': /* USASCII */
+ case 'B': /* USASCII */
term.c.attr.mode &= ~ATTR_GFX;
break;
- case 'A': /* UK (IGNORED) */
- case '<': /* multinational charset (IGNORED) */
- case '5': /* Finnish (IGNORED) */
- case 'C': /* Finnish (IGNORED) */
- case 'K': /* German (IGNORED) */
+ case 'A': /* UK (IGNORED) */
+ case '<': /* multinational charset (IGNORED) */
+ case '5': /* Finnish (IGNORED) */
+ case 'C': /* Finnish (IGNORED) */
+ case 'K': /* German (IGNORED) */
break;
default:
- fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
+ fprintf(stderr,
+ "esc unhandled charset: ESC ( %c\n",
+ ascii);
}
term.esc = 0;
- } else if(term.esc & ESC_TEST) {
- if(ascii == '8') { /* DEC screen alignment test. */
+ } else if (term.esc & ESC_TEST) {
+ if (ascii == '8') { /* DEC screen alignment test. */
char E[UTF_SIZ] = "E";
int x, y;
- for(x = 0; x < term.col; ++x) {
- for(y = 0; y < term.row; ++y)
- tsetchar(E, &term.c.attr, x, y);
+ for (x = 0; x < term.col; ++x) {
+ for (y = 0; y < term.row; ++y)
+ tsetchar(E, &term.c.attr,
+ x, y);
}
}
term.esc = 0;
} else {
- switch(ascii) {
+ switch (ascii) {
case '[':
term.esc |= ESC_CSI;
break;
case '#':
term.esc |= ESC_TEST;
break;
- 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 */
strreset();
strescseq.type = ascii;
term.esc |= ESC_STR;
break;
- case '(': /* set primary charset G0 */
+ case '(': /* set primary charset G0 */
term.esc |= ESC_ALTCHARSET;
break;
- case ')': /* set secondary charset G1 (IGNORED) */
- case '*': /* set tertiary charset G2 (IGNORED) */
- case '+': /* set quaternary charset G3 (IGNORED) */
+ case ')': /* set secondary charset G1 (IGNORED) */
+ case '*': /* set tertiary charset G2 (IGNORED) */
+ case '+': /* set quaternary charset G3 (IGNORED) */
term.esc = 0;
break;
- 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);
}
term.esc = 0;
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 */
term.esc = 0;
break;
- case 'H': /* HTS -- Horizontal tab stop */
+ case 'H': /* HTS -- Horizontal tab stop */
term.tabs[term.c.x] = 1;
term.esc = 0;
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);
}
term.esc = 0;
break;
- case 'Z': /* DECID -- Identify Terminal */
+ case 'Z': /* DECID -- Identify Terminal */
ttywrite(VT102ID, sizeof(VT102ID) - 1);
term.esc = 0;
break;
- case 'c': /* RIS -- Reset to inital state */
+ case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
xresettitle();
break;
- case '=': /* DECPAM -- Application keypad */
+ case '=': /* DECPAM -- Application keypad */
term.mode |= MODE_APPKEYPAD;
term.esc = 0;
break;
- case '>': /* DECPNM -- Normal keypad */
+ case '>': /* DECPNM -- Normal keypad */
term.mode &= ~MODE_APPKEYPAD;
term.esc = 0;
break;
- case '7': /* DECSC -- Save Cursor */
+ case '7': /* DECSC -- Save Cursor */
tcursor(CURSOR_SAVE);
term.esc = 0;
break;
- case '8': /* DECRC -- Restore Cursor */
+ case '8': /* DECRC -- Restore Cursor */
tcursor(CURSOR_LOAD);
term.esc = 0;
break;
- case '\\': /* ST -- Stop */
+ case '\\': /* ST -- Stop */
term.esc = 0;
break;
default:
- fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
- (uchar) ascii, isprint(ascii)? ascii:'.');
+ fprintf(stderr,
+ "erresc: unknown sequence ESC 0x%02X '%c'\n",
+ (uchar) ascii,
+ isprint(ascii) ? ascii : '.');
term.esc = 0;
}
}
@@ -2238,142 +2269,149 @@ tputc(char *c, int len) {
/*
* Display control codes only if we are in graphic mode
*/
- if(control && !(term.c.attr.mode & ATTR_GFX))
+ if (control && !(term.c.attr.mode & ATTR_GFX))
return;
- if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+ if (sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
- if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
- tnewline(1); /* always go to first col */
+ if (IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
+ tnewline(1); /* always go to first col */
- if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
- memmove(&term.line[term.c.y][term.c.x+1],
+ if (IS_SET(MODE_INSERT) && term.c.x + 1 < term.col) {
+ memmove(&term.line[term.c.y][term.c.x + 1],
&term.line[term.c.y][term.c.x],
(term.col - term.c.x - 1) * sizeof(Glyph));
}
tsetchar(c, &term.c.attr, term.c.x, term.c.y);
- if(term.c.x+1 < term.col) {
- tmoveto(term.c.x+1, term.c.y);
+ if (term.c.x + 1 < term.col) {
+ tmoveto(term.c.x + 1, term.c.y);
} else {
term.c.state |= CURSOR_WRAPNEXT;
}
}
-int
-tresize(int col, int row) {
+int tresize(int col, int row)
+{
int i, x;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
int slide = term.c.y - row + 1;
bool *bp;
- if(col < 1 || row < 1)
+ if (col < 1 || row < 1)
return 0;
/* free unneeded rows */
i = 0;
- if(slide > 0) {
+ if (slide > 0) {
/*
* slide screen to keep cursor where we expect it -
* tscrollup would work here, but we can optimize to
* memmove because we're freeing the earlier lines
*/
- for(/* i = 0 */; i < slide; i++) {
+ for ( /* i = 0 */ ; i < slide; i++) {
free(term.line[i]);
free(term.alt[i]);
}
memmove(term.line, term.line + slide, row * sizeof(Line));
memmove(term.alt, term.alt + slide, 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.dirty[i] = 1;
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
- term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
- for(x = mincol; x < col; x++) {
+ term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
+ for (x = mincol; x < col; x++) {
term.line[i][x].state = 0;
term.alt[i][x].state = 0;
}
}
/* allocate any new rows */
- for(/* i == minrow */; i < row; i++) {
+ for ( /* i == minrow */ ; i < row; i++) {
term.dirty[i] = 1;
term.line[i] = xcalloc(col, sizeof(Glyph));
- term.alt [i] = xcalloc(col, sizeof(Glyph));
+ term.alt[i] = xcalloc(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);
return (slide > 0);
}
-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));
- XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);
+ DefaultDepth(xw.dpy, xw.scr));
+ XSetForeground(xw.dpy, dc.gc,
+ dc.col[IS_SET(MODE_REVERSE) ? defaultfg :
+ defaultbg].pixel);
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
XftDrawChange(xw.draw, xw.buf);
}
-static inline ushort
-sixd_to_16bit(int x) {
+static inline ushort sixd_to_16bit(int x)
+{
return x == 0 ? 0 : 0x3737 + 0x2828 * x;
}
-void
-xloadcols(void) {
+void xloadcols(void)
+{
int i, r, g, b;
- XRenderColor color = { .alpha = 0xffff };
+ XRenderColor color = {.alpha = 0xffff };
/* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
- for(i = 0; i < LEN(colorname); i++) {
- if(!colorname[i])
+ for (i = 0; i < LEN(colorname); i++) {
+ if (!colorname[i])
continue;
- if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.col[i])) {
- die("Could not allocate color '%s'\n", colorname[i]);
+ if (!XftColorAllocName
+ (xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.col[i])) {
+ die("Could not allocate color '%s'\n",
+ colorname[i]);
}
}
/* load colors [16-255] ; same colors as xterm */
- for(i = 16, r = 0; r < 6; r++) {
- for(g = 0; g < 6; g++) {
- for(b = 0; b < 6; b++) {
+ for (i = 16, r = 0; r < 6; r++) {
+ for (g = 0; g < 6; g++) {
+ for (b = 0; b < 6; b++) {
color.red = sixd_to_16bit(r);
color.green = sixd_to_16bit(g);
color.blue = sixd_to_16bit(b);
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i])) {
+ if (!XftColorAllocValue
+ (xw.dpy, xw.vis, xw.cmap, &color,
+ &dc.col[i])) {
die("Could not allocate color %d\n", i);
}
i++;
@@ -2381,75 +2419,78 @@ xloadcols(void) {
}
}
- for(r = 0; r < 24; r++, i++) {
+ for (r = 0; r < 24; r++, i++) {
color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color,
+ if (!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color,
&dc.col[i])) {
die("Could not allocate color %d\n", i);
}
}
}
-int
-xsetcolorname(int x, const char *name) {
- XRenderColor color = { .alpha = 0xffff };
+int xsetcolorname(int x, const char *name)
+{
+ XRenderColor color = {.alpha = 0xffff };
Colour colour;
if (x < 0 || x > LEN(colorname))
return -1;
- if(!name) {
- if(16 <= x && x < 16 + 216) {
- int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b = (x - 16) % 6;
+ if (!name) {
+ if (16 <= x && x < 16 + 216) {
+ int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b =
+ (x - 16) % 6;
color.red = sixd_to_16bit(r);
color.green = sixd_to_16bit(g);
color.blue = sixd_to_16bit(b);
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
- return 0; /* something went wrong */
+ if (!XftColorAllocValue
+ (xw.dpy, xw.vis, xw.cmap, &color, &colour))
+ return 0; /* something went wrong */
dc.col[x] = colour;
return 1;
} else if (16 + 216 <= x && x < 256) {
- color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x - (16 + 216));
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
- return 0; /* something went wrong */
+ color.red = color.green = color.blue =
+ 0x0808 + 0x0a0a * (x - (16 + 216));
+ if (!XftColorAllocValue
+ (xw.dpy, xw.vis, xw.cmap, &color, &colour))
+ return 0; /* something went wrong */
dc.col[x] = colour;
return 1;
} else {
name = colorname[x];
}
}
- if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
+ if (!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
return 0;
dc.col[x] = colour;
return 1;
}
-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();
- if(xw.isfixed == False) {
+ if (xw.isfixed == False) {
sizeh->flags = PSize | PResizeInc | PBaseSize;
sizeh->height = xw.h;
sizeh->width = xw.w;
@@ -2463,25 +2504,26 @@ xhints(void) {
sizeh->min_height = sizeh->max_height = xw.fh;
}
- XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+ XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
+ &class);
XFree(sizeh);
}
-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->set = FcFontSort(0, match, FcTrue, 0, &result))) {
+ if (!(f->set = FcFontSort(0, match, FcTrue, 0, &result))) {
FcPatternDestroy(match);
return 1;
}
- if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
+ if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(match);
return 1;
}
@@ -2499,29 +2541,32 @@ xloadfont(Font *f, FcPattern *pattern) {
return 0;
}
-void
-xloadfonts(char *fontstr, int fontsize) {
+void xloadfonts(char *fontstr, int fontsize)
+{
FcPattern *pattern;
FcResult result;
double fontval;
- 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 > 0) {
+ if (fontsize > 0) {
FcPatternDel(pattern, FC_PIXEL_SIZE);
- FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
+ FcPatternAddDouble(pattern, FC_PIXEL_SIZE,
+ (double) fontsize);
usedfontsize = fontsize;
} else {
- result = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
- if(result == FcResultMatch) {
- usedfontsize = (int)fontval;
+ result =
+ FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0,
+ &fontval);
+ if (result == FcResultMatch) {
+ usedfontsize = (int) fontval;
} else {
/*
* Default font size is 12, if none given. This is to
@@ -2535,7 +2580,7 @@ xloadfonts(char *fontstr, int 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);
/* Setting character width and height. */
@@ -2544,32 +2589,32 @@ xloadfonts(char *fontstr, int 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
-xunloadfonts(void) {
+void xunloadfonts(void)
+{
int i, ip;
/*
* Free the loaded fonts in the font cache. This is done backwards
* from the frccur.
*/
- for(i = 0, ip = frccur; i < frclen; i++, ip--) {
- if(ip < 0)
+ for (i = 0, ip = frccur; i < frclen; i++, ip--) {
+ if (ip < 0)
ip = LEN(frc) - 1;
XftFontClose(xw.dpy, frc[ip].font);
}
@@ -2590,32 +2635,32 @@ xunloadfonts(void) {
FcFontSetDestroy(dc.ibfont.set);
}
-void
-xzoom(const Arg *arg) {
+void xzoom(const Arg *arg)
+{
xunloadfonts();
xloadfonts(usedfont, usedfontsize + arg->i);
cresize(0, 0);
redraw(0);
}
-void
-xinit(void) {
+void xinit(void)
+{
XSetWindowAttributes attrs;
XGCValues gcvalues;
Cursor cursor;
Window parent;
int sw, sh;
- 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 */
@@ -2623,12 +2668,12 @@ xinit(void) {
xloadcols();
/* adjust fixed window geometry */
- if(xw.isfixed) {
+ if (xw.isfixed) {
sw = DisplayWidth(xw.dpy, xw.scr);
sh = DisplayHeight(xw.dpy, xw.scr);
- if(xw.fx < 0)
+ if (xw.fx < 0)
xw.fx = sw + xw.fx - xw.fw - 1;
- if(xw.fy < 0)
+ if (xw.fy < 0)
xw.fy = sh + xw.fy - xw.fh - 1;
xw.h = xw.fh;
@@ -2646,25 +2691,24 @@ xinit(void) {
attrs.border_pixel = dc.col[defaultbg].pixel;
attrs.bit_gravity = NorthWestGravity;
attrs.event_mask = FocusChangeMask | KeyPressMask
- | ExposureMask | VisibilityChangeMask | StructureNotifyMask
- | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
+ | ExposureMask | VisibilityChangeMask | StructureNotifyMask
+ | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
attrs.colormap = xw.cmap;
- parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
- XRootWindow(xw.dpy, xw.scr);
+ parent = opt_embed ? strtol(opt_embed, NULL, 0) :
+ XRootWindow(xw.dpy, xw.scr);
xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
- xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
- xw.vis,
- CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
- | CWColormap,
- &attrs);
+ xw.w, xw.h, 0, XDefaultDepth(xw.dpy,
+ xw.scr),
+ InputOutput, xw.vis,
+ CWBackPixel | CWBorderPixel | CWBitGravity |
+ CWEventMask | CWColormap, &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);
@@ -2672,29 +2716,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);
@@ -2706,8 +2752,8 @@ xinit(void) {
XSync(xw.dpy, 0);
}
-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 frp, frcflags;
@@ -2720,90 +2766,92 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
FcFontSet *fcsets[] = { NULL };
FcCharSet *fccharset;
Colour *fg = &dc.col[base.fg], *bg = &dc.col[base.bg],
- *temp, revfg, revbg;
+ *temp, revfg, revbg;
XRenderColor colfg, colbg;
frcflags = FRC_NORMAL;
- if(base.mode & ATTR_BOLD) {
- if(BETWEEN(base.fg, 0, 7)) {
+ if (base.mode & ATTR_BOLD) {
+ if (BETWEEN(base.fg, 0, 7)) {
/* basic system colors */
fg = &dc.col[base.fg + 8];
- } else if(BETWEEN(base.fg, 16, 195)) {
+ } else if (BETWEEN(base.fg, 16, 195)) {
/* 256 colors */
fg = &dc.col[base.fg + 36];
- } else if(BETWEEN(base.fg, 232, 251)) {
+ } else if (BETWEEN(base.fg, 232, 251)) {
/* greyscale */
fg = &dc.col[base.fg + 4];
}
/*
* Those ranges will not be brightened:
- * 8 - 15 – bright system colors
- * 196 - 231 – highest 256 color cube
- * 252 - 255 – brightest colors in greyscale
+ * 8 - 15 – bright system colors
+ * 196 - 231 – highest 256 color cube
+ * 252 - 255 – brightest colors in greyscale
*/
font = &dc.bfont;
frcflags = FRC_BOLD;
}
- if(base.mode & ATTR_ITALIC) {
+ if (base.mode & ATTR_ITALIC) {
font = &dc.ifont;
frcflags = FRC_ITALIC;
}
- if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
+ if ((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
font = &dc.ibfont;
frcflags = FRC_ITALICBOLD;
}
- 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;
colfg.green = ~fg->color.green;
colfg.blue = ~fg->color.blue;
colfg.alpha = fg->color.alpha;
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+ XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
+ &revfg);
fg = &revfg;
}
- if(bg == &dc.col[defaultbg]) {
+ if (bg == &dc.col[defaultbg]) {
bg = &dc.col[defaultfg];
} else {
colbg.red = ~bg->color.red;
colbg.green = ~bg->color.green;
colbg.blue = ~bg->color.blue;
colbg.alpha = bg->color.alpha;
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+ XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
+ &revbg);
bg = &revbg;
}
}
- if(base.mode & ATTR_REVERSE) {
+ if (base.mode & ATTR_REVERSE) {
temp = fg;
fg = bg;
bg = temp;
}
/* 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. */
XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
fcsets[0] = font->set;
- 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
@@ -2813,27 +2861,29 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
u8fs = s;
u8fblen = 0;
u8fl = 0;
- for(;;) {
+ for (;;) {
u8c = s;
u8cblen = utf8decode(s, &u8char);
s += u8cblen;
bytelen -= u8cblen;
- doesexist = XftCharIndex(xw.dpy, font->match, u8char);
- if(!doesexist || bytelen <= 0) {
- if(bytelen <= 0) {
- if(doesexist) {
+ doesexist =
+ XftCharIndex(xw.dpy, font->match, u8char);
+ if (!doesexist || bytelen <= 0) {
+ if (bytelen <= 0) {
+ if (doesexist) {
u8fl++;
u8fblen += u8cblen;
}
}
- 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 += font->width * u8fl;
}
break;
@@ -2842,23 +2892,23 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
u8fl++;
u8fblen += u8cblen;
}
- if(doesexist)
+ if (doesexist)
break;
frp = frccur;
/* Search the font cache. */
- for(i = 0; i < frclen; i++, frp--) {
- if(frp <= 0)
+ for (i = 0; i < frclen; i++, frp--) {
+ if (frp <= 0)
frp = LEN(frc) - 1;
- if(frc[frp].c == u8char
- && frc[frp].flags == frcflags) {
+ if (frc[frp].c == u8char
+ && frc[frp].flags == frcflags) {
break;
}
}
/* Nothing was found. */
- if(i >= frclen) {
+ if (i >= frclen) {
/*
* Nothing was found in the cache. Now use
* some dozen of Fontconfig calls to get the
@@ -2869,16 +2919,15 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
FcCharSetAddChar(fccharset, u8char);
FcPatternAddCharSet(fcpattern, FC_CHARSET,
- fccharset);
- FcPatternAddBool(fcpattern, FC_SCALABLE,
- FcTrue);
+ fccharset);
+ FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
- FcConfigSubstitute(0, fcpattern,
- FcMatchPattern);
+ FcConfigSubstitute(0, fcpattern, FcMatchPattern);
FcDefaultSubstitute(fcpattern);
fontpattern = FcFontSetMatch(0, fcsets,
- FcTrue, fcpattern, &fcres);
+ FcTrue, fcpattern,
+ &fcres);
/*
* Overwrite or create the new cache entry
@@ -2886,15 +2935,15 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
*/
frccur++;
frclen++;
- if(frccur >= LEN(frc))
+ if (frccur >= LEN(frc))
frccur = 0;
- if(frclen > LEN(frc)) {
+ if (frclen > LEN(frc)) {
frclen = LEN(frc);
XftFontClose(xw.dpy, frc[frccur].font);
}
frc[frccur].font = XftFontOpenPattern(xw.dpy,
- fontpattern);
+ fontpattern);
frc[frccur].c = u8char;
frc[frccur].flags = frcflags;
@@ -2905,51 +2954,52 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
}
XftDrawStringUtf8(xw.draw, fg, frc[frp].font,
- xp, winy + frc[frp].font->ascent,
- (FcChar8 *)u8c, u8cblen);
+ xp, winy + frc[frp].font->ascent,
+ (FcChar8 *) u8c, u8cblen);
xp += font->width;
}
/*
- 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);
}
}
-void
-xdrawcursor(void) {
+void xdrawcursor(void)
+{
static int oldx = 0, oldy = 0;
int sl;
- Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs, 0};
+ Glyph g = { {' '}, ATTR_NULL, defaultbg, defaultcs, 0 };
- LIMIT(oldx, 0, term.col-1);
- LIMIT(oldy, 0, term.row-1);
+ LIMIT(oldx, 0, term.col - 1);
+ LIMIT(oldy, 0, term.row - 1);
- if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
+ if (term.line[term.c.y][term.c.x].state & GLYPH_SET)
memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
/* remove the old cursor */
- if(term.line[oldy][oldx].state & GLYPH_SET) {
+ if (term.line[oldy][oldx].state & GLYPH_SET) {
sl = utf8size(term.line[oldy][oldx].c);
- xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
- oldy, 1, sl);
+ xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx],
+ oldx, oldy, 1, sl);
} else {
xtermclear(oldx, oldy, oldx, oldy);
}
/* draw the new one */
- if(!(IS_SET(MODE_HIDE))) {
- if(!(xw.state & WIN_FOCUSED))
+ if (!(IS_SET(MODE_HIDE))) {
+ if (!(xw.state & WIN_FOCUSED))
g.bg = defaultucs;
- if(IS_SET(MODE_REVERSE))
- g.mode |= ATTR_REVERSE, g.fg = defaultcs, g.bg = defaultfg;
+ if (IS_SET(MODE_REVERSE))
+ g.mode |= ATTR_REVERSE, g.fg = defaultcs, g.bg =
+ defaultfg;
sl = utf8size(g.c);
xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
@@ -2958,137 +3008,137 @@ xdrawcursor(void) {
}
-void
-xsettitle(char *p) {
+void xsettitle(char *p)
+{
XTextProperty prop;
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
- &prop);
+ &prop);
XSetWMName(xw.dpy, xw.win, &prop);
}
-void
-xresettitle(void) {
+void xresettitle(void)
+{
xsettitle(opt_title ? opt_title : "st");
}
-void
-redraw(int timeout) {
- struct timespec tv = {0, timeout * 1000};
+void redraw(int timeout)
+{
+ struct timespec tv = { 0, timeout * 1000 };
tfulldirt();
draw();
- if(timeout > 0) {
+ if (timeout > 0) {
nanosleep(&tv, NULL);
- XSync(xw.dpy, False); /* necessary for a good tput flash */
+ XSync(xw.dpy, False); /* necessary for a good tput flash */
}
}
-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, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
bool ena_sel = sel.bx != -1;
- if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
+ if (sel.alt ^ IS_SET(MODE_ALTSCREEN))
ena_sel = 0;
- 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(ena_sel && *(new.c) && selected(x, y))
+ if (ena_sel && *(new.c) && selected(x, y))
new.mode ^= ATTR_REVERSE;
- if(ib > 0 && (!(new.state & GLYPH_SET)
- || ATTRCMP(base, new)
- || ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+ if (ib > 0 && (!(new.state & GLYPH_SET)
+ || ATTRCMP(base, new)
+ || ib >= DRAW_BUF_SIZ - UTF_SIZ)) {
xdraws(buf, base, ox, y, ic, ib);
ic = ib = 0;
}
- if(new.state & GLYPH_SET) {
- if(ib == 0) {
+ if (new.state & GLYPH_SET) {
+ if (ib == 0) {
ox = x;
base = new;
}
sl = utf8size(new.c);
- memcpy(buf+ib, new.c, sl);
+ memcpy(buf + ib, new.c, sl);
ib += sl;
++ic;
}
}
- if(ib > 0)
+ if (ib > 0)
xdraws(buf, base, ox, y, ic, ib);
}
xdrawcursor();
}
-void
-expose(XEvent *ev) {
+void expose(XEvent *ev)
+{
XExposeEvent *e = &ev->xexpose;
- if(xw.state & WIN_REDRAW) {
- if(!e->count)
+ if (xw.state & WIN_REDRAW) {
+ if (!e->count)
xw.state &= ~WIN_REDRAW;
}
redraw(0);
}
-void
-visibility(XEvent *ev) {
+void visibility(XEvent *ev)
+{
XVisibilityEvent *e = &ev->xvisibility;
- if(e->state == VisibilityFullyObscured) {
+ if (e->state == VisibilityFullyObscured) {
xw.state &= ~WIN_VISIBLE;
- } else if(!(xw.state & WIN_VISIBLE)) {
+ } else if (!(xw.state & WIN_VISIBLE)) {
/* need a full redraw for next Expose, not just a buf copy */
xw.state |= WIN_VISIBLE | WIN_REDRAW;
}
}
-void
-unmap(XEvent *ev) {
+void unmap(XEvent *ev)
+{
xw.state &= ~WIN_VISIBLE;
}
-void
-xseturgency(int add) {
+void xseturgency(int add)
+{
XWMHints *h = XGetWMHints(xw.dpy, xw.win);
- h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
+ h->flags =
+ add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
XSetWMHints(xw.dpy, xw.win, h);
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);
@@ -3098,66 +3148,65 @@ focus(XEvent *ev) {
}
}
-inline bool
-match(uint mask, uint state) {
+inline bool match(uint mask, uint state)
+{
state &= ~(ignoremod);
- if(mask == XK_NO_MOD && state)
+ if (mask == XK_NO_MOD && state)
return false;
- if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
+ if (mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
return false;
- if((state & mask) != state)
+ if ((state & mask) != state)
return false;
return true;
}
-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)
+{
uint mask;
Key *kp;
int i;
/* Check for mapped keys out of X11 function keys. */
- for(i = 0; i < LEN(mappedkeys); i++) {
- if(mappedkeys[i] == k)
+ 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++) {
+ for (kp = key; kp < key + LEN(key); kp++) {
mask = kp->mask;
- if(kp->k != k)
+ if (kp->k != k)
continue;
- if(!match(mask, state))
+ if (!match(mask, state))
continue;
- if(kp->appkey > 0) {
- if(!IS_SET(MODE_APPKEYPAD))
+ if (kp->appkey > 0) {
+ if (!IS_SET(MODE_APPKEYPAD))
continue;
- if(term.numlock && kp->appkey == 2)
+ if (term.numlock && kp->appkey == 2)
continue;
- } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+ } else if (kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
continue;
}
- if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
- (kp->appcursor > 0
- && !IS_SET(MODE_APPCURSOR))) {
+ if ((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
+ (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
continue;
}
- if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
- (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+ if ((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
+ (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
continue;
}
@@ -3167,8 +3216,8 @@ kmap(KeySym k, uint state) {
return NULL;
}
-void
-kpress(XEvent *ev) {
+void kpress(XEvent *ev)
+{
XKeyEvent *e = &ev->xkey;
KeySym ksym;
char xstr[31], buf[32], *customkey, *cp = buf;
@@ -3176,29 +3225,30 @@ kpress(XEvent *ev) {
Status status;
Shortcut *bp;
- if(IS_SET(MODE_KBDLOCK))
+ if (IS_SET(MODE_KBDLOCK))
return;
- len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
+ len =
+ XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
e->state &= ~Mod2Mask;
/* 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))) {
len = strlen(customkey);
memcpy(buf, customkey, len);
- /* 2. hardcoded (overrides X lookup) */
+ /* 2. hardcoded (overrides X lookup) */
} else {
- if(len == 0)
+ if (len == 0)
return;
- if(len == 1 && e->state & Mod1Mask)
+ if (len == 1 && e->state & Mod1Mask)
*cp++ = '\033';
memcpy(cp, xstr, len);
@@ -3206,38 +3256,39 @@ kpress(XEvent *ev) {
}
ttywrite(buf, len);
- if(IS_SET(MODE_ECHO))
+ if (IS_SET(MODE_ECHO))
techo(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;
@@ -3248,16 +3299,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;
fd_set rfd;
int xfd = XConnectionNumber(xw.dpy), xev;
@@ -3265,112 +3316,112 @@ run(void) {
gettimeofday(&last, NULL);
- for(xev = actionfps;;) {
+ for (xev = actionfps;;) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
- if(errno == EINTR)
+ if (select(MAX(xfd, cmdfd) + 1, &rfd, NULL, NULL, tv) < 0) {
+ if (errno == EINTR)
continue;
die("select failed: %s\n", SERRNO);
}
gettimeofday(&now, NULL);
drawtimeout.tv_sec = 0;
- drawtimeout.tv_usec = (1000/xfps) * 1000;
+ drawtimeout.tv_usec = (1000 / xfps) * 1000;
tv = &drawtimeout;
- if(FD_ISSET(cmdfd, &rfd))
+ if (FD_ISSET(cmdfd, &rfd))
ttyread();
- if(FD_ISSET(xfd, &rfd))
+ if (FD_ISSET(xfd, &rfd))
xev = actionfps;
- if(TIMEDIFF(now, last) > \
- (xev ? (1000/xfps) : (1000/actionfps))) {
- while(XPending(xw.dpy)) {
+ if (TIMEDIFF(now, last) >
+ (xev ? (1000 / xfps) : (1000 / actionfps))) {
+ 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);
last = now;
- if(xev && !FD_ISSET(xfd, &rfd))
+ if (xev && !FD_ISSET(xfd, &rfd))
xev--;
- if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd))
+ if (!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd))
tv = NULL;
}
}
}
-int
-main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
int i, bitm, xr, yr;
uint wr, hr;
xw.fw = xw.fh = xw.fx = xw.fy = 0;
xw.isfixed = False;
- for(i = 1; i < argc; i++) {
- switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
+ for (i = 1; i < argc; i++) {
+ switch (argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
case 'c':
- if(++i < argc)
+ if (++i < argc)
opt_class = argv[i];
break;
case 'e':
/* eat all remaining arguments */
- if(++i < argc)
+ if (++i < argc)
opt_cmd = &argv[i];
goto run;
case 'f':
- if(++i < argc)
+ if (++i < argc)
opt_font = argv[i];
break;
case 'g':
- if(++i >= argc)
+ if (++i >= argc)
break;
bitm = XParseGeometry(argv[i], &xr, &yr, &wr, &hr);
- if(bitm & XValue)
+ if (bitm & XValue)
xw.fx = xr;
- if(bitm & YValue)
+ if (bitm & YValue)
xw.fy = yr;
- if(bitm & WidthValue)
- xw.fw = (int)wr;
- if(bitm & HeightValue)
- xw.fh = (int)hr;
- if(bitm & XNegative && xw.fx == 0)
+ if (bitm & WidthValue)
+ xw.fw = (int) wr;
+ if (bitm & HeightValue)
+ xw.fh = (int) hr;
+ if (bitm & XNegative && xw.fx == 0)
xw.fx = -1;
- if(bitm & XNegative && xw.fy == 0)
+ if (bitm & XNegative && xw.fy == 0)
xw.fy = -1;
- if(xw.fh != 0 && xw.fw != 0)
+ if (xw.fh != 0 && xw.fw != 0)
xw.isfixed = True;
break;
case 'o':
- if(++i < argc)
+ if (++i < argc)
opt_io = argv[i];
break;
case 't':
- if(++i < argc)
+ if (++i < argc)
opt_title = argv[i];
break;
case 'v':
default:
die(USAGE);
case 'w':
- if(++i < argc)
+ if (++i < argc)
opt_embed = argv[i];
break;
}
}
-run:
+ run:
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
tnew(80, 24);
@@ -3381,4 +3432,3 @@ run:
return 0;
}
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 15:59:14 +0000