Thomas Adam
b3a724f30c
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.c
2017-01-23 12:20:43 +00:00
nicm
98e7fbb2ac
Open /dev/ptm before pledge() and save it to be used for PTMGET later
...
(this means inlining forkpty()).
ok deraadt
2017-01-23 10:09:43 +00:00
Thomas Adam
d2eab39ffa
Merge branch 'obsd-master'
2017-01-22 20:01:12 +00:00
Nicholas Marriott
aa70f28069
Merge branch 'master' of github.com:tmux/tmux
2017-01-22 19:14:10 +00:00
Nicholas Marriott
acf331f7f1
Add b64_pton as well.
2017-01-22 19:12:15 +00:00
nicm
4ede35c48c
Accept the OSC 52 escape sequence inside tmux to add a new buffer, from
...
harry dot gindi at live dot com.
2017-01-22 19:00:01 +00:00
Thomas Adam
c17b0a202a
Merge branch 'obsd-master'
2017-01-20 16:01:11 +00:00
nicm
46572ba904
Print error rather than fatal() if tcgetattr() fails, which is much more
...
useful to user.
2017-01-20 14:02:33 +00:00
Nicholas Marriott
61af9d7cc2
Look for ncursesw as well as ncurses, based on a change from Bert van Hall.
2017-01-19 15:31:22 +00:00
Nicholas Marriott
b98b4e23a3
Put version in log in portable tmux.
2017-01-18 17:35:41 +00:00
Nicholas Marriott
7e4908f751
If --enable-{utf8proc,utempter} is given, do not build without it.
2017-01-18 14:32:50 +00:00
Nicholas Marriott
787f9de5d8
vis.h comes from compat.h.
2017-01-18 12:16:14 +00:00
Thomas Adam
044999ce6d
Merge branch 'obsd-master'
2017-01-18 12:01:11 +00:00
nicm
faa0570309
Plain stravis() because it will mangle UTF-8 characters, so add
...
utf8_stravis() which calls our existing utf8_strvis() and use it instead
2017-01-18 10:08:05 +00:00
Thomas Adam
6d37984f4f
Merge branch 'obsd-master'
2017-01-18 10:01:12 +00:00
nicm
4bb5a1d6a7
Run arguments through vis() as well when printing them.
2017-01-18 10:00:50 +00:00
nicm
649c0d8e91
Do not reset idx, it has just been set.
2017-01-18 08:43:21 +00:00
nicm
373541104b
options_match needs to explicitly check for user options.
2017-01-18 08:40:50 +00:00
Thomas Adam
64c486ae81
Merge branch 'obsd-master'
2017-01-17 02:01:11 +00:00
nicm
6b6b0e91d0
Correctly handle -style options without all of a corresponding -fg/-bg/-attr.
2017-01-16 23:45:08 +00:00
Nicholas Marriott
c0346701df
Fix VIS_DQ check.
2017-01-16 18:20:50 +00:00
Thomas Adam
7e110b9d99
Merge branch 'obsd-master'
2017-01-16 15:36:02 +00:00
Nicholas Marriott
f20e3ee62c
We need VIS_DQ in vis.h as well.
2017-01-16 15:01:14 +00:00
nicm
ef15b4195f
Revert WIP parts of previous I didn't mean to commit yet.
2017-01-16 14:52:25 +00:00
nicm
68db958477
getopt() has a struct option so just return to using options_entry.
2017-01-16 14:49:14 +00:00
Nicholas Marriott
997b11741c
Remove vis.h which comes from compat.
2017-01-16 12:09:04 +00:00
Thomas Adam
7b60645732
Merge branch 'obsd-master'
2017-01-16 00:01:10 +00:00
Thomas Adam
c9fcb76651
Merge branch 'obsd-master'
2017-01-15 22:01:11 +00:00
nicm
52847a9518
It is silly for cmd_list_parse to return an integer error when it could
...
just return NULL.
2017-01-15 22:00:56 +00:00
nicm
3054846143
-q flag now needs to be checked in a couple more places.
2017-01-15 20:50:34 +00:00
nicm
2b0bc9f1c5
Major tidy up and rework of options tree and set-option/show-options
...
commands this pushes more of the code into options.c and ties it more
closely to the options table rather than having an unnecessary
split. Also add support for array options (will be used later). Only
(intentional) user visible change is that show-options output is now
passed through vis(3) with VIS_DQ so quotes are escaped.
2017-01-15 20:48:41 +00:00
nicm
404214b0ac
Remove unused quiet option.
2017-01-15 20:16:22 +00:00
nicm
a3cf995017
Append needs to go old,new not new,old...
2017-01-15 20:14:36 +00:00
Thomas Adam
4f077fe62c
Merge branch 'obsd-master'
2017-01-14 20:01:13 +00:00
nicm
e06efab9da
killp -a should not kill the window if only one pane.
2017-01-14 18:53:08 +00:00
Thomas Adam
780dd7ac82
Merge branch 'obsd-master'
2017-01-13 14:01:13 +00:00
Thomas Adam
2311bbd28a
Merge branch 'obsd-master'
2017-01-13 12:01:12 +00:00
nicm
08d21936e4
options_get_style return const too.
2017-01-13 11:58:49 +00:00
nicm
22a528905d
Make options_get_string return const string.
2017-01-13 11:56:43 +00:00
nicm
95950bf668
Add -E to detach-client to exec a command to replace the client instead
...
of exiting it, useful if tmux wasn't exec'd itself. From Jenna Magius.
2017-01-13 10:12:12 +00:00
Thomas Adam
d4cb178249
Merge branch 'obsd-master'
2017-01-12 16:01:13 +00:00
nicm
24cba5907b
Simplify appending to string options.
2017-01-12 15:36:35 +00:00
Thomas Adam
1eb9500644
Merge branch 'obsd-master'
2017-01-12 12:01:10 +00:00
nicm
dad3090d32
Put all palette functions together in the file.
2017-01-12 10:15:55 +00:00
Thomas Adam
4a76861925
Merge branch 'obsd-master'
2017-01-12 02:01:11 +00:00
nicm
9b6aeacdc0
aixterm colours can be used if -2 is given, as well as if TERM tells us
...
the terminal has >=16 colours.
2017-01-12 00:30:41 +00:00
nicm
0752fdaf6a
Erm the aixterm colours should start at 8, not 7.
2017-01-12 00:24:28 +00:00
nicm
9e786030df
Fix setting the palette of aixterm colours (90-97).
2017-01-12 00:19:32 +00:00
Thomas Adam
33ebb9ec39
Merge branch 'obsd-master'
2017-01-12 00:01:13 +00:00
nicm
74c40d04ea
Be less aggressive about turning margins off.
2017-01-11 23:10:04 +00:00