Thomas Adam
4165ed96f8
Add back __CYGWIN__ block
...
This went missing during the merge from OpenBSD.
2015-05-09 20:03:24 +01:00
Thomas Adam
504b97b6a4
Merge branch 'obsd-master'
...
Conflicts:
tmux.h
2015-05-09 12:52:38 +01:00
nicm
879de25583
Remove some stuff that accidentally ended up here from portable, and
...
remove a little-used debug function.
2015-05-08 15:56:49 +00:00
Thomas Adam
f10d3675f8
Merge branch 'obsd-master'
2015-05-06 10:03:52 +01:00
nicm
33a585c47f
Turn cursor off during redraw, pointed out by George Nachman.
2015-05-06 07:52:06 +00:00
Thomas Adam
72e9ebf2ec
Merge branch 'obsd-master'
2015-04-25 20:45:02 +00:00
nicm
07dfdb974d
Make message log a TAILQ.
2015-04-25 18:33:59 +00:00
Thomas Adam
56e1132db4
Merge branch 'obsd-master'
2015-04-25 10:02:46 +00:00
nicm
aeedb464a6
Convert clients list into a TAILQ.
2015-04-24 23:17:11 +00:00
nicm
8d66f4fba4
Change the windows array into an RB tree and fix some places where we
...
were only looking at the first winlink for a window in a session.
2015-04-22 15:30:11 +00:00
Thomas Adam
0a88377086
Merge branch 'obsd-master'
2015-04-22 10:05:54 +01:00
nicm
4cf4302962
Don't eat the mouse event that triggers a drag end because we may want
...
to pass it on to application inside the pane.
2015-04-21 15:21:41 +00:00
nicm
bded743706
Support for multiple key tables to commands to be bound to sequences of
...
keys. The default key bindings become the "prefix" table and -n the
"root" table. Keys may be bound in new tables with bind -T and
switch-client -T used to specify the table in which the next key should
be looked up. Based on a diff from Keith Amling.
2015-04-20 15:34:56 +00:00
Thomas Adam
b25dc423b0
Merge branch 'obsd-master'
2015-04-20 15:44:27 +01:00
nicm
bf635e7741
Rewrite of tmux mouse support which was a mess. Instead of having
...
options for "mouse-this" and "mouse-that", mouse events may be bound as
keys and there is one option "mouse" that turns on mouse support
entirely (set -g mouse on).
See the new MOUSE SUPPORT section of the man page for description of the
key names and new flags (-t= to specify the pane or window under mouse
as a target, and send-keys -M to pass through a mouse event).
The default builtin bindings for the mouse are:
bind -n MouseDown1Pane select-pane -t=; send-keys -M
bind -n MouseDown1Status select-window -t=
bind -n MouseDrag1Pane copy-mode -M
bind -n MouseDrag1Border resize-pane -M
To get the effect of turning mode-mouse off, do:
unbind -n MouseDrag1Pane
unbind -temacs-copy MouseDrag1Pane
The old mouse options are now gone, set-option -q may be used to
suppress warnings if mixing configuration files.
2015-04-19 21:34:21 +00: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
370cf75458
Merge branch 'obsd-master'
2015-04-19 14:44:56 +01:00
nicm
02df86079b
Fix some format specifier nits, from Ben Boeckel.
2015-03-31 17:45:10 +00:00
Thomas Adam
833fe5bdee
Merge branch 'obsd-master'
...
Conflicts:
cmd-pipe-pane.c
2015-02-06 19:07:43 +00:00
nicm
8d94bb67ab
Use formats not status_replace for set-titles-string.
2015-02-06 17:17:12 +00:00
nicm
c9642ee213
Remove two unused arguments from status_replace.
2015-02-01 23:43:23 +00:00
Nicholas Marriott
747cab4281
No need for $Id$ now.
2014-11-08 12:27:43 +00:00
Thomas Adam
35ffd093d7
Merge branch 'obsd-master'
...
Conflicts:
Makefile
cmd-link-window.c
cmd-unlink-window.c
2014-10-29 12:51:21 +00:00
nicm
abfb9656ef
Fix some spacing nits.
2014-10-22 23:18:53 +00:00
Thomas Adam
562af864bd
Merge branch 'obsd-master'
...
Conflicts:
Makefile
cmd-list-commands.c
cmd-suspend-client.c
job.c
tmux.h
xmalloc.c
2014-10-21 07:11:44 +01:00
nicm
c011446e78
Update status when pane selected with mouse, from Balazs Kezes.
2014-10-02 09:31:30 +00:00
Nicholas Marriott
b6aef2490f
Ignore ENXIO on Solaris as well, from Peter Schow.
2014-10-02 09:47:00 +01:00
Thomas Adam
2874a431c0
Merge branch 'obsd-master'
2014-09-25 11:29:54 +01:00
nicm
4e956d545a
Various minor style and spacing nits.
2014-09-01 21:50:18 +00:00
Thomas Adam
a131b82e95
Merge branch 'obsd-master'
...
Conflicts:
client.c
2014-08-09 20:31:36 +01:00
nicm
1ac96200a7
Remove support for the continuous reporting "any" mouse mode which never
...
really worked properly and is rarely used.
2014-08-09 07:33:37 +00:00
krw
2b67907176
An EOF is a good reason to close a connection.
...
ok nicm@
2014-07-13 20:51:08 +00:00
nicm
f117c7d94a
If a client is killed while suspended with ^Z so has gone through the
...
MSG_EXITED dance, don't try to resume it since a) it's pointless and b)
the tty structures have been cleaned up and tmux will crash.
2014-07-13 20:23:10 +00:00
Thomas Adam
953c3ef47a
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.1
window.c
2014-04-23 11:26:11 +01:00
nicm
e5d85c6c3c
Because we pass the file descriptor from client to server, tmux can't
...
usefully work if stdin is /dev/tty. Complain about it more clearly.
2014-04-16 08:02:31 +00:00
Thomas Adam
0c99c7dbff
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tty-keys.c
2014-04-05 12:36:14 +01:00
Nicholas Marriott
cbd360b7dd
Spaces to tabs.
2014-03-06 12:46:03 +00:00
Nicholas Marriott
b65c72c45c
Restore SunOS fix, noticed by Greg Onufer.
2014-03-05 23:28:32 +00: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
ca1d78f523
Merge branch 'obsd-master'
2014-02-19 15:05:07 +00:00
nicm
69b7c496ac
Be consistent and allow only mouse down and mouse wheel for any pane
...
with mouse-select-pane rather than just in copy mode, reported by Balazs
Kezes.
2014-02-17 22:42:20 +00:00
Thomas Adam
b3de4a3dec
Merge branch 'obsd-master'
...
Conflicts:
tmux.1
tmux.c
2014-02-16 23:02:07 +00:00
nicm
e9d32f901a
Make status-interval of zero work as indented.
2014-02-14 14:00:18 +00:00
nicm
f835be4bb2
Style nit - no space between function name and bracket.
2014-02-14 13:59:01 +00:00
Thomas Adam
d50e47fc4a
Merge branch 'obsd-master'
...
Conflicts:
Makefile
cmd-server-info.c
cmd-start-server.c
2014-01-31 21:39:56 +00:00
nicm
9f02feb9d0
Break up and simplify screen_redraw_screen.
2014-01-31 14:19:24 +00:00
Thomas Adam
3e498cdb49
Merge branch 'obsd-master'
2013-11-14 07:51:26 +00:00
benno
7624800ddc
from nicm: : handle msgbuf_write() returning EAGAIN
2013-11-13 20:43:36 +00:00
nicm
bf35441608
Do not run any command line command from the client which starts the
...
server until after the configuration file completes. This prevents it
racing against run-shell or if-shell in .tmux.conf that run in the
background.
2013-10-20 17:28:43 +00:00
Thomas
7f479ffdce
Merge branch 'obsd-master' into mtemp
2013-10-11 14:33:29 +01:00