[PATCH 5/5] Make config.def.h more consistent

From: FRIGN <dev_AT_frign.de>
Date: Wed, 8 Jul 2015 20:34:12 +0200

Looking a bit better now.
---
 config.def.h | 129 +++++++++++++++++++++++++----------------------------------
 1 file changed, 55 insertions(+), 74 deletions(-)
diff --git a/config.def.h b/config.def.h
index 5375c1c..e9075cb 100644
--- a/config.def.h
+++ b/config.def.h
_AT_@ -1,65 +1,56 @@
 /* See LICENSE file for copyright and license details. */
 
-/*
- * appearance
- *
- * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- */
-static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
-static int borderpx = 2;
-static char shell[] = "/bin/sh";
-static char *utmp = NULL;
+/* -- Appearance -- */
+/* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */
+static char font[]      = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static int  borderpx    = 2;
+static char shell[]     = "/bin/sh";
+static char *utmp       = NULL;
 static char stty_args[] = "stty raw -echo -iexten echonl";
 
-/* identification sequence returned in DA and DECID */
+/* -- Identification sequence returned in DA and DECID -- */
 static char vtiden[] = "\033[?6c";
 
-/* Kerning / character bounding-box multipliers */
+/* -- Kerning / character bounding-box multipliers -- */
 static float cwscale = 1.0;
 static float chscale = 1.0;
 
-/*
- * word delimiter string
- *
- * More advanced example: " `'\"()[]{}"
- */
+/* -- Word delimiter string -- */
+/* More advanced example: " `'\"()[]{}" */
 static char worddelimiters[] = " ";
 
-/* selection timeouts (in milliseconds) */
+/* -- Selection timeouts -- */
+/* In milliseconds */
 static unsigned int doubleclicktimeout = 300;
 static unsigned int tripleclicktimeout = 600;
 
-/* alt screens */
+/* -- Alt screens -- */
 static int allowaltscreen = 1;
 
-/* frames per second st should at maximum draw to the screen */
+/* -- FPS limits -- */
 static unsigned int xfps = 120;
 static unsigned int actionfps = 30;
 
-/*
- * blinking timeout (set to 0 to disable blinking) for the terminal blinking
- * attribute.
- */
+/* -- Blinking timeout for the terminal blinking attribute -- */
+/* Set to 0 to disable blinking */
 static unsigned int blinktimeout = 800;
 
-/*
- * thickness of underline and bar cursors
- */
+/* -- Thickness of underline and bar cursors -- */
 static unsigned int cursorthickness = 2;
 
-/*
- * bell volume. It must be a value between -100 and 100. Use 0 for disabling
- * it
- */
+/* -- Bell volume -- */
+/* Must be between -100 and 100, setting it to 0 disables it */
 static int bellvolume = 0;
 
-/* TERM value */
+/* -- TERM value -- */
 static char termname[] = "st-256color";
 
+/* -- Spaces per tab -- */
 static unsigned int tabspaces = 8;
 
 
-/* Terminal colors (16 first used in escape sequence) */
+/* -- Terminal colors -- */
+/* 16 first used in escape sequences */
 static const char *colorname[] = {
 	/* 8 normal colors */
 	"black",
_AT_@ -83,28 +74,23 @@ static const char *colorname[] = {
 
 	[255] = 0,
 
-	/* more colors can be added after 255 to use with DefaultXX */
+	/* Add colors here after 255 to use them with defaultXX */
 	"#cccccc",
 };
 
 
-/*
- * Default colors (colorname index)
- * foreground, background, cursor
- */
+/* -- Default colors -- */
+/* Foreground, background, cursor colors */
 static unsigned int defaultfg = 7;
 static unsigned int defaultbg = 0;
 static unsigned int defaultcs = 256;
 
-/*
- * Colors used, when the specific fg == defaultfg. So in reverse mode this
- * will reverse too. Another logic would only make the simple feature too
- * complex.
- */
+/* -- Fallback colors in case fg == defaultfg -- */
+/* This is reversed in reverse mode as well. */
 static unsigned int defaultitalic = 11;
 static unsigned int defaultunderline = 7;
 
-/* Internal mouse shortcuts. */
+/* -- Internal mouse shortcuts -- */
 /* Beware that overloading Button1 will disable the selection. */
 static Mousekey mshortcuts[] = {
 	/* button               mask            string */
_AT_@ -112,7 +98,7 @@ static Mousekey mshortcuts[] = {
 	{ Button5,              XK_ANY_MOD,     "\005" },
 };
 
-/* Internal keyboard shortcuts. */
+/* -- Internal keyboard shortcuts -- */
 #define MODKEY Mod1Mask
 
 static Shortcut shortcuts[] = {
_AT_@ -130,46 +116,42 @@ static Shortcut shortcuts[] = {
 	{ MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
 };
 
-/*
- * Special keys (change & recompile st.info accordingly)
+/* -- Special keys -- */
+/* Don't forget to change & recompile st.info accordingly
  *
  * Mask value:
  * * Use XK_ANY_MOD to match the key no matter modifiers state
  * * Use XK_NO_MOD to match the key alone (no modifiers)
  * appkey value:
- * * 0: no value
- * * > 0: keypad application mode enabled
- * *   = 2: term.numlock = 1
- * * < 0: keypad application mode disabled
+ *  > 0: keypad application mode enabled
+ *       = 2: term.numlock = 1
+ *  = 0: no value
+ *  < 0: keypad application mode disabled
  * appcursor value:
- * * 0: no value
- * * > 0: cursor application mode enabled
- * * < 0: cursor application mode disabled
+ *  > 0: cursor application mode enabled
+ *  = 0: no value
+ *  < 0: cursor application mode disabled
  * crlf value
- * * 0: no value
- * * > 0: crlf mode is enabled
- * * < 0: crlf mode is disabled
+ *  > 0: crlf mode enabled
+ *  = 0: no value
+ *  < 0: crlf mode disabled
  *
- * Be careful with the order of the definitions because st searches in
+ * Be careful with the order of the definitions, because st seeks
  * this table sequentially, so any XK_ANY_MOD must be in the last
  * position for a key.
- */
-
-/*
+ *
  * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
- * to be mapped below, add them to this array.
+ * to be mapped below, add them to the following array.
  */
 static KeySym mappedkeys[] = { -1 };
 
-/*
- * State bits to ignore when matching key or button events.  By default,
- * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
- */
-static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
+/* -- State-bits ignored while matching key or button events -- */
+/* By default, numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. */
+static uint ignoremod = Mod2Mask | XK_SWITCH_MOD;
 
-/* Override mouse-select while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it. */
+/* -- Override mouse-select while mask is active (when MODE_MOUSE is set) -- */
+/* Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier or to 0 to disable it. */
 static uint forceselmod = ShiftMask;
 
 static Key key[] = {
_AT_@ -371,12 +353,11 @@ static Key key[] = {
 	{ XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0,    0},
 };
 
-/*
- * Selection types' masks.
- * Use the same masks as usual.
- * Button1Mask is always unset, to make masks match between ButtonPress.
+/* -- Selection types' masks -- */
+/* Use the same masks as usual.
+ * Button1Mask is always unset to make masks match between ButtonPress,
  * ButtonRelease and MotionNotify.
- * If no match is found, regular selection is used.
+ * If no match is found, the regular selection is used.
  */
 static uint selmasks[] = {
 	[SEL_RECTANGULAR] = Mod1Mask,
-- 
1.8.5.5
--Multipart=_Wed__8_Jul_2015_20_45_23_+0200_.YLrupkOLV48Y1fT--
Received on Mon Sep 17 2001 - 00:00:00 CEST

This archive was generated by hypermail 2.3.0 : Wed Jul 08 2015 - 21:48:09 CEST