circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 11:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-05-17 09:02:36 +01:00
commit eb064e8a62
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-new-session.c
View File

@ -192,6 +192,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
if (strcmp(tmp, "-") == 0) { if (strcmp(tmp, "-") == 0) {
if (c != NULL) if (c != NULL)
dsx = c->tty.sx; dsx = c->tty.sx;
else
dsx = 80;
} else { } else {
dsx = strtonum(tmp, 1, USHRT_MAX, &errstr); dsx = strtonum(tmp, 1, USHRT_MAX, &errstr);
if (errstr != NULL) { if (errstr != NULL) {
@ -205,6 +207,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
if (strcmp(tmp, "-") == 0) { if (strcmp(tmp, "-") == 0) {
if (c != NULL) if (c != NULL)
dsy = c->tty.sy; dsy = c->tty.sy;
else
dsy = 24;
} else { } else {
dsy = strtonum(tmp, 1, USHRT_MAX, &errstr); dsy = strtonum(tmp, 1, USHRT_MAX, &errstr);
if (errstr != NULL) { if (errstr != NULL) {

8
tty-acs.c
View File

@ -37,10 +37,14 @@ static const struct tty_acs_entry tty_acs_table[] = {
{ '0', "\342\226\256" }, /* solid square block */ { '0', "\342\226\256" }, /* solid square block */
{ '`', "\342\227\206" }, /* diamond */ { '`', "\342\227\206" }, /* diamond */
{ 'a', "\342\226\222" }, /* checker board (stipple) */ { 'a', "\342\226\222" }, /* checker board (stipple) */
{ 'b', "\342\220\211" },
{ 'c', "\342\220\214" },
{ 'd', "\342\220\215" },
{ 'e', "\342\220\212" },
{ 'f', "\302\260" }, /* degree symbol */ { 'f', "\302\260" }, /* degree symbol */
{ 'g', "\302\261" }, /* plus/minus */ { 'g', "\302\261" }, /* plus/minus */
{ 'h', "\342\226\222" }, /* board of squares */ { 'h', "\342\220\244" },
{ 'i', "\342\230\203" }, /* lantern symbol */ { 'i', "\342\220\213" },
{ 'j', "\342\224\230" }, /* lower right corner */ { 'j', "\342\224\230" }, /* lower right corner */
{ 'k', "\342\224\220" }, /* upper right corner */ { 'k', "\342\224\220" }, /* upper right corner */
{ 'l', "\342\224\214" }, /* upper left corner */ { 'l', "\342\224\214" }, /* upper left corner */