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

1178 Commits

Author SHA1 Message Date
Nicholas Marriott
14fad6a5cc Add -A flag to new-session to make it behave like attach-session if the 
session exists. If -A is used, -D behaves like -d to attach-session.
 2013-03-24 09:58:40 +00:00
Nicholas Marriott
20636d956d Add a command queue to standardize and simplify commands that call other 
commands and allow a command to block execution of subsequent
commands. This allows run-shell and if-shell to be synchronous which has
been much requested.

Each client has a default command queue and commands are consumed one at
a time from it. A command may suspend execution from the queue by
returning CMD_RETURN_WAIT and then resume it by calling cmd_continue() -
for example run-shell does this from the callback that is fired after
the job is freed.

When the command queue becomes empty, command clients are automatically
exited (unless attaching). A callback is also fired - this is used for
nested commands in, for example, if-shell which can block execution of
the client's cmdq until a new cmdq becomes empty.

Also merge all the old error/info/print functions together and lose the
old curclient/cmdclient distinction - a cmdq is bound to one client (or
none if in the configuration file), this is a command client if
c->session is NULL otherwise an attached client.
 2013-03-24 09:54:10 +00:00
Nicholas Marriott
a60687f9ba Handle focus events from the terminal, from Aaron Jensen. 2013-03-24 09:28:59 +00:00
Nicholas Marriott
7f191c7951 Add -P and -F to new-session. 2013-03-22 17:01:15 +00:00
Nicholas Marriott
eaaeb28cda Add session_set_current helper function, extracted from a diff from 
Aaron Jensen.
 2013-03-22 16:00:26 +00:00
Nicholas Marriott
8478895eeb Add -e flag to capture-pane to include embedded ANSI SGR escape 
sequences, from George Nachman.
 2013-03-22 15:51:54 +00:00
Nicholas Marriott
db66d85176 Fix double space in sessions template. 2013-03-22 10:38:13 +00:00
Nicholas Marriott
f0efa576e0 Add resize-pane -x and -y for absolute pane size (much requested). 2013-03-22 10:37:39 +00:00
Nicholas Marriott
67b4d5b609 Support the latest theory for mouse input, this is enabled/disabled with 
SM/RM 1006 and is similar in style to SGR input: \033[<b;x;yM or
\033[b;x;ym. From Egmont Koblinger.
 2013-03-22 10:33:50 +00:00
Nicholas Marriott
10682b9e7e Instead of loads of little screen_write_*_on and off functions which 
just change mode flags, just have screen_write_mode_set and
screen_write_mode_clear.
 2013-03-21 18:47:56 +00:00
Nicholas Marriott
3665be7c44 Tidy by splitting default key tables into two. 2013-03-21 16:50:22 +00:00
Nicholas Marriott
c982279950 Fix constness of cmd_template_replace, window_choose_add_item and 
window_choose_add_window.
 2013-03-21 16:19:25 +00:00
Nicholas Marriott
180faf73af Allow choose commands to be used outside tmux, so long as at least one 
client is attached.
 2013-03-21 16:09:59 +00:00
Nicholas Marriott
6ddb06d372 Extend jobs to support writing and use that for copy-pipe instead of popen, 
from Chris Johnsen.
 2013-03-21 14:24:33 +00:00
Nicholas Marriott
c5ad47ee7c Only send end guard if begin was sent, from George Nachman. 2013-03-13 07:31:36 +00:00
Nicholas Marriott
c41d92d27a Add time and a command count to control mode guards, based on code from George 
Nachman.
 2013-03-11 09:35:44 +00:00
Nicholas Marriott
f47a063841 Rename session idx to session id throughout and add $ prefix to targets to use 
it, extended from a diff from George Nachman.
 2013-03-07 10:07:22 +00:00
Nicholas Marriott
7fd4d49d56 Add a wait-for command which blocks a client on a named channel until it is 
wokrn up again (with wait-for -S). From Thiago Padilha.
 2013-03-06 09:57:26 +00:00
Nicholas Marriott
aaeee34c32 Preserve trailing spaces with capture-pane -J, from George Nachman. 2013-03-04 11:03:03 +00:00
Nicholas Marriott
f339cfd315 Add -A flag to new-session to make it behave like attach-session if the session 
exists. If -A is used, -D behaves like -d to attach-session.
 2013-02-24 00:43:28 +00:00
Nicholas Marriott
c5239c5984 Add resize-pane -Z to temporary zoom the active pane to occupy the full window 
or unzoom (restored to the normal layout) if it already zoomed, bound to C-b z
by default. The pane is unzoomed on pretty much any excuse whatsoever.

We considered making this a new layout but the requirements are quite different
from layouts so decided it is better as a special case. Each current layout
cell is saved, a temporary one-cell layout generated and all except the active
pane set to NULL.

Prompted by suggestions and scripts from several. Thanks to Aaron Jensen and
Thiago Padilha for testing an earlier version.
 2013-02-24 00:25:03 +00:00
Nicholas Marriott
3964309c67 Add a command queue to standardize and simplify commands that call other 
commands and allow a command to block execution of subsequent commands. This
allows run-shell and if-shell to be synchronous which has been much requested.

Each client has a default command queue and commands are consumed one at a time
from it. A command may suspend execution from the queue by returning
CMD_RETURN_WAIT and then resume it by calling cmd_continue() - for example
run-shell does this from the callback that is fired after the job is freed.

When the command queue becomes empty, command clients are automatically exited
(unless attaching). A callback is also fired - this is used for nested commands
in, for example, if-shell which can block execution of the client's cmdq until
a new cmdq becomes empty.

Also merge all the old error/info/print functions together and lose the old
curclient/cmdclient distinction - a cmdq is bound to one client (or none if in
the configuration file), this is a command client if c->session is NULL
otherwise an attached client.
 2013-02-23 22:25:58 +00:00
Nicholas Marriott
ee0f8adfac Handle focus events from the terminal, from Aaron Jensen. 2013-02-23 10:01:34 +00:00
Nicholas Marriott
3a2e9d805a Fix error reporting for client commands by adding a flag to cmd_find_client to 
tell it whether or not to show errors, sometimes it's needed and sometimes not.
 2013-02-22 23:04:53 +00:00
Nicholas Marriott
1994ae4640 Missing PANE_RESIZE define. 2013-02-22 21:47:34 +00:00
Nicholas Marriott
4c9f9438ff Add support for focus notifications when tmux pane changes, based on work by 
Aaron Jensen.
 2013-02-22 07:23:11 +00:00
Nicholas Marriott
8c50f625b0 Add session_set_current helper function, extracted from a diff from Aaron 
Jensen.
 2013-02-21 16:54:13 +00:00
Nicholas Marriott
b8b5631d9d Add -C and -J to capture pane to escape control sequences and to join wrapped 
line, based on a diff from George Nachman.
 2013-02-21 09:35:01 +00:00
Nicholas Marriott
afd5e978cf Need to set clients in context before changing their reference count. 2013-02-20 10:25:15 +00:00
Nicholas Marriott
c3859d1df1 Add copy-pipe mode command to copy selection and also pipe to a command. 2013-02-19 17:49:53 +00:00
Nicholas Marriott
4d1d4d6e8e Add -e flag to capture-pane to include embedded ANSI SGR escape sequences, from 
George Nachman.
 2013-02-19 09:55:02 +00:00
Nicholas Marriott
293e331d69 Add functions to allocate and free command contexts rather than doing it all on 
the stack.
 2013-02-18 23:20:21 +00:00
Nicholas Marriott
44452823b7 Fix double space in sessions template. 2013-02-18 17:12:58 +00:00
Nicholas Marriott
e4bb87032e Add resize-pane -x and -y for absolute pane size. 2013-02-18 17:00:35 +00:00
Nicholas Marriott
e5eee7de0c Support the latest theory for mouse input, this is enabled/disabled with SM/RM 
1006 and is similar in style to SGR input: \033[<b;x;yM or \033[b;x;ym. From
Egmont Koblinger.
 2013-02-18 14:52:27 +00:00
Nicholas Marriott
cf2c0237f4 Instead of loads of little screen_write_*_on and off functions which just 
change mode flags, just have screen_write_mode_set and screen_write_mode_clear.
 2013-02-17 10:43:35 +00:00
Nicholas Marriott
10db7ec51b Include the \033 in the key tree and adjust key matching for this change. 2013-02-16 13:21:14 +00:00
Nicholas Marriott
82355d2f2d Tidy by splitting default key tables into two. 2013-02-15 02:16:41 +00:00
Nicholas Marriott
68e370574a Fix constness of window_choose_add_item and _window. 2013-02-13 10:25:37 +00:00
Nicholas Marriott
544c80d715 Fix constness of cmd_template_replace. 2013-02-13 10:19:43 +00:00
Nicholas Marriott
102cb77435 Add -v to set and setw to show only option value. 2013-02-12 20:12:10 +00:00
Nicholas Marriott
99cc0015f8 Rework reflow code so it does not do so much allocation which should be faster 
with large histories.
 2013-02-10 18:15:30 +00:00
Nicholas Marriott
f1ce95915c Allow choose commands to be used outside tmux, so long as at least one client 
is attached.
 2013-02-10 17:52:51 +00:00
Nicholas Marriott
aadc87f5a7 Remove free callback for window_choose_data objects. 2013-02-10 17:36:58 +00:00
Nicholas Marriott
4d382ae8e6 Miscellaneous tidying of choose API, including: 
- rename client and session to start_client and start_session in
  window_choose_data struct. also add TREE_OTHER define and reorder the
  struct
- rename window_choose_ctx to window_choose_data_run
- don't pass a cmd_ctx into window_choose_create (will let it use a
  different client later). instead take type, session, client
- add window_choose_data_free and use it to dispose of wcd rather than
  each cmd-*.c doing it individually
- change so ref counting is done by wcd_add and wcd_free rather than
  callers. this means 1 ref for each item but what of it :-)
- also add a ref to tree_session - not sure if this is needed?
- all the callbacks except choose-client and find-window are the same so
  remove them and add window_choose_default_callback
- reorder/rename some other bits and pieces for tidyness
 2013-02-10 17:32:58 +00:00
Thomas Adam
64da762c15 Merge branch 'obsd-master' 2013-02-07 12:08:55 +00:00
Nicholas Marriott
8903c1f167 Automatically reflow wrapped lines when a pane is resized, requested by 
many over the years and finally implemented by Richard Woodbury.
 2013-02-05 11:08:59 +00:00
Thomas Adam
a3f4eb7b24 Merge branch 'obsd-master' 
Conflicts:
	Makefile
	grid-utf8.c
 2013-01-30 15:27:19 +00:00
Nicholas Marriott
fdbfc7e349 Rather than having two grids for each pane, one for ASCII and one for 
UTF-8, collapse the two together. Simplifies the code at the expense of
more memory (which can probably be reduced again later).
 2013-01-18 02:16:21 +00:00
Thomas Adam
de194016ec Merge branch 'obsd-master' 2013-01-17 01:38:21 +00:00
Nicholas Marriott
e33ba57c13 Remove the layout undo/redo code which never really worked. 2013-01-17 00:11:22 +00:00
Nicholas Marriott
44f8e1caff Implement ECH (erase character, CSI X). Reported by Christian Neukirchen. 2013-01-15 23:18:55 +00:00
Nicholas Marriott
bc2e4a36df If timing between keys is less than (by default) 1 millisecond, assume 
the text is being pasted. assume-paste-time option changes the value (0
disables). Based on a diff from Marcin Kulik.
 2013-01-15 22:55:29 +00:00
Thomas Adam
675c6b3773 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-12-31 18:50:37 +00:00
Nicholas Marriott
a2c8af97e9 Add missing function prototype. 2012-12-24 12:33:05 +00:00
Thomas Adam
fb83914bd7 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-12-08 20:29:37 +00:00
Nicholas Marriott
8264e92b37 Fix return value of load_cfg, from Thomas Adam. 2012-11-27 22:59:34 +00:00
Thomas Adam
739a76634c Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-27 22:24:00 +00:00
Nicholas Marriott
47c097cb51 Support middle-click paste, based on a diff from Ailin Nemui. 2012-11-27 20:22:12 +00:00
Nicholas Marriott
24d7d073ff Support the 47 and 1047 SM and RM sequences (alternate screen without 
cursor), requested by I forget who ages ago.
 2012-11-27 20:08:42 +00:00
Thomas Adam
39631edb98 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-27 18:12:04 +00:00
Nicholas Marriott
9b8998aeec Correctly aggregate together errors from nested config files (with 
source-file). Fix by Thomas Adam, reported by Sam Livingstone-Gray
 2012-11-27 16:12:29 +00:00
Thomas Adam
1bc910a963 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-22 22:19:04 +00:00
Nicholas Marriott
260419f48e Put helper function back, will be needed in a bit. 2012-11-22 14:41:11 +00:00
Thomas Adam
c04aa90207 Merge branch 'obsd-master' 
Sync from OpenBSD.

* obsd-master:
  Add halfpage commands to mode command string table (missed by accident), from Thomas Adam.
  Clarify some points about config files, notably that they are only read at server start. From Thomas Adam.
  Use a utility function for common code to show errors in config file, from Thomas Adam.
 2012-11-22 13:24:14 +00:00
Nicholas Marriott
827b311c81 Use a utility function for common code to show errors in config file, 
from Thomas Adam.
 2012-11-19 10:38:06 +00:00
Thomas Adam
be10e8eee6 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-08 21:27:40 +00:00
Nicholas Marriott
c68efec6c0 Show last client activity time in default choose-client list. 2012-11-05 13:13:04 +00:00
Thomas Adam
47fbf87185 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-26 20:28:58 +01:00
Nicholas Marriott
d210d99cce Make mouse event structure clearer by defining events (up, click, drag) 
and simplifying how buttons and wheels are represented, from Ailin
Nemui. Should be no functional changes.
 2012-10-26 14:35:42 +00:00
Thomas Adam
619ffe1f4f Merge branch 'obsd-master' 
Sync from OpenBSD.

* obsd-master:
  Allow session tree (C-b s) to expand and collapse sessions with left/right/space keys. From Thomas Adam.
  Remove some out of date text from man page, from Thomas Adam.
 2012-10-02 10:47:16 +01:00
Nicholas Marriott
9107b0c69a Allow session tree (C-b s) to expand and collapse sessions with 
left/right/space keys. From Thomas Adam.
 2012-10-02 08:16:28 +00:00
Thomas Adam
48750022c0 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-09-25 17:05:36 +01:00
Nicholas Marriott
17bbf90393 Add notification for input from a pane, from George Nachman. 2012-09-25 07:41:22 +00:00
Nicholas Marriott
149f5bac05 Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux 
Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c
 2012-09-25 08:07:39 +01:00
Thomas Adam
e342304134 Merge branch 'obsd-master' 
Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c
	tmux.h
 2012-09-24 17:55:06 +01:00
Nicholas Marriott
84612a8196 Add control_write_buffer, from George Nachman. 2012-09-24 13:39:10 +00:00
Nicholas Marriott
5d60bc7f7c Use pgrp of pty fd not pid of immediate child when recovering current working 
directory (like current process). From Marcel Partap.
 2012-09-24 14:05:38 +01:00
Nicholas Marriott
42272dfbd5 Use pgrp of pty fd not pid of immediate child when recovering current 
working directory (like current process). From Marcel Partap.
 2012-09-24 13:05:10 +00:00
Nicholas Marriott
c914fcfacb When choosing a pane found by find-window, switch to that pane rather 
than just the window. Also use a helper function for the inner loop.
 2012-09-04 22:37:31 +01:00
Nicholas Marriott
28fd3a3835 add cmd-choose-list to allow arbitrary options to be selected. From 
Thomas Adam.
 2012-09-04 22:37:29 +01:00
Nicholas Marriott
41a448193f Send notifications to control clients. Also don't redraw client when 
suspended.
 2012-09-04 22:36:47 +01:00
Nicholas Marriott
9e7bbc7281 When choosing a pane found by find-window, switch to that pane rather 
than just the window. Also use a helper function for the inner loop.
 2012-09-03 12:20:17 +00:00
Nicholas Marriott
7263fa36eb add cmd-choose-list to allow arbitrary options to be selected. From 
Thomas Adam.
 2012-09-03 09:57:57 +00:00
Nicholas Marriott
9247c90d69 Send notifications to control clients. Also don't redraw client when 
suspended.
 2012-09-03 09:32:38 +00:00
Tiago Cunha
56e37487a8 Sync OpenBSD patchset 1165: 
Fix up window reference counting and don't crash if the rename timer
fires while the window is dead but still referenced. Fixes problem
reported by Michael Scholz.
 2012-08-31 09:22:08 +00:00
Tiago Cunha
1c608031b5 Sync OpenBSD patchset 1162: 
Use a separate define for each default format template and strip clutter
from the choose-tree defaults.
 2012-08-31 09:18:50 +00:00
Nicholas Marriott
58e8e0eac8 Fix up window reference counting and don't crash if the rename timer 
fires while the window is dead but still referenced. Fixes problem
reported by Michael Scholz.
 2012-08-21 10:00:33 +00:00
Nicholas Marriott
73c6785538 Use a separate define for each default format template and strip clutter 
from the choose-tree defaults.
 2012-08-14 08:51:53 +00:00
Tiago Cunha
200b0e5821 Sync OpenBSD patchset 1156: 
Instead of numbering choose mode items 0-9a-z and then nothing, number
them all and if there are more than 10 use a prompt when 0-9 is
pressed. From Thomas Adam.
 2012-08-12 19:28:20 +00:00
Tiago Cunha
c8849ac990 Sync OpenBSD patchset 1153: 
Add a queue of notifys and a way to turn them off and on (we do not want
notifys to happen during some commands). Based on code from George
Nachman.
 2012-08-12 19:23:01 +00:00
Nicholas Marriott
a3dec6bece Instead of numbering choose mode items 0-9a-z and then nothing, number 
them all and if there are more than 10 use a prompt when 0-9 is
pressed. From Thomas Adam.
 2012-08-11 06:45:33 +00:00
Nicholas Marriott
5385a9bb34 Add a queue of notifys and a way to turn them off and on (we do not want 
notifys to happen during some commands). Based on code from George
Nachman.
 2012-07-13 06:27:41 +00:00
Tiago Cunha
1f5e6e35d5 Sync OpenBSD patchset 1151: 
Make command exec functions return an enum rather than -1/0/1 values and
add a new value to mean "leave client running but don't attach" to fix
problems with using some commands in a command sequence. Most of the
work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
 2012-07-11 19:37:32 +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
Tiago Cunha
a10143a2d1 Sync OpenBSD patchset 1146: 
Add choose-tree command to show windows and sessions in the same
list. Change choose-window and -session to use the same code. From
Thomas Adam.
 2012-07-11 17:13:55 +00:00
Tiago Cunha
38530de622 Sync OpenBSD patchset 1144: 
Clear flags across all sessions, from Thomas Adam.
 2012-07-11 17:06:11 +00:00
Nicholas Marriott
ede8312d59 Make command exec functions return an enum rather than -1/0/1 values and 
add a new value to mean "leave client running but don't attach" to fix
problems with using some commands in a command sequence. Most of the
work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
 2012-07-11 07:10:15 +00:00
Nicholas Marriott
df912e3540 xfree is not particularly helpful, remove it. From Thomas Adam. 2012-07-10 11:53:01 +00:00
Nicholas Marriott
f20c6fe009 Add choose-tree command to show windows and sessions in the same 
list. Change choose-window and -session to use the same code. From
Thomas Adam.
 2012-07-08 16:04:38 +00:00