circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add some const, from Markus F X J Oberhumer.

pull/3307/head
nicm 2022-08-15 08:41:13 +00:00
parent cfdc5b62ad
commit 497021d0db
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
key-bindings.c
View File

@ -344,7 +344,7 @@ key_bindings_init_done(__unused struct cmdq_item *item, __unused void *data)
void void
key_bindings_init(void) key_bindings_init(void)
{ {
static const char *defaults[] = { static const char *const defaults[] = {
/* Prefix keys. */ /* Prefix keys. */
"bind -N 'Send the prefix key' C-b { send-prefix }", "bind -N 'Send the prefix key' C-b { send-prefix }",
"bind -N 'Rotate through the panes' C-o { rotate-window }", "bind -N 'Rotate through the panes' C-o { rotate-window }",

54
tty-features.c
View File

@ -36,13 +36,13 @@
/* A named terminal feature. */ /* A named terminal feature. */
struct tty_feature { struct tty_feature {
const char *name; const char *name;
const char **capabilities; const char *const *capabilities;
int flags; int flags;
}; };
/* Terminal has xterm(1) title setting. */ /* Terminal has xterm(1) title setting. */
static const char *tty_feature_title_capabilities[] = { static const char *const tty_feature_title_capabilities[] = {
"tsl=\\E]0;", /* should be using TS really */ "tsl=\\E]0;", /* should be using TS really */
"fsl=\\a", "fsl=\\a",
NULL NULL
@ -54,7 +54,7 @@ static const struct tty_feature tty_feature_title = {
}; };
/* Terminal has OSC 7 working directory. */ /* Terminal has OSC 7 working directory. */
static const char *tty_feature_osc7_capabilities[] = { static const char *const tty_feature_osc7_capabilities[] = {
"Swd=\\E]7;", "Swd=\\E]7;",
"fsl=\\a", "fsl=\\a",
NULL NULL
@ -66,7 +66,7 @@ static const struct tty_feature tty_feature_osc7 = {
}; };
/* Terminal has mouse support. */ /* Terminal has mouse support. */
static const char *tty_feature_mouse_capabilities[] = { static const char *const tty_feature_mouse_capabilities[] = {
"kmous=\\E[M", "kmous=\\E[M",
NULL NULL
}; };
@ -77,7 +77,7 @@ static const struct tty_feature tty_feature_mouse = {
}; };
/* Terminal can set the clipboard with OSC 52. */ /* Terminal can set the clipboard with OSC 52. */
static const char *tty_feature_clipboard_capabilities[] = { static const char *const tty_feature_clipboard_capabilities[] = {
"Ms=\\E]52;%p1%s;%p2%s\\a", "Ms=\\E]52;%p1%s;%p2%s\\a",
NULL NULL
}; };
@ -88,7 +88,7 @@ static const struct tty_feature tty_feature_clipboard = {
}; };
/* Terminal supports OSC 8 hyperlinks. */ /* Terminal supports OSC 8 hyperlinks. */
static const char *tty_feature_hyperlinks_capabilities[] = { static const char *const tty_feature_hyperlinks_capabilities[] = {
"*:Hls=\\E]8;%?%p1%l%tid=%p1%s%;;%p2%s\\E\\\\", "*:Hls=\\E]8;%?%p1%l%tid=%p1%s%;;%p2%s\\E\\\\",
NULL NULL
}; };
@ -103,7 +103,7 @@ static const struct tty_feature tty_feature_hyperlinks = {
* terminals with RGB have versions that do not allow setting colours from the * terminals with RGB have versions that do not allow setting colours from the
* 256 palette. * 256 palette.
*/ */
static const char *tty_feature_rgb_capabilities[] = { static const char *const tty_feature_rgb_capabilities[] = {
"AX", "AX",
"setrgbf=\\E[38;2;%p1%d;%p2%d;%p3%dm", "setrgbf=\\E[38;2;%p1%d;%p2%d;%p3%dm",
"setrgbb=\\E[48;2;%p1%d;%p2%d;%p3%dm", "setrgbb=\\E[48;2;%p1%d;%p2%d;%p3%dm",
@ -118,7 +118,7 @@ static const struct tty_feature tty_feature_rgb = {
}; };
/* Terminal supports 256 colours. */ /* Terminal supports 256 colours. */
static const char *tty_feature_256_capabilities[] = { static const char *const tty_feature_256_capabilities[] = {
"AX", "AX",
"setab=\\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", "setab=\\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
"setaf=\\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", "setaf=\\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
@ -131,7 +131,7 @@ static const struct tty_feature tty_feature_256 = {
}; };
/* Terminal supports overline. */ /* Terminal supports overline. */
static const char *tty_feature_overline_capabilities[] = { static const char *const tty_feature_overline_capabilities[] = {
"Smol=\\E[53m", "Smol=\\E[53m",
NULL NULL
}; };
@ -142,7 +142,7 @@ static const struct tty_feature tty_feature_overline = {
}; };
/* Terminal supports underscore styles. */ /* Terminal supports underscore styles. */
static const char *tty_feature_usstyle_capabilities[] = { static const char *const tty_feature_usstyle_capabilities[] = {
"Smulx=\\E[4::%p1%dm", "Smulx=\\E[4::%p1%dm",
"Setulc=\\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m", "Setulc=\\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m",
"ol=\\E[59m", "ol=\\E[59m",
@ -155,7 +155,7 @@ static const struct tty_feature tty_feature_usstyle = {
}; };
/* Terminal supports bracketed paste. */ /* Terminal supports bracketed paste. */
static const char *tty_feature_bpaste_capabilities[] = { static const char *const tty_feature_bpaste_capabilities[] = {
"Enbp=\\E[?2004h", "Enbp=\\E[?2004h",
"Dsbp=\\E[?2004l", "Dsbp=\\E[?2004l",
NULL NULL
@ -167,7 +167,7 @@ static const struct tty_feature tty_feature_bpaste = {
}; };
/* Terminal supports focus reporting. */ /* Terminal supports focus reporting. */
static const char *tty_feature_focus_capabilities[] = { static const char *const tty_feature_focus_capabilities[] = {
"Enfcs=\\E[?1004h", "Enfcs=\\E[?1004h",
"Dsfcs=\\E[?1004l", "Dsfcs=\\E[?1004l",
NULL NULL
@ -179,7 +179,7 @@ static const struct tty_feature tty_feature_focus = {
}; };
/* Terminal supports cursor styles. */ /* Terminal supports cursor styles. */
static const char *tty_feature_cstyle_capabilities[] = { static const char *const tty_feature_cstyle_capabilities[] = {
"Ss=\\E[%p1%d q", "Ss=\\E[%p1%d q",
"Se=\\E[2 q", "Se=\\E[2 q",
NULL NULL
@ -191,7 +191,7 @@ static const struct tty_feature tty_feature_cstyle = {
}; };
/* Terminal supports cursor colours. */ /* Terminal supports cursor colours. */
static const char *tty_feature_ccolour_capabilities[] = { static const char *const tty_feature_ccolour_capabilities[] = {
"Cs=\\E]12;%p1%s\\a", "Cs=\\E]12;%p1%s\\a",
"Cr=\\E]112\\a", "Cr=\\E]112\\a",
NULL NULL
@ -203,7 +203,7 @@ static const struct tty_feature tty_feature_ccolour = {
}; };
/* Terminal supports strikethrough. */ /* Terminal supports strikethrough. */
static const char *tty_feature_strikethrough_capabilities[] = { static const char *const tty_feature_strikethrough_capabilities[] = {
"smxx=\\E[9m", "smxx=\\E[9m",
NULL NULL
}; };
@ -214,7 +214,7 @@ static const struct tty_feature tty_feature_strikethrough = {
}; };
/* Terminal supports synchronized updates. */ /* Terminal supports synchronized updates. */
static const char *tty_feature_sync_capabilities[] = { static const char *const tty_feature_sync_capabilities[] = {
"Sync=\\EP=%p1%ds\\E\\\\", "Sync=\\EP=%p1%ds\\E\\\\",
NULL NULL
}; };
@ -225,7 +225,7 @@ static const struct tty_feature tty_feature_sync = {
}; };
/* Terminal supports extended keys. */ /* Terminal supports extended keys. */
static const char *tty_feature_extkeys_capabilities[] = { static const char *const tty_feature_extkeys_capabilities[] = {
"Eneks=\\E[>4;1m", "Eneks=\\E[>4;1m",
"Dseks=\\E[>4m", "Dseks=\\E[>4m",
NULL NULL
@ -237,7 +237,7 @@ static const struct tty_feature tty_feature_extkeys = {
}; };
/* Terminal supports DECSLRM margins. */ /* Terminal supports DECSLRM margins. */
static const char *tty_feature_margins_capabilities[] = { static const char *const tty_feature_margins_capabilities[] = {
"Enmg=\\E[?69h", "Enmg=\\E[?69h",
"Dsmg=\\E[?69l", "Dsmg=\\E[?69l",
"Clmg=\\E[s", "Clmg=\\E[s",
@ -251,7 +251,7 @@ static const struct tty_feature tty_feature_margins = {
}; };
/* Terminal supports DECFRA rectangle fill. */ /* Terminal supports DECFRA rectangle fill. */
static const char *tty_feature_rectfill_capabilities[] = { static const char *const tty_feature_rectfill_capabilities[] = {
"Rect", "Rect",
NULL NULL
}; };
@ -262,7 +262,7 @@ static const struct tty_feature tty_feature_rectfill = {
}; };
/* Use builtin function keys only. */ /* Use builtin function keys only. */
static const char *tty_feature_ignorefkeys_capabilities[] = { static const char *const tty_feature_ignorefkeys_capabilities[] = {
"kf0@", "kf0@",
"kf1@", "kf1@",
"kf2@", "kf2@",
@ -336,7 +336,7 @@ static const struct tty_feature tty_feature_ignorefkeys = {
}; };
/* Available terminal features. */ /* Available terminal features. */
static const struct tty_feature *tty_features[] = { static const struct tty_feature *const tty_features[] = {
&tty_feature_256, &tty_feature_256,
&tty_feature_bpaste, &tty_feature_bpaste,
&tty_feature_ccolour, &tty_feature_ccolour,
@ -410,9 +410,9 @@ tty_get_features(int feat)
int int
tty_apply_features(struct tty_term *term, int feat) tty_apply_features(struct tty_term *term, int feat)
{ {
const struct tty_feature *tf; const struct tty_feature *tf;
const char **capability; const char *const *capability;
u_int i; u_int i;
if (feat == 0) if (feat == 0)
return (0); return (0);
@ -443,7 +443,7 @@ tty_apply_features(struct tty_term *term, int feat)
void void
tty_default_features(int *feat, const char *name, u_int version) tty_default_features(int *feat, const char *name, u_int version)
{ {
static struct { static const struct {
const char *name; const char *name;
u_int version; u_int version;
const char *features; const char *features;