circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-10-18 12:01:12 +01:00
parent c57df2bb73 51ff77d47b
commit 9e986d6a96
3 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
menu.c
View File

@@ -100,6 +100,8 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
new_item->key = item->key; new_item->key = item->key;
width = format_width(new_item->name); width = format_width(new_item->name);
if (*new_item->name == '-')
width--;
if (width > menu->width) if (width > menu->width)
menu->width = width; menu->width = width;
} }

18
tmux.1
View File

@@ -4276,24 +4276,6 @@ see the
section. section.
Attributes are ignored. Attributes are ignored.
.Pp .Pp
.It Ic popup-style Ar style
Set the popup style.
For how to specify
.Ar style ,
see the
.Sx STYLES
section.
Attributes are ignored.
.Pp
.It Ic popup-border-style Ar style
Set the popup border style.
For how to specify
.Ar style ,
see the
.Sx STYLES
section.
Attributes are ignored.
.Pp
.It Ic popup-border-lines Ar type .It Ic popup-border-lines Ar type
Set the type of characters used for drawing popup borders. Set the type of characters used for drawing popup borders.
.Ar type .Ar type

34
tty-acs.c
View File

@@ -25,7 +25,7 @@
/* Table mapping ACS entries to UTF-8. */ /* Table mapping ACS entries to UTF-8. */
struct tty_acs_entry { struct tty_acs_entry {
u_char key; u_char key;
const char *string; const char *string;
}; };
static const struct tty_acs_entry tty_acs_table[] = { static const struct tty_acs_entry tty_acs_table[] = {
@@ -61,7 +61,7 @@ static const struct tty_acs_entry tty_acs_table[] = {
{ 'x', "\342\224\202" }, /* vertical line */ { 'x', "\342\224\202" }, /* vertical line */
{ 'y', "\342\211\244" }, /* less-than-or-equal-to */ { 'y', "\342\211\244" }, /* less-than-or-equal-to */
{ 'z', "\342\211\245" }, /* greater-than-or-equal-to */ { 'z', "\342\211\245" }, /* greater-than-or-equal-to */
{ '{', "\317\200" }, /* greek pi */ { '{', "\317\200" }, /* greek pi */
{ '|', "\342\211\240" }, /* not-equal */ { '|', "\342\211\240" }, /* not-equal */
{ '}', "\302\243" }, /* UK pound sign */ { '}', "\302\243" }, /* UK pound sign */
{ '~', "\302\267" } /* bullet */ { '~', "\302\267" } /* bullet */
@@ -124,7 +124,7 @@ static const struct utf8_data tty_acs_double_borders_list[] = {
{ "\342\225\240", 0, 3, 1 }, /* U+2560 */ { "\342\225\240", 0, 3, 1 }, /* U+2560 */
{ "\342\225\243", 0, 3, 1 }, /* U+2563 */ { "\342\225\243", 0, 3, 1 }, /* U+2563 */
{ "\342\225\254", 0, 3, 1 }, /* U+256C */ { "\342\225\254", 0, 3, 1 }, /* U+256C */
{ "\302\267", 0, 2, 1 } /* U+00B7 */ { "\302\267", 0, 2, 1 } /* U+00B7 */
}; };
/* UTF-8 heavy borders. */ /* UTF-8 heavy borders. */
@@ -141,24 +141,24 @@ static const struct utf8_data tty_acs_heavy_borders_list[] = {
{ "\342\224\243", 0, 3, 1 }, /* U+2523 */ { "\342\224\243", 0, 3, 1 }, /* U+2523 */
{ "\342\224\253", 0, 3, 1 }, /* U+252B */ { "\342\224\253", 0, 3, 1 }, /* U+252B */
{ "\342\225\213", 0, 3, 1 }, /* U+254B */ { "\342\225\213", 0, 3, 1 }, /* U+254B */
{ "\302\267", 0, 2, 1 } /* U+00B7 */ { "\302\267", 0, 2, 1 } /* U+00B7 */
}; };
/* UTF-8 rounded borders. */ /* UTF-8 rounded borders. */
static const struct utf8_data tty_acs_rounded_borders_list[] = { static const struct utf8_data tty_acs_rounded_borders_list[] = {
{ "", 0, 0, 0 }, { "", 0, 0, 0 },
{ "\342\224\202", 0, 3, 1 }, /* U+2502 */ { "\342\224\202", 0, 3, 1 }, /* U+2502 */
{ "\342\224\200", 0, 3, 1 }, /* U+2500 */ { "\342\224\200", 0, 3, 1 }, /* U+2500 */
{ "\342\225\255", 0, 3, 1 }, /* U+256D */ { "\342\225\255", 0, 3, 1 }, /* U+256D */
{ "\342\225\256", 0, 3, 1 }, /* U+256E */ { "\342\225\256", 0, 3, 1 }, /* U+256E */
{ "\342\225\260", 0, 3, 1 }, /* U+2570 */ { "\342\225\260", 0, 3, 1 }, /* U+2570 */
{ "\342\225\257", 0, 3, 1 }, /* U+256F */ { "\342\225\257", 0, 3, 1 }, /* U+256F */
{ "\342\224\263", 0, 3, 1 }, /* U+2533 */ { "\342\224\263", 0, 3, 1 }, /* U+2533 */
{ "\342\224\273", 0, 3, 1 }, /* U+253B */ { "\342\224\273", 0, 3, 1 }, /* U+253B */
{ "\342\224\243", 0, 3, 1 }, /* U+2523 */ { "\342\224\243", 0, 3, 1 }, /* U+2523 */
{ "\342\224\253", 0, 3, 1 }, /* U+252B */ { "\342\224\253", 0, 3, 1 }, /* U+252B */
{ "\342\225\213", 0, 3, 1 }, /* U+254B */ { "\342\225\213", 0, 3, 1 }, /* U+254B */
{ "\302\267", 0, 2, 1 } /* U+00B7 */ { "\302\267", 0, 2, 1 } /* U+00B7 */
}; };
/* Get cell border character for double style. */ /* Get cell border character for double style. */