circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-18 10:28:54 +00:00
Code Issues Projects Releases Wiki Activity
9,203 Commits 3 Branches 37 Tags 31 MiB
c01251d023
Commit Graph

212 Commits

Author SHA1 Message Date
Thomas Adam
da1f6fc2c8 Merge branch 'obsd-master' 
Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h
 2015-10-27 23:27:26 +00:00
nicm
44657bf932 Move struct options into options.c. 2015-10-27 15:58:42 +00:00
Thomas Adam
ed17760a52 Merge branch 'obsd-master' 2015-09-24 10:01:09 +01:00
nicm
ddb2d1221b Assign flag not number for flag types (we got away with it so far 
because that are a union). From Filipe Brandenburger.
 2015-09-24 07:02:18 +00:00
Thomas Adam
76688d2040 Merge branch 'obsd-master' 
Conflicts:
	cfg.c
	tmux.c
 2015-09-06 20:47:50 +01:00
nicm
93b946ee50 Tweak some error messages/comments. 2015-09-01 19:50:09 +00:00
Thomas Adam
a568aaa0c0 Merge branch 'obsd-master' 2015-07-28 18:01:08 +01:00
nicm
b254115acd Tidy up the way terminals are described and move some structs out of tmux.h. 2015-07-28 15:18:10 +00:00
Thomas Adam
b25dc423b0 Merge branch 'obsd-master' 2015-04-20 15:44:27 +01:00
nicm
ee123c2489 Support setting the default window and pane background colours (window 
and active pane via window-style and window-active-style options, an
individual pane by a new select-pane -P flag). From J Raynor.
 2015-04-19 21:05:27 +00:00
Thomas Adam
833fe5bdee Merge branch 'obsd-master' 
Conflicts:
	cmd-pipe-pane.c
 2015-02-06 19:07:43 +00:00
nicm
16bdd970dc Support blinking cursor mode, both the xterm CSI ?12 h/l and (the 
backwards) screen CSI 34 h/l. From Guanpeng Xu.
 2015-01-20 08:18:04 +00:00
Nicholas Marriott
747cab4281 No need for $Id$ now. 2014-11-08 12:27:43 +00:00
Thomas Adam
a131b82e95 Merge branch 'obsd-master' 
Conflicts:
	client.c
 2014-08-09 20:31:36 +01:00
nicm
2056a9ef9e Drop explicit support for F13-F20 and change to match the xterm terminfo 
entry:

        F13-F24 are S-F1 to S-F12
        F25-F36 are C-F1 to C-F12
        F37-F48 are C-S-F1 to C-S-F12
        F49-F60 are M-F1 to M-F12
and     F61-F63 are M-S-F1 to M-S-F3

This should be no difference for applications inside tmux, but means
that any key binding for F13 will need to be replaced by S-F1 and so on.
 2014-07-21 10:25:48 +00:00
Thomas Adam
953c3ef47a Merge branch 'obsd-master' 
Conflicts:
	Makefile
	tmux.1
	window.c
 2014-04-23 11:26:11 +01:00
nicm
c3b2e5eed3 Wrap some long lines. 2014-04-17 12:57:28 +00:00
Thomas Adam
0c99c7dbff Merge branch 'obsd-master' 
Conflicts:
	Makefile
	tty-keys.c
 2014-04-05 12:36:14 +01:00
nicm
f1828921df Change terminal-overrides to a server option (now that we have them), it 
doesn't make much sense as a session option.
 2014-02-23 00:53:06 +00:00
Thomas Adam
06b5805479 Merge branch 'obsd-master' 2013-06-13 18:12:49 +01:00
Nicholas Marriott
13441e8cb8 The actual terminfo entries we ended up with for cursor changes are Cs, 
Ce, Ss and Se (not Cc, Ce, Cs, Csr). So use and document these instead
of the ones we were using earlier.
 2013-06-02 07:52:15 +00:00
Thomas Adam
b58bca9a72 Merge branch 'obsd-master' 
Conflicts:
	tmux.c
 2013-04-13 17:05:49 +01:00
Nicholas Marriott
982354765b Remove tmux's (already minimal) 88 colour support. Such terminals are 
few and unnecessary.
 2013-03-27 11:17:12 +00:00
Nicholas Marriott
0ccd84d2ef Instead of skipping del_curterm on FreeBSD < 7, skip it on ncurses < 5.7. It 
looks like 5.6 on Linux has the problem too. Reported by Myles Dear.
 2013-03-22 15:36:45 +00:00
Thomas Adam
de194016ec Merge branch 'obsd-master' 2013-01-17 01:38:21 +00:00
Nicholas Marriott
44f8e1caff Implement ECH (erase character, CSI X). Reported by Christian Neukirchen. 2013-01-15 23:18:55 +00:00
Tiago Cunha
a432fcd306 Sync OpenBSD patchset 1150: 
xfree is not particularly helpful, remove it. From Thomas Adam.
 2012-07-11 19:34:16 +00:00
Nicholas Marriott
df912e3540 xfree is not particularly helpful, remove it. From Thomas Adam. 2012-07-10 11:53:01 +00:00
Tiago Cunha
d9cb07df3b Sync OpenBSD patchset 1116: 
If there are any terminals with insert mode but not ich1, they can go
through the slow path. Tidies code slightly.
 2012-05-22 20:58:33 +00:00
Nicholas Marriott
2f93affb98 If there are any terminals with insert mode but not ich1, they can go 
through the slow path. Tidies code slightly.
 2012-05-22 09:36:12 +00:00
Tiago Cunha
f308663ad4 Sync OpenBSD patchset 985: 
Log terminal overrides.
 2011-12-06 18:48:45 +00:00
Nicholas Marriott
c44d2d854f Log terminal overrides. 2011-12-01 23:47:08 +00:00
Tiago Cunha
03ee7f7edf Sync OpenBSD patchset 969: 
Support for \e[3J to clear the history. Also send the corresponding
terminfo code (E3) before locking.
 2011-10-23 15:10:22 +00:00
Nicholas Marriott
f0aad68aee Support for \e[3J to clear the history. Also send the corresponding 
terminfo code (E3) before locking.
 2011-10-23 10:16:14 +00:00
Tiago Cunha
391f1f08c0 Expand the Id keyword. 2011-07-09 09:42:33 +00:00
Nicholas Marriott
c80f75f4f4 tparm requires 10 arguments on Solaris. 2011-06-26 23:59:23 +00:00
Tiago Cunha
b2f301f4e2 Sync OpenBSD patchset 916: 
Support DECSCUSR sequence to set the cursor style with two new
terminfo(5) extensions, Cs and Csr. Written by Ailin Nemui.
 2011-05-22 16:26:09 +00:00
Tiago Cunha
719755574d Sync OpenBSD patchset 915: 
Support xterm(1) cursor colour change sequences through terminfo(5) Cc
(set) and Cr (reset) extensions. Originally by Sean Estabrooks, tweaked
by me and Ailin Nemui.
 2011-05-22 16:25:02 +00:00
Tiago Cunha
89f35125b4 Sync OpenBSD patchset 914: 
Support setting the xterm clipboard when copying from copy mode using
the xterm escape sequence for the purpose (if xterm is configured to
allow it).

Written by and much discussed Ailin Nemui, guidance on
xterm/termcap/terminfo from Thomas Dickey.
 2011-05-22 16:23:07 +00:00
Nicholas Marriott
3ea5e06bfb Support DECSCUSR sequence to set the cursor style with two new 
terminfo(5) extensions, Cs and Csr. Written by Ailin Nemui.
 2011-05-20 19:17:39 +00:00
Nicholas Marriott
944b5e6fa0 Support xterm(1) cursor colour change sequences through terminfo(5) Cc 
(set) and Cr (reset) extensions. Originally by Sean Estabrooks, tweaked
by me and Ailin Nemui.
 2011-05-20 19:03:58 +00:00
Tiago Cunha
4fcbf4b872 Sync OpenBSD patchset 904: 
Use the tsl and fsl terminfo(5) capabilities to update terminal title
and automatically fill them in on terminals with the XT capability
(which means their title setting is xterm-compatible). From hsim at
gmx.li.
 2011-05-18 20:28:43 +00:00
Nicholas Marriott
96e7f33da3 Support setting the xterm clipboard when copying from copy mode using 
the xterm escape sequence for the purpose (if xterm is configured to
allow it).

Written by and much discussed Ailin Nemui, guidance on
xterm/termcap/terminfo from Thomas Dickey.
 2011-05-18 20:24:29 +00:00
Nicholas Marriott
295ace6820 Use the tsl and fsl terminfo(5) capabilities to update terminal title 
and automatically fill them in on terminals with the XT capability
(which means their title setting is xterm-compatible). From hsim at
gmx.li.
 2011-05-08 19:53:06 +00:00
Nicholas Marriott
75f218dc73 If the terminal supports sitm for italics, use it instead of standout 
(smso). From Tiago Resende.
 2011-04-09 07:48:58 +00:00
Nicholas Marriott
0a09d04e1b If the terminal supports sitm for italics, use it instead of standout 
(smso). From Tiago Resende.
 2011-04-09 07:48:08 +00:00
Tiago Cunha
3b56ebce6d Sync OpenBSD patchset 854: 
Use LIST_* not SLIST_*.
 2011-02-15 15:12:28 +00:00
Nicholas Marriott
4dfb29fa38 Use LIST_* not SLIST_*. 2011-01-26 00:11:47 +00:00
Tiago Cunha
9ad028e8ee Sync OpenBSD patchset 822: 
Another table that should be const.
 2011-01-03 23:30:43 +00:00
Nicholas Marriott
5d0cfe079b Another table that should be const. 2011-01-01 03:32:28 +00:00
Nicholas Marriott
f71b3054cd Switch tmux to use autoconf and automake. 
Although they suck, they suck less than the alternatives.
 2010-12-31 22:12:33 +00:00
Tiago Cunha
5126037ea0 Sync OpenBSD patchset 762: 
Use UTF-8 line drawing characters on UTF-8 terminals. Fixes some stupid
terminals (I'm looking at you, putty) which disable the vt100 ACS mode
switching sequences in UTF-8 mode.

Also on terminals without ACS at all, use ASCII equivalents where
obvious.
 2010-09-18 15:43:53 +00:00
Tiago Cunha
d7a3fc3df4 Sync OpenBSD patchset 761: 
Ignore terminal overrides settings without a value.
 2010-09-18 15:41:50 +00:00
Nicholas Marriott
cb564bb427 Use UTF-8 line drawing characters on UTF-8 terminals. Fixes some stupid 
terminals (I'm looking at you, putty) which disable the vt100 ACS mode
switching sequences in UTF-8 mode.

Also on terminals without ACS at all, use ASCII equivalents where
obvious.
 2010-09-11 16:19:22 +00:00
Nicholas Marriott
3696cce4ae Ignore terminal overrides settings without a value. 2010-09-11 15:43:11 +00:00
Nicholas Marriott
f4b9b84190 FreeBSD 6.x has a bug and crashes in del_curterm, so ifdef it out on that 
platform.
 2009-12-18 07:42:30 +00:00
Tiago Cunha
cc094fdfe6 Sync OpenBSD patchset 581: 
Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last
time now I've configured emacs to make them displayed in really annoying
colours...
 2009-12-04 22:14:47 +00:00
Nicholas Marriott
15a64b805e Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last 
time now I've configured emacs to make them displayed in really annoying
colours...
 2009-12-03 22:50:09 +00:00
Nicholas Marriott
1f7ac1e0cb Solaris requires this header ordering. 2009-12-03 14:33:27 +00:00
Tiago Cunha
8ba590b473 Sync OpenBSD patchset 563: 
Emulate il1, dl1, ich1 to run (albeit slowly) with vt100 feature set.
 2009-11-28 14:42:21 +00:00
Nicholas Marriott
d31d4c05cf Emulate il1, dl1, ich1 to run (albeit slowly) with vt100 feature set. 2009-11-26 14:46:08 +00:00
Nicholas Marriott
399002baa4 Despite terminfo being in use for around 20 years, NetBSD still haven't got 
their act together, so add an ifdef to use ncurses.h instead of curses.h.

Untested.
 2009-11-26 09:19:05 +00:00
Tiago Cunha
2bd39071d3 Sync OpenBSD patchset 532: 
Emulate the ri (reverse index) capability: this allows tmux to at least start
on Sun consoles (TERM=sun or sun-color), even if there appear to still be
problems on some boxes (my Blade 100 is fine but edd's Blade 1000 shows odd
screen corruption).
 2009-11-13 16:57:21 +00:00
Nicholas Marriott
5ae542e7ee Emulate the ri (reverse index) capability: this allows tmux to at least start 
on Sun consoles (TERM=sun or sun-color), even if there appear to still be
problems on some boxes (my Blade 100 is fine but edd's Blade 1000 shows odd
screen corruption).
 2009-11-12 08:05:23 +00:00
Tiago Cunha
1c4b7d33b1 Sync OpenBSD patchset 458: 
Support the (mostly new) function key+modifier caps (kIC-kIC7). Most of these
will be caught (soon) by the xterm keys code in xterm itself but some other
descriptions such as rxvt define them as well.
 2009-10-28 23:01:44 +00:00
Tiago Cunha
41863470ba Sync OpenBSD patchset 446: 
Remove the -d flag to tmux and just use op/AX to detect default colours.

Irritatingly, although op can be used to tell if a terminal supports default
colours, it can't be used to set them because in some terminfo descriptions it
resets attributes as a side-effect (acts as sgr0) and in others it doesn't, so
it is not possible to determine reliably what the terminal state will be
afterwards. So if AX is missing and op is present, tmux just sends sgr0.

Anyone using -d for a terminal who finds they actually needed it can replace it
using terminal-overrides, but please let me know as it is probably an omission
from terminfo.
 2009-10-28 22:48:35 +00:00
Nicholas Marriott
c92c2bfb10 Support the (mostly new) function key+modifier caps (kIC-kIC7). Most of these 
will be caught (soon) by the xterm keys code in xterm itself but some other
descriptions such as rxvt define them as well.
 2009-10-26 16:00:51 +00:00
Nicholas Marriott
3a7636ff0f Remove the -d flag to tmux and just use op/AX to detect default colours. 
Irritatingly, although op can be used to tell if a terminal supports default
colours, it can't be used to set them because in some terminfo descriptions it
resets attributes as a side-effect (acts as sgr0) and in others it doesn't, so
it is not possible to determine reliably what the terminal state will be
afterwards. So if AX is missing and op is present, tmux just sends sgr0.

Anyone using -d for a terminal who finds they actually needed it can replace it
using terminal-overrides, but please let me know as it is probably an omission
from terminfo.
 2009-10-25 21:11:21 +00:00
Tiago Cunha
d55ee38c7f Sync OpenBSD patchset 443: 
Bring a comment into line with reality.
 2009-10-25 10:42:08 +00:00
Nicholas Marriott
385236e967 Bring a comment into line with reality. 2009-10-24 21:18:33 +00:00
Tiago Cunha
44fd6f4381 Sync OpenBSD patchset 395: 
Use relative cursor movement instead of absolute when possible and when
supported by the terminal to reduce the size of the output data (generally
about 10-20%).
 2009-10-15 01:33:21 +00:00
Nicholas Marriott
687c4a9fab Use relative cursor movement instead of absolute when possible and when 
supported by the terminal to reduce the size of the output data (generally
about 10-20%).
 2009-10-12 13:01:18 +00:00
Nicholas Marriott
2c9d4dfdd4 Tweak tparm() to make Solaris' backward userland happy and remove the -I mess 
in configure which tried to deal with the fallout from their horrible package
management.
 2009-09-22 19:20:08 +00:00
Nicholas Marriott
266c13df18 Check the return value of strunvis against -1 not NULL. 2009-08-23 11:50:39 +00:00
Nicholas Marriott
1eb303e6d4 Check the return value of strunvis against -1 not NULL. 2009-08-23 11:40:05 +00:00
Tiago Cunha
633e74ef80 Sync OpenBSD patchset 287: 
Emulate dch/dch1 if missing by redrawing the entire line.
 2009-08-21 21:15:00 +00:00
Nicholas Marriott
926b52b600 Emulate dch/dch1 if missing by redrawing the entire line. 2009-08-21 12:29:59 +00:00
Tiago Cunha
cd5294dfb4 Sync OpenBSD patchset 221: 
Clear the codes array earlier as tty_term_free could be called on error.
 2009-08-09 16:52:06 +00:00
Tiago Cunha
9002e60adf Sync OpenBSD patchset 213: 
Don't try to free old string values (and crash) when they are overridden unless
they were actually found in the source terminal description. Reported by jmc.
 2009-08-09 15:57:13 +00:00
Tiago Cunha
3deb17e841 Do not include vis.h directly, since it's OS-dependent. 2009-08-09 15:29:54 +00:00
Tiago Cunha
15f6a41a75 Sync OpenBSD patchset 211: 
Add a terminal-overrides session option allowing individual terminfo(5) entries
to be overridden. The 88col/256col checks are now moved into the default
setting and out of the code.

Also remove a couple of old workarounds for xterm and rxvt which are no longer
necessary (tmux can emulate them if missing).
 2009-08-09 15:26:24 +00:00
Tiago Cunha
75b6736cf4 Sync OpenBSD patchset 210: 
Fix checking of setupterm(3) error codes. While there include the
name of the terminal type causing the error where relevant. ok nicm@.
 2009-08-09 12:06:25 +00:00
Nicholas Marriott
4027335fa9 Clear the codes array earlier as tty_term_free could be called on error. 2009-08-05 19:05:02 +00:00
Nicholas Marriott
ac54dee9bb Don't try to free old string values (and crash) when they are overridden unless 
they were actually found in the source terminal description. Reported by jmc.
 2009-08-03 15:30:16 +00:00
Nicholas Marriott
1673735f02 Add a terminal-overrides session option allowing individual terminfo(5) entries 
to be overridden. The 88col/256col checks are now moved into the default
setting and out of the code.

Also remove a couple of old workarounds for xterm and rxvt which are no longer
necessary (tmux can emulate them if missing).
 2009-08-03 14:10:54 +00:00
Matthieu Herrb
e4bb08e1f5 Fix checking of setupterm(3) error codes. While there include the 
name of the terminal type causing the error where relevant. ok nicm@.
 2009-08-02 20:47:35 +00:00
Nicholas Marriott
910d6282c4 Whoops, chose the wrong one in a conflict. Revert. 2009-07-14 06:54:38 +00:00
Nicholas Marriott
edd3142d1f Don't need ncurses, use curses. 2009-07-14 06:47:12 +00:00
Nicholas Marriott
ceace9c6bd Since tmux doesn't actually need ncurses, use -lcurses/curses.h 
instead. Pointed out by millert a while ago.
 2009-07-14 06:30:45 +00:00
Nicholas Marriott
a9e3d5c56a More diff-to-OpenBSD reduction. Move a lot of compat stuff into compat.h. 2009-06-25 16:47:00 +00:00
Ray Lai
74749e8705 Remove trailing newlines, spaces, and tabs. 
No binary change.
 2009-06-05 03:13:16 +00:00
Nicholas Marriott
35876eaab9 Import tmux, a terminal multiplexor allowing (among other things) a single 
terminal to be switched between several different windows and programs
displayed on one terminal be detached from one terminal and moved to another.

ok deraadt pirofti
 2009-06-01 22:58:49 +00:00
Nicholas Marriott
0b54a2d723 Don't use -Wcast-qual and use explicit casts to shut gcc up in the few cases we can't avoid using a char *. 2009-05-15 12:57:36 +00:00
Nicholas Marriott
143aa718e5 Space trimmage mega-diff. 2009-05-04 17:58:27 +00:00
Nicholas Marriott
5fbdca890a Use the xenl terminfo flag to detect early-wrap terminals like the FreeBSD 
console. Many thanks for a very informative email from Christian Weisgerber.
 2009-04-23 21:09:17 +00:00
Nicholas Marriott
e6d35b6aa4 Support for 88 colour terminals. 2009-03-07 10:29:06 +00:00
Nicholas Marriott
171256057e Extra function keys from Dashing dashing at hushmail dot com 2009-03-02 18:05:40 +00:00
Nicholas Marriott
b03783efad strdup() not necessary here. 2009-02-16 19:01:16 +00:00
Nicholas Marriott
e6ed1cc44f Never draw last character: stops stray scrolling sometimes should status line be disabled. 2009-02-12 00:18:05 +00:00
Nicholas Marriott
959eeef505 FreeBSD's console wraps lines at $COLUMNS - 1 rather than $COLUMNS (the cursor can never be beyond $COLUMNS - 1) and does not appear to support changing this behaviour, or any of the obvious possibilities (turning off right margin wrapping, insert mode). This is irritating, most notably because it impossible to write to the very bottom-right of the screen without scrolling. To work around this, if built on FreeBSD and run with a "cons" $TERM, the bottom-right cell on the screen is omitted. 2009-02-11 23:16:45 +00:00
Nicholas Marriott
d5eaf3a9f6 Emulate CSR with existing screen data on old/stupid terminals which don't support it. 2009-02-11 19:06:58 +00:00
Nicholas Marriott
6c76aaca92 Lose unnecessary cursor restores, fix a couple of placement bugs and remove unused CR. 2009-02-11 18:44:08 +00:00
Nicholas Marriott
65378588ac Don't debug this stuff. 2009-02-11 17:08:09 +00:00
Nicholas Marriott
051dcdcba8 Fix all rxvt*. 2009-02-01 18:11:51 +00:00
Nicholas Marriott
6897510552 Codes no longer needed. 2009-01-11 23:41:29 +00:00
Nicholas Marriott
ee0a7cda88 Restore emulation of ich with insert mode. 2009-01-10 22:28:40 +00:00
Nicholas Marriott
736117e4e9 Whoops, didn't mean to commit that bit. 2009-01-10 22:26:08 +00:00
Nicholas Marriott
20fc7a4b6c Don't need cud. 2009-01-10 22:24:23 +00:00
Nicholas Marriott
312633203d Support btab. 2009-01-10 18:28:09 +00:00
Nicholas Marriott
a1b43faa43 Trim spaces. 2009-01-10 01:51:22 +00:00
Nicholas Marriott
fb6c8ecae6 New command, server-info, to show server info + terminal details. Also tweak term stuff a bit. 2009-01-10 01:30:38 +00:00
Nicholas Marriott
3ed5aa3e72 Build array of codes, stop using ncurses global variables and push ncurses crap into tty-term.c. 2009-01-09 23:57:42 +00:00