Tag 1.6 release.

.gitignore

@@ -1,17 +0,0 @@
-*.o
-*~
-*.diff
-*.patch
-*.core
-core
-tags
-.deps/
-aclocal.m4
-autom4te.cache/
-config.log
-config.status
-etc/
-tmux
-Makefile
-Makefile.in
-configure

.mailmap

@@ -1,24 +0,0 @@
-Bob Beck 		<beck@openbsd.org> beck <beck>
-Igor Sobrado 		<sobrado@openbsd.org> sobrado <sobrado>
-Jacek Masiulaniec 	<jacekm@openbsd.org> jacekm <jacekm>
-Jason McIntyre 		<jmc@openbsd.org> jcm <jcm>
-Joel Sing		<jsing@openbsd.org> jsing <jsing>
-Marc Espie 		<espie@openbsd.org> espie <espie>
-Matthew Dempsky 	<matthew@openbsd.org> matthew <matthew>
-Matthias Kilian 	<kili@openbsd.org> kili <kili>
-Matthieu Herrb 		<matthieu@openbsd.org> matthieu <matthieu>
-Miod Vallat 		<miod@openbsd.org> miod <miod>
-Nicholas Marriott 	<nicm@openbsd.org> nicm <nicm>
-Nicholas Marriott 	<nicm@openbsd.org> no_author <no_author@example.org>
-<nicm@openbsd.org>	<nicholas.marriott@gmail.com>
-Okan Demirmen 		<okan@openbsd.org> okan <okan>
-Philip Guenther		<guenther@openbsd.org> guenther <guenther>
-Pierre-Yves Ritschard 	<pyr@openbsd.org> pyr <pyr>
-Ray Lai 		<ray@openbsd.org> ray <ray>
-Ryan McBride		<mcbride@openbsd.org> mcbride <mcbride>
-Stefan Sperling 	<stsp@openbsd.org> stsp <stsp>
-Stuart Henderson 	<sthen@openbsd.org> sthen <sthen>
-Ted Unangst 		<tedu@openbsd.org> tedu <tedu>
-Theo Deraadt 		<deraadt@openbsd.org> deraadt <deraadt>
-Thomas Adam		<thomas@xteddy.org> Thomas <thomas@xteddy.org>
-William Yodlowsky 	<william@openbsd.org> william <william>

CHANGES

@@ -1,114 +1,3 @@
-CHANGES FROM 1.7 to 1.8, 26 March 2013
-
-Incompatible Changes
-====================
-
-* layout redo/undo has been removed.
-
-Normal Changes
-==============
-
-* Add halfpage up/down bindings to copy mode.
-* Session choosing fixed to work with unattached sessions.
-* New window options window-status-last-{attr,bg,fg} to denote the last
-  window which was active.
-* Scrolling in copy-mode now scrolls the region without moving the mouse
-  cursor.
-* run-shell learnt '-t' to specify the pane to use when displaying output.
-* Support for middle-click pasting.
-* choose-tree learns '-u' to start uncollapsed.
-* select-window learnt '-T; to toggle to the last window if it's already
-  current.
-* New session option 'assume-paste-time' for pasting text versus key-binding
-  actions.
-* choose-* commands now work outside of an attached client.
-* Aliases are now shown for list-commands command.
-* Status learns about formats.
-* Free-form options can be set with set-option if prepended with an '@'
-  sign.
-* capture-pane learnt '-p' to send to stdout, and '-e' for capturing escape
-  sequences, and '-a' to capture the alternate screen, and '-P' to dump
-  pending output.
-* Many new formats added (client_session, client_last_session, etc.)
-* Control mode, which is a way for a client to send tmux commands.
-  Currently more useful to users of iterm2.
-* resize-pane learnt '-x' and '-y' for absolute pane sizing.
-* Config file loading now reports errors from all files which are loaded via
-  the 'source-file' command.
-* 'copy-pipe' mode command to copy selection and pipe the selection to a
-  command.
-* Changes panes can now emit focus notifications for certain applications
-  which use those.
-* run-shell and if-shell now accept format placeholders.
-* resize-pane learnt '-Z' for zooming a pane temporarily.
-* new-session learnt '-A' to make it behave like attach-session.
-* set-option learnt '-o' to prevent setting an option which is already set.
-* capture-pane and show-options learns '-q' to silence errors.
-* New command 'wait-for' which blocks a client until woken up again.
-* Resizing panes will now reflow the text inside them.
-* Lots and lots of bug fixes, fixing memory-leaks, etc.
-* Various manpage improvements.
-
-CHANGES FROM 1.6 to 1.7, 13 October 2012
-
-* tmux configuration files now support line-continuation with a "\" at the
-  end of a line.
-* New option status-position to move the status line to the top or bottom of
-  the screen.
-* Enforce history-limit option when clearing the screen.
-* Give each window a unique id, like panes but prefixed with @.
-* Add pane id to each pane in layout description (while still accepting
-  the old form).
-* Provide defined ways to set the various default-path possibilities: ~
-  for home directory, . for server start directory, - for session start
-  directory and empty for the pane's working directory (the default). All
-  can also be used as part of a relative path (eg -/foo). Also provide -c
-  flags to neww and splitw to override default-path setting.
-* Add -l flag to send-keys to send input literally (without translating
-  key names).
-* Allow a single option to be specified to show-options to show just that
-  option.
-* New command "move-pane" (like join-pane but allows the same window).
-* join-pane and move-pane commands learn "-b" option to place the pane to
-  the left or above.
-* Support for bracketed-paste mode.
-* Allow send-keys command to accept hex values.
-* Add locking around "start-server" to avoid race-conditions.
-* break-pane learns -P/-F arguments for display formatting.
-* set-option learns "-q" to make it quiet, and not print out anything.
-* copy mode learns "wrap-search" option.
-* Add a simple form of output rate limiting by counting the number of
-  certain C0 sequences (linefeeds, backspaces, carriage returns) and if it
-  exceeds a threshold (current default 250/millisecond), start to redraw
-  the pane every 100 milliseconds instead of making each change as it
-  comes. Two configuration options - c0-change-trigger and
-  c0-change-interval.
-* find-window learns new flags:  "-C", "-N", "-T" to match against either or
-  all of a window's content, name, or title.  Defaults to all three options
-  if none specified.
-* find-window automatically selects the appropriate pane for the found
-  matches.
-* show-environment can now accept one option to show that environment value.
-* Exit mouse mode when end-of-screen reached when scrolling with the mouse
-  wheel.
-* select-layout learns -u and -U for layout history stacks.
-* kill-window, detach-client, kill-session all  learn "-a" option for
-  killing all but the current thing specified.
-* move-window learns "-r" option to renumber window sequentially in a
-  session.
-* New session option "renumber-windows" to automatically renumber windows in
-  a session when a window is closed.  (see "move-window -r").
-* Only enter copy-mode on scroll up.
-* choose-* and list-* commands all use "-F" for format specifiers.
-* When spawning external commands, the value from the "default-shell" option
-  is now used, rather than assuming /bin/sh.
-* New choose-tree command to render window/sessions as a tree for selection.
-* display-message learns new format options.
-* For linked-windows across sessions, all flags for that window are now
-  cleared across sessions.
-* Lots and lots of bug fixes, fixing memory-leaks, etc.
-* Various manpage improvements.
-
 CHANGES FROM 1.5 TO 1.6, 23 January 2012
 
 * Extend the mode-mouse option to add a third choice which means the mouse

FAQ

@@ -326,6 +326,51 @@ lock(1) or vlock(1)) by using the following:
 
 bind x set lock-command '/usr/bin/vlock' \; lock-client \; set lock-command 'tput civis && read -s -n1'
 
+* How can I open a new window in the same directory as the current window?
+
+One option is to just run "TMUX= tmux" in the window. However, this only works if no
+command is running, so that you can input the command.
+
+A workaround is to let tmux know about the current path through an environment
+variable. To do so, use the following command:
+
+    [ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I") $PWD
+
+Which sets TMUXPWD_i (where i is the number of the current window) to the path
+of the current directory. This command can be added to PS1, for example:
+
+    PS1='$([ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I") $PWD)\h$ '
+
+When a new window is created, the shell should be asked to change
+directory. You can define a new binding (for example, if using GNU bash):
+
+    bind-key C-c run-shell 'tmux neww "cd $(tmux display -p "\$TMUXPWD_#I"); exec bash"'
+
+This solution will work even if a command is currently running in the terminal,
+but it will not work from a window that has just been swapped with another
+because TMUXPWD_i will not be updated after a swap. However, once a new prompt
+is displayed, TMUXPWD_i is updated properly.
+
+* tmux doesn't start with "daemon failed"
+
+tmux shows something similar to this when started:
+
+    fatal: server_start: daemon failed: No such file or directory
+    fatal: main_dispatch: imsg_read failed
+
+A possible reason is that /dev/null is not a character device or is otherwise
+inaccessible.
+
+Check with:
+
+    file /dev/null
+    ls -l /dev/null
+
+If it is not a character device or has incorrect permissions, it can typically
+be recreated with:
+
+    cd /dev && rm null && ./MAKEDEV null
+
 * vim displays reverse video instead of italics, while less displays italics
   (or just regular text) instead of reverse. What's wrong?
 
@@ -364,37 +409,5 @@ If your urxvt cannot display italics at all, make sure you have an italics
 capable font enabled, for example, add to ~/.Xdefaults:
 
 	urxvt.italicFont: xft:Bitstream Vera Sans Mono:italic:autohint=true
-
-* How can I make tmux use my terminal's scrollback buffer?
-
-Normally, tmux enables the terminal's "alternate screen". Most terminals (such
-as xterm) do not save scrollback for the alternate screen. You might prefer
-tmux to use the normal screen, so it uses your terminal's scrollback
-buffer. This way, you can access the scrollback buffer as usual, for example
-using the mouse wheel - although there is no guarantee output inside tmux will
-always (or ever) be added to the scrollback.
-
-You can make tmux use the normal screen by telling it that your terminal does
-not have an alternate screen. Put the following in ~/.tmux.conf:
-
-        set -g terminal-overrides 'xterm*:smcup@:rmcup@'
-
-Adjust if your $TERM does not start with xterm.
-
-tmux will still emulate the alternate screen for applications run under tmux,
-so you don't really lose anything with this setting. The only disadvantage is
-that when you exit tmux, it will not restore whatever was there before you
-started.
-
-* How do I see the default configuration?
-
-Show the default session options by starting a new tmux server with no
-configuration file:
-
-        $ tmux -Lfoo -f/dev/null start\; show -g
-
-Or the default window options:
-
-        $ tmux -Lfoo -f/dev/null start\; show -gw
  
 $Id$

Makefile.am

@@ -6,7 +6,7 @@ dist_man1_MANS = tmux.1
 
 # Distribution tarball options.
 EXTRA_DIST = \
-	CHANGES FAQ README TODO examples compat \
+	CHANGES FAQ NOTES TODO examples compat \
 	array.h compat.h tmux.h osdep-*.c
 dist-hook:
 	grep "^#found_debug=" configure
@@ -24,17 +24,14 @@ endif
 # Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
 # different flags.
 if IS_GCC
-CFLAGS += -std=gnu99
+CFLAGS += -std=c99
 if IS_DEBUG
-CFLAGS += -O0 -g
+CFLAGS += -g -ggdb -O0
 CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
 CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
 CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
 CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
-CFLAGS += -Wdeclaration-after-statement
 CPPFLAGS += -DDEBUG
-else
-CFLAGS += -O2
 endif
 if IS_GCC4
 CPPFLAGS += -iquote. -I/usr/local/include
@@ -69,8 +66,8 @@ dist_tmux_SOURCES = \
 	cmd-capture-pane.c \
 	cmd-choose-buffer.c \
 	cmd-choose-client.c \
-	cmd-choose-list.c \
+	cmd-choose-session.c \
-	cmd-choose-tree.c \
+	cmd-choose-window.c \
 	cmd-clear-history.c \
 	cmd-clock-mode.c \
 	cmd-command-prompt.c \
@@ -104,7 +101,6 @@ dist_tmux_SOURCES = \
 	cmd-new-window.c \
 	cmd-paste-buffer.c \
 	cmd-pipe-pane.c \
-	cmd-queue.c \
 	cmd-refresh-client.c \
 	cmd-rename-session.c \
 	cmd-rename-window.c \
@@ -118,10 +114,12 @@ dist_tmux_SOURCES = \
 	cmd-select-pane.c \
 	cmd-select-window.c \
 	cmd-send-keys.c \
+	cmd-send-prefix.c \
 	cmd-server-info.c \
 	cmd-set-buffer.c \
 	cmd-set-environment.c \
 	cmd-set-option.c \
+	cmd-show-buffer.c \
 	cmd-show-environment.c \
 	cmd-show-messages.c \
 	cmd-show-options.c \
@@ -135,14 +133,11 @@ dist_tmux_SOURCES = \
 	cmd-switch-client.c \
 	cmd-unbind-key.c \
 	cmd-unlink-window.c \
-	cmd-wait-for.c \
 	cmd.c \
 	colour.c \
-	control.c \
-	control-notify.c \
 	environ.c \
 	format.c \
-	grid-cell.c \
+	grid-utf8.c \
 	grid-view.c \
 	grid.c \
 	input-keys.c \
@@ -156,7 +151,6 @@ dist_tmux_SOURCES = \
 	log.c \
 	mode-key.c \
 	names.c \
-	notify.c \
 	options-table.c \
 	options.c \
 	paste.c \

NOTES

@@ -0,0 +1,82 @@
+Welcome to tmux!
+
+tmux is a "terminal multiplexer", it enables a number of terminals (or windows)
+to be accessed and controlled from a single terminal. tmux is intended to be a
+simple, modern, BSD-licensed alternative to programs such as GNU screen.
+
+This release runs on OpenBSD, FreeBSD, NetBSD, Linux and OS X and may still
+run on Solaris and AIX (although they haven't been tested in a while). It is
+usable, although there remain a number of missing features and some remaining
+bugs are expected.
+
+If upgrading from 1.5, PLEASE NOTE:
+- The word-separators window option is now a session option.
+- The options used to change the window attributes when an alert occurs were
+  removed. Each kind of alert has its own individual set of options.
+- The ability to have a list of prefix keys was dropped in favour of two
+  separate options, prefix and prefix2.
+
+Since the 1.2 release that tmux depends on libevent. Download it from:
+
+	http://www.monkey.org/~provos/libevent/
+
+To build tmux from a release tarball, do:
+
+	$ ./configure && make
+	$ sudo make install
+
+To build from a version control checkout, the configure script must be
+generated by running:
+
+	$ sh autogen.sh
+
+tmux consists of a server part and multiple clients. The server is created when
+required and runs continuously unless killed by the user. Clients access the
+server through a socket in /tmp. Multiple sessions may be created on a single
+server and attached to a number of clients. Each session may then have a number
+of windows and windows may be linked to a number of sessions. Commands are
+available to create, rename and destroy windows and sessions; to attach and
+detach sessions from client terminals; to set configuration options; to split
+windows into several simultaneously displayed panes; and to bind and unbind
+command keys (invoked preceded by a prefix key, by default ctrl-b). Please see
+the tmux(1) man page for further information.
+
+A more extensive, but rough, todo list is included in the TODO file.
+
+tmux also depends on several features of the client terminal (TERM), if these
+are missing it may refuse to run, or not behave correctly.
+
+A Vim syntax file is available in the examples directory. To install it:
+
+- Drop the file in the syntax directory in your runtimepath (such as
+  ~/.vim/syntax/tmux.vim).
+- Make the filetype recognisable by adding the following to filetype.vim
+  in your runtimepath (~/.vim/filetype.vim):
+
+	augroup filetypedetect
+		au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
+	augroup END
+
+- Switch on syntax highlighting by adding "syntax enable" to your vimrc file.
+
+For debugging, running tmux with -v or -vv will generate server and client log
+files in the current directory.
+
+tmux mailing lists are available; visit:
+
+	https://sourceforge.net/mail/?group_id=200378
+
+Bug reports, feature suggestions and especially code contributions are most
+welcome. Please send by email to:
+
+	nicm@users.sf.net
+
+This file and the CHANGES, FAQ and TODO files are licensed under the ISC
+license. Files under examples/ remain copyright their authors unless otherwise
+stated in the file but permission has been received to distribute them with
+tmux. All other files have a license and copyright notice at their
+start. Please contact me with any queries.
+
+-- Nicholas Marriott <nicm@users.sf.net>
+
+$Id$

README

@@ -1,60 +0,0 @@
-Welcome to tmux!
-
-tmux is a "terminal multiplexer", it enables a number of terminals (or windows)
-to be accessed and controlled from a single terminal. tmux is intended to be a
-simple, modern, BSD-licensed alternative to programs such as GNU screen.
-
-This release runs on OpenBSD, FreeBSD, NetBSD, Linux and OS X and may still
-run on Solaris and AIX (although they haven't been tested in a while).
-
-Since the 1.2 release tmux depends on libevent. Download it from:
-
-	http://www.monkey.org/~provos/libevent/
-
-To build tmux from a release tarball, do:
-
-	$ ./configure && make
-	$ sudo make install
-
-To get and build the latest from version control:
-
-	$ git clone git://git.code.sf.net/p/tmux/tmux-code tmux
-	$ cd tmux
-	$ sh autogen.sh
-	$ ./configure && make
-
-For more information see https://sourceforge.net/scm/?type=git&group_id=200378
-and http://git-scm.com. Patches should be sent by email to the mailing list at
-tmux-users@lists.sourceforge.net.
-
-For documentation on using tmux, see the tmux.1 manpage. It can be viewed from
-the source tree with:
-
-	$ nroff -mdoc tmux.1|less
-
-Some common questions are answered in the FAQ file and a more extensive (but
-slightly out of date) guide is available in the OpenBSD FAQ at
-http://www.openbsd.org/faq/faq7.html#tmux. A rough todo list is in the TODO
-file and some example configurations and a Vim syntax file are in the examples
-directory.
-
-For debugging, running tmux with -v or -vv will generate server and client log
-files in the current directory.
-
-tmux mailing lists are available. Visit:
-
-	https://sourceforge.net/mail/?group_id=200378
-
-Bug reports, feature suggestions and especially code contributions are most
-welcome. Please send by email to:
-
-	tmux-users@lists.sourceforge.net
-
-This file and the CHANGES, FAQ and TODO files are licensed under the ISC
-license. Files under examples/ remain copyright their authors unless otherwise
-stated in the file but permission has been received to distribute them with
-tmux. All other files have a license and copyright notice at their start.
-
--- Nicholas Marriott <nicm@users.sf.net>
-
-$Id$

SYNCING

@@ -1,174 +0,0 @@
-Preamble
-========
-
-Tmux on SourceForge has two git repositories [1] "tmux-code" and "tmux-openbsd".
-Here's a description of them:
-
-* "tmux-code" is the portable version, the one which contains code for other
-  operating systems, and autotools, etc., which isn't found or needed in the
-  OpenBSD base system.
-
-* "tmux-openbsd" is the version of tmux in OpenBSD base system which provides
-  the basis of the portable tmux version.
-
-Note:  The "tmux-openbsd" repository is actually handled by "git cvsimport"
-running at 15 minute intervals, so a commit made to OpenBSD's tmux CVS
-repository will take at least that long to appear in this git repository.
-(It might take longer, depending on the CVS mirror used to import the
-OpenBSD code).
-
-It is assumed that the person doing the sync has read/write access to the
-tmux-code repository on SourceForge already.
-
-If you've never used git before, git tracks meta-data about the committer
-and the author, as part of a commit, hence:
-
-% git config [--global] user.name "Your name"
-% git config [--global] user.email "you@yourdomain.com"
-
-Note that, if you already have this in the global ~/.gitconfig option, then
-this will be used.  Setting this per-repository would involve not using the
-"--global" flag above.   If you wish to use the same credentials always,
-pass the "--global" option, as shown.
-
-This is a one-off operation once the repository has been cloned, assuming
-this information has ever been set before.
-
-Cloning repositories
-====================
-
-This involves having both tmux-code and tmux-openbsd cloned, as in:
-
-% cd /some/where/useful
-% git clone ssh://${USER}@git.code.sf.net/p/tmux/tmux
-% git clone ssh://${USER}@git.code.sf.net/p/tmux/tmux-openbsd
-
-Note that you do not need additional checkouts to manage the sync -- an
-existing clone of either repositories will suffice.  So if you already have
-these checkouts existing, skip that.
-
-Adding in git-remotes
-=====================
-
-Because the portable "tmux-code" git repository and the "tmux-openbsd"
-repository do not inherently share any history between each other, the
-history has been faked between them.  This "faking of history" is something
-which has to be told to git for the purposes of comparing the "tmux" and
-"tmux-openbsd" repositories for syncing.  To do this, we must reference the
-clone of the "tmux-openbsd" repository from the "tmux-code" repository, as
-shown by the following command:
-
-% cd /path/to/tmux-code
-% git remote add obsd-tmux file:///path/to/tmux-openbsd
-
-So that now, the remote "obsd-tmux" can be used to reference branches and
-commits from the "tmux-openbsd" repository, but from the context of the
-portable "tmux-code" repository, which makes sense because it's the "tmux"
-repository which will have the updates applied to them.
-
-Fetching updates
-================
-
-To ensure the latest commits from "tmux-openbsd" can be found from within
-"tmux-code", we have to ensure the "master" branch from "tmux-openbsd" is
-up-to-date first, and then reference that update in "tmux-code", as in:
-
-% cd /path/to/tmux-openbsd
-% git checkout master
-% git pull
-
-Then back in "tmux-code":
-
-% cd /path/to/tmux-code
-% git fetch obsd-tmux-code
-
-Creating the necessary branches
-===============================
-
-Now that "tmux-code" can see commits and branches from "tmux-openbsd" by way
-of the remote name "obsd-tmux", we can now create the master branch from
-"tmux-openbsd" in the "tmux-code" repository:
-
-% git checkout -b obsd-master obsd-tmux/master
-
-Adding in the fake history points
-================================= 
-
-To tie both the "master" branch from "tmux-code" and the "obsd-master"
-branch from "tmux-openbsd" together, the fake history points added to the
-"tmux-code" repository need to be added.  To do this, we must add an
-additional refspec line, as in:
-
-% cd /path/to/tmux-code
-% git config --add remote.origin.fetch '+refs/replace/*:refs/replace/*'
-% git fetch origin
-
-Performing the Sync
-===================
-
-Make sure the "master" branch is checked out:
-
-% git checkout master
-
-The following will show commits on OpenBSD not yet synched with "tmux-code":
-
-% git log master..obsd-master
-
-From there, merge the result in, fixing up any conflicts which might arise.
-
-% git merge obsd-master
-
-Then ensure things look correct by BULDING the result of that sync:
-
-% make clean && ./autogen.sh && ./configure && make
-
-Compare the git merge result with what's on origin/master -- that is, check
-which commits you're about to push:
-
-% git log origin/master..master
-
-And if happy:
-
-% git push origin master
-
-Release tmux for next version
-=============================
-
-1. Comment the "found_debug=yes" line in configure.ac, since releases
-   don't have debugging enabled, otherwise make(1) aborts when
-   preparing the distribution.
-
-2. Update and commit README and CHANGES.  The former should be checked for
-   anything outdated and updated with a list of things that might break
-   upgrades and the latter should mention all the major changes since
-   the last version.
-
-3. Tag with:
-
-   % git tag -a 1.X
-
-   Where "1.X" is the next version.
-
-   Push the tag out with:
-
-   % git push 1.X
-
-4. Build the tarball with make dist.  Now that it's using autoconf there
-   shouldn't be any weird files (such as the original and rejection files
-   from patch(1)) but it doesn't hurt taking a quick look at it.
-
-5. Split the release changes into a new file.  This should be named
-   tmux-$VERSION-readme to make sourceforge show it automagically in specific
-   parts of the project page.
-
-6. Upload the tarball and the above file. Make the tarball the default
-   download by selecting all operating systems under the file details.
-
-7. Run make update-index.html upload-index.html to replace %%VERSION%%.
-
-8. Bump version in configure.ac and uncomment "found_debug=yes" to create
-   a debug build by default.
-
-9. Update freshmeat.
-
-[1] https://sourceforge.net/p/tmux/_list/git

TODO

@@ -1,19 +1,3 @@
-NOTES
-=====
-
-This file describes rough notes regarding ideas for potential future tmux
-development.  It's not necessarily guaranteed that items in this TODO file
-will ever get implemented.
-
-It is asked therefore, that anyone thinking of undertaking a task in this
-TODO file, email tmux-users@lists.sf.net to discuss the feature.
-
-Thie file is split up between tmux user interface (UI) issues, and terminal
-compatibility issues.
-
-TMUX UI ISSUES
-==============
-
 - implicitly add exec to the commands for new windows (switch to disable it)?
 - bring back detach-session to detach all clients on a session?
 - allow fnmatch for -c, so that you can, eg, detach all clients
@@ -22,134 +6,139 @@ TMUX UI ISSUES
 - flags to centre screen in window
 - activity/bell should be per-window not per-link? what if it is cur win in
   session not being watched?
+- use a better termcap internally instead of screen, perhaps xterm
 - should be able to move to a hidden pane and it would be moved into view. pane
   number in status line/top-right would be cool for this
 - support other mouse modes (highlight etc) and use it in copy mode
 - set-remain-on-exit is a bit of a hack, some way to do it generically?
+- clear window title on exit
 - would be nice to be able to use "--" to mark start of command w/ neww etc
   to avoid quoting
 - make command sequences more usable: don't require space after ;, handle
   errors better
+- attach should have a flag to create session if it doesn't exist
 - choice and more mode would be better per client than per window?
 - hooks to which commands may be attached, for example: tmux add-hook
   "new-session" if-shell "[ -e $HOME/.tmux-session.conf ]" source-file
   $HOME/.tmux-session.conf
+- get it passing all the vttest tests that don't require resizing the terminal
 - way to set socket path from config file
+- what about utmp etc? can tmux update it like screen? setgid?
 - warts on current naming:
   	- display-time but message-fg/bg/attr
 	- list-* vs show-*
 	- server-info
 	- up-pane/down-pane/swap-pane -U/swap-pane -D vs next-*/previous-*
 	- split-window -> split-pane??
+- a way for force-width/height to apply to only one pane (how?)
+- command to list what is actually running in each window with command line,
+  pid (need some adaption of the osdep code)
+- support for bce
 - some way to force a screen to use the entire terminal even if it is forced
   to be smaller by other clients. pan smaller terminal? (like screen F)
 	-- idea of a "view" onto a window, need base x/y offsets for redraw
+- handle resize better in copy mode
+- way to copy stuff that is off screen due to resize
 - commands should be able to succeed or fail and have || or && for command
   lists
-- some way to keep a command running continually and just use its last line of
+- some way to KEEP a command running continually and just use its LAST line of
   output
 - UTF-8 to a non-UTF-8 terminal should not be able to balls up
   the terminal - www/ruby-addressable; make regress
 - support esc-esc to quit in modes
 - fix ctrl+F1-F4 output. to what?
 - better utf8 support: window names, prompt input, message display
+- session history for client and last-session command
+- option to change status line colour when current window is in a mode?
 - option to move copy mode indicator into status line
+- list-buffer/show-buffer should display UTF-8
 - selection behaviour closer to vi in vi mode
 - live update: server started with -U connects to server, requests sessions and
   windows, receives fds
+- command to show a tree of sessions-windows-panes (active marked with *)
 - sort out inheriting config from shell on new sessions/windows:
         should pick up default-path/termios/etc from client if possible,
 	else leave empty/default
 - link panes into multiple windows
 - bells should be passed between sessions with visual-bell etc
+- use screen-256color when started on 256 colour terminal??
+- if-shell/run-shell should block further command execution in the same command
   sequence until its shell exits, to allow them to be used from the config file
 - better session sharing: create-socket command to create socket somewhere (-r
   flag for readonly)
 - multiline status line (no?)
+- flag for absolute pane size to resize-pane
+- sanity check input to socket
 - support title stack, both internally and externally
 	http://docs.freebsd.org/cgi/getmsg.cgi?fetch=1149299+0+archive/2010/freebsd-questions/20100207.freebsd-questions
+- command to show status line information briefly when it is off
 - some way to pad # stuff with spaces, #!2T maybe
 - a binding to "scroll down and exit at bottom" copy mode
-- some way to pass keystrokes in copy mode through to underlying window. why?
+- some way to pass keystrokes in copy mode through to underlying window
 - last window update time and # replacement for it for display-message
 - find-window across sessions - other ways to make session handling easier?
 - ' and " should be parsed the same (eg "\e" vs '\e') in config and command
   prompt?
 - command to toggle selection not to move it in copy-mode
+- why are alerts per-winlink? try per window?
 - audit of escape sequence support vs xterm
 - support binding keys to mouse (mouse-select-pane -> mouse-keys or something,
   mouse click == select-pane -t %%, mouse scroll up == copy-mode)
+- something for -t "last window in session" so a session can be used as a stack
+- synchronous commands - client sends cmd and blocks, neww/splitw saves client
+  ptr then when program inside died, sends MSG_SOMETHING with wait status to
+  client
+- documentation improvements - rlpowell's tutorial - build instructions
 - bind commands to key sequences? -- make it so ALL keys go through a table,
   first an implicit table in which C-b is the only default binding to a
   command that says "next key from $othertable" and so on. means -n can
   go away as well
 - monitor, bell etc should monitor /all/ panes in the window not just one
 - a history of commands that can be reversed (reverse member of each command,
-  and a buffer)
+  and a buffer) info() when changing to same window
-- info() when changing to same window
 - way to add dest for break-pane; maybe some easier way to unbreak-pane
 - case insensitive searching
-- incremental searching in copy mode.
+- option to move status line to top
 - configurable borders and empty space filler for when panes < window?
 - mouse-select-pane will screw up with !MODE_MOUSE_STANDARD (it sets the
   flag on w/o checking the others before calling tty_update_mode)
+- multiple keys could be done with tables, ie have prefixes go and instead
+	bind -n ^A prefix-table "default"
+  where prefix-table sets command lookup table and sets prefix flag, then next
+  key is looked up in that table
 - pass shell commands as argv rather than strings, allow them to be specified
   in commands without quotes
+- a command to choose from a generic list, so you can do eg
+  choose-list -l Abc,Moo,Blah "run-shell 'sh /my/choose/script %%'"
+- numeric prefix in copy mode should be paste buffer for C-w
 - named buffers and allow gaps in the stack
+- get rid of separate UTF-8 cell stuff: add 1 byte to cell and store BMP as
+  uint16_t+3 bits of flags. anything <=0xffff is Unicode, higher are used to
+  build tree of combined characters/non-BMP (LRU dropped when full)
+- entry in FAQ about what to do when someone does mkdir /tmp/tmux-1000
+- show size under pane number in display-panes mode
 - monitor-activity is broken in several ways with multiple clients
 - monitor-activity should be more powerful (eg set a region)
 - maybe a way to put pane names instead of window names in status line
 - support for borderless panes
-- wait-for command 20130222153957.GY6782@yelena.nicm.ath.cx
+- run-shell/if-shell should support status_replace stuff
+- wait-pane command or another way to make it synchronous/wait for command to
+  finish
 - last-pane across sessions
+- attach should take a pane and select it as well as attaching
+- should default-path be a window option?
+- option to put status line at top (why?)
 - panes should have names like windows
 - command-prompt doesn't work if made read-only. why?
 - option to quote format eg #{session_name:quoted}
+- formats need to be used for much much more stuff!
 - formats need conditions for >0 (for #P)
+- flags to find-window to select what is searched (title, name, content, history)
 - fetch full command line on !Linux, and add option to strip prefixes
   such as "sh " "/bin/sh " etc etc
 - synchronize-windows option
+- possibly support rxvt-unicode extended mouse input (1015)
 - append to buffer in copy mode
-- way to paste w/o trailing whitespace
-- flag to switch-client to switch all clients
-- history of layouts and undo/redo flags to selectl
-- way to tag a layout as a number/name
-- optimize pane redraws, 20120318184853.GK10965@yelena.nicm.ath.cx
-- support multibyte key strings
-- allow commands to be executed when certain patterns in a screen
-  are clicked on with the mouse
-- flag to make next/previous commands skip a window
-- way to do tmux command/run-shell from mode keys
-- send command to all windows
-- choose-pane command (augment choose-tree to do this?)
-- choose-mode and copy-mode are very similar. Perhaps make choose-mode a subset
-  of copy-mode in that it inherits key-bindings and other traits but not all
-- add -c for new-session like new-window
-- flag to choose-* for sort order (eg sort windows/sessions/clients by last
-  used time) - perhaps using formats (but what about numeric sort)?
-- instead of separate window and session options, just one master options list
-  with each option having a type (window or session), then options on window,
-  on session, and global. for window options we look window->session->global,
-  and for session we look session->global
-- maybe keep last layout + size around and if size reverts just put it back
-- way to set hints/limits about pane size for resizing
-- revamp layouts: they are too complicated, should be more closely integrated,
-  should support hints, layout sets should just be a special case of custom
-  layouts, and we should support panes that are not attached to a cell at
-  all. this could be the time to introduce panelink to replace layout_cell
-- run-shell/if-shell should support formats
-- attach should take a pane and select it as well as attaching
-- attach should have a flag to create session if it doesn't exist. or better
-  new a flag to attach it
-
-TERMINAL ISSUES
-================
-
-- use a better termcap internally instead of screen, perhaps xterm
-- clear window title on exit (see using xterm title stack)
-- get it passing all the vttest tests that don't require resizing the terminal
-- support for bce
-- use screen-256color when started on 256 colour terminal?
 * We need a tmux terminfo entry to document the extensions we are using in
   upstream terminfo. Must NOT change (only add or remove) anything from
   TERM=screen so we can fallback!

arguments.c

@@ -68,14 +68,15 @@ args_parse(const char *template, int argc, char **argv)
 		if (opt < 0 || opt >= SCHAR_MAX)
 			continue;
 		if (opt == '?' || (ptr = strchr(template, opt)) == NULL) {
-			free(args->flags);
+			xfree(args->flags);
-			free(args);
+			xfree(args);
 			return (NULL);
 		}
 
 		bit_set(args->flags, opt);
 		if (ptr[1] == ':') {
-			free(args->values[opt]);
+			if (args->values[opt] != NULL)
+				xfree(args->values[opt]);
 			args->values[opt] = xstrdup(optarg);
 		}
 	}
@@ -96,11 +97,13 @@ args_free(struct args *args)
 
 	cmd_free_argv(args->argc, args->argv);
 
-	for (i = 0; i < SCHAR_MAX; i++)
+	for (i = 0; i < SCHAR_MAX; i++) {
-		free(args->values[i]);
+		if (args->values[i] != NULL)
+			xfree(args->values[i]);
+	}
 
-	free(args->flags);
+	xfree(args->flags);
-	free(args);
+	xfree(args);
 }
 
 /* Print a set of arguments. */
@@ -179,7 +182,8 @@ args_has(struct args *args, u_char ch)
 void
 args_set(struct args *args, u_char ch, const char *value)
 {
-	free(args->values[ch]);
+	if (args->values[ch] != NULL)
+		xfree(args->values[ch]);
 	if (value != NULL)
 		args->values[ch] = xstrdup(value);
 	else

array.h

@@ -109,12 +109,13 @@
 } while (0)
 
 #define ARRAY_FREE(a) do {						\
-	free((a)->list);						\
+	if ((a)->list != NULL)						\
+		xfree((a)->list);					\
 	ARRAY_INIT(a);							\
 } while (0)
 #define ARRAY_FREEALL(a) do {						\
 	ARRAY_FREE(a);							\
-	free(a);							\
+	xfree(a);							\
 } while (0)
 
 #endif

attributes.c

@@ -26,21 +26,27 @@ const char *
 attributes_tostring(u_char attr)
 {
 	static char	buf[128];
-	size_t		len;
 
 	if (attr == 0)
 		return ("none");
 
-	len = xsnprintf(buf, sizeof buf, "%s%s%s%s%s%s%s",
+	buf[0] = '\0';
-		attr & GRID_ATTR_BRIGHT ? "bright," : "",
+	if (attr & GRID_ATTR_BRIGHT)
-		attr & GRID_ATTR_DIM ? "dim," : "",
+		strlcat(buf, "bright,", sizeof (buf));
-		attr & GRID_ATTR_UNDERSCORE ? "underscore," : "",
+	if (attr & GRID_ATTR_DIM)
-		attr & GRID_ATTR_BLINK ? "blink," : "",
+		strlcat(buf, "dim,", sizeof (buf));
-		attr & GRID_ATTR_REVERSE ? "reverse," : "",
+	if (attr & GRID_ATTR_UNDERSCORE)
-		attr & GRID_ATTR_HIDDEN ? "hidden," : "",
+		strlcat(buf, "underscore,", sizeof (buf));
-		attr & GRID_ATTR_ITALICS ? "italics," : "");
+	if (attr & GRID_ATTR_BLINK)
-	if (len > 0)
+		strlcat(buf, "blink,", sizeof (buf));
-		buf[len - 1] = '\0';
+	if (attr & GRID_ATTR_REVERSE)
+		strlcat(buf, "reverse,", sizeof (buf));
+	if (attr & GRID_ATTR_HIDDEN)
+		strlcat(buf, "hidden,", sizeof (buf));
+	if (attr & GRID_ATTR_ITALICS)
+		strlcat(buf, "italics,", sizeof (buf));
+	if (*buf != '\0')
+		*(strrchr(buf, ',')) = '\0';
 
 	return (buf);
 }

autogen.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 # $Id$
 
-if [ "x$(uname)" = "xOpenBSD" ]; then
+[ -z "$AUTOMAKE_VERSION" ] && export AUTOMAKE_VERSION=1.10
-	[ -z "$AUTOMAKE_VERSION" ] && export AUTOMAKE_VERSION=1.10
+[ -z "$AUTOCONF_VERSION" ] && export AUTOCONF_VERSION=2.65
-	[ -z "$AUTOCONF_VERSION" ] && export AUTOCONF_VERSION=2.65
-fi
 
 die()
 {

cfg.c

@@ -19,133 +19,144 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
 
-struct cmd_q		*cfg_cmd_q;
+/*
-int			 cfg_finished;
+ * Config file parser. Pretty quick and simple, each line is parsed into a
-int			 cfg_references;
+ * argv array and executed as a command.
-struct causelist	 cfg_causes;
+ */
 
+void printflike2 cfg_print(struct cmd_ctx *, const char *, ...);
+void printflike2 cfg_error(struct cmd_ctx *, const char *, ...);
+
+char	 	       *cfg_cause;
+int     	 	cfg_finished;
+struct causelist	cfg_causes = ARRAY_INITIALIZER;
+
+/* ARGSUSED */
+void printflike2
+cfg_print(unused struct cmd_ctx *ctx, unused const char *fmt, ...)
+{
+}
+
+/* ARGSUSED */
+void printflike2
+cfg_error(unused struct cmd_ctx *ctx, const char *fmt, ...)
+{
+	va_list	ap;
+
+	va_start(ap, fmt);
+	xvasprintf(&cfg_cause, fmt, ap);
+	va_end(ap);
+}
+
+void printflike2
+cfg_add_cause(struct causelist *causes, const char *fmt, ...)
+{
+	char	*cause;
+	va_list	 ap;
+
+	va_start(ap, fmt);
+	xvasprintf(&cause, fmt, ap);
+	va_end(ap);
+
+	ARRAY_ADD(causes, cause);
+}
+
+/*
+ * Load configuration file. Returns -1 for an error with a list of messages in
+ * causes. Note that causes must be initialised by the caller!
+ */
 int
-load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
+load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
 {
 	FILE		*f;
-	u_int		 n, found;
+	u_int		 n;
-	char		*buf, *copy, *line, *cause1, *msg;
+	char		*buf, *line, *cause;
-	size_t		 len, oldlen;
+	size_t		 len;
 	struct cmd_list	*cmdlist;
+	struct cmd_ctx	 ctx;
+	int		 retval;
 
-	log_debug("loading %s", path);
 	if ((f = fopen(path, "rb")) == NULL) {
-		xasprintf(cause, "%s: %s", path, strerror(errno));
+		cfg_add_cause(causes, "%s: %s", path, strerror(errno));
 		return (-1);
 	}
+	n = 0;
 
-	n = found = 0;
 	line = NULL;
+	retval = 0;
 	while ((buf = fgetln(f, &len))) {
-		/* Trim \n. */
 		if (buf[len - 1] == '\n')
 			len--;
-		log_debug("%s: %.*s", path, (int)len, buf);
 
-		/* Current line is the continuation of the previous one. */
+		if (line != NULL)
-		if (line != NULL) {
+			line = xrealloc(line, 1, strlen(line) + len + 1);
-			oldlen = strlen(line);
+		else {
-			line = xrealloc(line, 1, oldlen + len + 1);
-		} else {
-			oldlen = 0;
 			line = xmalloc(len + 1);
+			*line = '\0';
 		}
 
-		/* Append current line to the previous. */
+		/* Append buffer to line. strncat will terminate. */
-		memcpy(line + oldlen, buf, len);
+		strncat(line, buf, len);
-		line[oldlen + len] = '\0';
 		n++;
 
 		/* Continuation: get next line? */
 		len = strlen(line);
 		if (len > 0 && line[len - 1] == '\\') {
 			line[len - 1] = '\0';
-
+			continue;
-			/* Ignore escaped backslash at EOL. */
-			if (len > 1 && line[len - 2] != '\\')
-				continue;
 		}
-		copy = line;
+		buf = line;
 		line = NULL;
 
-		/* Skip empty lines. */
+		if (cmd_string_parse(buf, &cmdlist, &cause) != 0) {
-		buf = copy;
+			xfree(buf);
-		while (isspace((u_char)*buf))
+			if (cause == NULL)
-			buf++;
-		if (*buf == '\0') {
-			free(copy);
-			continue;
-		}
-
-		/* Parse and run the command. */
-		if (cmd_string_parse(buf, &cmdlist, path, n, &cause1) != 0) {
-			free(copy);
-			if (cause1 == NULL)
 				continue;
-			xasprintf(&msg, "%s:%u: %s", path, n, cause1);
+			cfg_add_cause(causes, "%s: %u: %s", path, n, cause);
-			ARRAY_ADD(&cfg_causes, msg);
+			xfree(cause);
-			free(cause1);
 			continue;
-		}
+		} else
-		free(copy);
+			xfree(buf);
-
 		if (cmdlist == NULL)
 			continue;
-		cmdq_append(cmdq, cmdlist);
+		cfg_cause = NULL;
+
+		if (ctxin == NULL) {
+			ctx.msgdata = NULL;
+			ctx.curclient = NULL;
+			ctx.cmdclient = NULL;
+		} else {
+			ctx.msgdata = ctxin->msgdata;
+			ctx.curclient = ctxin->curclient;
+			ctx.cmdclient = ctxin->cmdclient;
+		}
+
+		ctx.error = cfg_error;
+		ctx.print = cfg_print;
+		ctx.info = cfg_print;
+
+		cfg_cause = NULL;
+		if (cmd_list_exec(cmdlist, &ctx) == 1)
+			retval = 1;
 		cmd_list_free(cmdlist);
-		found++;
+		if (cfg_cause != NULL) {
+			cfg_add_cause(
+			    causes, "%s: %d: %s", path, n, cfg_cause);
+			xfree(cfg_cause);
+		}
+	}
+	if (line != NULL) {
+		cfg_add_cause(causes,
+		    "%s: %d: line continuation at end of file", path, n);
+		xfree(line);
 	}
-	if (line != NULL)
-		free(line);
 	fclose(f);
 
-	return (found);
+	return (retval);
-}
-
-void
-cfg_default_done(unused struct cmd_q *cmdq)
-{
-	if (--cfg_references != 0)
-		return;
-	cfg_finished = 1;
-
-	if (!RB_EMPTY(&sessions))
-		cfg_show_causes(RB_MIN(sessions, &sessions));
-
-	cmdq_free(cfg_cmd_q);
-	cfg_cmd_q = NULL;
-}
-
-void
-cfg_show_causes(struct session *s)
-{
-	struct window_pane	*wp;
-	char			*cause;
-	u_int			 i;
-
-	if (s == NULL || ARRAY_EMPTY(&cfg_causes))
-		return;
-	wp = s->curw->window->active;
-
-	window_pane_set_mode(wp, &window_copy_mode);
-	window_copy_init_for_output(wp);
-	for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
-		cause = ARRAY_ITEM(&cfg_causes, i);
-		window_copy_add(wp, "%s", cause);
-		free(cause);
-	}
-	ARRAY_FREE(&cfg_causes);
 }

client.c

@@ -17,7 +17,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
@@ -35,58 +34,20 @@
 
 struct imsgbuf	client_ibuf;
 struct event	client_event;
-struct event	client_stdin;
+const char     *client_exitmsg;
-enum {
-	CLIENT_EXIT_NONE,
-	CLIENT_EXIT_DETACHED,
-	CLIENT_EXIT_DETACHED_HUP,
-	CLIENT_EXIT_LOST_TTY,
-	CLIENT_EXIT_TERMINATED,
-	CLIENT_EXIT_LOST_SERVER,
-	CLIENT_EXIT_EXITED,
-	CLIENT_EXIT_SERVER_EXITED,
-} client_exitreason = CLIENT_EXIT_NONE;
 int		client_exitval;
 enum msgtype	client_exittype;
 int		client_attached;
 
-int		client_get_lock(char *);
 int		client_connect(char *, int);
 void		client_send_identify(int);
 void		client_send_environ(void);
 void		client_write_server(enum msgtype, void *, size_t);
 void		client_update_event(void);
 void		client_signal(int, short, void *);
-void		client_stdin_callback(int, short, void *);
-void		client_write(int, const char *, size_t);
 void		client_callback(int, short, void *);
 int		client_dispatch_attached(void);
 int		client_dispatch_wait(void *);
-const char     *client_exit_message(void);
-
-/*
- * Get server create lock. If already held then server start is happening in
- * another client, so block until the lock is released and return -1 to
- * retry. Ignore other errors - just continue and start the server without the
- * lock.
- */
-int
-client_get_lock(char *lockfile)
-{
-	int lockfd;
-
-	if ((lockfd = open(lockfile, O_WRONLY|O_CREAT, 0600)) == -1)
-		fatal("open failed");
-
-	if (flock(lockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK) {
-		while (flock(lockfd, LOCK_EX) == -1 && errno == EINTR)
-			/* nothing */;
-		close(lockfd);
-		return (-1);
-	}
-
-	return (lockfd);
-}
 
 /* Connect client to server. */
 int
@@ -94,8 +55,7 @@ client_connect(char *path, int start_server)
 {
 	struct sockaddr_un	sa;
 	size_t			size;
-	int			fd, lockfd;
+	int			fd;
-	char		       *lockfile;
 
 	memset(&sa, 0, sizeof sa);
 	sa.sun_family = AF_UNIX;
@@ -105,25 +65,24 @@ client_connect(char *path, int start_server)
 		return (-1);
 	}
 
-retry:
 	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
 		fatal("socket failed");
 
 	if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) {
-		if (errno != ECONNREFUSED && errno != ENOENT)
-			goto failed;
 		if (!start_server)
 			goto failed;
-		close(fd);
+		switch (errno) {
-
+		case ECONNREFUSED:
-		xasprintf(&lockfile, "%s.lock", path);
+			if (unlink(path) != 0)
-		if ((lockfd = client_get_lock(lockfile)) == -1)
+				goto failed;
-			goto retry;
+			/* FALLTHROUGH */
-		if (unlink(path) != 0 && errno != ENOENT)
+		case ENOENT:
-			return (-1);
+			if ((fd = server_start()) == -1)
-		fd = server_start(lockfd, lockfile);
+				goto failed;
-		free(lockfile);
+			break;
-		close(lockfd);
+		default:
+			goto failed;
+		}
 	}
 
 	setblocking(fd, 0);
@@ -134,31 +93,6 @@ failed:
 	return (-1);
 }
 
-/* Get exit string from reason number. */
-const char *
-client_exit_message(void)
-{
-	switch (client_exitreason) {
-	case CLIENT_EXIT_NONE:
-		break;
-	case CLIENT_EXIT_DETACHED:
-		return ("detached");
-	case CLIENT_EXIT_DETACHED_HUP:
-		return ("detached and SIGHUP");
-	case CLIENT_EXIT_LOST_TTY:
-		return ("lost tty");
-	case CLIENT_EXIT_TERMINATED:
-		return ("terminated");
-	case CLIENT_EXIT_LOST_SERVER:
-		return ("lost server");
-	case CLIENT_EXIT_EXITED:
-		return ("exited");
-	case CLIENT_EXIT_SERVER_EXITED:
-		return ("server exited");
-	}
-	return ("unknown reason");
-}
-
 /* Client main loop. */
 int
 client_main(int argc, char **argv, int flags)
@@ -170,7 +104,6 @@ client_main(int argc, char **argv, int flags)
 	pid_t			 ppid;
 	enum msgtype		 msg;
 	char			*cause;
-	struct termios		 tio, saved_tio;
 
 	/* Set up the initial command. */
 	cmdflags = 0;
@@ -188,9 +121,8 @@ client_main(int argc, char **argv, int flags)
 		 * later in server) but it is necessary to get the start server
 		 * flag.
 		 */
-		cmdlist = cmd_list_parse(argc, argv, NULL, 0, &cause);
+		if ((cmdlist = cmd_list_parse(argc, argv, &cause)) == NULL) {
-		if (cmdlist == NULL) {
+			log_warnx("%s", cause);
-			fprintf(stderr, "%s\n", cause);
 			return (1);
 		}
 		cmdflags &= ~CMD_STARTSERVER;
@@ -210,17 +142,16 @@ client_main(int argc, char **argv, int flags)
 	 * if the socket path matches $TMUX, this is probably the same server.
 	 */
 	if (shell_cmd == NULL && environ_path != NULL &&
-	    (cmdflags & CMD_CANTNEST) &&
+	    cmdflags & CMD_CANTNEST && strcmp(socket_path, environ_path) == 0) {
-	    strcmp(socket_path, environ_path) == 0) {
+		log_warnx("sessions should be nested with care. "
-		fprintf(stderr, "sessions should be nested with care, "
+		    "unset $TMUX to force.");
-		    "unset $TMUX to force\n");
 		return (1);
 	}
 
 	/* Initialise the client socket and start the server. */
 	fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER);
 	if (fd == -1) {
-		fprintf(stderr, "failed to connect to server\n");
+		log_warn("failed to connect to server");
 		return (1);
 	}
 
@@ -234,30 +165,6 @@ client_main(int argc, char **argv, int flags)
 	imsg_init(&client_ibuf, fd);
 	event_set(&client_event, fd, EV_READ, client_callback, shell_cmd);
 
-	/* Create stdin handler. */
-	setblocking(STDIN_FILENO, 0);
-	event_set(&client_stdin, STDIN_FILENO, EV_READ|EV_PERSIST,
-	    client_stdin_callback, NULL);
-	if (flags & IDENTIFY_TERMIOS) {
-		if (tcgetattr(STDIN_FILENO, &saved_tio) != 0) {
-			fprintf(stderr, "tcgetattr failed: %s\n",
-			    strerror(errno));
-			return (1);
-		}
-		cfmakeraw(&tio);
-		tio.c_iflag = ICRNL|IXANY;
-		tio.c_oflag = OPOST|ONLCR;
-#ifdef NOKERNINFO
-		tio.c_lflag = NOKERNINFO;
-#endif
-		tio.c_cflag = CREAD|CS8|HUPCL;
-		tio.c_cc[VMIN] = 1;
-		tio.c_cc[VTIME] = 0;
-		cfsetispeed(&tio, cfgetispeed(&saved_tio));
-		cfsetospeed(&tio, cfgetospeed(&saved_tio));
-		tcsetattr(STDIN_FILENO, TCSANOW, &tio);
-	}
-
 	/* Establish signal handlers. */
 	set_signals(client_signal);
 
@@ -270,13 +177,13 @@ client_main(int argc, char **argv, int flags)
 	if (msg == MSG_COMMAND) {
 		/* Fill in command line arguments. */
 		cmddata.pid = environ_pid;
-		cmddata.session_id = environ_session_id;
+		cmddata.idx = environ_idx;
 
 		/* Prepare command for server. */
 		cmddata.argc = argc;
 		if (cmd_pack_argv(
 		    argc, argv, cmddata.argv, sizeof cmddata.argv) != 0) {
-			fprintf(stderr, "command too long\n");
+			log_warnx("command too long");
 			return (1);
 		}
 
@@ -290,23 +197,13 @@ client_main(int argc, char **argv, int flags)
 
 	/* Print the exit message, if any, and exit. */
 	if (client_attached) {
-		if (client_exitreason != CLIENT_EXIT_NONE && !login_shell)
+		if (client_exitmsg != NULL && !login_shell)
-			printf("[%s]\n", client_exit_message());
+			printf("[%s]\n", client_exitmsg);
 
 		ppid = getppid();
 		if (client_exittype == MSG_DETACHKILL && ppid > 1)
 			kill(ppid, SIGHUP);
-	} else if (flags & IDENTIFY_TERMIOS) {
-		if (flags & IDENTIFY_CONTROL) {
-			if (client_exitreason != CLIENT_EXIT_NONE)
-			    printf("%%exit %s\n", client_exit_message());
-			else
-			    printf("%%exit\n");
-			printf("\033\\");
-		}
-		tcsetattr(STDOUT_FILENO, TCSAFLUSH, &saved_tio);
 	}
-	setblocking(STDIN_FILENO, 1);
 	return (client_exitval);
 }
 
@@ -332,7 +229,16 @@ client_send_identify(int flags)
 		fatal("dup failed");
 	imsg_compose(&client_ibuf,
 	    MSG_IDENTIFY, PROTOCOL_VERSION, -1, fd, &data, sizeof data);
-	client_update_event();
+
+	if ((fd = dup(STDOUT_FILENO)) == -1)
+		fatal("dup failed");
+	imsg_compose(&client_ibuf,
+	    MSG_STDOUT, PROTOCOL_VERSION, -1, fd, NULL, 0);
+
+	if ((fd = dup(STDERR_FILENO)) == -1)
+		fatal("dup failed");
+	imsg_compose(&client_ibuf,
+	    MSG_STDERR, PROTOCOL_VERSION, -1, fd, NULL, 0);
 }
 
 /* Forward entire environment to server. */
@@ -354,7 +260,6 @@ void
 client_write_server(enum msgtype type, void *buf, size_t len)
 {
 	imsg_compose(&client_ibuf, type, PROTOCOL_VERSION, -1, -1, buf, len);
-	client_update_event();
 }
 
 /* Update client event based on whether it needs to read or read and write. */
@@ -373,6 +278,7 @@ client_update_event(void)
 }
 
 /* Callback to handle signals in the client. */
+/* ARGSUSED */
 void
 client_signal(int sig, unused short events, unused void *data)
 {
@@ -391,12 +297,12 @@ client_signal(int sig, unused short events, unused void *data)
 	} else {
 		switch (sig) {
 		case SIGHUP:
-			client_exitreason = CLIENT_EXIT_LOST_TTY;
+			client_exitmsg = "lost tty";
 			client_exitval = 1;
 			client_write_server(MSG_EXITING, NULL, 0);
 			break;
 		case SIGTERM:
-			client_exitreason = CLIENT_EXIT_TERMINATED;
+			client_exitmsg = "terminated";
 			client_exitval = 1;
 			client_write_server(MSG_EXITING, NULL, 0);
 			break;
@@ -419,6 +325,7 @@ client_signal(int sig, unused short events, unused void *data)
 }
 
 /* Callback for client imsg read events. */
+/* ARGSUSED */
 void
 client_callback(unused int fd, short events, void *data)
 {
@@ -447,45 +354,11 @@ client_callback(unused int fd, short events, void *data)
 	return;
 
 lost_server:
-	client_exitreason = CLIENT_EXIT_LOST_SERVER;
+	client_exitmsg = "lost server";
 	client_exitval = 1;
 	event_loopexit(NULL);
 }
 
-/* Callback for client stdin read events. */
-void
-client_stdin_callback(unused int fd, unused short events, unused void *data1)
-{
-	struct msg_stdin_data	data;
-
-	data.size = read(STDIN_FILENO, data.data, sizeof data.data);
-	if (data.size < 0 && (errno == EINTR || errno == EAGAIN))
-		return;
-
-	client_write_server(MSG_STDIN, &data, sizeof data);
-	if (data.size <= 0)
-		event_del(&client_stdin);
-	client_update_event();
-}
-
-/* Force write to file descriptor. */
-void
-client_write(int fd, const char *data, size_t size)
-{
-	ssize_t	used;
-
-	while (size != 0) {
-		used = write(fd, data, size);
-		if (used == -1) {
-			if (errno == EINTR || errno == EAGAIN)
-				continue;
-			break;
-		}
-		data += used;
-		size -= used;
-	}
-}
-
 /* Dispatch imsgs when in wait state (before MSG_READY). */
 int
 client_dispatch_wait(void *data)
@@ -494,10 +367,11 @@ client_dispatch_wait(void *data)
 	ssize_t			n, datalen;
 	struct msg_shell_data	shelldata;
 	struct msg_exit_data	exitdata;
-	struct msg_stdout_data	stdoutdata;
-	struct msg_stderr_data	stderrdata;
 	const char             *shellcmd = data;
 
+	if ((n = imsg_read(&client_ibuf)) == -1 || n == 0)
+		fatalx("imsg_read failed");
+
 	for (;;) {
 		if ((n = imsg_get(&client_ibuf, &imsg)) == -1)
 			fatalx("imsg_get failed");
@@ -505,7 +379,6 @@ client_dispatch_wait(void *data)
 			return (0);
 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
 
-		log_debug("got %d from server", imsg.hdr.type);
 		switch (imsg.hdr.type) {
 		case MSG_EXIT:
 		case MSG_SHUTDOWN:
@@ -522,37 +395,14 @@ client_dispatch_wait(void *data)
 			if (datalen != 0)
 				fatalx("bad MSG_READY size");
 
-			event_del(&client_stdin);
 			client_attached = 1;
-			client_write_server(MSG_RESIZE, NULL, 0);
-			break;
-		case MSG_STDIN:
-			if (datalen != 0)
-				fatalx("bad MSG_STDIN size");
-
-			event_add(&client_stdin, NULL);
-			break;
-		case MSG_STDOUT:
-			if (datalen != sizeof stdoutdata)
-				fatalx("bad MSG_STDOUT");
-			memcpy(&stdoutdata, imsg.data, sizeof stdoutdata);
-
-			client_write(STDOUT_FILENO, stdoutdata.data, stdoutdata.size);
-			break;
-		case MSG_STDERR:
-			if (datalen != sizeof stderrdata)
-				fatalx("bad MSG_STDERR");
-			memcpy(&stderrdata, imsg.data, sizeof stderrdata);
-
-			client_write(STDERR_FILENO, stderrdata.data, stderrdata.size);
 			break;
 		case MSG_VERSION:
 			if (datalen != 0)
 				fatalx("bad MSG_VERSION size");
 
-			fprintf(stderr, "protocol version mismatch "
+			log_warnx("protocol version mismatch (client %u, "
-			    "(client %u, server %u)\n", PROTOCOL_VERSION,
+			    "server %u)", PROTOCOL_VERSION, imsg.hdr.peerid);
-			    imsg.hdr.peerid);
 			client_exitval = 1;
 
 			imsg_free(&imsg);
@@ -567,12 +417,6 @@ client_dispatch_wait(void *data)
 
 			shell_exec(shelldata.shell, shellcmd);
 			/* NOTREACHED */
-		case MSG_DETACH:
-			client_write_server(MSG_EXITING, NULL, 0);
-			break;
-		case MSG_EXITED:
-			imsg_free(&imsg);
-			return (-1);
 		default:
 			fatalx("unexpected message");
 		}
@@ -582,6 +426,7 @@ client_dispatch_wait(void *data)
 }
 
 /* Dispatch imsgs in attached state (after MSG_READY). */
+/* ARGSUSED */
 int
 client_dispatch_attached(void)
 {
@@ -597,7 +442,7 @@ client_dispatch_attached(void)
 			return (0);
 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
 
-		log_debug("got %d from server", imsg.hdr.type);
+		log_debug("client got %d", imsg.hdr.type);
 		switch (imsg.hdr.type) {
 		case MSG_DETACHKILL:
 		case MSG_DETACH:
@@ -606,9 +451,9 @@ client_dispatch_attached(void)
 
 			client_exittype = imsg.hdr.type;
 			if (imsg.hdr.type == MSG_DETACHKILL)
-				client_exitreason = CLIENT_EXIT_DETACHED_HUP;
+				client_exitmsg = "detached and SIGHUP";
 			else
-				client_exitreason = CLIENT_EXIT_DETACHED;
+				client_exitmsg = "detached";
 			client_write_server(MSG_EXITING, NULL, 0);
 			break;
 		case MSG_EXIT:
@@ -617,7 +462,7 @@ client_dispatch_attached(void)
 				fatalx("bad MSG_EXIT size");
 
 			client_write_server(MSG_EXITING, NULL, 0);
-			client_exitreason = CLIENT_EXIT_EXITED;
+			client_exitmsg = "exited";
 			break;
 		case MSG_EXITED:
 			if (datalen != 0)
@@ -630,7 +475,7 @@ client_dispatch_attached(void)
 				fatalx("bad MSG_SHUTDOWN size");
 
 			client_write_server(MSG_EXITING, NULL, 0);
-			client_exitreason = CLIENT_EXIT_SERVER_EXITED;
+			client_exitmsg = "server exited";
 			client_exitval = 1;
 			break;
 		case MSG_SUSPEND:

cmd-attach-session.c

@@ -18,15 +18,13 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
-
 #include "tmux.h"
 
 /*
  * Attach existing session to the current terminal.
  */
 
-enum cmd_retval	cmd_attach_session_exec(struct cmd *, struct cmd_q *);
+int	cmd_attach_session_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_attach_session_entry = {
 	"attach-session", "attach",
@@ -38,28 +36,29 @@ const struct cmd_entry cmd_attach_session_entry = {
 	cmd_attach_session_exec
 };
 
-enum cmd_retval
+int
-cmd_attach_session(struct cmd_q *cmdq, const char* tflag, int dflag, int rflag)
+cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
+	struct args	*args = self->args;
 	struct session	*s;
 	struct client	*c;
 	const char	*update;
-	char		*cause;
+	char		*overrides, *cause;
 	u_int		 i;
 
 	if (RB_EMPTY(&sessions)) {
-		cmdq_error(cmdq, "no sessions");
+		ctx->error(ctx, "no sessions");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL)
+	if ((s = cmd_find_session(ctx, args_get(args, 't'), 1)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
-	if (cmdq->client == NULL)
+	if (ctx->cmdclient == NULL && ctx->curclient == NULL)
-		return (CMD_RETURN_NORMAL);
+		return (0);
 
-	if (cmdq->client->session != NULL) {
+	if (ctx->cmdclient == NULL) {
-		if (dflag) {
+		if (args_has(self->args, 'd')) {
 			/*
 			 * Can't use server_write_session in case attaching to
 			 * the same session as currently attached to.
@@ -68,53 +67,48 @@ cmd_attach_session(struct cmd_q *cmdq, const char* tflag, int dflag, int rflag)
 				c = ARRAY_ITEM(&clients, i);
 				if (c == NULL || c->session != s)
 					continue;
-				if (c == cmdq->client)
+				if (c == ctx->curclient)
 					continue;
 				server_write_client(c, MSG_DETACH, NULL, 0);
 			}
 		}
 
-		cmdq->client->session = s;
+		ctx->curclient->session = s;
-		notify_attached_session_changed(cmdq->client);
 		session_update_activity(s);
-		server_redraw_client(cmdq->client);
+		server_redraw_client(ctx->curclient);
 		s->curw->flags &= ~WINLINK_ALERTFLAGS;
 	} else {
-		if (server_client_open(cmdq->client, s, &cause) != 0) {
+		if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
-			cmdq_error(cmdq, "open terminal failed: %s", cause);
+			ctx->error(ctx, "not a terminal");
-			free(cause);
+			return (-1);
-			return (CMD_RETURN_ERROR);
 		}
 
-		if (rflag)
+		overrides =
-			cmdq->client->flags |= CLIENT_READONLY;
+		    options_get_string(&s->options, "terminal-overrides");
+		if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
+			ctx->error(ctx, "terminal open failed: %s", cause);
+			xfree(cause);
+			return (-1);
+		}
 
-		if (dflag)
+		if (args_has(self->args, 'r'))
+			ctx->cmdclient->flags |= CLIENT_READONLY;
+
+		if (args_has(self->args, 'd'))
 			server_write_session(s, MSG_DETACH, NULL, 0);
 
-		update = options_get_string(&s->options, "update-environment");
+		ctx->cmdclient->session = s;
-		environ_update(update, &cmdq->client->environ, &s->environ);
-
-		cmdq->client->session = s;
-		notify_attached_session_changed(cmdq->client);
 		session_update_activity(s);
-		server_redraw_client(cmdq->client);
+		server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
-		s->curw->flags &= ~WINLINK_ALERTFLAGS;
 
-		server_write_ready(cmdq->client);
+		update = options_get_string(&s->options, "update-environment");
-		cmdq->client_exit = 0;
+		environ_update(update, &ctx->cmdclient->environ, &s->environ);
+
+		server_redraw_client(ctx->cmdclient);
+		s->curw->flags &= ~WINLINK_ALERTFLAGS;
 	}
 	recalculate_sizes();
 	server_update_socket();
 
-	return (CMD_RETURN_NORMAL);
+	return (1);	/* 1 means don't tell command client to exit */
-}
-
-enum cmd_retval
-cmd_attach_session_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args	*args = self->args;
-
-	return (cmd_attach_session(cmdq, args_get(args, 't'),
-	    args_has(args, 'd'), args_has(args, 'r')));
 }

cmd-bind-key.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -27,10 +26,10 @@
  * Bind a key to a command, this recurses through cmd_*.
  */
 
-enum cmd_retval	 cmd_bind_key_check(struct args *);
+int	cmd_bind_key_check(struct args *);
-enum cmd_retval	 cmd_bind_key_exec(struct cmd *, struct cmd_q *);
+int	cmd_bind_key_exec(struct cmd *, struct cmd_ctx *);
 
-enum cmd_retval	 cmd_bind_key_table(struct cmd *, struct cmd_q *, int);
+int	cmd_bind_key_table(struct cmd *, struct cmd_ctx *, int);
 
 const struct cmd_entry cmd_bind_key_entry = {
 	"bind-key", "bind",
@@ -42,21 +41,21 @@ const struct cmd_entry cmd_bind_key_entry = {
 	cmd_bind_key_exec
 };
 
-enum cmd_retval
+int
 cmd_bind_key_check(struct args *args)
 {
 	if (args_has(args, 't')) {
-		if (args->argc != 2 && args->argc != 3)
+		if (args->argc != 2)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 	} else {
 		if (args->argc < 2)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 	}
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
-enum cmd_retval
+int
-cmd_bind_key_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_bind_key_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	char		*cause;
@@ -65,72 +64,57 @@ cmd_bind_key_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	key = key_string_lookup_string(args->argv[0]);
 	if (key == KEYC_NONE) {
-		cmdq_error(cmdq, "unknown key: %s", args->argv[0]);
+		ctx->error(ctx, "unknown key: %s", args->argv[0]);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	if (args_has(args, 't'))
-		return (cmd_bind_key_table(self, cmdq, key));
+		return (cmd_bind_key_table(self, ctx, key));
 
-	cmdlist = cmd_list_parse(args->argc - 1, args->argv + 1, NULL, 0,
+	cmdlist = cmd_list_parse(args->argc - 1, args->argv + 1, &cause);
-	    &cause);
 	if (cmdlist == NULL) {
-		cmdq_error(cmdq, "%s", cause);
+		ctx->error(ctx, "%s", cause);
-		free(cause);
+		xfree(cause);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	if (!args_has(args, 'n'))
 	    key |= KEYC_PREFIX;
 	key_bindings_add(key, args_has(args, 'r'), cmdlist);
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
-enum cmd_retval
+int
-cmd_bind_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
+cmd_bind_key_table(struct cmd *self, struct cmd_ctx *ctx, int key)
 {
 	struct args			*args = self->args;
 	const char			*tablename;
 	const struct mode_key_table	*mtab;
 	struct mode_key_binding		*mbind, mtmp;
 	enum mode_key_cmd		 cmd;
-	const char			*arg;
 
 	tablename = args_get(args, 't');
 	if ((mtab = mode_key_findtable(tablename)) == NULL) {
-		cmdq_error(cmdq, "unknown key table: %s", tablename);
+		ctx->error(ctx, "unknown key table: %s", tablename);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	cmd = mode_key_fromstring(mtab->cmdstr, args->argv[1]);
 	if (cmd == MODEKEY_NONE) {
-		cmdq_error(cmdq, "unknown command: %s", args->argv[1]);
+		ctx->error(ctx, "unknown command: %s", args->argv[1]);
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	}
-
-	if (cmd != MODEKEYCOPY_COPYPIPE) {
-		if (args->argc != 2) {
-			cmdq_error(cmdq, "no argument allowed");
-			return (CMD_RETURN_ERROR);
-		}
-		arg = NULL;
-	} else {
-		if (args->argc != 3) {
-			cmdq_error(cmdq, "no argument given");
-			return (CMD_RETURN_ERROR);
-		}
-		arg = args->argv[2];
 	}
 
 	mtmp.key = key;
 	mtmp.mode = !!args_has(args, 'c');
-	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) == NULL) {
+	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) != NULL) {
-		mbind = xmalloc(sizeof *mbind);
+		mbind->cmd = cmd;
-		mbind->key = mtmp.key;
+		return (0);
-		mbind->mode = mtmp.mode;
-		RB_INSERT(mode_key_tree, mtab->tree, mbind);
 	}
+	mbind = xmalloc(sizeof *mbind);
+	mbind->key = mtmp.key;
+	mbind->mode = mtmp.mode;
 	mbind->cmd = cmd;
-	mbind->arg = arg != NULL ? xstrdup(arg) : NULL;
+	RB_INSERT(mode_key_tree, mtab->tree, mbind);
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-break-pane.c

@@ -26,45 +26,38 @@
  * Break pane off into a window.
  */
 
-enum cmd_retval	 cmd_break_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_break_pane_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_break_pane_entry = {
 	"break-pane", "breakp",
-	"dPF:t:", 0, 0,
+	"dt:", 0, 0,
-	"[-dP] [-F format] " CMD_TARGET_PANE_USAGE,
+	"[-d] " CMD_TARGET_PANE_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_break_pane_exec
 };
 
-enum cmd_retval
+int
-cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
 	struct session		*s;
 	struct window_pane	*wp;
 	struct window		*w;
-	char			*name;
 	char			*cause;
 	int			 base_idx;
-	struct client		*c;
-	struct format_tree	*ft;
-	const char		*template;
-	char			*cp;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
+	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	if (window_count_panes(wl->window) == 1) {
-		cmdq_error(cmdq, "can't break with only one pane");
+		ctx->error(ctx, "can't break with only one pane");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	w = wl->window;
-	server_unzoom_window(w);
-
 	TAILQ_REMOVE(&w->panes, wp, entry);
 	if (wp == w->active) {
 		w->active = w->last;
@@ -81,10 +74,8 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	w = wp->window = window_create1(s->sx, s->sy);
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 	w->active = wp;
-	name = default_window_name(w);
+	w->name = default_window_name(w);
-	window_set_name(w, name);
+	layout_init(w);
-	free(name);
-	layout_init(w, wp);
 
 	base_idx = options_get_number(&s->options, "base-index");
 	wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */
@@ -94,22 +85,5 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	server_redraw_session(s);
 	server_status_session_group(s);
 
-	if (args_has(args, 'P')) {
+	return (0);
-		if ((template = args_get(args, 'F')) == NULL)
-			template = BREAK_PANE_TEMPLATE;
-
-		ft = format_create();
-		if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL)
-			format_client(ft, c);
-		format_session(ft, s);
-		format_winlink(ft, s, wl);
-		format_window_pane(ft, wp);
-
-		cp = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", cp);
-		free(cp);
-
-		format_free(ft);
-	}
-	return (CMD_RETURN_NORMAL);
 }

cmd-capture-pane.c

@@ -24,96 +24,45 @@
 #include "tmux.h"
 
 /*
- * Write the entire contents of a pane to a buffer or stdout.
+ * Write the entire contents of a pane to a buffer.
  */
 
-enum cmd_retval	 cmd_capture_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_capture_pane_exec(struct cmd *, struct cmd_ctx *);
-
-char		*cmd_capture_pane_append(char *, size_t *, char *, size_t);
-char		*cmd_capture_pane_pending(struct args *, struct window_pane *,
-		     size_t *);
-char		*cmd_capture_pane_history(struct args *, struct cmd_q *,
-		     struct window_pane *, size_t *);
 
 const struct cmd_entry cmd_capture_pane_entry = {
 	"capture-pane", "capturep",
-	"ab:CeE:JpPqS:t:", 0, 0,
+	"b:E:S:t:", 0, 0,
-	"[-aCeJpPq] [-b buffer-index] [-E end-line] [-S start-line]"
+	"[-b buffer-index] [-E end-line] [-S start-line] [-t target-pane]",
-	CMD_TARGET_PANE_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_capture_pane_exec
 };
 
-char *
+int
-cmd_capture_pane_append(char *buf, size_t *len, char *line, size_t linelen)
+cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
-	buf = xrealloc(buf, 1, *len + linelen + 1);
-	memcpy(buf + *len, line, linelen);
-	*len += linelen;
-	return (buf);
-}
-
-char *
-cmd_capture_pane_pending(struct args *args, struct window_pane *wp,
-    size_t *len)
-{
-	char	*buf, *line, tmp[5];
-	size_t	 linelen;
-	u_int	 i;
-
-	if (wp->ictx.since_ground == NULL)
-		return (xstrdup(""));
-
-	line = EVBUFFER_DATA(wp->ictx.since_ground);
-	linelen = EVBUFFER_LENGTH(wp->ictx.since_ground);
-
-	buf = xstrdup("");
-	if (args_has(args, 'C')) {
-		for (i = 0; i < linelen; i++) {
-			if (line[i] >= ' ') {
-				tmp[0] = line[i];
-				tmp[1] = '\0';
-			} else
-				xsnprintf(tmp, sizeof tmp, "\\%03o", line[i]);
-			buf = cmd_capture_pane_append(buf, len, tmp,
-			    strlen(tmp));
-		}
-	} else
-		buf = cmd_capture_pane_append(buf, len, line, linelen);
-	return (buf);
-}
-
-char *
-cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
-    struct window_pane *wp, size_t *len)
 {
+	struct args		*args = self->args;
+	struct window_pane	*wp;
+	char 			*buf, *line, *cause;
+	struct screen		*s;
 	struct grid		*gd;
-	const struct grid_line	*gl;
+	int			 buffer, n;
-	struct grid_cell	*gc = NULL;
+	u_int			 i, limit, top, bottom, tmp;
-	int			 n, with_codes, escape_c0, join_lines;
+	size_t         		 len, linelen;
-	u_int			 i, sx, top, bottom, tmp;
-	char			*cause, *buf, *line;
-	size_t			 linelen;
 
-	sx = screen_size_x(&wp->base);
+	if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
-	if (args_has(args, 'a')) {
+		return (-1);
-		gd = wp->saved_grid;
+	s = &wp->base;
-		if (gd == NULL) {
+	gd = s->grid;
-			if (!args_has(args, 'q')) {
+
-				cmdq_error(cmdq, "no alternate screen");
+	buf = NULL;
-				return (NULL);
+	len = 0;
-			}
-			return (xstrdup(""));
-		}
-	} else
-		gd = wp->base.grid;
 
 	n = args_strtonum(args, 'S', INT_MIN, SHRT_MAX, &cause);
 	if (cause != NULL) {
 		top = gd->hsize;
-		free(cause);
+		xfree(cause);
 	} else if (n < 0 && (u_int) -n > gd->hsize)
 		top = 0;
 	else
@@ -124,7 +73,7 @@ cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
 	n = args_strtonum(args, 'E', INT_MIN, SHRT_MAX, &cause);
 	if (cause != NULL) {
 		bottom = gd->hsize + gd->sy - 1;
-		free(cause);
+		xfree(cause);
 	} else if (n < 0 && (u_int) -n > gd->hsize)
 		bottom = 0;
 	else
@@ -138,81 +87,38 @@ cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
 		top = tmp;
 	}
 
-	with_codes = args_has(args, 'e');
-	escape_c0 = args_has(args, 'C');
-	join_lines = args_has(args, 'J');
-
-	buf = NULL;
 	for (i = top; i <= bottom; i++) {
-		line = grid_string_cells(gd, 0, i, sx, &gc, with_codes,
+	       line = grid_string_cells(s->grid, 0, i, screen_size_x(s));
-		    escape_c0, !join_lines);
+	       linelen = strlen(line);
-		linelen = strlen(line);
 
-		buf = cmd_capture_pane_append(buf, len, line, linelen);
+	       buf = xrealloc(buf, 1, len + linelen + 1);
+	       memcpy(buf + len, line, linelen);
+	       len += linelen;
+	       buf[len++] = '\n';
 
-		gl = grid_peek_line(gd, i);
+	       xfree(line);
-		if (!join_lines || !(gl->flags & GRID_LINE_WRAPPED))
-			buf[(*len)++] = '\n';
-
-		free(line);
-	}
-	return (buf);
-}
-
-enum cmd_retval
-cmd_capture_pane_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args		*args = self->args;
-	struct client		*c;
-	struct window_pane	*wp;
-	char			*buf, *cause;
-	int			 buffer;
-	u_int			 limit;
-	size_t			 len;
-
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	len = 0;
-	if (args_has(args, 'P'))
-		buf = cmd_capture_pane_pending(args, wp, &len);
-	else
-		buf = cmd_capture_pane_history(args, cmdq, wp, &len);
-	if (buf == NULL)
-		return (CMD_RETURN_ERROR);
-
-	if (args_has(args, 'p')) {
-		c = cmdq->client;
-		if (c == NULL ||
-		    (c->session != NULL && !(c->flags & CLIENT_CONTROL))) {
-			cmdq_error(cmdq, "can't write to stdout");
-			return (CMD_RETURN_ERROR);
-		}
-		evbuffer_add(c->stdout_data, buf, len);
-		if (args_has(args, 'P') && len > 0)
-		    evbuffer_add(c->stdout_data, "\n", 1);
-		server_push_stdout(c);
-	} else {
-		limit = options_get_number(&global_options, "buffer-limit");
-		if (!args_has(args, 'b')) {
-			paste_add(&global_buffers, buf, len, limit);
-			return (CMD_RETURN_NORMAL);
-		}
-
-		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
-		if (cause != NULL) {
-			cmdq_error(cmdq, "buffer %s", cause);
-			free(buf);
-			free(cause);
-			return (CMD_RETURN_ERROR);
-		}
-
-		if (paste_replace(&global_buffers, buffer, buf, len) != 0) {
-			cmdq_error(cmdq, "no buffer %d", buffer);
-			free(buf);
-			return (CMD_RETURN_ERROR);
-		}
 	}
 
-	return (CMD_RETURN_NORMAL);
+	limit = options_get_number(&global_options, "buffer-limit");
+
+	if (!args_has(args, 'b')) {
+		paste_add(&global_buffers, buf, len, limit);
+		return (0);
+	}
+
+	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
+	if (cause != NULL) {
+		ctx->error(ctx, "buffer %s", cause);
+		xfree(buf);
+		xfree(cause);
+		return (-1);
+	}
+
+	if (paste_replace(&global_buffers, buffer, buf, len) != 0) {
+		ctx->error(ctx, "no buffer %d", buffer);
+		xfree(buf);
+		return (-1);
+	}
+
+	return (0);
 }

cmd-choose-buffer.c

@@ -19,7 +19,6 @@
 #include <sys/types.h>
 
 #include <ctype.h>
-#include <stdlib.h>
 
 #include "tmux.h"
 
@@ -27,70 +26,118 @@
  * Enter choice mode to choose a buffer.
  */
 
-enum cmd_retval	 cmd_choose_buffer_exec(struct cmd *, struct cmd_q *);
+int	cmd_choose_buffer_exec(struct cmd *, struct cmd_ctx *);
+
+void	cmd_choose_buffer_callback(void *, int);
+void	cmd_choose_buffer_free(void *);
 
 const struct cmd_entry cmd_choose_buffer_entry = {
 	"choose-buffer", NULL,
-	"F:t:", 0, 1,
+	"t:", 0, 1,
-	CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
+	CMD_TARGET_WINDOW_USAGE " [template]",
 	0,
 	NULL,
 	NULL,
 	cmd_choose_buffer_exec
 };
 
-enum cmd_retval
+struct cmd_choose_buffer_data {
-cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+	struct client   *client;
+	char            *template;
+};
+
+int
+cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args			*args = self->args;
-	struct client			*c;
+	struct cmd_choose_buffer_data	*cdata;
-	struct window_choose_data	*cdata;
 	struct winlink			*wl;
 	struct paste_buffer		*pb;
-	char				*action, *action_data;
-	const char			*template;
 	u_int				 idx;
+	char				*tmp;
 
-	if ((c = cmd_current_client(cmdq)) == NULL) {
+	if (ctx->curclient == NULL) {
-		cmdq_error(cmdq, "no client available");
+		ctx->error(ctx, "must be run interactively");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	if ((template = args_get(args, 'F')) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
-		template = CHOOSE_BUFFER_TEMPLATE;
+		return (-1);
-
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
 
 	if (paste_get_top(&global_buffers) == NULL)
-		return (CMD_RETURN_NORMAL);
+		return (0);
 
 	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
-		return (CMD_RETURN_NORMAL);
+		return (0);
-
-	if (args->argc != 0)
-		action = xstrdup(args->argv[0]);
-	else
-		action = xstrdup("paste-buffer -b '%%'");
 
 	idx = 0;
 	while ((pb = paste_walk_stack(&global_buffers, &idx)) != NULL) {
-		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
+		tmp = paste_print(pb, 50);
-		cdata->idx = idx - 1;
+		window_choose_add(wl->window->active, idx - 1,
-
+		    "%u: %zu bytes: \"%s\"", idx - 1, pb->size, tmp);
-		cdata->ft_template = xstrdup(template);
+		xfree(tmp);
-		format_add(cdata->ft, "line", "%u", idx - 1);
-		format_paste_buffer(cdata->ft, pb);
-
-		xasprintf(&action_data, "%u", idx - 1);
-		cdata->command = cmd_template_replace(action, action_data, 1);
-		free(action_data);
-
-		window_choose_add(wl->window->active, cdata);
 	}
-	free(action);
 
-	window_choose_ready(wl->window->active, 0, NULL);
+	cdata = xmalloc(sizeof *cdata);
+	if (args->argc != 0)
+		cdata->template = xstrdup(args->argv[0]);
+	else
+		cdata->template = xstrdup("paste-buffer -b '%%'");
+	cdata->client = ctx->curclient;
+	cdata->client->references++;
 
-	return (CMD_RETURN_NORMAL);
+	window_choose_ready(wl->window->active,
+	    0, cmd_choose_buffer_callback, cmd_choose_buffer_free, cdata);
+
+	return (0);
+}
+
+void
+cmd_choose_buffer_callback(void *data, int idx)
+{
+	struct cmd_choose_buffer_data	*cdata = data;
+	struct cmd_list			*cmdlist;
+	struct cmd_ctx			 ctx;
+	char				*template, *cause, tmp[16];
+
+	if (idx == -1)
+		return;
+	if (cdata->client->flags & CLIENT_DEAD)
+		return;
+
+	xsnprintf(tmp, sizeof tmp, "%u", idx);
+	template = cmd_template_replace(cdata->template, tmp, 1);
+
+	if (cmd_string_parse(template, &cmdlist, &cause) != 0) {
+		if (cause != NULL) {
+			*cause = toupper((u_char) *cause);
+			status_message_set(cdata->client, "%s", cause);
+			xfree(cause);
+		}
+		xfree(template);
+		return;
+	}
+	xfree(template);
+
+	ctx.msgdata = NULL;
+	ctx.curclient = cdata->client;
+
+	ctx.error = key_bindings_error;
+	ctx.print = key_bindings_print;
+	ctx.info = key_bindings_info;
+
+	ctx.cmdclient = NULL;
+
+	cmd_list_exec(cmdlist, &ctx);
+	cmd_list_free(cmdlist);
+}
+
+void
+cmd_choose_buffer_free(void *data)
+{
+	struct cmd_choose_buffer_data	*cdata = data;
+
+	cdata->client->references--;
+	xfree(cdata->template);
+	xfree(cdata);
 }

cmd-choose-client.c

@@ -19,7 +19,6 @@
 #include <sys/types.h>
 
 #include <ctype.h>
-#include <stdlib.h>
 
 #include "tmux.h"
 
@@ -27,14 +26,15 @@
  * Enter choice mode to choose a client.
  */
 
-enum cmd_retval	 cmd_choose_client_exec(struct cmd *, struct cmd_q *);
+int	cmd_choose_client_exec(struct cmd *, struct cmd_ctx *);
 
-void	cmd_choose_client_callback(struct window_choose_data *);
+void	cmd_choose_client_callback(void *, int);
+void	cmd_choose_client_free(void *);
 
 const struct cmd_entry cmd_choose_client_entry = {
 	"choose-client", NULL,
-	"F:t:", 0, 1,
+	"t:", 0, 1,
-	CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
+	CMD_TARGET_WINDOW_USAGE " [template]",
 	0,
 	NULL,
 	NULL,
@@ -43,83 +43,111 @@ const struct cmd_entry cmd_choose_client_entry = {
 
 struct cmd_choose_client_data {
 	struct client	*client;
+	char   		*template;
 };
 
-enum cmd_retval
+int
-cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_choose_client_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args			*args = self->args;
-	struct client			*c;
+	struct cmd_choose_client_data	*cdata;
-	struct client			*c1;
-	struct window_choose_data	*cdata;
 	struct winlink			*wl;
-	const char			*template;
+	struct client			*c;
-	char				*action;
 	u_int			 	 i, idx, cur;
 
-	if ((c = cmd_current_client(cmdq)) == NULL) {
+	if (ctx->curclient == NULL) {
-		cmdq_error(cmdq, "no client available");
+		ctx->error(ctx, "must be run interactively");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
-		return (CMD_RETURN_NORMAL);
+		return (0);
-
-	if ((template = args_get(args, 'F')) == NULL)
-		template = CHOOSE_CLIENT_TEMPLATE;
-
-	if (args->argc != 0)
-		action = xstrdup(args->argv[0]);
-	else
-		action = xstrdup("detach-client -t '%%'");
 
 	cur = idx = 0;
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c1 = ARRAY_ITEM(&clients, i);
+		c = ARRAY_ITEM(&clients, i);
-		if (c1 == NULL || c1->session == NULL || c1->tty.path == NULL)
+		if (c == NULL || c->session == NULL)
 			continue;
-		if (c1 == cmdq->client)
+		if (c == ctx->curclient)
 			cur = idx;
 		idx++;
 
-		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
+		window_choose_add(wl->window->active, i,
-		cdata->idx = i;
+		    "%s: %s [%ux%u %s]%s%s", c->tty.path,
-
+		    c->session->name, c->tty.sx, c->tty.sy,
-		cdata->ft_template = xstrdup(template);
+		    c->tty.termname,
-		format_add(cdata->ft, "line", "%u", i);
+		    c->tty.flags & TTY_UTF8 ? " (utf8)" : "",
-		format_session(cdata->ft, c1->session);
+		    c->flags & CLIENT_READONLY ? " (ro)" : "");
-		format_client(cdata->ft, c1);
-
-		cdata->command = cmd_template_replace(action, c1->tty.path, 1);
-
-		window_choose_add(wl->window->active, cdata);
 	}
-	free(action);
 
-	window_choose_ready(wl->window->active, cur,
+	cdata = xmalloc(sizeof *cdata);
-	    cmd_choose_client_callback);
+	if (args->argc != 0)
+		cdata->template = xstrdup(args->argv[0]);
+	else
+		cdata->template = xstrdup("detach-client -t '%%'");
+	cdata->client = ctx->curclient;
+	cdata->client->references++;
 
-	return (CMD_RETURN_NORMAL);
+	window_choose_ready(wl->window->active,
+	    cur, cmd_choose_client_callback, cmd_choose_client_free, cdata);
+
+	return (0);
 }
 
 void
-cmd_choose_client_callback(struct window_choose_data *cdata)
+cmd_choose_client_callback(void *data, int idx)
 {
-	struct client  	*c;
+	struct cmd_choose_client_data	*cdata = data;
+	struct client  			*c;
+	struct cmd_list			*cmdlist;
+	struct cmd_ctx			 ctx;
+	char				*template, *cause;
 
-	if (cdata == NULL)
+	if (idx == -1)
 		return;
-	if (cdata->start_client->flags & CLIENT_DEAD)
+	if (cdata->client->flags & CLIENT_DEAD)
 		return;
 
-	if (cdata->idx > ARRAY_LENGTH(&clients) - 1)
+	if ((u_int) idx > ARRAY_LENGTH(&clients) - 1)
 		return;
-	c = ARRAY_ITEM(&clients, cdata->idx);
+	c = ARRAY_ITEM(&clients, idx);
 	if (c == NULL || c->session == NULL)
 		return;
+	template = cmd_template_replace(cdata->template, c->tty.path, 1);
 
-	window_choose_data_run(cdata);
+	if (cmd_string_parse(template, &cmdlist, &cause) != 0) {
+		if (cause != NULL) {
+			*cause = toupper((u_char) *cause);
+			status_message_set(c, "%s", cause);
+			xfree(cause);
+		}
+		xfree(template);
+		return;
+	}
+	xfree(template);
+
+	ctx.msgdata = NULL;
+	ctx.curclient = cdata->client;
+
+	ctx.error = key_bindings_error;
+	ctx.print = key_bindings_print;
+	ctx.info = key_bindings_info;
+
+	ctx.cmdclient = NULL;
+
+	cmd_list_exec(cmdlist, &ctx);
+	cmd_list_free(cmdlist);
+}
+
+void
+cmd_choose_client_free(void *data)
+{
+	struct cmd_choose_client_data	*cdata = data;
+
+	cdata->client->references--;
+	xfree(cdata->template);
+	xfree(cdata);
 }

cmd-choose-list.c

@@ -1,98 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2012 Thomas Adam <thomas@xteddy.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-
-#include <string.h>
-
-#include "tmux.h"
-
-#define CMD_CHOOSE_LIST_DEFAULT_TEMPLATE "run-shell '%%'"
-
-/*
- * Enter choose mode to choose a custom list.
- */
-
-enum cmd_retval cmd_choose_list_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_choose_list_entry = {
-	"choose-list", NULL,
-	"l:t:", 0, 1,
-	"[-l items] " CMD_TARGET_WINDOW_USAGE "[template]",
-	0,
-	NULL,
-	NULL,
-	cmd_choose_list_exec
-};
-
-enum cmd_retval
-cmd_choose_list_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args			*args = self->args;
-	struct client			*c;
-	struct winlink			*wl;
-	const char			*list1;
-	char				*template, *item, *copy, *list;
-	u_int				 idx;
-
-	if ((c = cmd_current_client(cmdq)) == NULL) {
-		cmdq_error(cmdq, "no client available");
-		return (CMD_RETURN_ERROR);
-	}
-
-	if ((list1 = args_get(args, 'l')) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
-		return (CMD_RETURN_NORMAL);
-
-	if (args->argc != 0)
-		template = xstrdup(args->argv[0]);
-	else
-		template = xstrdup(CMD_CHOOSE_LIST_DEFAULT_TEMPLATE);
-
-	copy = list = xstrdup(list1);
-	idx = 0;
-	while ((item = strsep(&list, ",")) != NULL)
-	{
-		if (*item == '\0') /* no empty entries */
-			continue;
-		window_choose_add_item(wl->window->active, c, wl, item,
-		    template, idx);
-		idx++;
-	}
-	free(copy);
-
-	if (idx == 0) {
-		free(template);
-		window_pane_reset_mode(wl->window->active);
-		return (CMD_RETURN_ERROR);
-	}
-
-	window_choose_ready(wl->window->active, 0, NULL);
-
-	free(template);
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-choose-session.c

@@ -0,0 +1,156 @@
+/* $Id$ */
+
+/*
+ * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <ctype.h>
+
+#include "tmux.h"
+
+/*
+ * Enter choice mode to choose a session.
+ */
+
+int	cmd_choose_session_exec(struct cmd *, struct cmd_ctx *);
+
+void	cmd_choose_session_callback(void *, int);
+void	cmd_choose_session_free(void *);
+
+const struct cmd_entry cmd_choose_session_entry = {
+	"choose-session", NULL,
+	"t:", 0, 1,
+	CMD_TARGET_WINDOW_USAGE " [template]",
+	0,
+	NULL,
+	NULL,
+	cmd_choose_session_exec
+};
+
+struct cmd_choose_session_data {
+	struct client	*client;
+	char   		*template;
+};
+
+int
+cmd_choose_session_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct args			*args = self->args;
+	struct cmd_choose_session_data	*cdata;
+	struct winlink			*wl;
+	struct session			*s;
+	struct session_group		*sg;
+	u_int			 	 idx, sgidx, cur;
+	char				 tmp[64];
+
+	if (ctx->curclient == NULL) {
+		ctx->error(ctx, "must be run interactively");
+		return (-1);
+	}
+
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
+		return (-1);
+
+	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
+		return (0);
+
+	cur = idx = 0;
+	RB_FOREACH(s, sessions, &sessions) {
+		if (s == ctx->curclient->session)
+			cur = idx;
+		idx++;
+
+		sg = session_group_find(s);
+		if (sg == NULL)
+			*tmp = '\0';
+		else {
+			sgidx = session_group_index(sg);
+			xsnprintf(tmp, sizeof tmp, " (group %u)", sgidx);
+		}
+
+		window_choose_add(wl->window->active, s->idx,
+		    "%s: %u windows [%ux%u]%s%s", s->name,
+		    winlink_count(&s->windows), s->sx, s->sy,
+		    tmp, s->flags & SESSION_UNATTACHED ? "" : " (attached)");
+	}
+
+	cdata = xmalloc(sizeof *cdata);
+	if (args->argc != 0)
+		cdata->template = xstrdup(args->argv[0]);
+	else
+		cdata->template = xstrdup("switch-client -t '%%'");
+	cdata->client = ctx->curclient;
+	cdata->client->references++;
+
+	window_choose_ready(wl->window->active,
+	    cur, cmd_choose_session_callback, cmd_choose_session_free, cdata);
+
+	return (0);
+}
+
+void
+cmd_choose_session_callback(void *data, int idx)
+{
+	struct cmd_choose_session_data	*cdata = data;
+	struct session			*s;
+	struct cmd_list			*cmdlist;
+	struct cmd_ctx			 ctx;
+	char				*template, *cause;
+
+	if (idx == -1)
+		return;
+	if (cdata->client->flags & CLIENT_DEAD)
+		return;
+
+	s = session_find_by_index(idx);
+	if (s == NULL)
+		return;
+	template = cmd_template_replace(cdata->template, s->name, 1);
+
+	if (cmd_string_parse(template, &cmdlist, &cause) != 0) {
+		if (cause != NULL) {
+			*cause = toupper((u_char) *cause);
+			status_message_set(cdata->client, "%s", cause);
+			xfree(cause);
+		}
+		xfree(template);
+		return;
+	}
+	xfree(template);
+
+	ctx.msgdata = NULL;
+	ctx.curclient = cdata->client;
+
+	ctx.error = key_bindings_error;
+	ctx.print = key_bindings_print;
+	ctx.info = key_bindings_info;
+
+	ctx.cmdclient = NULL;
+
+	cmd_list_exec(cmdlist, &ctx);
+	cmd_list_free(cmdlist);
+}
+
+void
+cmd_choose_session_free(void *data)
+{
+	struct cmd_choose_session_data	*cdata = data;
+
+	cdata->client->references--;
+	xfree(cdata->template);
+	xfree(cdata);
+}

cmd-choose-tree.c

@@ -1,239 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2012 Thomas Adam <thomas@xteddy.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-
-#include <string.h>
-
-#include "tmux.h"
-
-#define CMD_CHOOSE_TREE_WINDOW_ACTION "select-window -t '%%'"
-#define CMD_CHOOSE_TREE_SESSION_ACTION "switch-client -t '%%'"
-
-/*
- * Enter choice mode to choose a session and/or window.
- */
-
-enum cmd_retval	cmd_choose_tree_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_choose_tree_entry = {
-	"choose-tree", NULL,
-	"S:W:swub:c:t:", 0, 1,
-	"[-suw] [-b session-template] [-c window template] [-S format] " \
-	"[-W format] " CMD_TARGET_WINDOW_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_choose_tree_exec
-};
-
-const struct cmd_entry cmd_choose_session_entry = {
-	"choose-session", NULL,
-	"F:t:", 0, 1,
-	CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
-	0,
-	NULL,
-	NULL,
-	cmd_choose_tree_exec
-};
-
-const struct cmd_entry cmd_choose_window_entry = {
-	"choose-window", NULL,
-	"F:t:", 0, 1,
-	CMD_TARGET_WINDOW_USAGE "[-F format] [template]",
-	0,
-	NULL,
-	NULL,
-	cmd_choose_tree_exec
-};
-
-enum cmd_retval
-cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args			*args = self->args;
-	struct winlink			*wl, *wm;
-	struct session			*s, *s2;
-	struct client			*c;
-	struct window_choose_data	*wcd = NULL;
-	const char			*ses_template, *win_template;
-	char				*final_win_action, *cur_win_template;
-	char				*final_win_template_middle;
-	char				*final_win_template_last;
-	const char			*ses_action, *win_action;
-	u_int				 cur_win, idx_ses, win_ses, win_max;
-	u_int				 wflag, sflag;
-
-	ses_template = win_template = NULL;
-	ses_action = win_action = NULL;
-
-	if ((c = cmd_current_client(cmdq)) == NULL) {
-		cmdq_error(cmdq, "no client available");
-		return (CMD_RETURN_ERROR);
-	}
-
-	if ((s = c->session) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
-		return (CMD_RETURN_NORMAL);
-
-	/* Sort out which command this is. */
-	wflag = sflag = 0;
-	if (self->entry == &cmd_choose_session_entry) {
-		sflag = 1;
-		if ((ses_template = args_get(args, 'F')) == NULL)
-			ses_template = CHOOSE_TREE_SESSION_TEMPLATE;
-
-		if (args->argc != 0)
-			ses_action = args->argv[0];
-		else
-			ses_action = CMD_CHOOSE_TREE_SESSION_ACTION;
-	} else if (self->entry == &cmd_choose_window_entry) {
-		wflag = 1;
-		if ((win_template = args_get(args, 'F')) == NULL)
-			win_template = CHOOSE_TREE_WINDOW_TEMPLATE;
-
-		if (args->argc != 0)
-			win_action = args->argv[0];
-		else
-			win_action = CMD_CHOOSE_TREE_WINDOW_ACTION;
-	} else {
-		wflag = args_has(args, 'w');
-		sflag = args_has(args, 's');
-
-		if ((ses_action = args_get(args, 'b')) == NULL)
-			ses_action = CMD_CHOOSE_TREE_SESSION_ACTION;
-
-		if ((win_action = args_get(args, 'c')) == NULL)
-			win_action = CMD_CHOOSE_TREE_WINDOW_ACTION;
-
-		if ((ses_template = args_get(args, 'S')) == NULL)
-			ses_template = CHOOSE_TREE_SESSION_TEMPLATE;
-
-		if ((win_template = args_get(args, 'W')) == NULL)
-			win_template = CHOOSE_TREE_WINDOW_TEMPLATE;
-	}
-
-	/*
-	 * If not asking for windows and sessions, assume no "-ws" given and
-	 * hence display the entire tree outright.
-	 */
-	if (!wflag && !sflag)
-		wflag = sflag = 1;
-
-	/*
-	 * If we're drawing in tree mode, including sessions, then pad the
-	 * window template, otherwise just render the windows as a flat list
-	 * without any padding.
-	 */
-	if (wflag && sflag) {
-		xasprintf(&final_win_template_middle,
-		    " \001tq\001> %s", win_template);
-		xasprintf(&final_win_template_last,
-		    " \001mq\001> %s", win_template);
-	} else if (wflag) {
-		final_win_template_middle = xstrdup(win_template);
-		final_win_template_last = xstrdup(win_template);
-	} else
-		final_win_template_middle = final_win_template_last = NULL;
-
-	idx_ses = cur_win = -1;
-	RB_FOREACH(s2, sessions, &sessions) {
-		idx_ses++;
-
-		/*
-		 * If we're just choosing windows, jump straight there. Note
-		 * that this implies the current session, so only choose
-		 * windows when the session matches this one.
-		 */
-		if (wflag && !sflag) {
-			if (s != s2)
-				continue;
-			goto windows_only;
-		}
-
-		wcd = window_choose_add_session(wl->window->active,
-		    c, s2, ses_template, ses_action, idx_ses);
-
-		/* If we're just choosing sessions, skip choosing windows. */
-		if (sflag && !wflag) {
-			if (s == s2)
-				cur_win = idx_ses;
-			continue;
-		}
-windows_only:
-		win_ses = win_max = -1;
-		RB_FOREACH(wm, winlinks, &s2->windows)
-			win_max++;
-		RB_FOREACH(wm, winlinks, &s2->windows) {
-			win_ses++;
-			if (sflag && wflag)
-				idx_ses++;
-
-			if (wm == s2->curw && s == s2) {
-				if (wflag && !sflag) {
-					/*
-					 * Then we're only counting windows.
-					 * So remember which is the current
-					 * window in the list.
-					 */
-					cur_win = win_ses;
-				} else
-					cur_win = idx_ses;
-			}
-
-			xasprintf(&final_win_action, "%s %s %s",
-			    wcd != NULL ? wcd->command : "",
-			    wcd != NULL ? ";" : "", win_action);
-
-			if (win_ses != win_max)
-				cur_win_template = final_win_template_middle;
-			else
-				cur_win_template = final_win_template_last;
-
-			window_choose_add_window(wl->window->active,
-			    c, s2, wm, cur_win_template,
-			    final_win_action,
-			    (wflag && !sflag) ? win_ses : idx_ses);
-
-			free(final_win_action);
-		}
-
-		/*
-		 * If we're just drawing windows, don't consider moving on to
-		 * other sessions as we only list windows in this session.
-		 */
-		if (wflag && !sflag)
-			break;
-	}
-	free(final_win_template_middle);
-	free(final_win_template_last);
-
-	window_choose_ready(wl->window->active, cur_win, NULL);
-
-	if (args_has(args, 'u'))
-		window_choose_expand_all(wl->window->active);
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-choose-window.c

@@ -0,0 +1,169 @@
+/* $Id$ */
+
+/*
+ * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <ctype.h>
+
+#include "tmux.h"
+
+/*
+ * Enter choice mode to choose a window.
+ */
+
+int	cmd_choose_window_exec(struct cmd *, struct cmd_ctx *);
+
+void	cmd_choose_window_callback(void *, int);
+void	cmd_choose_window_free(void *);
+
+const struct cmd_entry cmd_choose_window_entry = {
+	"choose-window", NULL,
+	"t:", 0, 1,
+	CMD_TARGET_WINDOW_USAGE " [template]",
+	0,
+	NULL,
+	NULL,
+	cmd_choose_window_exec
+};
+
+struct cmd_choose_window_data {
+	struct client	*client;
+	struct session	*session;
+	char   		*template;
+};
+
+int
+cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct args			*args = self->args;
+	struct cmd_choose_window_data	*cdata;
+	struct session			*s;
+	struct winlink			*wl, *wm;
+	struct window			*w;
+	u_int			 	 idx, cur;
+	char				*flags, *title;
+	const char			*left, *right;
+
+	if (ctx->curclient == NULL) {
+		ctx->error(ctx, "must be run interactively");
+		return (-1);
+	}
+	s = ctx->curclient->session;
+
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
+		return (-1);
+
+	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
+		return (0);
+
+	cur = idx = 0;
+	RB_FOREACH(wm, winlinks, &s->windows) {
+		w = wm->window;
+
+		if (wm == s->curw)
+			cur = idx;
+		idx++;
+
+		flags = window_printable_flags(s, wm);
+		title = w->active->screen->title;
+		if (wm == wl)
+			title = w->active->base.title;
+		left = " \"";
+		right = "\"";
+		if (*title == '\0')
+			left = right = "";
+
+		window_choose_add(wl->window->active,
+		    wm->idx, "%3d: %s%s [%ux%u] (%u panes%s)%s%s%s",
+		    wm->idx, w->name, flags, w->sx, w->sy, window_count_panes(w),
+		    w->active->fd == -1 ? ", dead" : "",
+		    left, title, right);
+
+		xfree(flags);
+	}
+
+	cdata = xmalloc(sizeof *cdata);
+	if (args->argc != 0)
+		cdata->template = xstrdup(args->argv[0]);
+	else
+		cdata->template = xstrdup("select-window -t '%%'");
+	cdata->session = s;
+	cdata->session->references++;
+	cdata->client = ctx->curclient;
+	cdata->client->references++;
+
+	window_choose_ready(wl->window->active,
+	    cur, cmd_choose_window_callback, cmd_choose_window_free, cdata);
+
+	return (0);
+}
+
+void
+cmd_choose_window_callback(void *data, int idx)
+{
+	struct cmd_choose_window_data	*cdata = data;
+	struct session			*s = cdata->session;
+	struct cmd_list			*cmdlist;
+	struct cmd_ctx			 ctx;
+	char				*target, *template, *cause;
+
+	if (idx == -1)
+		return;
+	if (!session_alive(s))
+		return;
+	if (cdata->client->flags & CLIENT_DEAD)
+		return;
+
+	xasprintf(&target, "%s:%d", s->name, idx);
+	template = cmd_template_replace(cdata->template, target, 1);
+	xfree(target);
+
+	if (cmd_string_parse(template, &cmdlist, &cause) != 0) {
+		if (cause != NULL) {
+			*cause = toupper((u_char) *cause);
+			status_message_set(cdata->client, "%s", cause);
+			xfree(cause);
+		}
+		xfree(template);
+		return;
+	}
+	xfree(template);
+
+	ctx.msgdata = NULL;
+	ctx.curclient = cdata->client;
+
+	ctx.error = key_bindings_error;
+	ctx.print = key_bindings_print;
+	ctx.info = key_bindings_info;
+
+	ctx.cmdclient = NULL;
+
+	cmd_list_exec(cmdlist, &ctx);
+	cmd_list_free(cmdlist);
+}
+
+void
+cmd_choose_window_free(void *data)
+{
+	struct cmd_choose_window_data	*cdata = data;
+
+	cdata->session->references--;
+	cdata->client->references--;
+	xfree(cdata->template);
+	xfree(cdata);
+}

cmd-clear-history.c

@@ -24,7 +24,7 @@
  * Clear pane history.
  */
 
-enum cmd_retval	 cmd_clear_history_exec(struct cmd *, struct cmd_q *);
+int	cmd_clear_history_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_clear_history_entry = {
 	"clear-history", "clearhist",
@@ -36,19 +36,19 @@ const struct cmd_entry cmd_clear_history_entry = {
 	cmd_clear_history_exec
 };
 
-enum cmd_retval
+int
-cmd_clear_history_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_clear_history_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct window_pane	*wp;
 	struct grid		*gd;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
+	if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	gd = wp->base.grid;
 
 	grid_move_lines(gd, 0, gd->hsize, gd->sy);
 	gd->hsize = 0;
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-clock-mode.c

@@ -24,7 +24,7 @@
  * Enter clock mode.
  */
 
-enum cmd_retval	 cmd_clock_mode_exec(struct cmd *, struct cmd_q *);
+int	cmd_clock_mode_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_clock_mode_entry = {
 	"clock-mode", NULL,
@@ -36,16 +36,16 @@ const struct cmd_entry cmd_clock_mode_entry = {
 	cmd_clock_mode_exec
 };
 
-enum cmd_retval
+int
-cmd_clock_mode_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_clock_mode_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct window_pane	*wp;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
+	if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	window_pane_set_mode(wp, &window_clock_mode);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-command-prompt.c

@@ -19,7 +19,6 @@
 #include <sys/types.h>
 
 #include <ctype.h>
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -31,7 +30,7 @@
 
 void	cmd_command_prompt_key_binding(struct cmd *, int);
 int	cmd_command_prompt_check(struct args *);
-enum cmd_retval	cmd_command_prompt_exec(struct cmd *, struct cmd_q *);
+int	cmd_command_prompt_exec(struct cmd *, struct cmd_ctx *);
 
 int	cmd_command_prompt_callback(void *, const char *);
 void	cmd_command_prompt_free(void *);
@@ -84,8 +83,8 @@ cmd_command_prompt_key_binding(struct cmd *self, int key)
 	}
 }
 
-enum cmd_retval
+int
-cmd_command_prompt_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_command_prompt_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args			*args = self->args;
 	const char			*inputs, *prompts;
@@ -94,11 +93,11 @@ cmd_command_prompt_exec(struct cmd *self, struct cmd_q *cmdq)
 	char				*prompt, *ptr, *input = NULL;
 	size_t				 n;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	if (c->prompt_string != NULL)
-		return (CMD_RETURN_NORMAL);
+		return (0);
 
 	cdata = xmalloc(sizeof *cdata);
 	cdata->c = c;
@@ -139,9 +138,9 @@ cmd_command_prompt_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	status_prompt_set(c, prompt, input, cmd_command_prompt_callback,
 	    cmd_command_prompt_free, cdata, 0);
-	free(prompt);
+	xfree(prompt);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
 int
@@ -150,6 +149,7 @@ cmd_command_prompt_callback(void *data, const char *s)
 	struct cmd_command_prompt_cdata	*cdata = data;
 	struct client			*c = cdata->c;
 	struct cmd_list			*cmdlist;
+	struct cmd_ctx			 ctx;
 	char				*cause, *new_template, *prompt, *ptr;
 	char				*input = NULL;
 
@@ -157,7 +157,7 @@ cmd_command_prompt_callback(void *data, const char *s)
 		return (0);
 
 	new_template = cmd_template_replace(cdata->template, s, cdata->idx);
-	free(cdata->template);
+	xfree(cdata->template);
 	cdata->template = new_template;
 
 	/*
@@ -169,21 +169,30 @@ cmd_command_prompt_callback(void *data, const char *s)
 		input = strsep(&cdata->next_input, ",");
 		status_prompt_update(c, prompt, input);
 
-		free(prompt);
+		xfree(prompt);
 		cdata->idx++;
 		return (1);
 	}
 
-	if (cmd_string_parse(new_template, &cmdlist, NULL, 0, &cause) != 0) {
+	if (cmd_string_parse(new_template, &cmdlist, &cause) != 0) {
 		if (cause != NULL) {
 			*cause = toupper((u_char) *cause);
 			status_message_set(c, "%s", cause);
-			free(cause);
+			xfree(cause);
 		}
 		return (0);
 	}
 
-	cmdq_run(c->cmdq, cmdlist);
+	ctx.msgdata = NULL;
+	ctx.curclient = c;
+
+	ctx.error = key_bindings_error;
+	ctx.print = key_bindings_print;
+	ctx.info = key_bindings_info;
+
+	ctx.cmdclient = NULL;
+
+	cmd_list_exec(cmdlist, &ctx);
 	cmd_list_free(cmdlist);
 
 	if (c->prompt_callbackfn != (void *) &cmd_command_prompt_callback)
@@ -196,8 +205,11 @@ cmd_command_prompt_free(void *data)
 {
 	struct cmd_command_prompt_cdata	*cdata = data;
 
-	free(cdata->inputs);
+	if (cdata->inputs != NULL)
-	free(cdata->prompts);
+		xfree(cdata->inputs);
-	free(cdata->template);
+	if (cdata->prompts != NULL)
-	free(cdata);
+		xfree(cdata->prompts);
+	if (cdata->template != NULL)
+		xfree(cdata->template);
+	xfree(cdata);
 }

cmd-confirm-before.c

@@ -17,7 +17,6 @@
  */
 
 #include <ctype.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -26,11 +25,11 @@
  * Asks for confirmation before executing a command.
  */
 
-void		 cmd_confirm_before_key_binding(struct cmd *, int);
+void	cmd_confirm_before_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_confirm_before_exec(struct cmd *, struct cmd_q *);
+int	cmd_confirm_before_exec(struct cmd *, struct cmd_ctx *);
 
-int		 cmd_confirm_before_callback(void *, const char *);
+int	cmd_confirm_before_callback(void *, const char *);
-void		 cmd_confirm_before_free(void *);
+void	cmd_confirm_before_free(void *);
 
 const struct cmd_entry cmd_confirm_before_entry = {
 	"confirm-before", "confirm",
@@ -43,8 +42,8 @@ const struct cmd_entry cmd_confirm_before_entry = {
 };
 
 struct cmd_confirm_before_data {
+	struct client	*c;
 	char		*cmd;
-	struct client	*client;
 };
 
 void
@@ -65,8 +64,8 @@ cmd_confirm_before_key_binding(struct cmd *self, int key)
 	}
 }
 
-enum cmd_retval
+int
-cmd_confirm_before_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_confirm_before_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args			*args = self->args;
 	struct cmd_confirm_before_data	*cdata;
@@ -74,8 +73,13 @@ cmd_confirm_before_exec(struct cmd *self, struct cmd_q *cmdq)
 	char				*cmd, *copy, *new_prompt, *ptr;
 	const char			*prompt;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	if (ctx->curclient == NULL) {
-		return (CMD_RETURN_ERROR);
+		ctx->error(ctx, "must be run interactively");
+		return (-1);
+	}
+
+	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
+		return (-1);
 
 	if ((prompt = args_get(args, 'p')) != NULL)
 		xasprintf(&new_prompt, "%s ", prompt);
@@ -83,48 +87,53 @@ cmd_confirm_before_exec(struct cmd *self, struct cmd_q *cmdq)
 		ptr = copy = xstrdup(args->argv[0]);
 		cmd = strsep(&ptr, " \t");
 		xasprintf(&new_prompt, "Confirm '%s'? (y/n) ", cmd);
-		free(copy);
+		xfree(copy);
 	}
 
 	cdata = xmalloc(sizeof *cdata);
 	cdata->cmd = xstrdup(args->argv[0]);
-
+	cdata->c = c;
-	cdata->client = c;
+	status_prompt_set(cdata->c, new_prompt, NULL,
-	cdata->client->references++;
-
-	status_prompt_set(c, new_prompt, NULL,
 	    cmd_confirm_before_callback, cmd_confirm_before_free, cdata,
 	    PROMPT_SINGLE);
 
-	free(new_prompt);
+	xfree(new_prompt);
-	return (CMD_RETURN_NORMAL);
+	return (1);
 }
 
 int
 cmd_confirm_before_callback(void *data, const char *s)
 {
 	struct cmd_confirm_before_data	*cdata = data;
-	struct client			*c = cdata->client;
+	struct client			*c = cdata->c;
 	struct cmd_list			*cmdlist;
+	struct cmd_ctx	 	 	 ctx;
 	char				*cause;
 
-	if (c->flags & CLIENT_DEAD)
-		return (0);
-
 	if (s == NULL || *s == '\0')
 		return (0);
 	if (tolower((u_char) s[0]) != 'y' || s[1] != '\0')
 		return (0);
 
-	if (cmd_string_parse(cdata->cmd, &cmdlist, NULL, 0, &cause) != 0) {
+	if (cmd_string_parse(cdata->cmd, &cmdlist, &cause) != 0) {
 		if (cause != NULL) {
-			cmdq_error(c->cmdq, "%s", cause);
+			*cause = toupper((u_char) *cause);
-			free(cause);
+			status_message_set(c, "%s", cause);
+			xfree(cause);
 		}
 		return (0);
 	}
 
-	cmdq_run(c->cmdq, cmdlist);
+	ctx.msgdata = NULL;
+	ctx.curclient = c;
+
+	ctx.error = key_bindings_error;
+	ctx.print = key_bindings_print;
+	ctx.info = key_bindings_info;
+
+	ctx.cmdclient = NULL;
+
+	cmd_list_exec(cmdlist, &ctx);
 	cmd_list_free(cmdlist);
 
 	return (0);
@@ -134,10 +143,8 @@ void
 cmd_confirm_before_free(void *data)
 {
 	struct cmd_confirm_before_data	*cdata = data;
-	struct client			*c = cdata->client;
 
-	c->references--;
+	if (cdata->cmd != NULL)
-
+		xfree(cdata->cmd);
-	free(cdata->cmd);
+	xfree(cdata);
-	free(cdata);
 }

cmd-copy-mode.c

@@ -24,8 +24,8 @@
  * Enter copy mode.
  */
 
-void		 cmd_copy_mode_key_binding(struct cmd *, int);
+void	cmd_copy_mode_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_copy_mode_exec(struct cmd *, struct cmd_q *);
+int	cmd_copy_mode_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_copy_mode_entry = {
 	"copy-mode", NULL,
@@ -45,20 +45,20 @@ cmd_copy_mode_key_binding(struct cmd *self, int key)
 		args_set(self->args, 'u', NULL);
 }
 
-enum cmd_retval
+int
-cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_copy_mode_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct window_pane	*wp;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
+	if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	if (window_pane_set_mode(wp, &window_copy_mode) != 0)
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	window_copy_init_from_pane(wp);
 	if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
 		window_copy_pageup(wp);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-delete-buffer.c

@@ -26,7 +26,7 @@
  * Delete a paste buffer.
  */
 
-enum cmd_retval	 cmd_delete_buffer_exec(struct cmd *, struct cmd_q *);
+int	cmd_delete_buffer_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_delete_buffer_entry = {
 	"delete-buffer", "deleteb",
@@ -38,8 +38,8 @@ const struct cmd_entry cmd_delete_buffer_entry = {
 	cmd_delete_buffer_exec
 };
 
-enum cmd_retval
+int
-cmd_delete_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_delete_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	char		*cause;
@@ -47,20 +47,20 @@ cmd_delete_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	if (!args_has(args, 'b')) {
 		paste_free_top(&global_buffers);
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	}
 
 	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
 	if (cause != NULL) {
-		cmdq_error(cmdq, "buffer %s", cause);
+		ctx->error(ctx, "buffer %s", cause);
-		free(cause);
+		xfree(cause);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	if (paste_free_index(&global_buffers, buffer) != 0) {
-		cmdq_error(cmdq, "no buffer %d", buffer);
+		ctx->error(ctx, "no buffer %d", buffer);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-detach-client.c

@@ -24,23 +24,23 @@
  * Detach a client.
  */
 
-enum cmd_retval	 cmd_detach_client_exec(struct cmd *, struct cmd_q *);
+int	cmd_detach_client_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_detach_client_entry = {
 	"detach-client", "detach",
-	"as:t:P", 0, 0,
+	"s:t:P", 0, 0,
-	"[-P] [-a] [-s target-session] " CMD_TARGET_CLIENT_USAGE,
+	"[-P] [-s target-session] " CMD_TARGET_CLIENT_USAGE,
 	CMD_READONLY,
 	NULL,
 	NULL,
 	cmd_detach_client_exec
 };
 
-enum cmd_retval
+int
-cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_detach_client_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
-	struct client	*c, *c2;
+	struct client	*c;
 	struct session 	*s;
 	enum msgtype     msgtype;
 	u_int 		 i;
@@ -51,9 +51,9 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
 		msgtype = MSG_DETACH;
 
 	if (args_has(args, 's')) {
-		s = cmd_find_session(cmdq, args_get(args, 's'), 0);
+		s = cmd_find_session(ctx, args_get(args, 's'), 0);
 		if (s == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 
 		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 			c = ARRAY_ITEM(&clients, i);
@@ -61,20 +61,12 @@ cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
 				server_write_client(c, msgtype, NULL, 0);
 		}
 	} else {
-		c = cmd_find_client(cmdq, args_get(args, 't'), 0);
+		c = cmd_find_client(ctx, args_get(args, 't'));
 		if (c == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 
-		if (args_has(args, 'a')) {
+		server_write_client(c, msgtype, NULL, 0);
-			for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-				c2 = ARRAY_ITEM(&clients, i);
-				if (c2 == NULL || c == c2)
-					continue;
-				server_write_client(c2, msgtype, NULL, 0);
-			}
-		} else
-			server_write_client(c, msgtype, NULL, 0);
 	}
 
-	return (CMD_RETURN_STOP);
+	return (0);
 }

cmd-display-message.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <time.h>
 
 #include "tmux.h"
@@ -27,21 +26,20 @@
  * Displays a message in the status line.
  */
 
-enum cmd_retval	 cmd_display_message_exec(struct cmd *, struct cmd_q *);
+int	cmd_display_message_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_display_message_entry = {
 	"display-message", "display",
-	"c:pt:F:", 0, 1,
+	"c:pt:", 0, 1,
-	"[-p] [-c target-client] [-F format] " CMD_TARGET_PANE_USAGE
+	"[-p] [-c target-client] [-t target-pane] [message]",
-	" [message]",
 	0,
 	NULL,
 	NULL,
 	cmd_display_message_exec
 };
 
-enum cmd_retval
+int
-cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct client		*c;
@@ -50,62 +48,31 @@ cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct window_pane	*wp;
 	const char		*template;
 	char			*msg;
-	struct format_tree	*ft;
-	char			 out[BUFSIZ];
-	time_t			 t;
-	size_t			 len;
 
-	if (args_has(args, 't')) {
+	if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL)
-		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
+		return (-1);
+
+	if (args_has(args, 't') != 0) {
+		wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp);
 		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 	} else {
-		wl = cmd_find_pane(cmdq, NULL, &s, &wp);
+		s = NULL;
-		if (wl == NULL)
+		wl = NULL;
-			return (CMD_RETURN_ERROR);
+		wp = NULL;
 	}
 
-	if (args_has(args, 'F') && args->argc != 0) {
+	if (args->argc == 0)
-		cmdq_error(cmdq, "only one of -F or argument must be given");
+		template = "[#S] #I:#W, current pane #P - (%H:%M %d-%b-%y)";
-		return (CMD_RETURN_ERROR);
+	else
-	}
-
-	if (args_has(args, 'c')) {
-	    c = cmd_find_client(cmdq, args_get(args, 'c'), 0);
-	    if (c == NULL)
-		return (CMD_RETURN_ERROR);
-	} else {
-		c = cmd_current_client(cmdq);
-		if (c == NULL && !args_has(self->args, 'p')) {
-			cmdq_error(cmdq, "no client available");
-			return (CMD_RETURN_ERROR);
-		}
-	}
-
-	template = args_get(args, 'F');
-	if (args->argc != 0)
 		template = args->argv[0];
-	if (template == NULL)
-		template = DISPLAY_MESSAGE_TEMPLATE;
 
-	ft = format_create();
+	msg = status_replace(c, s, wl, wp, template, time(NULL), 0);
-	if (c != NULL)
-		format_client(ft, c);
-	format_session(ft, s);
-	format_winlink(ft, s, wl);
-	format_window_pane(ft, wp);
-
-	t = time(NULL);
-	len = strftime(out, sizeof out, template, localtime(&t));
-	out[len] = '\0';
-
-	msg = format_expand(ft, out);
 	if (args_has(self->args, 'p'))
-		cmdq_print(cmdq, "%s", msg);
+		ctx->print(ctx, "%s", msg);
 	else
 		status_message_set(c, "%s", msg);
-	free(msg);
+	xfree(msg);
-	format_free(ft);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-display-panes.c

@@ -24,7 +24,7 @@
  * Display panes on a client.
  */
 
-enum cmd_retval	 cmd_display_panes_exec(struct cmd *, struct cmd_q *);
+int	cmd_display_panes_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_display_panes_entry = {
 	"display-panes", "displayp",
@@ -36,16 +36,16 @@ const struct cmd_entry cmd_display_panes_entry = {
 	cmd_display_panes_exec
 };
 
-enum cmd_retval
+int
-cmd_display_panes_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_display_panes_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct client	*c;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	server_set_identify(c);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-find-window.c

@@ -19,7 +19,6 @@
 #include <sys/types.h>
 
 #include <fnmatch.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -28,24 +27,15 @@
  * Find window containing text.
  */
 
-enum cmd_retval	 cmd_find_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_find_window_exec(struct cmd *, struct cmd_ctx *);
 
-void	cmd_find_window_callback(struct window_choose_data *);
+void	cmd_find_window_callback(void *, int);
-
+void	cmd_find_window_free(void *);
-/* Flags for determining matching behavior. */
-#define CMD_FIND_WINDOW_BY_TITLE   0x1
-#define CMD_FIND_WINDOW_BY_CONTENT 0x2
-#define CMD_FIND_WINDOW_BY_NAME    0x4
-
-#define CMD_FIND_WINDOW_ALL		\
-	(CMD_FIND_WINDOW_BY_TITLE |	\
-	 CMD_FIND_WINDOW_BY_CONTENT |	\
-	 CMD_FIND_WINDOW_BY_NAME)
 
 const struct cmd_entry cmd_find_window_entry = {
 	"find-window", "findw",
-	"F:CNt:T", 1, 4,
+	"t:", 1, 1,
-	"[-CNT] [-F format] " CMD_TARGET_WINDOW_USAGE " match-string",
+	CMD_TARGET_WINDOW_USAGE " match-string",
 	0,
 	NULL,
 	NULL,
@@ -53,122 +43,78 @@ const struct cmd_entry cmd_find_window_entry = {
 };
 
 struct cmd_find_window_data {
-	struct winlink	*wl;
+	struct session	*session;
-	char		*list_ctx;
-	u_int		 pane_id;
 };
-ARRAY_DECL(cmd_find_window_data_list, struct cmd_find_window_data);
 
-u_int	cmd_find_window_match_flags(struct args *);
+int
-void	cmd_find_window_match(struct cmd_find_window_data_list *, int,
+cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
-	    struct winlink *, const char *, const char *);
-
-u_int
-cmd_find_window_match_flags(struct args *args)
-{
-	u_int	match_flags = 0;
-
-	/* Turn on flags based on the options. */
-	if (args_has(args, 'T'))
-		match_flags |= CMD_FIND_WINDOW_BY_TITLE;
-	if (args_has(args, 'C'))
-		match_flags |= CMD_FIND_WINDOW_BY_CONTENT;
-	if (args_has(args, 'N'))
-		match_flags |= CMD_FIND_WINDOW_BY_NAME;
-
-	/* If none of the flags were set, default to matching anything. */
-	if (match_flags == 0)
-		match_flags = CMD_FIND_WINDOW_ALL;
-
-	return (match_flags);
-}
-
-void
-cmd_find_window_match(struct cmd_find_window_data_list *find_list,
-    int match_flags, struct winlink *wl, const char *str, const char *searchstr)
-{
-	struct cmd_find_window_data	 find_data;
-	struct window_pane		*wp;
-	u_int				 i, line;
-	char				*sres;
-
-	memset(&find_data, 0, sizeof find_data);
-
-	i = 0;
-	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
-		i++;
-
-		if ((match_flags & CMD_FIND_WINDOW_BY_NAME) &&
-		    fnmatch(searchstr, wl->window->name, 0) == 0) {
-			find_data.list_ctx = xstrdup("");
-			break;
-		}
-
-		if ((match_flags & CMD_FIND_WINDOW_BY_TITLE) &&
-		    fnmatch(searchstr, wp->base.title, 0) == 0) {
-			xasprintf(&find_data.list_ctx,
-			    "pane %u title: \"%s\"", i - 1, wp->base.title);
-			break;
-		}
-
-		if (match_flags & CMD_FIND_WINDOW_BY_CONTENT &&
-		    (sres = window_pane_search(wp, str, &line)) != NULL) {
-			xasprintf(&find_data.list_ctx,
-			    "pane %u line %u: \"%s\"", i - 1, line + 1, sres);
-			free(sres);
-			break;
-		}
-	}
-	if (find_data.list_ctx != NULL) {
-		find_data.wl = wl;
-		find_data.pane_id = i - 1;
-		ARRAY_ADD(find_list, find_data);
-	}
-}
-
-enum cmd_retval
-cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args			*args = self->args;
-	struct client			*c;
+	struct cmd_find_window_data	*cdata;
-	struct window_choose_data	*cdata;
 	struct session			*s;
 	struct winlink			*wl, *wm;
-	struct cmd_find_window_data_list find_list;
+	struct window			*w;
-	char				*str, *searchstr;
+	struct window_pane		*wp;
-	const char			*template;
+	ARRAY_DECL(, u_int)	 	 list_idx;
-	u_int				 i, match_flags;
+	ARRAY_DECL(, char *)	 	 list_ctx;
+	char				*str, *sres, *sctx, *searchstr;
+	u_int				 i, line;
 
-	if ((c = cmd_current_client(cmdq)) == NULL) {
+	if (ctx->curclient == NULL) {
-		cmdq_error(cmdq, "no client available");
+		ctx->error(ctx, "must be run interactively");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
-	s = c->session;
+	s = ctx->curclient->session;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
-	if ((template = args_get(args, 'F')) == NULL)
-		template = FIND_WINDOW_TEMPLATE;
-
-	match_flags = cmd_find_window_match_flags(args);
 	str = args->argv[0];
 
-	ARRAY_INIT(&find_list);
+	ARRAY_INIT(&list_idx);
+	ARRAY_INIT(&list_ctx);
 
 	xasprintf(&searchstr, "*%s*", str);
-	RB_FOREACH(wm, winlinks, &s->windows)
+	RB_FOREACH(wm, winlinks, &s->windows) {
-	    cmd_find_window_match (&find_list, match_flags, wm, str, searchstr);
+		i = 0;
-	free(searchstr);
+		TAILQ_FOREACH(wp, &wm->window->panes, entry) {
+			i++;
 
-	if (ARRAY_LENGTH(&find_list) == 0) {
+			if (fnmatch(searchstr, wm->window->name, 0) == 0)
-		cmdq_error(cmdq, "no windows matching: %s", str);
+				sctx = xstrdup("");
-		ARRAY_FREE(&find_list);
+			else {
-		return (CMD_RETURN_ERROR);
+				sres = window_pane_search(wp, str, &line);
+				if (sres == NULL &&
+				    fnmatch(searchstr, wp->base.title, 0) != 0)
+					continue;
+
+				if (sres == NULL) {
+					xasprintf(&sctx,
+					    "pane %u title: \"%s\"", i - 1,
+					    wp->base.title);
+				} else {
+					xasprintf(&sctx,
+					    "pane %u line %u: \"%s\"", i - 1,
+					    line + 1, sres);
+					xfree(sres);
+				}
+			}
+
+			ARRAY_ADD(&list_idx, wm->idx);
+			ARRAY_ADD(&list_ctx, sctx);
+		}
+	}
+	xfree(searchstr);
+
+	if (ARRAY_LENGTH(&list_idx) == 0) {
+		ctx->error(ctx, "no windows matching: %s", str);
+		ARRAY_FREE(&list_idx);
+		ARRAY_FREE(&list_ctx);
+		return (-1);
 	}
 
-	if (ARRAY_LENGTH(&find_list) == 1) {
+	if (ARRAY_LENGTH(&list_idx) == 1) {
-		if (session_select(s, ARRAY_FIRST(&find_list).wl->idx) == 0)
+		if (session_select(s, ARRAY_FIRST(&list_idx)) == 0)
 			server_redraw_session(s);
 		recalculate_sizes();
 		goto out;
@@ -177,52 +123,54 @@ cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
 		goto out;
 
-	for (i = 0; i < ARRAY_LENGTH(&find_list); i++) {
+	for (i = 0; i < ARRAY_LENGTH(&list_idx); i++) {
-		wm = ARRAY_ITEM(&find_list, i).wl;
+		wm = winlink_find_by_index(
+		    &s->windows, ARRAY_ITEM(&list_idx, i));
+		w = wm->window;
 
-		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
+		sctx = ARRAY_ITEM(&list_ctx, i);
-		cdata->idx = wm->idx;
+		window_choose_add(wl->window->active,
-		cdata->wl = wm;
+		    wm->idx, "%3d: %s [%ux%u] (%u panes) %s", wm->idx, w->name,
-
+		    w->sx, w->sy, window_count_panes(w), sctx);
-		cdata->ft_template = xstrdup(template);
+		xfree(sctx);
-		cdata->pane_id = ARRAY_ITEM(&find_list, i).pane_id;
-
-		format_add(cdata->ft, "line", "%u", i);
-		format_add(cdata->ft, "window_find_matches", "%s",
-		    ARRAY_ITEM(&find_list, i).list_ctx);
-		format_session(cdata->ft, s);
-		format_winlink(cdata->ft, s, wm);
-		format_window_pane(cdata->ft, wm->window->active);
-
-		window_choose_add(wl->window->active, cdata);
 	}
 
-	window_choose_ready(wl->window->active, 0, cmd_find_window_callback);
+	cdata = xmalloc(sizeof *cdata);
+	cdata->session = s;
+	cdata->session->references++;
+
+	window_choose_ready(wl->window->active,
+	    0, cmd_find_window_callback, cmd_find_window_free, cdata);
 
 out:
-	ARRAY_FREE(&find_list);
+	ARRAY_FREE(&list_idx);
-	return (CMD_RETURN_NORMAL);
+	ARRAY_FREE(&list_ctx);
+
+	return (0);
 }
 
 void
-cmd_find_window_callback(struct window_choose_data *cdata)
+cmd_find_window_callback(void *data, int idx)
 {
-	struct session		*s;
+	struct cmd_find_window_data	*cdata = data;
-	struct window_pane	*wp;
+	struct session			*s = cdata->session;
 
-	if (cdata == NULL)
+	if (idx == -1)
 		return;
-
-	s = cdata->start_session;
 	if (!session_alive(s))
 		return;
 
-	wp = window_pane_at_index(cdata->wl->window, cdata->pane_id);
+	if (session_select(s, idx) == 0) {
-	if (wp != NULL && window_pane_visible(wp))
-		window_set_active_pane(cdata->wl->window, wp);
-
-	if (session_select(s, cdata->idx) == 0) {
 		server_redraw_session(s);
 		recalculate_sizes();
 	}
 }
+
+void
+cmd_find_window_free(void *data)
+{
+	struct cmd_find_window_data	*cdata = data;
+
+	cdata->session->references--;
+	xfree(cdata);
+}

cmd-has-session.c

@@ -24,7 +24,7 @@
  * Cause client to report an error and exit with 1 if session doesn't exist.
  */
 
-enum cmd_retval	 cmd_has_session_exec(struct cmd *, struct cmd_q *);
+int	cmd_has_session_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_has_session_entry = {
 	"has-session", "has",
@@ -36,13 +36,13 @@ const struct cmd_entry cmd_has_session_entry = {
 	cmd_has_session_exec
 };
 
-enum cmd_retval
+int
-cmd_has_session_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_has_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 
-	if (cmd_find_session(cmdq, args_get(args, 't'), 0) == NULL)
+	if (cmd_find_session(ctx, args_get(args, 't'), 0) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-if-shell.c

@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -29,16 +28,15 @@
  * Executes a tmux command if a shell command returns true or false.
  */
 
-enum cmd_retval	 cmd_if_shell_exec(struct cmd *, struct cmd_q *);
+int	cmd_if_shell_exec(struct cmd *, struct cmd_ctx *);
 
 void	cmd_if_shell_callback(struct job *);
-void	cmd_if_shell_done(struct cmd_q *);
 void	cmd_if_shell_free(void *);
 
 const struct cmd_entry cmd_if_shell_entry = {
 	"if-shell", "if",
-	"bt:", 2, 3,
+	"", 2, 3,
-	"[-b] " CMD_TARGET_PANE_USAGE " shell-command command [command]",
+	"shell-command command [command]",
 	0,
 	NULL,
 	NULL,
@@ -48,43 +46,15 @@ const struct cmd_entry cmd_if_shell_entry = {
 struct cmd_if_shell_data {
 	char		*cmd_if;
 	char		*cmd_else;
-	struct cmd_q	*cmdq;
+	struct cmd_ctx	 ctx;
-	int		 bflag;
-	int		 started;
 };
 
-enum cmd_retval
+int
-cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args			*args = self->args;
 	struct cmd_if_shell_data	*cdata;
-	char				*shellcmd;
+	const char			*shellcmd = args->argv[0];
-	struct client			*c;
-	struct session			*s = NULL;
-	struct winlink			*wl = NULL;
-	struct window_pane		*wp = NULL;
-	struct format_tree		*ft;
-
-	if (args_has(args, 't'))
-		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
-	else {
-		c = cmd_find_client(cmdq, NULL, 1);
-		if (c != NULL && c->session != NULL) {
-			s = c->session;
-			wl = s->curw;
-			wp = wl->window->active;
-		}
-	}
-
-	ft = format_create();
-	if (s != NULL)
-		format_session(ft, s);
-	if (s != NULL && wl != NULL)
-		format_winlink(ft, s, wl);
-	if (wp != NULL)
-		format_window_pane(ft, wp);
-	shellcmd = format_expand(ft, args->argv[0]);
-	format_free(ft);
 
 	cdata = xmalloc(sizeof *cdata);
 	cdata->cmd_if = xstrdup(args->argv[1]);
@@ -92,85 +62,61 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
 		cdata->cmd_else = xstrdup(args->argv[2]);
 	else
 		cdata->cmd_else = NULL;
-	cdata->bflag = args_has(args, 'b');
+	memcpy(&cdata->ctx, ctx, sizeof cdata->ctx);
 
-	cdata->started = 0;
+	if (ctx->cmdclient != NULL)
-	cdata->cmdq = cmdq;
+		ctx->cmdclient->references++;
-	cmdq->references++;
+	if (ctx->curclient != NULL)
+		ctx->curclient->references++;
 
-	job_run(shellcmd, s, cmd_if_shell_callback, cmd_if_shell_free, cdata);
+	job_run(shellcmd, cmd_if_shell_callback, cmd_if_shell_free, cdata);
-	free(shellcmd);
 
-	if (cdata->bflag)
+	return (1);	/* don't let client exit */
-		return (CMD_RETURN_NORMAL);
-	return (CMD_RETURN_WAIT);
 }
 
 void
 cmd_if_shell_callback(struct job *job)
 {
 	struct cmd_if_shell_data	*cdata = job->data;
-	struct cmd_q			*cmdq = cdata->cmdq, *cmdq1;
+	struct cmd_ctx			*ctx = &cdata->ctx;
 	struct cmd_list			*cmdlist;
 	char				*cause, *cmd;
 
-	if (cmdq->dead)
+	if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0) {
-		return;
-
-	if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0)
 		cmd = cdata->cmd_else;
-	else
+		if (cmd == NULL)
+			return;
+	} else
 		cmd = cdata->cmd_if;
-	if (cmd == NULL)
+	if (cmd_string_parse(cmd, &cmdlist, &cause) != 0) {
-		return;
-
-	if (cmd_string_parse(cmd, &cmdlist, NULL, 0, &cause) != 0) {
 		if (cause != NULL) {
-			cmdq_error(cmdq, "%s", cause);
+			ctx->error(ctx, "%s", cause);
-			free(cause);
+			xfree(cause);
 		}
 		return;
 	}
 
-	cdata->started = 1;
+	cmd_list_exec(cmdlist, ctx);
-
-	cmdq1 = cmdq_new(cmdq->client);
-	cmdq1->emptyfn = cmd_if_shell_done;
-	cmdq1->data = cdata;
-
-	cmdq_run(cmdq1, cmdlist);
 	cmd_list_free(cmdlist);
 }
 
-void
-cmd_if_shell_done(struct cmd_q *cmdq1)
-{
-	struct cmd_if_shell_data	*cdata = cmdq1->data;
-	struct cmd_q			*cmdq = cdata->cmdq;
-
-	if (!cmdq_free(cmdq) && !cdata->bflag)
-		cmdq_continue(cmdq);
-
-	cmdq_free(cmdq1);
-
-	free(cdata->cmd_else);
-	free(cdata->cmd_if);
-	free(cdata);
-}
-
 void
 cmd_if_shell_free(void *data)
 {
 	struct cmd_if_shell_data	*cdata = data;
-	struct cmd_q			*cmdq = cdata->cmdq;
+	struct cmd_ctx			*ctx = &cdata->ctx;
+	struct msg_exit_data		 exitdata;
 
-	if (cdata->started)
+	if (ctx->cmdclient != NULL) {
-		return;
+		ctx->cmdclient->references--;
+		exitdata.retcode = ctx->cmdclient->retcode;
+		ctx->cmdclient->flags |= CLIENT_EXIT;
+	}
+	if (ctx->curclient != NULL)
+		ctx->curclient->references--;
 
-	if (!cmdq_free(cmdq) && !cdata->bflag)
+	if (cdata->cmd_else != NULL)
-		cmdq_continue(cmdq);
+		xfree(cdata->cmd_else);
-
+	xfree(cdata->cmd_if);
-	free(cdata->cmd_else);
+	xfree(cdata);
-	free(cdata->cmd_if);
-	free(cdata);
 }

cmd-join-pane.c

@@ -1,7 +1,6 @@
 /* $Id$ */
 
 /*
- * Copyright (c) 2011 George Nachman <tmux@georgester.com>
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -25,34 +24,22 @@
 #include "tmux.h"
 
 /*
- * Join or move a pane into another (like split/swap/kill).
+ * Join a pane into another (like split/swap/kill).
  */
 
-void		 cmd_join_pane_key_binding(struct cmd *, int);
+void	cmd_join_pane_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_join_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_join_pane_exec(struct cmd *, struct cmd_ctx *);
-
-enum cmd_retval	 join_pane(struct cmd *, struct cmd_q *, int);
 
 const struct cmd_entry cmd_join_pane_entry = {
 	"join-pane", "joinp",
-	"bdhvp:l:s:t:", 0, 0,
+	"dhvp:l:s:t:", 0, 0,
-	"[-bdhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
+	"[-dhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
 	0,
 	cmd_join_pane_key_binding,
 	NULL,
 	cmd_join_pane_exec
 };
 
-const struct cmd_entry cmd_move_pane_entry = {
-	"move-pane", "movep",
-	"bdhvp:l:s:t:", 0, 0,
-	"[-bdhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
-	0,
-	NULL,
-	NULL,
-	cmd_join_pane_exec
-};
-
 void
 cmd_join_pane_key_binding(struct cmd *self, int key)
 {
@@ -67,14 +54,8 @@ cmd_join_pane_key_binding(struct cmd *self, int key)
 	}
 }
 
-enum cmd_retval
+int
-cmd_join_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_join_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
-	return (join_pane(self, cmdq, self->entry == &cmd_join_pane_entry));
-}
-
-enum cmd_retval
-join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 {
 	struct args		*args = self->args;
 	struct session		*dst_s;
@@ -86,26 +67,20 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 	enum layout_type	 type;
 	struct layout_cell	*lc;
 
-	dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), &dst_s, &dst_wp);
+	dst_wl = cmd_find_pane(ctx, args_get(args, 't'), &dst_s, &dst_wp);
 	if (dst_wl == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	dst_w = dst_wl->window;
 	dst_idx = dst_wl->idx;
-	server_unzoom_window(dst_w);
 
-	src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp);
+	src_wl = cmd_find_pane(ctx, args_get(args, 's'), NULL, &src_wp);
 	if (src_wl == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	src_w = src_wl->window;
-	server_unzoom_window(src_w);
 
-	if (not_same_window && src_w == dst_w) {
+	if (src_w == dst_w) {
-		cmdq_error(cmdq, "can't join a pane to its own window");
+		ctx->error(ctx, "can't join a pane to its own window");
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	}
-	if (!not_same_window && src_wp == dst_wp) {
-		cmdq_error(cmdq, "source and target panes must be different");
-		return (CMD_RETURN_ERROR);
 	}
 
 	type = LAYOUT_TOPBOTTOM;
@@ -116,26 +91,26 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 	if (args_has(args, 'l')) {
 		size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "size %s", cause);
+			ctx->error(ctx, "size %s", cause);
-			free(cause);
+			xfree(cause);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	} else if (args_has(args, 'p')) {
 		percentage = args_strtonum(args, 'p', 0, 100, &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "percentage %s", cause);
+			ctx->error(ctx, "percentage %s", cause);
-			free(cause);
+			xfree(cause);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 		if (type == LAYOUT_TOPBOTTOM)
 			size = (dst_wp->sy * percentage) / 100;
 		else
 			size = (dst_wp->sx * percentage) / 100;
 	}
-	lc = layout_split_pane(dst_wp, type, size, args_has(args, 'b'));
+
-	if (lc == NULL) {
+	if ((lc = layout_split_pane(dst_wp, type, size)) == NULL) {
-		cmdq_error(cmdq, "create pane failed: pane too small");
+		ctx->error(ctx, "create pane failed: pane too small");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	layout_close_pane(src_wp);
@@ -149,8 +124,6 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 
 	if (window_count_panes(src_w) == 0)
 		server_kill_window(src_w);
-	else
-		notify_window_layout_changed(src_w);
 
 	src_wp->window = dst_w;
 	TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry);
@@ -168,6 +141,5 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 	} else
 		server_status_session(dst_s);
 
-	notify_window_layout_changed(dst_w);
+	return (0);
-	return (CMD_RETURN_NORMAL);
 }

cmd-kill-pane.c

@@ -26,7 +26,7 @@
  * Kill pane.
  */
 
-enum cmd_retval	 cmd_kill_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_kill_pane_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_kill_pane_entry = {
 	"kill-pane", "killp",
@@ -38,30 +38,32 @@ const struct cmd_entry cmd_kill_pane_entry = {
 	cmd_kill_pane_exec
 };
 
-enum cmd_retval
+int
-cmd_kill_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
-	struct window_pane	*loopwp, *tmpwp, *wp;
+	struct window_pane	*loopwp, *nextwp, *wp;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
+	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	server_unzoom_window(wl->window);
 
 	if (window_count_panes(wl->window) == 1) {
 		/* Only one pane, kill the window. */
 		server_kill_window(wl->window);
 		recalculate_sizes();
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	}
 
 	if (args_has(self->args, 'a')) {
-		TAILQ_FOREACH_SAFE(loopwp, &wl->window->panes, entry, tmpwp) {
+		loopwp = TAILQ_FIRST(&wl->window->panes);
-			if (loopwp == wp)
+		while (loopwp != NULL) {
-				continue;
+			nextwp = TAILQ_NEXT(loopwp, entry);
-			layout_close_pane(loopwp);
+			if (loopwp != wp) {
-			window_remove_pane(wl->window, loopwp);
+				layout_close_pane(loopwp);
+				window_remove_pane(wl->window, loopwp);
+			}
+			loopwp = nextwp;
 		}
 	} else {
 		layout_close_pane(wp);
@@ -69,5 +71,5 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	}
 	server_redraw_window(wl->window);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-kill-server.c

@@ -27,7 +27,7 @@
  * Kill the server and do nothing else.
  */
 
-enum cmd_retval	 cmd_kill_server_exec(struct cmd *, struct cmd_q *);
+int	cmd_kill_server_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_kill_server_entry = {
 	"kill-server", NULL,
@@ -39,10 +39,11 @@ const struct cmd_entry cmd_kill_server_entry = {
 	cmd_kill_server_exec
 };
 
-enum cmd_retval
+/* ARGSUSED */
-cmd_kill_server_exec(unused struct cmd *self, unused struct cmd_q *cmdq)
+int
+cmd_kill_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
 	kill(getpid(), SIGTERM);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-kill-session.c

@@ -27,37 +27,29 @@
  * Note this deliberately has no alias to make it hard to hit by accident.
  */
 
-enum cmd_retval	 cmd_kill_session_exec(struct cmd *, struct cmd_q *);
+int	cmd_kill_session_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_kill_session_entry = {
 	"kill-session", NULL,
-	"at:", 0, 0,
+	"t:", 0, 0,
-	"[-a] " CMD_TARGET_SESSION_USAGE,
+	CMD_TARGET_SESSION_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_kill_session_exec
 };
 
-enum cmd_retval
+int
-cmd_kill_session_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
-	struct session	*s, *s2, *s3;
+	struct session	*s;
 
-	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+	if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
-	if (args_has(args, 'a')) {
+	server_destroy_session(s);
-		RB_FOREACH_SAFE(s2, sessions, &sessions, s3) {
+	session_destroy(s);
-			if (s != s2) {
+
-				server_destroy_session(s2);
+	return (0);
-				session_destroy(s2);
-			}
-		}
-	} else {
-		server_destroy_session(s);
-		session_destroy(s);
-	}
-	return (CMD_RETURN_NORMAL);
 }

cmd-kill-window.c

@@ -24,36 +24,29 @@
  * Destroy window.
  */
 
-enum cmd_retval	 cmd_kill_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_kill_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_kill_window_entry = {
 	"kill-window", "killw",
-	"at:", 0, 0,
+	"t:", 0, 0,
-	"[-a] " CMD_TARGET_WINDOW_USAGE,
+	CMD_TARGET_WINDOW_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_kill_window_exec
 };
 
-enum cmd_retval
+int
-cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
-	struct winlink	*wl, *wl2, *wl3;
+	struct winlink	*wl;
-	struct session	*s;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-
-	if (args_has(args, 'a')) {
-		RB_FOREACH_SAFE(wl2, winlinks, &s->windows, wl3) {
-			if (wl != wl2)
-				server_kill_window(wl2->window);
-		}
-	} else
-		server_kill_window(wl->window);
 
+	server_kill_window(wl->window);
 	recalculate_sizes();
-	return (CMD_RETURN_NORMAL);
+
+	return (0);
 }

cmd-link-window.c

@@ -26,7 +26,7 @@
  * Link a window into another session.
  */
 
-enum cmd_retval	 cmd_link_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_link_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_link_window_entry = {
 	"link-window", "linkw",
@@ -38,8 +38,8 @@ const struct cmd_entry cmd_link_window_entry = {
 	cmd_link_window_exec
 };
 
-enum cmd_retval
+int
-cmd_link_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct session	*src, *dst;
@@ -47,19 +47,19 @@ cmd_link_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	char		*cause;
 	int		 idx, kflag, dflag;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 's'), &src)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 's'), &src)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &dst)) == -2)
+	if ((idx = cmd_find_index(ctx, args_get(args, 't'), &dst)) == -2)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	kflag = args_has(self->args, 'k');
 	dflag = args_has(self->args, 'd');
 	if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
-		cmdq_error(cmdq, "can't link window: %s", cause);
+		ctx->error(ctx, "can't link window: %s", cause);
-		free(cause);
+		xfree(cause);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	recalculate_sizes();
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-list-buffers.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -27,43 +26,33 @@
  * List paste buffers.
  */
 
-enum cmd_retval	 cmd_list_buffers_exec(struct cmd *, struct cmd_q *);
+int	cmd_list_buffers_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_list_buffers_entry = {
 	"list-buffers", "lsb",
-	"F:", 0, 0,
+	"", 0, 0,
-	"[-F format]",
+	"",
 	0,
 	NULL,
 	NULL,
 	cmd_list_buffers_exec
 };
 
-enum cmd_retval
+/* ARGSUSED */
-cmd_list_buffers_exec(unused struct cmd *self, struct cmd_q *cmdq)
+int
+cmd_list_buffers_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct args		*args = self->args;
 	struct paste_buffer	*pb;
-	struct format_tree	*ft;
 	u_int			 idx;
-	char			*line;
+	char			*tmp;
-	const char		*template;
-
-	if ((template = args_get(args, 'F')) == NULL)
-		template = LIST_BUFFERS_TEMPLATE;
 
 	idx = 0;
 	while ((pb = paste_walk_stack(&global_buffers, &idx)) != NULL) {
-		ft = format_create();
+		tmp = paste_print(pb, 50);
-		format_add(ft, "line", "%u", idx - 1);
+		ctx->print(ctx,
-		format_paste_buffer(ft, pb);
+		    "%u: %zu bytes: \"%s\"", idx - 1, pb->size, tmp);
-
+		xfree(tmp);
-		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
-		free(line);
-
-		format_free(ft);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-list-clients.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -28,7 +27,7 @@
  * List all clients.
  */
 
-enum cmd_retval	cmd_list_clients_exec(struct cmd *, struct cmd_q *);
+int	cmd_list_clients_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_list_clients_entry = {
 	"list-clients", "lsc",
@@ -40,8 +39,9 @@ const struct cmd_entry cmd_list_clients_entry = {
 	cmd_list_clients_exec
 };
 
-enum cmd_retval
+/* ARGSUSED */
-cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq)
+int
+cmd_list_clients_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args 		*args = self->args;
 	struct client		*c;
@@ -52,14 +52,19 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq)
 	char			*line;
 
 	if (args_has(args, 't')) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		s = cmd_find_session(ctx, args_get(args, 't'), 0);
 		if (s == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 	} else
 		s = NULL;
 
-	if ((template = args_get(args, 'F')) == NULL)
+	template = args_get(args, 'F');
-		template = LIST_CLIENTS_TEMPLATE;
+	if (template == NULL) {
+		template = "#{client_tty}: #{session_name} "
+		    "[#{client_width}x#{client_height} #{client_termname}]"
+		    "#{?client_utf8, (utf8),}"
+		    "#{?client_readonly, (ro),}";
+	}
 
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
@@ -75,11 +80,11 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq)
 		format_client(ft, c);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		ctx->print(ctx, "%s", line);
-		free(line);
+		xfree(line);
 
 		format_free(ft);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-list-commands.c

@@ -24,7 +24,7 @@
  * List all commands with usages.
  */
 
-enum cmd_retval	 cmd_list_commands_exec(struct cmd *, struct cmd_q *);
+int	cmd_list_commands_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_list_commands_entry = {
 	"list-commands", "lscm",
@@ -36,20 +36,14 @@ const struct cmd_entry cmd_list_commands_entry = {
 	cmd_list_commands_exec
 };
 
-enum cmd_retval
+/* ARGSUSED */
-cmd_list_commands_exec(unused struct cmd *self, struct cmd_q *cmdq)
+int
+cmd_list_commands_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
 	const struct cmd_entry 	      **entryp;
 
-	for (entryp = cmd_table; *entryp != NULL; entryp++) {
+	for (entryp = cmd_table; *entryp != NULL; entryp++)
-		if ((*entryp)->alias != NULL) {
+		ctx->print(ctx, "%s %s", (*entryp)->name, (*entryp)->usage);
-			cmdq_print(cmdq, "%s (%s) %s", (*entryp)->name,
-			    (*entryp)->alias, (*entryp)->usage);
-		} else {
-			cmdq_print(cmdq, "%s %s", (*entryp)->name,
-			    (*entryp)->usage);
-		}
-	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-list-keys.c

@@ -26,8 +26,9 @@
  * List key bindings.
  */
 
-enum cmd_retval	 cmd_list_keys_exec(struct cmd *, struct cmd_q *);
+int	cmd_list_keys_exec(struct cmd *, struct cmd_ctx *);
-enum cmd_retval	 cmd_list_keys_table(struct cmd *, struct cmd_q *);
+
+int	cmd_list_keys_table(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_list_keys_entry = {
 	"list-keys", "lsk",
@@ -39,8 +40,8 @@ const struct cmd_entry cmd_list_keys_entry = {
 	cmd_list_keys_exec
 };
 
-enum cmd_retval
+int
-cmd_list_keys_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct key_binding	*bd;
@@ -50,7 +51,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 	int			 width, keywidth;
 
 	if (args_has(args, 't'))
-		return (cmd_list_keys_table(self, cmdq));
+		return (cmd_list_keys_table(self, ctx));
 
 	width = 0;
 
@@ -91,14 +92,14 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 			continue;
 
 		cmd_list_print(bd->cmdlist, tmp + used, (sizeof tmp) - used);
-		cmdq_print(cmdq, "bind-key %s", tmp);
+		ctx->print(ctx, "bind-key %s", tmp);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
-enum cmd_retval
+int
-cmd_list_keys_table(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_keys_table(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args			*args = self->args;
 	const char			*tablename;
@@ -109,8 +110,8 @@ cmd_list_keys_table(struct cmd *self, struct cmd_q *cmdq)
 
 	tablename = args_get(args, 't');
 	if ((mtab = mode_key_findtable(tablename)) == NULL) {
-		cmdq_error(cmdq, "unknown key table: %s", tablename);
+		ctx->error(ctx, "unknown key table: %s", tablename);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	width = 0;
@@ -138,14 +139,11 @@ cmd_list_keys_table(struct cmd *self, struct cmd_q *cmdq)
 			mode = "c";
 		cmdstr = mode_key_tostring(mtab->cmdstr, mbind->cmd);
 		if (cmdstr != NULL) {
-			cmdq_print(cmdq, "bind-key -%st %s%s %*s %s%s%s%s",
+			ctx->print(ctx, "bind-key -%st %s%s %*s %s",
 			    mode, any_mode && *mode == '\0' ? " " : "",
-			    mtab->name, (int) width, key, cmdstr,
+			    mtab->name, (int) width, key, cmdstr);
-			    mbind->arg != NULL ? " \"" : "",
-			    mbind->arg != NULL ? mbind->arg : "",
-			    mbind->arg != NULL ? "\"": "");
 		}
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-list-panes.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "tmux.h"
@@ -27,70 +26,70 @@
  * List panes on given window.
  */
 
-enum cmd_retval	 cmd_list_panes_exec(struct cmd *, struct cmd_q *);
+int	cmd_list_panes_exec(struct cmd *, struct cmd_ctx *);
 
-void	cmd_list_panes_server(struct cmd *, struct cmd_q *);
+void	cmd_list_panes_server(struct cmd *, struct cmd_ctx *);
 void	cmd_list_panes_session(
-	    struct cmd *, struct session *, struct cmd_q *, int);
+	    struct cmd *, struct session *, struct cmd_ctx *, int);
 void	cmd_list_panes_window(struct cmd *,
-	    struct session *, struct winlink *, struct cmd_q *, int);
+	    struct session *, struct winlink *, struct cmd_ctx *, int);
 
 const struct cmd_entry cmd_list_panes_entry = {
 	"list-panes", "lsp",
 	"asF:t:", 0, 0,
-	"[-as] [-F format] " CMD_TARGET_WINDOW_USAGE,
+	"[-as] [-F format] [-t target]",
 	0,
 	NULL,
 	NULL,
 	cmd_list_panes_exec
 };
 
-enum cmd_retval
+int
-cmd_list_panes_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_panes_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct session	*s;
 	struct winlink	*wl;
 
 	if (args_has(args, 'a'))
-		cmd_list_panes_server(self, cmdq);
+		cmd_list_panes_server(self, ctx);
 	else if (args_has(args, 's')) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		s = cmd_find_session(ctx, args_get(args, 't'), 0);
 		if (s == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
-		cmd_list_panes_session(self, s, cmdq, 1);
+		cmd_list_panes_session(self, s, ctx, 1);
 	} else {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
+		wl = cmd_find_window(ctx, args_get(args, 't'), &s);
 		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
-		cmd_list_panes_window(self, s, wl, cmdq, 0);
+		cmd_list_panes_window(self, s, wl, ctx, 0);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
 void
-cmd_list_panes_server(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_panes_server(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct session	*s;
 
 	RB_FOREACH(s, sessions, &sessions)
-		cmd_list_panes_session(self, s, cmdq, 2);
+		cmd_list_panes_session(self, s, ctx, 2);
 }
 
 void
 cmd_list_panes_session(
-    struct cmd *self, struct session *s, struct cmd_q *cmdq, int type)
+    struct cmd *self, struct session *s, struct cmd_ctx *ctx, int type)
 {
 	struct winlink	*wl;
 
 	RB_FOREACH(wl, winlinks, &s->windows)
-		cmd_list_panes_window(self, s, wl, cmdq, type);
+		cmd_list_panes_window(self, s, wl, ctx, type);
 }
 
 void
 cmd_list_panes_window(struct cmd *self,
-    struct session *s, struct winlink *wl, struct cmd_q *cmdq, int type)
+    struct session *s, struct winlink *wl, struct cmd_ctx *ctx, int type)
 {
 	struct args		*args = self->args;
 	struct window_pane	*wp;
@@ -135,8 +134,8 @@ cmd_list_panes_window(struct cmd *self,
 		format_window_pane(ft, wp);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		ctx->print(ctx, "%s", line);
-		free(line);
+		xfree(line);
 
 		format_free(ft);
 		n++;

cmd-list-sessions.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -28,7 +27,7 @@
  * List all sessions.
  */
 
-enum cmd_retval	 cmd_list_sessions_exec(struct cmd *, struct cmd_q *);
+int	cmd_list_sessions_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_list_sessions_entry = {
 	"list-sessions", "ls",
@@ -40,8 +39,8 @@ const struct cmd_entry cmd_list_sessions_entry = {
 	cmd_list_sessions_exec
 };
 
-enum cmd_retval
+int
-cmd_list_sessions_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_sessions_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct session		*s;
@@ -50,8 +49,14 @@ cmd_list_sessions_exec(struct cmd *self, struct cmd_q *cmdq)
 	const char		*template;
 	char			*line;
 
-	if ((template = args_get(args, 'F')) == NULL)
+	template = args_get(args, 'F');
-		template = LIST_SESSIONS_TEMPLATE;
+	if (template == NULL) {
+		template = "#{session_name}: #{session_windows} windows "
+		    "(created #{session_created_string}) [#{session_width}x"
+		    "#{session_height}]#{?session_grouped, (group ,}"
+		    "#{session_group}#{?session_grouped,),}"
+		    "#{?session_attached, (attached),}";
+	}
 
 	n = 0;
 	RB_FOREACH(s, sessions, &sessions) {
@@ -60,12 +65,12 @@ cmd_list_sessions_exec(struct cmd *self, struct cmd_q *cmdq)
 		format_session(ft, s);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		ctx->print(ctx, "%s", line);
-		free(line);
+		xfree(line);
 
 		format_free(ft);
 		n++;
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-list-windows.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "tmux.h"
@@ -27,15 +26,15 @@
  * List windows on given session.
  */
 
-enum cmd_retval	 cmd_list_windows_exec(struct cmd *, struct cmd_q *);
+int	cmd_list_windows_exec(struct cmd *, struct cmd_ctx *);
 
-void	cmd_list_windows_server(struct cmd *, struct cmd_q *);
+void	cmd_list_windows_server(struct cmd *, struct cmd_ctx *);
 void	cmd_list_windows_session(
-	    struct cmd *, struct session *, struct cmd_q *, int);
+	    struct cmd *, struct session *, struct cmd_ctx *, int);
 
 const struct cmd_entry cmd_list_windows_entry = {
 	"list-windows", "lsw",
-	"F:at:", 0, 0,
+	"aF:t:", 0, 0,
 	"[-a] [-F format] " CMD_TARGET_SESSION_USAGE,
 	0,
 	NULL,
@@ -43,36 +42,36 @@ const struct cmd_entry cmd_list_windows_entry = {
 	cmd_list_windows_exec
 };
 
-enum cmd_retval
+int
-cmd_list_windows_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct session	*s;
 
 	if (args_has(args, 'a'))
-		cmd_list_windows_server(self, cmdq);
+		cmd_list_windows_server(self, ctx);
 	else {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		s = cmd_find_session(ctx, args_get(args, 't'), 0);
 		if (s == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
-		cmd_list_windows_session(self, s, cmdq, 0);
+		cmd_list_windows_session(self, s, ctx, 0);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
 void
-cmd_list_windows_server(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_windows_server(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct session	*s;
 
 	RB_FOREACH(s, sessions, &sessions)
-		cmd_list_windows_session(self, s, cmdq, 1);
+		cmd_list_windows_session(self, s, ctx, 1);
 }
 
 void
 cmd_list_windows_session(
-    struct cmd *self, struct session *s, struct cmd_q *cmdq, int type)
+    struct cmd *self, struct session *s, struct cmd_ctx *ctx, int type)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
@@ -85,10 +84,18 @@ cmd_list_windows_session(
 	if (template == NULL) {
 		switch (type) {
 		case 0:
-			template = LIST_WINDOWS_TEMPLATE;
+			template = "#{window_index}: "
+			    "#{window_name} "
+			    "[#{window_width}x#{window_height}] "
+			    "[layout #{window_layout}]"
+			    "#{?window_active, (active),}";
 			break;
 		case 1:
-			template = LIST_WINDOWS_WITH_SESSION_TEMPLATE;
+			template = "#{session_name}:#{window_index}: "
+			    "#{window_name} "
+			    "[#{window_width}x#{window_height}] "
+			    "[layout #{window_layout}]"
+			    "#{?window_active, (active),}";
 			break;
 		}
 	}
@@ -99,11 +106,10 @@ cmd_list_windows_session(
 		format_add(ft, "line", "%u", n);
 		format_session(ft, s);
 		format_winlink(ft, s, wl);
-		format_window_pane(ft, wl->window->active);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		ctx->print(ctx, "%s", line);
-		free(line);
+		xfree(line);
 
 		format_free(ft);
 		n++;

cmd-list.c

@@ -18,14 +18,12 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
 
 struct cmd_list *
-cmd_list_parse(int argc, char **argv, const char* file, u_int line,
+cmd_list_parse(int argc, char **argv, char **cause)
-    char **cause)
 {
 	struct cmd_list	*cmdlist;
 	struct cmd	*cmd;
@@ -35,7 +33,7 @@ cmd_list_parse(int argc, char **argv, const char* file, u_int line,
 
 	copy_argv = cmd_copy_argv(argc, argv);
 
-	cmdlist = xcalloc(1, sizeof *cmdlist);
+	cmdlist = xmalloc(sizeof *cmdlist);
 	cmdlist->references = 1;
 	TAILQ_INIT(&cmdlist->list);
 
@@ -56,7 +54,7 @@ cmd_list_parse(int argc, char **argv, const char* file, u_int line,
 		if (arglen != 1)
 			new_argc++;
 
-		cmd = cmd_parse(new_argc, new_argv, file, line, cause);
+		cmd = cmd_parse(new_argc, new_argv, cause);
 		if (cmd == NULL)
 			goto bad;
 		TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
@@ -65,8 +63,7 @@ cmd_list_parse(int argc, char **argv, const char* file, u_int line,
 	}
 
 	if (lastsplit != argc) {
-		cmd = cmd_parse(argc - lastsplit, copy_argv + lastsplit,
+		cmd = cmd_parse(argc - lastsplit, copy_argv + lastsplit, cause);
-		    file, line, cause);
 		if (cmd == NULL)
 			goto bad;
 		TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
@@ -81,22 +78,56 @@ bad:
 	return (NULL);
 }
 
+int
+cmd_list_exec(struct cmd_list *cmdlist, struct cmd_ctx *ctx)
+{
+	struct cmd	*cmd;
+	int		 n, retval;
+
+	retval = 0;
+	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
+		if ((n = cmd_exec(cmd, ctx)) == -1)
+			return (-1);
+
+		/*
+		 * A 1 return value means the command client is being attached
+		 * (sent MSG_READY).
+		 */
+		if (n == 1) {
+			retval = 1;
+
+			/*
+			 * The command client has been attached, so mangle the
+			 * context to treat any following commands as if they
+			 * were called from inside.
+			 */
+			if (ctx->curclient == NULL) {
+				ctx->curclient = ctx->cmdclient;
+				ctx->cmdclient = NULL;
+
+				ctx->error = key_bindings_error;
+				ctx->print = key_bindings_print;
+				ctx->info = key_bindings_info;
+			}
+		}
+	}
+	return (retval);
+}
+
 void
 cmd_list_free(struct cmd_list *cmdlist)
 {
-	struct cmd	*cmd, *cmd1;
+	struct cmd	*cmd;
 
 	if (--cmdlist->references != 0)
 		return;
 
-	TAILQ_FOREACH_SAFE(cmd, &cmdlist->list, qentry, cmd1) {
+	while (!TAILQ_EMPTY(&cmdlist->list)) {
+		cmd = TAILQ_FIRST(&cmdlist->list);
 		TAILQ_REMOVE(&cmdlist->list, cmd, qentry);
-		args_free(cmd->args);
+		cmd_free(cmd);
-		free(cmd->file);
-		free(cmd);
 	}
-
+	xfree(cmdlist);
-	free(cmdlist);
 }
 
 size_t

cmd-load-buffer.c

@@ -30,8 +30,8 @@
  * Loads a paste buffer from a file.
  */
 
-enum cmd_retval	 cmd_load_buffer_exec(struct cmd *, struct cmd_q *);
+int	cmd_load_buffer_exec(struct cmd *, struct cmd_ctx *);
-void		 cmd_load_buffer_callback(struct client *, int, void *);
+void	cmd_load_buffer_callback(struct client *, void *);
 
 const struct cmd_entry cmd_load_buffer_entry = {
 	"load-buffer", "loadb",
@@ -43,48 +43,60 @@ const struct cmd_entry cmd_load_buffer_entry = {
 	cmd_load_buffer_exec
 };
 
-enum cmd_retval
+int
-cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
-	struct client	*c = cmdq->client;
+	struct client	*c = ctx->cmdclient;
 	struct session  *s;
 	FILE		*f;
 	const char	*path, *newpath, *wd;
 	char		*pdata, *new_pdata, *cause;
 	size_t		 psize;
 	u_int		 limit;
-	int		 ch, error, buffer, *buffer_ptr;
+	int		 ch, buffer;
+	int		*buffer_ptr;
 
 	if (!args_has(args, 'b'))
 		buffer = -1;
 	else {
 		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "buffer %s", cause);
+			ctx->error(ctx, "buffer %s", cause);
-			free(cause);
+			xfree(cause);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	}
 
 	path = args->argv[0];
 	if (strcmp(path, "-") == 0) {
+		if (c == NULL) {
+			ctx->error(ctx, "%s: can't read from stdin", path);
+			return (-1);
+		}
+		if (c->flags & CLIENT_TERMINAL) {
+			ctx->error(ctx, "%s: stdin is a tty", path);
+			return (-1);
+		}
+		if (c->stdin_fd == -1) {
+			ctx->error(ctx, "%s: can't read from stdin", path);
+			return (-1);
+		}
+
 		buffer_ptr = xmalloc(sizeof *buffer_ptr);
 		*buffer_ptr = buffer;
 
-		error = server_set_stdin_callback (c, cmd_load_buffer_callback,
+		c->stdin_data = buffer_ptr;
-		    buffer_ptr, &cause);
+		c->stdin_callback = cmd_load_buffer_callback;
-		if (error != 0) {
+
-			cmdq_error(cmdq, "%s: %s", path, cause);
+		c->references++;
-			free(cause);
+		bufferevent_enable(c->stdin_event, EV_READ);
-			return (CMD_RETURN_ERROR);
+		return (1);
-		}
-		return (CMD_RETURN_WAIT);
 	}
 
 	if (c != NULL)
 		wd = c->cwd;
-	else if ((s = cmd_current_session(cmdq, 0)) != NULL) {
+	else if ((s = cmd_current_session(ctx, 0)) != NULL) {
 		wd = options_get_string(&s->options, "default-path");
 		if (*wd == '\0')
 			wd = s->cwd;
@@ -96,8 +108,8 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 			path = newpath;
 	}
 	if ((f = fopen(path, "rb")) == NULL) {
-		cmdq_error(cmdq, "%s: %s", path, strerror(errno));
+		ctx->error(ctx, "%s: %s", path, strerror(errno));
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	pdata = NULL;
@@ -105,14 +117,14 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 	while ((ch = getc(f)) != EOF) {
 		/* Do not let the server die due to memory exhaustion. */
 		if ((new_pdata = realloc(pdata, psize + 2)) == NULL) {
-			cmdq_error(cmdq, "realloc error: %s", strerror(errno));
+			ctx->error(ctx, "realloc error: %s", strerror(errno));
 			goto error;
 		}
 		pdata = new_pdata;
 		pdata[psize++] = ch;
 	}
 	if (ferror(f)) {
-		cmdq_error(cmdq, "%s: read error", path);
+		ctx->error(ctx, "%s: read error", path);
 		goto error;
 	}
 	if (pdata != NULL)
@@ -123,59 +135,55 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 	limit = options_get_number(&global_options, "buffer-limit");
 	if (buffer == -1) {
 		paste_add(&global_buffers, pdata, psize, limit);
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	}
 	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
-		cmdq_error(cmdq, "no buffer %d", buffer);
+		ctx->error(ctx, "no buffer %d", buffer);
-		free(pdata);
+		xfree(pdata);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 
 error:
-	free(pdata);
+	if (pdata != NULL)
+		xfree(pdata);
 	if (f != NULL)
 		fclose(f);
-	return (CMD_RETURN_ERROR);
+	return (-1);
 }
 
 void
-cmd_load_buffer_callback(struct client *c, int closed, void *data)
+cmd_load_buffer_callback(struct client *c, void *data)
 {
 	int	*buffer = data;
 	char	*pdata;
 	size_t	 psize;
 	u_int	 limit;
 
-	if (!closed)
+	/*
-		return;
+	 * Event callback has already checked client is not dead and reduced
-	c->stdin_callback = NULL;
+	 * its reference count. But tell it to exit.
+	 */
+	c->flags |= CLIENT_EXIT;
 
-	c->references--;
+	psize = EVBUFFER_LENGTH(c->stdin_event->input);
-	if (c->flags & CLIENT_DEAD)
-		return;
-
-	psize = EVBUFFER_LENGTH(c->stdin_data);
 	if (psize == 0 || (pdata = malloc(psize + 1)) == NULL) {
-		free(data);
+		xfree(data);
-		goto out;
+		return;
 	}
-	memcpy(pdata, EVBUFFER_DATA(c->stdin_data), psize);
+	bufferevent_read(c->stdin_event, pdata, psize);
 	pdata[psize] = '\0';
-	evbuffer_drain(c->stdin_data, psize);
 
 	limit = options_get_number(&global_options, "buffer-limit");
 	if (*buffer == -1)
 		paste_add(&global_buffers, pdata, psize, limit);
 	else if (paste_replace(&global_buffers, *buffer, pdata, psize) != 0) {
 		/* No context so can't use server_client_msg_error. */
-		evbuffer_add_printf(c->stderr_data, "no buffer %d\n", *buffer);
+		evbuffer_add_printf(
-		server_push_stderr(c);
+		    c->stderr_event->output, "no buffer %d\n", *buffer);
+		bufferevent_enable(c->stderr_event, EV_WRITE);
 	}
 
-	free(data);
+	xfree(data);
-
-out:
-	cmdq_continue(c->cmdq);
 }

cmd-lock-server.c

@@ -28,7 +28,7 @@
  * Lock commands.
  */
 
-enum cmd_retval	 cmd_lock_server_exec(struct cmd *, struct cmd_q *);
+int	cmd_lock_server_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_lock_server_entry = {
 	"lock-server", "lock",
@@ -60,8 +60,9 @@ const struct cmd_entry cmd_lock_client_entry = {
 	cmd_lock_server_exec
 };
 
-enum cmd_retval
+/* ARGSUSED */
-cmd_lock_server_exec(struct cmd *self, unused struct cmd_q *cmdq)
+int
+cmd_lock_server_exec(struct cmd *self, unused struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct client	*c;
@@ -70,17 +71,15 @@ cmd_lock_server_exec(struct cmd *self, unused struct cmd_q *cmdq)
 	if (self->entry == &cmd_lock_server_entry)
 		server_lock();
 	else if (self->entry == &cmd_lock_session_entry) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
-		if (s == NULL)
+			return (-1);
-			return (CMD_RETURN_ERROR);
 		server_lock_session(s);
 	} else {
-		c = cmd_find_client(cmdq, args_get(args, 't'), 0);
+		if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
-		if (c == NULL)
+			return (-1);
-			return (CMD_RETURN_ERROR);
 		server_lock_client(c);
 	}
 	recalculate_sizes();
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-move-window.c

@@ -26,51 +26,41 @@
  * Move a window.
  */
 
-enum cmd_retval	 cmd_move_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_move_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_move_window_entry = {
 	"move-window", "movew",
-	"dkrs:t:", 0, 0,
+	"dks:t:", 0, 0,
-	"[-dkr] " CMD_SRCDST_WINDOW_USAGE,
+	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_move_window_exec
 };
 
-enum cmd_retval
+int
-cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
-	struct session	*src, *dst, *s;
+	struct session	*src, *dst;
 	struct winlink	*wl;
 	char		*cause;
 	int		 idx, kflag, dflag;
 
-	if (args_has(args, 'r')) {
+	if ((wl = cmd_find_window(ctx, args_get(args, 's'), &src)) == NULL)
-		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+		return (-1);
-			return (CMD_RETURN_ERROR);
+	if ((idx = cmd_find_index(ctx, args_get(args, 't'), &dst)) == -2)
-
+		return (-1);
-		session_renumber_windows(s);
-		recalculate_sizes();
-
-		return (CMD_RETURN_NORMAL);
-	}
-
-	if ((wl = cmd_find_window(cmdq, args_get(args, 's'), &src)) == NULL)
-		return (CMD_RETURN_ERROR);
-	if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &dst)) == -2)
-		return (CMD_RETURN_ERROR);
 
 	kflag = args_has(self->args, 'k');
 	dflag = args_has(self->args, 'd');
 	if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
-		cmdq_error(cmdq, "can't move window: %s", cause);
+		ctx->error(ctx, "can't move window: %s", cause);
-		free(cause);
+		xfree(cause);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	server_unlink_window(src, wl);
 	recalculate_sizes();
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-new-session.c

@@ -30,80 +30,86 @@
  * Create a new session and attach to the current terminal unless -d is given.
  */
 
-enum cmd_retval	 cmd_new_session_check(struct args *);
+int	cmd_new_session_check(struct args *);
-enum cmd_retval	 cmd_new_session_exec(struct cmd *, struct cmd_q *);
+int	cmd_new_session_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_new_session_entry = {
 	"new-session", "new",
-	"AdDF:n:Ps:t:x:y:", 0, 1,
+	"dn:s:t:x:y:", 0, 1,
-	"[-AdDP] [-F format] [-n window-name] [-s session-name] "
+	"[-d] [-n window-name] [-s session-name] [-t target-session] "
-	CMD_TARGET_SESSION_USAGE " [-x width] [-y height] [command]",
+	"[-x width] [-y height] [command]",
 	CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON,
 	NULL,
 	cmd_new_session_check,
 	cmd_new_session_exec
 };
 
-enum cmd_retval
+int
 cmd_new_session_check(struct args *args)
 {
 	if (args_has(args, 't') && (args->argc != 0 || args_has(args, 'n')))
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
-enum cmd_retval
+int
-cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
-	struct client		*c = cmdq->client;
+	struct session		*s, *old_s, *groupwith;
-	struct session		*s, *groupwith;
 	struct window		*w;
+	struct window_pane	*wp;
 	struct environ		 env;
 	struct termios		 tio, *tiop;
 	struct passwd		*pw;
 	const char		*newname, *target, *update, *cwd, *errstr;
-	const char		*template;
+	char			*overrides, *cmd, *cause;
-	char			*cmd, *cause, *cp;
 	int			 detached, idx;
-	u_int			 sx, sy;
+	u_int			 sx, sy, i;
-	int			 already_attached;
-	struct format_tree	*ft;
 
 	newname = args_get(args, 's');
 	if (newname != NULL) {
 		if (!session_check_name(newname)) {
-			cmdq_error(cmdq, "bad session name: %s", newname);
+			ctx->error(ctx, "bad session name: %s", newname);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 		if (session_find(newname) != NULL) {
-			if (args_has(args, 'A')) {
+			ctx->error(ctx, "duplicate session: %s", newname);
-				return (cmd_attach_session(cmdq, newname,
+			return (-1);
-				    args_has(args, 'D'), 0));
-			}
-			cmdq_error(cmdq, "duplicate session: %s", newname);
-			return (CMD_RETURN_ERROR);
 		}
 	}
 
 	target = args_get(args, 't');
 	if (target != NULL) {
-		groupwith = cmd_find_session(cmdq, target, 0);
+		groupwith = cmd_find_session(ctx, target, 0);
 		if (groupwith == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 	} else
 		groupwith = NULL;
 
+	/*
+	 * There are three cases:
+	 *
+	 * 1. If cmdclient is non-NULL, new-session has been called from the
+	 *    command-line - cmdclient is to become a new attached, interactive
+	 *    client. Unless -d is given, the terminal must be opened and then
+	 *    the client sent MSG_READY.
+	 *
+	 * 2. If cmdclient is NULL, new-session has been called from an
+	 *    existing client (such as a key binding).
+	 *
+	 * 3. Both are NULL, the command was in the configuration file. Treat
+	 *    this as if -d was given even if it was not.
+	 *
+	 * In all cases, a new additional session needs to be created and
+	 * (unless -d) set as the current session for the client.
+	 */
+
 	/* Set -d if no client. */
 	detached = args_has(args, 'd');
-	if (c == NULL)
+	if (ctx->cmdclient == NULL && ctx->curclient == NULL)
 		detached = 1;
 
-	/* Is this client already attached? */
-	already_attached = 0;
-	if (c != NULL && c->session != NULL)
-		already_attached = 1;
-
 	/*
 	 * Save the termios settings, part of which is used for new windows in
 	 * this session.
@@ -113,25 +119,32 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	 * before opening the terminal as that calls tcsetattr() to prepare for
 	 * tmux taking over.
 	 */
-	if (!detached && !already_attached && c->tty.fd != -1) {
+	if (ctx->cmdclient != NULL && ctx->cmdclient->tty.fd != -1) {
-		if (tcgetattr(c->tty.fd, &tio) != 0)
+		if (tcgetattr(ctx->cmdclient->tty.fd, &tio) != 0)
 			fatal("tcgetattr failed");
 		tiop = &tio;
 	} else
 		tiop = NULL;
 
 	/* Open the terminal if necessary. */
-	if (!detached && !already_attached) {
+	if (!detached && ctx->cmdclient != NULL) {
-		if (server_client_open(c, NULL, &cause) != 0) {
+		if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
-			cmdq_error(cmdq, "open terminal failed: %s", cause);
+			ctx->error(ctx, "not a terminal");
-			free(cause);
+			return (-1);
-			return (CMD_RETURN_ERROR);
+		}
+
+		overrides =
+		    options_get_string(&global_s_options, "terminal-overrides");
+		if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
+			ctx->error(ctx, "open terminal failed: %s", cause);
+			xfree(cause);
+			return (-1);
 		}
 	}
 
 	/* Get the new session working directory. */
-	if (c != NULL && c->cwd != NULL)
+	if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
-		cwd = c->cwd;
+		cwd = ctx->cmdclient->cwd;
 	else {
 		pw = getpwuid(getuid());
 		if (pw->pw_dir != NULL && *pw->pw_dir != '\0')
@@ -141,25 +154,32 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	}
 
 	/* Find new session size. */
-	if (c != NULL) {
+	if (ctx->cmdclient != NULL) {
-		sx = c->tty.sx;
+		sx = ctx->cmdclient->tty.sx;
-		sy = c->tty.sy;
+		sy = ctx->cmdclient->tty.sy;
+	} else if (ctx->curclient != NULL) {
+		sx = ctx->curclient->tty.sx;
+		sy = ctx->curclient->tty.sy;
 	} else {
 		sx = 80;
 		sy = 24;
 	}
-	if (detached && args_has(args, 'x')) {
+	if (detached) {
-		sx = strtonum(args_get(args, 'x'), 1, USHRT_MAX, &errstr);
+		if (args_has(args, 'x')) {
-		if (errstr != NULL) {
+			sx = strtonum(
-			cmdq_error(cmdq, "width %s", errstr);
+			    args_get(args, 'x'), 1, USHRT_MAX, &errstr);
-			return (CMD_RETURN_ERROR);
+			if (errstr != NULL) {
+				ctx->error(ctx, "width %s", errstr);
+				return (-1);
+			}
 		}
-	}
+		if (args_has(args, 'y')) {
-	if (detached && args_has(args, 'y')) {
+			sy = strtonum(
-		sy = strtonum(args_get(args, 'y'), 1, USHRT_MAX, &errstr);
+			    args_get(args, 'y'), 1, USHRT_MAX, &errstr);
-		if (errstr != NULL) {
+			if (errstr != NULL) {
-			cmdq_error(cmdq, "height %s", errstr);
+				ctx->error(ctx, "height %s", errstr);
-			return (CMD_RETURN_ERROR);
+				return (-1);
+			}
 		}
 	}
 	if (sy > 0 && options_get_number(&global_s_options, "status"))
@@ -180,23 +200,26 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	/* Construct the environment. */
 	environ_init(&env);
 	update = options_get_string(&global_s_options, "update-environment");
-	if (c != NULL)
+	if (ctx->cmdclient != NULL)
-		environ_update(update, &c->environ, &env);
+		environ_update(update, &ctx->cmdclient->environ, &env);
 
 	/* Create the new session. */
 	idx = -1 - options_get_number(&global_s_options, "base-index");
 	s = session_create(newname, cmd, cwd, &env, tiop, idx, sx, sy, &cause);
 	if (s == NULL) {
-		cmdq_error(cmdq, "create session failed: %s", cause);
+		ctx->error(ctx, "create session failed: %s", cause);
-		free(cause);
+		xfree(cause);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	environ_free(&env);
 
 	/* Set the initial window name if one given. */
 	if (cmd != NULL && args_has(args, 'n')) {
 		w = s->curw->window;
-		window_set_name(w, args_get(args, 'n'));
+
+		xfree(w->name);
+		w->name = xstrdup(args_get(args, 'n'));
+
 		options_set_number(&w->options, "automatic-rename", 0);
 	}
 
@@ -215,14 +238,23 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	 * taking this session and needs to get MSG_READY and stay around.
 	 */
 	if (!detached) {
-		if (!already_attached)
+		if (ctx->cmdclient != NULL) {
-			server_write_ready(c);
+			server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
-		else if (c->session != NULL)
+
-			c->last_session = c->session;
+			old_s = ctx->cmdclient->session;
-		c->session = s;
+			if (old_s != NULL)
-		notify_attached_session_changed(c);
+				ctx->cmdclient->last_session = old_s;
-		session_update_activity(s);
+			ctx->cmdclient->session = s;
-		server_redraw_client(c);
+			session_update_activity(s);
+			server_redraw_client(ctx->cmdclient);
+		} else {
+			old_s = ctx->curclient->session;
+			if (old_s != NULL)
+				ctx->curclient->last_session = old_s;
+			ctx->curclient->session = s;
+			session_update_activity(s);
+			server_redraw_client(ctx->curclient);
+		}
 	}
 	recalculate_sizes();
 	server_update_socket();
@@ -231,27 +263,17 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	 * If there are still configuration file errors to display, put the new
 	 * session's current window into more mode and display them now.
 	 */
-	if (cfg_finished)
+	if (cfg_finished && !ARRAY_EMPTY(&cfg_causes)) {
-		cfg_show_causes(s);
+		wp = s->curw->window->active;
-
+		window_pane_set_mode(wp, &window_copy_mode);
-	/* Print if requested. */
+		window_copy_init_for_output(wp);
-	if (args_has(args, 'P')) {
+		for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
-		if ((template = args_get(args, 'F')) == NULL)
+			cause = ARRAY_ITEM(&cfg_causes, i);
-			template = NEW_SESSION_TEMPLATE;
+			window_copy_add(wp, "%s", cause);
-
+			xfree(cause);
-		ft = format_create();
+		}
-		if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL)
+		ARRAY_FREE(&cfg_causes);
-			format_client(ft, c);
-		format_session(ft, s);
-
-		cp = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", cp);
-		free(cp);
-
-		format_free(ft);
 	}
 
-	if (!detached)
+	return (!detached);	/* 1 means don't tell command client to exit */
-		cmdq->client_exit = 0;
-	return (CMD_RETURN_NORMAL);
 }

cmd-new-window.c

@@ -26,35 +26,32 @@
  * Create a new window.
  */
 
-enum cmd_retval	cmd_new_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_new_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_new_window_entry = {
 	"new-window", "neww",
-	"ac:dF:kn:Pt:", 0, 1,
+	"adkn:Pt:", 0, 1,
-	"[-adkP] [-c start-directory] [-F format] [-n window-name] "
+	"[-adk] [-n window-name] [-t target-window] [command]",
-	CMD_TARGET_WINDOW_USAGE " [command]",
 	0,
 	NULL,
 	NULL,
 	cmd_new_window_exec
 };
 
-enum cmd_retval
+int
-cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct args		*args = self->args;
+	struct args	*args = self->args;
-	struct session		*s;
+	struct session	*s;
-	struct winlink		*wl;
+	struct winlink	*wl;
-	struct client		*c;
+	const char     	*cmd, *cwd;
-	const char		*cmd, *cwd, *template;
+	char		*cause;
-	char			*cause, *cp;
+	int		 idx, last, detached;
-	int			 idx, last, detached;
-	struct format_tree	*ft;
 
 	if (args_has(args, 'a')) {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
+		wl = cmd_find_window(ctx, args_get(args, 't'), &s);
 		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		idx = wl->idx + 1;
 
 		/* Find the next free index. */
@@ -63,8 +60,8 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 				break;
 		}
 		if (last == INT_MAX) {
-			cmdq_error(cmdq, "no free window indexes");
+			ctx->error(ctx, "no free window indexes");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 
 		/* Move everything from last - 1 to idx up a bit. */
@@ -74,8 +71,8 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 			server_unlink_window(s, wl);
 		}
 	} else {
-		if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &s)) == -2)
+		if ((idx = cmd_find_index(ctx, args_get(args, 't'), &s)) == -2)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 	}
 	detached = args_has(args, 'd');
 
@@ -87,7 +84,6 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		 * Can't use session_detach as it will destroy session if this
 		 * makes it empty.
 		 */
-		notify_window_unlinked(s, wl->window);
 		wl->flags &= ~WINLINK_ALERTFLAGS;
 		winlink_stack_remove(&s->lastw, wl);
 		winlink_remove(&s->windows, wl);
@@ -103,15 +99,15 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		cmd = options_get_string(&s->options, "default-command");
 	else
 		cmd = args->argv[0];
-	cwd = cmd_get_default_path(cmdq, args_get(args, 'c'));
+	cwd = cmd_get_default_path(ctx);
 
 	if (idx == -1)
 		idx = -1 - options_get_number(&s->options, "base-index");
 	wl = session_new(s, args_get(args, 'n'), cmd, cwd, idx, &cause);
 	if (wl == NULL) {
-		cmdq_error(cmdq, "create window failed: %s", cause);
+		ctx->error(ctx, "create window failed: %s", cause);
-		free(cause);
+		xfree(cause);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	if (!detached) {
 		session_select(s, wl->idx);
@@ -119,23 +115,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	} else
 		server_status_session_group(s);
 
-	if (args_has(args, 'P')) {
+	if (args_has(args, 'P'))
-		if ((template = args_get(args, 'F')) == NULL)
+		ctx->print(ctx, "%s:%u", s->name, wl->idx);
-			template = NEW_WINDOW_TEMPLATE;
+	return (0);
-
-		ft = format_create();
-		if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL)
-			format_client(ft, c);
-		format_session(ft, s);
-		format_winlink(ft, s, wl);
-		format_window_pane(ft, wl->window->active);
-
-		cp = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", cp);
-		free(cp);
-
-		format_free(ft);
-	}
-
-	return (CMD_RETURN_NORMAL);
 }

cmd-paste-buffer.c

@@ -27,23 +27,23 @@
  * Paste paste buffer if present.
  */
 
-enum cmd_retval	 cmd_paste_buffer_exec(struct cmd *, struct cmd_q *);
+int	cmd_paste_buffer_exec(struct cmd *, struct cmd_ctx *);
 
-void	cmd_paste_buffer_filter(struct window_pane *,
+void	cmd_paste_buffer_filter(
-	    const char *, size_t, const char *, int);
+	    struct window_pane *, const char *, size_t, const char *);
 
 const struct cmd_entry cmd_paste_buffer_entry = {
 	"paste-buffer", "pasteb",
-	"db:prs:t:", 0, 0,
+	"db:rs:t:", 0, 0,
-	"[-dpr] [-s separator] [-b buffer-index] " CMD_TARGET_PANE_USAGE,
+	"[-dr] [-s separator] [-b buffer-index] [-t target-pane]",
 	0,
 	NULL,
 	NULL,
 	cmd_paste_buffer_exec
 };
 
-enum cmd_retval
+int
-cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct window_pane	*wp;
@@ -52,19 +52,18 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 	const char		*sepstr;
 	char			*cause;
 	int			 buffer;
-	int			 pflag;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
+	if (cmd_find_pane(ctx, args_get(args, 't'), &s, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	if (!args_has(args, 'b'))
 		buffer = -1;
 	else {
 		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "buffer %s", cause);
+			ctx->error(ctx, "buffer %s", cause);
-			free(cause);
+			xfree(cause);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	}
 
@@ -73,8 +72,8 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 	else {
 		pb = paste_get_index(&global_buffers, buffer);
 		if (pb == NULL) {
-			cmdq_error(cmdq, "no buffer %d", buffer);
+			ctx->error(ctx, "no buffer %d", buffer);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	}
 
@@ -86,8 +85,7 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 			else
 				sepstr = "\r";
 		}
-		pflag = (wp->screen->mode & MODE_BRACKETPASTE);
+		cmd_paste_buffer_filter(wp, pb->data, pb->size, sepstr);
-		paste_send_pane(pb, wp, sepstr, args_has(args, 'p') && pflag);
 	}
 
 	/* Delete the buffer if -d. */
@@ -98,5 +96,26 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 			paste_free_index(&global_buffers, buffer);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
+}
+
+/* Add bytes to a buffer and filter '\n' according to separator. */
+void
+cmd_paste_buffer_filter(
+    struct window_pane *wp, const char *data, size_t size, const char *sep)
+{
+	const char	*end = data + size;
+	const char	*lf;
+	size_t		 seplen;
+
+	seplen = strlen(sep);
+	while ((lf = memchr(data, '\n', end - data)) != NULL) {
+		if (lf != data)
+			bufferevent_write(wp->event, data, lf - data);
+		bufferevent_write(wp->event, sep, seplen);
+		data = lf + 1;
+	}
+
+	if (end != data)
+		bufferevent_write(wp->event, data, end - data);
 }

cmd-pipe-pane.c

@@ -31,7 +31,7 @@
  * Open pipe to redirect pane output. If already open, close first.
  */
 
-enum cmd_retval	 cmd_pipe_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_pipe_pane_exec(struct cmd *, struct cmd_ctx *);
 
 void	cmd_pipe_pane_error_callback(struct bufferevent *, short, void *);
 
@@ -45,8 +45,8 @@ const struct cmd_entry cmd_pipe_pane_entry = {
 	cmd_pipe_pane_exec
 };
 
-enum cmd_retval
+int
-cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct client		*c;
@@ -54,9 +54,9 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	char			*command;
 	int			 old_fd, pipe_fd[2], null_fd;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
+	if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	c = cmd_find_client(cmdq, NULL, 1);
+	c = cmd_find_client(ctx, NULL);
 
 	/* Destroy the old pipe. */
 	old_fd = wp->pipe_fd;
@@ -68,7 +68,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	/* If no pipe command, that is enough. */
 	if (args->argc == 0 || *args->argv[0] == '\0')
-		return (CMD_RETURN_NORMAL);
+		return (0);
 
 	/*
 	 * With -o, only open the new pipe if there was no previous one. This
@@ -77,19 +77,19 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	 *	bind ^p pipep -o 'cat >>~/output'
 	 */
 	if (args_has(self->args, 'o') && old_fd != -1)
-		return (CMD_RETURN_NORMAL);
+		return (0);
 
 	/* Open the new pipe. */
 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_fd) != 0) {
-		cmdq_error(cmdq, "socketpair error: %s", strerror(errno));
+		ctx->error(ctx, "socketpair error: %s", strerror(errno));
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	/* Fork the child. */
 	switch (fork()) {
 	case -1:
-		cmdq_error(cmdq, "fork error: %s", strerror(errno));
+		ctx->error(ctx, "fork error: %s", strerror(errno));
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	case 0:
 		/* Child process. */
 		close(pipe_fd[0]);
@@ -126,10 +126,11 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 		bufferevent_enable(wp->pipe_event, EV_WRITE);
 
 		setblocking(wp->pipe_fd, 0);
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	}
 }
 
+/* ARGSUSED */
 void
 cmd_pipe_pane_error_callback(
     unused struct bufferevent *bufev, unused short what, void *data)

cmd-queue.c

@@ -1,282 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include "tmux.h"
-
-/* Create new command queue. */
-struct cmd_q *
-cmdq_new(struct client *c)
-{
-	struct cmd_q	*cmdq;
-
-	cmdq = xcalloc(1, sizeof *cmdq);
-	cmdq->references = 1;
-	cmdq->dead = 0;
-
-	cmdq->client = c;
-	cmdq->client_exit = 0;
-
-	TAILQ_INIT(&cmdq->queue);
-	cmdq->item = NULL;
-	cmdq->cmd = NULL;
-
-	return (cmdq);
-}
-
-/* Free command queue */
-int
-cmdq_free(struct cmd_q *cmdq)
-{
-	if (--cmdq->references != 0)
-		return (cmdq->dead);
-
-	cmdq_flush(cmdq);
-	free(cmdq);
-	return (1);
-}
-
-/* Show message from command. */
-void printflike2
-cmdq_print(struct cmd_q *cmdq, const char *fmt, ...)
-{
-	struct client	*c = cmdq->client;
-	struct window	*w;
-	va_list		 ap;
-
-	va_start(ap, fmt);
-
-	if (c == NULL)
-		/* nothing */;
-	else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
-		va_start(ap, fmt);
-		evbuffer_add_vprintf(c->stdout_data, fmt, ap);
-		va_end(ap);
-
-		evbuffer_add(c->stdout_data, "\n", 1);
-		server_push_stdout(c);
-	} else {
-		w = c->session->curw->window;
-		if (w->active->mode != &window_copy_mode) {
-			window_pane_reset_mode(w->active);
-			window_pane_set_mode(w->active, &window_copy_mode);
-			window_copy_init_for_output(w->active);
-		}
-		window_copy_vadd(w->active, fmt, ap);
-	}
-
-	va_end(ap);
-}
-
-/* Show info from command. */
-void printflike2
-cmdq_info(struct cmd_q *cmdq, const char *fmt, ...)
-{
-	struct client	*c = cmdq->client;
-	va_list		 ap;
-	char		*msg;
-
-	if (options_get_number(&global_options, "quiet"))
-		return;
-
-	va_start(ap, fmt);
-
-	if (c == NULL)
-		/* nothing */;
-	else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
-		va_start(ap, fmt);
-		evbuffer_add_vprintf(c->stdout_data, fmt, ap);
-		va_end(ap);
-
-		evbuffer_add(c->stdout_data, "\n", 1);
-		server_push_stdout(c);
-	} else {
-		xvasprintf(&msg, fmt, ap);
-		*msg = toupper((u_char) *msg);
-		status_message_set(c, "%s", msg);
-		free(msg);
-	}
-
-	va_end(ap);
-
-}
-
-/* Show error from command. */
-void printflike2
-cmdq_error(struct cmd_q *cmdq, const char *fmt, ...)
-{
-	struct client	*c = cmdq->client;
-	struct cmd	*cmd = cmdq->cmd;
-	va_list		 ap;
-	char		*msg, *cause;
-	size_t		 msglen;
-
-	va_start(ap, fmt);
-	msglen = xvasprintf(&msg, fmt, ap);
-	va_end(ap);
-
-	if (c == NULL) {
-		xasprintf(&cause, "%s:%u: %s", cmd->file, cmd->line, msg);
-		ARRAY_ADD(&cfg_causes, cause);
-	} else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
-		evbuffer_add(c->stderr_data, msg, msglen);
-		evbuffer_add(c->stderr_data, "\n", 1);
-
-		server_push_stderr(c);
-		c->retcode = 1;
-	} else {
-		*msg = toupper((u_char) *msg);
-		status_message_set(c, "%s", msg);
-	}
-
-	free(msg);
-}
-
-/* Print a guard line. */
-int
-cmdq_guard(struct cmd_q *cmdq, const char *guard)
-{
-	struct client	*c = cmdq->client;
-
-	if (c == NULL || c->session == NULL)
-		return 0;
-	if (!(c->flags & CLIENT_CONTROL))
-		return 0;
-
-	evbuffer_add_printf(c->stdout_data, "%%%s %ld %u\n", guard,
-	    (long) cmdq->time, cmdq->number);
-	server_push_stdout(c);
-	return 1;
-}
-
-/* Add command list to queue and begin processing if needed. */
-void
-cmdq_run(struct cmd_q *cmdq, struct cmd_list *cmdlist)
-{
-	cmdq_append(cmdq, cmdlist);
-
-	if (cmdq->item == NULL) {
-		cmdq->cmd = NULL;
-		cmdq_continue(cmdq);
-	}
-}
-
-/* Add command list to queue. */
-void
-cmdq_append(struct cmd_q *cmdq, struct cmd_list *cmdlist)
-{
-	struct cmd_q_item	*item;
-
-	item = xcalloc(1, sizeof *item);
-	item->cmdlist = cmdlist;
-	TAILQ_INSERT_TAIL(&cmdq->queue, item, qentry);
-	cmdlist->references++;
-}
-
-/* Continue processing command queue. Returns 1 if finishes empty. */
-int
-cmdq_continue(struct cmd_q *cmdq)
-{
-	struct cmd_q_item	*next;
-	enum cmd_retval		 retval;
-	int			 empty, guard;
-	char			 s[1024];
-
-	notify_disable();
-
-	empty = TAILQ_EMPTY(&cmdq->queue);
-	if (empty)
-		goto empty;
-
-	if (cmdq->item == NULL) {
-		cmdq->item = TAILQ_FIRST(&cmdq->queue);
-		cmdq->cmd = TAILQ_FIRST(&cmdq->item->cmdlist->list);
-	} else
-		cmdq->cmd = TAILQ_NEXT(cmdq->cmd, qentry);
-
-	do {
-		next = TAILQ_NEXT(cmdq->item, qentry);
-
-		while (cmdq->cmd != NULL) {
-			cmd_print(cmdq->cmd, s, sizeof s);
-			log_debug("cmdq %p: %s (client %d)", cmdq, s,
-			    cmdq->client != NULL ? cmdq->client->ibuf.fd : -1);
-
-			cmdq->time = time(NULL);
-			cmdq->number++;
-
-			guard = cmdq_guard(cmdq, "begin");
-			retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
-			if (guard) {
-				if (retval == CMD_RETURN_ERROR)
-				    cmdq_guard(cmdq, "error");
-				else
-				    cmdq_guard(cmdq, "end");
-			}
-
-			if (retval == CMD_RETURN_ERROR)
-				break;
-			if (retval == CMD_RETURN_WAIT)
-				goto out;
-			if (retval == CMD_RETURN_STOP) {
-				cmdq_flush(cmdq);
-				goto empty;
-			}
-
-			cmdq->cmd = TAILQ_NEXT(cmdq->cmd, qentry);
-		}
-
-		TAILQ_REMOVE(&cmdq->queue, cmdq->item, qentry);
-		cmd_list_free(cmdq->item->cmdlist);
-		free(cmdq->item);
-
-		cmdq->item = next;
-		if (cmdq->item != NULL)
-			cmdq->cmd = TAILQ_FIRST(&cmdq->item->cmdlist->list);
-	} while (cmdq->item != NULL);
-
-empty:
-	if (cmdq->client_exit)
-		cmdq->client->flags |= CLIENT_EXIT;
-	if (cmdq->emptyfn != NULL)
-		cmdq->emptyfn(cmdq); /* may free cmdq */
-	empty = 1;
-
-out:
-	notify_enable();
-	return (empty);
-}
-
-/* Flush command queue. */
-void
-cmdq_flush(struct cmd_q *cmdq)
-{
-	struct cmd_q_item	*item, *item1;
-
-	TAILQ_FOREACH_SAFE(item, &cmdq->queue, qentry, item1) {
-		TAILQ_REMOVE(&cmdq->queue, item, qentry);
-		cmd_list_free(item->cmdlist);
-		free(item);
-	}
-	cmdq->item = NULL;
-}

cmd-refresh-client.c

@@ -24,54 +24,32 @@
  * Refresh client.
  */
 
-enum cmd_retval	 cmd_refresh_client_exec(struct cmd *, struct cmd_q *);
+int	cmd_refresh_client_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_refresh_client_entry = {
 	"refresh-client", "refresh",
-	"C:St:", 0, 0,
+	"St:", 0, 0,
-	"[-S] [-C size]" CMD_TARGET_CLIENT_USAGE,
+	"[-S] " CMD_TARGET_CLIENT_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_refresh_client_exec
 };
 
-enum cmd_retval
+int
-cmd_refresh_client_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_refresh_client_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct client	*c;
-	const char	*size;
-	u_int		 w, h;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
-	if (args_has(args, 'C')) {
+	if (args_has(args, 'S')) {
-		if ((size = args_get(args, 'C')) == NULL) {
-			cmdq_error(cmdq, "missing size");
-			return (CMD_RETURN_ERROR);
-		}
-		if (sscanf(size, "%u,%u", &w, &h) != 2) {
-			cmdq_error(cmdq, "bad size argument");
-			return (CMD_RETURN_ERROR);
-		}
-		if (w < PANE_MINIMUM || w > 5000 ||
-		    h < PANE_MINIMUM || h > 5000) {
-			cmdq_error(cmdq, "size too small or too big");
-			return (CMD_RETURN_ERROR);
-		}
-		if (!(c->flags & CLIENT_CONTROL)) {
-			cmdq_error(cmdq, "not a control client");
-			return (CMD_RETURN_ERROR);
-		}
-		if (tty_set_size(&c->tty, w, h))
-			recalculate_sizes();
-	} else if (args_has(args, 'S')) {
 		status_update_jobs(c);
 		server_status_client(c);
 	} else
 		server_redraw_client(c);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-rename-session.c

@@ -26,7 +26,7 @@
  * Change session name.
  */
 
-enum cmd_retval	 cmd_rename_session_exec(struct cmd *, struct cmd_q *);
+int	cmd_rename_session_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_rename_session_entry = {
 	"rename-session", "rename",
@@ -38,8 +38,8 @@ const struct cmd_entry cmd_rename_session_entry = {
 	cmd_rename_session_exec
 };
 
-enum cmd_retval
+int
-cmd_rename_session_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_rename_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct session	*s;
@@ -47,24 +47,23 @@ cmd_rename_session_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	newname = args->argv[0];
 	if (!session_check_name(newname)) {
-		cmdq_error(cmdq, "bad session name: %s", newname);
+		ctx->error(ctx, "bad session name: %s", newname);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	if (session_find(newname) != NULL) {
-		cmdq_error(cmdq, "duplicate session: %s", newname);
+		ctx->error(ctx, "duplicate session: %s", newname);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+	if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	RB_REMOVE(sessions, &sessions, s);
-	free(s->name);
+	xfree(s->name);
 	s->name = xstrdup(newname);
 	RB_INSERT(sessions, &sessions, s);
 
 	server_status_session(s);
-	notify_session_renamed(s);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-rename-window.c

@@ -26,7 +26,7 @@
  * Rename a window.
  */
 
-enum cmd_retval	 cmd_rename_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_rename_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_rename_window_entry = {
 	"rename-window", "renamew",
@@ -38,20 +38,21 @@ const struct cmd_entry cmd_rename_window_entry = {
 	cmd_rename_window_exec
 };
 
-enum cmd_retval
+int
-cmd_rename_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_rename_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct session	*s;
 	struct winlink	*wl;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
-	window_set_name(wl->window, args->argv[0]);
+	xfree(wl->window->name);
+	wl->window->name = xstrdup(args->argv[0]);
 	options_set_number(&wl->window->options, "automatic-rename", 0);
 
 	server_status_window(wl->window);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-resize-pane.c

@@ -26,13 +26,13 @@
  * Increase or decrease pane size.
  */
 
-void		 cmd_resize_pane_key_binding(struct cmd *, int);
+void	cmd_resize_pane_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_resize_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_resize_pane_entry = {
 	"resize-pane", "resizep",
-	"DLRt:Ux:y:Z", 0, 1,
+	"DLRt:U", 0, 1,
-	"[-DLRUZ] [-x width] [-y height] " CMD_TARGET_PANE_USAGE " [adjustment]",
+	"[-DLRU] " CMD_TARGET_PANE_USAGE " [adjustment]",
 	0,
 	cmd_resize_pane_key_binding,
 	NULL,
@@ -75,74 +75,34 @@ cmd_resize_pane_key_binding(struct cmd *self, int key)
 		self->args = args_create(1, "5");
 		args_set(self->args, 'R', NULL);
 		break;
-	case 'z':
-		self->args = args_create(0);
-		args_set(self->args, 'Z', NULL);
-		break;
 	default:
 		self->args = args_create(0);
 		break;
 	}
 }
 
-enum cmd_retval
+int
-cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
-	struct window		*w;
 	const char	       	*errstr;
-	char			*cause;
 	struct window_pane	*wp;
 	u_int			 adjust;
-	int			 x, y;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
+	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	w = wl->window;
-
-	if (args_has(args, 'Z')) {
-		if (w->flags & WINDOW_ZOOMED)
-			window_unzoom(w);
-		else
-			window_zoom(wp);
-		server_redraw_window(w);
-		server_status_window(w);
-		return (CMD_RETURN_NORMAL);
-	}
-	server_unzoom_window(w);
 
 	if (args->argc == 0)
 		adjust = 1;
 	else {
 		adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
 		if (errstr != NULL) {
-			cmdq_error(cmdq, "adjustment %s", errstr);
+			ctx->error(ctx, "adjustment %s", errstr);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	}
 
-	if (args_has(self->args, 'x')) {
-		x = args_strtonum(self->args, 'x', PANE_MINIMUM, INT_MAX,
-		    &cause);
-		if (cause != NULL) {
-			cmdq_error(cmdq, "width %s", cause);
-			free(cause);
-			return (CMD_RETURN_ERROR);
-		}
-		layout_resize_pane_to(wp, LAYOUT_LEFTRIGHT, x);
-	}
-	if (args_has(self->args, 'y')) {
-		y = args_strtonum(self->args, 'y', PANE_MINIMUM, INT_MAX,
-		    &cause);
-		if (cause != NULL) {
-			cmdq_error(cmdq, "height %s", cause);
-			free(cause);
-			return (CMD_RETURN_ERROR);
-		}
-		layout_resize_pane_to(wp, LAYOUT_TOPBOTTOM, y);
-	}
-
 	if (args_has(self->args, 'L'))
 		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, -adjust);
 	else if (args_has(self->args, 'R'))
@@ -153,5 +113,5 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust);
 	server_redraw_window(wl->window);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-respawn-pane.c

@@ -19,7 +19,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "tmux.h"
@@ -28,7 +27,7 @@
  * Respawn a pane (restart the command). Kill existing if -k given.
  */
 
-enum cmd_retval	 cmd_respawn_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_respawn_pane_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_respawn_pane_entry = {
 	"respawn-pane", "respawnp",
@@ -40,8 +39,8 @@ const struct cmd_entry cmd_respawn_pane_entry = {
 	cmd_respawn_pane_exec
 };
 
-enum cmd_retval
+int
-cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_respawn_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
@@ -53,16 +52,16 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	char			*cause;
 	u_int			 idx;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
+	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	w = wl->window;
 
 	if (!args_has(self->args, 'k') && wp->fd != -1) {
 		if (window_pane_index(wp, &idx) != 0)
 			fatalx("index not found");
-		cmdq_error(cmdq, "pane still active: %s:%u.%u",
+		ctx->error(ctx, "pane still active: %s:%u.%u",
 		    s->name, wl->idx, idx);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	environ_init(&env);
@@ -79,14 +78,14 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	else
 		cmd = NULL;
 	if (window_pane_spawn(wp, cmd, NULL, NULL, &env, s->tio, &cause) != 0) {
-		cmdq_error(cmdq, "respawn pane failed: %s", cause);
+		ctx->error(ctx, "respawn pane failed: %s", cause);
-		free(cause);
+		xfree(cause);
 		environ_free(&env);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	wp->flags |= PANE_REDRAW;
 	server_status_window(w);
 
 	environ_free(&env);
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-respawn-window.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "tmux.h"
@@ -27,7 +26,7 @@
  * Respawn a window (restart the command). Kill existing if -k given.
  */
 
-enum cmd_retval	 cmd_respawn_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_respawn_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_respawn_window_entry = {
 	"respawn-window", "respawnw",
@@ -39,8 +38,8 @@ const struct cmd_entry cmd_respawn_window_entry = {
 	cmd_respawn_window_exec
 };
 
-enum cmd_retval
+int
-cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
@@ -51,17 +50,17 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	const char		*cmd;
 	char		 	*cause;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	w = wl->window;
 
 	if (!args_has(self->args, 'k')) {
 		TAILQ_FOREACH(wp, &w->panes, entry) {
 			if (wp->fd == -1)
 				continue;
-			cmdq_error(cmdq,
+			ctx->error(ctx,
 			    "window still active: %s:%d", s->name, wl->idx);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	}
 
@@ -81,13 +80,13 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	else
 		cmd = NULL;
 	if (window_pane_spawn(wp, cmd, NULL, NULL, &env, s->tio, &cause) != 0) {
-		cmdq_error(cmdq, "respawn window failed: %s", cause);
+		ctx->error(ctx, "respawn window failed: %s", cause);
-		free(cause);
+		xfree(cause);
 		environ_free(&env);
 		server_destroy_pane(wp);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
-	layout_init(w, wp);
+	layout_init(w);
 	window_pane_reset_mode(wp);
 	screen_reinit(&wp->base);
 	input_init(wp);
@@ -97,5 +96,5 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	server_redraw_window(w);
 
 	environ_free(&env);
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-rotate-window.c

@@ -24,8 +24,8 @@
  * Rotate the panes in a window.
  */
 
-void		 cmd_rotate_window_key_binding(struct cmd *, int);
+void	cmd_rotate_window_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_rotate_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_rotate_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_rotate_window_entry = {
 	"rotate-window", "rotatew",
@@ -45,8 +45,8 @@ cmd_rotate_window_key_binding(struct cmd *self, int key)
 		args_set(self->args, 'D', NULL);
 }
 
-enum cmd_retval
+int
-cmd_rotate_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_rotate_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
@@ -55,8 +55,8 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct layout_cell	*lc;
 	u_int			 sx, sy, xoff, yoff;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	w = wl->window;
 
 	if (args_has(self->args, 'D')) {
@@ -115,5 +115,5 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		server_redraw_window(w);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-run-shell.c

@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -29,16 +28,15 @@
  * Runs a command without a window.
  */
 
-enum cmd_retval	 cmd_run_shell_exec(struct cmd *, struct cmd_q *);
+int	cmd_run_shell_exec(struct cmd *, struct cmd_ctx *);
 
 void	cmd_run_shell_callback(struct job *);
 void	cmd_run_shell_free(void *);
-void	cmd_run_shell_print(struct job *, const char *);
 
 const struct cmd_entry cmd_run_shell_entry = {
 	"run-shell", "run",
-	"bt:", 1, 1,
+	"", 1, 1,
-	"[-b] " CMD_TARGET_PANE_USAGE " shell-command",
+	"command",
 	0,
 	NULL,
 	NULL,
@@ -47,97 +45,49 @@ const struct cmd_entry cmd_run_shell_entry = {
 
 struct cmd_run_shell_data {
 	char		*cmd;
-	struct cmd_q	*cmdq;
+	struct cmd_ctx	 ctx;
-	int		 bflag;
-	int		 wp_id;
 };
 
-void
+int
-cmd_run_shell_print(struct job *job, const char *msg)
+cmd_run_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
-	struct cmd_run_shell_data	*cdata = job->data;
-	struct window_pane		*wp = NULL;
-
-	if (cdata->wp_id != -1)
-		wp = window_pane_find_by_id(cdata->wp_id);
-	if (wp == NULL) {
-		cmdq_print(cdata->cmdq, "%s", msg);
-		return;
-	}
-
-	if (window_pane_set_mode(wp, &window_copy_mode) == 0)
-		window_copy_init_for_output(wp);
-	if (wp->mode == &window_copy_mode)
-		window_copy_add(wp, "%s", msg);
-}
-
-enum cmd_retval
-cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args			*args = self->args;
 	struct cmd_run_shell_data	*cdata;
-	char				*shellcmd;
+	const char			*shellcmd = args->argv[0];
-	struct client			*c;
-	struct session			*s = NULL;
-	struct winlink			*wl = NULL;
-	struct window_pane		*wp = NULL;
-	struct format_tree		*ft;
-
-	if (args_has(args, 't'))
-		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
-	else {
-		c = cmd_find_client(cmdq, NULL, 1);
-		if (c != NULL && c->session != NULL) {
-			s = c->session;
-			wl = s->curw;
-			wp = wl->window->active;
-		}
-	}
-
-	ft = format_create();
-	if (s != NULL)
-		format_session(ft, s);
-	if (s != NULL && wl != NULL)
-		format_winlink(ft, s, wl);
-	if (wp != NULL)
-		format_window_pane(ft, wp);
-	shellcmd = format_expand(ft, args->argv[0]);
-	format_free(ft);
 
 	cdata = xmalloc(sizeof *cdata);
-	cdata->cmd = shellcmd;
+	cdata->cmd = xstrdup(args->argv[0]);
-	cdata->bflag = args_has(args, 'b');
+	memcpy(&cdata->ctx, ctx, sizeof cdata->ctx);
-	cdata->wp_id = wp != NULL ? (int) wp->id : -1;
 
-	cdata->cmdq = cmdq;
+	if (ctx->cmdclient != NULL)
-	cmdq->references++;
+		ctx->cmdclient->references++;
+	if (ctx->curclient != NULL)
+		ctx->curclient->references++;
 
-	job_run(shellcmd, s, cmd_run_shell_callback, cmd_run_shell_free, cdata);
+	job_run(shellcmd, cmd_run_shell_callback, cmd_run_shell_free, cdata);
 
-	if (cdata->bflag)
+	return (1);	/* don't let client exit */
-		return (CMD_RETURN_NORMAL);
-	return (CMD_RETURN_WAIT);
 }
 
 void
 cmd_run_shell_callback(struct job *job)
 {
 	struct cmd_run_shell_data	*cdata = job->data;
-	struct cmd_q			*cmdq = cdata->cmdq;
+	struct cmd_ctx			*ctx = &cdata->ctx;
 	char				*cmd, *msg, *line;
 	size_t				 size;
 	int				 retcode;
 	u_int				 lines;
 
-	if (cmdq->dead)
+	if (ctx->cmdclient != NULL && ctx->cmdclient->flags & CLIENT_DEAD)
+		return;
+	if (ctx->curclient != NULL && ctx->curclient->flags & CLIENT_DEAD)
 		return;
-	cmd = cdata->cmd;
 
 	lines = 0;
 	do {
 		if ((line = evbuffer_readline(job->event->input)) != NULL) {
-			cmd_run_shell_print(job, line);
+			ctx->print(ctx, "%s", line);
-			free(line);
 			lines++;
 		}
 	} while (line != NULL);
@@ -148,12 +98,14 @@ cmd_run_shell_callback(struct job *job)
 		memcpy(line, EVBUFFER_DATA(job->event->input), size);
 		line[size] = '\0';
 
-		cmd_run_shell_print(job, line);
+		ctx->print(ctx, "%s", line);
 		lines++;
 
-		free(line);
+		xfree(line);
 	}
 
+	cmd = cdata->cmd;
+
 	msg = NULL;
 	if (WIFEXITED(job->status)) {
 		if ((retcode = WEXITSTATUS(job->status)) != 0)
@@ -163,11 +115,11 @@ cmd_run_shell_callback(struct job *job)
 		xasprintf(&msg, "'%s' terminated by signal %d", cmd, retcode);
 	}
 	if (msg != NULL) {
-		if (lines == 0)
+		if (lines != 0)
-			cmdq_info(cmdq, "%s", msg);
+			ctx->print(ctx, "%s", msg);
 		else
-			cmd_run_shell_print(job, msg);
+			ctx->info(ctx, "%s", msg);
-		free(msg);
+		xfree(msg);
 	}
 }
 
@@ -175,11 +127,15 @@ void
 cmd_run_shell_free(void *data)
 {
 	struct cmd_run_shell_data	*cdata = data;
-	struct cmd_q			*cmdq = cdata->cmdq;
+	struct cmd_ctx			*ctx = &cdata->ctx;
 
-	if (!cmdq_free(cmdq) && !cdata->bflag)
+	if (ctx->cmdclient != NULL) {
-		cmdq_continue(cmdq);
+		ctx->cmdclient->references--;
+		ctx->cmdclient->flags |= CLIENT_EXIT;
+	}
+	if (ctx->curclient != NULL)
+		ctx->curclient->references--;
 
-	free(cdata->cmd);
+	xfree(cdata->cmd);
-	free(cdata);
+	xfree(cdata);
 }

cmd-save-buffer.c

@@ -20,7 +20,6 @@
 #include <sys/stat.h>
 
 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -29,144 +28,90 @@
  * Saves a paste buffer to a file.
  */
 
-enum cmd_retval	 cmd_save_buffer_exec(struct cmd *, struct cmd_q *);
+int	cmd_save_buffer_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_save_buffer_entry = {
 	"save-buffer", "saveb",
 	"ab:", 1, 1,
-	"[-a] " CMD_BUFFER_USAGE " path",
+	"[-a] " CMD_BUFFER_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_save_buffer_exec
 };
 
-const struct cmd_entry cmd_show_buffer_entry = {
+int
-	"show-buffer", "showb",
+cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
-	"b:", 0, 0,
-	CMD_BUFFER_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_save_buffer_exec
-};
-
-enum cmd_retval
-cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
-	struct client		*c;
+	struct client		*c = ctx->cmdclient;
 	struct session          *s;
 	struct paste_buffer	*pb;
 	const char		*path, *newpath, *wd;
-	char			*cause, *start, *end;
+	char			*cause;
-	size_t			 size, used;
 	int			 buffer;
 	mode_t			 mask;
 	FILE			*f;
-	char			*msg;
-	size_t			 msglen;
 
 	if (!args_has(args, 'b')) {
 		if ((pb = paste_get_top(&global_buffers)) == NULL) {
-			cmdq_error(cmdq, "no buffers");
+			ctx->error(ctx, "no buffers");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	} else {
 		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "buffer %s", cause);
+			ctx->error(ctx, "buffer %s", cause);
-			free(cause);
+			xfree(cause);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 
 		pb = paste_get_index(&global_buffers, buffer);
 		if (pb == NULL) {
-			cmdq_error(cmdq, "no buffer %d", buffer);
+			ctx->error(ctx, "no buffer %d", buffer);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	}
 
-	if (self->entry == &cmd_show_buffer_entry)
+	path = args->argv[0];
-		path = "-";
-	else
-		path = args->argv[0];
 	if (strcmp(path, "-") == 0) {
-		c = cmdq->client;
 		if (c == NULL) {
-			cmdq_error(cmdq, "can't write to stdout");
+			ctx->error(ctx, "%s: can't write to stdout", path);
-			return (CMD_RETURN_ERROR);
+			return (-1);
+		}
+		bufferevent_write(c->stdout_event, pb->data, pb->size);
+	} else {
+		if (c != NULL)
+			wd = c->cwd;
+		else if ((s = cmd_current_session(ctx, 0)) != NULL) {
+			wd = options_get_string(&s->options, "default-path");
+			if (*wd == '\0')
+				wd = s->cwd;
+		} else
+			wd = NULL;
+		if (wd != NULL && *wd != '\0') {
+			newpath = get_full_path(wd, path);
+			if (newpath != NULL)
+				path = newpath;
 		}
-		if (c->session == NULL || (c->flags & CLIENT_CONTROL))
-			goto do_stdout;
-		goto do_print;
-	}
 
-	c = cmdq->client;
+		mask = umask(S_IRWXG | S_IRWXO);
-	if (c != NULL)
+		if (args_has(self->args, 'a'))
-		wd = c->cwd;
+			f = fopen(path, "ab");
-	else if ((s = cmd_current_session(cmdq, 0)) != NULL) {
-		wd = options_get_string(&s->options, "default-path");
-		if (*wd == '\0')
-			wd = s->cwd;
-	} else
-		wd = NULL;
-	if (wd != NULL && *wd != '\0') {
-		newpath = get_full_path(wd, path);
-		if (newpath != NULL)
-			path = newpath;
-	}
-
-	mask = umask(S_IRWXG | S_IRWXO);
-	if (args_has(self->args, 'a'))
-		f = fopen(path, "ab");
-	else
-		f = fopen(path, "wb");
-	umask(mask);
-	if (f == NULL) {
-		cmdq_error(cmdq, "%s: %s", path, strerror(errno));
-		return (CMD_RETURN_ERROR);
-	}
-	if (fwrite(pb->data, 1, pb->size, f) != pb->size) {
-		cmdq_error(cmdq, "%s: fwrite error", path);
-		fclose(f);
-		return (CMD_RETURN_ERROR);
-	}
-	fclose(f);
-
-	return (CMD_RETURN_NORMAL);
-
-do_stdout:
-	evbuffer_add(c->stdout_data, pb->data, pb->size);
-	server_push_stdout(c);
-	return (CMD_RETURN_NORMAL);
-
-do_print:
-	if (pb->size > (INT_MAX / 4) - 1) {
-		cmdq_error(cmdq, "buffer too big");
-		return (CMD_RETURN_ERROR);
-	}
-	msg = NULL;
-	msglen = 0;
-
-	used = 0;
-	while (used != pb->size) {
-		start = pb->data + used;
-		end = memchr(start, '\n', pb->size - used);
-		if (end != NULL)
-			size = end - start;
 		else
-			size = pb->size - used;
+			f = fopen(path, "wb");
-
+		umask(mask);
-		msglen = size * 4 + 1;
+		if (f == NULL) {
-		msg = xrealloc(msg, 1, msglen);
+			ctx->error(ctx, "%s: %s", path, strerror(errno));
-
+			return (-1);
-		strvisx(msg, start, size, VIS_OCTAL|VIS_TAB);
+		}
-		cmdq_print(cmdq, "%s", msg);
+		if (fwrite(pb->data, 1, pb->size, f) != pb->size) {
-
+			ctx->error(ctx, "%s: fwrite error", path);
-		used += size + (end != NULL);
+			fclose(f);
+			return (-1);
+		}
+		fclose(f);
 	}
 
-	free(msg);
+	return (0);
-	return (CMD_RETURN_NORMAL);
 }

cmd-select-layout.c

@@ -24,8 +24,8 @@
  * Switch window to selected layout.
  */
 
-void		 cmd_select_layout_key_binding(struct cmd *, int);
+void	cmd_select_layout_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_select_layout_exec(struct cmd *, struct cmd_q *);
+int	cmd_select_layout_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_select_layout_entry = {
 	"select-layout", "selectl",
@@ -82,17 +82,16 @@ cmd_select_layout_key_binding(struct cmd *self, int key)
 	}
 }
 
-enum cmd_retval
+int
-cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct winlink	*wl;
 	const char	*layoutname;
 	int		 next, previous, layout;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	server_unzoom_window(wl->window);
 
 	next = self->entry == &cmd_next_layout_entry;
 	if (args_has(self->args, 'n'))
@@ -106,9 +105,8 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
 			layout = layout_set_next(wl->window);
 		else
 			layout = layout_set_previous(wl->window);
-		server_redraw_window(wl->window);
+		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
-		cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout));
+		return (0);
-		return (CMD_RETURN_NORMAL);
 	}
 
 	if (args->argc == 0)
@@ -117,19 +115,19 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
 		layout = layout_set_lookup(args->argv[0]);
 	if (layout != -1) {
 		layout = layout_set_select(wl->window, layout);
-		server_redraw_window(wl->window);
+		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
-		cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout));
+		return (0);
-		return (CMD_RETURN_NORMAL);
 	}
 
 	if (args->argc != 0) {
 		layoutname = args->argv[0];
 		if (layout_parse(wl->window, layoutname) == -1) {
-			cmdq_error(cmdq, "can't set layout: %s", layoutname);
+			ctx->error(ctx, "can't set layout: %s", layoutname);
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
-		server_redraw_window(wl->window);
+		ctx->info(ctx, "arranging in: %s", layoutname);
-		cmdq_info(cmdq, "arranging in: %s", layoutname);
+		return (0);
 	}
-	return (CMD_RETURN_NORMAL);
+
+	return (0);
 }

cmd-select-pane.c

@@ -24,8 +24,8 @@
  * Select pane.
  */
 
-void		 cmd_select_pane_key_binding(struct cmd *, int);
+void	cmd_select_pane_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_select_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_select_pane_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_select_pane_entry = {
 	"select-pane", "selectp",
@@ -63,38 +63,36 @@ cmd_select_pane_key_binding(struct cmd *self, int key)
 		args_set(self->args, 't', ":.+");
 }
 
-enum cmd_retval
+int
-cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
 	struct window_pane	*wp;
 
 	if (self->entry == &cmd_last_pane_entry || args_has(args, 'l')) {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
+		wl = cmd_find_window(ctx, args_get(args, 't'), NULL);
 		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 
 		if (wl->window->last == NULL) {
-			cmdq_error(cmdq, "no last pane");
+			ctx->error(ctx, "no last pane");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 
-		server_unzoom_window(wl->window);
 		window_set_active_pane(wl->window, wl->window->last);
 		server_status_window(wl->window);
 		server_redraw_window_borders(wl->window);
 
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	}
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
+	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
-	server_unzoom_window(wp->window);
 	if (!window_pane_visible(wp)) {
-		cmdq_error(cmdq, "pane not visible");
+		ctx->error(ctx, "pane not visible");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	if (args_has(self->args, 'L'))
@@ -106,13 +104,13 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	else if (args_has(self->args, 'D'))
 		wp = window_pane_find_down(wp);
 	if (wp == NULL) {
-		cmdq_error(cmdq, "pane not found");
+		ctx->error(ctx, "pane not found");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	window_set_active_pane(wl->window, wp);
 	server_status_window(wl->window);
 	server_redraw_window_borders(wl->window);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-select-window.c

@@ -26,13 +26,13 @@
  * Select window by index.
  */
 
-void		 cmd_select_window_key_binding(struct cmd *, int);
+void	cmd_select_window_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_select_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_select_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_select_window_entry = {
 	"select-window", "selectw",
-	"lnpTt:", 0, 0,
+	"lnpt:", 0, 0,
-	"[-lnpT] " CMD_TARGET_WINDOW_USAGE,
+	"[-lnp] " CMD_TARGET_WINDOW_USAGE,
 	0,
 	cmd_select_window_key_binding,
 	NULL,
@@ -83,8 +83,8 @@ cmd_select_window_key_binding(struct cmd *self, int key)
 		args_set(self->args, 'a', NULL);
 }
 
-enum cmd_retval
+int
-cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_select_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct winlink	*wl;
@@ -102,48 +102,38 @@ cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		last = 1;
 
 	if (next || previous || last) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		s = cmd_find_session(ctx, args_get(args, 't'), 0);
 		if (s == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 
 		activity = args_has(self->args, 'a');
 		if (next) {
 			if (session_next(s, activity) != 0) {
-				cmdq_error(cmdq, "no next window");
+				ctx->error(ctx, "no next window");
-				return (CMD_RETURN_ERROR);
+				return (-1);
 			}
 		} else if (previous) {
 			if (session_previous(s, activity) != 0) {
-				cmdq_error(cmdq, "no previous window");
+				ctx->error(ctx, "no previous window");
-				return (CMD_RETURN_ERROR);
+				return (-1);
 			}
 		} else {
 			if (session_last(s) != 0) {
-				cmdq_error(cmdq, "no last window");
+				ctx->error(ctx, "no last window");
-				return (CMD_RETURN_ERROR);
+				return (-1);
 			}
 		}
 
 		server_redraw_session(s);
 	} else {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
+		wl = cmd_find_window(ctx, args_get(args, 't'), &s);
 		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 
-		/*
+		if (session_select(s, wl->idx) == 0)
-		 * If -T and select-window is invoked on same window as
-		 * current, switch to previous window.
-		 */
-		if (args_has(self->args, 'T') && wl == s->curw) {
-			if (session_last(s) != 0) {
-				cmdq_error(cmdq, "no last window");
-				return (-1);
-			}
-			server_redraw_session(s);
-		} else if (session_select(s, wl->idx) == 0)
 			server_redraw_session(s);
 	}
 	recalculate_sizes();
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-send-keys.c

@@ -27,30 +27,20 @@
  * Send keys to client.
  */
 
-enum cmd_retval	 cmd_send_keys_exec(struct cmd *, struct cmd_q *);
+int	cmd_send_keys_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_send_keys_entry = {
 	"send-keys", "send",
-	"lRt:", 0, -1,
+	"Rt:", 0, -1,
-	"[-lR] " CMD_TARGET_PANE_USAGE " key ...",
+	"[-R] [-t target-pane] key ...",
 	0,
 	NULL,
 	NULL,
 	cmd_send_keys_exec
 };
 
-const struct cmd_entry cmd_send_prefix_entry = {
+int
-	"send-prefix", NULL,
+cmd_send_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
-	"2t:", 0, 0,
-	"[-2] " CMD_TARGET_PANE_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_send_keys_exec
-};
-
-enum cmd_retval
-cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
 	struct window_pane	*wp;
@@ -59,17 +49,8 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 	const char		*str;
 	int			 i, key;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
+	if (cmd_find_pane(ctx, args_get(args, 't'), &s, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-
-	if (self->entry == &cmd_send_prefix_entry) {
-		if (args_has(args, '2'))
-			key = options_get_number(&s->options, "prefix2");
-		else
-			key = options_get_number(&s->options, "prefix");
-		window_pane_key(wp, s, key);
-		return (CMD_RETURN_NORMAL);
-	}
 
 	if (args_has(args, 'R')) {
 		ictx = &wp->ictx;
@@ -90,8 +71,7 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 	for (i = 0; i < args->argc; i++) {
 		str = args->argv[i];
 
-		if (!args_has(args, 'l') &&
+		if ((key = key_string_lookup_string(str)) != KEYC_NONE) {
-		    (key = key_string_lookup_string(str)) != KEYC_NONE) {
 			    window_pane_key(wp, s, key);
 		} else {
 			for (; *str != '\0'; str++)
@@ -99,5 +79,5 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 		}
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-send-prefix.c

@@ -1,7 +1,7 @@
-/* $OpenBSD$ */
+/* $Id$ */
 
 /*
- * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,38 +18,40 @@
 
 #include <sys/types.h>
 
-#include <string.h>
-
 #include "tmux.h"
 
-/* Get cell width. */
+/*
-u_int
+ * Send prefix key as a key.
-grid_cell_width(const struct grid_cell *gc)
+ */
-{
-	return (gc->xstate >> 4);
-}
 
-/* Get cell data. */
+int	cmd_send_prefix_exec(struct cmd *, struct cmd_ctx *);
-void
-grid_cell_get(const struct grid_cell *gc, struct utf8_data *ud)
-{
-	ud->size = gc->xstate & 0xf;
-	ud->width = gc->xstate >> 4;
-	memcpy(ud->data, gc->xdata, ud->size);
-}
 
-/* Set cell data. */
+const struct cmd_entry cmd_send_prefix_entry = {
-void
+	"send-prefix", NULL,
-grid_cell_set(struct grid_cell *gc, const struct utf8_data *ud)
+	"2t:", 0, 0,
-{
+	"[-2] " CMD_TARGET_PANE_USAGE,
-	memcpy(gc->xdata, ud->data, ud->size);
+	0,
-	gc->xstate = (ud->width << 4) | ud->size;
+	NULL,
-}
+	NULL,
+	cmd_send_prefix_exec
+};
 
-/* Set a single character as cell data. */
+int
-void
+cmd_send_prefix_exec(struct cmd *self, struct cmd_ctx *ctx)
-grid_cell_one(struct grid_cell *gc, u_char ch)
 {
-	*gc->xdata = ch;
+	struct args		*args = self->args;
-	gc->xstate = (1 << 4) | 1;
+	struct session		*s;
+	struct window_pane	*wp;
+	int			 key;
+
+	if (cmd_find_pane(ctx, args_get(args, 't'), &s, &wp) == NULL)
+		return (-1);
+
+	if (args_has(args, '2'))
+		key = options_get_number(&s->options, "prefix2");
+	else
+		key = options_get_number(&s->options, "prefix");
+	window_pane_key(wp, s, key);
+
+	return (0);
 }

cmd-server-info.c

@@ -30,7 +30,7 @@
  * Show various information about server.
  */
 
-enum cmd_retval	 cmd_server_info_exec(struct cmd *, struct cmd_q *);
+int	cmd_server_info_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_server_info_entry = {
 	"server-info", "info",
@@ -42,8 +42,9 @@ const struct cmd_entry cmd_server_info_entry = {
 	cmd_server_info_exec
 };
 
-enum cmd_retval
+/* ARGSUSED */
-cmd_server_info_exec(unused struct cmd *self, struct cmd_q *cmdq)
+int
+cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct tty_term				*term;
 	struct client				*c;
@@ -57,118 +58,126 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_q *cmdq)
 	struct job				*job;
 	struct grid				*gd;
 	struct grid_line			*gl;
-	u_int		 			 i, j, k, lines;
+	u_int		 			 i, j, k;
-	size_t					 size;
 	char					 out[80];
 	char					*tim;
 	time_t		 			 t;
+	u_int					 lines, ulines;
+	size_t					 size, usize;
 
 	tim = ctime(&start_time);
 	*strchr(tim, '\n') = '\0';
-	cmdq_print(cmdq,
+	ctx->print(ctx,
 	    "tmux " VERSION ", pid %ld, started %s", (long) getpid(), tim);
-	cmdq_print(cmdq, "socket path %s, debug level %d", socket_path,
+	ctx->print(
-	    debug_level);
+	    ctx, "socket path %s, debug level %d", socket_path, debug_level);
 	if (uname(&un) >= 0) {
-		cmdq_print(cmdq, "system is %s %s %s %s",
+		ctx->print(ctx, "system is %s %s %s %s",
 		    un.sysname, un.release, un.version, un.machine);
 	}
 	if (cfg_file != NULL)
-		cmdq_print(cmdq, "configuration file is %s", cfg_file);
+		ctx->print(ctx, "configuration file is %s", cfg_file);
 	else
-		cmdq_print(cmdq, "configuration file not specified");
+		ctx->print(ctx, "configuration file not specified");
-	cmdq_print(cmdq, "protocol version is %d", PROTOCOL_VERSION);
+	ctx->print(ctx, "protocol version is %d", PROTOCOL_VERSION);
-	cmdq_print(cmdq, "%s", "");
+	ctx->print(ctx, "%s", "");
 
-	cmdq_print(cmdq, "Clients:");
+	ctx->print(ctx, "Clients:");
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
 		if (c == NULL || c->session == NULL)
 			continue;
 
-		cmdq_print(cmdq,"%2d: %s (%d, %d): %s [%ux%u %s bs=%hho "
+		ctx->print(ctx,"%2d: %s (%d, %d): %s [%ux%u %s bs=%hho] "
-		    "class=%u] [flags=0x%x/0x%x, references=%u]", i,
+		    "[flags=0x%x/0x%x, references=%u]", i, c->tty.path,
-		    c->tty.path, c->ibuf.fd, c->tty.fd, c->session->name,
+		    c->ibuf.fd, c->tty.fd, c->session->name,
 		    c->tty.sx, c->tty.sy, c->tty.termname,
-		    c->tty.tio.c_cc[VERASE], c->tty.class,
+		    c->tty.tio.c_cc[VERASE], c->flags,
-		    c->flags, c->tty.flags, c->references);
+		    c->tty.flags, c->references);
 	}
-	cmdq_print(cmdq, "%s", "");
+	ctx->print(ctx, "%s", "");
 
-	cmdq_print(cmdq, "Sessions: [%zu]", sizeof (struct grid_cell));
+	ctx->print(ctx, "Sessions: [%zu/%zu]",
+	    sizeof (struct grid_cell), sizeof (struct grid_utf8));
 	RB_FOREACH(s, sessions, &sessions) {
 		t = s->creation_time.tv_sec;
 		tim = ctime(&t);
 		*strchr(tim, '\n') = '\0';
 
-		cmdq_print(cmdq, "%2u: %s: %u windows (created %s) [%ux%u] "
+		ctx->print(ctx, "%2u: %s: %u windows (created %s) [%ux%u] "
-		    "[flags=0x%x]", s->id, s->name,
+		    "[flags=0x%x]", s->idx, s->name,
 		    winlink_count(&s->windows), tim, s->sx, s->sy, s->flags);
 		RB_FOREACH(wl, winlinks, &s->windows) {
 			w = wl->window;
-			cmdq_print(cmdq, "%4u: %s [%ux%u] [flags=0x%x, "
+			ctx->print(ctx, "%4u: %s [%ux%u] [flags=0x%x, "
 			    "references=%u, last layout=%d]", wl->idx, w->name,
 			    w->sx, w->sy, w->flags, w->references,
 			    w->lastlayout);
 			j = 0;
 			TAILQ_FOREACH(wp, &w->panes, entry) {
-				lines = size = 0;
+				lines = ulines = size = usize = 0;
 				gd = wp->base.grid;
 				for (k = 0; k < gd->hsize + gd->sy; k++) {
 					gl = &gd->linedata[k];
-					if (gl->celldata == NULL)
+					if (gl->celldata != NULL) {
-						continue;
+						lines++;
-					lines++;
+						size += gl->cellsize *
-					size += gl->cellsize *
+						    sizeof *gl->celldata;
-					    sizeof *gl->celldata;
+					}
+					if (gl->utf8data != NULL) {
+						ulines++;
+						usize += gl->utf8size *
+						    sizeof *gl->utf8data;
+					}
 				}
-				cmdq_print(cmdq,
+				ctx->print(ctx, "%6u: %s %lu %d %u/%u, %zu "
-				    "%6u: %s %lu %d %u/%u, %zu bytes", j,
+				    "bytes; UTF-8 %u/%u, %zu bytes", j,
 				    wp->tty, (u_long) wp->pid, wp->fd, lines,
-				    gd->hsize + gd->sy, size);
+				    gd->hsize + gd->sy, size, ulines,
+				    gd->hsize + gd->sy, usize);
 				j++;
 			}
 		}
 	}
-	cmdq_print(cmdq, "%s", "");
+	ctx->print(ctx, "%s", "");
 
-	cmdq_print(cmdq, "Terminals:");
+	ctx->print(ctx, "Terminals:");
 	LIST_FOREACH(term, &tty_terms, entry) {
-		cmdq_print(cmdq, "%s [references=%u, flags=0x%x]:",
+		ctx->print(ctx, "%s [references=%u, flags=0x%x]:",
 		    term->name, term->references, term->flags);
 		for (i = 0; i < NTTYCODE; i++) {
 			ent = &tty_term_codes[i];
 			code = &term->codes[ent->code];
 			switch (code->type) {
 			case TTYCODE_NONE:
-				cmdq_print(cmdq, "%2u: %s: [missing]",
+				ctx->print(ctx, "%2u: %s: [missing]",
 				    ent->code, ent->name);
 				break;
 			case TTYCODE_STRING:
 				strnvis(out, code->value.string, sizeof out,
 				    VIS_OCTAL|VIS_TAB|VIS_NL);
-				cmdq_print(cmdq, "%2u: %s: (string) %s",
+				ctx->print(ctx, "%2u: %s: (string) %s",
 				    ent->code, ent->name, out);
 				break;
 			case TTYCODE_NUMBER:
-				cmdq_print(cmdq, "%2u: %s: (number) %d",
+				ctx->print(ctx, "%2u: %s: (number) %d",
 				    ent->code, ent->name, code->value.number);
 				break;
 			case TTYCODE_FLAG:
-				cmdq_print(cmdq, "%2u: %s: (flag) %s",
+				ctx->print(ctx, "%2u: %s: (flag) %s",
 				    ent->code, ent->name,
 				    code->value.flag ? "true" : "false");
 				break;
 			}
 		}
 	}
-	cmdq_print(cmdq, "%s", "");
+	ctx->print(ctx, "%s", "");
 
-	cmdq_print(cmdq, "Jobs:");
+	ctx->print(ctx, "Jobs:");
 	LIST_FOREACH(job, &all_jobs, lentry) {
-		cmdq_print(cmdq, "%s [fd=%d, pid=%d, status=%d]",
+		ctx->print(ctx, "%s [fd=%d, pid=%d, status=%d]",
 		    job->cmd, job->fd, job->pid, job->status);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-set-buffer.c

@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -27,7 +26,7 @@
  * Add or set a paste buffer.
  */
 
-enum cmd_retval	 cmd_set_buffer_exec(struct cmd *, struct cmd_q *);
+int	cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_set_buffer_entry = {
 	"set-buffer", "setb",
@@ -39,8 +38,8 @@ const struct cmd_entry cmd_set_buffer_entry = {
 	cmd_set_buffer_exec
 };
 
-enum cmd_retval
+int
-cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_set_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	u_int		 limit;
@@ -55,22 +54,22 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	if (!args_has(args, 'b')) {
 		paste_add(&global_buffers, pdata, psize, limit);
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	}
 
 	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
 	if (cause != NULL) {
-		cmdq_error(cmdq, "buffer %s", cause);
+		ctx->error(ctx, "buffer %s", cause);
-		free(cause);
+		xfree(cause);
-		free(pdata);
+		xfree(pdata);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
-		cmdq_error(cmdq, "no buffer %d", buffer);
+		ctx->error(ctx, "no buffer %d", buffer);
-		free(pdata);
+		xfree(pdata);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-set-environment.c

@@ -27,7 +27,7 @@
  * Set an environment variable.
  */
 
-enum cmd_retval	 cmd_set_environment_exec(struct cmd *, struct cmd_q *);
+int	cmd_set_environment_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_set_environment_entry = {
 	"set-environment", "setenv",
@@ -39,8 +39,8 @@ const struct cmd_entry cmd_set_environment_entry = {
 	cmd_set_environment_exec
 };
 
-enum cmd_retval
+int
-cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_set_environment_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct session	*s;
@@ -49,15 +49,15 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	name = args->argv[0];
 	if (*name == '\0') {
-		cmdq_error(cmdq, "empty variable name");
+		ctx->error(ctx, "empty variable name");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	if (strchr(name, '=') != NULL) {
-		cmdq_error(cmdq, "variable name contains =");
+		ctx->error(ctx, "variable name contains =");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
-	if (args->argc < 2)
+	if (args->argc < 1)
 		value = NULL;
 	else
 		value = args->argv[1];
@@ -65,30 +65,30 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (args_has(self->args, 'g'))
 		env = &global_environ;
 	else {
-		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+		if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		env = &s->environ;
 	}
 
 	if (args_has(self->args, 'u')) {
 		if (value != NULL) {
-			cmdq_error(cmdq, "can't specify a value with -u");
+			ctx->error(ctx, "can't specify a value with -u");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 		environ_unset(env, name);
 	} else if (args_has(self->args, 'r')) {
 		if (value != NULL) {
-			cmdq_error(cmdq, "can't specify a value with -r");
+			ctx->error(ctx, "can't specify a value with -r");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 		environ_set(env, name, NULL);
 	} else {
 		if (value == NULL) {
-			cmdq_error(cmdq, "no value specified");
+			ctx->error(ctx, "no value specified");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 		environ_set(env, name, value);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-set-option.c

@@ -27,44 +27,44 @@
  * Set an option.
  */
 
-enum cmd_retval	cmd_set_option_exec(struct cmd *, struct cmd_q *);
+int	cmd_set_option_exec(struct cmd *, struct cmd_ctx *);
 
-enum cmd_retval	cmd_set_option_user(struct cmd *, struct cmd_q *,
+int	cmd_set_option_find(const char *, const struct options_table_entry **,
-	    const char *, const char *);
+	    const struct options_table_entry **);
 
-int	cmd_set_option_unset(struct cmd *, struct cmd_q *,
+int	cmd_set_option_unset(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
-int	cmd_set_option_set(struct cmd *, struct cmd_q *,
+int	cmd_set_option_set(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
 
-struct options_entry *cmd_set_option_string(struct cmd *, struct cmd_q *,
+struct options_entry *cmd_set_option_string(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
-struct options_entry *cmd_set_option_number(struct cmd *, struct cmd_q *,
+struct options_entry *cmd_set_option_number(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
-struct options_entry *cmd_set_option_key(struct cmd *, struct cmd_q *,
+struct options_entry *cmd_set_option_key(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
-struct options_entry *cmd_set_option_colour(struct cmd *, struct cmd_q *,
+struct options_entry *cmd_set_option_colour(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
-struct options_entry *cmd_set_option_attributes(struct cmd *, struct cmd_q *,
+struct options_entry *cmd_set_option_attributes(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
-struct options_entry *cmd_set_option_flag(struct cmd *, struct cmd_q *,
+struct options_entry *cmd_set_option_flag(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
-struct options_entry *cmd_set_option_choice(struct cmd *, struct cmd_q *,
+struct options_entry *cmd_set_option_choice(struct cmd *, struct cmd_ctx *,
 	    const struct options_table_entry *, struct options *,
 	    const char *);
 
 const struct cmd_entry cmd_set_option_entry = {
 	"set-option", "set",
-	"agoqst:uw", 1, 2,
+	"agst:uw", 1, 2,
-	"[-agosquw] [-t target-session|target-window] option [value]",
+	"[-agsuw] [-t target-session|target-window] option [value]",
 	0,
 	NULL,
 	NULL,
@@ -73,16 +73,49 @@ const struct cmd_entry cmd_set_option_entry = {
 
 const struct cmd_entry cmd_set_window_option_entry = {
 	"set-window-option", "setw",
-	"agoqt:u", 1, 2,
+	"agt:u", 1, 2,
-	"[-agoqu] " CMD_TARGET_WINDOW_USAGE " option [value]",
+	"[-agu] " CMD_TARGET_WINDOW_USAGE " option [value]",
 	0,
 	NULL,
 	NULL,
 	cmd_set_option_exec
 };
 
-enum cmd_retval
+/* Look for an option in all three tables. */
-cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
+int
+cmd_set_option_find(
+    const char *optstr, const struct options_table_entry **table,
+    const struct options_table_entry **oe)
+{
+	static const struct options_table_entry	*tables[] = {
+		server_options_table,
+		window_options_table,
+		session_options_table
+	};
+	const struct options_table_entry	*oe_loop;
+	u_int					 i;
+
+	for (i = 0; i < nitems(tables); i++) {
+		for (oe_loop = tables[i]; oe_loop->name != NULL; oe_loop++) {
+			if (strncmp(oe_loop->name, optstr, strlen(optstr)) != 0)
+				continue;
+
+			/* If already found, ambiguous. */
+			if (*oe != NULL)
+				return (-1);
+			*oe = oe_loop;
+			*table = tables[i];
+
+			/* Bail now if an exact match. */
+			if (strcmp((*oe)->name, optstr) == 0)
+				break;
+		}
+	}
+	return (0);
+}
+
+int
+cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args				*args = self->args;
 	const struct options_table_entry	*table, *oe;
@@ -90,34 +123,29 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct winlink				*wl;
 	struct client				*c;
 	struct options				*oo;
-	struct window				*w;
 	const char				*optstr, *valstr;
 	u_int					 i;
 
 	/* Get the option name and value. */
 	optstr = args->argv[0];
 	if (*optstr == '\0') {
-		cmdq_error(cmdq, "invalid option");
+		ctx->error(ctx, "invalid option");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	if (args->argc < 2)
 		valstr = NULL;
 	else
 		valstr = args->argv[1];
 
-	/* Is this a user option? */
-	if (*optstr == '@')
-		return (cmd_set_option_user(self, cmdq, optstr, valstr));
-
 	/* Find the option entry, try each table. */
 	table = oe = NULL;
-	if (options_table_find(optstr, &table, &oe) != 0) {
+	if (cmd_set_option_find(optstr, &table, &oe) != 0) {
-		cmdq_error(cmdq, "ambiguous option: %s", optstr);
+		ctx->error(ctx, "ambiguous option: %s", optstr);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 	if (oe == NULL) {
-		cmdq_error(cmdq, "unknown option: %s", optstr);
+		ctx->error(ctx, "unknown option: %s", optstr);
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	/* Work out the tree from the table. */
@@ -127,49 +155,32 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
 		if (args_has(self->args, 'g'))
 			oo = &global_w_options;
 		else {
-			wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
+			wl = cmd_find_window(ctx, args_get(args, 't'), NULL);
 			if (wl == NULL)
-				return (CMD_RETURN_ERROR);
+				return (-1);
 			oo = &wl->window->options;
 		}
 	} else if (table == session_options_table) {
 		if (args_has(self->args, 'g'))
 			oo = &global_s_options;
 		else {
-			s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+			s = cmd_find_session(ctx, args_get(args, 't'), 0);
 			if (s == NULL)
-				return (CMD_RETURN_ERROR);
+				return (-1);
 			oo = &s->options;
 		}
 	} else {
-		cmdq_error(cmdq, "unknown table");
+		ctx->error(ctx, "unknown table");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	/* Unset or set the option. */
 	if (args_has(args, 'u')) {
-		if (cmd_set_option_unset(self, cmdq, oe, oo, valstr) != 0)
+		if (cmd_set_option_unset(self, ctx, oe, oo, valstr) != 0)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 	} else {
-		if (args_has(args, 'o') && options_find1(oo, optstr) != NULL) {
+		if (cmd_set_option_set(self, ctx, oe, oo, valstr) != 0)
-			if (!args_has(args, 'q'))
+			return (-1);
-				cmdq_print(cmdq, "already set: %s", optstr);
-			return (CMD_RETURN_NORMAL);
-		}
-		if (cmd_set_option_set(self, cmdq, oe, oo, valstr) != 0)
-			return (CMD_RETURN_ERROR);
-	}
-
-	/* Start or stop timers when automatic-rename changed. */
-	if (strcmp (oe->name, "automatic-rename") == 0) {
-		for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
-			if ((w = ARRAY_ITEM(&windows, i)) == NULL)
-				continue;
-			if (options_get_number(&w->options, "automatic-rename"))
-				queue_window_name(w);
-			else if (event_initialized(&w->name_timer))
-				evtimer_del(&w->name_timer);
-		}
 	}
 
 	/* Update sizes and redraw. May not need it but meh. */
@@ -180,148 +191,81 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
 			server_redraw_client(c);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
-/* Set user option. */
-enum cmd_retval
-cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char* optstr,
-    const char *valstr)
-{
-	struct args	*args = self->args;
-	struct session	*s;
-	struct winlink	*wl;
-	struct options	*oo;
-
-	if (args_has(args, 's'))
-		oo = &global_options;
-	else if (args_has(self->args, 'w') ||
-	    self->entry == &cmd_set_window_option_entry) {
-		if (args_has(self->args, 'g'))
-			oo = &global_w_options;
-		else {
-			wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
-			if (wl == NULL)
-				return (CMD_RETURN_ERROR);
-			oo = &wl->window->options;
-		}
-	} else {
-		if (args_has(self->args, 'g'))
-			oo = &global_s_options;
-		else {
-			s = cmd_find_session(cmdq, args_get(args, 't'), 0);
-			if (s == NULL)
-				return (CMD_RETURN_ERROR);
-			oo = &s->options;
-		}
-	}
-
-	if (args_has(args, 'u')) {
-		if (options_find1(oo, optstr) == NULL) {
-			cmdq_error(cmdq, "unknown option: %s", optstr);
-			return (CMD_RETURN_ERROR);
-		}
-		if (valstr != NULL) {
-			cmdq_error(cmdq, "value passed to unset option: %s",
-			    optstr);
-			return (CMD_RETURN_ERROR);
-		}
-		options_remove(oo, optstr);
-	} else {
-		if (valstr == NULL) {
-			cmdq_error(cmdq, "empty value");
-			return (CMD_RETURN_ERROR);
-		}
-		if (args_has(args, 'o') && options_find1(oo, optstr) != NULL) {
-			if (!args_has(args, 'q'))
-				cmdq_print(cmdq, "already set: %s", optstr);
-			return (CMD_RETURN_NORMAL);
-		}
-		options_set_string(oo, optstr, "%s", valstr);
-		if (!args_has(args, 'q')) {
-			cmdq_info(cmdq, "set option: %s -> %s", optstr,
-			    valstr);
-		}
-	}
-	return (CMD_RETURN_NORMAL);
-}
-
-
 /* Unset an option. */
 int
-cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_unset(struct cmd *self, struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
 	struct args	*args = self->args;
 
 	if (args_has(args, 'g')) {
-		cmdq_error(cmdq, "can't unset global option: %s", oe->name);
+		ctx->error(ctx, "can't unset global option: %s", oe->name);
 		return (-1);
 	}
 	if (value != NULL) {
-		cmdq_error(cmdq, "value passed to unset option: %s", oe->name);
+		ctx->error(ctx, "value passed to unset option: %s", oe->name);
 		return (-1);
 	}
 
 	options_remove(oo, oe->name);
-	if (!args_has(args, 'q'))
+	ctx->info(ctx, "unset option: %s", oe->name);
-		cmdq_info(cmdq, "unset option: %s", oe->name);
 	return (0);
 }
 
 /* Set an option. */
 int
-cmd_set_option_set(struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_set(struct cmd *self, struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
-	struct args		*args = self->args;
 	struct options_entry	*o;
 	const char		*s;
 
 	if (oe->type != OPTIONS_TABLE_FLAG && value == NULL) {
-		cmdq_error(cmdq, "empty value");
+		ctx->error(ctx, "empty value");
 		return (-1);
 	}
 
 	o = NULL;
 	switch (oe->type) {
 	case OPTIONS_TABLE_STRING:
-		o = cmd_set_option_string(self, cmdq, oe, oo, value);
+		o = cmd_set_option_string(self, ctx, oe, oo, value);
 		break;
 	case OPTIONS_TABLE_NUMBER:
-		o = cmd_set_option_number(self, cmdq, oe, oo, value);
+		o = cmd_set_option_number(self, ctx, oe, oo, value);
 		break;
 	case OPTIONS_TABLE_KEY:
-		o = cmd_set_option_key(self, cmdq, oe, oo, value);
+		o = cmd_set_option_key(self, ctx, oe, oo, value);
 		break;
 	case OPTIONS_TABLE_COLOUR:
-		o = cmd_set_option_colour(self, cmdq, oe, oo, value);
+		o = cmd_set_option_colour(self, ctx, oe, oo, value);
 		break;
 	case OPTIONS_TABLE_ATTRIBUTES:
-		o = cmd_set_option_attributes(self, cmdq, oe, oo, value);
+		o = cmd_set_option_attributes(self, ctx, oe, oo, value);
 		break;
 	case OPTIONS_TABLE_FLAG:
-		o = cmd_set_option_flag(self, cmdq, oe, oo, value);
+		o = cmd_set_option_flag(self, ctx, oe, oo, value);
 		break;
 	case OPTIONS_TABLE_CHOICE:
-		o = cmd_set_option_choice(self, cmdq, oe, oo, value);
+		o = cmd_set_option_choice(self, ctx, oe, oo, value);
 		break;
 	}
 	if (o == NULL)
 		return (-1);
 
-	s = options_table_print_entry(oe, o, 0);
+	s = options_table_print_entry(oe, o);
-	if (!args_has(args, 'q'))
+	ctx->info(ctx, "set option: %s -> %s", oe->name, s);
-		cmdq_info(cmdq, "set option: %s -> %s", oe->name, s);
 	return (0);
 }
 
 /* Set a string option. */
 struct options_entry *
-cmd_set_option_string(struct cmd *self, unused struct cmd_q *cmdq,
+cmd_set_option_string(struct cmd *self, unused struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
-	struct args		*args = self->args;
+	struct args	*args = self->args;
 	struct options_entry	*o;
 	char			*oldval, *newval;
 
@@ -333,13 +277,13 @@ cmd_set_option_string(struct cmd *self, unused struct cmd_q *cmdq,
 
 	o = options_set_string(oo, oe->name, "%s", newval);
 
-	free(newval);
+	xfree(newval);
 	return (o);
 }
 
 /* Set a number option. */
 struct options_entry *
-cmd_set_option_number(unused struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_number(unused struct cmd *self, struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
 	long long	 ll;
@@ -347,7 +291,7 @@ cmd_set_option_number(unused struct cmd *self, struct cmd_q *cmdq,
 
 	ll = strtonum(value, oe->minimum, oe->maximum, &errstr);
 	if (errstr != NULL) {
-		cmdq_error(cmdq, "value is %s: %s", errstr, value);
+		ctx->error(ctx, "value is %s: %s", errstr, value);
 		return (NULL);
 	}
 
@@ -356,13 +300,13 @@ cmd_set_option_number(unused struct cmd *self, struct cmd_q *cmdq,
 
 /* Set a key option. */
 struct options_entry *
-cmd_set_option_key(unused struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_key(unused struct cmd *self, struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
 	int	key;
 
 	if ((key = key_string_lookup_string(value)) == KEYC_NONE) {
-		cmdq_error(cmdq, "bad key: %s", value);
+		ctx->error(ctx, "bad key: %s", value);
 		return (NULL);
 	}
 
@@ -371,13 +315,13 @@ cmd_set_option_key(unused struct cmd *self, struct cmd_q *cmdq,
 
 /* Set a colour option. */
 struct options_entry *
-cmd_set_option_colour(unused struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_colour(unused struct cmd *self, struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
 	int	colour;
 
 	if ((colour = colour_fromstring(value)) == -1) {
-		cmdq_error(cmdq, "bad colour: %s", value);
+		ctx->error(ctx, "bad colour: %s", value);
 		return (NULL);
 	}
 
@@ -386,13 +330,13 @@ cmd_set_option_colour(unused struct cmd *self, struct cmd_q *cmdq,
 
 /* Set an attributes option. */
 struct options_entry *
-cmd_set_option_attributes(unused struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_attributes(unused struct cmd *self, struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
 	int	attr;
 
 	if ((attr = attributes_fromstring(value)) == -1) {
-		cmdq_error(cmdq, "bad attributes: %s", value);
+		ctx->error(ctx, "bad attributes: %s", value);
 		return (NULL);
 	}
 
@@ -401,7 +345,7 @@ cmd_set_option_attributes(unused struct cmd *self, struct cmd_q *cmdq,
 
 /* Set a flag option. */
 struct options_entry *
-cmd_set_option_flag(unused struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_flag(unused struct cmd *self, struct cmd_ctx *ctx,
     const struct options_table_entry *oe, struct options *oo, const char *value)
 {
 	int	flag;
@@ -418,7 +362,7 @@ cmd_set_option_flag(unused struct cmd *self, struct cmd_q *cmdq,
 		    strcasecmp(value, "no") == 0)
 			flag = 0;
 		else {
-			cmdq_error(cmdq, "bad value: %s", value);
+			ctx->error(ctx, "bad value: %s", value);
 			return (NULL);
 		}
 	}
@@ -428,9 +372,8 @@ cmd_set_option_flag(unused struct cmd *self, struct cmd_q *cmdq,
 
 /* Set a choice option. */
 struct options_entry *
-cmd_set_option_choice(unused struct cmd *self, struct cmd_q *cmdq,
+cmd_set_option_choice(unused struct cmd *self, struct cmd_ctx *ctx,
-    const struct options_table_entry *oe, struct options *oo,
+    const struct options_table_entry *oe, struct options *oo, const char *value)
-    const char *value)
 {
 	const char	**choicep;
 	int		  n, choice = -1;
@@ -442,13 +385,13 @@ cmd_set_option_choice(unused struct cmd *self, struct cmd_q *cmdq,
 			continue;
 
 		if (choice != -1) {
-			cmdq_error(cmdq, "ambiguous value: %s", value);
+			ctx->error(ctx, "ambiguous value: %s", value);
 			return (NULL);
 		}
 		choice = n - 1;
 	}
 	if (choice == -1) {
-		cmdq_error(cmdq, "unknown value: %s", value);
+		ctx->error(ctx, "unknown value: %s", value);
 		return (NULL);
 	}
 

cmd-show-buffer.c

@@ -0,0 +1,109 @@
+/* $Id$ */
+
+/*
+ * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include "tmux.h"
+
+/*
+ * Show a paste buffer.
+ */
+
+int	cmd_show_buffer_exec(struct cmd *, struct cmd_ctx *);
+
+const struct cmd_entry cmd_show_buffer_entry = {
+	"show-buffer", "showb",
+	"b:", 0, 0,
+	CMD_BUFFER_USAGE,
+	0,
+	NULL,
+	NULL,
+	cmd_show_buffer_exec
+};
+
+int
+cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct args		*args = self->args;
+	struct session		*s;
+	struct paste_buffer	*pb;
+	int			 buffer;
+	char			*in, *buf, *ptr, *cause;
+	size_t			 size, len;
+	u_int			 width;
+
+	if ((s = cmd_find_session(ctx, NULL, 0)) == NULL)
+		return (-1);
+
+	if (!args_has(args, 'b')) {
+		if ((pb = paste_get_top(&global_buffers)) == NULL) {
+			ctx->error(ctx, "no buffers");
+			return (-1);
+		}
+	} else {
+		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
+		if (cause != NULL) {
+			ctx->error(ctx, "buffer %s", cause);
+			xfree(cause);
+			return (-1);
+		}
+
+		pb = paste_get_index(&global_buffers, buffer);
+		if (pb == NULL) {
+			ctx->error(ctx, "no buffer %d", buffer);
+			return (-1);
+		}
+	}
+
+	size = pb->size;
+	if (size > SIZE_MAX / 4 - 1)
+		size = SIZE_MAX / 4 - 1;
+	in = xmalloc(size * 4 + 1);
+	strvisx(in, pb->data, size, VIS_OCTAL|VIS_TAB);
+
+	width = s->sx;
+	if (ctx->cmdclient != NULL)
+		width = ctx->cmdclient->tty.sx;
+
+	buf = xmalloc(width + 1);
+	len = 0;
+
+	ptr = in;
+	do {
+		buf[len++] = *ptr++;
+
+		if (len == width || buf[len - 1] == '\n') {
+			if (buf[len - 1] == '\n')
+				len--;
+			buf[len] = '\0';
+
+			ctx->print(ctx, "%s", buf);
+			len = 0;
+		}
+	} while (*ptr != '\0');
+
+	if (len != 0) {
+		buf[len] = '\0';
+		ctx->print(ctx, "%s", buf);
+	}
+	xfree(buf);
+
+	xfree(in);
+
+	return (0);
+}

cmd-show-environment.c

@@ -27,20 +27,20 @@
  * Show environment.
  */
 
-enum cmd_retval	 cmd_show_environment_exec(struct cmd *, struct cmd_q *);
+int	cmd_show_environment_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_show_environment_entry = {
 	"show-environment", "showenv",
-	"gt:", 0, 1,
+	"gt:", 0, 0,
-	"[-g] " CMD_TARGET_SESSION_USAGE " [name]",
+	"[-g] " CMD_TARGET_SESSION_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_show_environment_exec
 };
 
-enum cmd_retval
+int
-cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_show_environment_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct session		*s;
@@ -50,30 +50,17 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (args_has(self->args, 'g'))
 		env = &global_environ;
 	else {
-		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+		if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		env = &s->environ;
 	}
 
-	if (args->argc != 0) {
-		envent = environ_find(env, args->argv[0]);
-		if (envent == NULL) {
-			cmdq_error(cmdq, "unknown variable: %s", args->argv[0]);
-			return (CMD_RETURN_ERROR);
-		}
-		if (envent->value != NULL)
-			cmdq_print(cmdq, "%s=%s", envent->name, envent->value);
-		else
-			cmdq_print(cmdq, "-%s", envent->name);
-		return (CMD_RETURN_NORMAL);
-	}
-
 	RB_FOREACH(envent, environ, env) {
 		if (envent->value != NULL)
-			cmdq_print(cmdq, "%s=%s", envent->name, envent->value);
+			ctx->print(ctx, "%s=%s", envent->name, envent->value);
 		else
-			cmdq_print(cmdq, "-%s", envent->name);
+			ctx->print(ctx, "-%s", envent->name);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-show-messages.c

@@ -27,7 +27,7 @@
  * Show client message log.
  */
 
-enum cmd_retval	 cmd_show_messages_exec(struct cmd *, struct cmd_q *);
+int	cmd_show_messages_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_show_messages_entry = {
 	"show-messages", "showmsgs",
@@ -39,8 +39,8 @@ const struct cmd_entry cmd_show_messages_entry = {
 	cmd_show_messages_exec
 };
 
-enum cmd_retval
+int
-cmd_show_messages_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_show_messages_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct client		*c;
@@ -48,8 +48,8 @@ cmd_show_messages_exec(struct cmd *self, struct cmd_q *cmdq)
 	char			*tim;
 	u_int			 i;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
 		msg = &ARRAY_ITEM(&c->message_log, i);
@@ -57,8 +57,8 @@ cmd_show_messages_exec(struct cmd *self, struct cmd_q *cmdq)
 		tim = ctime(&msg->msg_time);
 		*strchr(tim, '\n') = '\0';
 
-		cmdq_print(cmdq, "%s %s", tim, msg->msg);
+		ctx->print(ctx, "%s %s", tim, msg->msg);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-show-options.c

@@ -27,17 +27,12 @@
  * Show options.
  */
 
-enum cmd_retval	 cmd_show_options_exec(struct cmd *, struct cmd_q *);
+int	cmd_show_options_exec(struct cmd *, struct cmd_ctx *);
-
-enum cmd_retval	cmd_show_options_one(struct cmd *, struct cmd_q *,
-		    struct options *, int);
-enum cmd_retval cmd_show_options_all(struct cmd *, struct cmd_q *,
-		    const struct options_table_entry *, struct options *);
 
 const struct cmd_entry cmd_show_options_entry = {
 	"show-options", "show",
-	"gqst:vw", 0, 1,
+	"gst:w", 0, 0,
-	"[-gqsvw] [-t target-session|target-window] [option]",
+	"[-gsw] [-t target-session|target-window]",
 	0,
 	NULL,
 	NULL,
@@ -46,23 +41,24 @@ const struct cmd_entry cmd_show_options_entry = {
 
 const struct cmd_entry cmd_show_window_options_entry = {
 	"show-window-options", "showw",
-	"gvt:", 0, 1,
+	"gt:", 0, 0,
-	"[-gv] " CMD_TARGET_WINDOW_USAGE " [option]",
+	"[-g] " CMD_TARGET_WINDOW_USAGE,
 	0,
 	NULL,
 	NULL,
 	cmd_show_options_exec
 };
 
-enum cmd_retval
+int
-cmd_show_options_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args				*args = self->args;
+	const struct options_table_entry	*table, *oe;
 	struct session				*s;
 	struct winlink				*wl;
-	const struct options_table_entry	*table;
 	struct options				*oo;
-	int					 quiet;
+	struct options_entry			*o;
+	const char				*optval;
 
 	if (args_has(self->args, 's')) {
 		oo = &global_options;
@@ -73,9 +69,9 @@ cmd_show_options_exec(struct cmd *self, struct cmd_q *cmdq)
 		if (args_has(self->args, 'g'))
 			oo = &global_w_options;
 		else {
-			wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
+			wl = cmd_find_window(ctx, args_get(args, 't'), NULL);
 			if (wl == NULL)
-				return (CMD_RETURN_ERROR);
+				return (-1);
 			oo = &wl->window->options;
 		}
 	} else {
@@ -83,91 +79,19 @@ cmd_show_options_exec(struct cmd *self, struct cmd_q *cmdq)
 		if (args_has(self->args, 'g'))
 			oo = &global_s_options;
 		else {
-			s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+			s = cmd_find_session(ctx, args_get(args, 't'), 0);
 			if (s == NULL)
-				return (CMD_RETURN_ERROR);
+				return (-1);
 			oo = &s->options;
 		}
 	}
 
-	quiet = args_has(self->args, 'q');
-	if (args->argc == 0)
-		return (cmd_show_options_all(self, cmdq, table, oo));
-	else
-		return (cmd_show_options_one(self, cmdq, oo, quiet));
-}
-
-enum cmd_retval
-cmd_show_options_one(struct cmd *self, struct cmd_q *cmdq,
-    struct options *oo, int quiet)
-{
-	struct args				*args = self->args;
-	const struct options_table_entry	*table, *oe;
-	struct options_entry			*o;
-	const char				*optval;
-
-	if (*args->argv[0] == '@') {
-		if ((o = options_find1(oo, args->argv[0])) == NULL) {
-			if (quiet)
-				return (CMD_RETURN_NORMAL);
-			cmdq_error(cmdq, "unknown option: %s", args->argv[0]);
-			return (CMD_RETURN_ERROR);
-		}
-		if (args_has(self->args, 'v'))
-			cmdq_print(cmdq, "%s", o->str);
-		else
-			cmdq_print(cmdq, "%s \"%s\"", o->name, o->str);
-		return (CMD_RETURN_NORMAL);
-	}
-
-	table = oe = NULL;
-	if (options_table_find(args->argv[0], &table, &oe) != 0) {
-		cmdq_error(cmdq, "ambiguous option: %s", args->argv[0]);
-		return (CMD_RETURN_ERROR);
-	}
-	if (oe == NULL) {
-		if (quiet)
-		    return (CMD_RETURN_NORMAL);
-		cmdq_error(cmdq, "unknown option: %s", args->argv[0]);
-		return (CMD_RETURN_ERROR);
-	}
-	if ((o = options_find1(oo, oe->name)) == NULL)
-		return (CMD_RETURN_NORMAL);
-	optval = options_table_print_entry(oe, o, args_has(self->args, 'v'));
-	if (args_has(self->args, 'v'))
-		cmdq_print(cmdq, "%s", optval);
-	else
-		cmdq_print(cmdq, "%s %s", oe->name, optval);
-	return (CMD_RETURN_NORMAL);
-}
-
-enum cmd_retval
-cmd_show_options_all(struct cmd *self, struct cmd_q *cmdq,
-    const struct options_table_entry *table, struct options *oo)
-{
-	const struct options_table_entry	*oe;
-	struct options_entry			*o;
-	const char				*optval;
-
-	RB_FOREACH(o, options_tree, &oo->tree) {
-		if (*o->name == '@') {
-			if (args_has(self->args, 'v'))
-				cmdq_print(cmdq, "%s", o->str);
-			else
-				cmdq_print(cmdq, "%s \"%s\"", o->name, o->str);
-		}
-	}
-
 	for (oe = table; oe->name != NULL; oe++) {
 		if ((o = options_find1(oo, oe->name)) == NULL)
 			continue;
-		optval = options_table_print_entry(oe, o,
+		optval = options_table_print_entry(oe, o);
-		    args_has(self->args, 'v'));
+		ctx->print(ctx, "%s %s", oe->name, optval);
-		if (args_has(self->args, 'v'))
-			cmdq_print(cmdq, "%s", optval);
-		else
-			cmdq_print(cmdq, "%s %s", oe->name, optval);
 	}
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-source-file.c

@@ -18,18 +18,13 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
-
 #include "tmux.h"
 
 /*
  * Sources a configuration file.
  */
 
-enum cmd_retval	cmd_source_file_exec(struct cmd *, struct cmd_q *);
+int	cmd_source_file_exec(struct cmd *, struct cmd_ctx *);
-
-void		cmd_source_file_show(struct cmd_q *);
-void		cmd_source_file_done(struct cmd_q *);
 
 const struct cmd_entry cmd_source_file_entry = {
 	"source-file", "source",
@@ -41,68 +36,39 @@ const struct cmd_entry cmd_source_file_entry = {
 	cmd_source_file_exec
 };
 
-enum cmd_retval
+int
-cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_source_file_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct args	*args = self->args;
+	struct args		*args = self->args;
-	struct cmd_q	*cmdq1;
+	struct causelist	 causes;
-	char		*cause;
+	char			*cause;
+	struct window_pane	*wp;
+	int			 retval;
+	u_int			 i;
 
-	cmdq1 = cmdq_new(NULL);
+	ARRAY_INIT(&causes);
-	cmdq1->emptyfn = cmd_source_file_done;
-	cmdq1->data = cmdq;
 
-	switch (load_cfg(args->argv[0], cmdq1, &cause)) {
+	retval = load_cfg(args->argv[0], ctx, &causes);
-	case -1:
+	if (ARRAY_EMPTY(&causes))
-		if (cfg_references == 0) {
+		return (retval);
-			cmdq_free(cmdq1);
+
-			cmdq_error(cmdq, "%s", cause);
+	if (retval == 1 && !RB_EMPTY(&sessions) && ctx->cmdclient != NULL) {
-			free(cause);
+		wp = RB_MIN(sessions, &sessions)->curw->window->active;
-			return (CMD_RETURN_ERROR);
+		window_pane_set_mode(wp, &window_copy_mode);
+		window_copy_init_for_output(wp);
+		for (i = 0; i < ARRAY_LENGTH(&causes); i++) {
+			cause = ARRAY_ITEM(&causes, i);
+			window_copy_add(wp, "%s", cause);
+			xfree(cause);
+		}
+	} else {
+		for (i = 0; i < ARRAY_LENGTH(&causes); i++) {
+			cause = ARRAY_ITEM(&causes, i);
+			ctx->print(ctx, "%s", cause);
+			xfree(cause);
 		}
-		ARRAY_ADD(&cfg_causes, cause);
-		/* FALLTHROUGH */
-	case 0:
-		if (cfg_references == 0)
-			cmd_source_file_show(cmdq);
-		cmdq_free(cmdq1);
-		return (CMD_RETURN_NORMAL);
 	}
+	ARRAY_FREE(&causes);
 
-	cmdq->references++;
+	return (retval);
-	cfg_references++;
-
-	cmdq_continue(cmdq1);
-	return (CMD_RETURN_WAIT);
-}
-
-void
-cmd_source_file_show(struct cmd_q *cmdq)
-{
-	u_int	 i;
-	char	*cause;
-
-	for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
-		cause = ARRAY_ITEM(&cfg_causes, i);
-		cmdq_print(cmdq, "%s", cause);
-		free(cause);
-	}
-	ARRAY_FREE(&cfg_causes);
-}
-
-void
-cmd_source_file_done(struct cmd_q *cmdq1)
-{
-	struct cmd_q	*cmdq = cmdq1->data;
-
-	cmdq_free(cmdq1);
-
-	cfg_references--;
-
-	if (cmdq_free(cmdq))
-		return;
-
-	if (cfg_references == 0)
-		cmd_source_file_show(cmdq);
-	cmdq_continue(cmdq);
 }

cmd-split-window.c

@@ -27,14 +27,13 @@
  * Split a window (add a new pane).
  */
 
-void		 cmd_split_window_key_binding(struct cmd *, int);
+void	cmd_split_window_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_split_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_split_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_split_window_entry = {
 	"split-window", "splitw",
-	"c:dF:l:hp:Pt:v", 0, 1,
+	"dl:hp:Pt:v", 0, 1,
-	"[-dhvP] [-c start-directory] [-F format] [-p percentage|-l size] "
+	"[-dhvP] [-p percentage|-l size] [-t target-pane] [command]",
-	CMD_TARGET_PANE_USAGE " [command]",
 	0,
 	cmd_split_window_key_binding,
 	NULL,
@@ -49,8 +48,8 @@ cmd_split_window_key_binding(struct cmd *self, int key)
 		args_set(self->args, 'h', NULL);
 }
 
-enum cmd_retval
+int
-cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct session		*s;
@@ -58,21 +57,16 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct window		*w;
 	struct window_pane	*wp, *new_wp = NULL;
 	struct environ		 env;
-	const char		*cmd, *cwd, *shell;
+	const char	       	*cmd, *cwd, *shell;
 	char			*cause, *new_cause;
-	u_int			 hlimit;
+	u_int			 hlimit, paneidx;
 	int			 size, percentage;
 	enum layout_type	 type;
 	struct layout_cell	*lc;
-	const char		*template;
-	struct client		*c;
-	struct format_tree	*ft;
-	char			*cp;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
+	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	w = wl->window;
-	server_unzoom_window(w);
 
 	environ_init(&env);
 	environ_copy(&global_environ, &env);
@@ -83,7 +77,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		cmd = options_get_string(&s->options, "default-command");
 	else
 		cmd = args->argv[0];
-	cwd = cmd_get_default_path(cmdq, args_get(args, 'c'));
+	cwd = cmd_get_default_path(ctx);
 
 	type = LAYOUT_TOPBOTTOM;
 	if (args_has(args, 'h'))
@@ -94,7 +88,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
 		if (cause != NULL) {
 			xasprintf(&new_cause, "size %s", cause);
-			free(cause);
+			xfree(cause);
 			cause = new_cause;
 			goto error;
 		}
@@ -102,7 +96,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		percentage = args_strtonum(args, 'p', 0, INT_MAX, &cause);
 		if (cause != NULL) {
 			xasprintf(&new_cause, "percentage %s", cause);
-			free(cause);
+			xfree(cause);
 			cause = new_cause;
 			goto error;
 		}
@@ -117,7 +111,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (*shell == '\0' || areshell(shell))
 		shell = _PATH_BSHELL;
 
-	if ((lc = layout_split_pane(wp, type, size, 0)) == NULL) {
+	if ((lc = layout_split_pane(wp, type, size)) == NULL) {
 		cause = xstrdup("pane too small");
 		goto error;
 	}
@@ -139,30 +133,17 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	environ_free(&env);
 
 	if (args_has(args, 'P')) {
-		if ((template = args_get(args, 'F')) == NULL)
+		if (window_pane_index(new_wp, &paneidx) != 0)
-			template = SPLIT_WINDOW_TEMPLATE;
+			fatalx("index not found");
-
+		ctx->print(ctx, "%s:%u.%u", s->name, wl->idx, paneidx);
-		ft = format_create();
-		if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL)
-			format_client(ft, c);
-		format_session(ft, s);
-		format_winlink(ft, s, wl);
-		format_window_pane(ft, new_wp);
-
-		cp = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", cp);
-		free(cp);
-
-		format_free(ft);
 	}
-	notify_window_layout_changed(w);
+	return (0);
-	return (CMD_RETURN_NORMAL);
 
 error:
 	environ_free(&env);
 	if (new_wp != NULL)
 		window_remove_pane(w, new_wp);
-	cmdq_error(cmdq, "create pane failed: %s", cause);
+	ctx->error(ctx, "create pane failed: %s", cause);
-	free(cause);
+	xfree(cause);
-	return (CMD_RETURN_ERROR);
+	return (-1);
 }

cmd-start-server.c

@@ -24,7 +24,7 @@
  * Start the server and do nothing else.
  */
 
-enum cmd_retval	 cmd_start_server_exec(struct cmd *, struct cmd_q *);
+int	cmd_start_server_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_start_server_entry = {
 	"start-server", "start",
@@ -36,8 +36,9 @@ const struct cmd_entry cmd_start_server_entry = {
 	cmd_start_server_exec
 };
 
-enum cmd_retval
+/* ARGSUSED */
-cmd_start_server_exec(unused struct cmd *self, unused struct cmd_q *cmdq)
+int
+cmd_start_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-string.c

@@ -31,12 +31,11 @@
  * Parse a command from a string.
  */
 
-int	 cmd_string_getc(const char *, size_t *);
+int	cmd_string_getc(const char *, size_t *);
-void	 cmd_string_ungetc(size_t *);
+void	cmd_string_ungetc(size_t *);
-void	 cmd_string_copy(char **, char *, size_t *);
+char   *cmd_string_string(const char *, size_t *, char, int);
-char	*cmd_string_string(const char *, size_t *, char, int);
+char   *cmd_string_variable(const char *, size_t *);
-char	*cmd_string_variable(const char *, size_t *);
+char   *cmd_string_expand_tilde(const char *, size_t *);
-char	*cmd_string_expand_tilde(const char *, size_t *);
 
 int
 cmd_string_getc(const char *s, size_t *p)
@@ -59,8 +58,7 @@ cmd_string_ungetc(size_t *p)
  * string, or NULL for empty command.
  */
 int
-cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
+cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
-    u_int line, char **cause)
 {
 	size_t		p;
 	int		ch, i, argc, rval;
@@ -86,17 +84,26 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
 		case '\'':
 			if ((t = cmd_string_string(s, &p, '\'', 0)) == NULL)
 				goto error;
-			cmd_string_copy(&buf, t, &len);
+			buf = xrealloc(buf, 1, len + strlen(t) + 1);
+			strlcpy(buf + len, t, strlen(t) + 1);
+			len += strlen(t);
+			xfree(t);
 			break;
 		case '"':
 			if ((t = cmd_string_string(s, &p, '"', 1)) == NULL)
 				goto error;
-			cmd_string_copy(&buf, t, &len);
+			buf = xrealloc(buf, 1, len + strlen(t) + 1);
+			strlcpy(buf + len, t, strlen(t) + 1);
+			len += strlen(t);
+			xfree(t);
 			break;
 		case '$':
 			if ((t = cmd_string_variable(s, &p)) == NULL)
 				goto error;
-			cmd_string_copy(&buf, t, &len);
+			buf = xrealloc(buf, 1, len + strlen(t) + 1);
+			strlcpy(buf + len, t, strlen(t) + 1);
+			len += strlen(t);
+			xfree(t);
 			break;
 		case '#':
 			/* Comment: discard rest of line. */
@@ -132,7 +139,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
 			if (argc == 0)
 				goto out;
 
-			*cmdlist = cmd_list_parse(argc, argv, file, line, cause);
+			*cmdlist = cmd_list_parse(argc, argv, cause);
 			if (*cmdlist == NULL)
 				goto out;
 
@@ -140,10 +147,12 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
 			goto out;
 		case '~':
 			if (buf == NULL) {
-				t = cmd_string_expand_tilde(s, &p);
+				if ((t = cmd_string_expand_tilde(s, &p)) == NULL)
-				if (t == NULL)
 					goto error;
-				cmd_string_copy(&buf, t, &len);
+				buf = xrealloc(buf, 1, len + strlen(t) + 1);
+				strlcpy(buf + len, t, strlen(t) + 1);
+				len += strlen(t);
+				xfree(t);
 				break;
 			}
 			/* FALLTHROUGH */
@@ -161,31 +170,18 @@ error:
 	xasprintf(cause, "invalid or unknown command: %s", s);
 
 out:
-	free(buf);
+	if (buf != NULL)
+		xfree(buf);
 
 	if (argv != NULL) {
 		for (i = 0; i < argc; i++)
-			free(argv[i]);
+			xfree(argv[i]);
-		free(argv);
+		xfree(argv);
 	}
 
 	return (rval);
 }
 
-void
-cmd_string_copy(char **dst, char *src, size_t *len)
-{
-	size_t srclen;
-
-	srclen = strlen(src);
-
-	*dst = xrealloc(*dst, 1, *len + srclen + 1);
-	strlcpy(*dst + *len, src, srclen + 1);
-
-	*len += srclen;
-	free(src);
-}
-
 char *
 cmd_string_string(const char *s, size_t *p, char endch, int esc)
 {
@@ -225,7 +221,10 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc)
 				break;
 			if ((t = cmd_string_variable(s, p)) == NULL)
 				goto error;
-			cmd_string_copy(&buf, t, &len);
+			buf = xrealloc(buf, 1, len + strlen(t) + 1);
+			strlcpy(buf + len, t, strlen(t) + 1);
+			len += strlen(t);
+			xfree(t);
 			continue;
 		}
 
@@ -240,7 +239,8 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc)
 	return (buf);
 
 error:
-	free(buf);
+	if (buf != NULL)
+		xfree(buf);
 	return (NULL);
 }
 
@@ -303,13 +303,14 @@ cmd_string_variable(const char *s, size_t *p)
 	buf[len] = '\0';
 
 	envent = environ_find(&global_environ, buf);
-	free(buf);
+	xfree(buf);
 	if (envent == NULL)
 		return (xstrdup(""));
 	return (xstrdup(envent->value));
 
 error:
-	free(buf);
+	if (buf != NULL)
+		xfree(buf);
 	return (NULL);
 }
 
@@ -333,7 +334,7 @@ cmd_string_expand_tilde(const char *s, size_t *p)
 			return (NULL);
 		if ((pw = getpwnam(username)) != NULL)
 			home = pw->pw_dir;
-		free(username);
+		xfree(username);
 	}
 	if (home == NULL)
 		return (NULL);

cmd-suspend-client.c

@@ -27,7 +27,7 @@
  * Suspend client with SIGTSTP.
  */
 
-enum cmd_retval	 cmd_suspend_client_exec(struct cmd *, struct cmd_q *);
+int	cmd_suspend_client_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_suspend_client_entry = {
 	"suspend-client", "suspendc",
@@ -39,18 +39,18 @@ const struct cmd_entry cmd_suspend_client_entry = {
 	cmd_suspend_client_exec
 };
 
-enum cmd_retval
+int
-cmd_suspend_client_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_suspend_client_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct client	*c;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	tty_stop_tty(&c->tty);
 	c->flags |= CLIENT_SUSPENDED;
 	server_write_client(c, MSG_SUSPEND, NULL, 0);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-swap-pane.c

@@ -26,8 +26,8 @@
  * Swap two panes.
  */
 
-void		 cmd_swap_pane_key_binding(struct cmd *, int);
+void	cmd_swap_pane_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_swap_pane_exec(struct cmd *, struct cmd_q *);
+int	cmd_swap_pane_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_swap_pane_entry = {
 	"swap-pane", "swapp",
@@ -49,8 +49,8 @@ cmd_swap_pane_key_binding(struct cmd *self, int key)
 		args_set(self->args, 'D', NULL);
 }
 
-enum cmd_retval
+int
-cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*src_wl, *dst_wl;
@@ -59,11 +59,10 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct layout_cell	*src_lc, *dst_lc;
 	u_int			 sx, sy, xoff, yoff;
 
-	dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &dst_wp);
+	dst_wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &dst_wp);
 	if (dst_wl == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	dst_w = dst_wl->window;
-	server_unzoom_window(dst_w);
 
 	if (!args_has(args, 's')) {
 		src_w = dst_w;
@@ -76,17 +75,16 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 			if (src_wp == NULL)
 				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
 		} else
-			return (CMD_RETURN_NORMAL);
+			return (0);
 	} else {
-		src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp);
+		src_wl = cmd_find_pane(ctx, args_get(args, 's'), NULL, &src_wp);
 		if (src_wl == NULL)
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		src_w = src_wl->window;
 	}
-	server_unzoom_window(src_w);
 
 	if (src_wp == dst_wp)
-		return (CMD_RETURN_NORMAL);
+		return (0);
 
 	tmp_wp = TAILQ_PREV(dst_wp, window_panes, entry);
 	TAILQ_REMOVE(&dst_w->panes, dst_wp, entry);
@@ -140,5 +138,5 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	server_redraw_window(src_w);
 	server_redraw_window(dst_w);
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-swap-window.c

@@ -26,7 +26,7 @@
  * Swap one window with another.
  */
 
-enum cmd_retval	cmd_swap_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_swap_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_swap_window_entry = {
 	"swap-window", "swapw",
@@ -38,8 +38,8 @@ const struct cmd_entry cmd_swap_window_entry = {
 	cmd_swap_window_exec
 };
 
-enum cmd_retval
+int
-cmd_swap_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	const char		*target_src, *target_dst;
@@ -49,22 +49,22 @@ cmd_swap_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct window		*w;
 
 	target_src = args_get(args, 's');
-	if ((wl_src = cmd_find_window(cmdq, target_src, &src)) == NULL)
+	if ((wl_src = cmd_find_window(ctx, target_src, &src)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	target_dst = args_get(args, 't');
-	if ((wl_dst = cmd_find_window(cmdq, target_dst, &dst)) == NULL)
+	if ((wl_dst = cmd_find_window(ctx, target_dst, &dst)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	sg_src = session_group_find(src);
 	sg_dst = session_group_find(dst);
 	if (src != dst &&
 	    sg_src != NULL && sg_dst != NULL && sg_src == sg_dst) {
-		cmdq_error(cmdq, "can't move window, sessions are grouped");
+		ctx->error(ctx, "can't move window, sessions are grouped");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	if (wl_dst->window == wl_src->window)
-		return (CMD_RETURN_NORMAL);
+		return (0);
 
 	w = wl_dst->window;
 	wl_dst->window = wl_src->window;
@@ -83,5 +83,5 @@ cmd_swap_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	}
 	recalculate_sizes();
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-switch-client.c

@@ -27,8 +27,8 @@
  * Switch client to a different session.
  */
 
-void		 cmd_switch_client_key_binding(struct cmd *, int);
+void	cmd_switch_client_key_binding(struct cmd *, int);
-enum cmd_retval	 cmd_switch_client_exec(struct cmd *, struct cmd_q *);
+int	cmd_switch_client_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_switch_client_entry = {
 	"switch-client", "switchc",
@@ -57,48 +57,48 @@ cmd_switch_client_key_binding(struct cmd *self, int key)
 	}
 }
 
-enum cmd_retval
+int
-cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_switch_client_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct client	*c;
 	struct session	*s;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 'c'), 0)) == NULL)
+	if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	if (args_has(args, 'r')) {
 		if (c->flags & CLIENT_READONLY) {
 			c->flags &= ~CLIENT_READONLY;
-			cmdq_info(cmdq, "made client writable");
+			ctx->info(ctx, "made client writable");
 		} else {
 			c->flags |= CLIENT_READONLY;
-			cmdq_info(cmdq, "made client read-only");
+			ctx->info(ctx, "made client read-only");
 		}
 	}
 
 	s = NULL;
 	if (args_has(args, 'n')) {
 		if ((s = session_next_session(c->session)) == NULL) {
-			cmdq_error(cmdq, "can't find next session");
+			ctx->error(ctx, "can't find next session");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	} else if (args_has(args, 'p')) {
 		if ((s = session_previous_session(c->session)) == NULL) {
-			cmdq_error(cmdq, "can't find previous session");
+			ctx->error(ctx, "can't find previous session");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	} else if (args_has(args, 'l')) {
 		if (c->last_session != NULL && session_alive(c->last_session))
 			s = c->last_session;
 		if (s == NULL) {
-			cmdq_error(cmdq, "can't find last session");
+			ctx->error(ctx, "can't find last session");
-			return (CMD_RETURN_ERROR);
+			return (-1);
 		}
 	} else
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		s = cmd_find_session(ctx, args_get(args, 't'), 0);
 	if (s == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 
 	if (c->session != NULL)
 		c->last_session = c->session;
@@ -110,5 +110,5 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
 	server_redraw_client(c);
 	s->curw->flags &= ~WINLINK_ALERTFLAGS;
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-unbind-key.c

@@ -18,17 +18,16 @@
 
 #include <sys/types.h>
 
-#include <stdlib.h>
-
 #include "tmux.h"
 
 /*
  * Unbind key from command.
  */
 
-enum cmd_retval	 cmd_unbind_key_check(struct args *);
+int	cmd_unbind_key_check(struct args *);
-enum cmd_retval	 cmd_unbind_key_exec(struct cmd *, struct cmd_q *);
+int	cmd_unbind_key_exec(struct cmd *, struct cmd_ctx *);
-enum cmd_retval	 cmd_unbind_key_table(struct cmd *, struct cmd_q *, int);
+
+int	cmd_unbind_key_table(struct cmd *, struct cmd_ctx *, int);
 
 const struct cmd_entry cmd_unbind_key_entry = {
 	"unbind-key", "unbind",
@@ -40,51 +39,48 @@ const struct cmd_entry cmd_unbind_key_entry = {
 	cmd_unbind_key_exec
 };
 
-enum cmd_retval
+int
 cmd_unbind_key_check(struct args *args)
 {
-	if (args_has(args, 'a') && args->argc != 0)
+	if (args_has(args, 'a') && (args->argc != 0 || args_has(args, 't')))
-		return (CMD_RETURN_ERROR);
+	    return (-1);
 	if (!args_has(args, 'a') && args->argc != 1)
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
-enum cmd_retval
+int
-cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_unbind_key_exec(struct cmd *self, unused struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct key_binding	*bd;
 	int			 key;
 
-	if (!args_has(args, 'a')) {
+	if (args_has(args, 'a')) {
-		key = key_string_lookup_string(args->argv[0]);
-		if (key == KEYC_NONE) {
-			cmdq_error(cmdq, "unknown key: %s", args->argv[0]);
-			return (CMD_RETURN_ERROR);
-		}
-	} else
-		key = KEYC_NONE;
-
-	if (args_has(args, 't'))
-		return (cmd_unbind_key_table(self, cmdq, key));
-
-	if (key == KEYC_NONE) {
 		while (!RB_EMPTY(&key_bindings)) {
 			bd = RB_ROOT(&key_bindings);
 			key_bindings_remove(bd->key);
 		}
-		return (CMD_RETURN_NORMAL);
+		return (0);
 	}
 
+	key = key_string_lookup_string(args->argv[0]);
+	if (key == KEYC_NONE) {
+		ctx->error(ctx, "unknown key: %s", args->argv[0]);
+		return (-1);
+	}
+
+	if (args_has(args, 't'))
+		return (cmd_unbind_key_table(self, ctx, key));
+
 	if (!args_has(args, 'n'))
 		key |= KEYC_PREFIX;
 	key_bindings_remove(key);
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }
 
-enum cmd_retval
+int
-cmd_unbind_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
+cmd_unbind_key_table(struct cmd *self, struct cmd_ctx *ctx, int key)
 {
 	struct args			*args = self->args;
 	const char			*tablename;
@@ -93,24 +89,15 @@ cmd_unbind_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
 
 	tablename = args_get(args, 't');
 	if ((mtab = mode_key_findtable(tablename)) == NULL) {
-		cmdq_error(cmdq, "unknown key table: %s", tablename);
+		ctx->error(ctx, "unknown key table: %s", tablename);
-		return (CMD_RETURN_ERROR);
+		return (-1);
-	}
-
-	if (key == KEYC_NONE) {
-		while (!RB_EMPTY(mtab->tree)) {
-			mbind = RB_ROOT(mtab->tree);
-			RB_REMOVE(mode_key_tree, mtab->tree, mbind);
-			free(mbind);
-		}
-		return (CMD_RETURN_NORMAL);
 	}
 
 	mtmp.key = key;
 	mtmp.mode = !!args_has(args, 'c');
 	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) != NULL) {
 		RB_REMOVE(mode_key_tree, mtab->tree, mbind);
-		free(mbind);
+		xfree(mbind);
 	}
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-unlink-window.c

@@ -24,7 +24,7 @@
  * Unlink a window, unless it would be destroyed by doing so (only one link).
  */
 
-enum cmd_retval	 cmd_unlink_window_exec(struct cmd *, struct cmd_q *);
+int	cmd_unlink_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_unlink_window_entry = {
 	"unlink-window", "unlinkw",
@@ -36,8 +36,8 @@ const struct cmd_entry cmd_unlink_window_entry = {
 	cmd_unlink_window_exec
 };
 
-enum cmd_retval
+int
-cmd_unlink_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_unlink_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
@@ -46,8 +46,8 @@ cmd_unlink_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct session_group	*sg;
 	u_int			 references;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
+	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	w = wl->window;
 
 	sg = session_group_find(s);
@@ -59,12 +59,12 @@ cmd_unlink_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		references = 1;
 
 	if (!args_has(self->args, 'k') && w->references == references) {
-		cmdq_error(cmdq, "window is only linked to one session");
+		ctx->error(ctx, "window is only linked to one session");
-		return (CMD_RETURN_ERROR);
+		return (-1);
 	}
 
 	server_unlink_window(s, wl);
 	recalculate_sizes();
 
-	return (CMD_RETURN_NORMAL);
+	return (0);
 }

cmd-wait-for.c

@@ -1,197 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
- * Copyright (c) 2013 Thiago de Arruda <tpadilha84@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "tmux.h"
-
-/*
- * Block or wake a client on a named wait channel.
- */
-
-enum cmd_retval cmd_wait_for_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_wait_for_entry = {
-	"wait-for", "wait",
-	"LSU", 1, 1,
-	"[-LSU] channel",
-	0,
-	NULL,
-	NULL,
-	cmd_wait_for_exec
-};
-
-struct wait_channel {
-	const char	       *name;
-	int			locked;
-
-	TAILQ_HEAD(, cmd_q)	waiters;
-	TAILQ_HEAD(, cmd_q)	lockers;
-
-	RB_ENTRY(wait_channel)	entry;
-};
-RB_HEAD(wait_channels, wait_channel);
-struct wait_channels wait_channels = RB_INITIALIZER(wait_channels);
-
-int	wait_channel_cmp(struct wait_channel *, struct wait_channel *);
-RB_PROTOTYPE(wait_channels, wait_channel, entry, wait_channel_cmp);
-RB_GENERATE(wait_channels, wait_channel, entry, wait_channel_cmp);
-
-int
-wait_channel_cmp(struct wait_channel *wc1, struct wait_channel *wc2)
-{
-	return (strcmp(wc1->name, wc2->name));
-}
-
-enum cmd_retval	cmd_wait_for_signal(struct cmd_q *, const char *,
-		    struct wait_channel *);
-enum cmd_retval	cmd_wait_for_wait(struct cmd_q *, const char *,
-		    struct wait_channel *);
-enum cmd_retval	cmd_wait_for_lock(struct cmd_q *, const char *,
-		    struct wait_channel *);
-enum cmd_retval	cmd_wait_for_unlock(struct cmd_q *, const char *,
-		    struct wait_channel *);
-
-enum cmd_retval
-cmd_wait_for_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args     	*args = self->args;
-	const char		*name = args->argv[0];
-	struct wait_channel	*wc, wc0;
-
-	wc0.name = name;
-	wc = RB_FIND(wait_channels, &wait_channels, &wc0);
-
-	if (args_has(args, 'S'))
-		return (cmd_wait_for_signal(cmdq, name, wc));
-	if (args_has(args, 'L'))
-		return (cmd_wait_for_lock(cmdq, name, wc));
-	if (args_has(args, 'U'))
-		return (cmd_wait_for_unlock(cmdq, name, wc));
-	return (cmd_wait_for_wait(cmdq, name, wc));
-}
-
-enum cmd_retval
-cmd_wait_for_signal(struct cmd_q *cmdq, const char *name,
-    struct wait_channel *wc)
-{
-	struct cmd_q	*wq, *wq1;
-
-	if (wc == NULL || TAILQ_EMPTY(&wc->waiters)) {
-		cmdq_error(cmdq, "no waiting clients on %s", name);
-		return (CMD_RETURN_ERROR);
-	}
-
-	TAILQ_FOREACH_SAFE(wq, &wc->waiters, waitentry, wq1) {
-		TAILQ_REMOVE(&wc->waiters, wq, waitentry);
-		if (!cmdq_free(wq))
-			cmdq_continue(wq);
-	}
-
-	if (!wc->locked) {
-		RB_REMOVE(wait_channels, &wait_channels, wc);
-		free((void*) wc->name);
-		free(wc);
-	}
-
-	return (CMD_RETURN_NORMAL);
-}
-
-enum cmd_retval
-cmd_wait_for_wait(struct cmd_q *cmdq, const char *name,
-    struct wait_channel *wc)
-{
-	if (cmdq->client == NULL || cmdq->client->session != NULL) {
-		cmdq_error(cmdq, "not able to wait");
-		return (CMD_RETURN_ERROR);
-	}
-
-	if (wc == NULL) {
-		wc = xmalloc(sizeof *wc);
-		wc->name = xstrdup(name);
-		wc->locked = 0;
-		TAILQ_INIT(&wc->waiters);
-		TAILQ_INIT(&wc->lockers);
-		RB_INSERT(wait_channels, &wait_channels, wc);
-	}
-
-	TAILQ_INSERT_TAIL(&wc->waiters, cmdq, waitentry);
-	cmdq->references++;
-
-	return (CMD_RETURN_WAIT);
-}
-
-enum cmd_retval
-cmd_wait_for_lock(struct cmd_q *cmdq, const char *name,
-    struct wait_channel *wc)
-{
-	if (cmdq->client == NULL || cmdq->client->session != NULL) {
-		cmdq_error(cmdq, "not able to lock");
-		return (CMD_RETURN_ERROR);
-	}
-
-	if (wc == NULL) {
-		wc = xmalloc(sizeof *wc);
-		wc->name = xstrdup(name);
-		wc->locked = 0;
-		TAILQ_INIT(&wc->waiters);
-		TAILQ_INIT(&wc->lockers);
-		RB_INSERT(wait_channels, &wait_channels, wc);
-	}
-
-	if (wc->locked) {
-		TAILQ_INSERT_TAIL(&wc->lockers, cmdq, waitentry);
-		cmdq->references++;
-		return (CMD_RETURN_WAIT);
-	}
-	wc->locked = 1;
-
-	return (CMD_RETURN_NORMAL);
-}
-
-enum cmd_retval
-cmd_wait_for_unlock(struct cmd_q *cmdq, const char *name,
-    struct wait_channel *wc)
-{
-	struct cmd_q	*wq;
-
-	if (wc == NULL || !wc->locked) {
-		cmdq_error(cmdq, "channel %s not locked", name);
-		return (CMD_RETURN_ERROR);
-	}
-
-	if ((wq = TAILQ_FIRST(&wc->lockers)) != NULL) {
-		TAILQ_REMOVE(&wc->lockers, wq, waitentry);
-		if (!cmdq_free(wq))
-			cmdq_continue(wq);
-	} else {
-		wc->locked = 0;
-		if (TAILQ_EMPTY(&wc->waiters)) {
-			RB_REMOVE(wait_channels, &wait_channels, wc);
-			free((void*) wc->name);
-			free(wc);
-		}
-	}
-
-	return (CMD_RETURN_NORMAL);
-}
-

cmd.c

@@ -20,7 +20,6 @@
 #include <sys/time.h>
 
 #include <fnmatch.h>
-#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -34,9 +33,7 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_capture_pane_entry,
 	&cmd_choose_buffer_entry,
 	&cmd_choose_client_entry,
-	&cmd_choose_list_entry,
 	&cmd_choose_session_entry,
-	&cmd_choose_tree_entry,
 	&cmd_choose_window_entry,
 	&cmd_clear_history_entry,
 	&cmd_clock_mode_entry,
@@ -69,7 +66,6 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_lock_client_entry,
 	&cmd_lock_server_entry,
 	&cmd_lock_session_entry,
-	&cmd_move_pane_entry,
 	&cmd_move_window_entry,
 	&cmd_new_session_entry,
 	&cmd_new_window_entry,
@@ -112,24 +108,19 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_switch_client_entry,
 	&cmd_unbind_key_entry,
 	&cmd_unlink_window_entry,
-	&cmd_wait_for_entry,
 	NULL
 };
 
-int		 cmd_session_better(struct session *, struct session *, int);
 struct session	*cmd_choose_session_list(struct sessionslist *);
 struct session	*cmd_choose_session(int);
 struct client	*cmd_choose_client(struct clients *);
 struct client	*cmd_lookup_client(const char *);
 struct session	*cmd_lookup_session(const char *, int *);
-struct session	*cmd_lookup_session_id(const char *);
 struct winlink	*cmd_lookup_window(struct session *, const char *, int *);
 int		 cmd_lookup_index(struct session *, const char *, int *);
 struct window_pane *cmd_lookup_paneid(const char *);
-struct winlink	*cmd_lookup_winlink_windowid(struct session *, const char *);
+struct session	*cmd_pane_session(struct cmd_ctx *,
-struct window	*cmd_lookup_windowid(const char *);
+		    struct window_pane *, struct winlink **);
-struct session	*cmd_window_session(struct cmd_q *, struct window *,
-		    struct winlink **);
 struct winlink	*cmd_find_window_offset(const char *, struct session *, int *);
 int		 cmd_find_index_offset(const char *, struct session *, int *);
 struct window_pane *cmd_find_pane_offset(const char *, struct winlink *);
@@ -201,13 +192,15 @@ cmd_free_argv(int argc, char **argv)
 
 	if (argc == 0)
 		return;
-	for (i = 0; i < argc; i++)
+	for (i = 0; i < argc; i++) {
-		free(argv[i]);
+		if (argv[i] != NULL)
-	free(argv);
+			xfree(argv[i]);
+	}
+	xfree(argv);
 }
 
 struct cmd *
-cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
+cmd_parse(int argc, char **argv, char **cause)
 {
 	const struct cmd_entry **entryp, *entry;
 	struct cmd		*cmd;
@@ -257,14 +250,9 @@ cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
 	if (entry->check != NULL && entry->check(args) != 0)
 		goto usage;
 
-	cmd = xcalloc(1, sizeof *cmd);
+	cmd = xmalloc(sizeof *cmd);
 	cmd->entry = entry;
 	cmd->args = args;
-
-	if (file != NULL)
-		cmd->file = xstrdup(file);
-	cmd->line = line;
-
 	return (cmd);
 
 ambiguous:
@@ -288,6 +276,20 @@ usage:
 	return (NULL);
 }
 
+int
+cmd_exec(struct cmd *cmd, struct cmd_ctx *ctx)
+{
+	return (cmd->entry->exec(cmd, ctx));
+}
+
+void
+cmd_free(struct cmd *cmd)
+{
+	if (cmd->args != NULL)
+		args_free(cmd->args);
+	xfree(cmd);
+}
+
 size_t
 cmd_print(struct cmd *cmd, char *buf, size_t len)
 {
@@ -297,10 +299,11 @@ cmd_print(struct cmd *cmd, char *buf, size_t len)
 	if (off < len) {
 		used = args_print(cmd->args, buf + off, len - off);
 		if (used == 0)
-			off--;
+			buf[off - 1] = '\0';
-		else
+		else {
 			off += used;
-		buf[off] = '\0';
+			buf[off] = '\0';
+		}
 	}
 	return (off);
 }
@@ -313,33 +316,31 @@ cmd_print(struct cmd *cmd, char *buf, size_t len)
  * session from all sessions.
  */
 struct session *
-cmd_current_session(struct cmd_q *cmdq, int prefer_unattached)
+cmd_current_session(struct cmd_ctx *ctx, int prefer_unattached)
 {
-	struct msg_command_data	*data = cmdq->msgdata;
+	struct msg_command_data	*data = ctx->msgdata;
-	struct client		*c = cmdq->client;
+	struct client		*c = ctx->cmdclient;
 	struct session		*s;
 	struct sessionslist	 ss;
 	struct winlink		*wl;
 	struct window_pane	*wp;
-	const char		*path;
 	int			 found;
 
-	if (c != NULL && c->session != NULL)
+	if (ctx->curclient != NULL && ctx->curclient->session != NULL)
-		return (c->session);
+		return (ctx->curclient->session);
 
 	/*
-	 * If the name of the calling client's pty is known, build a list of
+	 * If the name of the calling client's pty is know, build a list of the
-	 * the sessions that contain it and if any choose either the first or
+	 * sessions that contain it and if any choose either the first or the
-	 * the newest.
+	 * newest.
 	 */
-	path = c == NULL ? NULL : c->tty.path;
+	if (c != NULL && c->tty.path != NULL) {
-	if (path != NULL) {
 		ARRAY_INIT(&ss);
 		RB_FOREACH(s, sessions, &sessions) {
 			found = 0;
 			RB_FOREACH(wl, winlinks, &s->windows) {
 				TAILQ_FOREACH(wp, &wl->window->panes, entry) {
-					if (strcmp(wp->tty, path) == 0) {
+					if (strcmp(wp->tty, c->tty.path) == 0) {
 						found = 1;
 						break;
 					}
@@ -358,8 +359,8 @@ cmd_current_session(struct cmd_q *cmdq, int prefer_unattached)
 	}
 
 	/* Use the session from the TMUX environment variable. */
-	if (data != NULL && data->pid == getpid() && data->session_id != -1) {
+	if (data != NULL && data->pid == getpid() && data->idx != -1) {
-		s = session_find_by_id(data->session_id);
+		s = session_find_by_index(data->idx);
 		if (s != NULL)
 			return (s);
 	}
@@ -367,24 +368,6 @@ cmd_current_session(struct cmd_q *cmdq, int prefer_unattached)
 	return (cmd_choose_session(prefer_unattached));
 }
 
-/* Is this session better? */
-int
-cmd_session_better(struct session *s, struct session *best,
-    int prefer_unattached)
-{
-	if (best == NULL)
-		return (1);
-	if (prefer_unattached) {
-		if (!(best->flags & SESSION_UNATTACHED) &&
-		    (s->flags & SESSION_UNATTACHED))
-			return (1);
-		else if ((best->flags & SESSION_UNATTACHED) &&
-		    !(s->flags & SESSION_UNATTACHED))
-			return (0);
-	}
-	return (timercmp(&s->activity_time, &best->activity_time, >));
-}
-
 /*
  * Find the most recently used session, preferring unattached if the flag is
  * set.
@@ -392,14 +375,21 @@ cmd_session_better(struct session *s, struct session *best,
 struct session *
 cmd_choose_session(int prefer_unattached)
 {
-	struct session	*s, *best;
+	struct session	*s, *sbest;
+	struct timeval	*tv = NULL;
 
-	best = NULL;
+	sbest = NULL;
 	RB_FOREACH(s, sessions, &sessions) {
-		if (cmd_session_better(s, best, prefer_unattached))
+		if (tv == NULL || timercmp(&s->activity_time, tv, >) ||
-			best = s;
+		    (prefer_unattached &&
+		    !(sbest->flags & SESSION_UNATTACHED) &&
+		    (s->flags & SESSION_UNATTACHED))) {
+			sbest = s;
+			tv = &s->activity_time;
+		}
 	}
-	return (best);
+
+	return (sbest);
 }
 
 /* Find the most recently used session from a list. */
@@ -430,21 +420,21 @@ cmd_choose_session_list(struct sessionslist *ss)
  * then of all clients.
  */
 struct client *
-cmd_current_client(struct cmd_q *cmdq)
+cmd_current_client(struct cmd_ctx *ctx)
 {
 	struct session		*s;
 	struct client		*c;
 	struct clients		 cc;
 	u_int			 i;
 
-	if (cmdq->client != NULL && cmdq->client->session != NULL)
+	if (ctx->curclient != NULL)
-		return (cmdq->client);
+		return (ctx->curclient);
 
 	/*
 	 * No current client set. Find the current session and return the
 	 * newest of its clients.
 	 */
-	s = cmd_current_session(cmdq, 0);
+	s = cmd_current_session(ctx, 0);
 	if (s != NULL && !(s->flags & SESSION_UNATTACHED)) {
 		ARRAY_INIT(&cc);
 		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
@@ -489,19 +479,15 @@ cmd_choose_client(struct clients *cc)
 
 /* Find the target client or report an error and return NULL. */
 struct client *
-cmd_find_client(struct cmd_q *cmdq, const char *arg, int quiet)
+cmd_find_client(struct cmd_ctx *ctx, const char *arg)
 {
 	struct client	*c;
 	char		*tmparg;
 	size_t		 arglen;
 
 	/* A NULL argument means the current client. */
-	if (arg == NULL) {
+	if (arg == NULL)
-		c = cmd_current_client(cmdq);
+		return (cmd_current_client(ctx));
-		if (c == NULL && !quiet)
-			cmdq_error(cmdq, "no clients");
-		return (c);
-	}
 	tmparg = xstrdup(arg);
 
 	/* Trim a single trailing colon if any. */
@@ -513,10 +499,10 @@ cmd_find_client(struct cmd_q *cmdq, const char *arg, int quiet)
 	c = cmd_lookup_client(tmparg);
 
 	/* If no client found, report an error. */
-	if (c == NULL && !quiet)
+	if (c == NULL)
-		cmdq_error(cmdq, "client not found: %s", tmparg);
+		ctx->error(ctx, "client not found: %s", tmparg);
 
-	free(tmparg);
+	xfree(tmparg);
 	return (c);
 }
 
@@ -533,7 +519,7 @@ cmd_lookup_client(const char *name)
 
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL || c->tty.path == NULL)
+		if (c == NULL || c->session == NULL)
 			continue;
 		path = c->tty.path;
 
@@ -551,21 +537,6 @@ cmd_lookup_client(const char *name)
 	return (NULL);
 }
 
-/* Find the target session or report an error and return NULL. */
-struct session *
-cmd_lookup_session_id(const char *arg)
-{
-	char	*endptr;
-	long	 id;
-
-	if (arg[0] != '$')
-		return (NULL);
-	id = strtol(arg + 1, &endptr, 10);
-	if (arg[1] != '\0' && *endptr == '\0')
-		return (session_find_by_id(id));
-	return (NULL);
-}
-
 /* Lookup a session by name. If no session is found, NULL is returned. */
 struct session *
 cmd_lookup_session(const char *name, int *ambiguous)
@@ -574,10 +545,6 @@ cmd_lookup_session(const char *name, int *ambiguous)
 
 	*ambiguous = 0;
 
-	/* Look for $id first. */
-	if ((s = cmd_lookup_session_id(name)) != NULL)
-		return (s);
-
 	/*
 	 * Look for matches. First look for exact matches - session names must
 	 * be unique so an exact match can't be ambigious and can just be
@@ -619,10 +586,6 @@ cmd_lookup_window(struct session *s, const char *name, int *ambiguous)
 
 	*ambiguous = 0;
 
-	/* Try as a window id. */
-	if ((wl = cmd_lookup_winlink_windowid(s, name)) != NULL)
-	    return (wl);
-
 	/* First see if this is a valid window index in this session. */
 	idx = strtonum(name, 0, INT_MAX, &errstr);
 	if (errstr == NULL) {
@@ -685,7 +648,10 @@ cmd_lookup_index(struct session *s, const char *name, int *ambiguous)
 	return (-1);
 }
 
-/* Lookup pane id. An initial % means a pane id. */
+/*
+ * Lookup pane id. An initial % means a pane id. sp must already point to the
+ * current session.
+ */
 struct window_pane *
 cmd_lookup_paneid(const char *arg)
 {
@@ -701,50 +667,19 @@ cmd_lookup_paneid(const char *arg)
 	return (window_pane_find_by_id(paneid));
 }
 
-/* Lookup window id in a session. An initial @ means a window id. */
+/* Find session and winlink for pane. */
-struct winlink *
-cmd_lookup_winlink_windowid(struct session *s, const char *arg)
-{
-	const char	*errstr;
-	u_int		 windowid;
-
-	if (*arg != '@')
-		return (NULL);
-
-	windowid = strtonum(arg + 1, 0, UINT_MAX, &errstr);
-	if (errstr != NULL)
-		return (NULL);
-	return (winlink_find_by_window_id(&s->windows, windowid));
-}
-
-/* Lookup window id. An initial @ means a window id. */
-struct window *
-cmd_lookup_windowid(const char *arg)
-{
-	const char	*errstr;
-	u_int		 windowid;
-
-	if (*arg != '@')
-		return (NULL);
-
-	windowid = strtonum(arg + 1, 0, UINT_MAX, &errstr);
-	if (errstr != NULL)
-		return (NULL);
-	return (window_find_by_id(windowid));
-}
-
-/* Find session and winlink for window. */
 struct session *
-cmd_window_session(struct cmd_q *cmdq, struct window *w, struct winlink **wlp)
+cmd_pane_session(struct cmd_ctx *ctx, struct window_pane *wp,
+    struct winlink **wlp)
 {
 	struct session		*s;
 	struct sessionslist	 ss;
 	struct winlink		*wl;
 
-	/* If this window is in the current session, return that winlink. */
+	/* If this pane is in the current session, return that winlink. */
-	s = cmd_current_session(cmdq, 0);
+	s = cmd_current_session(ctx, 0);
 	if (s != NULL) {
-		wl = winlink_find_by_window(&s->windows, w);
+		wl = winlink_find_by_window(&s->windows, wp->window);
 		if (wl != NULL) {
 			if (wlp != NULL)
 				*wlp = wl;
@@ -752,26 +687,25 @@ cmd_window_session(struct cmd_q *cmdq, struct window *w, struct winlink **wlp)
 		}
 	}
 
-	/* Otherwise choose from all sessions with this window. */
+	/* Otherwise choose from all sessions with this pane. */
 	ARRAY_INIT(&ss);
 	RB_FOREACH(s, sessions, &sessions) {
-		if (winlink_find_by_window(&s->windows, w) != NULL)
+		if (winlink_find_by_window(&s->windows, wp->window) != NULL)
 			ARRAY_ADD(&ss, s);
 	}
 	s = cmd_choose_session_list(&ss);
 	ARRAY_FREE(&ss);
 	if (wlp != NULL)
-		*wlp = winlink_find_by_window(&s->windows, w);
+		*wlp = winlink_find_by_window(&s->windows, wp->window);
 	return (s);
 }
 
 /* Find the target session or report an error and return NULL. */
 struct session *
-cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
+cmd_find_session(struct cmd_ctx *ctx, const char *arg, int prefer_unattached)
 {
 	struct session		*s;
 	struct window_pane	*wp;
-	struct window		*w;
 	struct client		*c;
 	char			*tmparg;
 	size_t			 arglen;
@@ -779,13 +713,11 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
 
 	/* A NULL argument means the current session. */
 	if (arg == NULL)
-		return (cmd_current_session(cmdq, prefer_unattached));
+		return (cmd_current_session(ctx, prefer_unattached));
 
-	/* Lookup as pane id or window id. */
+	/* Lookup as pane id. */
 	if ((wp = cmd_lookup_paneid(arg)) != NULL)
-		return (cmd_window_session(cmdq, wp->window, NULL));
+		return (cmd_pane_session(ctx, wp, NULL));
-	if ((w = cmd_lookup_windowid(arg)) != NULL)
-		return (cmd_window_session(cmdq, w, NULL));
 
 	/* Trim a single trailing colon if any. */
 	tmparg = xstrdup(arg);
@@ -795,8 +727,8 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
 
 	/* An empty session name is the current session. */
 	if (*tmparg == '\0') {
-		free(tmparg);
+		xfree(tmparg);
-		return (cmd_current_session(cmdq, prefer_unattached));
+		return (cmd_current_session(ctx, prefer_unattached));
 	}
 
 	/* Find the session, if any. */
@@ -809,18 +741,18 @@ cmd_find_session(struct cmd_q *cmdq, const char *arg, int prefer_unattached)
 	/* If no session found, report an error. */
 	if (s == NULL) {
 		if (ambiguous)
-			cmdq_error(cmdq, "more than one session: %s", tmparg);
+			ctx->error(ctx, "more than one session: %s", tmparg);
 		else
-			cmdq_error(cmdq, "session not found: %s", tmparg);
+			ctx->error(ctx, "session not found: %s", tmparg);
 	}
 
-	free(tmparg);
+	xfree(tmparg);
 	return (s);
 }
 
 /* Find the target session and window or report an error and return NULL. */
 struct winlink *
-cmd_find_window(struct cmd_q *cmdq, const char *arg, struct session **sp)
+cmd_find_window(struct cmd_ctx *ctx, const char *arg, struct session **sp)
 {
 	struct session		*s;
 	struct winlink		*wl;
@@ -833,8 +765,8 @@ cmd_find_window(struct cmd_q *cmdq, const char *arg, struct session **sp)
 	 * Find the current session. There must always be a current session, if
 	 * it can't be found, report an error.
 	 */
-	if ((s = cmd_current_session(cmdq, 0)) == NULL) {
+	if ((s = cmd_current_session(ctx, 0)) == NULL) {
-		cmdq_error(cmdq, "can't establish current session");
+		ctx->error(ctx, "can't establish current session");
 		return (NULL);
 	}
 
@@ -847,7 +779,7 @@ cmd_find_window(struct cmd_q *cmdq, const char *arg, struct session **sp)
 
 	/* Lookup as pane id. */
 	if ((wp = cmd_lookup_paneid(arg)) != NULL) {
-		s = cmd_window_session(cmdq, wp->window, &wl);
+		s = cmd_pane_session(ctx, wp, &wl);
 		if (sp != NULL)
 			*sp = s;
 		return (wl);
@@ -881,10 +813,6 @@ cmd_find_window(struct cmd_q *cmdq, const char *arg, struct session **sp)
 		wl = s->curw;
 	else if (winptr[0] == '!' && winptr[1] == '\0')
 		wl = TAILQ_FIRST(&s->lastw);
-	else if (winptr[0] == '^' && winptr[1] == '\0')
-		wl = RB_MIN(winlinks, &s->windows);
-	else if (winptr[0] == '$' && winptr[1] == '\0')
-		wl = RB_MAX(winlinks, &s->windows);
 	else if (winptr[0] == '+' || winptr[0] == '-')
 		wl = cmd_find_window_offset(winptr, s, &ambiguous);
 	else
@@ -893,7 +821,7 @@ cmd_find_window(struct cmd_q *cmdq, const char *arg, struct session **sp)
 		goto not_found;
 
 	if (sessptr != NULL)
-		free(sessptr);
+		xfree(sessptr);
 	return (wl);
 
 no_colon:
@@ -928,18 +856,20 @@ lookup_session:
 
 no_session:
 	if (ambiguous)
-		cmdq_error(cmdq, "multiple sessions: %s", arg);
+		ctx->error(ctx, "multiple sessions: %s", arg);
 	else
-		cmdq_error(cmdq, "session not found: %s", arg);
+		ctx->error(ctx, "session not found: %s", arg);
-	free(sessptr);
+	if (sessptr != NULL)
+		xfree(sessptr);
 	return (NULL);
 
 not_found:
 	if (ambiguous)
-		cmdq_error(cmdq, "multiple windows: %s", arg);
+		ctx->error(ctx, "multiple windows: %s", arg);
 	else
-		cmdq_error(cmdq, "window not found: %s", arg);
+		ctx->error(ctx, "window not found: %s", arg);
-	free(sessptr);
+	if (sessptr != NULL)
+		xfree(sessptr);
 	return (NULL);
 }
 
@@ -970,7 +900,7 @@ cmd_find_window_offset(const char *winptr, struct session *s, int *ambiguous)
  * example if it is going to be created).
  */
 int
-cmd_find_index(struct cmd_q *cmdq, const char *arg, struct session **sp)
+cmd_find_index(struct cmd_ctx *ctx, const char *arg, struct session **sp)
 {
 	struct session	*s;
 	struct winlink	*wl;
@@ -982,8 +912,8 @@ cmd_find_index(struct cmd_q *cmdq, const char *arg, struct session **sp)
 	 * Find the current session. There must always be a current session, if
 	 * it can't be found, report an error.
 	 */
-	if ((s = cmd_current_session(cmdq, 0)) == NULL) {
+	if ((s = cmd_current_session(ctx, 0)) == NULL) {
-		cmdq_error(cmdq, "can't establish current session");
+		ctx->error(ctx, "can't establish current session");
 		return (-2);
 	}
 
@@ -1030,7 +960,8 @@ cmd_find_index(struct cmd_q *cmdq, const char *arg, struct session **sp)
 	} else if ((idx = cmd_lookup_index(s, winptr, &ambiguous)) == -1)
 		goto invalid_index;
 
-	free(sessptr);
+	if (sessptr != NULL)
+		xfree(sessptr);
 	return (idx);
 
 no_colon:
@@ -1066,26 +997,29 @@ lookup_session:
 
 no_session:
 	if (ambiguous)
-		cmdq_error(cmdq, "multiple sessions: %s", arg);
+		ctx->error(ctx, "multiple sessions: %s", arg);
 	else
-		cmdq_error(cmdq, "session not found: %s", arg);
+		ctx->error(ctx, "session not found: %s", arg);
-	free(sessptr);
+	if (sessptr != NULL)
+		xfree(sessptr);
 	return (-2);
 
 invalid_index:
 	if (ambiguous)
 		goto not_found;
-	cmdq_error(cmdq, "invalid index: %s", arg);
+	ctx->error(ctx, "invalid index: %s", arg);
 
-	free(sessptr);
+	if (sessptr != NULL)
+		xfree(sessptr);
 	return (-2);
 
 not_found:
 	if (ambiguous)
-		cmdq_error(cmdq, "multiple windows: %s", arg);
+		ctx->error(ctx, "multiple windows: %s", arg);
 	else
-		cmdq_error(cmdq, "window not found: %s", arg);
+		ctx->error(ctx, "window not found: %s", arg);
-	free(sessptr);
+	if (sessptr != NULL)
+		xfree(sessptr);
 	return (-2);
 }
 
@@ -1121,7 +1055,7 @@ cmd_find_index_offset(const char *winptr, struct session *s, int *ambiguous)
  * such as mysession:mywindow.0.
  */
 struct winlink *
-cmd_find_pane(struct cmd_q *cmdq,
+cmd_find_pane(struct cmd_ctx *ctx,
     const char *arg, struct session **sp, struct window_pane **wpp)
 {
 	struct session	*s;
@@ -1131,8 +1065,8 @@ cmd_find_pane(struct cmd_q *cmdq,
 	u_int		 idx;
 
 	/* Get the current session. */
-	if ((s = cmd_current_session(cmdq, 0)) == NULL) {
+	if ((s = cmd_current_session(ctx, 0)) == NULL) {
-		cmdq_error(cmdq, "can't establish current session");
+		ctx->error(ctx, "can't establish current session");
 		return (NULL);
 	}
 	if (sp != NULL)
@@ -1146,7 +1080,7 @@ cmd_find_pane(struct cmd_q *cmdq,
 
 	/* Lookup as pane id. */
 	if ((*wpp = cmd_lookup_paneid(arg)) != NULL) {
-		s = cmd_window_session(cmdq, (*wpp)->window, &wl);
+		s = cmd_pane_session(ctx, *wpp, &wl);
 		if (sp != NULL)
 			*sp = s;
 		return (wl);
@@ -1161,7 +1095,7 @@ cmd_find_pane(struct cmd_q *cmdq,
 	winptr[period - arg] = '\0';
 	if (*winptr == '\0')
 		wl = s->curw;
-	else if ((wl = cmd_find_window(cmdq, winptr, sp)) == NULL)
+	else if ((wl = cmd_find_window(ctx, winptr, sp)) == NULL)
 		goto error;
 
 	/* Find the pane section and look it up. */
@@ -1179,17 +1113,17 @@ cmd_find_pane(struct cmd_q *cmdq,
 			goto lookup_string;
 	}
 
-	free(winptr);
+	xfree(winptr);
 	return (wl);
 
 lookup_string:
 	/* Try pane string description. */
 	if ((*wpp = window_find_string(wl->window, paneptr)) == NULL) {
-		cmdq_error(cmdq, "can't find pane: %s", paneptr);
+		ctx->error(ctx, "can't find pane: %s", paneptr);
 		goto error;
 	}
 
-	free(winptr);
+	xfree(winptr);
 	return (wl);
 
 no_period:
@@ -1210,12 +1144,12 @@ lookup_window:
 		return (s->curw);
 
 	/* Try as a window and use the active pane. */
-	if ((wl = cmd_find_window(cmdq, arg, sp)) != NULL)
+	if ((wl = cmd_find_window(ctx, arg, sp)) != NULL)
 		*wpp = wl->window->active;
 	return (wl);
 
 error:
-	free(winptr);
+	xfree(winptr);
 	return (NULL);
 }
 
@@ -1240,14 +1174,14 @@ cmd_find_pane_offset(const char *paneptr, struct winlink *wl)
 
 /* Replace the first %% or %idx in template by s. */
 char *
-cmd_template_replace(const char *template, const char *s, int idx)
+cmd_template_replace(char *template, const char *s, int idx)
 {
-	char		 ch, *buf;
+	char	 ch;
-	const char	*ptr;
+	char	*buf, *ptr;
-	int		 replaced;
+	int	 replaced;
-	size_t		 len;
+	size_t	 len;
 
-	if (strchr(template, '%') == NULL)
+	if (strstr(template, "%") == NULL)
 		return (xstrdup(template));
 
 	buf = xmalloc(1);
@@ -1279,86 +1213,34 @@ cmd_template_replace(const char *template, const char *s, int idx)
 	return (buf);
 }
 
-/*
+/* Return the default path for a new pane. */
- * Return the default path for a new pane, using the given path or the
- * default-path option if it is NULL. Several special values are accepted: the
- * empty string or relative path for the current pane's working directory, ~
- * for the user's home, - for the session working directory, . for the tmux
- * server's working directory. The default on failure is the session's working
- * directory.
- */
 const char *
-cmd_get_default_path(struct cmd_q *cmdq, const char *cwd)
+cmd_get_default_path(struct cmd_ctx *ctx)
 {
-	struct client		*c = cmdq->client;
+	const char		*cwd;
 	struct session		*s;
+	struct window_pane	*wp;
 	struct environ_entry	*envent;
-	const char		*root;
-	char			 tmp[MAXPATHLEN];
-	struct passwd		*pw;
-	int			 n;
-	size_t			 skip;
-	static char		 path[MAXPATHLEN];
 
-	if ((s = cmd_current_session(cmdq, 0)) == NULL)
+	if ((s = cmd_current_session(ctx, 0)) == NULL)
 		return (NULL);
 
-	if (cwd == NULL)
+	cwd = options_get_string(&s->options, "default-path");
-		cwd = options_get_string(&s->options, "default-path");
+	if ((cwd[0] == '~' && cwd[1] == '\0') || !strcmp(cwd, "$HOME")) {
-
+		envent = environ_find(&global_environ, "HOME");
-	skip = 1;
+		if (envent != NULL && *envent->value != '\0')
-	if (strcmp(cwd, "$HOME") == 0 || strncmp(cwd, "$HOME/", 6) == 0) {
+			return envent->value;
-		/* User's home directory - $HOME. */
+		cwd = "";
-		skip = 5;
+	}
-		goto find_home;
+	if (*cwd == '\0') {
-	} else if (cwd[0] == '~' && (cwd[1] == '\0' || cwd[1] == '/')) {
+		if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
-		/* User's home directory - ~. */
+			return (ctx->cmdclient->cwd);
-		goto find_home;
+		if (ctx->curclient != NULL) {
-	} else if (cwd[0] == '-' && (cwd[1] == '\0' || cwd[1] == '/')) {
+			wp = s->curw->window->active;
-		/* Session working directory. */
+			if ((cwd = osdep_get_cwd(wp->pid)) != NULL)
-		root = s->cwd;
+				return (cwd);
-		goto complete_path;
-	} else if (cwd[0] == '.' && (cwd[1] == '\0' || cwd[1] == '/')) {
-		/* Server working directory. */
-		if (getcwd(tmp, sizeof tmp) != NULL) {
-			root = tmp;
-			goto complete_path;
 		}
 		return (s->cwd);
-	} else if (*cwd == '/') {
-		/* Absolute path. */
-		return (cwd);
-	} else {
-		/* Empty or relative path. */
-		if (c != NULL && c->session == NULL && c->cwd != NULL)
-			root = c->cwd;
-		else if (s->curw != NULL)
-			root = osdep_get_cwd(s->curw->window->active->fd);
-		else
-			return (s->cwd);
-		skip = 0;
-		if (root != NULL)
-			goto complete_path;
 	}
-
+	return (cwd);
-	return (s->cwd);
-
-find_home:
-	envent = environ_find(&global_environ, "HOME");
-	if (envent != NULL && *envent->value != '\0')
-		root = envent->value;
-	else if ((pw = getpwuid(getuid())) != NULL)
-		root = pw->pw_dir;
-	else
-		return (s->cwd);
-
-complete_path:
-	if (root[skip] == '\0') {
-		strlcpy(path, root, sizeof path);
-		return (path);
-	}
-	n = snprintf(path, sizeof path, "%s/%s", root, cwd + skip);
-	if (n > 0 && (size_t)n < sizeof path)
-		return (path);
-	return (s->cwd);
 }

compat/asprintf.c

@@ -53,7 +53,7 @@ vasprintf(char **ret, const char *fmt, va_list ap)
 
 	*ret = xmalloc(n + 1);
 	if ((n = vsnprintf(*ret, n + 1, fmt, ap2)) < 0) {
-		free(*ret);
+		xfree(*ret);
 		goto error;
 	}
 

compat/fgetln.c

@@ -43,7 +43,9 @@
 #include "tmux.h"
 
 char *
-fgetln(FILE *fp, size_t *len)
+fgetln(fp, len)
+	FILE *fp;
+	size_t *len;
 {
 	static char *buf = NULL;
 	static size_t bufsiz = 0;

compat/getopt.c

@@ -52,7 +52,10 @@ char	*BSDoptarg;		/* argument associated with option */
  *	Parse argc/argv argument vector.
  */
 int
-BSDgetopt(int nargc, char *const *nargv, const char *ostr)
+BSDgetopt(nargc, nargv, ostr)
+	int nargc;
+	char * const *nargv;
+	const char *ostr;
 {
 	static char *place = EMSG;		/* option letter processing */
 	char *oli;				/* option letter list index */
@@ -67,8 +70,6 @@ BSDgetopt(int nargc, char *const *nargv, const char *ostr)
 			return (-1);
 		}
 		if (place[1] && *++place == '-') {	/* found "--" */
-			if (place[1])
-				return (BADCH);
 			++BSDoptind;
 			place = EMSG;
 			return (-1);

compat/queue.h

@@ -1,4 +1,5 @@
-/*	$OpenBSD: queue.h,v 1.36 2012/04/11 13:29:14 naddy Exp $	*/
+/* $Id$ */
+/*	$OpenBSD: queue.h,v 1.31 2005/11/25 08:06:25 otto Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
 
 /*
@@ -36,7 +37,7 @@
 #define	_SYS_QUEUE_H_
 
 /*
- * This file defines five types of data structures: singly-linked lists, 
+ * This file defines five types of data structures: singly-linked lists,
  * lists, simple queues, tail queues, and circular queues.
  *
  *
@@ -82,7 +83,7 @@
  * For details on the use of these macros, see the queue(3) manual page.
  */
 
-#if defined(QUEUE_MACRO_DEBUG) || (defined(_KERNEL) && defined(DIAGNOSTIC))
+#ifdef QUEUE_MACRO_DEBUG
 #define _Q_INVALIDATE(a) (a) = ((void *)-1)
 #else
 #define _Q_INVALIDATE(a)
@@ -95,15 +96,15 @@
 struct name {								\
 	struct type *slh_first;	/* first element */			\
 }
- 
+
 #define	SLIST_HEAD_INITIALIZER(head)					\
 	{ NULL }
- 
+
 #define SLIST_ENTRY(type)						\
 struct {								\
 	struct type *sle_next;	/* next element */			\
 }
- 
+
 /*
  * Singly-linked List access methods.
  */
@@ -117,10 +118,10 @@ struct {								\
 	    (var) != SLIST_END(head);					\
 	    (var) = SLIST_NEXT(var, field))
 
-#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-	for ((var) = SLIST_FIRST(head);				\
+	for ((varp) = &SLIST_FIRST((head));				\
-	    (var) && ((tvar) = SLIST_NEXT(var, field), 1);		\
+	    ((var) = *(varp)) != SLIST_END(head);			\
-	    (var) = (tvar))
+	    (varp) = &SLIST_NEXT((var), field))
 
 /*
  * Singly-linked List functions.
@@ -139,7 +140,7 @@ struct {								\
 	(head)->slh_first = (elm);					\
 } while (0)
 
-#define	SLIST_REMOVE_AFTER(elm, field) do {				\
+#define	SLIST_REMOVE_NEXT(head, elm, field) do {			\
 	(elm)->field.sle_next = (elm)->field.sle_next->field.sle_next;	\
 } while (0)
 
@@ -191,11 +192,6 @@ struct {								\
 	    (var)!= LIST_END(head);					\
 	    (var) = LIST_NEXT(var, field))
 
-#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = LIST_FIRST(head);				\
-	    (var) && ((tvar) = LIST_NEXT(var, field), 1);		\
-	    (var) = (tvar))
-
 /*
  * List functions.
  */
@@ -274,11 +270,6 @@ struct {								\
 	    (var) != SIMPLEQ_END(head);					\
 	    (var) = SIMPLEQ_NEXT(var, field))
 
-#define	SIMPLEQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = SIMPLEQ_FIRST(head);				\
-	    (var) && ((tvar) = SIMPLEQ_NEXT(var, field), 1);		\
-	    (var) = (tvar))
-
 /*
  * Simple queue functions.
  */
@@ -310,12 +301,6 @@ struct {								\
 		(head)->sqh_last = &(head)->sqh_first;			\
 } while (0)
 
-#define SIMPLEQ_REMOVE_AFTER(head, elm, field) do {			\
-	if (((elm)->field.sqe_next = (elm)->field.sqe_next->field.sqe_next) \
-	    == NULL)							\
-		(head)->sqh_last = &(elm)->field.sqe_next;		\
-} while (0)
-
 /*
  * Tail queue definitions.
  */
@@ -334,8 +319,8 @@ struct {								\
 	struct type **tqe_prev;	/* address of previous next element */	\
 }
 
-/* 
+/*
- * tail queue access methods 
+ * tail queue access methods
  */
 #define	TAILQ_FIRST(head)		((head)->tqh_first)
 #define	TAILQ_END(head)			NULL
@@ -353,24 +338,11 @@ struct {								\
 	    (var) != TAILQ_END(head);					\
 	    (var) = TAILQ_NEXT(var, field))
 
-#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = TAILQ_FIRST(head);					\
-	    (var) != TAILQ_END(head) &&					\
-	    ((tvar) = TAILQ_NEXT(var, field), 1);			\
-	    (var) = (tvar))
-
-
 #define TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
 	for((var) = TAILQ_LAST(head, headname);				\
 	    (var) != TAILQ_END(head);					\
 	    (var) = TAILQ_PREV(var, headname, field))
 
-#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-	for ((var) = TAILQ_LAST(head, headname);			\
-	    (var) != TAILQ_END(head) &&					\
-	    ((tvar) = TAILQ_PREV(var, headname, field), 1);		\
-	    (var) = (tvar))
-
 /*
  * Tail queue functions.
  */
@@ -455,7 +427,7 @@ struct {								\
 }
 
 /*
- * Circular queue access methods 
+ * Circular queue access methods
  */
 #define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
 #define	CIRCLEQ_LAST(head)		((head)->cqh_last)
@@ -470,23 +442,11 @@ struct {								\
 	    (var) != CIRCLEQ_END(head);					\
 	    (var) = CIRCLEQ_NEXT(var, field))
 
-#define	CIRCLEQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = CIRCLEQ_FIRST(head);				\
-	    (var) != CIRCLEQ_END(head) &&				\
-	    ((tvar) = CIRCLEQ_NEXT(var, field), 1);			\
-	    (var) = (tvar))
-
 #define CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
 	for((var) = CIRCLEQ_LAST(head);					\
 	    (var) != CIRCLEQ_END(head);					\
 	    (var) = CIRCLEQ_PREV(var, field))
 
-#define	CIRCLEQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-	for ((var) = CIRCLEQ_LAST(head, headname);			\
-	    (var) != CIRCLEQ_END(head) && 				\
-	    ((tvar) = CIRCLEQ_PREV(var, headname, field), 1);		\
-	    (var) = (tvar))
-
 /*
  * Circular queue functions.
  */

compat/tree.h

@@ -1,5 +1,5 @@
 /* $Id$ */
-/*	$OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $	*/
+/*	$OpenBSD: tree.h,v 1.12 2009/03/02 09:42:55 mikeb Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -84,7 +84,7 @@ struct {								\
 	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
 	(head)->sph_root = tmp;						\
 } while (0)
-	
+
 #define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
 	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
 	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
@@ -731,19 +731,9 @@ name##_RB_MINMAX(struct name *head, int val)				\
 	     (x) != NULL;						\
 	     (x) = name##_RB_NEXT(x))
 
-#define RB_FOREACH_SAFE(x, name, head, y)				\
-	for ((x) = RB_MIN(name, head);					\
-	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), 1);		\
-	     (x) = (y))
-
 #define RB_FOREACH_REVERSE(x, name, head)				\
 	for ((x) = RB_MAX(name, head);					\
 	     (x) != NULL;						\
 	     (x) = name##_RB_PREV(x))
 
-#define RB_FOREACH_REVERSE_SAFE(x, name, head, y)			\
-	for ((x) = RB_MAX(name, head);					\
-	    ((x) != NULL) && ((y) = name##_RB_PREV(x), 1);		\
-	     (x) = (y))
-
 #endif	/* _SYS_TREE_H_ */

configure.ac

@@ -1,7 +1,7 @@
 # $Id$
 
 # Miscellaneous autofoo bullshit.
-AC_INIT(tmux, 1.8)
+AC_INIT(tmux, 1.6)
 
 AC_CONFIG_AUX_DIR(etc)
 AM_INIT_AUTOMAKE([foreign])
@@ -53,11 +53,8 @@ AM_CONDITIONAL(IS_DEBUG, test "x$found_debug" = xyes)
 AC_ARG_ENABLE(
        static,
        AC_HELP_STRING(--enable-static, create a static build),
-       found_static=$enable_static
+       [LDFLAGS="$LDFLAGS -static"]
 )
-if test "x$found_static" = xyes; then
-   LDFLAGS="$LDFLAGS -static"
-fi
 
 # Is this gcc?
 AM_CONDITIONAL(IS_GCC, test "x$GCC" = xyes)

control-notify.c

@@ -1,203 +0,0 @@
-/* $OpenBSD$ */
-
-/*
- * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
- * Copyright (c) 2012 George Nachman <tmux@georgester.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include "tmux.h"
-
-#define CONTROL_SHOULD_NOTIFY_CLIENT(c) \
-	((c) != NULL && ((c)->flags & CLIENT_CONTROL))
-
-void
-control_notify_input(struct client *c, struct window_pane *wp,
-    struct evbuffer *input)
-{
-	u_char		*buf;
-	size_t		 len;
-	struct evbuffer *message;
-	u_int		 i;
-
-	if (c->session == NULL)
-	    return;
-
-	buf = EVBUFFER_DATA(input);
-	len = EVBUFFER_LENGTH(input);
-
-	/*
-	 * Only write input if the window pane is linked to a window belonging
-	 * to the client's session.
-	 */
-	if (winlink_find_by_window(&c->session->windows, wp->window) != NULL) {
-		message = evbuffer_new();
-		evbuffer_add_printf(message, "%%output %%%u ", wp->id);
-		for (i = 0; i < len; i++) {
-			if (buf[i] < ' ' || buf[i] == '\\')
-			    evbuffer_add_printf(message, "\\%03o", buf[i]);
-			else
-			    evbuffer_add_printf(message, "%c", buf[i]);
-		}
-		control_write_buffer(c, message);
-		evbuffer_free(message);
-	}
-}
-
-void
-control_notify_window_layout_changed(struct window *w)
-{
-	struct client		*c;
-	struct session		*s;
-	struct format_tree	*ft;
-	struct winlink		*wl;
-	u_int			 i;
-	const char		*template;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
-			continue;
-		s = c->session;
-
-		if (winlink_find_by_window_id(&s->windows, w->id) == NULL)
-			continue;
-
-		/*
-		 * When the last pane in a window is closed it won't have a
-		 * layout root and we don't need to inform the client about the
-		 * layout change because the whole window will go away soon.
-		 */
-		if (w->layout_root == NULL)
-			continue;
-		template = "%layout-change #{window_id} #{window_layout}";
-
-		ft = format_create();
-		wl = winlink_find_by_window(&s->windows, w);
-		if (wl != NULL) {
-			format_winlink(ft, c->session, wl);
-			control_write(c, "%s", format_expand(ft, template));
-		}
-		format_free(ft);
-	}
-}
-
-void
-control_notify_window_unlinked(unused struct session *s, struct window *w)
-{
-	struct client	*c;
-	u_int		 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
-			continue;
-
-		control_write(c, "%%window-close @%u", w->id);
-	}
-}
-
-void
-control_notify_window_linked(unused struct session *s, struct window *w)
-{
-	struct client	*c;
-	struct session	*cs;
-	u_int		 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
-			continue;
-		cs = c->session;
-
-		if (winlink_find_by_window_id(&cs->windows, w->id) != NULL)
-			control_write(c, "%%window-add @%u", w->id);
-		else
-			control_write(c, "%%unlinked-window-add @%u", w->id);
-	}
-}
-
-void
-control_notify_window_renamed(struct window *w)
-{
-	struct client	*c;
-	u_int		 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
-			continue;
-
-		control_write(c, "%%window-renamed @%u %s", w->id, w->name);
-	}
-}
-
-void
-control_notify_attached_session_changed(struct client *c)
-{
-	struct session	*s;
-
-	if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
-		return;
-	s = c->session;
-
-	control_write(c, "%%session-changed $%u %s", s->id, s->name);
-}
-
-void
-control_notify_session_renamed(struct session *s)
-{
-	struct client	*c;
-	u_int		 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
-			continue;
-
-		control_write(c, "%%session-renamed $%u %s", s->id, s->name);
-	}
-}
-
-void
-control_notify_session_created(unused struct session *s)
-{
-	struct client	*c;
-	u_int		 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
-			continue;
-
-		control_write(c, "%%sessions-changed");
-	}
-}
-
-void
-control_notify_session_close(unused struct session *s)
-{
-	struct client	*c;
-	u_int		 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
-			continue;
-
-		control_write(c, "%%sessions-changed");
-	}
-}