Update config.h for latest upstream changes
This commit is contained in:
		
							
								
								
									
										54
									
								
								config.h
									
									
									
									
									
								
							
							
						
						
									
										54
									
								
								config.h
									
									
									
									
									
								
							| @@ -5,19 +5,21 @@ | |||||||
|  * |  * | ||||||
|  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html |  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html | ||||||
|  */ |  */ | ||||||
| static char font[] = "Inconsolata:size=10:antialias=true:hinting=true"; | static char *font = "Inconsolata:size=10:antialias=true:hinting=true"; | ||||||
| static int borderpx = 2; | static int borderpx = 2; | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * What program is execed by st depends of these precedence rules: |  * What program is execed by st depends of these precedence rules: | ||||||
|  * 1: program passed with -e |  * 1: program passed with -e | ||||||
|  * 2: utmp option |  * 2: scroll and/or utmp | ||||||
|  * 3: SHELL environment variable |  * 3: SHELL environment variable | ||||||
|  * 4: value of shell in /etc/passwd |  * 4: value of shell in /etc/passwd | ||||||
|  * 5: value of shell in config.h |  * 5: value of shell in config.h | ||||||
|  */ |  */ | ||||||
| static char *shell = "/bin/sh"; | static char *shell = "/bin/sh"; | ||||||
| char *utmp = NULL; | char *utmp = NULL; | ||||||
|  | /* scroll program: to enable use a string like "scroll" */ | ||||||
|  | char *scroll = NULL; | ||||||
| char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; | char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; | ||||||
|  |  | ||||||
| /* identification sequence returned in DA and DECID */ | /* identification sequence returned in DA and DECID */ | ||||||
| @@ -30,9 +32,9 @@ static float chscale = 1.0; | |||||||
| /* | /* | ||||||
|  * word delimiter string |  * word delimiter string | ||||||
|  * |  * | ||||||
|  * More advanced example: " `'\"()[]{}" |  * More advanced example: L" `'\"()[]{}" | ||||||
|  */ |  */ | ||||||
| char *worddelimiters = " │`'\"()[]{}"; | wchar_t *worddelimiters = L" │`'\"()[]{}"; | ||||||
|  |  | ||||||
| /* selection timeouts (in milliseconds) */ | /* selection timeouts (in milliseconds) */ | ||||||
| static unsigned int doubleclicktimeout = 300; | static unsigned int doubleclicktimeout = 300; | ||||||
| @@ -41,9 +43,18 @@ static unsigned int tripleclicktimeout = 600; | |||||||
| /* alt screens */ | /* alt screens */ | ||||||
| int allowaltscreen = 1; | int allowaltscreen = 1; | ||||||
|  |  | ||||||
| /* frames per second st should at maximum draw to the screen */ | /* allow certain non-interactive (insecure) window operations such as: | ||||||
| static unsigned int xfps = 120; |    setting the clipboard text */ | ||||||
| static unsigned int actionfps = 30; | int allowwindowops = 0; | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * draw latency range in ms - from new content/keypress/etc until drawing. | ||||||
|  |  * within this range, st draws when content stops arriving (idle). mostly it's | ||||||
|  |  * near minlatency, but it waits longer for slow updates to avoid partial draw. | ||||||
|  |  * low minlatency will tear/flicker more, as it can "detect" idle too early. | ||||||
|  |  */ | ||||||
|  | static double minlatency = 8; | ||||||
|  | static double maxlatency = 33; | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * blinking timeout (set to 0 to disable blinking) for the terminal blinking |  * blinking timeout (set to 0 to disable blinking) for the terminal blinking | ||||||
| @@ -110,7 +121,7 @@ static const char *colorname[] = { | |||||||
|  */ |  */ | ||||||
| unsigned int defaultfg = 12; | unsigned int defaultfg = 12; | ||||||
| unsigned int defaultbg = 8; | unsigned int defaultbg = 8; | ||||||
| static unsigned int defaultcs = 14; | unsigned int defaultcs = 14; | ||||||
| static unsigned int defaultrcs = 15; | static unsigned int defaultrcs = 15; | ||||||
|  |  | ||||||
| /* | /* | ||||||
| @@ -142,14 +153,24 @@ static unsigned int mousebg = 0; | |||||||
|  */ |  */ | ||||||
| static unsigned int defaultattr = 11; | static unsigned int defaultattr = 11; | ||||||
|  |  | ||||||
|  | /* | ||||||
|  |  * Force mouse select/shortcuts 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. | ||||||
|  |  */ | ||||||
|  | static uint forcemousemod = ShiftMask; | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * Internal mouse shortcuts. |  * Internal mouse shortcuts. | ||||||
|  * Beware that overloading Button1 will disable the selection. |  * Beware that overloading Button1 will disable the selection. | ||||||
|  */ |  */ | ||||||
| static MouseShortcut mshortcuts[] = { | static MouseShortcut mshortcuts[] = { | ||||||
| 	/* button               mask            string */ | 	/* mask                 button   function        argument       release */ | ||||||
| 	{ Button4,              XK_ANY_MOD,     "\031" }, | 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 }, | ||||||
| 	{ Button5,              XK_ANY_MOD,     "\005" }, | 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} }, | ||||||
|  | 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} }, | ||||||
|  | 	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} }, | ||||||
|  | 	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} }, | ||||||
| }; | }; | ||||||
|  |  | ||||||
| /* Internal keyboard shortcuts. */ | /* Internal keyboard shortcuts. */ | ||||||
| @@ -187,10 +208,6 @@ static Shortcut shortcuts[] = { | |||||||
|  * * 0: no value |  * * 0: no value | ||||||
|  * * > 0: cursor application mode enabled |  * * > 0: cursor application mode enabled | ||||||
|  * * < 0: cursor application mode disabled |  * * < 0: cursor application mode disabled | ||||||
|  * crlf value |  | ||||||
|  * * 0: no value |  | ||||||
|  * * > 0: crlf mode is enabled |  | ||||||
|  * * < 0: crlf mode is disabled |  | ||||||
|  * |  * | ||||||
|  * Be careful with the order of the definitions because st searches in |  * Be careful with the order of the definitions because st searches in | ||||||
|  * this table sequentially, so any XK_ANY_MOD must be in the last |  * this table sequentially, so any XK_ANY_MOD must be in the last | ||||||
| @@ -209,13 +226,6 @@ static KeySym mappedkeys[] = { -1 }; | |||||||
|  */ |  */ | ||||||
| static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; | 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. |  | ||||||
|  */ |  | ||||||
| static uint forceselmod = ShiftMask; |  | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * This is the huge key array which defines all compatibility to the Linux |  * This is the huge key array which defines all compatibility to the Linux | ||||||
|  * world. Please decide about changes wisely. |  * world. Please decide about changes wisely. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user