Enter date of release.

colour 8 instead.

.gitignore

@@ -6,6 +6,7 @@
 core
 tags
 .deps/
+compat/.dirstamp
 aclocal.m4
 autom4te.cache/
 config.log
@@ -15,3 +16,5 @@ tmux
 Makefile
 Makefile.in
 configure
+tmux.1.*
+*.dSYM

.mailmap

@@ -1,24 +1,37 @@
-Bob Beck 		<beck@openbsd.org> beck <beck>
+Bob Beck		<beck@openbsd.org> beck <beck>
-Igor Sobrado 		<sobrado@openbsd.org> sobrado <sobrado>
+Claudio Jeker		<claudio@openbsd.org> claudio <claudio>
-Jacek Masiulaniec 	<jacekm@openbsd.org> jacekm <jacekm>
+Igor Sobrado		<sobrado@openbsd.org> sobrado <sobrado>
-Jason McIntyre 		<jmc@openbsd.org> jcm <jcm>
+Ingo Schwarze		<schwarze@openbsd.org> schwarze <schwarze>
+Jacek Masiulaniec	<jacekm@openbsd.org> jacekm <jacekm>
+Jason McIntyre		<jmc@openbsd.org> jmc <jmc>
 Joel Sing		<jsing@openbsd.org> jsing <jsing>
-Marc Espie 		<espie@openbsd.org> espie <espie>
+Jonathan Gray		<jsg@openbsd.org> jsg <jsg>
-Matthew Dempsky 	<matthew@openbsd.org> matthew <matthew>
+Kenneth R Westerback	<krw@openbsd.org> krw <krw>
-Matthias Kilian 	<kili@openbsd.org> kili <kili>
+Marc Espie		<espie@openbsd.org> espie <espie>
-Matthieu Herrb 		<matthieu@openbsd.org> matthieu <matthieu>
+Matthew Dempsky		<matthew@openbsd.org> matthew <matthew>
-Miod Vallat 		<miod@openbsd.org> miod <miod>
+Matthias Kilian		<kili@openbsd.org> kili <kili>
-Nicholas Marriott 	<nicm@openbsd.org> nicm <nicm>
+Matthieu Herrb		<matthieu@openbsd.org> matthieu <matthieu>
-Nicholas Marriott 	<nicm@openbsd.org> no_author <no_author@example.org>
+Michael McConville	<mmcc@openbsd.org> mmcc <mmcc>
-<nicm@openbsd.org>	<nicholas.marriott@gmail.com>
+Miod Vallat		<miod@openbsd.org> miod <miod>
-Okan Demirmen 		<okan@openbsd.org> okan <okan>
+Nicholas Marriott	<nicholas.marriott@gmail.com> Nicholas Marriott <nicm@openbsd.org>
+Nicholas Marriott	<nicholas.marriott@gmail.com> nicm <nicm>
+Nicholas Marriott	<nicholas.marriott@gmail.com> no_author <no_author@example.org>
+Okan Demirmen		<okan@openbsd.org> okan <okan>
 Philip Guenther		<guenther@openbsd.org> guenther <guenther>
-Pierre-Yves Ritschard 	<pyr@openbsd.org> pyr <pyr>
+Pierre-Yves Ritschard	<pyr@openbsd.org> pyr <pyr>
-Ray Lai 		<ray@openbsd.org> ray <ray>
+Ray Lai			<ray@openbsd.org> ray <ray>
 Ryan McBride		<mcbride@openbsd.org> mcbride <mcbride>
-Stefan Sperling 	<stsp@openbsd.org> stsp <stsp>
+Sebastian Benoit	<benno@openbsd.org> benno <benno>
-Stuart Henderson 	<sthen@openbsd.org> sthen <sthen>
+Sebastien Marie		<semarie@openbsd.org> semarie <semarie>
-Ted Unangst 		<tedu@openbsd.org> tedu <tedu>
+Stefan Sperling		<stsp@openbsd.org> stsp <stsp>
-Theo Deraadt 		<deraadt@openbsd.org> deraadt <deraadt>
+Stuart Henderson	<sthen@openbsd.org> sthen <sthen>
+Ted Unangst		<tedu@openbsd.org> tedu <tedu>
+Theo de Raadt		<deraadt@openbsd.org> Theo Deraadt <deraadt@openbsd.org>
+Theo de Raadt		<deraadt@openbsd.org> deraadt <deraadt>
 Thomas Adam		<thomas@xteddy.org> Thomas <thomas@xteddy.org>
-William Yodlowsky 	<william@openbsd.org> william <william>
+Thomas Adam		<thomas@xteddy.org> Thomas Adam <thomas.adam@smoothwall.net>
+Thomas Adam		<thomas@xteddy.org> n6tadam <n6tadam@xteddy.org>
+Tim van der Molen	<tim@openbsd.org> tim <tim>
+Tobias Stoeckmann	<tobias@openbsd.org> tobias <tobias>
+Todd C Miller		<millert@openbsd.org> millert <millert>
+William Yodlowsky	<william@openbsd.org> william <william>

.travis.yml

@@ -0,0 +1,10 @@
+language: c
+matrix:
+    include:
+        - compiler: gcc
+        - compiler: clang
+          env: CFLAGS="-g -O2"
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get -y install debhelper autotools-dev dh-autoreconf file libncurses5-dev libevent-dev pkg-config libutempter-dev build-essential
+script: (CFLAGS= ./autogen.sh) && ./configure --enable-debug && make

CHANGES

@@ -1,3 +1,346 @@
+CHANGES FROM 2.3 to 2.4 20 April 2017
+
+Incompatible Changes
+====================
+
+* Key tables have undergone major changes. Mode key tables are no longer
+  separate from the main key tables. All mode key tables have been removed,
+  together with the -t flag to bind-key and unbind-key.
+
+  The emacs-edit, vi-edit, emacs-choose and vi-choose tables have been replaced
+  by fixed key bindings in the command prompt and choose modes. The mode-keys
+  and status-keys options remain.
+
+  The emacs-copy and vi-copy tables have been replaced by the copy-mode and
+  copy-mode-vi tables. Commands are sent using the -X and -N flags to
+  send-keys. So the following:
+
+    bind -temacs-copy C-Up scroll-up
+    bind -temacs-copy -R5 WheelUpPane scroll-up
+
+  Becomes:
+
+    bind -Tcopy-mode C-Up send -X scroll-up
+    bind -Tcopy-mode WheelUpPane send -N5 -X scroll-up
+
+  This changes allows the full command parser (including command sequences) and
+  command set to be used - for example, the normal command prompt with editing
+  and history is now used for searching, jumping, and so on instead of a custom
+  one. The default C-r binding is now:
+
+    bind -Tcopy-mode C-r command-prompt -p'search up' "send -X search-backward '%%'"
+
+  There are also some new commmands available with send -X, such as
+  copy-pipe-and-cancel.
+* set-remain-on-exit has gone -- can be achieved with hooks instead.
+* Hooks: before hooks have been removed and only a selection of commands now
+  have after hooks (they are no longer automatic). Additional hooks have been
+  added.
+* The xterm-keys option now defaults to on.
+
+Normal Changes
+==============
+
+* Support for mouse double and triple clicks.
+* BCE (Background Colour Erase) is now supported.
+* All occurrences of a search string in copy mode are now highlighted;
+  additionally, the number of search results is displayed. The highlighting
+  updates interactively with the default emacs key bindings (incremental
+  search).
+* source-file now understands glob patterns.
+* Formats now have simple comparisons:
+
+    #{==:a,b}
+    #{!=:a,b}
+
+* There are the following new formats:
+
+  - #{version} -- the tmux server version;
+  - #{client_termtype} -- the terminal type of the client;
+  - #{client_name} -- the name of a client;
+  - #{client_written} -- the number of bytes written to the client.
+
+* The configuration file now accepts %if/%endif conditional blocks which are
+  processed when it is parsed; the argument is a format string (useful with the
+  new format comparison options).
+* detach-client now has -E to execute a command replacing the client instead of
+  exiting.
+* Add support for custom command aliases, this is an array option which
+  contains items of the form "alias=command". This is consulted when an
+  unknown command is parsed.
+* break-pane now has -n to specify the new window name.
+* OSC 52 support has been added for programs inside tmux to set a tmux buffer.
+* The mouse "all event" mode (1003) is now supported.
+* Palette setting is now possible (OSC 4 and 104).
+* Strikethrough support (a recent terminfo is required).
+* Grouped sessions can now be named (new -t).
+* terminal-overrides and update-environment are now array options (the previous
+  set -ag syntax should work without change).
+* There have been substantial performance improvements.
+
+CHANGES FROM 2.2 to 2.3 29 September 2016
+
+Incompatible Changes
+====================
+
+None.
+
+Normal Changes
+==============
+
+* New option 'pane-border-status' to add text in the pane borders.
+* Support for hooks on commands: 'after' and 'before' hooks.
+* 'source-file' understands '-q' to suppress errors for nonexistent files.
+* Lots of UTF8 improvements, especially on MacOS.
+* 'window-status-separator' understands #[] expansions.
+* 'split-window' understands '-f' for performing a full-width split.
+* Allow report count to be specified when using 'bind-key -R'.
+* 'set -a' for appending to user options (@foo) is now supported.
+* 'display-panes' can now accept a command to run, rather than always
+  selecting the pane.
+
+CHANGES FROM 2.1 to 2.2 10 April 2016
+
+Incompatible Changes
+====================
+
+* The format strings which referenced time have been removed.  Instead:
+
+  #{t:window_activity}
+
+can be used.
+
+* Support for TMPDIR has been removed.  Use TMUX_TMPDIR instead.
+* UTF8 detection now happens automatically if the client supports it, hence
+  the:
+
+  mouse-utf8
+  utf8
+
+  options has been removed.
+* The:
+
+  mouse_utf8_flag
+
+  format string has been removed.
+* The -I option to show-messages has been removed.  See:
+
+  #{t:start_time}
+
+  format option instead.
+
+Normal Changes
+==============
+
+* Panes are unzoomed with selectp -LRUD
+* New formats added:
+
+  #{scroll_position}
+  #{socket_path}
+  #{=10:...} -- limit to N characters (from the start)
+  #{=-10:...} -- limit to N characters (from the end)
+  #{t:...} -- used to format time-based formats
+  #{b:...} -- used to ascertain basename from string
+  #{d:...} -- used to ascertain dirname from string
+  #{s:...} -- used to perform substitutions on a string
+
+* Job output is run via the format system, so formats work again
+* If display-time is set to 0, then the indicators wait for a key to be
+  pressed.
+* list-keys and list-commands can be run without starting the tmux server.
+* kill-session learns -C to clear all alerts in all windows of the session.
+* Support for hooks (internal for now), but hooks for the following have been
+  implemented:
+
+  alert-bell
+  alert-silence
+  alert-activity
+  client-attached
+  client-detached
+  client-resized
+  pane-died
+  pane-exited
+
+* RGB (24bit) colour support.  The 'Tc' flag must be set in the external TERM
+  entry (using terminal-overrides or a custom terminfo entry).
+
+
+CHANGES FROM 2.0 to 2.1 18 October 2015
+
+Incompatible Changes
+====================
+
+* Mouse-mode has been rewritten.  There's now no longer options for:
+	- mouse-resize-pane
+	- mouse-select-pane
+	- mouse-select-window
+	- mode-mouse
+
+  Instead there is just one option:  'mouse' which turns on mouse support
+  entirely.
+* 'default-terminal' is now a session option.  Furthermore, if this is set
+  to 'screen-*' then emulate what screen does.  If italics are wanted, this
+  can be set to 'tmux' but this is still new and not necessarily supported
+  on all platforms with older ncurses installs.
+* The c0-* options for rate-limiting have been removed.  Instead, a backoff
+  approach is used.
+
+Normal Changes
+==============
+
+* New formats:
+	- session_activity
+	- window_linked
+	- window_activity_format
+	- session_alerts
+	- session_last_attached
+	- client_pid
+	- pid
+* 'copy-selection', 'append-selection', 'start-named-buffer' now understand
+  an '-x' flag to prevent it exiting copying mode.
+* 'select-pane' now understands '-P' to set window/pane background colours.
+* 'renumber-windows' now understands windows which are unlinked.
+* 'bind' now understands multiple key tables.  Allows for key-chaining.
+* 'select-layout' understands '-o' to undo the last layout change.
+* The environment is updated when switching sessions as well as attaching.
+* 'select-pane' now understands '-M' for marking a pane.  This marked pane
+  can then be used with commands which understand src-pane specifiers
+  automatically.
+* If a session/window target is prefixed with '=' then only an exact match
+  is considered.
+* 'move-window' understands '-a'.
+* 'update-environment' understands '-E' when attach-session is used on an
+  already attached client.
+* 'show-environment' understands '-s' to output Bourne-compatible commands.
+* New option: 'history-file' to save/restore command prompt history.
+* Copy mode is exited if the history is cleared whilst in copy-mode.
+* 'copy-mode' learned '-e' to exit copy-mode when scrolling to end.
+
+CHANGES FROM 1.9a to 2.0 6 March 2015
+
+Incompatible Changes
+====================
+
+* The choose-list command has been removed.
+* 'terminal-overrides' is now a server option, not a session option.
+* 'message-limit' is now a server option, not a session option.
+* 'monitor-content' option has been removed.
+* 'pane_start_path' option has been removed.
+* The "info" mechanism which used to (for some commands) provide feedback
+  has been removed, and like other commands, they now produce nothing on
+  success.
+
+Normal Changes
+==============
+
+* tmux can now write an entry to utmp if the library 'utempter' is present
+  at compile time.
+* set-buffer learned append mode (-a), and a corresponding
+  'append-selection' command has been added to copy-mode.
+* choose-mode now has the following commands which can be bound:
+	- start-of-list
+	- end-of-list
+	- top-line
+	- bottom-line
+
+* choose-buffer now understands UTF-8.
+* Pane navigation has changed:
+	- The old way of always using the top or left if the choice is ambiguous.
+	- The new way of remembering the last used pane is annoying if the
+	  layout is balanced and the leftmost is obvious to the user (because
+	  clearly if we go right from the top-left in a tiled set of four we want
+	  to end up in top-right, even if we were last using the bottom-right).
+
+      So instead, use a combination of both: if there is only one possible
+      pane alongside the current pane, move to it, otherwise choose the most
+      recently used of the choice.
+* 'set-buffer' can now be told to give names to buffers.
+* The 'new-session', 'new-window', 'split-window', and 'respawn-pane' commands
+  now understand multiple arguments and handle quoting problems correctly.
+* 'capture-pane' understands '-S-' to mean the start of the pane, and '-E-' to
+  mean the end of the pane.
+* Support for function keys beyond F12 has changed.  The following explains:
+	- F13-F24 are S-F1 to S-F12
+	- F25-F36 are C-F1 to C-F12
+	- F37-F48 are C-S-F1 to C-S-F12
+	- F49-F60 are M-F1 to M-F12
+	- F61-F63 are M-S-F1 to M-S-F3
+
+ Therefore, F13 becomes a binding of S-F1, etc.
+* Support using pane id as part of session or window specifier (so % means
+  session-of-%1 or window-of-%1) and window id as part of session
+  (so @1 means session-of-@1).
+* 'copy-pipe' command now understands formats via -F
+* 'if-shell'  command now understands formats via -F
+* 'split-window' and 'join-window' understand -b to create the pane to the left
+  or above the target pane.
+
+CHANGES FROM 1.9 to 1.9a 22 February 2014
+
+NOTE:  This is a bug-fix release to address some important bugs which just
+missed the 1.9 deadline, but were found afterwards.
+
+Normal Changes
+==============
+
+* Fix crash due to uninitialized lastwp member of layout_cell
+* Fix -fg/-bg/-style with 256 colour terminals.  
+
+CHANGES FROM 1.8 to 1.9, 20 February 2014
+
+NOTE:  This release has bumped the tmux protocol version.  It is therefore
+advised that the prior tmux server is restarted when this version of tmux is
+installed, to avoid protocol mismatch errors for newer clients trying to
+talk to an older running tmux server.
+
+Incompatible Changes
+====================
+
+* 88 colour support has been removed.
+* 'default-path' has been removed.  The new-window command accepts '-c' to
+  cater for this.  The previous value of "." can be replaced with: 'neww -c
+  $PWD', the previous value of '' which meant current path of the pane can
+  be specified as:  'neww -c "#{pane_current_path}"'
+
+Deprecated Changes
+==================
+
+* The single format specifiers:  #A -> #Z (where defined) have been
+  deprecated and replaced with longer-named equivalents, as listed in the
+  FORMATS section of the tmux manpage.
+* The various foo-{fg,bg,attr} commands have been deprecated and replaced
+  with equivalent foo-style option instead.  Currently this is still
+  backwards-compatible, but will be removed over time.
+
+Normal Changes
+==============
+
+* A new environment variable TMUX_TMPDIR is now honoured, allowing the
+  socket directory to be set outside of TMPDIR (/tmp/ if not set).
+* If -s not given to swap-pane the current pane is assumed.
+* A #{pane_synchronized} format specifier has been added to be a conditional
+  format if a pane is in a synchronised mode (c.f. synchronize-panes)
+* Tmux now runs under Cygwin natively.
+* Formats can now be nested within each other and expanded accordingly.
+* Added 'automatic-rename-format' option to allow the automatic rename
+  mechanism to use something other than the default of
+  #{pane_current_command}.
+* new-session learnt '-c' to specify the starting directory for that session
+  and all subsequent windows therein.
+* The session name is now shown in the message printed to the terminal when
+  a session is detached.
+* Lots more format specifiers have been added.
+* Server race conditions have been fixed; in particular commands are not run
+  until after the configuration file is read completely.
+* Case insensitive searching in tmux's copy-mode is now possible.
+* attach-session and switch-client learnt the '-t' option to accept a window
+  and/or a pane to use.
+* Copy-mode is only exited if no selection is in progress.
+* Paste key in copy-mode is now possible to enter text from the clipboard.
+* status-interval set to '0' now works as intended.
+* tmux now supports 256 colours running under fbterm.
+* Many bug fixes!
+
 CHANGES FROM 1.7 to 1.8, 26 March 2013
 
 Incompatible Changes
@@ -17,7 +360,7 @@ Normal Changes
 * 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
+* 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.
@@ -37,9 +380,9 @@ Normal Changes
   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
+* Panes can now emit focus notifications for certain applications
   which use those.
-* run-shell and if-shell now accept format placeholders.
+* run-shell and if-shell now accept formats.
 * 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.
@@ -776,7 +1119,7 @@ The list of older changes is below.
 * -u flag to scroll-mode and copy-mode to start scrolled one page
   up. scroll-mode -u is bound to prefix,page-up (ppage) by default.
 * Allow status, mode and message attributes to be changed by three new options:
-  status-attr, mode-attr, message-attr. A comma-separataed list is accepted
+  status-attr, mode-attr, message-attr. A comma-separated list is accepted
   containing: bright, dim, underscore, blink, reverse, hidden, italics, for
   example:
 
@@ -1799,10 +2142,3 @@ The list of older changes is below.
   emacs) that don't require scrolling regions (ESC[r) mostly work fine
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
-
-$Id$
-
- LocalWords:  showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
- LocalWords:  rivo nurges lscm Erdely eol smysession mysession ek dstname RB ms
- LocalWords:  dstidx srcname srcidx winlink lsw nabc sabc Exp Tiago Cunha dch
- LocalWords:  setw Chisnall renamew merdely eg Maier newname selectw neww Gass

CONTRIBUTING

@@ -0,0 +1,33 @@
+When reporting issues:
+
+YOU MUST INCLUDE THE TMUX VERSION
+
+DO NOT OPEN AN ISSUE THAT DOES NOT MENTION THE TMUX VERSION
+
+Please also include:
+
+- your platform (Linux, OS X, or whatever);
+- a brief description of the problem with steps to reproduce;
+- a minimal tmux config, if you can't reproduce without a config;
+- your terminal, and $TERM inside and outside of tmux;
+- logs from tmux (see below);
+- at most one or two screenshots, if helpful.
+
+This should include at least the output of:
+
+    $ uname -sp && tmux -V && echo $TERM
+
+Please do not report bugs (crashes, incorrect behaviour) without reproducing on
+a tmux built from Git master.
+
+Note that TERM inside tmux must be a variant of screen or tmux (for example:
+screen or screen-256color, tmux or tmux-256color). Please ensure this is the
+case before opening an issue.
+
+To run tmux without a config and get logs, run:
+
+    tmux -Ltest kill-server
+    tmux -vvvv -Ltest -f/dev/null new
+
+Then reproduce the problem, exit tmux, and attach the tmux-server-*.log file
+from the current directory to the issue.

COPYING

@@ -0,0 +1,21 @@
+THIS IS FOR INFORMATION ONLY, CODE IS UNDER THE LICENCE AT THE TOP OF ITS FILE.
+
+The README, 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,
+typically:
+
+Copyright (c) <author>
+
+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.

FAQ

@@ -95,9 +95,6 @@ aware of are (bearing in mind I haven't used screen for a few years now):
 - screen has builtin serial and telnet support; this is bloat and is unlikely
   to be added to tmux.
 
-- screen has support for updating utmp. Nobody has really come up with a clean,
-  portable way to do this without making tmux setuid or setgid yet.
-
 - Environment handling is different.
 
 - tmux tends to be more demanding on the terminal so tends to show up terminal
@@ -107,8 +104,12 @@ aware of are (bearing in mind I haven't used screen for a few years now):
 
 * I found a bug! What do I do?
 
-Please send bug reports by email to nicm@users.sourceforge.net or
+Check the latest version of tmux from Git to see if the problem is still
-tmux-users@lists.sourceforge.net. Please include as much of the following
+reproducible.  Sometimes the length of time between releases means a lot of
+fixes can be sitting in Git and the problem might already be fixed.
+
+Please send bug reports by email to nicholas.marriott@gmail.com or
+tmux-users@googlegroups.com. Please include as much of the following
 information as possible:
 
 - the version of tmux you are running;
@@ -122,7 +123,7 @@ information as possible:
 
 * Why doesn't tmux do $x?
 
-Please send feature requests by email to nicm@users.sourceforge.net.
+Please send feature requests by email to tmux-users@googlegroups.com.
 
 * Why do you use the screen terminal description inside tmux? It sucks.
 
@@ -238,6 +239,31 @@ would be welcome.
 
 vim users may also want to set the "ttyfast" option inside tmux.
 
+* How do I make ctrl and shift arrow keys work in emacs?
+
+The terminal-init-screen function in term/screen.el is called for new frames,
+but it doesn't configure any function keys.
+
+If the tmux xterm-keys option is on, it is enough to define the same keys as
+xterm. Add the following to init.el or .emacs to do this:
+
+(defadvice terminal-init-screen
+  ;; The advice is named `tmux', and is run before `terminal-init-screen' runs.
+  (before tmux activate)
+  ;; Docstring.  This describes the advice and is made available inside emacs;
+  ;; for example when doing C-h f terminal-init-screen RET
+  "Apply xterm keymap, allowing use of keys passed through tmux."
+  ;; This is the elisp code that is run before `terminal-init-screen'.
+  (if (getenv "TMUX")
+    (let ((map (copy-keymap xterm-function-map)))
+    (set-keymap-parent map (keymap-parent input-decode-map))
+    (set-keymap-parent input-decode-map map))))
+
+And ensure .tmux.conf contains "set -g xterm-keys on".
+
+Alternatively, the screen.el file can be copied to the load path and
+customized.
+
 * Why doesn't elinks set the window title inside tmux?
 
 There isn't a way to detect if a terminal supports setting the window title, so
@@ -326,42 +352,33 @@ 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'
 
-* vim displays reverse video instead of italics, while less displays italics
+* I don't see italics! Or less and vim show italics and reverse the wrong way round!
-  (or just regular text) instead of reverse. What's wrong?
 
-Screen's terminfo description lacks italics mode and has standout mode in its
+GNU screen does not support italics and the "screen" terminfo description uses
-place, but using the same escape sequence that urxvt uses for italics. This
+the italics escape sequence incorrectly.
-means applications (like vim) looking for italics will not find it and might
-turn to reverse in its place, while applications (like less) asking for
-standout will end up with italics instead of reverse. To make applications
-aware that tmux supports italics and to use a proper escape sequence for
-standout, you'll need to create a new terminfo file with modified sgr, smso,
-rmso, sitm and ritm entries:
 
-	$ mkdir $HOME/.terminfo/
+As of tmux 2.1, if default-terminal is set to "screen" or matches "screen-*",
-	$ screen_terminfo="screen"
+tmux will behave like screen and italics will be disabled.
-	$ infocmp "$screen_terminfo" | sed \
+
-	  -e 's/^screen[^|]*|[^,]*,/screen-it|screen with italics support,/' \
+To enable italics, create a new terminfo entry called "tmux" (some platforms
-	  -e 's/%?%p1%t;3%/%?%p1%t;7%/' \
+may already have this, you can check with "infocmp tmux"):
-	  -e 's/smso=[^,]*,/smso=\\E[7m,/' \
+
-	  -e 's/rmso=[^,]*,/rmso=\\E[27m,/' \
+	$ cat <<EOF|tic -x -
-	  -e '$s/$/ sitm=\\E[3m, ritm=\\E[23m,/' > /tmp/screen.terminfo
+	tmux|tmux terminal multiplexer,
-	$ tic /tmp/screen.terminfo
+		ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, Ms@,
+		use=xterm+tmux, use=screen,
+
+	tmux-256color|tmux with 256 colors,
+		use=xterm+256setaf, use=tmux,
+	EOF
+	$
 
 And tell tmux to use it in ~/.tmux.conf:
 	
-	set -g default-terminal "screen-it"
+	set -g default-terminal "tmux"
 
-If your terminal supports 256 colors, use:
+If using urxvt, make sure you have an italics capable font enabled. for
-
+example, add to ~/.Xdefaults:
-	$ screen_terminfo="screen-256color"
-
-instead of "screen". See the FAQ entry about 256 colors support for more info.
-Also note that tmux will still display reverse video on terminals that do not
-support italics.
-
-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
 
@@ -377,7 +394,7 @@ 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@'
+        set -ga terminal-overrides ',xterm*:smcup@:rmcup@'
 
 Adjust if your $TERM does not start with xterm.
 
@@ -397,4 +414,49 @@ Or the default window options:
 
         $ tmux -Lfoo -f/dev/null start\; show -gw
 
-$Id$
+* How do I copy a selection from tmux to the system's clipboard?
+
+When running in xterm(1), tmux can automatically send copied text to the
+clipboard. This is controlled by the set-clipboard option and also needs this
+X resource to be set:
+
+	XTerm*disallowedWindowOps: 20,21,SetXprop
+
+For rxvt-unicode (urxvt), there is an unofficial Perl extension here:
+
+        http://anti.teamidiot.de/static/nei/*/Code/urxvt/
+
+Otherwise a key binding for copy mode using xclip (or xsel) works:
+
+	bind -temacs-copy C-y copy-pipe "xclip -i >/dev/null"
+
+Or for inside and outside copy mode with the prefix key:
+
+        bind C-y run -b "tmux save-buffer - | xclip -i"
+
+On OS X, look at the pbcopy(1) and pbpaste(1) commands.
+
+* Why don't some commands work inside tmux on OS X?
+
+Apple requires some undocumented, unsupported fiddling to allow commands that
+interact with the GUI to work. Neither tmux itself nor most shells do this, so
+an external program is required. This can be found here:
+
+        https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard
+
+Affected commands may include say(1), pbcopy(1), pbpaste(1) and ssh(1).
+
+* Why do I see dots around a session when I attach to it?
+
+tmux limits the size of the window to the smallest attached session. If
+it didn't do this then it would be impossible to see the entire window.
+The dots mark the size of the window tmux can display.
+
+To avoid this, detach all other clients when attaching:
+
+	$ tmux attach -d
+
+Or from inside tmux by detaching individual clients with C-b D or all
+using:
+
+	C-b : attach -d

ISSUE_TEMPLATE

@@ -0,0 +1 @@
+Please read https://raw.githubusercontent.com/tmux/tmux/master/CONTRIBUTING

Makefile.am

@@ -1,97 +1,92 @@
-# $Id$
+# Makefile.am
 
 # Obvious program stuff.
 bin_PROGRAMS = tmux
-dist_man1_MANS = tmux.1
+CLEANFILES = tmux.1.mdoc tmux.1.man
 
 # Distribution tarball options.
 EXTRA_DIST = \
-	CHANGES FAQ README TODO examples compat \
+	CHANGES FAQ README TODO COPYING example_tmux.conf compat/*.[ch] \
-	array.h compat.h tmux.h osdep-*.c
+	osdep-*.c mdoc2man.awk tmux.1
 dist-hook:
-	grep "^#found_debug=" configure
+	grep "^#enable_debug=" configure
-	find $(distdir) -name .svn -type d|xargs rm -Rf
 
 # Preprocessor flags.
-CPPFLAGS += @XOPEN_DEFINES@
+AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\""
 
-# glibc as usual does things ass-backwards and hides useful things by default,
+# Additional object files.
-# so everyone has to add this.
+LDADD = $(LIBOBJS)
-if IS_GLIBC
-CFLAGS += -D_GNU_SOURCE
-endif
 
-# Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
+# Set flags for gcc.
-# different flags.
 if IS_GCC
-CFLAGS += -std=gnu99
+AM_CFLAGS += -std=gnu99 -O2
 if IS_DEBUG
-CFLAGS += -O0 -g
+AM_CFLAGS += -g
-CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
+AM_CFLAGS += -Wno-long-long -Wall -W -Wformat=2
-CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
+AM_CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
-CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
+AM_CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
-CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
+AM_CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
-CFLAGS += -Wdeclaration-after-statement
+AM_CFLAGS += -Wdeclaration-after-statement -Wno-pointer-sign -Wno-attributes
-CPPFLAGS += -DDEBUG
+AM_CFLAGS += -Wno-unused-result
-else
+AM_CPPFLAGS += -DDEBUG
-CFLAGS += -O2
-endif
-if IS_GCC4
-CPPFLAGS += -iquote. -I/usr/local/include
-if IS_DEBUG
-CFLAGS += -Wno-pointer-sign
-endif
-else
-CPPFLAGS += -I. -I- -I/usr/local/include
 endif
+AM_CPPFLAGS += -iquote.
 endif
 
 # Set flags for Solaris.
 if IS_SUNOS
-CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+if IS_GCC
+AM_CPPFLAGS += -D_XPG6
+else
+AM_CPPFLAGS += -D_XPG4_2
+endif
 endif
 
 # Set flags for Sun CC.
 if IS_SUNCC
-CFLAGS += -erroff=E_EMPTY_DECLARATION
+AM_CFLAGS += -erroff=E_EMPTY_DECLARATION
+endif
+
+# Set _LINUX_SOURCE_COMPAT for AIX for malloc(0).
+if IS_AIX
+AM_CPPFLAGS += -D_LINUX_SOURCE_COMPAT=1
+endif
+
+# Set flags for NetBSD.
+if IS_NETBSD
+AM_CPPFLAGS += -D_OPENBSD_SOURCE
 endif
 
 # List of sources.
 dist_tmux_SOURCES = \
+	alerts.c \
 	arguments.c \
 	attributes.c \
 	cfg.c \
 	client.c \
-	clock.c \
 	cmd-attach-session.c \
 	cmd-bind-key.c \
 	cmd-break-pane.c \
 	cmd-capture-pane.c \
 	cmd-choose-buffer.c \
 	cmd-choose-client.c \
-	cmd-choose-list.c \
 	cmd-choose-tree.c \
-	cmd-clear-history.c \
-	cmd-clock-mode.c \
 	cmd-command-prompt.c \
 	cmd-confirm-before.c \
 	cmd-copy-mode.c \
-	cmd-delete-buffer.c \
 	cmd-detach-client.c \
 	cmd-display-message.c \
 	cmd-display-panes.c \
 	cmd-find-window.c \
-	cmd-has-session.c \
+	cmd-find.c \
 	cmd-if-shell.c \
 	cmd-join-pane.c \
 	cmd-kill-pane.c \
 	cmd-kill-server.c \
 	cmd-kill-session.c \
 	cmd-kill-window.c \
-	cmd-link-window.c \
 	cmd-list-buffers.c \
 	cmd-list-clients.c \
-	cmd-list-commands.c \
 	cmd-list-keys.c \
 	cmd-list-panes.c \
 	cmd-list-sessions.c \
@@ -118,33 +113,31 @@ dist_tmux_SOURCES = \
 	cmd-select-pane.c \
 	cmd-select-window.c \
 	cmd-send-keys.c \
-	cmd-server-info.c \
 	cmd-set-buffer.c \
 	cmd-set-environment.c \
+	cmd-set-hook.c \
 	cmd-set-option.c \
 	cmd-show-environment.c \
 	cmd-show-messages.c \
 	cmd-show-options.c \
 	cmd-source-file.c \
 	cmd-split-window.c \
-	cmd-start-server.c \
 	cmd-string.c \
-	cmd-suspend-client.c \
 	cmd-swap-pane.c \
 	cmd-swap-window.c \
 	cmd-switch-client.c \
 	cmd-unbind-key.c \
-	cmd-unlink-window.c \
 	cmd-wait-for.c \
 	cmd.c \
 	colour.c \
-	control.c \
+	compat.h \
 	control-notify.c \
+	control.c \
 	environ.c \
 	format.c \
-	grid-cell.c \
 	grid-view.c \
 	grid.c \
+	hooks.c \
 	input-keys.c \
 	input.c \
 	job.c \
@@ -154,24 +147,26 @@ dist_tmux_SOURCES = \
 	layout-set.c \
 	layout.c \
 	log.c \
-	mode-key.c \
 	names.c \
 	notify.c \
 	options-table.c \
 	options.c \
 	paste.c \
+	proc.c \
+	pty.c \
 	resize.c \
 	screen-redraw.c \
 	screen-write.c \
 	screen.c \
 	server-client.c \
 	server-fn.c \
-	server-window.c \
 	server.c \
 	session.c \
 	signal.c \
 	status.c \
+	style.c \
 	tmux.c \
+	tmux.h \
 	tty-acs.c \
 	tty-keys.c \
 	tty-term.c \
@@ -182,67 +177,29 @@ dist_tmux_SOURCES = \
 	window-copy.c \
 	window.c \
 	xmalloc.c \
+	xmalloc.h \
 	xterm-keys.c
 nodist_tmux_SOURCES = osdep-@PLATFORM@.c
 
-# Pile in all the compat/ stuff that is needed.
+# Add compat file for forkpty.
-if NO_FORKPTY
+if NEED_FORKPTY
 nodist_tmux_SOURCES += compat/forkpty-@PLATFORM@.c
 endif
-if NO_IMSG
+
-nodist_tmux_SOURCES += compat/imsg.c compat/imsg-buffer.c
+# Add compat file for utf8proc.
-endif
+if HAVE_UTF8PROC
-if NO_CLOSEFROM
+nodist_tmux_SOURCES += compat/utf8proc.c
-nodist_tmux_SOURCES += compat/closefrom.c
-endif
-if NO_DAEMON
-nodist_tmux_SOURCES += compat/daemon.c
-endif
-if NO_SETENV
-nodist_tmux_SOURCES += compat/setenv.c
-endif
-if NO_STRLCAT
-nodist_tmux_SOURCES += compat/strlcat.c
-endif
-if NO_STRLCPY
-nodist_tmux_SOURCES += compat/strlcpy.c
-endif
-if NO_ASPRINTF
-nodist_tmux_SOURCES += compat/asprintf.c
-endif
-if NO_FGETLN
-nodist_tmux_SOURCES += compat/fgetln.c
-endif
-if NO_GETOPT
-nodist_tmux_SOURCES += compat/getopt.c
-endif
-if NO_STRCASESTR
-nodist_tmux_SOURCES += compat/strcasestr.c
-endif
-if NO_STRSEP
-nodist_tmux_SOURCES += compat/strsep.c
-endif
-if NO_VIS
-nodist_tmux_SOURCES += compat/vis.c compat/unvis.c
-endif
-if NO_STRTONUM
-nodist_tmux_SOURCES += compat/strtonum.c
-endif
-if NO_B64_NTOP
-nodist_tmux_SOURCES += compat/b64_ntop.c
 endif
 
-# Update SF web site.
+# Install tmux.1 in the right format.
-upload-index.html: update-index.html
+install-exec-hook:
-	scp www/index.html www/main.css www/images/*.png \
+	if test x@MANFORMAT@ = xmdoc; then \
-		${USER},tmux@web.sf.net:/home/groups/t/tm/tmux/htdocs
+		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 \
-	rm -f www/index.html www/images/small-*
+			>$(srcdir)/tmux.1.mdoc; \
-
+	else \
-update-index.html:
+		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
-	(cd www/images && \
+			$(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
-		rm -f small-* && \
+	fi
-		for i in *.png; do \
+	$(mkdir_p) $(DESTDIR)$(mandir)/man1
-			convert "$$i" -resize 200x150 "small-$$i"; \
+	$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
-		done \
+		$(DESTDIR)$(mandir)/man1/tmux.1
-	)
-	sed "s/%%VERSION%%/${VERSION}/g" www/index.html.in >www/index.html

README

@@ -4,57 +4,70 @@ 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
+This release runs on OpenBSD, FreeBSD, NetBSD, Linux, OS X and Solaris.
-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:
+tmux depends on libevent 2.x. Download it from:
 
-	http://www.monkey.org/~provos/libevent/
+	http://libevent.org
 
-To build tmux from a release tarball, do:
+It also depends on ncurses, available from:
+
+	http://invisible-island.net/ncurses/
+
+To build and install tmux from a release tarball, use:
 
 	$ ./configure && make
 	$ sudo make install
 
+tmux can use the utempter library to update utmp(5), if it is installed - run
+configure with --enable-utempter to enable this.
+
 To get and build the latest from version control:
 
-	$ git clone git://git.code.sf.net/p/tmux/tmux-code tmux
+	$ git clone https://github.com/tmux/tmux.git
 	$ cd tmux
 	$ sh autogen.sh
 	$ ./configure && make
 
-For more information see https://sourceforge.net/scm/?type=git&group_id=200378
+For more information see http://git-scm.com. Patches should be sent by email to
-and http://git-scm.com. Patches should be sent by email to the mailing list at
+the mailing list at tmux-users@googlegroups.com.
-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
+Some common questions are answered in the FAQ file, a rough todo list is in the
-slightly out of date) guide is available in the OpenBSD FAQ at
+TODO file and an example configuration in example_tmux.conf.
-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
+A vim(1) syntax file is available at:
-directory.
+
+	https://github.com/ericpruitt/tmux.vim
+	https://raw.githubusercontent.com/ericpruitt/tmux.vim/master/vim/syntax/tmux.vim
+
+And a bash(1) completion file at:
+
+	https://github.com/imomaliev/tmux-bash-completion
 
 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:
+tmux mailing lists are available. For general discussion and bug reports:
 
-	https://sourceforge.net/mail/?group_id=200378
+	https://groups.google.com/forum/#!forum/tmux-users
+
+And for Git commit emails:
+
+	https://groups.google.com/forum/#!forum/tmux-git
+
+Subscribe by sending an email to <tmux-users+subscribe@googlegroups.com>.
 
 Bug reports, feature suggestions and especially code contributions are most
 welcome. Please send by email to:
 
-	tmux-users@lists.sourceforge.net
+	tmux-users@googlegroups.com
 
-This file and the CHANGES, FAQ and TODO files are licensed under the ISC
+This file and the CHANGES, FAQ, SYNCING and TODO files are licensed under the
-license. Files under examples/ remain copyright their authors unless otherwise
+ISC license. All other files have a license and copyright notice at their start.
-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>
+-- Nicholas Marriott <nicholas.marriott@gmail.com>
-
-$Id$

SYNCING

@@ -1,10 +1,10 @@
 Preamble
 ========
 
-Tmux on SourceForge has two git repositories [1] "tmux-code" and "tmux-openbsd".
+Tmux portable relies on  repositories "tmux" and "tmux-openbsd".
 Here's a description of them:
 
-* "tmux-code" is the portable version, the one which contains code for other
+* "tmux" 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.
 
@@ -17,9 +17,6 @@ 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:
 
@@ -37,11 +34,11 @@ this information has ever been set before.
 Cloning repositories
 ====================
 
-This involves having both tmux-code and tmux-openbsd cloned, as in:
+This involves having both tmux and tmux-openbsd cloned, as in:
 
 % cd /some/where/useful
-% git clone ssh://${USER}@git.code.sf.net/p/tmux/tmux
+% git clone https://github.com/tmux/tmux.git
-% git clone ssh://${USER}@git.code.sf.net/p/tmux/tmux-openbsd
+% git clone https://github.com/ThomasAdam/tmux-openbsd.git
 
 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
@@ -50,56 +47,56 @@ these checkouts existing, skip that.
 Adding in git-remotes
 =====================
 
-Because the portable "tmux-code" git repository and the "tmux-openbsd"
+Because the portable "tmux" 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
+clone of the "tmux-openbsd" repository from the "tmux" repository, as
 shown by the following command:
 
-% cd /path/to/tmux-code
+% cd /path/to/tmux
 % 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"
+portable "tmux" 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
+"tmux", 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:
+up-to-date first, and then reference that update in "tmux", as in:
 
 % cd /path/to/tmux-openbsd
 % git checkout master
 % git pull
 
-Then back in "tmux-code":
+Then back in "tmux":
 
-% cd /path/to/tmux-code
+% cd /path/to/tmux
-% git fetch obsd-tmux-code
+% git fetch obsd-tmux
 
 Creating the necessary branches
 ===============================
 
-Now that "tmux-code" can see commits and branches from "tmux-openbsd" by way
+Now that "tmux" 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:
+"tmux-openbsd" in the "tmux" 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"
+To tie both the "master" branch from "tmux" 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
+"tmux" repository need to be added.  To do this, we must add an
 additional refspec line, as in:
 
-% cd /path/to/tmux-code
+% cd /path/to/tmux
 % git config --add remote.origin.fetch '+refs/replace/*:refs/replace/*'
 % git fetch origin
 
@@ -110,7 +107,7 @@ Make sure the "master" branch is checked out:
 
 % git checkout master
 
-The following will show commits on OpenBSD not yet synched with "tmux-code":
+The following will show commits on OpenBSD not yet synched with "tmux":
 
 % git log master..obsd-master
 
@@ -118,7 +115,7 @@ 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:
+Then ensure things look correct by BUILDING the result of that sync:
 
 % make clean && ./autogen.sh && ./configure && make
 
@@ -131,10 +128,19 @@ And if happy:
 
 % git push origin master
 
+Keeping an eye on libutil in OpenBSD
+====================================
+
+A lot of the compat/ code in tmux comes from libutil, especially imsg.
+Sometimes the API can change, etc., which might cause interesting problems
+trying to run the portable version of tmux.  It's worth checking
+periodically for any changes to libutil in OpenBSD and syncing those files
+to compat/ as and when appropriate.
+
 Release tmux for next version
 =============================
 
-1. Comment the "found_debug=yes" line in configure.ac, since releases
+1. Comment the "enable_debug=yes" line in configure.ac, since releases
    don't have debugging enabled, otherwise make(1) aborts when
    preparing the distribution.
 
@@ -145,30 +151,26 @@ Release tmux for next version
 
 3. Tag with:
 
-   % git tag -a 1.X
+   % git tag -a 2.X
 
-   Where "1.X" is the next version.
+   Where "2.X" is the next version.
 
    Push the tag out with:
 
-   % git push 1.X
+   % git push 2.X
 
-4. Build the tarball with make dist.  Now that it's using autoconf there
+4. Build the tarball with 'make dist'.
-   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
+5. Check the tarball.  If it's good, go here to select the tag just pushed:
-   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
+   https://github.com/tmux/tmux/tags
-   download by selecting all operating systems under the file details.
 
-7. Run make update-index.html upload-index.html to replace %%VERSION%%.
+   Click the "Add release notes", upload the tarball and add a link in the
+   description field to the CHANGES file.
 
-8. Bump version in configure.ac and uncomment "found_debug=yes" to create
+7. Clone the tmux.github.io repository, and change the RELEASE version in
-   a debug build by default.
+   the Makefile.  Commit it, and run 'make' to replace %%VERSION%%.  Push
+   the result out.
 
-9. Update freshmeat.
+8. Bump version in tmux/tmux.git configure.ac and uncomment "enable_debug=yes" to
-
+   create a debug build by default.
-[1] https://sourceforge.net/p/tmux/_list/git

TODO

@@ -1,155 +1,122 @@
-NOTES
+- command bits and pieces:
-=====
+	* allow multiple targets: fnmatch for -t/-c, for example detach all
+	  clients with -t*
+	* add -c for new-session like new-window
+	* ' and " should be parsed the same (eg "\e" vs '\e') in config
+	  and command prompt
+	* last-pane across sessions
+	* resize-pane -p to match split-window -p
+	* flag to wait-for to have a timeout and/or to stop waiting when the
+	  client gets a signal
 
-This file describes rough notes regarding ideas for potential future tmux
+- make command sequences more usable
-development.  It's not necessarily guaranteed that items in this TODO file
+	* don't require space after ;
-will ever get implemented.
+	* options for error handling: && and ||?
 
-It is asked therefore, that anyone thinking of undertaking a task in this
+- options bits and pieces:
-TODO file, email tmux-users@lists.sf.net to discuss the feature.
+	* way to set socket path from config file
 
-Thie file is split up between tmux user interface (UI) issues, and terminal
+- format improvements:
-compatibility issues.
+	* option to quote format (#{q:session_name})
+	* some way to pad # stuff with spaces
+	* formats to show if a window is linked into multiple sessions, into
+	  multiple attached sessions, and is the active window in multiple
+	  attached sessions?
 
-TMUX UI ISSUES
+- choose mode improvements:
-==============
+	* choose-pane command (augment choose-tree to do this?)
+	* flag to choose-* for sort order
+	* two choices (first one then second, for swap-pane and join-pane)
+	* choose modes should ditch the key bindings and just have fixed keys, and
+	  be more customized to their purpose (d to delete a buffer for choose-buffer,
+	  a preview of buffer contents, etc)
+
+- improve monitor-*:
+	* straighten out rules for multiple clients
+	* think about what happens across sessions
+	* monitor changes within a region
+	* perhaps monitor /all/ panes in the window not just one
+
+- improve mouse support:
+	* bind commands to mouse in different areas? 
+	* commands executed when clicking on a pattern (URL)
 
-- 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
-- garbage collect window history (100 lines at a time?) if it hasn't been used
-  in $x time
-- 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?
-- 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?
-- 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
-- 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
-- way to set socket path from config file
 - warts on current naming:
-  	- display-time but message-fg/bg/attr
+	* display-time but message-fg/bg/attr
-	- list-* vs show-*
+	* list-* vs show-*
-	- server-info
-	- up-pane/down-pane/swap-pane -U/swap-pane -D vs next-*/previous-*
-	- split-window -> split-pane??
-- 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
-- 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
-  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
-- option to move copy mode indicator into status line
-- selection behaviour closer to vi in vi mode
-- live update: server started with -U connects to server, requests sessions and
-  windows, receives fds
-- 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
-  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?)
-- support title stack, both internally and externally
-	http://docs.freebsd.org/cgi/getmsg.cgi?fetch=1149299+0+archive/2010/freebsd-questions/20100207.freebsd-questions
-- 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?
-- 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
-- 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)
-- 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)
-- 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.
-- 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)
-- pass shell commands as argv rather than strings, allow them to be specified
-  in commands without quotes
-- named buffers and allow gaps in the stack
-- 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
-- last-pane across sessions
-- 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 conditions for >0 (for #P)
-- fetch full command line on !Linux, and add option to strip prefixes
-  such as "sh " "/bin/sh " etc etc
-- synchronize-windows option
-- 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
+- copy/paste improvements:
-================
+	* paste w/o trailing whitespace
+	* command to toggle selection not to move it in copy-mode
+	* regex searching
+	* searching in copy mode should unwrap lines, so if you search for "foobar"
+	  then it should be found even if it is now "foo\nbar" (if the WRAP flag
+	  is set on the line)
+	* capture-pane option to preserve spaces but not join lines
+	* improve word and line selection in copy mode (for example when dragging
+	  it should select by word. compare how xterm works. GitHub issue 682)
 
-- use a better termcap internally instead of screen, perhaps xterm
+- layout stuff
-- clear window title on exit (see using xterm title stack)
+	* way to tag a layout as a number/name
-- get it passing all the vttest tests that don't require resizing the terminal
+	* maybe keep last layout + size around and if size reverts just put it
-- support for bce
+	  back
-- use screen-256color when started on 256 colour terminal?
+	* revamp layouts: they are too complicated, should be more closely
-* We need a tmux terminfo entry to document the extensions we are using in
+	  integrated, should support hints, layout sets should just be a
-  upstream terminfo. Must NOT change (only add or remove) anything from
+	  special case of custom layouts, and we should support panes that are
-  TERM=screen so we can fallback!
+	  not attached to a cell at all. this could be the time to introduce
+	  panelink to replace layout_cell
+	* way to set hints/limits about pane size for resizing
+	* panning over window (window larger than visible)
+	* a mode where one application can cross two panes (ie x|y, width =
+	  COLUMNS/2 but height = ROWS * 2)
+	* separate active panes for different clients
+
+- code cleanup
+	* 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.
+	  problem: what about windows in multiple sessions? there are contexts
+	  where we do not know which session, or where multiple choices makes
+	  no sense... could at least have one global list for all types of
+	  global options and keep separate window,session lists
+	* the way pane, window, session destroy is handled is too complicated
+	  and the distinction between session.c, window.c and server-fn.c
+	  functions is not clear. could we just have kill_pane(),
+	  kill_window(), unlink_window(), kill_session() that fix up all data
+	  structures (flagging sessions as dead) and return a value to say
+	  whether clients need to be checked for dead sessions? sort of like
+	  session_detach now but more so. or some other scheme to make it
+	  simpler and clearer? also would be nice to remove/rename server-fn.c
+	* more readable way to work out the various things commands need to
+	  know about the client, notably:
+		- is this the config file? (cmdq->c == NULL)
+		- is this a command client? (cmdq->c != NULL &&
+		  cmdq->c->session == NULL)
+		- is this a control client?
+		- can i do stdin or stdout to this client?
+	  or even guarantee that cmdq->c != NULL and provide a better way to
+	  tell when in the config file - then we use cmdq->c if we need a
+	  client w/o a session else cmd_current_client
+
+- miscellaneous
+	* way to keep a job running just read its last line of output for #()
+	* link panes into multiple windows
+	* live update: server started with -U connects to server, requests
+	  sessions and windows, receives file descriptors
+	* there are inconsistencies in what we get from old shell and what
+	  comes from config for new sessions and windows. likewise, panes and
+	  jobs and run-shell and lock command all start with slightly different
+	  environments
+	* multiline status line? separate command prompt and status line?
+	* automatic pane logging
+	* marks in history, automatically add (move?) one when pane is changed
+	* this doesn't work, need pane reference count probably:
+	  bind -n DoubleClick3Status confirm-before -p "kill-window #I? (y/n)" kill-window
+
+- hooks
+	* more hooks for various things
+	* finish after hooks for special commands
+	* multiple hooks with the same name?
+	* finish hooks for notifys
+	* for session_closed, if no sessions at all, perhaps fake up a temporary one

alerts.c

@@ -0,0 +1,322 @@
+/* $OpenBSD$ */
+
+/*
+ * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@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 <event.h>
+#include <stdlib.h>
+
+#include "tmux.h"
+
+static int	alerts_fired;
+
+static void	alerts_timer(int, short, void *);
+static int	alerts_enabled(struct window *, int);
+static void	alerts_callback(int, short, void *);
+static void	alerts_reset(struct window *);
+
+static int	alerts_check_all(struct window *);
+static int	alerts_check_bell(struct window *);
+static int	alerts_check_activity(struct window *);
+static int	alerts_check_silence(struct window *);
+static void printflike(2, 3) alerts_set_message(struct session *, const char *,
+		    ...);
+static void	alerts_ring_bell(struct session *);
+
+static TAILQ_HEAD(, window) alerts_list = TAILQ_HEAD_INITIALIZER(alerts_list);
+
+static void
+alerts_timer(__unused int fd, __unused short events, void *arg)
+{
+	struct window	*w = arg;
+
+	log_debug("@%u alerts timer expired", w->id);
+	alerts_reset(w);
+	alerts_queue(w, WINDOW_SILENCE);
+}
+
+static void
+alerts_callback(__unused int fd, __unused short events, __unused void *arg)
+{
+	struct window	*w, *w1;
+	int		 alerts;
+
+	TAILQ_FOREACH_SAFE(w, &alerts_list, alerts_entry, w1) {
+		alerts = alerts_check_all(w);
+		log_debug("@%u alerts check, alerts %#x", w->id, alerts);
+
+		w->alerts_queued = 0;
+		TAILQ_REMOVE(&alerts_list, w, alerts_entry);
+
+		w->flags &= ~WINDOW_ALERTFLAGS;
+		window_remove_ref(w);
+	}
+	alerts_fired = 0;
+}
+
+static int
+alerts_check_all(struct window *w)
+{
+	int	alerts;
+
+	alerts  = alerts_check_bell(w);
+	alerts |= alerts_check_activity(w);
+	alerts |= alerts_check_silence(w);
+	return (alerts);
+}
+
+void
+alerts_check_session(struct session *s)
+{
+	struct winlink	*wl;
+
+	RB_FOREACH(wl, winlinks, &s->windows)
+		alerts_check_all(wl->window);
+}
+
+static int
+alerts_enabled(struct window *w, int flags)
+{
+	if (flags & WINDOW_BELL)
+		return (1);
+	if (flags & WINDOW_ACTIVITY) {
+		if (options_get_number(w->options, "monitor-activity"))
+			return (1);
+	}
+	if (flags & WINDOW_SILENCE) {
+		if (options_get_number(w->options, "monitor-silence") != 0)
+			return (1);
+	}
+	return (0);
+}
+
+void
+alerts_reset_all(void)
+{
+	struct window	*w;
+
+	RB_FOREACH(w, windows, &windows)
+		alerts_reset(w);
+}
+
+static void
+alerts_reset(struct window *w)
+{
+	struct timeval	tv;
+
+	w->flags &= ~WINDOW_SILENCE;
+	event_del(&w->alerts_timer);
+
+	timerclear(&tv);
+	tv.tv_sec = options_get_number(w->options, "monitor-silence");
+
+	log_debug("@%u alerts timer reset %u", w->id, (u_int)tv.tv_sec);
+	if (tv.tv_sec != 0)
+		event_add(&w->alerts_timer, &tv);
+}
+
+void
+alerts_queue(struct window *w, int flags)
+{
+	if (w->flags & WINDOW_ACTIVITY)
+		alerts_reset(w);
+
+	if (!event_initialized(&w->alerts_timer))
+		evtimer_set(&w->alerts_timer, alerts_timer, w);
+
+	if ((w->flags & flags) != flags) {
+		w->flags |= flags;
+		log_debug("@%u alerts flags added %#x", w->id, flags);
+	}
+
+	if (!w->alerts_queued) {
+		w->alerts_queued = 1;
+		TAILQ_INSERT_TAIL(&alerts_list, w, alerts_entry);
+		w->references++;
+	}
+
+	if (!alerts_fired && alerts_enabled(w, flags)) {
+		log_debug("alerts check queued (by @%u)", w->id);
+		event_once(-1, EV_TIMEOUT, alerts_callback, NULL, NULL);
+		alerts_fired = 1;
+	}
+}
+
+static int
+alerts_check_bell(struct window *w)
+{
+	struct window	*ws;
+	struct winlink	*wl;
+	struct session	*s;
+	struct client	*c;
+	int		 action, visual;
+
+	if (~w->flags & WINDOW_BELL)
+		return (0);
+
+	TAILQ_FOREACH(wl, &w->winlinks, wentry)
+		wl->session->flags &= ~SESSION_ALERTED;
+
+	TAILQ_FOREACH(wl, &w->winlinks, wentry) {
+		if (wl->flags & WINLINK_BELL)
+			continue;
+		s = wl->session;
+		if (s->curw != wl) {
+			wl->flags |= WINLINK_BELL;
+			notify_winlink("alert-bell", s, wl);
+		}
+
+		if (s->flags & SESSION_ALERTED)
+			continue;
+		s->flags |= SESSION_ALERTED;
+
+		action = options_get_number(s->options, "bell-action");
+		if (action == BELL_NONE)
+			return (0);
+
+		visual = options_get_number(s->options, "visual-bell");
+		TAILQ_FOREACH(c, &clients, entry) {
+			if (c->session != s || c->flags & CLIENT_CONTROL)
+				continue;
+			ws = c->session->curw->window;
+
+			if (action == BELL_CURRENT && ws != w)
+				action = BELL_NONE;
+			if (action == BELL_OTHER && ws != w)
+				action = BELL_NONE;
+
+			if (!visual) {
+				if (action != BELL_NONE)
+					tty_putcode(&c->tty, TTYC_BEL);
+				continue;
+			}
+			if (action == BELL_CURRENT)
+				status_message_set(c, "Bell in current window");
+			else if (action != BELL_NONE) {
+				status_message_set(c, "Bell in window %d",
+				    wl->idx);
+			}
+		}
+	}
+
+	return (WINDOW_BELL);
+}
+
+static int
+alerts_check_activity(struct window *w)
+{
+	struct winlink	*wl;
+	struct session	*s;
+
+	if (~w->flags & WINDOW_ACTIVITY)
+		return (0);
+	if (!options_get_number(w->options, "monitor-activity"))
+		return (0);
+
+	TAILQ_FOREACH(wl, &w->winlinks, wentry)
+		wl->session->flags &= ~SESSION_ALERTED;
+
+	TAILQ_FOREACH(wl, &w->winlinks, wentry) {
+		if (wl->flags & WINLINK_ACTIVITY)
+			continue;
+		s = wl->session;
+		if (s->curw == wl)
+			continue;
+
+		wl->flags |= WINLINK_ACTIVITY;
+		notify_winlink("alert-activity", s, wl);
+
+		if (s->flags & SESSION_ALERTED)
+			continue;
+		s->flags |= SESSION_ALERTED;
+
+		if (options_get_number(s->options, "bell-on-alert"))
+			alerts_ring_bell(s);
+		if (options_get_number(s->options, "visual-activity"))
+			alerts_set_message(s, "Activity in window %d", wl->idx);
+	}
+
+	return (WINDOW_ACTIVITY);
+}
+
+static int
+alerts_check_silence(struct window *w)
+{
+	struct winlink	*wl;
+	struct session	*s;
+
+	if (~w->flags & WINDOW_SILENCE)
+		return (0);
+	if (!options_get_number(w->options, "monitor-silence"))
+		return (0);
+
+	TAILQ_FOREACH(wl, &w->winlinks, wentry)
+		wl->session->flags &= ~SESSION_ALERTED;
+
+	TAILQ_FOREACH(wl, &w->winlinks, wentry) {
+		if (wl->flags & WINLINK_SILENCE)
+			continue;
+		s = wl->session;
+		if (s->curw == wl)
+			continue;
+		wl->flags |= WINLINK_SILENCE;
+		notify_winlink("alert-silence", s, wl);
+
+		if (s->flags & SESSION_ALERTED)
+			continue;
+		s->flags |= SESSION_ALERTED;
+
+		if (options_get_number(s->options, "bell-on-alert"))
+			alerts_ring_bell(s);
+
+		if (!options_get_number(s->options, "visual-silence"))
+			alerts_set_message(s, "Silence in window %d", wl->idx);
+	}
+
+	return (WINDOW_SILENCE);
+}
+
+static void
+alerts_set_message(struct session *s, const char *fmt, ...)
+{
+	struct client	*c;
+	va_list		 ap;
+	char		*message;
+
+	va_start(ap, fmt);
+	xvasprintf(&message, fmt, ap);
+	va_end(ap);
+
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == s)
+			status_message_set(c, "%s", message);
+	}
+
+	free(message);
+}
+
+static void
+alerts_ring_bell(struct session *s)
+{
+	struct client	*c;
+
+	TAILQ_FOREACH(c, &clients, entry) {
+		if (c->session == s && !(c->flags & CLIENT_CONTROL))
+			tty_putcode(&c->tty, TTYC_BEL);
+	}
+}

arguments.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@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
@@ -20,33 +20,41 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "tmux.h"
 
-/* Create an arguments set with no flags. */
+/*
-struct args *
+ * Manipulate command arguments.
-args_create(int argc, ...)
+ */
+
+struct args_entry {
+	u_char			 flag;
+	char			*value;
+	RB_ENTRY(args_entry)	 entry;
+};
+
+static void			 args_set(struct args *, u_char, const char *);
+static struct args_entry	*args_find(struct args *, u_char);
+
+static int	args_cmp(struct args_entry *, struct args_entry *);
+RB_GENERATE_STATIC(args_tree, args_entry, entry, args_cmp);
+
+/* Arguments tree comparison function. */
+static int
+args_cmp(struct args_entry *a1, struct args_entry *a2)
 {
-	struct args	*args;
+	return (a1->flag - a2->flag);
-	va_list		 ap;
+}
-	int		 i;
 
-	args = xcalloc(1, sizeof *args);
+/* Find a flag in the arguments tree. */
-	if ((args->flags = bit_alloc(SCHAR_MAX)) == NULL)
+static struct args_entry *
-		fatal("bit_alloc failed");
+args_find(struct args *args, u_char ch)
+{
+	struct args_entry	entry;
 
-	args->argc = argc;
+	entry.flag = ch;
-	if (argc == 0)
+	return (RB_FIND(args_tree, &args->tree, &entry));
-		args->argv = NULL;
-	else
-		args->argv = xcalloc(argc, sizeof *args->argv);
-
-	va_start(ap, argc);
-	for (i = 0; i < argc; i++)
-		args->argv[i] = xstrdup(va_arg(ap, char *));
-	va_end(ap);
-
-	return (args);
 }
 
 /* Parse an argv and argc into a new argument set. */
@@ -54,30 +62,21 @@ struct args *
 args_parse(const char *template, int argc, char **argv)
 {
 	struct args	*args;
-	char		*ptr;
 	int		 opt;
 
 	args = xcalloc(1, sizeof *args);
-	if ((args->flags = bit_alloc(SCHAR_MAX)) == NULL)
-		fatal("bit_alloc failed");
 
 	optreset = 1;
 	optind = 1;
 
 	while ((opt = getopt(argc, argv, template)) != -1) {
-		if (opt < 0 || opt >= SCHAR_MAX)
+		if (opt < 0)
 			continue;
-		if (opt == '?' || (ptr = strchr(template, opt)) == NULL) {
+		if (opt == '?' || strchr(template, opt) == NULL) {
-			free(args->flags);
+			args_free(args);
-			free(args);
 			return (NULL);
 		}
-
+		args_set(args, opt, optarg);
-		bit_set(args->flags, opt);
-		if (ptr[1] == ':') {
-			free(args->values[opt]);
-			args->values[opt] = xstrdup(optarg);
-		}
 	}
 	argc -= optind;
 	argv += optind;
@@ -92,122 +91,155 @@ args_parse(const char *template, int argc, char **argv)
 void
 args_free(struct args *args)
 {
-	u_int	i;
+	struct args_entry	*entry;
+	struct args_entry	*entry1;
 
 	cmd_free_argv(args->argc, args->argv);
 
-	for (i = 0; i < SCHAR_MAX; i++)
+	RB_FOREACH_SAFE(entry, args_tree, &args->tree, entry1) {
-		free(args->values[i]);
+		RB_REMOVE(args_tree, &args->tree, entry);
+		free(entry->value);
+		free(entry);
+	}
 
-	free(args->flags);
 	free(args);
 }
 
-/* Print a set of arguments. */
+/* Add to string. */
-size_t
+static void printflike(3, 4)
-args_print(struct args *args, char *buf, size_t len)
+args_print_add(char **buf, size_t *len, const char *fmt, ...)
 {
-	size_t		 off;
+	va_list  ap;
-	int		 i;
+	char	*s;
-	const char	*quotes;
+	size_t	 slen;
 
-	/* There must be at least one byte at the start. */
+	va_start(ap, fmt);
-	if (len == 0)
+	slen = xvasprintf(&s, fmt, ap);
-		return (0);
+	va_end(ap);
-	off = 0;
+
+	*len += slen;
+	*buf = xrealloc(*buf, *len);
+
+	strlcat(*buf, s, *len);
+	free(s);
+}
+
+/* Print a set of arguments. */
+char *
+args_print(struct args *args)
+{
+	size_t		 	 len;
+	char			*buf, *escaped;
+	int			 i, flags;
+	struct args_entry	*entry;
+	static const char	 quoted[] = " #\"';$";
+
+	len = 1;
+	buf = xcalloc(1, len);
 
 	/* Process the flags first. */
-	buf[off++] = '-';
+	RB_FOREACH(entry, args_tree, &args->tree) {
-	for (i = 0; i < SCHAR_MAX; i++) {
+		if (entry->value != NULL)
-		if (!bit_test(args->flags, i) || args->values[i] != NULL)
 			continue;
 
-		if (off == len - 1) {
+		if (*buf == '\0')
-			buf[off] = '\0';
+			args_print_add(&buf, &len, "-");
-			return (len);
+		args_print_add(&buf, &len, "%c", entry->flag);
-		}
-		buf[off++] = i;
-		buf[off] = '\0';
 	}
-	if (off == 1)
-		buf[--off] = '\0';
 
 	/* Then the flags with arguments. */
-	for (i = 0; i < SCHAR_MAX; i++) {
+	RB_FOREACH(entry, args_tree, &args->tree) {
-		if (!bit_test(args->flags, i) || args->values[i] == NULL)
+		if (entry->value == NULL)
 			continue;
 
-		if (off >= len) {
+		if (*buf != '\0')
-			/* snprintf will have zero terminated. */
+			args_print_add(&buf, &len, " -%c ", entry->flag);
-			return (len);
-		}
-
-		if (strchr(args->values[i], ' ') != NULL)
-			quotes = "\"";
 		else
-			quotes = "";
+			args_print_add(&buf, &len, "-%c ", entry->flag);
-		off += xsnprintf(buf + off, len - off, "%s-%c %s%s%s",
+
-		    off != 0 ? " " : "", i, quotes, args->values[i], quotes);
+		flags = VIS_OCTAL|VIS_TAB|VIS_NL;
+		if (entry->value[strcspn(entry->value, quoted)] != '\0')
+			flags |= VIS_DQ;
+		utf8_stravis(&escaped, entry->value, flags);
+		if (flags & VIS_DQ)
+			args_print_add(&buf, &len, "\"%s\"", escaped);
+		else
+			args_print_add(&buf, &len, "%s", escaped);
+		free(escaped);
 	}
 
 	/* And finally the argument vector. */
 	for (i = 0; i < args->argc; i++) {
-		if (off >= len) {
+		if (*buf != '\0')
-			/* snprintf will have zero terminated. */
+			args_print_add(&buf, &len, " ");
-			return (len);
-		}
 
-		if (strchr(args->argv[i], ' ') != NULL)
+		flags = VIS_OCTAL|VIS_TAB|VIS_NL;
-			quotes = "\"";
+		if (args->argv[i][strcspn(args->argv[i], quoted)] != '\0')
+			flags |= VIS_DQ;
+		utf8_stravis(&escaped, args->argv[i], flags);
+		if (flags & VIS_DQ)
+			args_print_add(&buf, &len, "\"%s\"", escaped);
 		else
-			quotes = "";
+			args_print_add(&buf, &len, "%s", escaped);
-		off += xsnprintf(buf + off, len - off, "%s%s%s%s",
+		free(escaped);
-		    off != 0 ? " " : "", quotes, args->argv[i], quotes);
 	}
 
-	return (off);
+	return (buf);
 }
 
 /* Return if an argument is present. */
 int
 args_has(struct args *args, u_char ch)
 {
-	return (bit_test(args->flags, ch));
+	return (args_find(args, ch) == NULL ? 0 : 1);
 }
 
-/* Set argument value. */
+/* Set argument value in the arguments tree. */
-void
+static void
 args_set(struct args *args, u_char ch, const char *value)
 {
-	free(args->values[ch]);
+	struct args_entry	*entry;
+
+	/* Replace existing argument. */
+	if ((entry = args_find(args, ch)) != NULL) {
+		free(entry->value);
+		entry->value = NULL;
+	} else {
+		entry = xcalloc(1, sizeof *entry);
+		entry->flag = ch;
+		RB_INSERT(args_tree, &args->tree, entry);
+	}
+
 	if (value != NULL)
-		args->values[ch] = xstrdup(value);
+		entry->value = xstrdup(value);
-	else
-		args->values[ch] = NULL;
-	bit_set(args->flags, ch);
 }
 
 /* Get argument value. Will be NULL if it isn't present. */
 const char *
 args_get(struct args *args, u_char ch)
 {
-	return (args->values[ch]);
+	struct args_entry	*entry;
+
+	if ((entry = args_find(args, ch)) == NULL)
+		return (NULL);
+	return (entry->value);
 }
 
 /* Convert an argument value to a number. */
 long long
-args_strtonum(struct args *args,
+args_strtonum(struct args *args, u_char ch, long long minval, long long maxval,
-    u_char ch, long long minval, long long maxval, char **cause)
+    char **cause)
 {
-	const char	*errstr;
+	const char		*errstr;
-	long long 	 ll;
+	long long 	 	 ll;
+	struct args_entry	*entry;
 
-	if (!args_has(args, ch)) {
+	if ((entry = args_find(args, ch)) == NULL) {
 		*cause = xstrdup("missing");
 		return (0);
 	}
 
-	ll = strtonum(args->values[ch], minval, maxval, &errstr);
+	ll = strtonum(entry->value, minval, maxval, &errstr);
 	if (errstr != NULL) {
 		*cause = xstrdup(errstr);
 		return (0);

array.h

@@ -1,120 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2006 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.
- */
-
-#ifndef ARRAY_H
-#define ARRAY_H
-
-#define ARRAY_INITIALIZER { NULL, 0, 0 }
-
-#define ARRAY_DECL(n, c)						\
-	struct n {							\
-		c	*list;						\
-		u_int	 num;						\
-		size_t	 space;						\
-	}
-
-#define ARRAY_ITEM(a, i) ((a)->list[i])
-#define ARRAY_ITEMSIZE(a) (sizeof *(a)->list)
-#define ARRAY_INITIALSPACE(a) (10 * ARRAY_ITEMSIZE(a))
-
-#define ARRAY_ENSURE(a, n) do {						\
-	if (UINT_MAX - (n) < (a)->num)					\
-		fatalx("number too big");				\
-	if (SIZE_MAX / ((a)->num + (n)) < ARRAY_ITEMSIZE(a))		\
-		fatalx("size too big");					\
-	if ((a)->space == 0) {						\
-	       	(a)->space = ARRAY_INITIALSPACE(a);			\
-		(a)->list = xrealloc((a)->list, 1, (a)->space);		\
-	}								\
-	while ((a)->space <= ((a)->num + (n)) * ARRAY_ITEMSIZE(a)) {	\
-		(a)->list = xrealloc((a)->list, 2, (a)->space);		\
-		(a)->space *= 2;					\
-	}								\
-} while (0)
-
-#define ARRAY_EMPTY(a) (((void *) (a)) == NULL || (a)->num == 0)
-#define ARRAY_LENGTH(a) ((a)->num)
-#define ARRAY_DATA(a) ((a)->list)
-
-#define ARRAY_FIRST(a) ARRAY_ITEM(a, 0)
-#define ARRAY_LAST(a) ARRAY_ITEM(a, (a)->num - 1)
-
-#define ARRAY_INIT(a) do {						\
-	(a)->num = 0;							\
-	(a)->list = NULL;		 				\
-	(a)->space = 0;							\
-} while (0)
-#define ARRAY_CLEAR(a) do {						\
-	(a)->num = 0;							\
-} while (0)
-
-#define ARRAY_SET(a, i, s) do {						\
-	(a)->list[i] = s;						\
-} while (0)
-
-#define ARRAY_ADD(a, s) do {						\
-	ARRAY_ENSURE(a, 1);						\
-	(a)->list[(a)->num] = s;					\
-	(a)->num++;							\
-} while (0)
-#define ARRAY_INSERT(a, i, s) do {					\
-	ARRAY_ENSURE(a, 1);						\
-	if ((i) < (a)->num) {						\
-		memmove((a)->list + (i) + 1, (a)->list + (i), 		\
-		    ARRAY_ITEMSIZE(a) * ((a)->num - (i)));		\
-	}								\
-	(a)->list[i] = s;						\
-	(a)->num++;							\
-} while (0)
-#define ARRAY_REMOVE(a, i) do {						\
-	if ((i) < (a)->num - 1) {					\
-		memmove((a)->list + (i), (a)->list + (i) + 1, 		\
-		    ARRAY_ITEMSIZE(a) * ((a)->num - (i) - 1));		\
-	}								\
-	(a)->num--;							\
-	if ((a)->num == 0)						\
-		ARRAY_FREE(a);						\
-} while (0)
-
-#define ARRAY_EXPAND(a, n) do {						\
-	ARRAY_ENSURE(a, n);						\
-	(a)->num += n;							\
-} while (0)
-#define ARRAY_TRUNC(a, n) do {						\
-	if ((a)->num > n)						\
-		(a)->num -= n;				       		\
-	else								\
-		ARRAY_FREE(a);						\
-} while (0)
-
-#define ARRAY_CONCAT(a, b) do {						\
-	ARRAY_ENSURE(a, (b)->num);					\
-	memcpy((a)->list + (a)->num, (b)->list, (b)->num * ARRAY_ITEMSIZE(a)); \
-	(a)->num += (b)->num;						\
-} while (0)
-
-#define ARRAY_FREE(a) do {						\
-	free((a)->list);						\
-	ARRAY_INIT(a);							\
-} while (0)
-#define ARRAY_FREEALL(a) do {						\
-	ARRAY_FREE(a);							\
-	free(a);							\
-} while (0)
-
-#endif

attributes.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Joshua Elsasser <josh@elsasser.org>
@@ -23,7 +23,7 @@
 #include "tmux.h"
 
 const char *
-attributes_tostring(u_char attr)
+attributes_tostring(int attr)
 {
 	static char	buf[128];
 	size_t		len;
@@ -31,14 +31,15 @@ attributes_tostring(u_char attr)
 	if (attr == 0)
 		return ("none");
 
-	len = xsnprintf(buf, sizeof buf, "%s%s%s%s%s%s%s",
+	len = xsnprintf(buf, sizeof buf, "%s%s%s%s%s%s%s%s",
-		attr & GRID_ATTR_BRIGHT ? "bright," : "",
+	    (attr & GRID_ATTR_BRIGHT) ? "bright," : "",
-		attr & GRID_ATTR_DIM ? "dim," : "",
+	    (attr & GRID_ATTR_DIM) ? "dim," : "",
-		attr & GRID_ATTR_UNDERSCORE ? "underscore," : "",
+	    (attr & GRID_ATTR_UNDERSCORE) ? "underscore," : "",
-		attr & GRID_ATTR_BLINK ? "blink," : "",
+	    (attr & GRID_ATTR_BLINK)? "blink," : "",
-		attr & GRID_ATTR_REVERSE ? "reverse," : "",
+	    (attr & GRID_ATTR_REVERSE) ? "reverse," : "",
-		attr & GRID_ATTR_HIDDEN ? "hidden," : "",
+	    (attr & GRID_ATTR_HIDDEN) ? "hidden," : "",
-		attr & GRID_ATTR_ITALICS ? "italics," : "");
+	    (attr & GRID_ATTR_ITALICS) ? "italics," : "",
+	    (attr & GRID_ATTR_STRIKETHROUGH) ? "strikethrough," : "");
 	if (len > 0)
 		buf[len - 1] = '\0';
 
@@ -49,7 +50,7 @@ int
 attributes_fromstring(const char *str)
 {
 	const char	delimiters[] = " ,|";
-	u_char		attr;
+	int		attr;
 	size_t		end;
 
 	if (*str == '\0' || strcspn(str, delimiters) == 0)
@@ -78,6 +79,8 @@ attributes_fromstring(const char *str)
 			attr |= GRID_ATTR_HIDDEN;
 		else if (end == 7 && strncasecmp(str, "italics", end) == 0)
 			attr |= GRID_ATTR_ITALICS;
+		else if (end == 13 && strncasecmp(str, "strikethrough", end) == 0)
+			attr |= GRID_ATTR_STRIKETHROUGH;
 		else
 			return (-1);
 		str += end + strspn(str + end, delimiters);

autogen.sh

@@ -1,9 +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.15
-	[ -z "$AUTOCONF_VERSION" ] && export AUTOCONF_VERSION=2.65
+	[ -z "$AUTOCONF_VERSION" ] && export AUTOCONF_VERSION=2.69
 fi
 
 die()

cfg.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@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
@@ -17,135 +17,204 @@
  */
 
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "tmux.h"
 
-struct cmd_q		*cfg_cmd_q;
+static char	 *cfg_file;
-int			 cfg_finished;
+int		  cfg_finished;
-int			 cfg_references;
+static char	**cfg_causes;
-struct causelist	 cfg_causes;
+static u_int	  cfg_ncauses;
+struct client	 *cfg_client;
+
+static enum cmd_retval
+cfg_done(__unused struct cmdq_item *item, __unused void *data)
+{
+	if (cfg_finished)
+		return (CMD_RETURN_NORMAL);
+	cfg_finished = 1;
+
+	if (!RB_EMPTY(&sessions))
+		cfg_show_causes(RB_MIN(sessions, &sessions));
+
+	if (cfg_client != NULL)
+		server_client_unref(cfg_client);
+	return (CMD_RETURN_NORMAL);
+}
+
+void
+set_cfg_file(const char *path)
+{
+	free(cfg_file);
+	cfg_file = xstrdup(path);
+}
+
+void
+start_cfg(void)
+{
+	const char	*home;
+	int		 quiet = 0;
+
+	cfg_client = TAILQ_FIRST(&clients);
+	if (cfg_client != NULL)
+		cfg_client->references++;
+
+	load_cfg(TMUX_CONF, cfg_client, NULL, 1);
+
+	if (cfg_file == NULL && (home = find_home()) != NULL) {
+		xasprintf(&cfg_file, "%s/.tmux.conf", home);
+		quiet = 1;
+	}
+	if (cfg_file != NULL)
+		load_cfg(cfg_file, cfg_client, NULL, quiet);
+
+	cmdq_append(cfg_client, cmdq_get_callback(cfg_done, NULL));
+}
 
 int
-load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
+load_cfg(const char *path, struct client *c, struct cmdq_item *item, int quiet)
 {
-	FILE		*f;
+	FILE			*f;
-	u_int		 n, found;
+	const char		 delim[3] = { '\\', '\\', '\0' };
-	char		*buf, *copy, *line, *cause1, *msg;
+	u_int			 found = 0;
-	size_t		 len, oldlen;
+	size_t			 line = 0;
-	struct cmd_list	*cmdlist;
+	char			*buf, *cause1, *p, *q, *s;
+	struct cmd_list		*cmdlist;
+	struct cmdq_item	*new_item;
+	int			 condition = 0;
+	struct format_tree	*ft;
 
 	log_debug("loading %s", path);
 	if ((f = fopen(path, "rb")) == NULL) {
-		xasprintf(cause, "%s: %s", path, strerror(errno));
+		if (errno == ENOENT && quiet)
+			return (0);
+		cfg_add_cause("%s: %s", path, strerror(errno));
 		return (-1);
 	}
 
-	n = found = 0;
+	while ((buf = fparseln(f, NULL, &line, delim, 0)) != NULL) {
-	line = NULL;
+		log_debug("%s: %s", path, buf);
-	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. */
+		p = buf;
-		if (line != NULL) {
+		while (isspace((u_char)*p))
-			oldlen = strlen(line);
+			p++;
-			line = xrealloc(line, 1, oldlen + len + 1);
+		if (*p == '\0') {
-		} else {
+			free(buf);
-			oldlen = 0;
-			line = xmalloc(len + 1);
-		}
-
-		/* Append current line to the previous. */
-		memcpy(line + oldlen, buf, len);
-		line[oldlen + len] = '\0';
-		n++;
-
-		/* Continuation: get next line? */
-		len = strlen(line);
-		if (len > 0 && line[len - 1] == '\\') {
-			line[len - 1] = '\0';
-
-			/* Ignore escaped backslash at EOL. */
-			if (len > 1 && line[len - 2] != '\\')
-				continue;
-		}
-		copy = line;
-		line = NULL;
-
-		/* Skip empty lines. */
-		buf = copy;
-		while (isspace((u_char)*buf))
-			buf++;
-		if (*buf == '\0') {
-			free(copy);
 			continue;
 		}
+		q = p + strlen(p) - 1;
+		while (q != p && isspace((u_char)*q))
+			*q-- = '\0';
 
-		/* Parse and run the command. */
+		if (condition != 0 && strcmp(p, "%endif") == 0) {
-		if (cmd_string_parse(buf, &cmdlist, path, n, &cause1) != 0) {
+			condition = 0;
-			free(copy);
+			continue;
+		}
+		if (strncmp(p, "%if ", 4) == 0) {
+			if (condition != 0) {
+				cfg_add_cause("%s:%zu: nested %%if", path,
+				    line);
+				continue;
+			}
+			ft = format_create(NULL, FORMAT_NONE, FORMAT_NOJOBS);
+
+			s = p + 3;
+			while (isspace((u_char)*s))
+				s++;
+			s = format_expand(ft, s);
+			if (*s != '\0' && (s[0] != '0' || s[1] != '\0'))
+				condition = 1;
+			else
+				condition = -1;
+			free(s);
+
+			format_free(ft);
+			continue;
+		}
+		if (condition == -1)
+			continue;
+
+		cmdlist = cmd_string_parse(p, path, line, &cause1);
+		if (cmdlist == NULL) {
+			free(buf);
 			if (cause1 == NULL)
 				continue;
-			xasprintf(&msg, "%s:%u: %s", path, n, cause1);
+			cfg_add_cause("%s:%zu: %s", path, line, cause1);
-			ARRAY_ADD(&cfg_causes, msg);
 			free(cause1);
 			continue;
 		}
-		free(copy);
+		free(buf);
 
 		if (cmdlist == NULL)
 			continue;
-		cmdq_append(cmdq, cmdlist);
+		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
+		if (item != NULL)
+			cmdq_insert_after(item, new_item);
+		else
+			cmdq_append(c, new_item);
 		cmd_list_free(cmdlist);
+
 		found++;
 	}
-	if (line != NULL)
-		free(line);
 	fclose(f);
 
 	return (found);
 }
 
 void
-cfg_default_done(unused struct cmd_q *cmdq)
+cfg_add_cause(const char *fmt, ...)
 {
-	if (--cfg_references != 0)
+	va_list	 ap;
-		return;
+	char	*msg;
-	cfg_finished = 1;
 
-	if (!RB_EMPTY(&sessions))
+	va_start(ap, fmt);
-		cfg_show_causes(RB_MIN(sessions, &sessions));
+	xvasprintf(&msg, fmt, ap);
+	va_end(ap);
 
-	cmdq_free(cfg_cmd_q);
+	cfg_ncauses++;
-	cfg_cmd_q = NULL;
+	cfg_causes = xreallocarray(cfg_causes, cfg_ncauses, sizeof *cfg_causes);
+	cfg_causes[cfg_ncauses - 1] = msg;
+}
+
+void
+cfg_print_causes(struct cmdq_item *item)
+{
+	u_int	 i;
+
+	for (i = 0; i < cfg_ncauses; i++) {
+		cmdq_print(item, "%s", cfg_causes[i]);
+		free(cfg_causes[i]);
+	}
+
+	free(cfg_causes);
+	cfg_causes = NULL;
+	cfg_ncauses = 0;
 }
 
 void
 cfg_show_causes(struct session *s)
 {
 	struct window_pane	*wp;
-	char			*cause;
 	u_int			 i;
 
-	if (s == NULL || ARRAY_EMPTY(&cfg_causes))
+	if (s == NULL || cfg_ncauses == 0)
 		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++) {
+	for (i = 0; i < cfg_ncauses; i++) {
-		cause = ARRAY_ITEM(&cfg_causes, i);
+		window_copy_add(wp, "%s", cfg_causes[i]);
-		window_copy_add(wp, "%s", cause);
+		free(cfg_causes[i]);
-		free(cause);
 	}
-	ARRAY_FREE(&cfg_causes);
+
+	free(cfg_causes);
+	cfg_causes = NULL;
+	cfg_ncauses = 0;
 }

clock.c

@@ -1,159 +0,0 @@
-/* $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 <string.h>
-#include <time.h>
-
-#include "tmux.h"
-
-const char clock_table[14][5][5] = {
-	{ { 1,1,1,1,1 }, /* 0 */
-	  { 1,0,0,0,1 },
-	  { 1,0,0,0,1 },
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 } },
-	{ { 0,0,0,0,1 }, /* 1 */
-	  { 0,0,0,0,1 },
-	  { 0,0,0,0,1 },
-	  { 0,0,0,0,1 },
-	  { 0,0,0,0,1 } },
-	{ { 1,1,1,1,1 }, /* 2 */
-	  { 0,0,0,0,1 },
-	  { 1,1,1,1,1 },
-	  { 1,0,0,0,0 },
-	  { 1,1,1,1,1 } },
-	{ { 1,1,1,1,1 }, /* 3 */
-	  { 0,0,0,0,1 },
-	  { 1,1,1,1,1 },
-	  { 0,0,0,0,1 },
-	  { 1,1,1,1,1 } },
-	{ { 1,0,0,0,1 }, /* 4 */
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 },
-	  { 0,0,0,0,1 },
-	  { 0,0,0,0,1 } },
-	{ { 1,1,1,1,1 }, /* 5 */
-	  { 1,0,0,0,0 },
-	  { 1,1,1,1,1 },
-	  { 0,0,0,0,1 },
-	  { 1,1,1,1,1 } },
-	{ { 1,1,1,1,1 }, /* 6 */
-	  { 1,0,0,0,0 },
-	  { 1,1,1,1,1 },
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 } },
-	{ { 1,1,1,1,1 }, /* 7 */
-	  { 0,0,0,0,1 },
-	  { 0,0,0,0,1 },
-	  { 0,0,0,0,1 },
-	  { 0,0,0,0,1 } },
-	{ { 1,1,1,1,1 }, /* 8 */
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 },
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 } },
-	{ { 1,1,1,1,1 }, /* 9 */
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 },
-	  { 0,0,0,0,1 },
-	  { 1,1,1,1,1 } },
-	{ { 0,0,0,0,0 }, /* : */
-	  { 0,0,1,0,0 },
-	  { 0,0,0,0,0 },
-	  { 0,0,1,0,0 },
-	  { 0,0,0,0,0 } },
-	{ { 1,1,1,1,1 }, /* A */
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 },
-	  { 1,0,0,0,1 },
-	  { 1,0,0,0,1 } },
-	{ { 1,1,1,1,1 }, /* P */
-	  { 1,0,0,0,1 },
-	  { 1,1,1,1,1 },
-	  { 1,0,0,0,0 },
-	  { 1,0,0,0,0 } },
-	{ { 1,0,0,0,1 }, /* M */
-	  { 1,1,0,1,1 },
-	  { 1,0,1,0,1 },
-	  { 1,0,0,0,1 },
-	  { 1,0,0,0,1 } },
-};
-
-void
-clock_draw(struct screen_write_ctx *ctx, int colour, int style)
-{
-	struct screen		*s = ctx->s;
-	struct grid_cell	 gc;
-	char			 tim[64], *ptr;
-	time_t			 t;
-	u_int			 i, j, x, y, idx;
-
-	t = time(NULL);
-	if (style == 0)
-		strftime(tim, sizeof tim, "%l:%M %p", localtime(&t));
-	else
-		strftime(tim, sizeof tim, "%H:%M", localtime(&t));
-
-	screen_write_clearscreen(ctx);
-
-	if (screen_size_x(s) < 6 * strlen(tim) || screen_size_y(s) < 6) {
-		if (screen_size_x(s) >= strlen(tim) && screen_size_y(s) != 0) {
-			x = (screen_size_x(s) / 2) - (strlen(tim) / 2);
-			y = screen_size_y(s) / 2;
-			screen_write_cursormove(ctx, x, y);
-
-			memcpy(&gc, &grid_default_cell, sizeof gc);
-			colour_set_fg(&gc, colour);
-			screen_write_puts(ctx, &gc, "%s", tim);
-		}
-		return;
-	}
-
-	x = (screen_size_x(s) / 2) - 3 * strlen(tim);
-	y = (screen_size_y(s) / 2) - 3;
-
-	memcpy(&gc, &grid_default_cell, sizeof gc);
-	colour_set_bg(&gc, colour);
-	for (ptr = tim; *ptr != '\0'; ptr++) {
-		if (*ptr >= '0' && *ptr <= '9')
-			idx = *ptr - '0';
-		else if (*ptr == ':')
-			idx = 10;
-		else if (*ptr == 'A')
-			idx = 11;
-		else if (*ptr == 'P')
-			idx = 12;
-		else if (*ptr == 'M')
-			idx = 13;
-		else {
-			x += 6;
-			continue;
-		}
-
-		for (j = 0; j < 5; j++) {
-			for (i = 0; i < 5; i++) {
-				screen_write_cursormove(ctx, x + i, y + j);
-				if (clock_table[idx][j][i])
-					screen_write_putc(ctx, &gc, ' ');
-			}
-		}
-		x += 6;
-	}
-}

cmd-attach-session.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -18,7 +18,11 @@
 
 #include <sys/types.h>
 
+#include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "tmux.h"
 
@@ -26,95 +30,121 @@
  * Attach existing session to the current terminal.
  */
 
-enum cmd_retval	cmd_attach_session_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_attach_session_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_attach_session_entry = {
-	"attach-session", "attach",
+	.name = "attach-session",
-	"drt:", 0, 0,
+	.alias = "attach",
-	"[-dr] " CMD_TARGET_SESSION_USAGE,
+
-	CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON,
+	.args = { "c:dErt:", 0, 0 },
-	NULL,
+	.usage = "[-dEr] [-c working-directory] " CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_attach_session_exec
+	.tflag = CMD_SESSION_WITHPANE,
+
+	.flags = CMD_STARTSERVER,
+	.exec = cmd_attach_session_exec
 };
 
 enum cmd_retval
-cmd_attach_session(struct cmd_q *cmdq, const char* tflag, int dflag, int rflag)
+cmd_attach_session(struct cmdq_item *item, int dflag, int rflag,
+    const char *cflag, int Eflag)
 {
-	struct session	*s;
+	struct session		*s = item->state.tflag.s;
-	struct client	*c;
+	struct client		*c = item->client, *c_loop;
-	const char	*update;
+	struct winlink		*wl = item->state.tflag.wl;
-	char		*cause;
+	struct window_pane	*wp = item->state.tflag.wp;
-	u_int		 i;
+	char			*cause;
 
 	if (RB_EMPTY(&sessions)) {
-		cmdq_error(cmdq, "no sessions");
+		cmdq_error(item, "no sessions");
 		return (CMD_RETURN_ERROR);
 	}
 
-	if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL)
+	if (c == NULL)
-		return (CMD_RETURN_ERROR);
-
-	if (cmdq->client == NULL)
 		return (CMD_RETURN_NORMAL);
+	if (server_client_check_nested(c)) {
+		cmdq_error(item, "sessions should be nested with care, "
+		    "unset $TMUX to force");
+		return (CMD_RETURN_ERROR);
+	}
 
-	if (cmdq->client->session != NULL) {
+	if (wl != NULL) {
+		if (wp != NULL)
+			window_set_active_pane(wp->window, wp);
+		session_set_current(s, wl);
+	}
+
+	if (cflag != NULL) {
+		free((void *)s->cwd);
+		s->cwd = format_single(item, cflag, c, s, wl, wp);
+	}
+
+	if (c->session != NULL) {
 		if (dflag) {
-			/*
+			TAILQ_FOREACH(c_loop, &clients, entry) {
-			 * Can't use server_write_session in case attaching to
+				if (c_loop->session != s || c == c_loop)
-			 * the same session as currently attached to.
-			 */
-			for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-				c = ARRAY_ITEM(&clients, i);
-				if (c == NULL || c->session != s)
 					continue;
-				if (c == cmdq->client)
+				server_client_detach(c_loop, MSG_DETACH);
-					continue;
-				server_write_client(c, MSG_DETACH, NULL, 0);
 			}
 		}
+		if (!Eflag)
+			environ_update(s->options, c->environ, s->environ);
 
-		cmdq->client->session = s;
+		c->session = s;
-		notify_attached_session_changed(cmdq->client);
+		if (!item->repeat)
-		session_update_activity(s);
+			server_client_set_key_table(c, NULL);
-		server_redraw_client(cmdq->client);
+		status_timer_start(c);
+		notify_client("client-session-changed", c);
+		session_update_activity(s, NULL);
+		gettimeofday(&s->last_attached_time, NULL);
+		server_redraw_client(c);
 		s->curw->flags &= ~WINLINK_ALERTFLAGS;
 	} else {
-		if (server_client_open(cmdq->client, s, &cause) != 0) {
+		if (server_client_open(c, &cause) != 0) {
-			cmdq_error(cmdq, "open terminal failed: %s", cause);
+			cmdq_error(item, "open terminal failed: %s", cause);
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
-
 		if (rflag)
-			cmdq->client->flags |= CLIENT_READONLY;
+			c->flags |= CLIENT_READONLY;
 
-		if (dflag)
+		if (dflag) {
-			server_write_session(s, MSG_DETACH, NULL, 0);
+			TAILQ_FOREACH(c_loop, &clients, entry) {
+				if (c_loop->session != s || c == c_loop)
+					continue;
+				server_client_detach(c_loop, MSG_DETACH);
+			}
+		}
+		if (!Eflag)
+			environ_update(s->options, c->environ, s->environ);
 
-		update = options_get_string(&s->options, "update-environment");
+		c->session = s;
-		environ_update(update, &cmdq->client->environ, &s->environ);
+		server_client_set_key_table(c, NULL);
-
+		status_timer_start(c);
-		cmdq->client->session = s;
+		notify_client("client-session-changed", c);
-		notify_attached_session_changed(cmdq->client);
+		session_update_activity(s, NULL);
-		session_update_activity(s);
+		gettimeofday(&s->last_attached_time, NULL);
-		server_redraw_client(cmdq->client);
+		server_redraw_client(c);
 		s->curw->flags &= ~WINLINK_ALERTFLAGS;
 
-		server_write_ready(cmdq->client);
+		if (~c->flags & CLIENT_CONTROL)
-		cmdq->client_exit = 0;
+			proc_send(c->peer, MSG_READY, -1, NULL, 0);
+		notify_client("client-attached", c);
+		c->flags |= CLIENT_ATTACHED;
 	}
 	recalculate_sizes();
+	alerts_check_session(s);
 	server_update_socket();
 
 	return (CMD_RETURN_NORMAL);
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_attach_session_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_attach_session_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
 
-	return (cmd_attach_session(cmdq, args_get(args, 't'),
+	return (cmd_attach_session(item, args_has(args, 'd'),
-	    args_has(args, 'd'), args_has(args, 'r')));
+	    args_has(args, 'r'), args_get(args, 'c'), args_has(args, 'E')));
 }

cmd-bind-key.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -24,113 +24,53 @@
 #include "tmux.h"
 
 /*
- * Bind a key to a command, this recurses through cmd_*.
+ * Bind a key to a command.
  */
 
-enum cmd_retval	 cmd_bind_key_check(struct args *);
+static enum cmd_retval	cmd_bind_key_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_bind_key_exec(struct cmd *, struct cmd_q *);
-
-enum cmd_retval	 cmd_bind_key_table(struct cmd *, struct cmd_q *, int);
 
 const struct cmd_entry cmd_bind_key_entry = {
-	"bind-key", "bind",
+	.name = "bind-key",
-	"cnrt:", 1, -1,
+	.alias = "bind",
-	"[-cnr] [-t key-table] key command [arguments]",
+
-	0,
+	.args = { "cnrT:", 2, -1 },
-	NULL,
+	.usage = "[-cnr] [-T key-table] key "
-	cmd_bind_key_check,
+	         "command [arguments]",
-	cmd_bind_key_exec
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_bind_key_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_bind_key_check(struct args *args)
+cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
-{
-	if (args_has(args, 't')) {
-		if (args->argc != 2 && args->argc != 3)
-			return (CMD_RETURN_ERROR);
-	} else {
-		if (args->argc < 2)
-			return (CMD_RETURN_ERROR);
-	}
-	return (CMD_RETURN_NORMAL);
-}
-
-enum cmd_retval
-cmd_bind_key_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args	*args = self->args;
 	char		*cause;
 	struct cmd_list	*cmdlist;
-	int		 key;
+	key_code	 key;
+	const char	*tablename;
 
 	key = key_string_lookup_string(args->argv[0]);
-	if (key == KEYC_NONE) {
+	if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
-		cmdq_error(cmdq, "unknown key: %s", args->argv[0]);
+		cmdq_error(item, "unknown key: %s", args->argv[0]);
 		return (CMD_RETURN_ERROR);
 	}
 
-	if (args_has(args, 't'))
+	if (args_has(args, 'T'))
-		return (cmd_bind_key_table(self, cmdq, key));
+		tablename = args_get(args, 'T');
+	else if (args_has(args, 'n'))
+		tablename = "root";
+	else
+		tablename = "prefix";
 
 	cmdlist = cmd_list_parse(args->argc - 1, args->argv + 1, NULL, 0,
 	    &cause);
 	if (cmdlist == NULL) {
-		cmdq_error(cmdq, "%s", cause);
+		cmdq_error(item, "%s", cause);
 		free(cause);
 		return (CMD_RETURN_ERROR);
 	}
 
-	if (!args_has(args, 'n'))
+	key_bindings_add(tablename, key, args_has(args, 'r'), cmdlist);
-	    key |= KEYC_PREFIX;
-	key_bindings_add(key, args_has(args, 'r'), cmdlist);
-	return (CMD_RETURN_NORMAL);
-}
-
-enum cmd_retval
-cmd_bind_key_table(struct cmd *self, struct cmd_q *cmdq, 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);
-		return (CMD_RETURN_ERROR);
-	}
-
-	cmd = mode_key_fromstring(mtab->cmdstr, args->argv[1]);
-	if (cmd == MODEKEY_NONE) {
-		cmdq_error(cmdq, "unknown command: %s", args->argv[1]);
-		return (CMD_RETURN_ERROR);
-	}
-
-	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) {
-		mbind = xmalloc(sizeof *mbind);
-		mbind->key = mtmp.key;
-		mbind->mode = mtmp.mode;
-		RB_INSERT(mode_key_tree, mtab->tree, mbind);
-	}
-	mbind->cmd = cmd;
-	mbind->arg = arg != NULL ? xstrdup(arg) : NULL;
 	return (CMD_RETURN_NORMAL);
 }

cmd-break-pane.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -26,90 +26,89 @@
  * Break pane off into a window.
  */
 
-enum cmd_retval	 cmd_break_pane_exec(struct cmd *, struct cmd_q *);
+#define BREAK_PANE_TEMPLATE "#{session_name}:#{window_index}.#{pane_index}"
+
+static enum cmd_retval	cmd_break_pane_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_break_pane_entry = {
-	"break-pane", "breakp",
+	.name = "break-pane",
-	"dPF:t:", 0, 0,
+	.alias = "breakp",
-	"[-dP] [-F format] " CMD_TARGET_PANE_USAGE,
+
-	0,
+	.args = { "dPF:n:s:t:", 0, 0 },
-	NULL,
+	.usage = "[-dP] [-F format] [-n window-name] [-s src-pane] [-t dst-window]",
-	NULL,
+
-	cmd_break_pane_exec
+	.sflag = CMD_PANE,
+	.tflag = CMD_WINDOW_INDEX,
+
+	.flags = 0,
+	.exec = cmd_break_pane_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct winlink		*wl;
+	struct client		*c = item->state.c;
-	struct session		*s;
+	struct winlink		*wl = item->state.sflag.wl;
-	struct window_pane	*wp;
+	struct session		*src_s = item->state.sflag.s;
-	struct window		*w;
+	struct session		*dst_s = item->state.tflag.s;
-	char			*name;
+	struct window_pane	*wp = item->state.sflag.wp;
-	char			*cause;
+	struct window		*w = wl->window;
-	int			 base_idx;
+	char			*name, *cause;
-	struct client		*c;
+	int			 idx = item->state.tflag.idx;
-	struct format_tree	*ft;
 	const char		*template;
 	char			*cp;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
+	if (idx != -1 && winlink_find_by_index(&dst_s->windows, idx) != NULL) {
-		return (CMD_RETURN_ERROR);
+		cmdq_error(item, "index %d already in use", idx);
-
-	if (window_count_panes(wl->window) == 1) {
-		cmdq_error(cmdq, "can't break with only one pane");
 		return (CMD_RETURN_ERROR);
 	}
 
-	w = wl->window;
+	if (window_count_panes(w) == 1) {
+		cmdq_error(item, "can't break with only one pane");
+		return (CMD_RETURN_ERROR);
+	}
 	server_unzoom_window(w);
 
 	TAILQ_REMOVE(&w->panes, wp, entry);
-	if (wp == w->active) {
+	window_lost_pane(w, wp);
-		w->active = w->last;
-		w->last = NULL;
-		if (w->active == NULL) {
-			w->active = TAILQ_PREV(wp, window_panes, entry);
-			if (w->active == NULL)
-				w->active = TAILQ_NEXT(wp, entry);
-		}
-	} else if (wp == w->last)
-		w->last = NULL;
 	layout_close_pane(wp);
 
-	w = wp->window = window_create1(s->sx, s->sy);
+	w = wp->window = window_create(dst_s->sx, dst_s->sy);
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 	w->active = wp;
-	name = default_window_name(w);
+
-	window_set_name(w, name);
+	if (!args_has(args, 'n')) {
-	free(name);
+		name = default_window_name(w);
+		window_set_name(w, name);
+		free(name);
+	} else {
+		window_set_name(w, args_get(args, 'n'));
+		options_set_number(w->options, "automatic-rename", 0);
+	}
+
 	layout_init(w, wp);
+	wp->flags |= PANE_CHANGED;
 
-	base_idx = options_get_number(&s->options, "base-index");
+	if (idx == -1)
-	wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */
+		idx = -1 - options_get_number(dst_s->options, "base-index");
+	wl = session_attach(dst_s, w, idx, &cause); /* can't fail */
 	if (!args_has(self->args, 'd'))
-		session_select(s, wl->idx);
+		session_select(dst_s, wl->idx);
 
-	server_redraw_session(s);
+	server_redraw_session(src_s);
-	server_status_session_group(s);
+	if (src_s != dst_s)
+		server_redraw_session(dst_s);
+	server_status_session_group(src_s);
+	if (src_s != dst_s)
+		server_status_session_group(dst_s);
 
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
 			template = BREAK_PANE_TEMPLATE;
-
+		cp = format_single(item, template, c, dst_s, wl, wp);
-		ft = format_create();
+		cmdq_print(item, "%s", cp);
-		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

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
@@ -27,56 +27,74 @@
  * Write the entire contents of a pane to a buffer or stdout.
  */
 
-enum cmd_retval	 cmd_capture_pane_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_capture_pane_exec(struct cmd *, struct cmdq_item *);
 
-char		*cmd_capture_pane_append(char *, size_t *, char *, size_t);
+static char	*cmd_capture_pane_append(char *, size_t *, char *, size_t);
-char		*cmd_capture_pane_pending(struct args *, struct window_pane *,
+static char	*cmd_capture_pane_pending(struct args *, struct window_pane *,
 		     size_t *);
-char		*cmd_capture_pane_history(struct args *, struct cmd_q *,
+static char	*cmd_capture_pane_history(struct args *, struct cmdq_item *,
 		     struct window_pane *, size_t *);
 
 const struct cmd_entry cmd_capture_pane_entry = {
-	"capture-pane", "capturep",
+	.name = "capture-pane",
-	"ab:CeE:JpPqS:t:", 0, 0,
+	.alias = "capturep",
-	"[-aCeJpPq] [-b buffer-index] [-E end-line] [-S start-line]"
+
-	CMD_TARGET_PANE_USAGE,
+	.args = { "ab:CeE:JpPqS:t:", 0, 0 },
-	0,
+	.usage = "[-aCeJpPq] " CMD_BUFFER_USAGE " [-E end-line] "
-	NULL,
+		 "[-S start-line]" CMD_TARGET_PANE_USAGE,
-	NULL,
+
-	cmd_capture_pane_exec
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_capture_pane_exec
 };
 
-char *
+const struct cmd_entry cmd_clear_history_entry = {
+	.name = "clear-history",
+	.alias = "clearhist",
+
+	.args = { "t:", 0, 0 },
+	.usage = CMD_TARGET_PANE_USAGE,
+
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_capture_pane_exec
+};
+
+static char *
 cmd_capture_pane_append(char *buf, size_t *len, char *line, size_t linelen)
 {
-	buf = xrealloc(buf, 1, *len + linelen + 1);
+	buf = xrealloc(buf, *len + linelen + 1);
 	memcpy(buf + *len, line, linelen);
 	*len += linelen;
 	return (buf);
 }
 
-char *
+static char *
 cmd_capture_pane_pending(struct args *args, struct window_pane *wp,
     size_t *len)
 {
-	char	*buf, *line, tmp[5];
+	struct evbuffer	*pending;
-	size_t	 linelen;
+	char		*buf, *line, tmp[5];
-	u_int	 i;
+	size_t		 linelen;
+	u_int		 i;
 
-	if (wp->ictx.since_ground == NULL)
+	pending = input_pending(wp);
+	if (pending == NULL)
 		return (xstrdup(""));
 
-	line = EVBUFFER_DATA(wp->ictx.since_ground);
+	line = EVBUFFER_DATA(pending);
-	linelen = EVBUFFER_LENGTH(wp->ictx.since_ground);
+	linelen = EVBUFFER_LENGTH(pending);
 
 	buf = xstrdup("");
 	if (args_has(args, 'C')) {
 		for (i = 0; i < linelen; i++) {
-			if (line[i] >= ' ') {
+			if (line[i] >= ' ' && line[i] != '\\') {
 				tmp[0] = line[i];
 				tmp[1] = '\0';
 			} else
-				xsnprintf(tmp, sizeof tmp, "\\%03o", line[i]);
+				xsnprintf(tmp, sizeof tmp, "\\%03hho", line[i]);
 			buf = cmd_capture_pane_append(buf, len, tmp,
 			    strlen(tmp));
 		}
@@ -85,8 +103,8 @@ cmd_capture_pane_pending(struct args *args, struct window_pane *wp,
 	return (buf);
 }
 
-char *
+static char *
-cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
+cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
     struct window_pane *wp, size_t *len)
 {
 	struct grid		*gd;
@@ -95,6 +113,7 @@ cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
 	int			 n, with_codes, escape_c0, join_lines;
 	u_int			 i, sx, top, bottom, tmp;
 	char			*cause, *buf, *line;
+	const char		*Sflag, *Eflag;
 	size_t			 linelen;
 
 	sx = screen_size_x(&wp->base);
@@ -102,7 +121,7 @@ cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
 		gd = wp->saved_grid;
 		if (gd == NULL) {
 			if (!args_has(args, 'q')) {
-				cmdq_error(cmdq, "no alternate screen");
+				cmdq_error(item, "no alternate screen");
 				return (NULL);
 			}
 			return (xstrdup(""));
@@ -110,27 +129,37 @@ cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
 	} else
 		gd = wp->base.grid;
 
-	n = args_strtonum(args, 'S', INT_MIN, SHRT_MAX, &cause);
+	Sflag = args_get(args, 'S');
-	if (cause != NULL) {
+	if (Sflag != NULL && strcmp(Sflag, "-") == 0)
-		top = gd->hsize;
-		free(cause);
-	} else if (n < 0 && (u_int) -n > gd->hsize)
 		top = 0;
-	else
+	else {
-		top = gd->hsize + n;
+		n = args_strtonum(args, 'S', INT_MIN, SHRT_MAX, &cause);
-	if (top > gd->hsize + gd->sy - 1)
+		if (cause != NULL) {
-		top = gd->hsize + gd->sy - 1;
+			top = gd->hsize;
+			free(cause);
+		} else if (n < 0 && (u_int) -n > gd->hsize)
+			top = 0;
+		else
+			top = gd->hsize + n;
+		if (top > gd->hsize + gd->sy - 1)
+			top = gd->hsize + gd->sy - 1;
+	}
 
-	n = args_strtonum(args, 'E', INT_MIN, SHRT_MAX, &cause);
+	Eflag = args_get(args, 'E');
-	if (cause != NULL) {
+	if (Eflag != NULL && strcmp(Eflag, "-") == 0)
-		bottom = gd->hsize + gd->sy - 1;
-		free(cause);
-	} else if (n < 0 && (u_int) -n > gd->hsize)
-		bottom = 0;
-	else
-		bottom = gd->hsize + n;
-	if (bottom > gd->hsize + gd->sy - 1)
 		bottom = gd->hsize + gd->sy - 1;
+	else {
+		n = args_strtonum(args, 'E', INT_MIN, SHRT_MAX, &cause);
+		if (cause != NULL) {
+			bottom = gd->hsize + gd->sy - 1;
+			free(cause);
+		} else if (n < 0 && (u_int) -n > gd->hsize)
+			bottom = 0;
+		else
+			bottom = gd->hsize + n;
+		if (bottom > gd->hsize + gd->sy - 1)
+			bottom = gd->hsize + gd->sy - 1;
+	}
 
 	if (bottom < top) {
 		tmp = bottom;
@@ -159,56 +188,52 @@ cmd_capture_pane_history(struct args *args, struct cmd_q *cmdq,
 	return (buf);
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_capture_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_capture_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
 	struct client		*c;
-	struct window_pane	*wp;
+	struct window_pane	*wp = item->state.tflag.wp;
 	char			*buf, *cause;
-	int			 buffer;
+	const char		*bufname;
-	u_int			 limit;
 	size_t			 len;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
+	if (self->entry == &cmd_clear_history_entry) {
-		return (CMD_RETURN_ERROR);
+		if (wp->mode == &window_copy_mode)
+			window_pane_reset_mode(wp);
+		grid_clear_history(wp->base.grid);
+		return (CMD_RETURN_NORMAL);
+	}
 
 	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);
+		buf = cmd_capture_pane_history(args, item, wp, &len);
 	if (buf == NULL)
 		return (CMD_RETURN_ERROR);
 
 	if (args_has(args, 'p')) {
-		c = cmdq->client;
+		c = item->client;
 		if (c == NULL ||
 		    (c->session != NULL && !(c->flags & CLIENT_CONTROL))) {
-			cmdq_error(cmdq, "can't write to stdout");
+			cmdq_error(item, "can't write to stdout");
+			free(buf);
 			return (CMD_RETURN_ERROR);
 		}
 		evbuffer_add(c->stdout_data, buf, len);
+		free(buf);
 		if (args_has(args, 'P') && len > 0)
 		    evbuffer_add(c->stdout_data, "\n", 1);
-		server_push_stdout(c);
+		server_client_push_stdout(c);
 	} else {
-		limit = options_get_number(&global_options, "buffer-limit");
+		bufname = NULL;
-		if (!args_has(args, 'b')) {
+		if (args_has(args, 'b'))
-			paste_add(&global_buffers, buf, len, limit);
+			bufname = args_get(args, 'b');
-			return (CMD_RETURN_NORMAL);
-		}
 
-		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
+		if (paste_set(buf, len, bufname, &cause) != 0) {
-		if (cause != NULL) {
+			cmdq_error(item, "%s", cause);
-			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);
 		}

cmd-choose-buffer.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@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
@@ -27,42 +27,46 @@
  * Enter choice mode to choose a buffer.
  */
 
-enum cmd_retval	 cmd_choose_buffer_exec(struct cmd *, struct cmd_q *);
+#define CHOOSE_BUFFER_TEMPLATE						\
+	"#{buffer_name}: #{buffer_size} bytes: #{buffer_sample}"
+
+static enum cmd_retval	cmd_choose_buffer_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_choose_buffer_entry = {
-	"choose-buffer", NULL,
+	.name = "choose-buffer",
-	"F:t:", 0, 1,
+	.alias = NULL,
-	CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
+
-	0,
+	.args = { "F:t:", 0, 1 },
-	NULL,
+	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
-	NULL,
+
-	cmd_choose_buffer_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_choose_buffer_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_choose_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
-	struct client			*c;
+	struct client			*c = item->state.c;
+	struct winlink			*wl = item->state.tflag.wl;
 	struct window_choose_data	*cdata;
-	struct winlink			*wl;
 	struct paste_buffer		*pb;
 	char				*action, *action_data;
 	const char			*template;
 	u_int				 idx;
 
-	if ((c = cmd_current_client(cmdq)) == NULL) {
+	if (c == NULL) {
-		cmdq_error(cmdq, "no client available");
+		cmdq_error(item, "no client available");
 		return (CMD_RETURN_ERROR);
 	}
 
 	if ((template = args_get(args, 'F')) == NULL)
 		template = CHOOSE_BUFFER_TEMPLATE;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
+	if (paste_get_top(NULL) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	if (paste_get_top(&global_buffers) == NULL)
 		return (CMD_RETURN_NORMAL);
 
 	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
@@ -74,19 +78,20 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		action = xstrdup("paste-buffer -b '%%'");
 
 	idx = 0;
-	while ((pb = paste_walk_stack(&global_buffers, &idx)) != NULL) {
+	pb = NULL;
+	while ((pb = paste_walk(pb)) != NULL) {
 		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
-		cdata->idx = idx - 1;
+		cdata->idx = idx;
 
 		cdata->ft_template = xstrdup(template);
-		format_add(cdata->ft, "line", "%u", idx - 1);
+		format_defaults_paste_buffer(cdata->ft, pb);
-		format_paste_buffer(cdata->ft, pb);
 
-		xasprintf(&action_data, "%u", idx - 1);
+		xasprintf(&action_data, "%s", paste_buffer_name(pb));
 		cdata->command = cmd_template_replace(action, action_data, 1);
 		free(action_data);
 
 		window_choose_add(wl->window->active, cdata);
+		idx++;
 	}
 	free(action);
 

cmd-choose-client.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -27,44 +27,51 @@
  * Enter choice mode to choose a client.
  */
 
-enum cmd_retval	 cmd_choose_client_exec(struct cmd *, struct cmd_q *);
+#define CHOOSE_CLIENT_TEMPLATE					\
+	"#{client_name}: #{session_name} "			\
+	"[#{client_width}x#{client_height} #{client_termname}]"	\
+	"#{?client_utf8, (utf8),}#{?client_readonly, (ro),} "	\
+	"(last used #{t:client_activity})"
 
-void	cmd_choose_client_callback(struct window_choose_data *);
+static enum cmd_retval	cmd_choose_client_exec(struct cmd *,
+			    struct cmdq_item *);
+
+static void	cmd_choose_client_callback(struct window_choose_data *);
 
 const struct cmd_entry cmd_choose_client_entry = {
-	"choose-client", NULL,
+	.name = "choose-client",
-	"F:t:", 0, 1,
+	.alias = NULL,
-	CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
+
-	0,
+	.args = { "F:t:", 0, 1 },
-	NULL,
+	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
-	NULL,
+
-	cmd_choose_client_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_choose_client_exec
 };
 
 struct cmd_choose_client_data {
 	struct client	*client;
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_choose_client_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
-	struct client			*c;
+	struct client			*c = item->state.c;
 	struct client			*c1;
 	struct window_choose_data	*cdata;
-	struct winlink			*wl;
+	struct winlink			*wl = item->state.tflag.wl;
 	const char			*template;
 	char				*action;
-	u_int			 	 i, idx, cur;
+	u_int			 	 idx, cur;
 
-	if ((c = cmd_current_client(cmdq)) == NULL) {
+	if (c == NULL) {
-		cmdq_error(cmdq, "no client available");
+		cmdq_error(item, "no client available");
 		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);
 
@@ -77,25 +84,24 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq)
 		action = xstrdup("detach-client -t '%%'");
 
 	cur = idx = 0;
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+	TAILQ_FOREACH(c1, &clients, entry) {
-		c1 = ARRAY_ITEM(&clients, i);
+		if (c1->session == NULL)
-		if (c1 == NULL || c1->session == NULL || c1->tty.path == NULL)
 			continue;
-		if (c1 == cmdq->client)
+		if (c1 == item->client)
 			cur = idx;
-		idx++;
 
 		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
-		cdata->idx = i;
+		cdata->idx = idx;
 
 		cdata->ft_template = xstrdup(template);
-		format_add(cdata->ft, "line", "%u", i);
+		format_add(cdata->ft, "line", "%u", idx);
-		format_session(cdata->ft, c1->session);
+		format_defaults(cdata->ft, c1, NULL, NULL, NULL);
-		format_client(cdata->ft, c1);
 
-		cdata->command = cmd_template_replace(action, c1->tty.path, 1);
+		cdata->command = cmd_template_replace(action, c1->name, 1);
 
 		window_choose_add(wl->window->active, cdata);
+
+		idx++;
 	}
 	free(action);
 
@@ -105,19 +111,23 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq)
 	return (CMD_RETURN_NORMAL);
 }
 
-void
+static void
 cmd_choose_client_callback(struct window_choose_data *cdata)
 {
 	struct client  	*c;
+	u_int		 idx;
 
 	if (cdata == NULL)
 		return;
 	if (cdata->start_client->flags & CLIENT_DEAD)
 		return;
 
-	if (cdata->idx > ARRAY_LENGTH(&clients) - 1)
+	idx = 0;
-		return;
+	TAILQ_FOREACH(c, &clients, entry) {
-	c = ARRAY_ITEM(&clients, cdata->idx);
+		if (idx == cdata->idx)
+			break;
+		idx++;
+	}
 	if (c == NULL || c->session == NULL)
 		return;
 

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-tree.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2012 Thomas Adam <thomas@xteddy.org>
@@ -32,46 +32,64 @@
  * Enter choice mode to choose a session and/or window.
  */
 
-enum cmd_retval	cmd_choose_tree_exec(struct cmd *, struct cmd_q *);
+#define CHOOSE_TREE_SESSION_TEMPLATE				\
+	"#{session_name}: #{session_windows} windows"		\
+	"#{?session_grouped, (group ,}"				\
+	"#{session_group}#{?session_grouped,),}"		\
+	"#{?session_attached, (attached),}"
+#define CHOOSE_TREE_WINDOW_TEMPLATE				\
+	"#{window_index}: #{window_name}#{window_flags} "	\
+	"\"#{pane_title}\""
+
+static enum cmd_retval	cmd_choose_tree_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_choose_tree_entry = {
-	"choose-tree", NULL,
+	.name = "choose-tree",
-	"S:W:swub:c:t:", 0, 1,
+	.alias = NULL,
-	"[-suw] [-b session-template] [-c window template] [-S format] " \
+
-	"[-W format] " CMD_TARGET_WINDOW_USAGE,
+	.args = { "S:W:swub:c:t:", 0, 1 },
-	0,
+	.usage = "[-suw] [-b session-template] [-c window template] "
-	NULL,
+		 "[-S format] [-W format] " CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_choose_tree_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_choose_tree_exec
 };
 
 const struct cmd_entry cmd_choose_session_entry = {
-	"choose-session", NULL,
+	.name = "choose-session",
-	"F:t:", 0, 1,
+	.alias = NULL,
-	CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
+
-	0,
+	.args = { "F:t:", 0, 1 },
-	NULL,
+	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
-	NULL,
+
-	cmd_choose_tree_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_choose_tree_exec
 };
 
 const struct cmd_entry cmd_choose_window_entry = {
-	"choose-window", NULL,
+	.name = "choose-window",
-	"F:t:", 0, 1,
+	.alias = NULL,
-	CMD_TARGET_WINDOW_USAGE "[-F format] [template]",
+
-	0,
+	.args = { "F:t:", 0, 1 },
-	NULL,
+	.usage = CMD_TARGET_WINDOW_USAGE "[-F format] [template]",
-	NULL,
+
-	cmd_choose_tree_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_choose_tree_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_choose_tree_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
-	struct winlink			*wl, *wm;
+	struct client			*c = item->state.c;
-	struct session			*s, *s2;
+	struct winlink			*wl = item->state.tflag.wl, *wm;
-	struct client			*c;
+	struct session			*s = item->state.tflag.s, *s2;
 	struct window_choose_data	*wcd = NULL;
 	const char			*ses_template, *win_template;
 	char				*final_win_action, *cur_win_template;
@@ -84,17 +102,11 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq)
 	ses_template = win_template = NULL;
 	ses_action = win_action = NULL;
 
-	if ((c = cmd_current_client(cmdq)) == NULL) {
+	if (c == NULL) {
-		cmdq_error(cmdq, "no client available");
+		cmdq_error(item, "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);
 
@@ -232,8 +244,10 @@ windows_only:
 
 	window_choose_ready(wl->window->active, cur_win, NULL);
 
-	if (args_has(args, 'u'))
+	if (args_has(args, 'u')) {
 		window_choose_expand_all(wl->window->active);
+		window_choose_set_current(wl->window->active, cur_win);
+	}
 
 	return (CMD_RETURN_NORMAL);
 }

cmd-clear-history.c

@@ -1,54 +0,0 @@
-/* $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 "tmux.h"
-
-/*
- * Clear pane history.
- */
-
-enum cmd_retval	 cmd_clear_history_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_clear_history_entry = {
-	"clear-history", "clearhist",
-	"t:", 0, 0,
-	CMD_TARGET_PANE_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_clear_history_exec
-};
-
-enum cmd_retval
-cmd_clear_history_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args		*args = self->args;
-	struct window_pane	*wp;
-	struct grid		*gd;
-
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
-	gd = wp->base.grid;
-
-	grid_move_lines(gd, 0, gd->hsize, gd->sy);
-	gd->hsize = 0;
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-command-prompt.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@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
@@ -29,85 +29,64 @@
  * Prompt for command in client.
  */
 
-void	cmd_command_prompt_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_command_prompt_exec(struct cmd *,
-int	cmd_command_prompt_check(struct args *);
+			    struct cmdq_item *);
-enum cmd_retval	cmd_command_prompt_exec(struct cmd *, struct cmd_q *);
 
-int	cmd_command_prompt_callback(void *, const char *);
+static int	cmd_command_prompt_callback(void *, const char *, int);
-void	cmd_command_prompt_free(void *);
+static void	cmd_command_prompt_free(void *);
 
 const struct cmd_entry cmd_command_prompt_entry = {
-	"command-prompt", NULL,
+	.name = "command-prompt",
-	"I:p:t:", 0, 1,
+	.alias = NULL,
-	"[-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " [template]",
+
-	0,
+	.args = { "1iI:Np:t:", 0, 1 },
-	cmd_command_prompt_key_binding,
+	.usage = "[-1Ni] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " "
-	NULL,
+		 "[template]",
-	cmd_command_prompt_exec
+
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
+	.exec = cmd_command_prompt_exec
 };
 
 struct cmd_command_prompt_cdata {
 	struct client	*c;
+	int		 flags;
+
 	char		*inputs;
 	char		*next_input;
-	char		*next_prompt;
+
 	char		*prompts;
+	char		*next_prompt;
+
 	char		*template;
 	int		 idx;
 };
 
-void
+static enum cmd_retval
-cmd_command_prompt_key_binding(struct cmd *self, int key)
+cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
-{
-	switch (key) {
-	case '$':
-		self->args = args_create(1, "rename-session '%%'");
-		args_set(self->args, 'I', "#S");
-		break;
-	case ',':
-		self->args = args_create(1, "rename-window '%%'");
-		args_set(self->args, 'I', "#W");
-		break;
-	case '.':
-		self->args = args_create(1, "move-window -t '%%'");
-		break;
-	case 'f':
-		self->args = args_create(1, "find-window '%%'");
-		break;
-	case '\'':
-		self->args = args_create(1, "select-window -t ':%%'");
-		args_set(self->args, 'p', "index");
-		break;
-	default:
-		self->args = args_create(0);
-		break;
-	}
-}
-
-enum cmd_retval
-cmd_command_prompt_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args			*args = self->args;
 	const char			*inputs, *prompts;
 	struct cmd_command_prompt_cdata	*cdata;
-	struct client			*c;
+	struct client			*c = item->state.c;
 	char				*prompt, *ptr, *input = NULL;
 	size_t				 n;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-
 	if (c->prompt_string != NULL)
 		return (CMD_RETURN_NORMAL);
 
-	cdata = xmalloc(sizeof *cdata);
+	cdata = xcalloc(1, sizeof *cdata);
 	cdata->c = c;
-	cdata->idx = 1;
+
 	cdata->inputs = NULL;
 	cdata->next_input = NULL;
-	cdata->next_prompt = NULL;
+
 	cdata->prompts = NULL;
+	cdata->next_prompt = NULL;
+
 	cdata->template = NULL;
+	cdata->idx = 1;
 
 	if (args->argc != 0)
 		cdata->template = xstrdup(args->argv[0]);
@@ -137,34 +116,56 @@ cmd_command_prompt_exec(struct cmd *self, struct cmd_q *cmdq)
 		input = strsep(&cdata->next_input, ",");
 	}
 
+	if (args_has(args, '1'))
+		cdata->flags |= PROMPT_SINGLE;
+	else if (args_has(args, 'N'))
+		cdata->flags |= PROMPT_NUMERIC;
+	else if (args_has(args, 'i'))
+		cdata->flags |= PROMPT_INCREMENTAL;
 	status_prompt_set(c, prompt, input, cmd_command_prompt_callback,
-	    cmd_command_prompt_free, cdata, 0);
+	    cmd_command_prompt_free, cdata, cdata->flags);
 	free(prompt);
 
 	return (CMD_RETURN_NORMAL);
 }
 
-int
+static enum cmd_retval
-cmd_command_prompt_callback(void *data, const char *s)
+cmd_command_prompt_error(struct cmdq_item *item, void *data)
+{
+	char	*error = data;
+
+	cmdq_error(item, "%s", error);
+	free(error);
+
+	return (CMD_RETURN_NORMAL);
+}
+
+static int
+cmd_command_prompt_callback(void *data, const char *s, int done)
 {
 	struct cmd_command_prompt_cdata	*cdata = data;
 	struct client			*c = cdata->c;
 	struct cmd_list			*cmdlist;
+	struct cmdq_item		*new_item;
 	char				*cause, *new_template, *prompt, *ptr;
 	char				*input = NULL;
 
 	if (s == NULL)
 		return (0);
+	if (done && (cdata->flags & PROMPT_INCREMENTAL))
+		return (0);
 
 	new_template = cmd_template_replace(cdata->template, s, cdata->idx);
-	free(cdata->template);
+	if (done) {
-	cdata->template = new_template;
+		free(cdata->template);
+		cdata->template = new_template;
+	}
 
 	/*
 	 * Check if there are more prompts; if so, get its respective input
 	 * and update the prompt data.
 	 */
-	if ((ptr = strsep(&cdata->next_prompt, ",")) != NULL) {
+	if (done && (ptr = strsep(&cdata->next_prompt, ",")) != NULL) {
 		xasprintf(&prompt, "%s ", ptr);
 		input = strsep(&cdata->next_input, ",");
 		status_prompt_update(c, prompt, input);
@@ -174,24 +175,29 @@ cmd_command_prompt_callback(void *data, const char *s)
 		return (1);
 	}
 
-	if (cmd_string_parse(new_template, &cmdlist, NULL, 0, &cause) != 0) {
+	cmdlist = cmd_string_parse(new_template, NULL, 0, &cause);
+	if (cmdlist == NULL) {
 		if (cause != NULL) {
-			*cause = toupper((u_char) *cause);
+			new_item = cmdq_get_callback(cmd_command_prompt_error,
-			status_message_set(c, "%s", cause);
+			    cause);
-			free(cause);
+		} else
-		}
+			new_item = NULL;
-		return (0);
+	} else {
+		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
+		cmd_list_free(cmdlist);
 	}
 
-	cmdq_run(c->cmdq, cmdlist);
+	if (new_item != NULL)
-	cmd_list_free(cmdlist);
+		cmdq_append(c, new_item);
 
-	if (c->prompt_callbackfn != (void *) &cmd_command_prompt_callback)
+	if (!done)
+		free(new_template);
+	if (c->prompt_callbackfn != (void *)&cmd_command_prompt_callback)
 		return (1);
 	return (0);
 }
 
-void
+static void
 cmd_command_prompt_free(void *data)
 {
 	struct cmd_command_prompt_cdata	*cdata = data;

cmd-confirm-before.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -16,6 +16,8 @@
  * 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>
@@ -26,20 +28,23 @@
  * Asks for confirmation before executing a command.
  */
 
-void		 cmd_confirm_before_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_confirm_before_exec(struct cmd *,
-enum cmd_retval	 cmd_confirm_before_exec(struct cmd *, struct cmd_q *);
+			    struct cmdq_item *);
 
-int		 cmd_confirm_before_callback(void *, const char *);
+static int	cmd_confirm_before_callback(void *, const char *, int);
-void		 cmd_confirm_before_free(void *);
+static void	cmd_confirm_before_free(void *);
 
 const struct cmd_entry cmd_confirm_before_entry = {
-	"confirm-before", "confirm",
+	.name = "confirm-before",
-	"p:t:", 1, 1,
+	.alias = "confirm",
-	"[-p prompt] " CMD_TARGET_CLIENT_USAGE " command",
+
-	0,
+	.args = { "p:t:", 1, 1 },
-	cmd_confirm_before_key_binding,
+	.usage = "[-p prompt] " CMD_TARGET_CLIENT_USAGE " command",
-	NULL,
+
-	cmd_confirm_before_exec
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
+	.exec = cmd_confirm_before_exec
 };
 
 struct cmd_confirm_before_data {
@@ -47,36 +52,15 @@ struct cmd_confirm_before_data {
 	struct client	*client;
 };
 
-void
+static enum cmd_retval
-cmd_confirm_before_key_binding(struct cmd *self, int key)
+cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
-{
-	switch (key) {
-	case '&':
-		self->args = args_create(1, "kill-window");
-		args_set(self->args, 'p', "kill-window #W? (y/n)");
-		break;
-	case 'x':
-		self->args = args_create(1, "kill-pane");
-		args_set(self->args, 'p', "kill-pane #P? (y/n)");
-		break;
-	default:
-		self->args = args_create(0);
-		break;
-	}
-}
-
-enum cmd_retval
-cmd_confirm_before_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args			*args = self->args;
 	struct cmd_confirm_before_data	*cdata;
-	struct client			*c;
+	struct client			*c = item->state.c;
 	char				*cmd, *copy, *new_prompt, *ptr;
 	const char			*prompt;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-
 	if ((prompt = args_get(args, 'p')) != NULL)
 		xasprintf(&new_prompt, "%s ", prompt);
 	else {
@@ -100,12 +84,24 @@ cmd_confirm_before_exec(struct cmd *self, struct cmd_q *cmdq)
 	return (CMD_RETURN_NORMAL);
 }
 
-int
+static enum cmd_retval
-cmd_confirm_before_callback(void *data, const char *s)
+cmd_confirm_before_error(struct cmdq_item *item, void *data)
+{
+	char	*error = data;
+
+	cmdq_error(item, "%s", error);
+	free(error);
+
+	return (CMD_RETURN_NORMAL);
+}
+
+static int
+cmd_confirm_before_callback(void *data, const char *s, __unused int done)
 {
 	struct cmd_confirm_before_data	*cdata = data;
 	struct client			*c = cdata->client;
 	struct cmd_list			*cmdlist;
+	struct cmdq_item		*new_item;
 	char				*cause;
 
 	if (c->flags & CLIENT_DEAD)
@@ -116,27 +112,31 @@ cmd_confirm_before_callback(void *data, const char *s)
 	if (tolower((u_char) s[0]) != 'y' || s[1] != '\0')
 		return (0);
 
-	if (cmd_string_parse(cdata->cmd, &cmdlist, NULL, 0, &cause) != 0) {
+	cmdlist = cmd_string_parse(cdata->cmd, NULL, 0, &cause);
+	if (cmdlist == NULL) {
 		if (cause != NULL) {
-			cmdq_error(c->cmdq, "%s", cause);
+			new_item = cmdq_get_callback(cmd_confirm_before_error,
-			free(cause);
+			    cause);
-		}
+		} else
-		return (0);
+			new_item = NULL;
+	} else {
+		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
+		cmd_list_free(cmdlist);
 	}
 
-	cmdq_run(c->cmdq, cmdlist);
+	if (new_item != NULL)
-	cmd_list_free(cmdlist);
+		cmdq_append(c, new_item);
 
 	return (0);
 }
 
-void
+static void
 cmd_confirm_before_free(void *data)
 {
 	struct cmd_confirm_before_data	*cdata = data;
 	struct client			*c = cdata->client;
 
-	c->references--;
+	server_client_unref(c);
 
 	free(cdata->cmd);
 	free(cdata);

cmd-copy-mode.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -21,44 +21,69 @@
 #include "tmux.h"
 
 /*
- * Enter copy mode.
+ * Enter copy or clock mode.
  */
 
-void		 cmd_copy_mode_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_copy_mode_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_copy_mode_exec(struct cmd *, struct cmd_q *);
 
 const struct cmd_entry cmd_copy_mode_entry = {
-	"copy-mode", NULL,
+	.name = "copy-mode",
-	"t:u", 0, 0,
+	.alias = NULL,
-	"[-u] " CMD_TARGET_PANE_USAGE,
+
-	0,
+	.args = { "Met:u", 0, 0 },
-	cmd_copy_mode_key_binding,
+	.usage = "[-Mu] " CMD_TARGET_PANE_USAGE,
-	NULL,
+
-	cmd_copy_mode_exec
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_copy_mode_exec
 };
 
-void
+const struct cmd_entry cmd_clock_mode_entry = {
-cmd_copy_mode_key_binding(struct cmd *self, int key)
+	.name = "clock-mode",
-{
+	.alias = NULL,
-	self->args = args_create(0);
-	if (key == KEYC_PPAGE)
-		args_set(self->args, 'u', NULL);
-}
 
-enum cmd_retval
+	.args = { "t:", 0, 0 },
-cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
+	.usage = CMD_TARGET_PANE_USAGE,
+
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_copy_mode_exec
+};
+
+static enum cmd_retval
+cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct window_pane	*wp;
+	struct client		*c = item->client;
+	struct session		*s;
+	struct window_pane	*wp = item->state.tflag.wp;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
+	if (args_has(args, 'M')) {
-		return (CMD_RETURN_ERROR);
+		if ((wp = cmd_mouse_pane(&item->mouse, &s, NULL)) == NULL)
+			return (CMD_RETURN_NORMAL);
+		if (c == NULL || c->session != s)
+			return (CMD_RETURN_NORMAL);
+	}
 
-	if (window_pane_set_mode(wp, &window_copy_mode) != 0)
+	if (self->entry == &cmd_clock_mode_entry) {
+		window_pane_set_mode(wp, &window_clock_mode);
 		return (CMD_RETURN_NORMAL);
-	window_copy_init_from_pane(wp);
+	}
+
+	if (wp->mode != &window_copy_mode) {
+		if (window_pane_set_mode(wp, &window_copy_mode) != 0)
+			return (CMD_RETURN_NORMAL);
+		window_copy_init_from_pane(wp, args_has(self->args, 'e'));
+	}
+	if (args_has(args, 'M')) {
+		if (wp->mode != NULL && wp->mode != &window_copy_mode)
+			return (CMD_RETURN_NORMAL);
+		window_copy_start_drag(c, &item->mouse);
+	}
 	if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
-		window_copy_pageup(wp);
+		window_copy_pageup(wp, 0);
 
 	return (CMD_RETURN_NORMAL);
 }

cmd-delete-buffer.c

@@ -1,66 +0,0 @@
-/* $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 <stdlib.h>
-
-#include "tmux.h"
-
-/*
- * Delete a paste buffer.
- */
-
-enum cmd_retval	 cmd_delete_buffer_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_delete_buffer_entry = {
-	"delete-buffer", "deleteb",
-	"b:", 0, 0,
-	CMD_BUFFER_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_delete_buffer_exec
-};
-
-enum cmd_retval
-cmd_delete_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args	*args = self->args;
-	char		*cause;
-	int		 buffer;
-
-	if (!args_has(args, 'b')) {
-		paste_free_top(&global_buffers);
-		return (CMD_RETURN_NORMAL);
-	}
-
-	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
-	if (cause != NULL) {
-		cmdq_error(cmdq, "buffer %s", cause);
-		free(cause);
-		return (CMD_RETURN_ERROR);
-	}
-
-	if (paste_free_index(&global_buffers, buffer) != 0) {
-		cmdq_error(cmdq, "no buffer %d", buffer);
-		return (CMD_RETURN_ERROR);
-	}
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-detach-client.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -18,32 +18,60 @@
 
 #include <sys/types.h>
 
+#include <string.h>
+
 #include "tmux.h"
 
 /*
  * Detach a client.
  */
 
-enum cmd_retval	 cmd_detach_client_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_detach_client_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_detach_client_entry = {
-	"detach-client", "detach",
+	.name = "detach-client",
-	"as:t:P", 0, 0,
+	.alias = "detach",
-	"[-P] [-a] [-s target-session] " CMD_TARGET_CLIENT_USAGE,
+
-	CMD_READONLY,
+	.args = { "aE:s:t:P", 0, 0 },
-	NULL,
+	.usage = "[-aP] [-E shell-command] "
-	NULL,
+	         "[-s target-session] " CMD_TARGET_CLIENT_USAGE,
-	cmd_detach_client_exec
+
+	.sflag = CMD_SESSION,
+	.tflag = CMD_CLIENT,
+
+	.flags = CMD_READONLY,
+	.exec = cmd_detach_client_exec
 };
 
-enum cmd_retval
+const struct cmd_entry cmd_suspend_client_entry = {
-cmd_detach_client_exec(struct cmd *self, struct cmd_q *cmdq)
+	.name = "suspend-client",
+	.alias = "suspendc",
+
+	.args = { "t:", 0, 0 },
+	.usage = CMD_TARGET_CLIENT_USAGE,
+
+	.tflag = CMD_CLIENT,
+
+	.flags = 0,
+	.exec = cmd_detach_client_exec
+};
+
+static enum cmd_retval
+cmd_detach_client_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct client	*c, *c2;
+	struct client	*c = item->state.c, *cloop;
-	struct session 	*s;
+	struct session	*s;
-	enum msgtype     msgtype;
+	enum msgtype	 msgtype;
-	u_int 		 i;
+	const char	*cmd = args_get(args, 'E');
+
+	if (self->entry == &cmd_suspend_client_entry) {
+		tty_stop_tty(&c->tty);
+		c->flags |= CLIENT_SUSPENDED;
+		proc_send(c->peer, MSG_SUSPEND, -1, NULL, 0);
+		return (CMD_RETURN_NORMAL);
+	}
 
 	if (args_has(args, 'P'))
 		msgtype = MSG_DETACHKILL;
@@ -51,30 +79,33 @@ 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 = item->state.sflag.s;
-		if (s == NULL)
+		TAILQ_FOREACH(cloop, &clients, entry) {
-			return (CMD_RETURN_ERROR);
+			if (cloop->session == s) {
-
+				if (cmd != NULL)
-		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+					server_client_exec(cloop, cmd);
-			c = ARRAY_ITEM(&clients, i);
+				else
-			if (c != NULL && c->session == s)
+					server_client_detach(cloop, msgtype);
-				server_write_client(c, msgtype, NULL, 0);
-		}
-	} else {
-		c = cmd_find_client(cmdq, args_get(args, 't'), 0);
-		if (c == NULL)
-			return (CMD_RETURN_ERROR);
-
-		if (args_has(args, 'a')) {
-			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);
 	}
 
+	if (args_has(args, 'a')) {
+		TAILQ_FOREACH(cloop, &clients, entry) {
+			if (cloop->session != NULL && cloop != c) {
+				if (cmd != NULL)
+					server_client_exec(cloop, cmd);
+				else
+					server_client_detach(cloop, msgtype);
+			}
+		}
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (cmd != NULL)
+		server_client_exec(c, cmd);
+	else
+		server_client_detach(c, msgtype);
 	return (CMD_RETURN_STOP);
 }

cmd-display-message.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -27,84 +27,62 @@
  * Displays a message in the status line.
  */
 
-enum cmd_retval	 cmd_display_message_exec(struct cmd *, struct cmd_q *);
+#define DISPLAY_MESSAGE_TEMPLATE			\
+	"[#{session_name}] #{window_index}:"		\
+	"#{window_name}, current pane #{pane_index} "	\
+	"- (%H:%M %d-%b-%y)"
+
+static enum cmd_retval	cmd_display_message_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_display_message_entry = {
-	"display-message", "display",
+	.name = "display-message",
-	"c:pt:F:", 0, 1,
+	.alias = "display",
-	"[-p] [-c target-client] [-F format] " CMD_TARGET_PANE_USAGE
+
-	" [message]",
+	.args = { "c:pt:F:", 0, 1 },
-	0,
+	.usage = "[-p] [-c target-client] [-F format] "
-	NULL,
+		 CMD_TARGET_PANE_USAGE " [message]",
-	NULL,
+
-	cmd_display_message_exec
+	.cflag = CMD_CLIENT_CANFAIL,
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_display_message_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct client		*c;
+	struct client		*c = item->state.c;
-	struct session		*s;
+	struct session		*s = item->state.tflag.s;
-	struct winlink		*wl;
+	struct winlink		*wl = item->state.tflag.wl;
-	struct window_pane	*wp;
+	struct window_pane	*wp = item->state.tflag.wp;
 	const char		*template;
 	char			*msg;
 	struct format_tree	*ft;
-	char			 out[BUFSIZ];
-	time_t			 t;
-	size_t			 len;
-
-	if (args_has(args, 't')) {
-		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-	} else {
-		wl = cmd_find_pane(cmdq, NULL, &s, &wp);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-	}
 
 	if (args_has(args, 'F') && args->argc != 0) {
-		cmdq_error(cmdq, "only one of -F or argument must be given");
+		cmdq_error(item, "only one of -F or argument must be given");
 		return (CMD_RETURN_ERROR);
 	}
 
-	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();
+	ft = format_create(item, FORMAT_NONE, 0);
-	if (c != NULL)
+	format_defaults(ft, c, s, wl, wp);
-		format_client(ft, c);
-	format_session(ft, s);
-	format_winlink(ft, s, wl);
-	format_window_pane(ft, wp);
 
-	t = time(NULL);
+	msg = format_expand_time(ft, template, 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);
+		cmdq_print(item, "%s", msg);
-	else
+	else if (c != NULL)
 		status_message_set(c, "%s", msg);
 	free(msg);
+
 	format_free(ft);
 
 	return (CMD_RETURN_NORMAL);

cmd-display-panes.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -18,34 +18,98 @@
 
 #include <sys/types.h>
 
+#include <ctype.h>
+#include <stdlib.h>
+
 #include "tmux.h"
 
 /*
  * Display panes on a client.
  */
 
-enum cmd_retval	 cmd_display_panes_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_display_panes_exec(struct cmd *,
+			    struct cmdq_item *);
+
+static void		cmd_display_panes_callback(struct client *,
+			    struct window_pane *);
 
 const struct cmd_entry cmd_display_panes_entry = {
-	"display-panes", "displayp",
+	.name = "display-panes",
-	"t:", 0, 0,
+	.alias = "displayp",
-	CMD_TARGET_CLIENT_USAGE,
+
-	0,
+	.args = { "t:", 0, 1 },
-	NULL,
+	.usage = CMD_TARGET_CLIENT_USAGE,
-	NULL,
+
-	cmd_display_panes_exec
+	.tflag = CMD_CLIENT,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_display_panes_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_display_panes_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct client	*c;
+	struct client	*c = item->state.c;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	if (c->identify_callback != NULL)
-		return (CMD_RETURN_ERROR);
+		return (CMD_RETURN_NORMAL);
 
-	server_set_identify(c);
+	c->identify_callback = cmd_display_panes_callback;
+	if (args->argc != 0)
+		c->identify_callback_data = xstrdup(args->argv[0]);
+	else
+		c->identify_callback_data = xstrdup("select-pane -t '%%'");
+
+	server_client_set_identify(c);
 
 	return (CMD_RETURN_NORMAL);
 }
+
+static enum cmd_retval
+cmd_display_panes_error(struct cmdq_item *item, void *data)
+{
+	char	*error = data;
+
+	cmdq_error(item, "%s", error);
+	free(error);
+
+	return (CMD_RETURN_NORMAL);
+}
+
+static void
+cmd_display_panes_callback(struct client *c, struct window_pane *wp)
+{
+	struct cmd_list		*cmdlist;
+	struct cmdq_item	*new_item;
+	char			*template, *cmd, *expanded, *cause;
+
+	template = c->identify_callback_data;
+	if (wp == NULL)
+		goto out;
+	xasprintf(&expanded, "%%%u", wp->id);
+	cmd = cmd_template_replace(template, expanded, 1);
+
+	cmdlist = cmd_string_parse(cmd, NULL, 0, &cause);
+	if (cmdlist == NULL) {
+		if (cause != NULL) {
+			new_item = cmdq_get_callback(cmd_display_panes_error,
+			    cause);
+		} else
+			new_item = NULL;
+	} else {
+		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
+		cmd_list_free(cmdlist);
+	}
+
+	if (new_item != NULL)
+		cmdq_append(c, new_item);
+
+	free(cmd);
+	free(expanded);
+
+out:
+	free(c->identify_callback_data);
+	c->identify_callback_data = NULL;
+	c->identify_callback = NULL;
+}

cmd-find-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -28,9 +28,14 @@
  * Find window containing text.
  */
 
-enum cmd_retval	 cmd_find_window_exec(struct cmd *, struct cmd_q *);
+#define FIND_WINDOW_TEMPLATE					\
+	"#{window_index}: #{window_name} "			\
+	"[#{window_width}x#{window_height}] "			\
+	"(#{window_panes} panes) #{window_find_matches}"
 
-void	cmd_find_window_callback(struct window_choose_data *);
+static enum cmd_retval	cmd_find_window_exec(struct cmd *, struct cmdq_item *);
+
+static void		cmd_find_window_callback(struct window_choose_data *);
 
 /* Flags for determining matching behavior. */
 #define CMD_FIND_WINDOW_BY_TITLE   0x1
@@ -43,27 +48,31 @@ void	cmd_find_window_callback(struct window_choose_data *);
 	 CMD_FIND_WINDOW_BY_NAME)
 
 const struct cmd_entry cmd_find_window_entry = {
-	"find-window", "findw",
+	.name = "find-window",
-	"F:CNt:T", 1, 4,
+	.alias = "findw",
-	"[-CNT] [-F format] " CMD_TARGET_WINDOW_USAGE " match-string",
+
-	0,
+	.args = { "F:CNt:T", 1, 4 },
-	NULL,
+	.usage = "[-CNT] [-F format] " CMD_TARGET_WINDOW_USAGE " match-string",
-	NULL,
+
-	cmd_find_window_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_find_window_exec
 };
 
 struct cmd_find_window_data {
 	struct winlink	*wl;
 	char		*list_ctx;
 	u_int		 pane_id;
+	TAILQ_ENTRY(cmd_find_window_data) entry;
 };
-ARRAY_DECL(cmd_find_window_data_list, struct cmd_find_window_data);
+TAILQ_HEAD(cmd_find_window_list, cmd_find_window_data);
 
-u_int	cmd_find_window_match_flags(struct args *);
+static u_int	cmd_find_window_match_flags(struct args *);
-void	cmd_find_window_match(struct cmd_find_window_data_list *, int,
+static void	cmd_find_window_match(struct cmd_find_window_list *, int,
-	    struct winlink *, const char *, const char *);
+		    struct winlink *, const char *, const char *);
 
-u_int
+static u_int
 cmd_find_window_match_flags(struct args *args)
 {
 	u_int	match_flags = 0;
@@ -83,16 +92,17 @@ cmd_find_window_match_flags(struct args *args)
 	return (match_flags);
 }
 
-void
+static void
-cmd_find_window_match(struct cmd_find_window_data_list *find_list,
+cmd_find_window_match(struct cmd_find_window_list *find_list,
-    int match_flags, struct winlink *wl, const char *str, const char *searchstr)
+    int match_flags, struct winlink *wl, const char *str,
+    const char *searchstr)
 {
-	struct cmd_find_window_data	 find_data;
+	struct cmd_find_window_data	*find_data;
 	struct window_pane		*wp;
 	u_int				 i, line;
 	char				*sres;
 
-	memset(&find_data, 0, sizeof find_data);
+	find_data = xcalloc(1, sizeof *find_data);
 
 	i = 0;
 	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
@@ -100,53 +110,53 @@ cmd_find_window_match(struct cmd_find_window_data_list *find_list,
 
 		if ((match_flags & CMD_FIND_WINDOW_BY_NAME) &&
 		    fnmatch(searchstr, wl->window->name, 0) == 0) {
-			find_data.list_ctx = xstrdup("");
+			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,
+			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,
+			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;
+	if (find_data->list_ctx != NULL) {
-		find_data.pane_id = i - 1;
+		find_data->wl = wl;
-		ARRAY_ADD(find_list, find_data);
+		find_data->pane_id = i - 1;
-	}
+		TAILQ_INSERT_TAIL(find_list, find_data, entry);
+	} else
+		free(find_data);
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
-	struct client			*c;
+	struct client			*c = item->state.c;
 	struct window_choose_data	*cdata;
-	struct session			*s;
+	struct session			*s = item->state.tflag.s;
-	struct winlink			*wl, *wm;
+	struct winlink			*wl = item->state.tflag.wl, *wm;
-	struct cmd_find_window_data_list find_list;
+	struct cmd_find_window_list	 find_list;
+	struct cmd_find_window_data	*find_data;
+	struct cmd_find_window_data	*find_data1;
 	char				*str, *searchstr;
 	const char			*template;
 	u_int				 i, match_flags;
 
-	if ((c = cmd_current_client(cmdq)) == NULL) {
+	if (c == NULL) {
-		cmdq_error(cmdq, "no client available");
+		cmdq_error(item, "no client available");
 		return (CMD_RETURN_ERROR);
 	}
-	s = c->session;
-
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
 
 	if ((template = args_get(args, 'F')) == NULL)
 		template = FIND_WINDOW_TEMPLATE;
@@ -154,21 +164,20 @@ cmd_find_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	match_flags = cmd_find_window_match_flags(args);
 	str = args->argv[0];
 
-	ARRAY_INIT(&find_list);
+	TAILQ_INIT(&find_list);
 
 	xasprintf(&searchstr, "*%s*", str);
 	RB_FOREACH(wm, winlinks, &s->windows)
-	    cmd_find_window_match (&find_list, match_flags, wm, str, searchstr);
+	    cmd_find_window_match(&find_list, match_flags, wm, str, searchstr);
 	free(searchstr);
 
-	if (ARRAY_LENGTH(&find_list) == 0) {
+	if (TAILQ_EMPTY(&find_list)) {
-		cmdq_error(cmdq, "no windows matching: %s", str);
+		cmdq_error(item, "no windows matching: %s", str);
-		ARRAY_FREE(&find_list);
 		return (CMD_RETURN_ERROR);
 	}
 
-	if (ARRAY_LENGTH(&find_list) == 1) {
+	if (TAILQ_NEXT(TAILQ_FIRST(&find_list), entry) == NULL) {
-		if (session_select(s, ARRAY_FIRST(&find_list).wl->idx) == 0)
+		if (session_select(s, TAILQ_FIRST(&find_list)->wl->idx) == 0)
 			server_redraw_session(s);
 		recalculate_sizes();
 		goto out;
@@ -177,34 +186,37 @@ 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++) {
+	i = 0;
-		wm = ARRAY_ITEM(&find_list, i).wl;
+	TAILQ_FOREACH(find_data, &find_list, entry) {
-
 		cdata = window_choose_data_create(TREE_OTHER, c, c->session);
-		cdata->idx = wm->idx;
+		cdata->idx = find_data->wl->idx;
-		cdata->wl = wm;
+		cdata->wl = find_data->wl;
 
 		cdata->ft_template = xstrdup(template);
-		cdata->pane_id = ARRAY_ITEM(&find_list, i).pane_id;
+		cdata->pane_id = find_data->pane_id;
 
 		format_add(cdata->ft, "line", "%u", i);
 		format_add(cdata->ft, "window_find_matches", "%s",
-		    ARRAY_ITEM(&find_list, i).list_ctx);
+		    find_data->list_ctx);
-		format_session(cdata->ft, s);
+		format_defaults(cdata->ft, NULL, s, find_data->wl, NULL);
-		format_winlink(cdata->ft, s, wm);
-		format_window_pane(cdata->ft, wm->window->active);
 
 		window_choose_add(wl->window->active, cdata);
+
+		i++;
 	}
 
 	window_choose_ready(wl->window->active, 0, cmd_find_window_callback);
 
 out:
-	ARRAY_FREE(&find_list);
+	TAILQ_FOREACH_SAFE(find_data, &find_list, entry, find_data1) {
+		free(find_data->list_ctx);
+		TAILQ_REMOVE(&find_list, find_data, entry);
+		free(find_data);
+	}
 	return (CMD_RETURN_NORMAL);
 }
 
-void
+static void
 cmd_find_window_callback(struct window_choose_data *cdata)
 {
 	struct session		*s;

cmd-if-shell.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -29,148 +29,174 @@
  * Executes a tmux command if a shell command returns true or false.
  */
 
-enum cmd_retval	 cmd_if_shell_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_if_shell_exec(struct cmd *, struct cmdq_item *);
 
-void	cmd_if_shell_callback(struct job *);
+static enum cmd_retval	cmd_if_shell_error(struct cmdq_item *, void *);
-void	cmd_if_shell_done(struct cmd_q *);
+static void		cmd_if_shell_callback(struct job *);
-void	cmd_if_shell_free(void *);
+static void		cmd_if_shell_free(void *);
 
 const struct cmd_entry cmd_if_shell_entry = {
-	"if-shell", "if",
+	.name = "if-shell",
-	"bt:", 2, 3,
+	.alias = "if",
-	"[-b] " CMD_TARGET_PANE_USAGE " shell-command command [command]",
+
-	0,
+	.args = { "bFt:", 2, 3 },
-	NULL,
+	.usage = "[-bF] " CMD_TARGET_PANE_USAGE " shell-command command "
-	NULL,
+		 "[command]",
-	cmd_if_shell_exec
+
+	.tflag = CMD_PANE_CANFAIL,
+
+	.flags = 0,
+	.exec = cmd_if_shell_exec
 };
 
 struct cmd_if_shell_data {
-	char		*cmd_if;
+	char			*file;
-	char		*cmd_else;
+	u_int			 line;
-	struct cmd_q	*cmdq;
+
-	int		 bflag;
+	char			*cmd_if;
-	int		 started;
+	char			*cmd_else;
+
+	struct client		*client;
+	struct cmdq_item	*item;
+	struct mouse_event	 mouse;
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
 	struct cmd_if_shell_data	*cdata;
-	char				*shellcmd;
+	char				*shellcmd, *cmd, *cause;
-	struct client			*c;
+	struct cmd_list			*cmdlist;
-	struct session			*s = NULL;
+	struct cmdq_item		*new_item;
-	struct winlink			*wl = NULL;
+	struct client			*c = item->state.c;
-	struct window_pane		*wp = NULL;
+	struct session			*s = item->state.tflag.s;
-	struct format_tree		*ft;
+	struct winlink			*wl = item->state.tflag.wl;
+	struct window_pane		*wp = item->state.tflag.wp;
+	const char			*cwd;
 
-	if (args_has(args, 't'))
+	if (item->client != NULL && item->client->session == NULL)
-		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
+		cwd = item->client->cwd;
-	else {
+	else if (s != NULL)
-		c = cmd_find_client(cmdq, NULL, 1);
+		cwd = s->cwd;
-		if (c != NULL && c->session != NULL) {
+	else
-			s = c->session;
+		cwd = NULL;
-			wl = s->curw;
+
-			wp = wl->window->active;
+	shellcmd = format_single(item, args->argv[0], c, s, wl, wp);
+	if (args_has(args, 'F')) {
+		cmd = NULL;
+		if (*shellcmd != '0' && *shellcmd != '\0')
+			cmd = args->argv[1];
+		else if (args->argc == 3)
+			cmd = args->argv[2];
+		free(shellcmd);
+		if (cmd == NULL)
+			return (CMD_RETURN_NORMAL);
+		cmdlist = cmd_string_parse(cmd, NULL, 0, &cause);
+		if (cmdlist == NULL) {
+			if (cause != NULL) {
+				cmdq_error(item, "%s", cause);
+				free(cause);
+			}
+			return (CMD_RETURN_ERROR);
 		}
+		new_item = cmdq_get_command(cmdlist, NULL, &item->mouse, 0);
+		cmdq_insert_after(item, new_item);
+		cmd_list_free(cmdlist);
+		return (CMD_RETURN_NORMAL);
 	}
 
-	ft = format_create();
+	cdata = xcalloc(1, sizeof *cdata);
-	if (s != NULL)
+	if (self->file != NULL) {
-		format_session(ft, s);
+		cdata->file = xstrdup(self->file);
-	if (s != NULL && wl != NULL)
+		cdata->line = self->line;
-		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]);
 	if (args->argc == 3)
 		cdata->cmd_else = xstrdup(args->argv[2]);
 	else
 		cdata->cmd_else = NULL;
-	cdata->bflag = args_has(args, 'b');
 
-	cdata->started = 0;
+	cdata->client = item->client;
-	cdata->cmdq = cmdq;
+	cdata->client->references++;
-	cmdq->references++;
 
-	job_run(shellcmd, s, cmd_if_shell_callback, cmd_if_shell_free, cdata);
+	if (!args_has(args, 'b'))
+		cdata->item = item;
+	else
+		cdata->item = NULL;
+	memcpy(&cdata->mouse, &item->mouse, sizeof cdata->mouse);
+
+	job_run(shellcmd, s, cwd, cmd_if_shell_callback, cmd_if_shell_free,
+	    cdata);
 	free(shellcmd);
 
-	if (cdata->bflag)
+	if (args_has(args, 'b'))
 		return (CMD_RETURN_NORMAL);
 	return (CMD_RETURN_WAIT);
 }
 
-void
+static enum cmd_retval
+cmd_if_shell_error(struct cmdq_item *item, void *data)
+{
+	char	*error = data;
+
+	cmdq_error(item, "%s", error);
+	free(error);
+
+	return (CMD_RETURN_NORMAL);
+}
+
+static void
 cmd_if_shell_callback(struct job *job)
 {
 	struct cmd_if_shell_data	*cdata = job->data;
-	struct cmd_q			*cmdq = cdata->cmdq, *cmdq1;
+	struct client			*c = cdata->client;
 	struct cmd_list			*cmdlist;
-	char				*cause, *cmd;
+	struct cmdq_item		*new_item;
-
+	char				*cause, *cmd, *file = cdata->file;
-	if (cmdq->dead)
+	u_int				 line = cdata->line;
-		return;
 
 	if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0)
 		cmd = cdata->cmd_else;
 	else
 		cmd = cdata->cmd_if;
 	if (cmd == NULL)
-		return;
+		goto out;
 
-	if (cmd_string_parse(cmd, &cmdlist, NULL, 0, &cause) != 0) {
+	cmdlist = cmd_string_parse(cmd, file, line, &cause);
-		if (cause != NULL) {
+	if (cmdlist == NULL) {
-			cmdq_error(cmdq, "%s", cause);
+		if (cause != NULL)
-			free(cause);
+			new_item = cmdq_get_callback(cmd_if_shell_error, cause);
-		}
+		else
-		return;
+			new_item = NULL;
+	} else {
+		new_item = cmdq_get_command(cmdlist, NULL, &cdata->mouse, 0);
+		cmd_list_free(cmdlist);
 	}
 
-	cdata->started = 1;
+	if (new_item != NULL) {
+		if (cdata->item == NULL)
+			cmdq_append(c, new_item);
+		else
+			cmdq_insert_after(cdata->item, new_item);
+	}
 
-	cmdq1 = cmdq_new(cmdq->client);
+out:
-	cmdq1->emptyfn = cmd_if_shell_done;
+	if (cdata->item != NULL)
-	cmdq1->data = cdata;
+		cdata->item->flags &= ~CMDQ_WAITING;
-
-	cmdq_run(cmdq1, cmdlist);
-	cmd_list_free(cmdlist);
 }
 
-void
+static 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;
 
-	if (cdata->started)
+	server_client_unref(cdata->client);
-		return;
-
-	if (!cmdq_free(cmdq) && !cdata->bflag)
-		cmdq_continue(cmdq);
 
 	free(cdata->cmd_else);
 	free(cdata->cmd_if);
+
+	free(cdata->file);
 	free(cdata);
 }

cmd-join-pane.c

@@ -1,8 +1,8 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2011 George Nachman <tmux@georgester.com>
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -28,53 +28,38 @@
  * Join or move a pane into another (like split/swap/kill).
  */
 
-void		 cmd_join_pane_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_join_pane_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_join_pane_exec(struct cmd *, struct cmd_q *);
-
-enum cmd_retval	 join_pane(struct cmd *, struct cmd_q *, int);
 
 const struct cmd_entry cmd_join_pane_entry = {
-	"join-pane", "joinp",
+	.name = "join-pane",
-	"bdhvp:l:s:t:", 0, 0,
+	.alias = "joinp",
-	"[-bdhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
+
-	0,
+	.args = { "bdhvp:l:s:t:", 0, 0 },
-	cmd_join_pane_key_binding,
+	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
-	NULL,
+
-	cmd_join_pane_exec
+	.sflag = CMD_PANE_MARKED,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
+	.exec = cmd_join_pane_exec
 };
 
 const struct cmd_entry cmd_move_pane_entry = {
-	"move-pane", "movep",
+	.name = "move-pane",
-	"bdhvp:l:s:t:", 0, 0,
+	.alias = "movep",
-	"[-bdhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
+
-	0,
+	.args = { "bdhvp:l:s:t:", 0, 0 },
-	NULL,
+	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
-	NULL,
+
-	cmd_join_pane_exec
+	.sflag = CMD_PANE,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
+	.exec = cmd_join_pane_exec
 };
 
-void
+static enum cmd_retval
-cmd_join_pane_key_binding(struct cmd *self, int key)
+cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
-{
-	switch (key) {
-	case '%':
-		self->args = args_create(0);
-		args_set(self->args, 'h', NULL);
-		break;
-	default:
-		self->args = args_create(0);
-		break;
-	}
-}
-
-enum cmd_retval
-cmd_join_pane_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	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;
@@ -85,26 +70,31 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 	int			 size, percentage, dst_idx;
 	enum layout_type	 type;
 	struct layout_cell	*lc;
+	int			 not_same_window;
 
-	dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), &dst_s, &dst_wp);
+	if (self->entry == &cmd_join_pane_entry)
-	if (dst_wl == NULL)
+		not_same_window = 1;
-		return (CMD_RETURN_ERROR);
+	else
+		not_same_window = 0;
+
+	dst_s = item->state.tflag.s;
+	dst_wl = item->state.tflag.wl;
+	dst_wp = item->state.tflag.wp;
 	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 = item->state.sflag.wl;
-	if (src_wl == NULL)
+	src_wp = item->state.sflag.wp;
-		return (CMD_RETURN_ERROR);
 	src_w = src_wl->window;
 	server_unzoom_window(src_w);
 
 	if (not_same_window && src_w == dst_w) {
-		cmdq_error(cmdq, "can't join a pane to its own window");
+		cmdq_error(item, "can't join a pane to its own window");
 		return (CMD_RETURN_ERROR);
 	}
 	if (!not_same_window && src_wp == dst_wp) {
-		cmdq_error(cmdq, "source and target panes must be different");
+		cmdq_error(item, "source and target panes must be different");
 		return (CMD_RETURN_ERROR);
 	}
 
@@ -116,14 +106,14 @@ 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);
+			cmdq_error(item, "size %s", cause);
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
 	} else if (args_has(args, 'p')) {
 		percentage = args_strtonum(args, 'p', 0, 100, &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "percentage %s", cause);
+			cmdq_error(item, "percentage %s", cause);
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
@@ -132,26 +122,17 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
 		else
 			size = (dst_wp->sx * percentage) / 100;
 	}
-	lc = layout_split_pane(dst_wp, type, size, args_has(args, 'b'));
+	lc = layout_split_pane(dst_wp, type, size, args_has(args, 'b'), 0);
 	if (lc == NULL) {
-		cmdq_error(cmdq, "create pane failed: pane too small");
+		cmdq_error(item, "create pane failed: pane too small");
 		return (CMD_RETURN_ERROR);
 	}
 
 	layout_close_pane(src_wp);
 
-	if (src_w->active == src_wp) {
+	window_lost_pane(src_w, src_wp);
-		src_w->active = TAILQ_PREV(src_wp, window_panes, entry);
-		if (src_w->active == NULL)
-			src_w->active = TAILQ_NEXT(src_wp, entry);
-	}
 	TAILQ_REMOVE(&src_w->panes, src_wp, entry);
 
-	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);
 	layout_assign_pane(lc, src_wp);
@@ -168,6 +149,11 @@ 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);
+	if (window_count_panes(src_w) == 0)
+		server_kill_window(src_w);
+	else
+		notify_window("window-layout-changed", src_w);
+	notify_window("window-layout-changed", dst_w);
+
 	return (CMD_RETURN_NORMAL);
 }

cmd-kill-pane.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -26,36 +26,29 @@
  * Kill pane.
  */
 
-enum cmd_retval	 cmd_kill_pane_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_kill_pane_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_kill_pane_entry = {
-	"kill-pane", "killp",
+	.name = "kill-pane",
-	"at:", 0, 0,
+	.alias = "killp",
-	"[-a] " CMD_TARGET_PANE_USAGE,
+
-	0,
+	.args = { "at:", 0, 0 },
-	NULL,
+	.usage = "[-a] " CMD_TARGET_PANE_USAGE,
-	NULL,
+
-	cmd_kill_pane_exec
+	.tflag = CMD_PANE,
+
+	.flags = 0,
+	.exec = cmd_kill_pane_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_kill_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_kill_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args		*args = self->args;
+	struct winlink		*wl = item->state.tflag.wl;
-	struct winlink		*wl;
+	struct window_pane	*loopwp, *tmpwp, *wp = item->state.tflag.wp;
-	struct window_pane	*loopwp, *tmpwp, *wp;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
 	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);
-	}
-
 	if (args_has(self->args, 'a')) {
 		TAILQ_FOREACH_SAFE(loopwp, &wl->window->panes, entry, tmpwp) {
 			if (loopwp == wp)
@@ -63,11 +56,17 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 			layout_close_pane(loopwp);
 			window_remove_pane(wl->window, loopwp);
 		}
+		server_redraw_window(wl->window);
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (window_count_panes(wl->window) == 1) {
+		server_kill_window(wl->window);
+		recalculate_sizes();
 	} else {
 		layout_close_pane(wp);
 		window_remove_pane(wl->window, wp);
+		server_redraw_window(wl->window);
 	}
-	server_redraw_window(wl->window);
-
 	return (CMD_RETURN_NORMAL);
 }

cmd-kill-server.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,22 +27,35 @@
  * Kill the server and do nothing else.
  */
 
-enum cmd_retval	 cmd_kill_server_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_kill_server_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_kill_server_entry = {
-	"kill-server", NULL,
+	.name = "kill-server",
-	"", 0, 0,
+	.alias = NULL,
-	"",
+
-	0,
+	.args = { "", 0, 0 },
-	NULL,
+	.usage = "",
-	NULL,
+
-	cmd_kill_server_exec
+	.flags = 0,
+	.exec = cmd_kill_server_exec
 };
 
-enum cmd_retval
+const struct cmd_entry cmd_start_server_entry = {
-cmd_kill_server_exec(unused struct cmd *self, unused struct cmd_q *cmdq)
+	.name = "start-server",
+	.alias = "start",
+
+	.args = { "", 0, 0 },
+	.usage = "",
+
+	.flags = CMD_STARTSERVER,
+	.exec = cmd_kill_server_exec
+};
+
+static enum cmd_retval
+cmd_kill_server_exec(struct cmd *self, __unused struct cmdq_item *item)
 {
-	kill(getpid(), SIGTERM);
+	if (self->entry == &cmd_kill_server_entry)
+		kill(getpid(), SIGTERM);
 
 	return (CMD_RETURN_NORMAL);
 }

cmd-kill-session.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,32 +27,41 @@
  * 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 *);
+static enum cmd_retval	cmd_kill_session_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_kill_session_entry = {
-	"kill-session", NULL,
+	.name = "kill-session",
-	"at:", 0, 0,
+	.alias = NULL,
-	"[-a] " CMD_TARGET_SESSION_USAGE,
+
-	0,
+	.args = { "aCt:", 0, 0 },
-	NULL,
+	.usage = "[-aC] " CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_kill_session_exec
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
+	.exec = cmd_kill_session_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_kill_session_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_kill_session_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct session	*s, *s2, *s3;
+	struct session	*s, *sloop, *stmp;
+	struct winlink	*wl;
 
-	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+	s = item->state.tflag.s;
-		return (CMD_RETURN_ERROR);
 
-	if (args_has(args, 'a')) {
+	if (args_has(args, 'C')) {
-		RB_FOREACH_SAFE(s2, sessions, &sessions, s3) {
+		RB_FOREACH(wl, winlinks, &s->windows) {
-			if (s != s2) {
+			wl->window->flags &= ~WINDOW_ALERTFLAGS;
-				server_destroy_session(s2);
+			wl->flags &= ~WINLINK_ALERTFLAGS;
-				session_destroy(s2);
+		}
+		server_redraw_session(s);
+	} else if (args_has(args, 'a')) {
+		RB_FOREACH_SAFE(sloop, sessions, &sessions, stmp) {
+			if (sloop != s) {
+				server_destroy_session(sloop);
+				session_destroy(sloop);
 			}
 		}
 	} else {

cmd-kill-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -24,35 +24,57 @@
  * Destroy window.
  */
 
-enum cmd_retval	 cmd_kill_window_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_kill_window_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_kill_window_entry = {
-	"kill-window", "killw",
+	.name = "kill-window",
-	"at:", 0, 0,
+	.alias = "killw",
-	"[-a] " CMD_TARGET_WINDOW_USAGE,
+
-	0,
+	.args = { "at:", 0, 0 },
-	NULL,
+	.usage = "[-a] " CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_kill_window_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_kill_window_exec
 };
 
-enum cmd_retval
+const struct cmd_entry cmd_unlink_window_entry = {
-cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq)
+	.name = "unlink-window",
+	.alias = "unlinkw",
+
+	.args = { "kt:", 0, 0 },
+	.usage = "[-k] " CMD_TARGET_WINDOW_USAGE,
+
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_kill_window_exec
+};
+
+static enum cmd_retval
+cmd_kill_window_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args	*args = self->args;
+	struct args		*args = self->args;
-	struct winlink	*wl, *wl2, *wl3;
+	struct winlink		*wl = item->state.tflag.wl, *wl2, *wl3;
-	struct session	*s;
+	struct window		*w = wl->window;
+	struct session		*s = item->state.tflag.s;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
+	if (self->entry == &cmd_unlink_window_entry) {
-		return (CMD_RETURN_ERROR);
+		if (!args_has(self->args, 'k') && !session_is_linked(s, w)) {
-
+			cmdq_error(item, "window only linked to one session");
-	if (args_has(args, 'a')) {
+			return (CMD_RETURN_ERROR);
-		RB_FOREACH_SAFE(wl2, winlinks, &s->windows, wl3) {
-			if (wl != wl2)
-				server_kill_window(wl2->window);
 		}
-	} else
+		server_unlink_window(s, wl);
-		server_kill_window(wl->window);
+	} else {
+		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);
+	}
 
 	recalculate_sizes();
 	return (CMD_RETURN_NORMAL);

cmd-link-window.c

@@ -1,65 +0,0 @@
-/* $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 <stdlib.h>
-
-#include "tmux.h"
-
-/*
- * Link a window into another session.
- */
-
-enum cmd_retval	 cmd_link_window_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_link_window_entry = {
-	"link-window", "linkw",
-	"dks:t:", 0, 0,
-	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_link_window_exec
-};
-
-enum cmd_retval
-cmd_link_window_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args	*args = self->args;
-	struct session	*src, *dst;
-	struct winlink	*wl;
-	char		*cause;
-	int		 idx, kflag, dflag;
-
-	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 link window: %s", cause);
-		free(cause);
-		return (CMD_RETURN_ERROR);
-	}
-	recalculate_sizes();
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-list-buffers.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,39 +27,41 @@
  * List paste buffers.
  */
 
-enum cmd_retval	 cmd_list_buffers_exec(struct cmd *, struct cmd_q *);
+#define LIST_BUFFERS_TEMPLATE						\
+	"#{buffer_name}: #{buffer_size} bytes: \"#{buffer_sample}\""
+
+static enum cmd_retval	cmd_list_buffers_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_list_buffers_entry = {
-	"list-buffers", "lsb",
+	.name = "list-buffers",
-	"F:", 0, 0,
+	.alias = "lsb",
-	"[-F format]",
+
-	0,
+	.args = { "F:", 0, 0 },
-	NULL,
+	.usage = "[-F format]",
-	NULL,
+
-	cmd_list_buffers_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_list_buffers_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_list_buffers_exec(unused struct cmd *self, struct cmd_q *cmdq)
+cmd_list_buffers_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
 	struct paste_buffer	*pb;
 	struct format_tree	*ft;
-	u_int			 idx;
 	char			*line;
 	const char		*template;
 
 	if ((template = args_get(args, 'F')) == NULL)
 		template = LIST_BUFFERS_TEMPLATE;
 
-	idx = 0;
+	pb = NULL;
-	while ((pb = paste_walk_stack(&global_buffers, &idx)) != NULL) {
+	while ((pb = paste_walk(pb)) != NULL) {
-		ft = format_create();
+		ft = format_create(item, FORMAT_NONE, 0);
-		format_add(ft, "line", "%u", idx - 1);
+		format_defaults_paste_buffer(ft, pb);
-		format_paste_buffer(ft, pb);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		cmdq_print(item, "%s", line);
 		free(line);
 
 		format_free(ft);

cmd-list-clients.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -28,57 +28,61 @@
  * List all clients.
  */
 
-enum cmd_retval	cmd_list_clients_exec(struct cmd *, struct cmd_q *);
+#define LIST_CLIENTS_TEMPLATE					\
+	"#{client_name}: #{session_name} "			\
+	"[#{client_width}x#{client_height} #{client_termname}]"	\
+	"#{?client_utf8, (utf8),} #{?client_readonly, (ro),}"
+
+static enum cmd_retval	cmd_list_clients_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_list_clients_entry = {
-	"list-clients", "lsc",
+	.name = "list-clients",
-	"F:t:", 0, 0,
+	.alias = "lsc",
-	"[-F format] " CMD_TARGET_SESSION_USAGE,
+
-	CMD_READONLY,
+	.args = { "F:t:", 0, 0 },
-	NULL,
+	.usage = "[-F format] " CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_list_clients_exec
+	.tflag = CMD_SESSION,
+
+	.flags = CMD_READONLY|CMD_AFTERHOOK,
+	.exec = cmd_list_clients_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args 		*args = self->args;
 	struct client		*c;
 	struct session		*s;
 	struct format_tree	*ft;
 	const char		*template;
-	u_int			 i;
+	u_int			 idx;
 	char			*line;
 
-	if (args_has(args, 't')) {
+	if (args_has(args, 't'))
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		s = item->state.tflag.s;
-		if (s == NULL)
+	else
-			return (CMD_RETURN_ERROR);
-	} else
 		s = NULL;
 
 	if ((template = args_get(args, 'F')) == NULL)
 		template = LIST_CLIENTS_TEMPLATE;
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+	idx = 0;
-		c = ARRAY_ITEM(&clients, i);
+	TAILQ_FOREACH(c, &clients, entry) {
-		if (c == NULL || c->session == NULL)
+		if (c->session == NULL || (s != NULL && s != c->session))
 			continue;
 
-		if (s != NULL && s != c->session)
+		ft = format_create(item, FORMAT_NONE, 0);
-			continue;
+		format_add(ft, "line", "%u", idx);
-
+		format_defaults(ft, c, NULL, NULL, NULL);
-		ft = format_create();
-		format_add(ft, "line", "%u", i);
-		format_session(ft, c->session);
-		format_client(ft, c);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		cmdq_print(item, "%s", line);
 		free(line);
 
 		format_free(ft);
+
+		idx++;
 	}
 
 	return (CMD_RETURN_NORMAL);

cmd-list-commands.c

@@ -1,55 +0,0 @@
-/* $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"
-
-/*
- * List all commands with usages.
- */
-
-enum cmd_retval	 cmd_list_commands_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_list_commands_entry = {
-	"list-commands", "lscm",
-	"", 0, 0,
-	"",
-	0,
-	NULL,
-	NULL,
-	cmd_list_commands_exec
-};
-
-enum cmd_retval
-cmd_list_commands_exec(unused struct cmd *self, struct cmd_q *cmdq)
-{
-	const struct cmd_entry 	      **entryp;
-
-	for (entryp = cmd_table; *entryp != NULL; entryp++) {
-		if ((*entryp)->alias != NULL) {
-			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);
-}

cmd-list-keys.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -18,6 +18,7 @@
 
 #include <sys/types.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "tmux.h"
@@ -26,126 +27,147 @@
  * List key bindings.
  */
 
-enum cmd_retval	 cmd_list_keys_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_list_keys_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_list_keys_table(struct cmd *, struct cmd_q *);
+
+static enum cmd_retval	cmd_list_keys_commands(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_list_keys_entry = {
-	"list-keys", "lsk",
+	.name = "list-keys",
-	"t:", 0, 0,
+	.alias = "lsk",
-	"[-t key-table]",
+
-	0,
+	.args = { "T:", 0, 0 },
-	NULL,
+	.usage = "[-T key-table]",
-	NULL,
+
-	cmd_list_keys_exec
+	.flags = CMD_STARTSERVER|CMD_AFTERHOOK,
+	.exec = cmd_list_keys_exec
 };
 
-enum cmd_retval
+const struct cmd_entry cmd_list_commands_entry = {
-cmd_list_keys_exec(struct cmd *self, struct cmd_q *cmdq)
+	.name = "list-commands",
+	.alias = "lscm",
+
+	.args = { "F:", 0, 0 },
+	.usage = "[-F format]",
+
+	.flags = CMD_STARTSERVER|CMD_AFTERHOOK,
+	.exec = cmd_list_keys_exec
+};
+
+static enum cmd_retval
+cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
+	struct key_table	*table;
 	struct key_binding	*bd;
-	const char		*key;
+	const char		*key, *tablename, *r;
-	char			 tmp[BUFSIZ], flags[8];
+	char			*cp, tmp[BUFSIZ];
-	size_t			 used;
+	int			 repeat, width, tablewidth, keywidth;
-	int			 width, keywidth;
 
-	if (args_has(args, 't'))
+	if (self->entry == &cmd_list_commands_entry)
-		return (cmd_list_keys_table(self, cmdq));
+		return (cmd_list_keys_commands(self, item));
 
-	width = 0;
+	tablename = args_get(args, 'T');
-
+	if (tablename != NULL && key_bindings_get_table(tablename, 0) == NULL) {
-	RB_FOREACH(bd, key_bindings, &key_bindings) {
+		cmdq_error(item, "table %s doesn't exist", tablename);
-		key = key_string_lookup_key(bd->key & ~KEYC_PREFIX);
-		if (key == NULL)
-			continue;
-
-		keywidth = strlen(key);
-		if (!(bd->key & KEYC_PREFIX)) {
-			if (bd->can_repeat)
-				keywidth += 4;
-			else
-				keywidth += 3;
-		} else if (bd->can_repeat)
-			keywidth += 3;
-		if (keywidth > width)
-			width = keywidth;
-	}
-
-	RB_FOREACH(bd, key_bindings, &key_bindings) {
-		key = key_string_lookup_key(bd->key & ~KEYC_PREFIX);
-		if (key == NULL)
-			continue;
-
-		*flags = '\0';
-		if (!(bd->key & KEYC_PREFIX)) {
-			if (bd->can_repeat)
-				xsnprintf(flags, sizeof flags, "-rn ");
-			else
-				xsnprintf(flags, sizeof flags, "-n ");
-		} else if (bd->can_repeat)
-			xsnprintf(flags, sizeof flags, "-r ");
-
-		used = xsnprintf(tmp, sizeof tmp, "%s%*s ",
-		    flags, (int) (width - strlen(flags)), key);
-		if (used >= sizeof tmp)
-			continue;
-
-		cmd_list_print(bd->cmdlist, tmp + used, (sizeof tmp) - used);
-		cmdq_print(cmdq, "bind-key %s", tmp);
-	}
-
-	return (CMD_RETURN_NORMAL);
-}
-
-enum cmd_retval
-cmd_list_keys_table(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args			*args = self->args;
-	const char			*tablename;
-	const struct mode_key_table	*mtab;
-	struct mode_key_binding		*mbind;
-	const char			*key, *cmdstr, *mode;
-	int			 	 width, keywidth, any_mode;
-
-	tablename = args_get(args, 't');
-	if ((mtab = mode_key_findtable(tablename)) == NULL) {
-		cmdq_error(cmdq, "unknown key table: %s", tablename);
 		return (CMD_RETURN_ERROR);
 	}
 
-	width = 0;
+	repeat = 0;
-	any_mode = 0;
+	tablewidth = keywidth = 0;
-	RB_FOREACH(mbind, mode_key_tree, mtab->tree) {
+	RB_FOREACH(table, key_tables, &key_tables) {
-		key = key_string_lookup_key(mbind->key);
+		if (tablename != NULL && strcmp(table->name, tablename) != 0)
-		if (key == NULL)
 			continue;
+		RB_FOREACH(bd, key_bindings, &table->key_bindings) {
+			key = key_string_lookup_key(bd->key);
 
-		if (mbind->mode != 0)
+			if (bd->can_repeat)
-			any_mode = 1;
+				repeat = 1;
 
-		keywidth = strlen(key);
+			width = utf8_cstrwidth(table->name);
-		if (keywidth > width)
+			if (width > tablewidth)
-			width = keywidth;
+				tablewidth = width;
+			width = utf8_cstrwidth(key);
+			if (width > keywidth)
+				keywidth = width;
+		}
 	}
 
-	RB_FOREACH(mbind, mode_key_tree, mtab->tree) {
+	RB_FOREACH(table, key_tables, &key_tables) {
-		key = key_string_lookup_key(mbind->key);
+		if (tablename != NULL && strcmp(table->name, tablename) != 0)
-		if (key == NULL)
 			continue;
+		RB_FOREACH(bd, key_bindings, &table->key_bindings) {
+			key = key_string_lookup_key(bd->key);
 
-		mode = "";
+			if (!repeat)
-		if (mbind->mode != 0)
+				r = "";
-			mode = "c";
+			else if (bd->can_repeat)
-		cmdstr = mode_key_tostring(mtab->cmdstr, mbind->cmd);
+				r = "-r ";
-		if (cmdstr != NULL) {
+			else
-			cmdq_print(cmdq, "bind-key -%st %s%s %*s %s%s%s%s",
+				r = "   ";
-			    mode, any_mode && *mode == '\0' ? " " : "",
+			xsnprintf(tmp, sizeof tmp, "%s-T ", r);
-			    mtab->name, (int) width, key, cmdstr,
+
-			    mbind->arg != NULL ? " \"" : "",
+			cp = utf8_padcstr(table->name, tablewidth);
-			    mbind->arg != NULL ? mbind->arg : "",
+			strlcat(tmp, cp, sizeof tmp);
-			    mbind->arg != NULL ? "\"": "");
+			strlcat(tmp, " ", sizeof tmp);
+			free(cp);
+
+			cp = utf8_padcstr(key, keywidth);
+			strlcat(tmp, cp, sizeof tmp);
+			strlcat(tmp, " ", sizeof tmp);
+			free(cp);
+
+			cp = cmd_list_print(bd->cmdlist);
+			strlcat(tmp, cp, sizeof tmp);
+			free(cp);
+
+			cmdq_print(item, "bind-key %s", tmp);
 		}
 	}
 
 	return (CMD_RETURN_NORMAL);
 }
+
+static enum cmd_retval
+cmd_list_keys_commands(struct cmd *self, struct cmdq_item *item)
+{
+	struct args		*args = self->args;
+	const struct cmd_entry	**entryp;
+	const struct cmd_entry	 *entry;
+	struct format_tree	 *ft;
+	const char		 *template, *s;
+	char			 *line;
+
+	if ((template = args_get(args, 'F')) == NULL) {
+		template = "#{command_list_name}"
+		    "#{?command_list_alias, (#{command_list_alias}),} "
+		    "#{command_list_usage}";
+	}
+
+	ft = format_create(item, FORMAT_NONE, 0);
+	format_defaults(ft, NULL, NULL, NULL, NULL);
+
+	for (entryp = cmd_table; *entryp != NULL; entryp++) {
+		entry = *entryp;
+
+		format_add(ft, "command_list_name", "%s", entry->name);
+		if (entry->alias != NULL)
+			s = entry->alias;
+		else
+			s = "";
+		format_add(ft, "command_list_alias", "%s", s);
+		if (entry->usage != NULL)
+			s = entry->usage;
+		else
+			s = "";
+		format_add(ft, "command_list_usage", "%s", s);
+
+		line = format_expand(ft, template);
+		if (*line != '\0')
+			cmdq_print(item, "%s", line);
+		free(line);
+	}
+
+	format_free(ft);
+	return (CMD_RETURN_NORMAL);
+}

cmd-list-panes.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -19,7 +19,6 @@
 #include <sys/types.h>
 
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "tmux.h"
 
@@ -27,70 +26,66 @@
  * List panes on given window.
  */
 
-enum cmd_retval	 cmd_list_panes_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_list_panes_exec(struct cmd *, struct cmdq_item *);
 
-void	cmd_list_panes_server(struct cmd *, struct cmd_q *);
+static void	cmd_list_panes_server(struct cmd *, struct cmdq_item *);
-void	cmd_list_panes_session(
+static void	cmd_list_panes_session(struct cmd *, struct session *,
-	    struct cmd *, struct session *, struct cmd_q *, int);
+		    struct cmdq_item *, int);
-void	cmd_list_panes_window(struct cmd *,
+static void	cmd_list_panes_window(struct cmd *, struct session *,
-	    struct session *, struct winlink *, struct cmd_q *, int);
+		    struct winlink *, struct cmdq_item *, int);
 
 const struct cmd_entry cmd_list_panes_entry = {
-	"list-panes", "lsp",
+	.name = "list-panes",
-	"asF:t:", 0, 0,
+	.alias = "lsp",
-	"[-as] [-F format] " CMD_TARGET_WINDOW_USAGE,
+
-	0,
+	.args = { "asF:t:", 0, 0 },
-	NULL,
+	.usage = "[-as] [-F format] " CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_list_panes_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_list_panes_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_list_panes_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_panes_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct session	*s;
+	struct session	*s = item->state.tflag.s;
-	struct winlink	*wl;
+	struct winlink	*wl = item->state.tflag.wl;
 
 	if (args_has(args, 'a'))
-		cmd_list_panes_server(self, cmdq);
+		cmd_list_panes_server(self, item);
-	else if (args_has(args, 's')) {
+	else if (args_has(args, 's'))
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		cmd_list_panes_session(self, s, item, 1);
-		if (s == NULL)
+	else
-			return (CMD_RETURN_ERROR);
+		cmd_list_panes_window(self, s, wl, item, 0);
-		cmd_list_panes_session(self, s, cmdq, 1);
-	} else {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-		cmd_list_panes_window(self, s, wl, cmdq, 0);
-	}
 
 	return (CMD_RETURN_NORMAL);
 }
 
-void
+static void
-cmd_list_panes_server(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_panes_server(struct cmd *self, struct cmdq_item *item)
 {
 	struct session	*s;
 
 	RB_FOREACH(s, sessions, &sessions)
-		cmd_list_panes_session(self, s, cmdq, 2);
+		cmd_list_panes_session(self, s, item, 2);
 }
 
-void
+static void
-cmd_list_panes_session(
+cmd_list_panes_session(struct cmd *self, struct session *s,
-    struct cmd *self, struct session *s, struct cmd_q *cmdq, int type)
+    struct cmdq_item *item, 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, item, type);
 }
 
-void
+static void
-cmd_list_panes_window(struct cmd *self,
+cmd_list_panes_window(struct cmd *self, struct session *s, struct winlink *wl,
-    struct session *s, struct winlink *wl, struct cmd_q *cmdq, int type)
+    struct cmdq_item *item, int type)
 {
 	struct args		*args = self->args;
 	struct window_pane	*wp;
@@ -117,9 +112,9 @@ cmd_list_panes_window(struct cmd *self,
 			    "#{?pane_active, (active),}#{?pane_dead, (dead),}";
 			break;
 		case 2:
-			template = "#{session_name}:#{window_index}.#{pane_index}: "
+			template = "#{session_name}:#{window_index}."
-			    "[#{pane_width}x#{pane_height}] [history "
+			    "#{pane_index}: [#{pane_width}x#{pane_height}] "
-			    "#{history_size}/#{history_limit}, "
+			    "[history #{history_size}/#{history_limit}, "
 			    "#{history_bytes} bytes] #{pane_id}"
 			    "#{?pane_active, (active),}#{?pane_dead, (dead),}";
 			break;
@@ -128,14 +123,12 @@ cmd_list_panes_window(struct cmd *self,
 
 	n = 0;
 	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
-		ft = format_create();
+		ft = format_create(item, FORMAT_NONE, 0);
 		format_add(ft, "line", "%u", n);
-		format_session(ft, s);
+		format_defaults(ft, NULL, s, wl, wp);
-		format_winlink(ft, s, wl);
-		format_window_pane(ft, wp);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		cmdq_print(item, "%s", line);
 		free(line);
 
 		format_free(ft);

cmd-list-sessions.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -28,20 +28,30 @@
  * List all sessions.
  */
 
-enum cmd_retval	 cmd_list_sessions_exec(struct cmd *, struct cmd_q *);
+#define LIST_SESSIONS_TEMPLATE				\
+	"#{session_name}: #{session_windows} windows "	\
+	"(created #{t:session_created}) "		\
+	"[#{session_width}x#{session_height}]"		\
+	"#{?session_grouped, (group ,}"			\
+	"#{session_group}#{?session_grouped,),}"	\
+	"#{?session_attached, (attached),}"
+
+static enum cmd_retval	cmd_list_sessions_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_list_sessions_entry = {
-	"list-sessions", "ls",
+	.name = "list-sessions",
-	"F:", 0, 0,
+	.alias = "ls",
-	"[-F format]",
+
-	0,
+	.args = { "F:", 0, 0 },
-	NULL,
+	.usage = "[-F format]",
-	NULL,
+
-	cmd_list_sessions_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_list_sessions_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_list_sessions_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_sessions_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
 	struct session		*s;
@@ -55,12 +65,12 @@ cmd_list_sessions_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	n = 0;
 	RB_FOREACH(s, sessions, &sessions) {
-		ft = format_create();
+		ft = format_create(item, FORMAT_NONE, 0);
 		format_add(ft, "line", "%u", n);
-		format_session(ft, s);
+		format_defaults(ft, NULL, s, NULL, NULL);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		cmdq_print(item, "%s", line);
 		free(line);
 
 		format_free(ft);

cmd-list-windows.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,52 +27,62 @@
  * List windows on given session.
  */
 
-enum cmd_retval	 cmd_list_windows_exec(struct cmd *, struct cmd_q *);
+#define LIST_WINDOWS_TEMPLATE					\
+	"#{window_index}: #{window_name}#{window_flags} "	\
+	"(#{window_panes} panes) "				\
+	"[#{window_width}x#{window_height}] "			\
+	"[layout #{window_layout}] #{window_id}"		\
+	"#{?window_active, (active),}";
+#define LIST_WINDOWS_WITH_SESSION_TEMPLATE			\
+	"#{session_name}:"					\
+	"#{window_index}: #{window_name}#{window_flags} "	\
+	"(#{window_panes} panes) "				\
+	"[#{window_width}x#{window_height}] "
 
-void	cmd_list_windows_server(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_list_windows_exec(struct cmd *, struct cmdq_item *);
-void	cmd_list_windows_session(
+
-	    struct cmd *, struct session *, struct cmd_q *, int);
+static void	cmd_list_windows_server(struct cmd *, struct cmdq_item *);
+static void	cmd_list_windows_session(struct cmd *, struct session *,
+		    struct cmdq_item *, int);
 
 const struct cmd_entry cmd_list_windows_entry = {
-	"list-windows", "lsw",
+	.name = "list-windows",
-	"F:at:", 0, 0,
+	.alias = "lsw",
-	"[-a] [-F format] " CMD_TARGET_SESSION_USAGE,
+
-	0,
+	.args = { "F:at:", 0, 0 },
-	NULL,
+	.usage = "[-a] [-F format] " CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_list_windows_exec
+	.tflag = CMD_SESSION,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_list_windows_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_list_windows_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_windows_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct session	*s;
 
 	if (args_has(args, 'a'))
-		cmd_list_windows_server(self, cmdq);
+		cmd_list_windows_server(self, item);
-	else {
+	else
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		cmd_list_windows_session(self, item->state.tflag.s, item, 0);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
-		cmd_list_windows_session(self, s, cmdq, 0);
-	}
 
 	return (CMD_RETURN_NORMAL);
 }
 
-void
+static void
-cmd_list_windows_server(struct cmd *self, struct cmd_q *cmdq)
+cmd_list_windows_server(struct cmd *self, struct cmdq_item *item)
 {
 	struct session	*s;
 
 	RB_FOREACH(s, sessions, &sessions)
-		cmd_list_windows_session(self, s, cmdq, 1);
+		cmd_list_windows_session(self, s, item, 1);
 }
 
-void
+static void
-cmd_list_windows_session(
+cmd_list_windows_session(struct cmd *self, struct session *s,
-    struct cmd *self, struct session *s, struct cmd_q *cmdq, int type)
+    struct cmdq_item *item, int type)
 {
 	struct args		*args = self->args;
 	struct winlink		*wl;
@@ -95,14 +105,12 @@ cmd_list_windows_session(
 
 	n = 0;
 	RB_FOREACH(wl, winlinks, &s->windows) {
-		ft = format_create();
+		ft = format_create(item, FORMAT_NONE, 0);
 		format_add(ft, "line", "%u", n);
-		format_session(ft, s);
+		format_defaults(ft, NULL, s, wl, NULL);
-		format_winlink(ft, s, wl);
-		format_window_pane(ft, wl->window->active);
 
 		line = format_expand(ft, template);
-		cmdq_print(cmdq, "%s", line);
+		cmdq_print(item, "%s", line);
 		free(line);
 
 		format_free(ft);

cmd-list.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -24,7 +24,7 @@
 #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, const char *file, u_int line,
     char **cause)
 {
 	struct cmd_list	*cmdlist;
@@ -99,21 +99,28 @@ cmd_list_free(struct cmd_list *cmdlist)
 	free(cmdlist);
 }
 
-size_t
+char *
-cmd_list_print(struct cmd_list *cmdlist, char *buf, size_t len)
+cmd_list_print(struct cmd_list *cmdlist)
 {
 	struct cmd	*cmd;
-	size_t		 off;
+	char		*buf, *this;
+	size_t		 len;
+
+	len = 1;
+	buf = xcalloc(1, len);
 
-	off = 0;
 	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
-		if (off >= len)
+		this = cmd_print(cmd);
-			break;
+
-		off += cmd_print(cmd, buf + off, len - off);
+		len += strlen(this) + 3;
-		if (off >= len)
+		buf = xrealloc(buf, len);
-			break;
+
+		strlcat(buf, this, len);
 		if (TAILQ_NEXT(cmd, qentry) != NULL)
-			off += xsnprintf(buf + off, len - off, " ; ");
+			strlcat(buf, " ; ", len);
+
+		free(this);
 	}
-	return (off);
+
+	return (buf);
 }

cmd-load-buffer.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,73 +31,65 @@
  * Loads a paste buffer from a file.
  */
 
-enum cmd_retval	 cmd_load_buffer_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_load_buffer_exec(struct cmd *, struct cmdq_item *);
-void		 cmd_load_buffer_callback(struct client *, int, void *);
+
+static void		cmd_load_buffer_callback(struct client *, int, void *);
 
 const struct cmd_entry cmd_load_buffer_entry = {
-	"load-buffer", "loadb",
+	.name = "load-buffer",
-	"b:", 1, 1,
+	.alias = "loadb",
-	CMD_BUFFER_USAGE " path",
+
-	0,
+	.args = { "b:", 1, 1 },
-	NULL,
+	.usage = CMD_BUFFER_USAGE " path",
-	NULL,
+
-	cmd_load_buffer_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_load_buffer_exec
 };
 
-enum cmd_retval
+struct cmd_load_buffer_data {
-cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+	struct cmdq_item	*item;
-{
+	char			*bufname;
-	struct args	*args = self->args;
+};
-	struct client	*c = cmdq->client;
-	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;
 
-	if (!args_has(args, 'b'))
+static enum cmd_retval
-		buffer = -1;
+cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
-	else {
+{
-		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
+	struct args			*args = self->args;
-		if (cause != NULL) {
+	struct cmd_load_buffer_data	*cdata;
-			cmdq_error(cmdq, "buffer %s", cause);
+	struct client			*c = item->client;
-			free(cause);
+	FILE				*f;
-			return (CMD_RETURN_ERROR);
+	const char			*path, *bufname;
-		}
+	char				*pdata, *new_pdata, *cause, *file;
-	}
+	size_t				 psize;
+	int				 ch, error;
+
+	bufname = NULL;
+	if (args_has(args, 'b'))
+		bufname = args_get(args, 'b');
 
 	path = args->argv[0];
 	if (strcmp(path, "-") == 0) {
-		buffer_ptr = xmalloc(sizeof *buffer_ptr);
+		cdata = xcalloc(1, sizeof *cdata);
-		*buffer_ptr = buffer;
+		cdata->item = item;
 
-		error = server_set_stdin_callback (c, cmd_load_buffer_callback,
+		if (bufname != NULL)
-		    buffer_ptr, &cause);
+			cdata->bufname = xstrdup(bufname);
+
+		error = server_set_stdin_callback(c, cmd_load_buffer_callback,
+		    cdata, &cause);
 		if (error != 0) {
-			cmdq_error(cmdq, "%s: %s", path, cause);
+			cmdq_error(item, "%s: %s", path, cause);
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
 		return (CMD_RETURN_WAIT);
 	}
 
-	if (c != NULL)
+	file = server_client_get_path(c, path);
-		wd = c->cwd;
+	f = fopen(file, "rb");
-	else if ((s = cmd_current_session(cmdq, 0)) != NULL) {
+	if (f == NULL) {
-		wd = options_get_string(&s->options, "default-path");
+		cmdq_error(item, "%s: %s", file, strerror(errno));
-		if (*wd == '\0')
+		free(file);
-			wd = s->cwd;
-	} else
-		wd = NULL;
-	if (wd != NULL && *wd != '\0') {
-		newpath = get_full_path(wd, path);
-		if (newpath != NULL)
-			path = newpath;
-	}
-	if ((f = fopen(path, "rb")) == NULL) {
-		cmdq_error(cmdq, "%s: %s", path, strerror(errno));
 		return (CMD_RETURN_ERROR);
 	}
 
@@ -105,29 +98,26 @@ 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));
+			cmdq_error(item, "realloc error: %s", strerror(errno));
 			goto error;
 		}
 		pdata = new_pdata;
 		pdata[psize++] = ch;
 	}
 	if (ferror(f)) {
-		cmdq_error(cmdq, "%s: read error", path);
+		cmdq_error(item, "%s: read error", file);
 		goto error;
 	}
 	if (pdata != NULL)
 		pdata[psize] = '\0';
 
 	fclose(f);
+	free(file);
 
-	limit = options_get_number(&global_options, "buffer-limit");
+	if (paste_set(pdata, psize, bufname, &cause) != 0) {
-	if (buffer == -1) {
+		cmdq_error(item, "%s", cause);
-		paste_add(&global_buffers, pdata, psize, limit);
-		return (CMD_RETURN_NORMAL);
-	}
-	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
-		cmdq_error(cmdq, "no buffer %d", buffer);
 		free(pdata);
+		free(cause);
 		return (CMD_RETURN_ERROR);
 	}
 
@@ -140,42 +130,44 @@ error:
 	return (CMD_RETURN_ERROR);
 }
 
-void
+static void
 cmd_load_buffer_callback(struct client *c, int closed, void *data)
 {
-	int	*buffer = data;
+	struct cmd_load_buffer_data	*cdata = data;
-	char	*pdata;
+	char				*pdata, *cause, *saved;
-	size_t	 psize;
+	size_t				 psize;
-	u_int	 limit;
 
 	if (!closed)
 		return;
 	c->stdin_callback = NULL;
 
-	c->references--;
+	server_client_unref(c);
 	if (c->flags & CLIENT_DEAD)
-		return;
+		goto out;
 
 	psize = EVBUFFER_LENGTH(c->stdin_data);
-	if (psize == 0 || (pdata = malloc(psize + 1)) == NULL) {
+	if (psize == 0 || (pdata = malloc(psize + 1)) == NULL)
-		free(data);
 		goto out;
-	}
+
 	memcpy(pdata, EVBUFFER_DATA(c->stdin_data), psize);
 	pdata[psize] = '\0';
 	evbuffer_drain(c->stdin_data, psize);
 
-	limit = options_get_number(&global_options, "buffer-limit");
+	if (paste_set(pdata, psize, cdata->bufname, &cause) != 0) {
-	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);
+		if (~c->flags & CLIENT_UTF8) {
-		server_push_stderr(c);
+			saved = cause;
+			cause = utf8_sanitize(saved);
+			free(saved);
+		}
+		evbuffer_add_printf(c->stderr_data, "%s", cause);
+		server_client_push_stderr(c);
+		free(pdata);
+		free(cause);
 	}
-
-	free(data);
-
 out:
-	cmdq_continue(c->cmdq);
+	cdata->item->flags &= ~CMDQ_WAITING;
+
+	free(cdata->bufname);
+	free(cdata);
 }

cmd-lock-server.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@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
@@ -18,68 +18,61 @@
 
 #include <sys/types.h>
 
-#include <pwd.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "tmux.h"
 
 /*
  * Lock commands.
  */
 
-enum cmd_retval	 cmd_lock_server_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_lock_server_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_lock_server_entry = {
-	"lock-server", "lock",
+	.name = "lock-server",
-	"", 0, 0,
+	.alias = "lock",
-	"",
+
-	0,
+	.args = { "", 0, 0 },
-	NULL,
+	.usage = "",
-	NULL,
+
-	cmd_lock_server_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_lock_server_exec
 };
 
 const struct cmd_entry cmd_lock_session_entry = {
-	"lock-session", "locks",
+	.name = "lock-session",
-	"t:", 0, 0,
+	.alias = "locks",
-	CMD_TARGET_SESSION_USAGE,
+
-	0,
+	.args = { "t:", 0, 0 },
-	NULL,
+	.usage = CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_lock_server_exec
+	.tflag = CMD_SESSION,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_lock_server_exec
 };
 
 const struct cmd_entry cmd_lock_client_entry = {
-	"lock-client", "lockc",
+	.name = "lock-client",
-	"t:", 0, 0,
+	.alias = "lockc",
-	CMD_TARGET_CLIENT_USAGE,
+
-	0,
+	.args = { "t:", 0, 0 },
-	NULL,
+	.usage = CMD_TARGET_CLIENT_USAGE,
-	NULL,
+
-	cmd_lock_server_exec
+	.tflag = CMD_CLIENT,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_lock_server_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_lock_server_exec(struct cmd *self, unused struct cmd_q *cmdq)
+cmd_lock_server_exec(struct cmd *self, __unused struct cmdq_item *item)
 {
-	struct args	*args = self->args;
-	struct client	*c;
-	struct session	*s;
-
 	if (self->entry == &cmd_lock_server_entry)
 		server_lock();
-	else if (self->entry == &cmd_lock_session_entry) {
+	else if (self->entry == &cmd_lock_session_entry)
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		server_lock_session(item->state.tflag.s);
-		if (s == NULL)
+	else
-			return (CMD_RETURN_ERROR);
+		server_lock_client(item->state.c);
-		server_lock_session(s);
+
-	} else {
-		c = cmd_find_client(cmdq, args_get(args, 't'), 0);
-		if (c == NULL)
-			return (CMD_RETURN_ERROR);
-		server_lock_client(c);
-	}
 	recalculate_sizes();
 
 	return (CMD_RETURN_NORMAL);

cmd-move-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@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
@@ -26,50 +26,79 @@
  * Move a window.
  */
 
-enum cmd_retval	 cmd_move_window_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_move_window_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_move_window_entry = {
-	"move-window", "movew",
+	.name = "move-window",
-	"dkrs:t:", 0, 0,
+	.alias = "movew",
-	"[-dkr] " CMD_SRCDST_WINDOW_USAGE,
+
-	0,
+	.args = { "adkrs:t:", 0, 0 },
-	NULL,
+	.usage = "[-dkr] " CMD_SRCDST_WINDOW_USAGE,
-	NULL,
+
-	cmd_move_window_exec
+	.sflag = CMD_WINDOW,
+	.tflag = CMD_MOVEW_R,
+
+	.flags = 0,
+	.exec = cmd_move_window_exec
 };
 
-enum cmd_retval
+const struct cmd_entry cmd_link_window_entry = {
-cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq)
+	.name = "link-window",
+	.alias = "linkw",
+
+	.args = { "adks:t:", 0, 0 },
+	.usage = "[-dk] " CMD_SRCDST_WINDOW_USAGE,
+
+	.sflag = CMD_WINDOW,
+	.tflag = CMD_WINDOW_INDEX,
+
+	.flags = 0,
+	.exec = cmd_move_window_exec
+};
+
+static enum cmd_retval
+cmd_move_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct session	*src, *dst, *s;
+	struct session	*src = item->state.sflag.s;
-	struct winlink	*wl;
+	struct session	*dst = item->state.tflag.s;
+	struct winlink	*wl = item->state.sflag.wl;
 	char		*cause;
-	int		 idx, kflag, dflag;
+	int		 idx = item->state.tflag.idx, kflag, dflag, sflag;
 
 	if (args_has(args, 'r')) {
-		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+		session_renumber_windows(dst);
-			return (CMD_RETURN_ERROR);
-
-		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) {
+	sflag = args_has(self->args, 's');
-		cmdq_error(cmdq, "can't move window: %s", cause);
+
+	if (args_has(self->args, 'a')) {
+		if ((idx = winlink_shuffle_up(dst, dst->curw)) == -1)
+			return (CMD_RETURN_ERROR);
+	}
+
+	if (server_link_window(src, wl, dst, idx, kflag, !dflag,
+	    &cause) != 0) {
+		cmdq_error(item, "can't link window: %s", cause);
 		free(cause);
 		return (CMD_RETURN_ERROR);
 	}
-	server_unlink_window(src, wl);
+	if (self->entry == &cmd_move_window_entry)
+		server_unlink_window(src, wl);
+
+	/*
+	 * Renumber the winlinks in the src session only, the destination
+	 * session already has the correct winlink id to us, either
+	 * automatically or specified by -s.
+	 */
+	if (!sflag && options_get_number(src->options, "renumber-windows"))
+		session_renumber_windows(src);
+
 	recalculate_sizes();
 
 	return (CMD_RETURN_NORMAL);

cmd-new-session.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -18,7 +18,8 @@
 
 #include <sys/types.h>
 
-#include <pwd.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
@@ -30,69 +31,116 @@
  * Create a new session and attach to the current terminal unless -d is given.
  */
 
-enum cmd_retval	 cmd_new_session_check(struct args *);
+#define NEW_SESSION_TEMPLATE "#{session_name}:"
-enum cmd_retval	 cmd_new_session_exec(struct cmd *, struct cmd_q *);
+
+static enum cmd_retval	cmd_new_session_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_new_session_entry = {
-	"new-session", "new",
+	.name = "new-session",
-	"AdDF:n:Ps:t:x:y:", 0, 1,
+	.alias = "new",
-	"[-AdDP] [-F format] [-n window-name] [-s session-name] "
+
-	CMD_TARGET_SESSION_USAGE " [-x width] [-y height] [command]",
+	.args = { "Ac:dDEF:n:Ps:t:x:y:", 0, -1 },
-	CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON,
+	.usage = "[-AdDEP] [-c start-directory] [-F format] [-n window-name] "
-	NULL,
+		 "[-s session-name] " CMD_TARGET_SESSION_USAGE " [-x width] "
-	cmd_new_session_check,
+		 "[-y height] [command]",
-	cmd_new_session_exec
+
+	.tflag = CMD_SESSION_CANFAIL,
+
+	.flags = CMD_STARTSERVER,
+	.exec = cmd_new_session_exec
 };
 
-enum cmd_retval
+const struct cmd_entry cmd_has_session_entry = {
-cmd_new_session_check(struct args *args)
+	.name = "has-session",
-{
+	.alias = "has",
-	if (args_has(args, 't') && (args->argc != 0 || args_has(args, 'n')))
-		return (CMD_RETURN_ERROR);
-	return (CMD_RETURN_NORMAL);
-}
 
-enum cmd_retval
+	.args = { "t:", 0, 0 },
-cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
+	.usage = CMD_TARGET_SESSION_USAGE,
+
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
+	.exec = cmd_new_session_exec
+};
+
+static enum cmd_retval
+cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct client		*c = cmdq->client;
+	struct client		*c = item->client;
-	struct session		*s, *groupwith;
+	struct session		*s, *as, *groupwith;
 	struct window		*w;
-	struct environ		 env;
+	struct environ		*env;
 	struct termios		 tio, *tiop;
-	struct passwd		*pw;
+	struct session_group	*sg;
-	const char		*newname, *target, *update, *cwd, *errstr;
+	const char		*newname, *errstr, *template, *group, *prefix;
-	const char		*template;
+	const char		*path, *cmd, *cwd, *to_free = NULL;
-	char			*cmd, *cause, *cp;
+	char		       **argv, *cause, *cp;
-	int			 detached, idx;
+	int			 detached, already_attached, idx, argc;
 	u_int			 sx, sy;
-	int			 already_attached;
+	struct environ_entry	*envent;
-	struct format_tree	*ft;
+	struct cmd_find_state	 fs;
+
+	if (self->entry == &cmd_has_session_entry) {
+		/*
+		 * cmd_prepare() will fail if the session cannot be found,
+		 * hence always return success here.
+		 */
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (args_has(args, 't') && (args->argc != 0 || args_has(args, 'n'))) {
+		cmdq_error(item, "command or window name given with target");
+		return (CMD_RETURN_ERROR);
+	}
 
 	newname = args_get(args, 's');
 	if (newname != NULL) {
 		if (!session_check_name(newname)) {
-			cmdq_error(cmdq, "bad session name: %s", newname);
+			cmdq_error(item, "bad session name: %s", newname);
 			return (CMD_RETURN_ERROR);
 		}
-		if (session_find(newname) != NULL) {
+		if ((as = session_find(newname)) != NULL) {
 			if (args_has(args, 'A')) {
-				return (cmd_attach_session(cmdq, newname,
+				/*
-				    args_has(args, 'D'), 0));
+				 * This item is now destined for
+				 * attach-session. Because attach-session will
+				 * have already been prepared, copy this
+				 * session into its tflag so it can be used.
+				 */
+				cmd_find_from_session(&item->state.tflag, as);
+				return (cmd_attach_session(item,
+				    args_has(args, 'D'), 0, NULL,
+				    args_has(args, 'E')));
 			}
-			cmdq_error(cmdq, "duplicate session: %s", newname);
+			cmdq_error(item, "duplicate session: %s", newname);
 			return (CMD_RETURN_ERROR);
 		}
 	}
 
-	target = args_get(args, 't');
+	/* Is this going to be part of a session group? */
-	if (target != NULL) {
+	group = args_get(args, 't');
-		groupwith = cmd_find_session(cmdq, target, 0);
+	if (group != NULL) {
-		if (groupwith == NULL)
+		groupwith = item->state.tflag.s;
-			return (CMD_RETURN_ERROR);
+		if (groupwith == NULL) {
-	} else
+			if (!session_check_name(group)) {
+				cmdq_error(item, "bad group name: %s", group);
+				goto error;
+			}
+			sg = session_group_find(group);
+		} else
+			sg = session_group_contains(groupwith);
+		if (sg != NULL)
+			prefix = sg->name;
+		else if (groupwith != NULL)
+			prefix = groupwith->name;
+		else
+			prefix = group;
+	} else {
 		groupwith = NULL;
+		sg = NULL;
+		prefix = NULL;
+	}
 
 	/* Set -d if no client. */
 	detached = args_has(args, 'd');
@@ -104,16 +152,30 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (c != NULL && c->session != NULL)
 		already_attached = 1;
 
+	/* Get the new session working directory. */
+	if (args_has(args, 'c')) {
+		cwd = args_get(args, 'c');
+		to_free = cwd = format_single(item, cwd, c, NULL, NULL, NULL);
+	} else if (c != NULL && c->session == NULL && c->cwd != NULL)
+		cwd = c->cwd;
+	else
+		cwd = ".";
+
 	/*
-	 * Save the termios settings, part of which is used for new windows in
+	 * If this is a new client, check for nesting and save the termios
-	 * this session.
+	 * settings (part of which is used for new windows in this session).
 	 *
-	 * This is read again with tcgetattr() rather than using tty.tio as if
+	 * tcgetattr() is used rather than using tty.tio since if the client is
-	 * detached, tty_open won't be called. Because of this, it must be done
+	 * detached, tty_open won't be called. It must be done before opening
-	 * before opening the terminal as that calls tcsetattr() to prepare for
+	 * the terminal as that calls tcsetattr() to prepare for tmux taking
-	 * tmux taking over.
+	 * over.
 	 */
 	if (!detached && !already_attached && c->tty.fd != -1) {
+		if (server_client_check_nested(item->client)) {
+			cmdq_error(item, "sessions should be nested with care, "
+			    "unset $TMUX to force");
+			return (CMD_RETURN_ERROR);
+		}
 		if (tcgetattr(c->tty.fd, &tio) != 0)
 			fatal("tcgetattr failed");
 		tiop = &tio;
@@ -122,24 +184,13 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	/* Open the terminal if necessary. */
 	if (!detached && !already_attached) {
-		if (server_client_open(c, NULL, &cause) != 0) {
+		if (server_client_open(c, &cause) != 0) {
-			cmdq_error(cmdq, "open terminal failed: %s", cause);
+			cmdq_error(item, "open terminal failed: %s", cause);
 			free(cause);
-			return (CMD_RETURN_ERROR);
+			goto error;
 		}
 	}
 
-	/* Get the new session working directory. */
-	if (c != NULL && c->cwd != NULL)
-		cwd = c->cwd;
-	else {
-		pw = getpwuid(getuid());
-		if (pw->pw_dir != NULL && *pw->pw_dir != '\0')
-			cwd = pw->pw_dir;
-		else
-			cwd = "/";
-	}
-
 	/* Find new session size. */
 	if (c != NULL) {
 		sx = c->tty.sx;
@@ -151,18 +202,18 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (detached && args_has(args, 'x')) {
 		sx = strtonum(args_get(args, 'x'), 1, USHRT_MAX, &errstr);
 		if (errstr != NULL) {
-			cmdq_error(cmdq, "width %s", errstr);
+			cmdq_error(item, "width %s", errstr);
-			return (CMD_RETURN_ERROR);
+			goto error;
 		}
 	}
 	if (detached && args_has(args, 'y')) {
 		sy = strtonum(args_get(args, 'y'), 1, USHRT_MAX, &errstr);
 		if (errstr != NULL) {
-			cmdq_error(cmdq, "height %s", errstr);
+			cmdq_error(item, "height %s", errstr);
-			return (CMD_RETURN_ERROR);
+			goto error;
 		}
 	}
-	if (sy > 0 && options_get_number(&global_s_options, "status"))
+	if (sy > 0 && options_get_number(global_s_options, "status"))
 		sy--;
 	if (sx == 0)
 		sx = 1;
@@ -170,58 +221,88 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 		sy = 1;
 
 	/* Figure out the command for the new window. */
-	if (target != NULL)
+	argc = -1;
-		cmd = NULL;
+	argv = NULL;
-	else if (args->argc != 0)
+	if (!args_has(args, 't') && args->argc != 0) {
-		cmd = args->argv[0];
+		argc = args->argc;
+		argv = args->argv;
+	} else if (sg == NULL && groupwith == NULL) {
+		cmd = options_get_string(global_s_options, "default-command");
+		if (cmd != NULL && *cmd != '\0') {
+			argc = 1;
+			argv = (char **)&cmd;
+		} else {
+			argc = 0;
+			argv = NULL;
+		}
+	}
+
+	path = NULL;
+	if (c != NULL && c->session == NULL)
+		envent = environ_find(c->environ, "PATH");
 	else
-		cmd = options_get_string(&global_s_options, "default-command");
+		envent = environ_find(global_environ, "PATH");
+	if (envent != NULL)
+		path = envent->value;
 
 	/* Construct the environment. */
-	environ_init(&env);
+	env = environ_create();
-	update = options_get_string(&global_s_options, "update-environment");
+	if (c != NULL && !args_has(args, 'E'))
-	if (c != NULL)
+		environ_update(global_s_options, c->environ, env);
-		environ_update(update, &c->environ, &env);
 
 	/* Create the new session. */
-	idx = -1 - options_get_number(&global_s_options, "base-index");
+	idx = -1 - options_get_number(global_s_options, "base-index");
-	s = session_create(newname, cmd, cwd, &env, tiop, idx, sx, sy, &cause);
+	s = session_create(prefix, newname, argc, argv, path, cwd, env, tiop,
+	    idx, sx, sy, &cause);
+	environ_free(env);
 	if (s == NULL) {
-		cmdq_error(cmdq, "create session failed: %s", cause);
+		cmdq_error(item, "create session failed: %s", cause);
 		free(cause);
-		return (CMD_RETURN_ERROR);
+		goto error;
 	}
-	environ_free(&env);
 
 	/* Set the initial window name if one given. */
-	if (cmd != NULL && args_has(args, 'n')) {
+	if (argc >= 0 && args_has(args, 'n')) {
 		w = s->curw->window;
 		window_set_name(w, args_get(args, 'n'));
-		options_set_number(&w->options, "automatic-rename", 0);
+		options_set_number(w->options, "automatic-rename", 0);
 	}
 
 	/*
 	 * If a target session is given, this is to be part of a session group,
 	 * so add it to the group and synchronize.
 	 */
-	if (groupwith != NULL) {
+	if (group != NULL) {
-		session_group_add(groupwith, s);
+		if (sg == NULL) {
+			if (groupwith != NULL) {
+				sg = session_group_new(groupwith->name);
+				session_group_add(sg, groupwith);
+			} else
+				sg = session_group_new(group);
+		}
+		session_group_add(sg, s);
 		session_group_synchronize_to(s);
-		session_select(s, RB_ROOT(&s->windows)->idx);
+		session_select(s, RB_MIN(winlinks, &s->windows)->idx);
 	}
+	notify_session("session-created", s);
 
 	/*
 	 * Set the client to the new session. If a command client exists, it is
 	 * taking this session and needs to get MSG_READY and stay around.
 	 */
 	if (!detached) {
-		if (!already_attached)
+		if (!already_attached) {
-			server_write_ready(c);
+			if (~c->flags & CLIENT_CONTROL)
-		else if (c->session != NULL)
+				proc_send(c->peer, MSG_READY, -1, NULL, 0);
+		} else if (c->session != NULL)
 			c->last_session = c->session;
 		c->session = s;
-		notify_attached_session_changed(c);
+		if (!item->repeat)
-		session_update_activity(s);
+			server_client_set_key_table(c, NULL);
+		status_timer_start(c);
+		notify_client("client-session-changed", c);
+		session_update_activity(s, NULL);
+		gettimeofday(&s->last_attached_time, NULL);
 		server_redraw_client(c);
 	}
 	recalculate_sizes();
@@ -238,20 +319,24 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
 			template = NEW_SESSION_TEMPLATE;
-
+		cp = format_single(item, template, c, s, NULL, NULL);
-		ft = format_create();
+		cmdq_print(item, "%s", cp);
-		if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL)
-			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)
-		cmdq->client_exit = 0;
+		c->flags |= CLIENT_ATTACHED;
+
+	if (to_free != NULL)
+		free((void *)to_free);
+
+	cmd_find_from_session(&fs, s);
+	hooks_insert(s->hooks, item, &fs, "after-new-session");
+
 	return (CMD_RETURN_NORMAL);
+
+error:
+	if (to_free != NULL)
+		free((void *)to_free);
+	return (CMD_RETURN_ERROR);
 }

cmd-new-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -18,7 +18,11 @@
 
 #include <sys/types.h>
 
+#include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "tmux.h"
 
@@ -26,59 +30,77 @@
  * Create a new window.
  */
 
-enum cmd_retval	cmd_new_window_exec(struct cmd *, struct cmd_q *);
+#define NEW_WINDOW_TEMPLATE "#{session_name}:#{window_index}.#{pane_index}"
+
+static enum cmd_retval	cmd_new_window_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_new_window_entry = {
-	"new-window", "neww",
+	.name = "new-window",
-	"ac:dF:kn:Pt:", 0, 1,
+	.alias = "neww",
-	"[-adkP] [-c start-directory] [-F format] [-n window-name] "
+
-	CMD_TARGET_WINDOW_USAGE " [command]",
+	.args = { "ac:dF:kn:Pt:", 0, -1 },
-	0,
+	.usage = "[-adkP] [-c start-directory] [-F format] [-n window-name] "
-	NULL,
+		 CMD_TARGET_WINDOW_USAGE " [command]",
-	NULL,
+
-	cmd_new_window_exec
+	.tflag = CMD_WINDOW_INDEX,
+
+	.flags = 0,
+	.exec = cmd_new_window_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct session		*s;
+	struct session		*s = item->state.tflag.s;
-	struct winlink		*wl;
+	struct winlink		*wl = item->state.tflag.wl;
-	struct client		*c;
+	struct client		*c = item->state.c;
-	const char		*cmd, *cwd, *template;
+	int			 idx = item->state.tflag.idx;
-	char			*cause, *cp;
+	const char		*cmd, *path, *template, *cwd, *to_free;
-	int			 idx, last, detached;
+	char		       **argv, *cause, *cp;
-	struct format_tree	*ft;
+	int			 argc, detached;
+	struct environ_entry	*envent;
+	struct cmd_find_state	 fs;
 
 	if (args_has(args, 'a')) {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
+		if ((idx = winlink_shuffle_up(s, wl)) == -1) {
-		if (wl == NULL)
+			cmdq_error(item, "no free window indexes");
-			return (CMD_RETURN_ERROR);
-		idx = wl->idx + 1;
-
-		/* Find the next free index. */
-		for (last = idx; last < INT_MAX; last++) {
-			if (winlink_find_by_index(&s->windows, last) == NULL)
-				break;
-		}
-		if (last == INT_MAX) {
-			cmdq_error(cmdq, "no free window indexes");
 			return (CMD_RETURN_ERROR);
 		}
-
-		/* Move everything from last - 1 to idx up a bit. */
-		for (; last > idx; last--) {
-			wl = winlink_find_by_index(&s->windows, last - 1);
-			server_link_window(s, wl, s, last, 0, 0, NULL);
-			server_unlink_window(s, wl);
-		}
-	} else {
-		if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &s)) == -2)
-			return (CMD_RETURN_ERROR);
 	}
 	detached = args_has(args, 'd');
 
+	if (args->argc == 0) {
+		cmd = options_get_string(s->options, "default-command");
+		if (cmd != NULL && *cmd != '\0') {
+			argc = 1;
+			argv = (char **)&cmd;
+		} else {
+			argc = 0;
+			argv = NULL;
+		}
+	} else {
+		argc = args->argc;
+		argv = args->argv;
+	}
+
+	path = NULL;
+	if (item->client != NULL && item->client->session == NULL)
+		envent = environ_find(item->client->environ, "PATH");
+	else
+		envent = environ_find(s->environ, "PATH");
+	if (envent != NULL)
+		path = envent->value;
+
+	to_free = NULL;
+	if (args_has(args, 'c')) {
+		cwd = args_get(args, 'c');
+		to_free = cwd = format_single(item, cwd, c, s, NULL, NULL);
+	} else if (item->client != NULL && item->client->session == NULL)
+		cwd = item->client->cwd;
+	else
+		cwd = s->cwd;
+
 	wl = NULL;
 	if (idx != -1)
 		wl = winlink_find_by_index(&s->windows, idx);
@@ -87,7 +109,7 @@ 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);
+		notify_session_window("window-unlinked", s, wl->window);
 		wl->flags &= ~WINLINK_ALERTFLAGS;
 		winlink_stack_remove(&s->lastw, wl);
 		winlink_remove(&s->windows, wl);
@@ -99,19 +121,14 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		}
 	}
 
-	if (args->argc == 0)
-		cmd = options_get_string(&s->options, "default-command");
-	else
-		cmd = args->argv[0];
-	cwd = cmd_get_default_path(cmdq, args_get(args, 'c'));
-
 	if (idx == -1)
-		idx = -1 - options_get_number(&s->options, "base-index");
+		idx = -1 - options_get_number(s->options, "base-index");
-	wl = session_new(s, args_get(args, 'n'), cmd, cwd, idx, &cause);
+	wl = session_new(s, args_get(args, 'n'), argc, argv, path, cwd, idx,
+		&cause);
 	if (wl == NULL) {
-		cmdq_error(cmdq, "create window failed: %s", cause);
+		cmdq_error(item, "create window failed: %s", cause);
 		free(cause);
-		return (CMD_RETURN_ERROR);
+		goto error;
 	}
 	if (!detached) {
 		session_select(s, wl->idx);
@@ -122,20 +139,21 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
 			template = NEW_WINDOW_TEMPLATE;
-
+		cp = format_single(item, template, c, s, wl, NULL);
-		ft = format_create();
+		cmdq_print(item, "%s", cp);
-		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);
 	}
 
+	if (to_free != NULL)
+		free((void *)to_free);
+
+	cmd_find_from_winlink(&fs, s, wl);
+	hooks_insert(s->hooks, item, &fs, "after-new-window");
+
 	return (CMD_RETURN_NORMAL);
+
+error:
+	if (to_free != NULL)
+		free((void *)to_free);
+	return (CMD_RETURN_ERROR);
 }

cmd-paste-buffer.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,58 +27,47 @@
  * Paste paste buffer if present.
  */
 
-enum cmd_retval	 cmd_paste_buffer_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_paste_buffer_exec(struct cmd *, struct cmdq_item *);
-
-void	cmd_paste_buffer_filter(struct window_pane *,
-	    const char *, size_t, const char *, int);
 
 const struct cmd_entry cmd_paste_buffer_entry = {
-	"paste-buffer", "pasteb",
+	.name = "paste-buffer",
-	"db:prs:t:", 0, 0,
+	.alias = "pasteb",
-	"[-dpr] [-s separator] [-b buffer-index] " CMD_TARGET_PANE_USAGE,
+
-	0,
+	.args = { "db:prs:t:", 0, 0 },
-	NULL,
+	.usage = "[-dpr] [-s separator] " CMD_BUFFER_USAGE " "
-	NULL,
+		 CMD_TARGET_PANE_USAGE,
-	cmd_paste_buffer_exec
+
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_paste_buffer_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_paste_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct window_pane	*wp;
+	struct window_pane	*wp = item->state.tflag.wp;
-	struct session		*s;
 	struct paste_buffer	*pb;
-	const char		*sepstr;
+	const char		*sepstr, *bufname, *bufdata, *bufend, *line;
-	char			*cause;
+	size_t			 seplen, bufsize;
-	int			 buffer;
+	int			 bracket = args_has(args, 'p');
-	int			 pflag;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
+	bufname = NULL;
-		return (CMD_RETURN_ERROR);
+	if (args_has(args, 'b'))
+		bufname = args_get(args, 'b');
 
-	if (!args_has(args, 'b'))
+	if (bufname == NULL)
-		buffer = -1;
+		pb = paste_get_top(NULL);
 	else {
-		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
+		pb = paste_get_name(bufname);
-		if (cause != NULL) {
-			cmdq_error(cmdq, "buffer %s", cause);
-			free(cause);
-			return (CMD_RETURN_ERROR);
-		}
-	}
-
-	if (buffer == -1)
-		pb = paste_get_top(&global_buffers);
-	else {
-		pb = paste_get_index(&global_buffers, buffer);
 		if (pb == NULL) {
-			cmdq_error(cmdq, "no buffer %d", buffer);
+			cmdq_error(item, "no buffer %s", bufname);
 			return (CMD_RETURN_ERROR);
 		}
 	}
 
-	if (pb != NULL) {
+	if (pb != NULL && ~wp->flags & PANE_INPUTOFF) {
 		sepstr = args_get(args, 's');
 		if (sepstr == NULL) {
 			if (args_has(args, 'r'))
@@ -86,17 +75,33 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 			else
 				sepstr = "\r";
 		}
-		pflag = (wp->screen->mode & MODE_BRACKETPASTE);
+		seplen = strlen(sepstr);
-		paste_send_pane(pb, wp, sepstr, args_has(args, 'p') && pflag);
+
+		if (bracket && (wp->screen->mode & MODE_BRACKETPASTE))
+			bufferevent_write(wp->event, "\033[200~", 6);
+
+		bufdata = paste_buffer_data(pb, &bufsize);
+		bufend = bufdata + bufsize;
+
+		for (;;) {
+			line = memchr(bufdata, '\n', bufend - bufdata);
+			if (line == NULL)
+				break;
+
+			bufferevent_write(wp->event, bufdata, line - bufdata);
+			bufferevent_write(wp->event, sepstr, seplen);
+
+			bufdata = line + 1;
+		}
+		if (bufdata != bufend)
+			bufferevent_write(wp->event, bufdata, bufend - bufdata);
+
+		if (bracket && (wp->screen->mode & MODE_BRACKETPASTE))
+			bufferevent_write(wp->event, "\033[201~", 6);
 	}
 
-	/* Delete the buffer if -d. */
+	if (pb != NULL && args_has(args, 'd'))
-	if (args_has(args, 'd')) {
+		paste_free(pb);
-		if (buffer == -1)
-			paste_free_top(&global_buffers);
-		else
-			paste_free_index(&global_buffers, buffer);
-	}
 
 	return (CMD_RETURN_NORMAL);
 }

cmd-pipe-pane.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -21,6 +21,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
@@ -31,32 +32,34 @@
  * Open pipe to redirect pane output. If already open, close first.
  */
 
-enum cmd_retval	 cmd_pipe_pane_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_pipe_pane_exec(struct cmd *, struct cmdq_item *);
 
-void	cmd_pipe_pane_error_callback(struct bufferevent *, short, void *);
+static void cmd_pipe_pane_error_callback(struct bufferevent *, short, void *);
 
 const struct cmd_entry cmd_pipe_pane_entry = {
-	"pipe-pane", "pipep",
+	.name = "pipe-pane",
-	"ot:", 0, 1,
+	.alias = "pipep",
-	"[-o] " CMD_TARGET_PANE_USAGE " [command]",
+
-	0,
+	.args = { "ot:", 0, 1 },
-	NULL,
+	.usage = "[-o] " CMD_TARGET_PANE_USAGE " [command]",
-	NULL,
+
-	cmd_pipe_pane_exec
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_pipe_pane_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct client		*c;
+	struct client		*c = item->state.c;
-	struct window_pane	*wp;
+	struct window_pane	*wp = item->state.tflag.wp;
-	char			*command;
+	struct session		*s = item->state.tflag.s;
+	struct winlink		*wl = item->state.tflag.wl;
+	char			*cmd;
 	int			 old_fd, pipe_fd[2], null_fd;
-
+	struct format_tree	*ft;
-	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
-	c = cmd_find_client(cmdq, NULL, 1);
 
 	/* Destroy the old pipe. */
 	old_fd = wp->pipe_fd;
@@ -81,14 +84,22 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	/* Open the new pipe. */
 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_fd) != 0) {
-		cmdq_error(cmdq, "socketpair error: %s", strerror(errno));
+		cmdq_error(item, "socketpair error: %s", strerror(errno));
 		return (CMD_RETURN_ERROR);
 	}
 
+	/* Expand the command. */
+	ft = format_create(item, FORMAT_NONE, 0);
+	format_defaults(ft, c, s, wl, wp);
+	cmd = format_expand_time(ft, args->argv[0], time(NULL));
+	format_free(ft);
+
 	/* Fork the child. */
 	switch (fork()) {
 	case -1:
-		cmdq_error(cmdq, "fork error: %s", strerror(errno));
+		cmdq_error(item, "fork error: %s", strerror(errno));
+
+		free(cmd);
 		return (CMD_RETURN_ERROR);
 	case 0:
 		/* Child process. */
@@ -110,9 +121,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 
 		closefrom(STDERR_FILENO + 1);
 
-		command = status_replace(
+		execl(_PATH_BSHELL, "sh", "-c", cmd, (char *) NULL);
-		    c, NULL, NULL, NULL, args->argv[0], time(NULL), 0);
-		execl(_PATH_BSHELL, "sh", "-c", command, (char *) NULL);
 		_exit(1);
 	default:
 		/* Parent process. */
@@ -126,13 +135,15 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 		bufferevent_enable(wp->pipe_event, EV_WRITE);
 
 		setblocking(wp->pipe_fd, 0);
+
+		free(cmd);
 		return (CMD_RETURN_NORMAL);
 	}
 }
 
-void
+static void
-cmd_pipe_pane_error_callback(
+cmd_pipe_pane_error_callback(__unused struct bufferevent *bufev,
-    unused struct bufferevent *bufev, unused short what, void *data)
+    __unused short what, void *data)
 {
 	struct window_pane	*wp = data;
 

cmd-queue.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@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
@@ -20,61 +20,381 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 #include "tmux.h"
 
-/* Create new command queue. */
+/* Global command queue. */
-struct cmd_q *
+static struct cmdq_list global_queue = TAILQ_HEAD_INITIALIZER(global_queue);
-cmdq_new(struct client *c)
+
+/* Get command queue name. */
+static const char *
+cmdq_name(struct client *c)
 {
-	struct cmd_q	*cmdq;
+	static char	s[32];
 
-	cmdq = xcalloc(1, sizeof *cmdq);
+	if (c == NULL)
-	cmdq->references = 1;
+		return ("<global>");
-	cmdq->dead = 0;
+	xsnprintf(s, sizeof s, "<%p>", c);
-
+	return (s);
-	cmdq->client = c;
-	cmdq->client_exit = 0;
-
-	TAILQ_INIT(&cmdq->queue);
-	cmdq->item = NULL;
-	cmdq->cmd = NULL;
-
-	return (cmdq);
 }
 
-/* Free command queue */
+/* Get command queue from client. */
-int
+static struct cmdq_list *
-cmdq_free(struct cmd_q *cmdq)
+cmdq_get(struct client *c)
 {
-	if (--cmdq->references != 0)
+	if (c == NULL)
-		return (cmdq->dead);
+		return (&global_queue);
+	return (&c->queue);
+}
 
-	cmdq_flush(cmdq);
+/* Append an item. */
-	free(cmdq);
+void
-	return (1);
+cmdq_append(struct client *c, struct cmdq_item *item)
+{
+	struct cmdq_list	*queue = cmdq_get(c);
+	struct cmdq_item	*next;
+
+	do {
+		next = item->next;
+		item->next = NULL;
+
+		if (c != NULL)
+			c->references++;
+		item->client = c;
+
+		item->queue = queue;
+		TAILQ_INSERT_TAIL(queue, item, entry);
+
+		item = next;
+	} while (item != NULL);
+}
+
+/* Insert an item. */
+void
+cmdq_insert_after(struct cmdq_item *after, struct cmdq_item *item)
+{
+	struct client		*c = after->client;
+	struct cmdq_list	*queue = after->queue;
+	struct cmdq_item	*next;
+
+	do {
+		next = item->next;
+		item->next = NULL;
+
+		if (c != NULL)
+			c->references++;
+		item->client = c;
+
+		item->queue = queue;
+		if (after->next != NULL)
+			TAILQ_INSERT_AFTER(queue, after->next, item, entry);
+		else
+			TAILQ_INSERT_AFTER(queue, after, item, entry);
+		after->next = item;
+
+		item = next;
+	} while (item != NULL);
+}
+
+/* Remove an item. */
+static void
+cmdq_remove(struct cmdq_item *item)
+{
+	if (item->formats != NULL)
+		format_free(item->formats);
+
+	if (item->client != NULL)
+		server_client_unref(item->client);
+
+	if (item->type == CMDQ_COMMAND)
+		cmd_list_free(item->cmdlist);
+
+	TAILQ_REMOVE(item->queue, item, entry);
+
+	free((void *)item->name);
+	free(item);
+}
+
+/* Set command group. */
+static u_int
+cmdq_next_group(void)
+{
+	static u_int	group;
+
+	return (++group);
+}
+
+/* Remove all subsequent items that match this item's group. */
+static void
+cmdq_remove_group(struct cmdq_item *item)
+{
+	struct cmdq_item	*this, *next;
+
+	this = TAILQ_NEXT(item, entry);
+	while (this != NULL) {
+		next = TAILQ_NEXT(this, entry);
+		if (this->group == item->group)
+			cmdq_remove(this);
+		this = next;
+	}
+}
+
+/* Get a command for the command queue. */
+struct cmdq_item *
+cmdq_get_command(struct cmd_list *cmdlist, struct cmd_find_state *current,
+    struct mouse_event *m, int flags)
+{
+	struct cmdq_item	*item, *first = NULL, *last = NULL;
+	struct cmd		*cmd;
+	u_int			 group = cmdq_next_group();
+	char			*tmp;
+
+	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
+		xasprintf(&tmp, "command[%s]", cmd->entry->name);
+
+		item = xcalloc(1, sizeof *item);
+		item->name = tmp;
+		item->type = CMDQ_COMMAND;
+
+		item->group = group;
+		item->flags = flags;
+
+		item->cmdlist = cmdlist;
+		item->cmd = cmd;
+
+		if (current != NULL)
+			cmd_find_copy_state(&item->current, current);
+		if (m != NULL)
+			memcpy(&item->mouse, m, sizeof item->mouse);
+		cmdlist->references++;
+
+		if (first == NULL)
+			first = item;
+		if (last != NULL)
+			last->next = item;
+		last = item;
+	}
+	return (first);
+}
+
+/* Fire command on command queue. */
+static enum cmd_retval
+cmdq_fire_command(struct cmdq_item *item)
+{
+	struct client		*c = item->client;
+	struct cmd		*cmd = item->cmd;
+	enum cmd_retval		 retval;
+	const char		*name;
+	struct cmd_find_state	*fsp, fs;
+	int			 flags;
+
+	flags = !!(cmd->flags & CMD_CONTROL);
+	cmdq_guard(item, "begin", flags);
+
+	if (cmd_prepare_state(cmd, item) != 0) {
+		retval = CMD_RETURN_ERROR;
+		goto out;
+	}
+	if (item->client == NULL)
+		item->client = cmd_find_client(item, NULL, CMD_FIND_QUIET);
+
+	retval = cmd->entry->exec(cmd, item);
+	if (retval == CMD_RETURN_ERROR)
+		goto out;
+
+	if (cmd->entry->flags & CMD_AFTERHOOK) {
+		name = cmd->entry->name;
+		if (cmd_find_valid_state(&item->state.tflag))
+			fsp = &item->state.tflag;
+		else {
+			if (cmd_find_current(&fs, item, CMD_FIND_QUIET) != 0)
+				goto out;
+			fsp = &fs;
+		}
+		hooks_insert(fsp->s->hooks, item, fsp, "after-%s", name);
+	}
+
+out:
+	item->client = c;
+	if (retval == CMD_RETURN_ERROR)
+		cmdq_guard(item, "error", flags);
+	else
+		cmdq_guard(item, "end", flags);
+	return (retval);
+}
+
+/* Get a callback for the command queue. */
+struct cmdq_item *
+cmdq_get_callback1(const char *name, cmdq_cb cb, void *data)
+{
+	struct cmdq_item	*item;
+	char			*tmp;
+
+	xasprintf(&tmp, "callback[%s]", name);
+
+	item = xcalloc(1, sizeof *item);
+	item->name = tmp;
+	item->type = CMDQ_CALLBACK;
+
+	item->group = 0;
+	item->flags = 0;
+
+	item->cb = cb;
+	item->data = data;
+
+	return (item);
+}
+
+/* Fire callback on callback queue. */
+static enum cmd_retval
+cmdq_fire_callback(struct cmdq_item *item)
+{
+	return (item->cb(item, item->data));
+}
+
+/* Add a format to command queue. */
+void
+cmdq_format(struct cmdq_item *item, const char *key, const char *fmt, ...)
+{
+	va_list			 ap;
+	struct cmdq_item	*loop;
+	char			*value;
+
+	va_start(ap, fmt);
+	xvasprintf(&value, fmt, ap);
+	va_end(ap);
+
+	for (loop = item; loop != NULL; loop = item->next) {
+		if (loop->formats == NULL)
+			loop->formats = format_create(NULL, FORMAT_NONE, 0);
+		format_add(loop->formats, key, "%s", value);
+	}
+
+	free(value);
+}
+
+/* Process next item on command queue. */
+u_int
+cmdq_next(struct client *c)
+{
+	struct cmdq_list	*queue = cmdq_get(c);
+	const char		*name = cmdq_name(c);
+	struct cmdq_item	*item;
+	enum cmd_retval		 retval;
+	u_int			 items = 0;
+	static u_int		 number;
+
+	if (TAILQ_EMPTY(queue)) {
+		log_debug("%s %s: empty", __func__, name);
+		return (0);
+	}
+	if (TAILQ_FIRST(queue)->flags & CMDQ_WAITING) {
+		log_debug("%s %s: waiting", __func__, name);
+		return (0);
+	}
+
+	log_debug("%s %s: enter", __func__, name);
+	for (;;) {
+		item = TAILQ_FIRST(queue);
+		if (item == NULL)
+			break;
+		log_debug("%s %s: %s (%d), flags %x", __func__, name,
+		    item->name, item->type, item->flags);
+
+		/*
+		 * Any item with the waiting flag set waits until an external
+		 * event clears the flag (for example, a job - look at
+		 * run-shell).
+		 */
+		if (item->flags & CMDQ_WAITING)
+			goto waiting;
+
+		/*
+		 * Items are only fired once, once the fired flag is set, a
+		 * waiting flag can only be cleared by an external event.
+		 */
+		if (~item->flags & CMDQ_FIRED) {
+			item->time = time(NULL);
+			item->number = ++number;
+
+			switch (item->type)
+			{
+			case CMDQ_COMMAND:
+				retval = cmdq_fire_command(item);
+
+				/*
+				 * If a command returns an error, remove any
+				 * subsequent commands in the same group.
+				 */
+				if (retval == CMD_RETURN_ERROR)
+					cmdq_remove_group(item);
+				break;
+			case CMDQ_CALLBACK:
+				retval = cmdq_fire_callback(item);
+				break;
+			default:
+				retval = CMD_RETURN_ERROR;
+				break;
+			}
+			item->flags |= CMDQ_FIRED;
+
+			if (retval == CMD_RETURN_WAIT) {
+				item->flags |= CMDQ_WAITING;
+				goto waiting;
+			}
+			items++;
+		}
+		cmdq_remove(item);
+	}
+
+	log_debug("%s %s: exit (empty)", __func__, name);
+	return (items);
+
+waiting:
+	log_debug("%s %s: exit (wait)", __func__, name);
+	return (items);
+}
+
+/* Print a guard line. */
+void
+cmdq_guard(struct cmdq_item *item, const char *guard, int flags)
+{
+	struct client	*c = item->client;
+
+	if (c == NULL || !(c->flags & CLIENT_CONTROL))
+		return;
+
+	evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard,
+	    (long)item->time, item->number, flags);
+	server_client_push_stdout(c);
 }
 
 /* Show message from command. */
-void printflike2
+void
-cmdq_print(struct cmd_q *cmdq, const char *fmt, ...)
+cmdq_print(struct cmdq_item *item, const char *fmt, ...)
 {
-	struct client	*c = cmdq->client;
+	struct client	*c = item->client;
 	struct window	*w;
 	va_list		 ap;
+	char		*tmp, *msg;
 
 	va_start(ap, fmt);
 
 	if (c == NULL)
 		/* nothing */;
 	else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
-		va_start(ap, fmt);
+		if (~c->flags & CLIENT_UTF8) {
-		evbuffer_add_vprintf(c->stdout_data, fmt, ap);
+			xvasprintf(&tmp, fmt, ap);
-		va_end(ap);
+			msg = utf8_sanitize(tmp);
-
+			free(tmp);
+			evbuffer_add(c->stdout_data, msg, strlen(msg));
+			free(msg);
+		} else
+			evbuffer_add_vprintf(c->stdout_data, fmt, ap);
 		evbuffer_add(c->stdout_data, "\n", 1);
-		server_push_stdout(c);
+		server_client_push_stdout(c);
 	} else {
 		w = c->session->curw->window;
 		if (w->active->mode != &window_copy_mode) {
@@ -88,62 +408,34 @@ cmdq_print(struct cmd_q *cmdq, const char *fmt, ...)
 	va_end(ap);
 }
 
-/* Show info from command. */
+/* Show error from command. */
-void printflike2
+void
-cmdq_info(struct cmd_q *cmdq, const char *fmt, ...)
+cmdq_error(struct cmdq_item *item, const char *fmt, ...)
 {
-	struct client	*c = cmdq->client;
+	struct client	*c = item->client;
+	struct cmd	*cmd = item->cmd;
 	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;
+	char		*tmp;
 
 	va_start(ap, fmt);
 	msglen = xvasprintf(&msg, fmt, ap);
 	va_end(ap);
 
-	if (c == NULL) {
+	if (c == NULL)
-		xasprintf(&cause, "%s:%u: %s", cmd->file, cmd->line, msg);
+		cfg_add_cause("%s:%u: %s", cmd->file, cmd->line, msg);
-		ARRAY_ADD(&cfg_causes, cause);
+	else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
-	} else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
+		if (~c->flags & CLIENT_UTF8) {
+			tmp = msg;
+			msg = utf8_sanitize(tmp);
+			free(tmp);
+			msglen = strlen(msg);
+		}
 		evbuffer_add(c->stderr_data, msg, msglen);
 		evbuffer_add(c->stderr_data, "\n", 1);
-
+		server_client_push_stderr(c);
-		server_push_stderr(c);
+		c->retval = 1;
-		c->retcode = 1;
 	} else {
 		*msg = toupper((u_char) *msg);
 		status_message_set(c, "%s", msg);
@@ -151,132 +443,3 @@ cmdq_error(struct cmd_q *cmdq, const char *fmt, ...)
 
 	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

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -24,54 +24,57 @@
  * Refresh client.
  */
 
-enum cmd_retval	 cmd_refresh_client_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_refresh_client_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_refresh_client_entry = {
-	"refresh-client", "refresh",
+	.name = "refresh-client",
-	"C:St:", 0, 0,
+	.alias = "refresh",
-	"[-S] [-C size]" CMD_TARGET_CLIENT_USAGE,
+
-	0,
+	.args = { "C:St:", 0, 0 },
-	NULL,
+	.usage = "[-S] [-C size] " CMD_TARGET_CLIENT_USAGE,
-	NULL,
+
-	cmd_refresh_client_exec
+	.tflag = CMD_CLIENT,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_refresh_client_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_refresh_client_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct client	*c;
+	struct client	*c = item->state.c;
 	const char	*size;
 	u_int		 w, h;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-
 	if (args_has(args, 'C')) {
 		if ((size = args_get(args, 'C')) == NULL) {
-			cmdq_error(cmdq, "missing size");
+			cmdq_error(item, "missing size");
 			return (CMD_RETURN_ERROR);
 		}
 		if (sscanf(size, "%u,%u", &w, &h) != 2) {
-			cmdq_error(cmdq, "bad size argument");
+			cmdq_error(item, "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");
+			cmdq_error(item, "size too small or too big");
 			return (CMD_RETURN_ERROR);
 		}
 		if (!(c->flags & CLIENT_CONTROL)) {
-			cmdq_error(cmdq, "not a control client");
+			cmdq_error(item, "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);
+		c->flags |= CLIENT_STATUSFORCE;
 		server_status_client(c);
-	} else
+	} else {
+		c->flags |= CLIENT_STATUSFORCE;
 		server_redraw_client(c);
+	}
 
 	return (CMD_RETURN_NORMAL);
 }

cmd-rename-session.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "tmux.h"
 
@@ -26,45 +27,49 @@
  * Change session name.
  */
 
-enum cmd_retval	 cmd_rename_session_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_rename_session_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_rename_session_entry = {
-	"rename-session", "rename",
+	.name = "rename-session",
-	"t:", 1, 1,
+	.alias = "rename",
-	CMD_TARGET_SESSION_USAGE " new-name",
+
-	0,
+	.args = { "t:", 1, 1 },
-	NULL,
+	.usage = CMD_TARGET_SESSION_USAGE " new-name",
-	NULL,
+
-	cmd_rename_session_exec
+	.tflag = CMD_SESSION,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_rename_session_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_rename_session_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_rename_session_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct session	*s;
+	struct session	*s = item->state.tflag.s;
 	const char	*newname;
 
 	newname = args->argv[0];
+	if (strcmp(newname, s->name) == 0)
+		return (CMD_RETURN_NORMAL);
+
 	if (!session_check_name(newname)) {
-		cmdq_error(cmdq, "bad session name: %s", newname);
+		cmdq_error(item, "bad session name: %s", newname);
 		return (CMD_RETURN_ERROR);
 	}
 	if (session_find(newname) != NULL) {
-		cmdq_error(cmdq, "duplicate session: %s", newname);
+		cmdq_error(item, "duplicate session: %s", newname);
 		return (CMD_RETURN_ERROR);
 	}
 
-	if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-
 	RB_REMOVE(sessions, &sessions, s);
 	free(s->name);
 	s->name = xstrdup(newname);
 	RB_INSERT(sessions, &sessions, s);
 
 	server_status_session(s);
-	notify_session_renamed(s);
+	notify_session("session-renamed", s);
 
 	return (CMD_RETURN_NORMAL);
 }

cmd-rename-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -26,30 +26,30 @@
  * Rename a window.
  */
 
-enum cmd_retval	 cmd_rename_window_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_rename_window_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_rename_window_entry = {
-	"rename-window", "renamew",
+	.name = "rename-window",
-	"t:", 1, 1,
+	.alias = "renamew",
-	CMD_TARGET_WINDOW_USAGE " new-name",
+
-	0,
+	.args = { "t:", 1, 1 },
-	NULL,
+	.usage = CMD_TARGET_WINDOW_USAGE " new-name",
-	NULL,
+
-	cmd_rename_window_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_rename_window_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_rename_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_rename_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct session	*s;
+	struct winlink	*wl = item->state.tflag.wl;
-	struct winlink	*wl;
-
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
-		return (CMD_RETURN_ERROR);
 
 	window_set_name(wl->window, args->argv[0]);
-	options_set_number(&wl->window->options, "automatic-rename", 0);
+	options_set_number(wl->window->options, "automatic-rename", 0);
 
 	server_status_window(wl->window);
 

cmd-resize-pane.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -26,80 +26,48 @@
  * Increase or decrease pane size.
  */
 
-void		 cmd_resize_pane_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_resize_pane_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_resize_pane_exec(struct cmd *, struct cmd_q *);
+
+static void	cmd_resize_pane_mouse_update(struct client *,
+		    struct mouse_event *);
 
 const struct cmd_entry cmd_resize_pane_entry = {
-	"resize-pane", "resizep",
+	.name = "resize-pane",
-	"DLRt:Ux:y:Z", 0, 1,
+	.alias = "resizep",
-	"[-DLRUZ] [-x width] [-y height] " CMD_TARGET_PANE_USAGE " [adjustment]",
+
-	0,
+	.args = { "DLMRt:Ux:y:Z", 0, 1 },
-	cmd_resize_pane_key_binding,
+	.usage = "[-DLMRUZ] [-x width] [-y height] " CMD_TARGET_PANE_USAGE " "
-	NULL,
+		 "[adjustment]",
-	cmd_resize_pane_exec
+
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_resize_pane_exec
 };
 
-void
+static enum cmd_retval
-cmd_resize_pane_key_binding(struct cmd *self, int key)
+cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
-{
-	switch (key) {
-	case KEYC_UP | KEYC_CTRL:
-		self->args = args_create(0);
-		args_set(self->args, 'U', NULL);
-		break;
-	case KEYC_DOWN | KEYC_CTRL:
-		self->args = args_create(0);
-		args_set(self->args, 'D', NULL);
-		break;
-	case KEYC_LEFT | KEYC_CTRL:
-		self->args = args_create(0);
-		args_set(self->args, 'L', NULL);
-		break;
-	case KEYC_RIGHT | KEYC_CTRL:
-		self->args = args_create(0);
-		args_set(self->args, 'R', NULL);
-		break;
-	case KEYC_UP | KEYC_ESCAPE:
-		self->args = args_create(1, "5");
-		args_set(self->args, 'U', NULL);
-		break;
-	case KEYC_DOWN | KEYC_ESCAPE:
-		self->args = args_create(1, "5");
-		args_set(self->args, 'D', NULL);
-		break;
-	case KEYC_LEFT | KEYC_ESCAPE:
-		self->args = args_create(1, "5");
-		args_set(self->args, 'L', NULL);
-		break;
-	case KEYC_RIGHT | KEYC_ESCAPE:
-		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
-cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
-	struct winlink		*wl;
+	struct window_pane	*wp = item->state.tflag.wp;
-	struct window		*w;
+	struct winlink		*wl = item->state.tflag.wl;
+	struct window		*w = wl->window;
+	struct client		*c = item->client;
+	struct session		*s = item->state.tflag.s;
 	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 (args_has(args, 'M')) {
-		return (CMD_RETURN_ERROR);
+		if (cmd_mouse_window(&item->mouse, &s) == NULL)
-	w = wl->window;
+			return (CMD_RETURN_NORMAL);
+		if (c == NULL || c->session != s)
+			return (CMD_RETURN_NORMAL);
+		c->tty.mouse_drag_update = cmd_resize_pane_mouse_update;
+		cmd_resize_pane_mouse_update(c, &item->mouse);
+		return (CMD_RETURN_NORMAL);
+	}
 
 	if (args_has(args, 'Z')) {
 		if (w->flags & WINDOW_ZOOMED)
@@ -117,7 +85,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	else {
 		adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
 		if (errstr != NULL) {
-			cmdq_error(cmdq, "adjustment %s", errstr);
+			cmdq_error(item, "adjustment %s", errstr);
 			return (CMD_RETURN_ERROR);
 		}
 	}
@@ -126,7 +94,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 		x = args_strtonum(self->args, 'x', PANE_MINIMUM, INT_MAX,
 		    &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "width %s", cause);
+			cmdq_error(item, "width %s", cause);
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
@@ -136,7 +104,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 		y = args_strtonum(self->args, 'y', PANE_MINIMUM, INT_MAX,
 		    &cause);
 		if (cause != NULL) {
-			cmdq_error(cmdq, "height %s", cause);
+			cmdq_error(item, "height %s", cause);
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
@@ -144,14 +112,63 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 	}
 
 	if (args_has(self->args, 'L'))
-		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, -adjust);
+		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, -adjust, 1);
 	else if (args_has(self->args, 'R'))
-		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust);
+		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust, 1);
 	else if (args_has(self->args, 'U'))
-		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, -adjust);
+		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, -adjust, 1);
 	else if (args_has(self->args, 'D'))
-		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust);
+		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust, 1);
 	server_redraw_window(wl->window);
 
 	return (CMD_RETURN_NORMAL);
 }
+
+static void
+cmd_resize_pane_mouse_update(struct client *c, struct mouse_event *m)
+{
+	struct winlink		*wl;
+	struct window_pane	*wp;
+	int			 found;
+	u_int			 y, ly;
+
+	wl = cmd_mouse_window(m, NULL);
+	if (wl == NULL) {
+		c->tty.mouse_drag_update = NULL;
+		return;
+	}
+
+	y = m->y;
+	if (m->statusat == 0 && y > 0)
+		y--;
+	else if (m->statusat > 0 && y >= (u_int)m->statusat)
+		y = m->statusat - 1;
+	ly = m->ly;
+	if (m->statusat == 0 && ly > 0)
+		ly--;
+	else if (m->statusat > 0 && ly >= (u_int)m->statusat)
+		ly = m->statusat - 1;
+
+	found = 0;
+	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
+		if (!window_pane_visible(wp))
+			continue;
+
+		if (wp->xoff + wp->sx == m->lx &&
+		    wp->yoff <= 1 + ly &&
+		    wp->yoff + wp->sy >= ly) {
+			layout_resize_pane(wp, LAYOUT_LEFTRIGHT, m->x - m->lx, 0);
+			found = 1;
+		}
+		if (wp->yoff + wp->sy == ly &&
+		    wp->xoff <= 1 + m->lx &&
+		    wp->xoff + wp->sx >= m->lx) {
+			layout_resize_pane(wp, LAYOUT_TOPBOTTOM, y - ly, 0);
+			found = 1;
+		}
+	}
+	if (found)
+		server_redraw_window(wl->window);
+	else
+		c->tty.mouse_drag_update = NULL;
+}

cmd-respawn-pane.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
  * Copyright (c) 2011 Marcel P. Partap <mpartap@gmx.net>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -28,65 +28,67 @@
  * Respawn a pane (restart the command). Kill existing if -k given.
  */
 
-enum cmd_retval	 cmd_respawn_pane_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_respawn_pane_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_respawn_pane_entry = {
-	"respawn-pane", "respawnp",
+	.name = "respawn-pane",
-	"kt:", 0, 1,
+	.alias = "respawnp",
-	"[-k] " CMD_TARGET_PANE_USAGE " [command]",
+
-	0,
+	.args = { "kt:", 0, -1 },
-	NULL,
+	.usage = "[-k] " CMD_TARGET_PANE_USAGE " [command]",
-	NULL,
+
-	cmd_respawn_pane_exec
+	.tflag = CMD_PANE,
+
+	.flags = 0,
+	.exec = cmd_respawn_pane_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_respawn_pane_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct winlink		*wl;
+	struct winlink		*wl = item->state.tflag.wl;
-	struct window		*w;
+	struct window		*w = wl->window;
-	struct window_pane	*wp;
+	struct window_pane	*wp = item->state.tflag.wp;
-	struct session		*s;
+	struct session		*s = item->state.tflag.s;
-	struct environ		 env;
+	struct environ		*env;
-	const char		*cmd;
+	const char		*path;
 	char			*cause;
 	u_int			 idx;
-
+	struct environ_entry	*envent;
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
-	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",
+		cmdq_error(item, "pane still active: %s:%d.%u",
 		    s->name, wl->idx, idx);
 		return (CMD_RETURN_ERROR);
 	}
 
-	environ_init(&env);
-	environ_copy(&global_environ, &env);
-	environ_copy(&s->environ, &env);
-	server_fill_environ(s, &env);
-
 	window_pane_reset_mode(wp);
 	screen_reinit(&wp->base);
 	input_init(wp);
 
-	if (args->argc != 0)
+	path = NULL;
-		cmd = args->argv[0];
+	if (item->client != NULL && item->client->session == NULL)
+		envent = environ_find(item->client->environ, "PATH");
 	else
-		cmd = NULL;
+		envent = environ_find(s->environ, "PATH");
-	if (window_pane_spawn(wp, cmd, NULL, NULL, &env, s->tio, &cause) != 0) {
+	if (envent != NULL)
-		cmdq_error(cmdq, "respawn pane failed: %s", cause);
+		path = envent->value;
+
+	env = environ_for_session(s);
+	if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env,
+	    s->tio, &cause) != 0) {
+		cmdq_error(item, "respawn pane failed: %s", cause);
 		free(cause);
-		environ_free(&env);
+		environ_free(env);
 		return (CMD_RETURN_ERROR);
 	}
+	environ_free(env);
+
 	wp->flags |= PANE_REDRAW;
 	server_status_window(w);
 
-	environ_free(&env);
 	return (CMD_RETURN_NORMAL);
 }

cmd-respawn-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@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
@@ -27,66 +27,70 @@
  * Respawn a window (restart the command). Kill existing if -k given.
  */
 
-enum cmd_retval	 cmd_respawn_window_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_respawn_window_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_respawn_window_entry = {
-	"respawn-window", "respawnw",
+	.name = "respawn-window",
-	"kt:", 0, 1,
+	.alias = "respawnw",
-	"[-k] " CMD_TARGET_WINDOW_USAGE " [command]",
+
-	0,
+	.args = { "kt:", 0, -1 },
-	NULL,
+	.usage = "[-k] " CMD_TARGET_WINDOW_USAGE " [command]",
-	NULL,
+
-	cmd_respawn_window_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_respawn_window_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct winlink		*wl;
+	struct session		*s = item->state.tflag.s;
-	struct window		*w;
+	struct winlink		*wl = item->state.tflag.wl;
+	struct window		*w = wl->window;
 	struct window_pane	*wp;
-	struct session		*s;
+	struct environ		*env;
-	struct environ		 env;
+	const char		*path;
-	const char		*cmd;
 	char		 	*cause;
-
+	struct environ_entry	*envent;
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
-		return (CMD_RETURN_ERROR);
-	w = wl->window;
 
 	if (!args_has(self->args, 'k')) {
 		TAILQ_FOREACH(wp, &w->panes, entry) {
 			if (wp->fd == -1)
 				continue;
-			cmdq_error(cmdq,
+			cmdq_error(item, "window still active: %s:%d", s->name,
-			    "window still active: %s:%d", s->name, wl->idx);
+			    wl->idx);
 			return (CMD_RETURN_ERROR);
 		}
 	}
 
-	environ_init(&env);
-	environ_copy(&global_environ, &env);
-	environ_copy(&s->environ, &env);
-	server_fill_environ(s, &env);
-
 	wp = TAILQ_FIRST(&w->panes);
 	TAILQ_REMOVE(&w->panes, wp, entry);
 	layout_free(w);
 	window_destroy_panes(w);
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 	window_pane_resize(wp, w->sx, w->sy);
-	if (args->argc != 0)
+
-		cmd = args->argv[0];
+	path = NULL;
+	if (item->client != NULL && item->client->session == NULL)
+		envent = environ_find(item->client->environ, "PATH");
 	else
-		cmd = NULL;
+		envent = environ_find(s->environ, "PATH");
-	if (window_pane_spawn(wp, cmd, NULL, NULL, &env, s->tio, &cause) != 0) {
+	if (envent != NULL)
-		cmdq_error(cmdq, "respawn window failed: %s", cause);
+		path = envent->value;
+
+	env = environ_for_session(s);
+	if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env,
+	    s->tio, &cause) != 0) {
+		cmdq_error(item, "respawn window failed: %s", cause);
 		free(cause);
-		environ_free(&env);
+		environ_free(env);
-		server_destroy_pane(wp);
+		server_destroy_pane(wp, 0);
 		return (CMD_RETURN_ERROR);
 	}
+	environ_free(env);
 	layout_init(w, wp);
 	window_pane_reset_mode(wp);
 	screen_reinit(&wp->base);
@@ -96,6 +100,5 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	recalculate_sizes();
 	server_redraw_window(w);
 
-	environ_free(&env);
 	return (CMD_RETURN_NORMAL);
 }

cmd-rotate-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -24,40 +24,32 @@
  * Rotate the panes in a window.
  */
 
-void		 cmd_rotate_window_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_rotate_window_exec(struct cmd *,
-enum cmd_retval	 cmd_rotate_window_exec(struct cmd *, struct cmd_q *);
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_rotate_window_entry = {
-	"rotate-window", "rotatew",
+	.name = "rotate-window",
-	"Dt:U", 0, 0,
+	.alias = "rotatew",
-	"[-DU] " CMD_TARGET_WINDOW_USAGE,
+
-	0,
+	.args = { "Dt:U", 0, 0 },
-	cmd_rotate_window_key_binding,
+	.usage = "[-DU] " CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_rotate_window_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_rotate_window_exec
 };
 
-void
+static enum cmd_retval
-cmd_rotate_window_key_binding(struct cmd *self, int key)
+cmd_rotate_window_exec(struct cmd *self, struct cmdq_item *item)
 {
-	self->args = args_create(0);
+	struct winlink		*wl = item->state.tflag.wl;
-	if (key == ('o' | KEYC_ESCAPE))
+	struct window		*w = wl->window;
-		args_set(self->args, 'D', NULL);
-}
-
-enum cmd_retval
-cmd_rotate_window_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args		*args = self->args;
-	struct winlink		*wl;
-	struct window		*w;
 	struct window_pane	*wp, *wp2;
 	struct layout_cell	*lc;
 	u_int			 sx, sy, xoff, yoff;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
+	server_unzoom_window(w);
-		return (CMD_RETURN_ERROR);
-	w = wl->window;
 
 	if (args_has(self->args, 'D')) {
 		wp = TAILQ_LAST(&w->panes, window_panes);

cmd-run-shell.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -29,40 +29,50 @@
  * Runs a command without a window.
  */
 
-enum cmd_retval	 cmd_run_shell_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_run_shell_exec(struct cmd *, struct cmdq_item *);
 
-void	cmd_run_shell_callback(struct job *);
+static void	cmd_run_shell_callback(struct job *);
-void	cmd_run_shell_free(void *);
+static void	cmd_run_shell_free(void *);
-void	cmd_run_shell_print(struct job *, const char *);
+static void	cmd_run_shell_print(struct job *, const char *);
 
 const struct cmd_entry cmd_run_shell_entry = {
-	"run-shell", "run",
+	.name = "run-shell",
-	"bt:", 1, 1,
+	.alias = "run",
-	"[-b] " CMD_TARGET_PANE_USAGE " shell-command",
+
-	0,
+	.args = { "bt:", 1, 1 },
-	NULL,
+	.usage = "[-b] " CMD_TARGET_PANE_USAGE " shell-command",
-	NULL,
+
-	cmd_run_shell_exec
+	.tflag = CMD_PANE_CANFAIL,
+
+	.flags = 0,
+	.exec = cmd_run_shell_exec
 };
 
 struct cmd_run_shell_data {
-	char		*cmd;
+	char			*cmd;
-	struct cmd_q	*cmdq;
+	struct cmdq_item	*item;
-	int		 bflag;
+	int			 wp_id;
-	int		 wp_id;
 };
 
-void
+static void
 cmd_run_shell_print(struct job *job, const char *msg)
 {
 	struct cmd_run_shell_data	*cdata = job->data;
 	struct window_pane		*wp = NULL;
+	struct cmd_find_state		 fs;
 
 	if (cdata->wp_id != -1)
 		wp = window_pane_find_by_id(cdata->wp_id);
 	if (wp == NULL) {
-		cmdq_print(cdata->cmdq, "%s", msg);
+		if (cdata->item != NULL) {
-		return;
+			cmdq_print(cdata->item, "%s", msg);
+			return;
+		}
+		if (cmd_find_current (&fs, NULL, CMD_FIND_QUIET) != 0)
+			return;
+		wp = fs.wp;
+		if (wp == NULL)
+			return;
 	}
 
 	if (window_pane_set_mode(wp, &window_copy_mode) == 0)
@@ -71,74 +81,55 @@ cmd_run_shell_print(struct job *job, const char *msg)
 		window_copy_add(wp, "%s", msg);
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
 	struct cmd_run_shell_data	*cdata;
-	char				*shellcmd;
+	struct client			*c = item->state.c;
-	struct client			*c;
+	struct session			*s = item->state.tflag.s;
-	struct session			*s = NULL;
+	struct winlink			*wl = item->state.tflag.wl;
-	struct winlink			*wl = NULL;
+	struct window_pane		*wp = item->state.tflag.wp;
-	struct window_pane		*wp = NULL;
+	const char			*cwd;
-	struct format_tree		*ft;
 
-	if (args_has(args, 't'))
+	if (item->client != NULL && item->client->session == NULL)
-		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
+		cwd = item->client->cwd;
-	else {
+	else if (s != NULL)
-		c = cmd_find_client(cmdq, NULL, 1);
+		cwd = s->cwd;
-		if (c != NULL && c->session != NULL) {
+	else
-			s = c->session;
+		cwd = NULL;
-			wl = s->curw;
-			wp = wl->window->active;
-		}
-	}
 
-	ft = format_create();
+	cdata = xcalloc(1, sizeof *cdata);
-	if (s != NULL)
+	cdata->cmd = format_single(item, args->argv[0], c, s, wl, wp);
-		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);
+	if (args_has(args, 't') && wp != NULL)
-	cdata->cmd = shellcmd;
+		cdata->wp_id = wp->id;
-	cdata->bflag = args_has(args, 'b');
+	else
-	cdata->wp_id = wp != NULL ? (int) wp->id : -1;
+		cdata->wp_id = -1;
 
-	cdata->cmdq = cmdq;
+	if (!args_has(args, 'b'))
-	cmdq->references++;
+		cdata->item = item;
 
-	job_run(shellcmd, s, cmd_run_shell_callback, cmd_run_shell_free, cdata);
+	job_run(cdata->cmd, s, cwd, cmd_run_shell_callback, cmd_run_shell_free,
+	    cdata);
 
-	if (cdata->bflag)
+	if (args_has(args, 'b'))
 		return (CMD_RETURN_NORMAL);
 	return (CMD_RETURN_WAIT);
 }
 
-void
+static void
 cmd_run_shell_callback(struct job *job)
 {
 	struct cmd_run_shell_data	*cdata = job->data;
-	struct cmd_q			*cmdq = cdata->cmdq;
+	char				*cmd = cdata->cmd, *msg, *line;
-	char				*cmd, *msg, *line;
 	size_t				 size;
 	int				 retcode;
-	u_int				 lines;
 
-	if (cmdq->dead)
-		return;
-	cmd = cdata->cmd;
-
-	lines = 0;
 	do {
 		if ((line = evbuffer_readline(job->event->input)) != NULL) {
 			cmd_run_shell_print(job, line);
 			free(line);
-			lines++;
 		}
 	} while (line != NULL);
 
@@ -149,7 +140,6 @@ cmd_run_shell_callback(struct job *job)
 		line[size] = '\0';
 
 		cmd_run_shell_print(job, line);
-		lines++;
 
 		free(line);
 	}
@@ -162,23 +152,18 @@ cmd_run_shell_callback(struct job *job)
 		retcode = WTERMSIG(job->status);
 		xasprintf(&msg, "'%s' terminated by signal %d", cmd, retcode);
 	}
-	if (msg != NULL) {
+	if (msg != NULL)
-		if (lines == 0)
+		cmd_run_shell_print(job, msg);
-			cmdq_info(cmdq, "%s", msg);
+	free(msg);
-		else
+
-			cmd_run_shell_print(job, msg);
+	if (cdata->item != NULL)
-		free(msg);
+		cdata->item->flags &= ~CMDQ_WAITING;
-	}
 }
 
-void
+static void
 cmd_run_shell_free(void *data)
 {
 	struct cmd_run_shell_data	*cdata = data;
-	struct cmd_q			*cmdq = cdata->cmdq;
-
-	if (!cmdq_free(cmdq) && !cdata->bflag)
-		cmdq_continue(cmdq);
 
 	free(cdata->cmd);
 	free(cdata);

cmd-save-buffer.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -20,8 +20,10 @@
 #include <sys/stat.h>
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "tmux.h"
 
@@ -29,72 +31,64 @@
  * Saves a paste buffer to a file.
  */
 
-enum cmd_retval	 cmd_save_buffer_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_save_buffer_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_save_buffer_entry = {
-	"save-buffer", "saveb",
+	.name = "save-buffer",
-	"ab:", 1, 1,
+	.alias = "saveb",
-	"[-a] " CMD_BUFFER_USAGE " path",
+
-	0,
+	.args = { "ab:", 1, 1 },
-	NULL,
+	.usage = "[-a] " CMD_BUFFER_USAGE " path",
-	NULL,
+
-	cmd_save_buffer_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_save_buffer_exec
 };
 
 const struct cmd_entry cmd_show_buffer_entry = {
-	"show-buffer", "showb",
+	.name = "show-buffer",
-	"b:", 0, 0,
+	.alias = "showb",
-	CMD_BUFFER_USAGE,
+
-	0,
+	.args = { "b:", 0, 0 },
-	NULL,
+	.usage = CMD_BUFFER_USAGE,
-	NULL,
+
-	cmd_save_buffer_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_save_buffer_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct client		*c;
+	struct client		*c = item->client;
-	struct session          *s;
 	struct paste_buffer	*pb;
-	const char		*path, *newpath, *wd;
+	const char		*path, *bufname, *bufdata, *start, *end;
-	char			*cause, *start, *end;
+	const char		*flags;
-	size_t			 size, used;
+	char			*msg, *file;
-	int			 buffer;
+	size_t			 size, used, msglen, bufsize;
-	mode_t			 mask;
 	FILE			*f;
-	char			*msg;
-	size_t			 msglen;
 
 	if (!args_has(args, 'b')) {
-		if ((pb = paste_get_top(&global_buffers)) == NULL) {
+		if ((pb = paste_get_top(NULL)) == NULL) {
-			cmdq_error(cmdq, "no buffers");
+			cmdq_error(item, "no buffers");
 			return (CMD_RETURN_ERROR);
 		}
 	} else {
-		buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
+		bufname = args_get(args, 'b');
-		if (cause != NULL) {
+		pb = paste_get_name(bufname);
-			cmdq_error(cmdq, "buffer %s", cause);
-			free(cause);
-			return (CMD_RETURN_ERROR);
-		}
-
-		pb = paste_get_index(&global_buffers, buffer);
 		if (pb == NULL) {
-			cmdq_error(cmdq, "no buffer %d", buffer);
+			cmdq_error(item, "no buffer %s", bufname);
 			return (CMD_RETURN_ERROR);
 		}
 	}
+	bufdata = paste_buffer_data(pb, &bufsize);
 
 	if (self->entry == &cmd_show_buffer_entry)
 		path = "-";
 	else
 		path = args->argv[0];
 	if (strcmp(path, "-") == 0) {
-		c = cmdq->client;
 		if (c == NULL) {
-			cmdq_error(cmdq, "can't write to stdout");
+			cmdq_error(item, "can't write to stdout");
 			return (CMD_RETURN_ERROR);
 		}
 		if (c->session == NULL || (c->flags & CLIENT_CONTROL))
@@ -102,67 +96,55 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		goto do_print;
 	}
 
-	c = cmdq->client;
+	flags = "wb";
-	if (c != NULL)
-		wd = c->cwd;
-	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");
+		flags = "ab";
-	else
+
-		f = fopen(path, "wb");
+	file = server_client_get_path(c, path);
-	umask(mask);
+	f = fopen(file, flags);
 	if (f == NULL) {
-		cmdq_error(cmdq, "%s: %s", path, strerror(errno));
+		cmdq_error(item, "%s: %s", file, strerror(errno));
+		free(file);
 		return (CMD_RETURN_ERROR);
 	}
-	if (fwrite(pb->data, 1, pb->size, f) != pb->size) {
+
-		cmdq_error(cmdq, "%s: fwrite error", path);
+	if (fwrite(bufdata, 1, bufsize, f) != bufsize) {
+		cmdq_error(item, "%s: write error", file);
 		fclose(f);
 		return (CMD_RETURN_ERROR);
 	}
+
 	fclose(f);
+	free(file);
 
 	return (CMD_RETURN_NORMAL);
 
 do_stdout:
-	evbuffer_add(c->stdout_data, pb->data, pb->size);
+	evbuffer_add(c->stdout_data, bufdata, bufsize);
-	server_push_stdout(c);
+	server_client_push_stdout(c);
 	return (CMD_RETURN_NORMAL);
 
 do_print:
-	if (pb->size > (INT_MAX / 4) - 1) {
+	if (bufsize > (INT_MAX / 4) - 1) {
-		cmdq_error(cmdq, "buffer too big");
+		cmdq_error(item, "buffer too big");
 		return (CMD_RETURN_ERROR);
 	}
 	msg = NULL;
-	msglen = 0;
 
 	used = 0;
-	while (used != pb->size) {
+	while (used != bufsize) {
-		start = pb->data + used;
+		start = bufdata + used;
-		end = memchr(start, '\n', pb->size - used);
+		end = memchr(start, '\n', bufsize - used);
 		if (end != NULL)
 			size = end - start;
 		else
-			size = pb->size - used;
+			size = bufsize - used;
 
 		msglen = size * 4 + 1;
-		msg = xrealloc(msg, 1, msglen);
+		msg = xrealloc(msg, msglen);
 
 		strvisx(msg, start, size, VIS_OCTAL|VIS_TAB);
-		cmdq_print(cmdq, "%s", msg);
+		cmdq_print(item, "%s", msg);
 
 		used += size + (end != NULL);
 	}

cmd-select-layout.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -18,118 +18,123 @@
 
 #include <sys/types.h>
 
+#include <stdlib.h>
+
 #include "tmux.h"
 
 /*
  * Switch window to selected layout.
  */
 
-void		 cmd_select_layout_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_select_layout_exec(struct cmd *,
-enum cmd_retval	 cmd_select_layout_exec(struct cmd *, struct cmd_q *);
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_select_layout_entry = {
-	"select-layout", "selectl",
+	.name = "select-layout",
-	"npt:", 0, 1,
+	.alias = "selectl",
-	"[-np] " CMD_TARGET_WINDOW_USAGE " [layout-name]",
+
-	0,
+	.args = { "nopt:", 0, 1 },
-	cmd_select_layout_key_binding,
+	.usage = "[-nop] " CMD_TARGET_WINDOW_USAGE " [layout-name]",
-	NULL,
+
-	cmd_select_layout_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_select_layout_exec
 };
 
 const struct cmd_entry cmd_next_layout_entry = {
-	"next-layout", "nextl",
+	.name = "next-layout",
-	"t:", 0, 0,
+	.alias = "nextl",
-	CMD_TARGET_WINDOW_USAGE,
+
-	0,
+	.args = { "t:", 0, 0 },
-	NULL,
+	.usage = CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_select_layout_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_select_layout_exec
 };
 
 const struct cmd_entry cmd_previous_layout_entry = {
-	"previous-layout", "prevl",
+	.name = "previous-layout",
-	"t:", 0, 0,
+	.alias = "prevl",
-	CMD_TARGET_WINDOW_USAGE,
+
-	0,
+	.args = { "t:", 0, 0 },
-	NULL,
+	.usage = CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_select_layout_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_select_layout_exec
 };
 
-void
+static enum cmd_retval
-cmd_select_layout_key_binding(struct cmd *self, int key)
+cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
-{
-	switch (key) {
-	case '1' | KEYC_ESCAPE:
-		self->args = args_create(1, "even-horizontal");
-		break;
-	case '2' | KEYC_ESCAPE:
-		self->args = args_create(1, "even-vertical");
-		break;
-	case '3' | KEYC_ESCAPE:
-		self->args = args_create(1, "main-horizontal");
-		break;
-	case '4' | KEYC_ESCAPE:
-		self->args = args_create(1, "main-vertical");
-		break;
-	case '5' | KEYC_ESCAPE:
-		self->args = args_create(1, "tiled");
-		break;
-	default:
-		self->args = args_create(0);
-		break;
-	}
-}
-
-enum cmd_retval
-cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args	*args = self->args;
-	struct winlink	*wl;
+	struct winlink	*wl = item->state.tflag.wl;
+	struct window	*w;
 	const char	*layoutname;
+	char		*oldlayout;
 	int		 next, previous, layout;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
+	w = wl->window;
-		return (CMD_RETURN_ERROR);
+	server_unzoom_window(w);
-	server_unzoom_window(wl->window);
 
 	next = self->entry == &cmd_next_layout_entry;
-	if (args_has(self->args, 'n'))
+	if (args_has(args, 'n'))
 		next = 1;
 	previous = self->entry == &cmd_previous_layout_entry;
-	if (args_has(self->args, 'p'))
+	if (args_has(args, 'p'))
 		previous = 1;
 
+	oldlayout = w->old_layout;
+	w->old_layout = layout_dump(w->layout_root);
+
 	if (next || previous) {
 		if (next)
-			layout = layout_set_next(wl->window);
+			layout_set_next(w);
 		else
-			layout = layout_set_previous(wl->window);
+			layout_set_previous(w);
-		server_redraw_window(wl->window);
+		goto changed;
-		cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout));
-		return (CMD_RETURN_NORMAL);
 	}
 
-	if (args->argc == 0)
+	if (!args_has(args, 'o')) {
-		layout = wl->window->lastlayout;
+		if (args->argc == 0)
-	else
+			layout = w->lastlayout;
-		layout = layout_set_lookup(args->argv[0]);
+		else
-	if (layout != -1) {
+			layout = layout_set_lookup(args->argv[0]);
-		layout = layout_set_select(wl->window, layout);
+		if (layout != -1) {
-		server_redraw_window(wl->window);
+			layout_set_select(w, layout);
-		cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout));
+			goto changed;
-		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);
-			return (CMD_RETURN_ERROR);
 		}
-		server_redraw_window(wl->window);
-		cmdq_info(cmdq, "arranging in: %s", layoutname);
 	}
+
+	if (args->argc != 0)
+		layoutname = args->argv[0];
+	else if (args_has(args, 'o'))
+		layoutname = oldlayout;
+	else
+		layoutname = NULL;
+
+	if (layoutname != NULL) {
+		if (layout_parse(w, layoutname) == -1) {
+			cmdq_error(item, "can't set layout: %s", layoutname);
+			goto error;
+		}
+		goto changed;
+	}
+
+	free(oldlayout);
 	return (CMD_RETURN_NORMAL);
+
+changed:
+	free(oldlayout);
+	server_redraw_window(w);
+	return (CMD_RETURN_NORMAL);
+
+error:
+	free(w->old_layout);
+	w->old_layout = oldlayout;
+	return (CMD_RETURN_ERROR);
 }

cmd-select-pane.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -24,95 +24,140 @@
  * Select pane.
  */
 
-void		 cmd_select_pane_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_select_pane_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_select_pane_exec(struct cmd *, struct cmd_q *);
 
 const struct cmd_entry cmd_select_pane_entry = {
-	"select-pane", "selectp",
+	.name = "select-pane",
-	"lDLRt:U", 0, 0,
+	.alias = "selectp",
-	"[-lDLRU] " CMD_TARGET_PANE_USAGE,
+
-	0,
+	.args = { "DdegLlMmP:Rt:U", 0, 0 },
-	cmd_select_pane_key_binding,
+	.usage = "[-DdegLlMmRU] [-P style] " CMD_TARGET_PANE_USAGE,
-	NULL,
+
-	cmd_select_pane_exec
+	.tflag = CMD_PANE,
+
+	.flags = 0,
+	.exec = cmd_select_pane_exec
 };
 
 const struct cmd_entry cmd_last_pane_entry = {
-	"last-pane", "lastp",
+	.name = "last-pane",
-	"t:", 0, 0,
+	.alias = "lastp",
-	CMD_TARGET_WINDOW_USAGE,
+
-	0,
+	.args = { "det:", 0, 0 },
-	NULL,
+	.usage = "[-de] " CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_select_pane_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_select_pane_exec
 };
 
-void
+static enum cmd_retval
-cmd_select_pane_key_binding(struct cmd *self, int key)
+cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
-{
-	self->args = args_create(0);
-	if (key == KEYC_UP)
-		args_set(self->args, 'U', NULL);
-	if (key == KEYC_DOWN)
-		args_set(self->args, 'D', NULL);
-	if (key == KEYC_LEFT)
-		args_set(self->args, 'L', NULL);
-	if (key == KEYC_RIGHT)
-		args_set(self->args, 'R', NULL);
-	if (key == 'o')
-		args_set(self->args, 't', ":.+");
-}
-
-enum cmd_retval
-cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
-	struct winlink		*wl;
+	struct winlink		*wl = item->state.tflag.wl;
-	struct window_pane	*wp;
+	struct window		*w = wl->window;
+	struct session		*s = item->state.tflag.s;
+	struct window_pane	*wp = item->state.tflag.wp, *lastwp, *markedwp;
+	const char		*style;
 
 	if (self->entry == &cmd_last_pane_entry || args_has(args, 'l')) {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-
 		if (wl->window->last == NULL) {
-			cmdq_error(cmdq, "no last pane");
+			cmdq_error(item, "no last pane");
 			return (CMD_RETURN_ERROR);
 		}
 
-		server_unzoom_window(wl->window);
+		if (args_has(self->args, 'e'))
-		window_set_active_pane(wl->window, wl->window->last);
+			w->last->flags &= ~PANE_INPUTOFF;
-		server_status_window(wl->window);
+		else if (args_has(self->args, 'd'))
-		server_redraw_window_borders(wl->window);
+			w->last->flags |= PANE_INPUTOFF;
+		else {
+			server_unzoom_window(w);
+			window_redraw_active_switch(w, w->last);
+			if (window_set_active_pane(w, w->last)) {
+				server_status_window(w);
+				server_redraw_window_borders(w);
+			}
+		}
 
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL)
+	if (args_has(args, 'm') || args_has(args, 'M')) {
-		return (CMD_RETURN_ERROR);
+		if (args_has(args, 'm') && !window_pane_visible(wp))
+			return (CMD_RETURN_NORMAL);
+		lastwp = marked_pane.wp;
 
+		if (args_has(args, 'M') || server_is_marked(s, wl, wp))
+			server_clear_marked();
+		else
+			server_set_marked(s, wl, wp);
+		markedwp = marked_pane.wp;
+
+		if (lastwp != NULL) {
+			server_redraw_window_borders(lastwp->window);
+			server_status_window(lastwp->window);
+		}
+		if (markedwp != NULL) {
+			server_redraw_window_borders(markedwp->window);
+			server_status_window(markedwp->window);
+		}
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (args_has(self->args, 'P') || args_has(self->args, 'g')) {
+		if (args_has(args, 'P')) {
+			style = args_get(args, 'P');
+			if (style_parse(&grid_default_cell, &wp->colgc,
+			    style) == -1) {
+				cmdq_error(item, "bad style: %s", style);
+				return (CMD_RETURN_ERROR);
+			}
+			wp->flags |= PANE_REDRAW;
+		}
+		if (args_has(self->args, 'g'))
+			cmdq_print(item, "%s", style_tostring(&wp->colgc));
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (args_has(self->args, 'L')) {
+		server_unzoom_window(wp->window);
+		wp = window_pane_find_left(wp);
+	} else if (args_has(self->args, 'R')) {
+		server_unzoom_window(wp->window);
+		wp = window_pane_find_right(wp);
+	} else if (args_has(self->args, 'U')) {
+		server_unzoom_window(wp->window);
+		wp = window_pane_find_up(wp);
+	} else if (args_has(self->args, 'D')) {
+		server_unzoom_window(wp->window);
+		wp = window_pane_find_down(wp);
+	}
+	if (wp == NULL)
+		return (CMD_RETURN_NORMAL);
+
+	if (args_has(self->args, 'e')) {
+		wp->flags &= ~PANE_INPUTOFF;
+		return (CMD_RETURN_NORMAL);
+	}
+	if (args_has(self->args, 'd')) {
+		wp->flags |= PANE_INPUTOFF;
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (wp == w->active)
+		return (CMD_RETURN_NORMAL);
 	server_unzoom_window(wp->window);
 	if (!window_pane_visible(wp)) {
-		cmdq_error(cmdq, "pane not visible");
+		cmdq_error(item, "pane not visible");
 		return (CMD_RETURN_ERROR);
 	}
-
+	window_redraw_active_switch(w, wp);
-	if (args_has(self->args, 'L'))
+	if (window_set_active_pane(w, wp)) {
-		wp = window_pane_find_left(wp);
+		server_status_window(w);
-	else if (args_has(self->args, 'R'))
+		server_redraw_window_borders(w);
-		wp = window_pane_find_right(wp);
-	else if (args_has(self->args, 'U'))
-		wp = window_pane_find_up(wp);
-	else if (args_has(self->args, 'D'))
-		wp = window_pane_find_down(wp);
-	if (wp == NULL) {
-		cmdq_error(cmdq, "pane not found");
-		return (CMD_RETURN_ERROR);
 	}
 
-	window_set_active_pane(wl->window, wp);
-	server_status_window(wl->window);
-	server_redraw_window_borders(wl->window);
-
 	return (CMD_RETURN_NORMAL);
 }

cmd-select-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -26,69 +26,66 @@
  * Select window by index.
  */
 
-void		 cmd_select_window_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_select_window_exec(struct cmd *,
-enum cmd_retval	 cmd_select_window_exec(struct cmd *, struct cmd_q *);
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_select_window_entry = {
-	"select-window", "selectw",
+	.name = "select-window",
-	"lnpTt:", 0, 0,
+	.alias = "selectw",
-	"[-lnpT] " CMD_TARGET_WINDOW_USAGE,
+
-	0,
+	.args = { "lnpTt:", 0, 0 },
-	cmd_select_window_key_binding,
+	.usage = "[-lnpT] " CMD_TARGET_WINDOW_USAGE,
-	NULL,
+
-	cmd_select_window_exec
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_select_window_exec
 };
 
 const struct cmd_entry cmd_next_window_entry = {
-	"next-window", "next",
+	.name = "next-window",
-	"at:", 0, 0,
+	.alias = "next",
-	"[-a] " CMD_TARGET_SESSION_USAGE,
+
-	0,
+	.args = { "at:", 0, 0 },
-	cmd_select_window_key_binding,
+	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_select_window_exec
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
+	.exec = cmd_select_window_exec
 };
 
 const struct cmd_entry cmd_previous_window_entry = {
-	"previous-window", "prev",
+	.name = "previous-window",
-	"at:", 0, 0,
+	.alias = "prev",
-	"[-a] " CMD_TARGET_SESSION_USAGE,
+
-	0,
+	.args = { "at:", 0, 0 },
-	cmd_select_window_key_binding,
+	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_select_window_exec
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
+	.exec = cmd_select_window_exec
 };
 
 const struct cmd_entry cmd_last_window_entry = {
-	"last-window", "last",
+	.name = "last-window",
-	"t:", 0, 0,
+	.alias = "last",
-	CMD_TARGET_SESSION_USAGE,
+
-	0,
+	.args = { "t:", 0, 0 },
-	NULL,
+	.usage = CMD_TARGET_SESSION_USAGE,
-	NULL,
+
-	cmd_select_window_exec
+	.tflag = CMD_SESSION,
+
+	.flags = 0,
+	.exec = cmd_select_window_exec
 };
 
-void
+static enum cmd_retval
-cmd_select_window_key_binding(struct cmd *self, int key)
+cmd_select_window_exec(struct cmd *self, struct cmdq_item *item)
 {
-	char	tmp[16];
+	struct winlink	*wl = item->state.tflag.wl;
-
+	struct session	*s = item->state.tflag.s;
-	self->args = args_create(0);
-	if (key >= '0' && key <= '9') {
-		xsnprintf(tmp, sizeof tmp, ":%d", key - '0');
-		args_set(self->args, 't', tmp);
-	}
-	if (key == ('n' | KEYC_ESCAPE) || key == ('p' | KEYC_ESCAPE))
-		args_set(self->args, 'a', NULL);
-}
-
-enum cmd_retval
-cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args	*args = self->args;
-	struct winlink	*wl;
-	struct session	*s;
 	int		 next, previous, last, activity;
 
 	next = self->entry == &cmd_next_window_entry;
@@ -102,41 +99,33 @@ 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);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
-
 		activity = args_has(self->args, 'a');
 		if (next) {
 			if (session_next(s, activity) != 0) {
-				cmdq_error(cmdq, "no next window");
+				cmdq_error(item, "no next window");
 				return (CMD_RETURN_ERROR);
 			}
 		} else if (previous) {
 			if (session_previous(s, activity) != 0) {
-				cmdq_error(cmdq, "no previous window");
+				cmdq_error(item, "no previous window");
 				return (CMD_RETURN_ERROR);
 			}
 		} else {
 			if (session_last(s) != 0) {
-				cmdq_error(cmdq, "no last window");
+				cmdq_error(item, "no last window");
 				return (CMD_RETURN_ERROR);
 			}
 		}
 
 		server_redraw_session(s);
 	} else {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-
 		/*
 		 * 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");
+				cmdq_error(item, "no last window");
 				return (-1);
 			}
 			server_redraw_session(s);

cmd-send-keys.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@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
@@ -27,76 +27,117 @@
  * Send keys to client.
  */
 
-enum cmd_retval	 cmd_send_keys_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_send_keys_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_send_keys_entry = {
-	"send-keys", "send",
+	.name = "send-keys",
-	"lRt:", 0, -1,
+	.alias = "send",
-	"[-lR] " CMD_TARGET_PANE_USAGE " key ...",
+
-	0,
+	.args = { "lXRMN:t:", 0, -1 },
-	NULL,
+	.usage = "[-lXRM] [-N repeat-count] " CMD_TARGET_PANE_USAGE " key ...",
-	NULL,
+
-	cmd_send_keys_exec
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_send_keys_exec
 };
 
 const struct cmd_entry cmd_send_prefix_entry = {
-	"send-prefix", NULL,
+	.name = "send-prefix",
-	"2t:", 0, 0,
+	.alias = NULL,
-	"[-2] " CMD_TARGET_PANE_USAGE,
+
-	0,
+	.args = { "2t:", 0, 0 },
-	NULL,
+	.usage = "[-2] " CMD_TARGET_PANE_USAGE,
-	NULL,
+
-	cmd_send_keys_exec
+	.tflag = CMD_PANE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_send_keys_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct window_pane	*wp;
+	struct client		*c = item->state.c;
-	struct session		*s;
+	struct window_pane	*wp = item->state.tflag.wp;
-	struct input_ctx	*ictx;
+	struct session		*s = item->state.tflag.s;
-	const char		*str;
+	struct mouse_event	*m = &item->mouse;
-	int			 i, key;
+	struct utf8_data	*ud, *uc;
+	wchar_t			 wc;
+	int			 i, literal;
+	key_code		 key;
+	u_int			 np = 1;
+	char			*cause = NULL;
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
+	if (args_has(args, 'N')) {
-		return (CMD_RETURN_ERROR);
+		np = args_strtonum(args, 'N', 1, UINT_MAX, &cause);
+		if (cause != NULL) {
+			cmdq_error(item, "repeat count %s", cause);
+			free(cause);
+			return (CMD_RETURN_ERROR);
+		}
+		if (args_has(args, 'X') || args->argc == 0)
+			wp->modeprefix = np;
+	}
+
+	if (args_has(args, 'X')) {
+		if (wp->mode == NULL || wp->mode->command == NULL) {
+			cmdq_error(item, "not in a mode");
+			return (CMD_RETURN_ERROR);
+		}
+		if (!m->valid)
+			wp->mode->command(wp, c, s, args, NULL);
+		else
+			wp->mode->command(wp, c, s, args, m);
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (args_has(args, 'M')) {
+		wp = cmd_mouse_pane(m, &s, NULL);
+		if (wp == NULL) {
+			cmdq_error(item, "no mouse target");
+			return (CMD_RETURN_ERROR);
+		}
+		window_pane_key(wp, NULL, s, m->key, m);
+		return (CMD_RETURN_NORMAL);
+	}
 
 	if (self->entry == &cmd_send_prefix_entry) {
 		if (args_has(args, '2'))
-			key = options_get_number(&s->options, "prefix2");
+			key = options_get_number(s->options, "prefix2");
 		else
-			key = options_get_number(&s->options, "prefix");
+			key = options_get_number(s->options, "prefix");
-		window_pane_key(wp, s, key);
+		window_pane_key(wp, NULL, s, key, NULL);
 		return (CMD_RETURN_NORMAL);
 	}
 
 	if (args_has(args, 'R')) {
-		ictx = &wp->ictx;
+		window_pane_reset_palette(wp);
-
+		input_reset(wp, 1);
-		memcpy(&ictx->cell, &grid_default_cell, sizeof ictx->cell);
-		memcpy(&ictx->old_cell, &ictx->cell, sizeof ictx->old_cell);
-		ictx->old_cx = 0;
-		ictx->old_cy = 0;
-
-		if (wp->mode == NULL)
-			screen_write_start(&ictx->ctx, wp, &wp->base);
-		else
-			screen_write_start(&ictx->ctx, NULL, &wp->base);
-		screen_write_reset(&ictx->ctx);
-		screen_write_stop(&ictx->ctx);
 	}
 
-	for (i = 0; i < args->argc; i++) {
+	for (; np != 0; np--) {
-		str = args->argv[i];
+		for (i = 0; i < args->argc; i++) {
-
+			literal = args_has(args, 'l');
-		if (!args_has(args, 'l') &&
+			if (!literal) {
-		    (key = key_string_lookup_string(str)) != KEYC_NONE) {
+				key = key_string_lookup_string(args->argv[i]);
-			    window_pane_key(wp, s, key);
+				if (key != KEYC_NONE && key != KEYC_UNKNOWN)
-		} else {
+					window_pane_key(wp, NULL, s, key, NULL);
-			for (; *str != '\0'; str++)
+				else
-			    window_pane_key(wp, s, *str);
+					literal = 1;
+			}
+			if (literal) {
+				ud = utf8_fromcstr(args->argv[i]);
+				for (uc = ud; uc->size != 0; uc++) {
+					if (utf8_combine(uc, &wc) != UTF8_DONE)
+						continue;
+					window_pane_key(wp, NULL, s, wc, NULL);
+				}
+				free(ud);
+			}
 		}
+
 	}
 
 	return (CMD_RETURN_NORMAL);

cmd-server-info.c

@@ -1,174 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2008 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 <sys/utsname.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "tmux.h"
-
-/*
- * Show various information about server.
- */
-
-enum cmd_retval	 cmd_server_info_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_server_info_entry = {
-	"server-info", "info",
-	"", 0, 0,
-	"",
-	0,
-	NULL,
-	NULL,
-	cmd_server_info_exec
-};
-
-enum cmd_retval
-cmd_server_info_exec(unused struct cmd *self, struct cmd_q *cmdq)
-{
-	struct tty_term				*term;
-	struct client				*c;
-	struct session				*s;
-	struct winlink				*wl;
-	struct window				*w;
-	struct window_pane			*wp;
-	struct tty_code				*code;
-	const struct tty_term_code_entry	*ent;
-	struct utsname				 un;
-	struct job				*job;
-	struct grid				*gd;
-	struct grid_line			*gl;
-	u_int		 			 i, j, k, lines;
-	size_t					 size;
-	char					 out[80];
-	char					*tim;
-	time_t		 			 t;
-
-	tim = ctime(&start_time);
-	*strchr(tim, '\n') = '\0';
-	cmdq_print(cmdq,
-	    "tmux " VERSION ", pid %ld, started %s", (long) getpid(), tim);
-	cmdq_print(cmdq, "socket path %s, debug level %d", socket_path,
-	    debug_level);
-	if (uname(&un) >= 0) {
-		cmdq_print(cmdq, "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);
-	else
-		cmdq_print(cmdq, "configuration file not specified");
-	cmdq_print(cmdq, "protocol version is %d", PROTOCOL_VERSION);
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "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 "
-		    "class=%u] [flags=0x%x/0x%x, references=%u]", i,
-		    c->tty.path, 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->flags, c->tty.flags, c->references);
-	}
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "Sessions: [%zu]", sizeof (struct grid_cell));
-	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] "
-		    "[flags=0x%x]", s->id, 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, "
-			    "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;
-				gd = wp->base.grid;
-				for (k = 0; k < gd->hsize + gd->sy; k++) {
-					gl = &gd->linedata[k];
-					if (gl->celldata == NULL)
-						continue;
-					lines++;
-					size += gl->cellsize *
-					    sizeof *gl->celldata;
-				}
-				cmdq_print(cmdq,
-				    "%6u: %s %lu %d %u/%u, %zu bytes", j,
-				    wp->tty, (u_long) wp->pid, wp->fd, lines,
-				    gd->hsize + gd->sy, size);
-				j++;
-			}
-		}
-	}
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "Terminals:");
-	LIST_FOREACH(term, &tty_terms, entry) {
-		cmdq_print(cmdq, "%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]",
-				    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",
-				    ent->code, ent->name, out);
-				break;
-			case TTYCODE_NUMBER:
-				cmdq_print(cmdq, "%2u: %s: (number) %d",
-				    ent->code, ent->name, code->value.number);
-				break;
-			case TTYCODE_FLAG:
-				cmdq_print(cmdq, "%2u: %s: (flag) %s",
-				    ent->code, ent->name,
-				    code->value.flag ? "true" : "false");
-				break;
-			}
-		}
-	}
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "Jobs:");
-	LIST_FOREACH(job, &all_jobs, lentry) {
-		cmdq_print(cmdq, "%s [fd=%d, pid=%d, status=%d]",
-		    job->cmd, job->fd, job->pid, job->status);
-	}
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-set-buffer.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -24,51 +24,98 @@
 #include "tmux.h"
 
 /*
- * Add or set a paste buffer.
+ * Add, set, append to or delete a paste buffer.
  */
 
-enum cmd_retval	 cmd_set_buffer_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_set_buffer_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_set_buffer_entry = {
-	"set-buffer", "setb",
+	.name = "set-buffer",
-	"b:", 1, 1,
+	.alias = "setb",
-	CMD_BUFFER_USAGE " data",
+
-	0,
+	.args = { "ab:n:", 0, 1 },
-	NULL,
+	.usage = "[-a] " CMD_BUFFER_USAGE " [-n new-buffer-name] data",
-	NULL,
+
-	cmd_set_buffer_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_set_buffer_exec
 };
 
-enum cmd_retval
+const struct cmd_entry cmd_delete_buffer_entry = {
-cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
+	.name = "delete-buffer",
+	.alias = "deleteb",
+
+	.args = { "b:", 0, 0 },
+	.usage = CMD_BUFFER_USAGE,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_set_buffer_exec
+};
+
+static enum cmd_retval
+cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args	*args = self->args;
+	struct args		*args = self->args;
-	u_int		 limit;
+	struct paste_buffer	*pb;
-	char		*pdata, *cause;
+	char			*bufdata, *cause;
-	size_t		 psize;
+	const char		*bufname, *olddata;
-	int		 buffer;
+	size_t			 bufsize, newsize;
 
-	limit = options_get_number(&global_options, "buffer-limit");
+	bufname = args_get(args, 'b');
+	if (bufname == NULL)
+		pb = NULL;
+	else
+		pb = paste_get_name(bufname);
 
-	pdata = xstrdup(args->argv[0]);
+	if (self->entry == &cmd_delete_buffer_entry) {
-	psize = strlen(pdata);
+		if (pb == NULL)
-
+			pb = paste_get_top(&bufname);
-	if (!args_has(args, 'b')) {
+		if (pb == NULL) {
-		paste_add(&global_buffers, pdata, psize, limit);
+			cmdq_error(item, "no buffer");
+			return (CMD_RETURN_ERROR);
+		}
+		paste_free(pb);
 		return (CMD_RETURN_NORMAL);
 	}
 
-	buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause);
+	if (args_has(args, 'n')) {
-	if (cause != NULL) {
+		if (pb == NULL)
-		cmdq_error(cmdq, "buffer %s", cause);
+			pb = paste_get_top(&bufname);
-		free(cause);
+		if (pb == NULL) {
-		free(pdata);
+			cmdq_error(item, "no buffer");
-		return (CMD_RETURN_ERROR);
+			return (CMD_RETURN_ERROR);
+		}
+		if (paste_rename(bufname, args_get(args, 'n'), &cause) != 0) {
+			cmdq_error(item, "%s", cause);
+			free(cause);
+			return (CMD_RETURN_ERROR);
+		}
+		return (CMD_RETURN_NORMAL);
 	}
 
-	if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) {
+	if (args->argc != 1) {
-		cmdq_error(cmdq, "no buffer %d", buffer);
+		cmdq_error(item, "no data specified");
-		free(pdata);
+		return (CMD_RETURN_ERROR);
+	}
+	if ((newsize = strlen(args->argv[0])) == 0)
+		return (CMD_RETURN_NORMAL);
+
+	bufsize = 0;
+	bufdata = NULL;
+
+	if (args_has(args, 'a') && pb != NULL) {
+		olddata = paste_buffer_data(pb, &bufsize);
+		bufdata = xmalloc(bufsize);
+		memcpy(bufdata, olddata, bufsize);
+	}
+
+	bufdata = xrealloc(bufdata, bufsize + newsize);
+	memcpy(bufdata + bufsize, args->argv[0], newsize);
+	bufsize += newsize;
+
+	if (paste_set(bufdata, bufsize, bufname, &cause) != 0) {
+		cmdq_error(item, "%s", cause);
+		free(bufdata);
+		free(cause);
 		return (CMD_RETURN_ERROR);
 	}
 

cmd-set-environment.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -27,33 +27,36 @@
  * Set an environment variable.
  */
 
-enum cmd_retval	 cmd_set_environment_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_set_environment_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_set_environment_entry = {
-	"set-environment", "setenv",
+	.name = "set-environment",
-	"grt:u", 1, 2,
+	.alias = "setenv",
-	"[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
+
-	0,
+	.args = { "grt:u", 1, 2 },
-	NULL,
+	.usage = "[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
-	NULL,
+
-	cmd_set_environment_exec
+	.tflag = CMD_SESSION_CANFAIL,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_set_environment_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct session	*s;
 	struct environ	*env;
-	const char	*name, *value;
+	const char	*name, *value, *target;
 
 	name = args->argv[0];
 	if (*name == '\0') {
-		cmdq_error(cmdq, "empty variable name");
+		cmdq_error(item, "empty variable name");
 		return (CMD_RETURN_ERROR);
 	}
 	if (strchr(name, '=') != NULL) {
-		cmdq_error(cmdq, "variable name contains =");
+		cmdq_error(item, "variable name contains =");
 		return (CMD_RETURN_ERROR);
 	}
 
@@ -63,31 +66,37 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq)
 		value = args->argv[1];
 
 	if (args_has(self->args, 'g'))
-		env = &global_environ;
+		env = global_environ;
 	else {
-		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+		if (item->state.tflag.s == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(item, "no such session: %s", target);
+			else
+				cmdq_error(item, "no current session");
 			return (CMD_RETURN_ERROR);
-		env = &s->environ;
+		}
+		env = item->state.tflag.s->environ;
 	}
 
 	if (args_has(self->args, 'u')) {
 		if (value != NULL) {
-			cmdq_error(cmdq, "can't specify a value with -u");
+			cmdq_error(item, "can't specify a value with -u");
 			return (CMD_RETURN_ERROR);
 		}
 		environ_unset(env, name);
 	} else if (args_has(self->args, 'r')) {
 		if (value != NULL) {
-			cmdq_error(cmdq, "can't specify a value with -r");
+			cmdq_error(item, "can't specify a value with -r");
 			return (CMD_RETURN_ERROR);
 		}
-		environ_set(env, name, NULL);
+		environ_clear(env, name);
 	} else {
 		if (value == NULL) {
-			cmdq_error(cmdq, "no value specified");
+			cmdq_error(item, "no value specified");
 			return (CMD_RETURN_ERROR);
 		}
-		environ_set(env, name, value);
+		environ_set(env, name, "%s", value);
 	}
 
 	return (CMD_RETURN_NORMAL);

cmd-set-hook.c

@@ -0,0 +1,130 @@
+/* $OpenBSD$ */
+
+/*
+ * 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 <stdlib.h>
+#include <string.h>
+
+#include "tmux.h"
+
+/*
+ * Set or show global or session hooks.
+ */
+
+static enum cmd_retval cmd_set_hook_exec(struct cmd *, struct cmdq_item *);
+
+const struct cmd_entry cmd_set_hook_entry = {
+	.name = "set-hook",
+	.alias = NULL,
+
+	.args = { "gt:u", 1, 2 },
+	.usage = "[-gu] " CMD_TARGET_SESSION_USAGE " hook-name [command]",
+
+	.tflag = CMD_SESSION_CANFAIL,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_set_hook_exec
+};
+
+const struct cmd_entry cmd_show_hooks_entry = {
+	.name = "show-hooks",
+	.alias = NULL,
+
+	.args = { "gt:", 0, 1 },
+	.usage = "[-g] " CMD_TARGET_SESSION_USAGE,
+
+	.tflag = CMD_SESSION,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_set_hook_exec
+};
+
+static enum cmd_retval
+cmd_set_hook_exec(struct cmd *self, struct cmdq_item *item)
+{
+	struct args	*args = self->args;
+	struct cmd_list	*cmdlist;
+	struct hooks	*hooks;
+	struct hook	*hook;
+	char		*cause, *tmp;
+	const char	*name, *cmd, *target;
+
+	if (args_has(args, 'g'))
+		hooks = global_hooks;
+	else {
+		if (item->state.tflag.s == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(item, "no such session: %s", target);
+			else
+				cmdq_error(item, "no current session");
+			return (CMD_RETURN_ERROR);
+		}
+		hooks = item->state.tflag.s->hooks;
+	}
+
+	if (self->entry == &cmd_show_hooks_entry) {
+		hook = hooks_first(hooks);
+		while (hook != NULL) {
+			tmp = cmd_list_print(hook->cmdlist);
+			cmdq_print(item, "%s -> %s", hook->name, tmp);
+			free(tmp);
+
+			hook = hooks_next(hook);
+		}
+		return (CMD_RETURN_NORMAL);
+	}
+
+	name = args->argv[0];
+	if (*name == '\0') {
+		cmdq_error(item, "invalid hook name");
+		return (CMD_RETURN_ERROR);
+	}
+	if (args->argc < 2)
+		cmd = NULL;
+	else
+		cmd = args->argv[1];
+
+	if (args_has(args, 'u')) {
+		if (cmd != NULL) {
+			cmdq_error(item, "command passed to unset hook: %s",
+			    name);
+			return (CMD_RETURN_ERROR);
+		}
+		hooks_remove(hooks, name);
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (cmd == NULL) {
+		cmdq_error(item, "no command to set hook: %s", name);
+		return (CMD_RETURN_ERROR);
+	}
+	cmdlist = cmd_string_parse(cmd, NULL, 0, &cause);
+	if (cmdlist == NULL) {
+		if (cause != NULL) {
+			cmdq_error(item, "%s", cause);
+			free(cause);
+		}
+		return (CMD_RETURN_ERROR);
+	}
+	hooks_add(hooks, name, cmdlist);
+	cmd_list_free(cmdlist);
+
+	return (CMD_RETURN_NORMAL);
+}

cmd-set-option.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,430 +27,366 @@
  * Set an option.
  */
 
-enum cmd_retval	cmd_set_option_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_set_option_exec(struct cmd *, struct cmdq_item *);
 
-enum cmd_retval	cmd_set_option_user(struct cmd *, struct cmd_q *,
+static int	cmd_set_option_set(struct cmd *, struct cmdq_item *,
-	    const char *, const char *);
+		    struct options *, struct options_entry *, const char *);
-
+static int	cmd_set_option_flag(struct cmdq_item *,
-int	cmd_set_option_unset(struct cmd *, struct cmd_q *,
+		    const struct options_table_entry *, struct options *,
-	    const struct options_table_entry *, struct options *,
+		    const char *);
-	    const char *);
+static int	cmd_set_option_choice(struct cmdq_item *,
-int	cmd_set_option_set(struct cmd *, struct cmd_q *,
+		    const struct options_table_entry *, struct options *,
-	    const struct options_table_entry *, struct options *,
+		    const char *);
-	    const char *);
-
-struct options_entry *cmd_set_option_string(struct cmd *, struct cmd_q *,
-	    const struct options_table_entry *, struct options *,
-	    const char *);
-struct options_entry *cmd_set_option_number(struct cmd *, struct cmd_q *,
-	    const struct options_table_entry *, struct options *,
-	    const char *);
-struct options_entry *cmd_set_option_key(struct cmd *, struct cmd_q *,
-	    const struct options_table_entry *, struct options *,
-	    const char *);
-struct options_entry *cmd_set_option_colour(struct cmd *, struct cmd_q *,
-	    const struct options_table_entry *, struct options *,
-	    const char *);
-struct options_entry *cmd_set_option_attributes(struct cmd *, struct cmd_q *,
-	    const struct options_table_entry *, struct options *,
-	    const char *);
-struct options_entry *cmd_set_option_flag(struct cmd *, struct cmd_q *,
-	    const struct options_table_entry *, struct options *,
-	    const char *);
-struct options_entry *cmd_set_option_choice(struct cmd *, struct cmd_q *,
-	    const struct options_table_entry *, struct options *,
-	    const char *);
 
 const struct cmd_entry cmd_set_option_entry = {
-	"set-option", "set",
+	.name = "set-option",
-	"agoqst:uw", 1, 2,
+	.alias = "set",
-	"[-agosquw] [-t target-session|target-window] option [value]",
+
-	0,
+	.args = { "agoqst:uw", 1, 2 },
-	NULL,
+	.usage = "[-agosquw] [-t target-window] option [value]",
-	NULL,
+
-	cmd_set_option_exec
+	.tflag = CMD_WINDOW_CANFAIL,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_set_option_exec
 };
 
 const struct cmd_entry cmd_set_window_option_entry = {
-	"set-window-option", "setw",
+	.name = "set-window-option",
-	"agoqt:u", 1, 2,
+	.alias = "setw",
-	"[-agoqu] " CMD_TARGET_WINDOW_USAGE " option [value]",
+
-	0,
+	.args = { "agoqt:u", 1, 2 },
-	NULL,
+	.usage = "[-agoqu] " CMD_TARGET_WINDOW_USAGE " option [value]",
-	NULL,
+
-	cmd_set_option_exec
+	.tflag = CMD_WINDOW_CANFAIL,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_set_option_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args				*args = self->args;
+	struct args			*args = self->args;
-	const struct options_table_entry	*table, *oe;
+	int				 append = args_has(args, 'a');
-	struct session				*s;
+	struct cmd_find_state		*fs = &item->state.tflag;
-	struct winlink				*wl;
+	struct session			*s = fs->s;
-	struct client				*c;
+	struct winlink			*wl = fs->wl;
-	struct options				*oo;
+	struct window			*w;
-	struct window				*w;
+	struct client			*c;
-	const char				*optstr, *valstr;
+	enum options_table_scope	 scope;
-	u_int					 i;
+	struct options			*oo;
+	struct options_entry		*parent, *o;
+	const char			*name, *value, *target;
+	int				 window, idx, already, error, ambiguous;
+	char				*cause;
 
-	/* Get the option name and value. */
+	/* Parse option name and index. */
-	optstr = args->argv[0];
+	name = options_match(args->argv[0], &idx, &ambiguous);
-	if (*optstr == '\0') {
+	if (name == NULL) {
-		cmdq_error(cmdq, "invalid option");
+		if (args_has(args, 'q'))
+			return (CMD_RETURN_NORMAL);
+		if (ambiguous)
+			cmdq_error(item, "ambiguous option: %s", args->argv[0]);
+		else
+			cmdq_error(item, "invalid option: %s", args->argv[0]);
 		return (CMD_RETURN_ERROR);
 	}
 	if (args->argc < 2)
-		valstr = NULL;
+		value = NULL;
 	else
-		valstr = args->argv[1];
+		value = args->argv[1];
 
-	/* Is this a user option? */
+	/*
-	if (*optstr == '@')
+	 * Figure out the scope: for user options it comes from the arguments,
-		return (cmd_set_option_user(self, cmdq, optstr, valstr));
+	 * otherwise from the option name.
-
+	 */
-	/* Find the option entry, try each table. */
+	if (*name == '@') {
-	table = oe = NULL;
+		window = (self->entry == &cmd_set_window_option_entry);
-	if (options_table_find(optstr, &table, &oe) != 0) {
+		scope = options_scope_from_flags(args, window, fs, &oo, &cause);
-		cmdq_error(cmdq, "ambiguous option: %s", optstr);
-		return (CMD_RETURN_ERROR);
-	}
-	if (oe == NULL) {
-		cmdq_error(cmdq, "unknown option: %s", optstr);
-		return (CMD_RETURN_ERROR);
-	}
-
-	/* Work out the tree from the table. */
-	if (table == server_options_table)
-		oo = &global_options;
-	else if (table == window_options_table) {
-		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 (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);
-			if (s == NULL)
-				return (CMD_RETURN_ERROR);
-			oo = &s->options;
-		}
 	} else {
-		cmdq_error(cmdq, "unknown table");
+		if (options_get_only(global_options, name) != NULL)
-		return (CMD_RETURN_ERROR);
+			scope = OPTIONS_TABLE_SERVER;
+		else if (options_get_only(global_s_options, name) != NULL)
+			scope = OPTIONS_TABLE_SESSION;
+		else if (options_get_only(global_w_options, name) != NULL)
+			scope = OPTIONS_TABLE_WINDOW;
+		else {
+			scope = OPTIONS_TABLE_NONE;
+			xasprintf(&cause, "unknown option: %s", args->argv[0]);
+		}
 	}
-
+	if (scope == OPTIONS_TABLE_NONE) {
-	/* Unset or set the option. */
+		if (args_has(args, 'q'))
-	if (args_has(args, 'u')) {
-		if (cmd_set_option_unset(self, cmdq, oe, oo, valstr) != 0)
-			return (CMD_RETURN_ERROR);
-	} else {
-		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);
-		}
+		cmdq_error(item, "%s", cause);
-		if (cmd_set_option_set(self, cmdq, oe, oo, valstr) != 0)
+		free(cause);
+		return (CMD_RETURN_ERROR);
+	}
+
+	/* Which table should this option go into? */
+	if (scope == OPTIONS_TABLE_SERVER)
+		oo = global_options;
+	else if (scope == OPTIONS_TABLE_SESSION) {
+		if (args_has(self->args, 'g'))
+			oo = global_s_options;
+		else if (s == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(item, "no such session: %s", target);
+			else
+				cmdq_error(item, "no current session");
 			return (CMD_RETURN_ERROR);
+		} else
+			oo = s->options;
+	} else if (scope == OPTIONS_TABLE_WINDOW) {
+		if (args_has(self->args, 'g'))
+			oo = global_w_options;
+		else if (wl == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(item, "no such window: %s", target);
+			else
+				cmdq_error(item, "no current window");
+			return (CMD_RETURN_ERROR);
+		} else
+			oo = wl->window->options;
 	}
+	o = options_get_only(oo, name);
+	parent = options_get(oo, name);
 
-	/* Start or stop timers when automatic-rename changed. */
+	/* Check that array options and indexes match up. */
-	if (strcmp (oe->name, "automatic-rename") == 0) {
+	if (idx != -1) {
-		for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
+		if (*name == '@' || options_array_size(parent, NULL) == -1) {
-			if ((w = ARRAY_ITEM(&windows, i)) == NULL)
+			cmdq_error(item, "not an array: %s", args->argv[0]);
-				continue;
+			return (CMD_RETURN_ERROR);
-			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. */
+	/* With -o, check this option is not already set. */
+	if (!args_has(args, 'u') && args_has(args, 'o')) {
+		if (idx == -1)
+			already = (o != NULL);
+		else {
+			if (o == NULL)
+				already = 0;
+			else
+				already = (options_array_get(o, idx) != NULL);
+		}
+		if (already) {
+			if (args_has(args, 'q'))
+				return (CMD_RETURN_NORMAL);
+			cmdq_error(item, "already set: %s", args->argv[0]);
+			return (CMD_RETURN_ERROR);
+		}
+	}
+
+	/* Change the option. */
+	if (args_has(args, 'u')) {
+		if (o == NULL)
+			return (CMD_RETURN_NORMAL);
+		if (idx == -1) {
+			if (oo == global_options ||
+			    oo == global_s_options ||
+			    oo == global_w_options)
+				options_default(oo, options_table_entry(o));
+			else
+				options_remove(o);
+		} else
+			options_array_set(o, idx, NULL, 0);
+	} else if (*name == '@') {
+		if (value == NULL) {
+			cmdq_error(item, "empty value");
+			return (CMD_RETURN_ERROR);
+		}
+		options_set_string(oo, name, append, "%s", value);
+	} else if (idx == -1 && options_array_size(parent, NULL) == -1) {
+		error = cmd_set_option_set(self, item, oo, parent, value);
+		if (error != 0)
+			return (CMD_RETURN_ERROR);
+	} else {
+		if (value == NULL) {
+			cmdq_error(item, "empty value");
+			return (CMD_RETURN_ERROR);
+		}
+		if (o == NULL)
+			o = options_empty(oo, options_table_entry(parent));
+		if (idx == -1) {
+			if (!append)
+				options_array_clear(o);
+			options_array_assign(o, value);
+		} else if (options_array_set(o, idx, value, append) != 0) {
+			cmdq_error(item, "invalid index: %s", args->argv[0]);
+			return (CMD_RETURN_ERROR);
+		}
+	}
+
+	/* Update timers and so on for various options. */
+	if (strcmp(name, "automatic-rename") == 0) {
+		RB_FOREACH(w, windows, &windows) {
+			if (w->active == NULL)
+				continue;
+			if (options_get_number(w->options, "automatic-rename"))
+				w->active->flags |= PANE_CHANGED;
+		}
+	}
+	if (strcmp(name, "key-table") == 0) {
+		TAILQ_FOREACH(c, &clients, entry)
+			server_client_set_key_table(c, NULL);
+	}
+	if (strcmp(name, "status") == 0 ||
+	    strcmp(name, "status-interval") == 0)
+		status_timer_start_all();
+	if (strcmp(name, "monitor-silence") == 0)
+		alerts_reset_all();
+	if (strcmp(name, "window-style") == 0 ||
+	    strcmp(name, "window-active-style") == 0) {
+		RB_FOREACH(w, windows, &windows)
+			w->flags |= WINDOW_STYLECHANGED;
+	}
+	if (strcmp(name, "pane-border-status") == 0) {
+		RB_FOREACH(w, windows, &windows)
+			layout_fix_panes(w, w->sx, w->sy);
+	}
+	RB_FOREACH (s, sessions, &sessions)
+		status_update_saved(s);
+
+	/*
+	 * Update sizes and redraw. May not always be necessary but do it
+	 * anyway.
+	 */
 	recalculate_sizes();
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+	TAILQ_FOREACH(c, &clients, entry) {
-		c = ARRAY_ITEM(&clients, i);
+		if (c->session != NULL)
-		if (c != NULL && c->session != NULL)
 			server_redraw_client(c);
 	}
 
 	return (CMD_RETURN_NORMAL);
 }
 
-/* Set user option. */
+static int
-enum cmd_retval
+cmd_set_option_set(struct cmd *self, struct cmdq_item *item, struct options *oo,
-cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char* optstr,
+    struct options_entry *parent, const char *value)
-    const char *valstr)
 {
-	struct args	*args = self->args;
+	const struct options_table_entry	*oe;
-	struct session	*s;
+	struct args				*args = self->args;
-	struct winlink	*wl;
+	int					 append = args_has(args, 'a');
-	struct options	*oo;
+	struct options_entry			*o;
+	long long				 number;
+	const char				*errstr;
+	key_code				 key;
 
-	if (args_has(args, 's'))
+	oe = options_table_entry(parent);
-		oo = &global_options;
+	if (value == NULL &&
-	else if (args_has(self->args, 'w') ||
+	    oe->type != OPTIONS_TABLE_FLAG &&
-	    self->entry == &cmd_set_window_option_entry) {
+	    oe->type != OPTIONS_TABLE_CHOICE) {
-		if (args_has(self->args, 'g'))
+		cmdq_error(item, "empty value");
-			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,
-    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);
-		return (-1);
-	}
-	if (value != NULL) {
-		cmdq_error(cmdq, "value passed to unset option: %s", oe->name);
 		return (-1);
 	}
 
-	options_remove(oo, oe->name);
-	if (!args_has(args, 'q'))
-		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,
-    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");
-		return (-1);
-	}
-
-	o = NULL;
 	switch (oe->type) {
 	case OPTIONS_TABLE_STRING:
-		o = cmd_set_option_string(self, cmdq, oe, oo, value);
+		options_set_string(oo, oe->name, append, "%s", value);
-		break;
+		return (0);
 	case OPTIONS_TABLE_NUMBER:
-		o = cmd_set_option_number(self, cmdq, oe, oo, value);
+		number = strtonum(value, oe->minimum, oe->maximum, &errstr);
-		break;
+		if (errstr != NULL) {
+			cmdq_error(item, "value is %s: %s", errstr, value);
+			return (-1);
+		}
+		options_set_number(oo, oe->name, number);
+		return (0);
 	case OPTIONS_TABLE_KEY:
-		o = cmd_set_option_key(self, cmdq, oe, oo, value);
+		key = key_string_lookup_string(value);
-		break;
+		if (key == KEYC_UNKNOWN) {
+			cmdq_error(item, "bad key: %s", value);
+			return (-1);
+		}
+		options_set_number(oo, oe->name, key);
+		return (0);
 	case OPTIONS_TABLE_COLOUR:
-		o = cmd_set_option_colour(self, cmdq, oe, oo, value);
+		if ((number = colour_fromstring(value)) == -1) {
-		break;
+			cmdq_error(item, "bad colour: %s", value);
+			return (-1);
+		}
+		o = options_set_number(oo, oe->name, number);
+		options_style_update_new(oo, o);
+		return (0);
 	case OPTIONS_TABLE_ATTRIBUTES:
-		o = cmd_set_option_attributes(self, cmdq, oe, oo, value);
+		if ((number = attributes_fromstring(value)) == -1) {
-		break;
+			cmdq_error(item, "bad attributes: %s", value);
+			return (-1);
+		}
+		o = options_set_number(oo, oe->name, number);
+		options_style_update_new(oo, o);
+		return (0);
 	case OPTIONS_TABLE_FLAG:
-		o = cmd_set_option_flag(self, cmdq, oe, oo, value);
+		return (cmd_set_option_flag(item, oe, oo, value));
-		break;
 	case OPTIONS_TABLE_CHOICE:
-		o = cmd_set_option_choice(self, cmdq, oe, oo, value);
+		return (cmd_set_option_choice(item, oe, oo, value));
+	case OPTIONS_TABLE_STYLE:
+		o = options_set_style(oo, oe->name, append, value);
+		if (o == NULL) {
+			cmdq_error(item, "bad style: %s", value);
+			return (-1);
+		}
+		options_style_update_old(oo, o);
+		return (0);
+	case OPTIONS_TABLE_ARRAY:
 		break;
 	}
-	if (o == NULL)
+	return (-1);
-		return (-1);
-
-	s = options_table_print_entry(oe, o, 0);
-	if (!args_has(args, 'q'))
-		cmdq_info(cmdq, "set option: %s -> %s", oe->name, s);
-	return (0);
 }
 
-/* Set a string option. */
+static int
-struct options_entry *
+cmd_set_option_flag(struct cmdq_item *item,
-cmd_set_option_string(struct cmd *self, unused struct cmd_q *cmdq,
+    const struct options_table_entry *oe, struct options *oo,
-    const struct options_table_entry *oe, struct options *oo, const char *value)
+    const char *value)
-{
-	struct args		*args = self->args;
-	struct options_entry	*o;
-	char			*oldval, *newval;
-
-	if (args_has(args, 'a')) {
-		oldval = options_get_string(oo, oe->name);
-		xasprintf(&newval, "%s%s", oldval, value);
-	} else
-		newval = xstrdup(value);
-
-	o = options_set_string(oo, oe->name, "%s", newval);
-
-	free(newval);
-	return (o);
-}
-
-/* Set a number option. */
-struct options_entry *
-cmd_set_option_number(unused struct cmd *self, struct cmd_q *cmdq,
-    const struct options_table_entry *oe, struct options *oo, const char *value)
-{
-	long long	 ll;
-	const char     	*errstr;
-
-	ll = strtonum(value, oe->minimum, oe->maximum, &errstr);
-	if (errstr != NULL) {
-		cmdq_error(cmdq, "value is %s: %s", errstr, value);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, ll));
-}
-
-/* Set a key option. */
-struct options_entry *
-cmd_set_option_key(unused struct cmd *self, struct cmd_q *cmdq,
-    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);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, key));
-}
-
-/* Set a colour option. */
-struct options_entry *
-cmd_set_option_colour(unused struct cmd *self, struct cmd_q *cmdq,
-    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);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, colour));
-}
-
-/* Set an attributes option. */
-struct options_entry *
-cmd_set_option_attributes(unused struct cmd *self, struct cmd_q *cmdq,
-    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);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, attr));
-}
-
-/* Set a flag option. */
-struct options_entry *
-cmd_set_option_flag(unused struct cmd *self, struct cmd_q *cmdq,
-    const struct options_table_entry *oe, struct options *oo, const char *value)
 {
 	int	flag;
 
 	if (value == NULL || *value == '\0')
 		flag = !options_get_number(oo, oe->name);
+	else if (strcmp(value, "1") == 0 ||
+	    strcasecmp(value, "on") == 0 ||
+	    strcasecmp(value, "yes") == 0)
+		flag = 1;
+	else if (strcmp(value, "0") == 0 ||
+	    strcasecmp(value, "off") == 0 ||
+	    strcasecmp(value, "no") == 0)
+		flag = 0;
 	else {
-		if ((value[0] == '1' && value[1] == '\0') ||
+		cmdq_error(item, "bad value: %s", value);
-		    strcasecmp(value, "on") == 0 ||
+		return (-1);
-		    strcasecmp(value, "yes") == 0)
-			flag = 1;
-		else if ((value[0] == '0' && value[1] == '\0') ||
-		    strcasecmp(value, "off") == 0 ||
-		    strcasecmp(value, "no") == 0)
-			flag = 0;
-		else {
-			cmdq_error(cmdq, "bad value: %s", value);
-			return (NULL);
-		}
 	}
-
+	options_set_number(oo, oe->name, flag);
-	return (options_set_number(oo, oe->name, flag));
+	return (0);
 }
 
-/* Set a choice option. */
+static int
-struct options_entry *
+cmd_set_option_choice(struct cmdq_item *item,
-cmd_set_option_choice(unused struct cmd *self, struct cmd_q *cmdq,
     const struct options_table_entry *oe, struct options *oo,
     const char *value)
 {
-	const char	**choicep;
+	const char	**cp;
 	int		  n, choice = -1;
 
-	n = 0;
+	if (value == NULL) {
-	for (choicep = oe->choices; *choicep != NULL; choicep++) {
+		choice = options_get_number(oo, oe->name);
-		n++;
+		if (choice < 2)
-		if (strncmp(*choicep, value, strlen(value)) != 0)
+			choice = !choice;
-			continue;
+	} else {
-
+		n = 0;
-		if (choice != -1) {
+		for (cp = oe->choices; *cp != NULL; cp++) {
-			cmdq_error(cmdq, "ambiguous value: %s", value);
+			if (strcmp(*cp, value) == 0)
-			return (NULL);
+				choice = n;
+			n++;
+		}
+		if (choice == -1) {
+			cmdq_error(item, "unknown value: %s", value);
+			return (-1);
 		}
-		choice = n - 1;
 	}
-	if (choice == -1) {
+	options_set_number(oo, oe->name, choice);
-		cmdq_error(cmdq, "unknown value: %s", value);
+	return (0);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, choice));
 }

cmd-show-environment.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -27,53 +27,110 @@
  * Show environment.
  */
 
-enum cmd_retval	 cmd_show_environment_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_show_environment_exec(struct cmd *,
+			    struct cmdq_item *);
+
+static char	*cmd_show_environment_escape(struct environ_entry *);
+static void	 cmd_show_environment_print(struct cmd *, struct cmdq_item *,
+		     struct environ_entry *);
 
 const struct cmd_entry cmd_show_environment_entry = {
-	"show-environment", "showenv",
+	.name = "show-environment",
-	"gt:", 0, 1,
+	.alias = "showenv",
-	"[-g] " CMD_TARGET_SESSION_USAGE " [name]",
+
-	0,
+	.args = { "gst:", 0, 1 },
-	NULL,
+	.usage = "[-gs] " CMD_TARGET_SESSION_USAGE " [name]",
-	NULL,
+
-	cmd_show_environment_exec
+	.tflag = CMD_SESSION_CANFAIL,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_show_environment_exec
 };
 
-enum cmd_retval
+static char *
-cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_show_environment_escape(struct environ_entry *envent)
+{
+	const char	*value = envent->value;
+	char		 c, *out, *ret;
+
+	out = ret = xmalloc(strlen(value) * 2 + 1); /* at most twice the size */
+	while ((c = *value++) != '\0') {
+		/* POSIX interprets $ ` " and \ in double quotes. */
+		if (c == '$' || c == '`' || c == '"' || c == '\\')
+			*out++ = '\\';
+		*out++ = c;
+	}
+	*out = '\0';
+
+	return (ret);
+}
+
+static void
+cmd_show_environment_print(struct cmd *self, struct cmdq_item *item,
+    struct environ_entry *envent)
+{
+	char	*escaped;
+
+	if (!args_has(self->args, 's')) {
+		if (envent->value != NULL)
+			cmdq_print(item, "%s=%s", envent->name, envent->value);
+		else
+			cmdq_print(item, "-%s", envent->name);
+		return;
+	}
+
+	if (envent->value != NULL) {
+		escaped = cmd_show_environment_escape(envent);
+		cmdq_print(item, "%s=\"%s\"; export %s;", envent->name, escaped,
+		    envent->name);
+		free(escaped);
+	} else
+		cmdq_print(item, "unset %s;", envent->name);
+}
+
+static enum cmd_retval
+cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct session		*s;
 	struct environ		*env;
 	struct environ_entry	*envent;
+	const char		*target;
+
+	if ((target = args_get(args, 't')) != NULL) {
+		if (item->state.tflag.s == NULL) {
+			cmdq_error(item, "no such session: %s", target);
+			return (CMD_RETURN_ERROR);
+		}
+	}
 
 	if (args_has(self->args, 'g'))
-		env = &global_environ;
+		env = global_environ;
 	else {
-		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
+		if (item->state.tflag.s == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(item, "no such session: %s", target);
+			else
+				cmdq_error(item, "no current session");
 			return (CMD_RETURN_ERROR);
-		env = &s->environ;
+		}
+		env = item->state.tflag.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]);
+			cmdq_error(item, "unknown variable: %s", args->argv[0]);
 			return (CMD_RETURN_ERROR);
 		}
-		if (envent->value != NULL)
+		cmd_show_environment_print(self, item, envent);
-			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) {
+	envent = environ_first(env);
-		if (envent->value != NULL)
+	while (envent != NULL) {
-			cmdq_print(cmdq, "%s=%s", envent->name, envent->value);
+		cmd_show_environment_print(self, item, envent);
-		else
+		envent = environ_next(envent);
-			cmdq_print(cmdq, "-%s", envent->name);
 	}
-
 	return (CMD_RETURN_NORMAL);
 }

cmd-show-messages.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -20,6 +20,7 @@
 
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "tmux.h"
 
@@ -27,37 +28,91 @@
  * Show client message log.
  */
 
-enum cmd_retval	 cmd_show_messages_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_show_messages_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_show_messages_entry = {
-	"show-messages", "showmsgs",
+	.name = "show-messages",
-	"t:", 0, 0,
+	.alias = "showmsgs",
-	CMD_TARGET_CLIENT_USAGE,
+
-	0,
+	.args = { "JTt:", 0, 0 },
-	NULL,
+	.usage = "[-JT] " CMD_TARGET_CLIENT_USAGE,
-	NULL,
+
-	cmd_show_messages_exec
+	.tflag = CMD_CLIENT,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_show_messages_exec
 };
 
-enum cmd_retval
+static int	cmd_show_messages_terminals(struct cmdq_item *, int);
-cmd_show_messages_exec(struct cmd *self, struct cmd_q *cmdq)
+static int	cmd_show_messages_jobs(struct cmdq_item *, int);
+
+static int
+cmd_show_messages_terminals(struct cmdq_item *item, int blank)
+{
+	struct tty_term	*term;
+	u_int		 i, n;
+
+	n = 0;
+	LIST_FOREACH(term, &tty_terms, entry) {
+		if (blank) {
+			cmdq_print(item, "%s", "");
+			blank = 0;
+		}
+		cmdq_print(item, "Terminal %u: %s [references=%u, flags=0x%x]:",
+		    n, term->name, term->references, term->flags);
+		n++;
+		for (i = 0; i < tty_term_ncodes(); i++)
+			cmdq_print(item, "%s", tty_term_describe(term, i));
+	}
+	return (n != 0);
+}
+
+static int
+cmd_show_messages_jobs(struct cmdq_item *item, int blank)
+{
+	struct job	*job;
+	u_int		 n;
+
+	n = 0;
+	LIST_FOREACH(job, &all_jobs, lentry) {
+		if (blank) {
+			cmdq_print(item, "%s", "");
+			blank = 0;
+		}
+		cmdq_print(item, "Job %u: %s [fd=%d, pid=%ld, status=%d]",
+		    n, job->cmd, job->fd, (long)job->pid, job->status);
+		n++;
+	}
+	return (n != 0);
+}
+
+static enum cmd_retval
+cmd_show_messages_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct client		*c;
+	struct client		*c = item->state.c;
 	struct message_entry	*msg;
 	char			*tim;
-	u_int			 i;
+	int			 done, blank;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
+	done = blank = 0;
-		return (CMD_RETURN_ERROR);
+	if (args_has(args, 'T')) {
-
+		blank = cmd_show_messages_terminals(item, blank);
-	for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
+		done = 1;
-		msg = &ARRAY_ITEM(&c->message_log, i);
+	}
+	if (args_has(args, 'J')) {
+		cmd_show_messages_jobs(item, blank);
+		done = 1;
+	}
+	if (done)
+		return (CMD_RETURN_NORMAL);
 
+	TAILQ_FOREACH(msg, &c->message_log, entry) {
 		tim = ctime(&msg->msg_time);
 		*strchr(tim, '\n') = '\0';
 
-		cmdq_print(cmdq, "%s %s", tim, msg->msg);
+		cmdq_print(item, "%s %s", tim, msg->msg);
 	}
 
 	return (CMD_RETURN_NORMAL);

cmd-show-options.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,147 +27,153 @@
  * Show options.
  */
 
-enum cmd_retval	 cmd_show_options_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_show_options_exec(struct cmd *, struct cmdq_item *);
 
-enum cmd_retval	cmd_show_options_one(struct cmd *, struct cmd_q *,
+static enum cmd_retval	cmd_show_options_one(struct cmd *, struct cmdq_item *,
-		    struct options *, int);
+			    struct options *);
-enum cmd_retval cmd_show_options_all(struct cmd *, struct cmd_q *,
+static enum cmd_retval	cmd_show_options_all(struct cmd *, struct cmdq_item *,
-		    const struct options_table_entry *, struct options *);
+		    	    struct options *);
 
 const struct cmd_entry cmd_show_options_entry = {
-	"show-options", "show",
+	.name = "show-options",
-	"gqst:vw", 0, 1,
+	.alias = "show",
-	"[-gqsvw] [-t target-session|target-window] [option]",
+
-	0,
+	.args = { "gqst:vw", 0, 1 },
-	NULL,
+	.usage = "[-gqsvw] [-t target-session|target-window] [option]",
-	NULL,
+
-	cmd_show_options_exec
+	.tflag = CMD_WINDOW_CANFAIL,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_show_options_exec
 };
 
 const struct cmd_entry cmd_show_window_options_entry = {
-	"show-window-options", "showw",
+	.name = "show-window-options",
-	"gvt:", 0, 1,
+	.alias = "showw",
-	"[-gv] " CMD_TARGET_WINDOW_USAGE " [option]",
+
-	0,
+	.args = { "gvt:", 0, 1 },
-	NULL,
+	.usage = "[-gv] " CMD_TARGET_WINDOW_USAGE " [option]",
-	NULL,
+
-	cmd_show_options_exec
+	.tflag = CMD_WINDOW_CANFAIL,
+
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_show_options_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_show_options_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args				*args = self->args;
+	struct args			*args = self->args;
-	struct session				*s;
+	struct cmd_find_state		*fs = &item->state.tflag;
-	struct winlink				*wl;
+	struct options			*oo;
-	const struct options_table_entry	*table;
+	enum options_table_scope	 scope;
-	struct options				*oo;
+	char				*cause;
-	int					 quiet;
+	int				 window;
 
-	if (args_has(self->args, 's')) {
+	window = (self->entry == &cmd_show_window_options_entry);
-		oo = &global_options;
+	scope = options_scope_from_flags(args, window, fs, &oo, &cause);
-		table = server_options_table;
+	if (scope == OPTIONS_TABLE_NONE) {
-	} else if (args_has(self->args, 'w') ||
+		cmdq_error(item, "%s", cause);
-	    self->entry == &cmd_show_window_options_entry) {
+		free(cause);
-		table = window_options_table;
+		return (CMD_RETURN_ERROR);
-		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 {
-		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);
-			if (s == NULL)
-				return (CMD_RETURN_ERROR);
-			oo = &s->options;
-		}
 	}
 
-	quiet = args_has(self->args, 'q');
 	if (args->argc == 0)
-		return (cmd_show_options_all(self, cmdq, table, oo));
+		return (cmd_show_options_all(self, item, oo));
 	else
-		return (cmd_show_options_one(self, cmdq, oo, quiet));
+		return (cmd_show_options_one(self, item, oo));
 }
 
-enum cmd_retval
+static void
-cmd_show_options_one(struct cmd *self, struct cmd_q *cmdq,
+cmd_show_options_print(struct cmd *self, struct cmdq_item *item,
-    struct options *oo, int quiet)
+    struct options_entry *o, int idx)
 {
-	struct args				*args = self->args;
+	const char	*name;
-	const struct options_table_entry	*table, *oe;
+	const char	*value;
-	struct options_entry			*o;
+	char		*tmp, *escaped;
-	const char				*optval;
+	u_int		 size, i;
 
-	if (*args->argv[0] == '@') {
+	if (idx != -1) {
-		if ((o = options_find1(oo, args->argv[0])) == NULL) {
+		xasprintf(&tmp, "%s[%d]", options_name(o), idx);
-			if (quiet)
+		name = tmp;
-				return (CMD_RETURN_NORMAL);
+	} else {
-			cmdq_error(cmdq, "unknown option: %s", args->argv[0]);
+		if (options_array_size(o, &size) != -1) {
+			for (i = 0; i < size; i++) {
+				if (options_array_get(o, i) == NULL)
+					continue;
+				cmd_show_options_print(self, item, o, i);
+			}
+			return;
+		}
+		tmp = NULL;
+		name = options_name(o);
+	}
+
+	value = options_tostring(o, idx, 0);
+	if (args_has(self->args, 'v'))
+		cmdq_print(item, "%s", value);
+	else if (options_isstring(o)) {
+		utf8_stravis(&escaped, value, VIS_OCTAL|VIS_TAB|VIS_NL|VIS_DQ);
+		cmdq_print(item, "%s \"%s\"", name, escaped);
+		free(escaped);
+	} else
+		cmdq_print(item, "%s %s", name, value);
+
+	free(tmp);
+}
+
+static enum cmd_retval
+cmd_show_options_one(struct cmd *self, struct cmdq_item *item,
+    struct options *oo)
+{
+	struct args		*args = self->args;
+	struct options_entry	*o;
+	int			 idx, ambiguous;
+	const char		*name = args->argv[0];
+
+	o = options_match_get(oo, name, &idx, 1, &ambiguous);
+	if (o == NULL) {
+		if (args_has(args, 'q'))
+			return (CMD_RETURN_NORMAL);
+		if (ambiguous) {
+			cmdq_error(item, "ambiguous option: %s", name);
 			return (CMD_RETURN_ERROR);
 		}
-		if (args_has(self->args, 'v'))
+		if (*name != '@' &&
-			cmdq_print(cmdq, "%s", o->str);
+		    options_match_get(oo, name, &idx, 0, &ambiguous) != NULL)
-		else
+			return (CMD_RETURN_NORMAL);
-			cmdq_print(cmdq, "%s \"%s\"", o->name, o->str);
+		cmdq_error(item, "unknown option: %s", name);
-		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) {
+	cmd_show_options_print(self, item, o, idx);
-		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
+static enum cmd_retval
-cmd_show_options_all(struct cmd *self, struct cmd_q *cmdq,
+cmd_show_options_all(struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *table, struct options *oo)
+    struct options *oo)
 {
+	struct options_entry			 *o;
 	const struct options_table_entry	*oe;
-	struct options_entry			*o;
+	u_int					 size, idx;
-	const char				*optval;
 
-	RB_FOREACH(o, options_tree, &oo->tree) {
+	o = options_first(oo);
-		if (*o->name == '@') {
+	while (o != NULL) {
-			if (args_has(self->args, 'v'))
+		oe = options_table_entry(o);
-				cmdq_print(cmdq, "%s", o->str);
+		if (oe != NULL && oe->style != NULL) {
-			else
+			o = options_next(o);
-				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,
+		}
-		    args_has(self->args, 'v'));
+		if (options_array_size(o, &size) == -1)
-		if (args_has(self->args, 'v'))
+			cmd_show_options_print(self, item, o, -1);
-			cmdq_print(cmdq, "%s", optval);
+		else {
-		else
+			for (idx = 0; idx < size; idx++) {
-			cmdq_print(cmdq, "%s %s", oe->name, optval);
+				if (options_array_get(o, idx) == NULL)
+					continue;
+				cmd_show_options_print(self, item, o, idx);
+			}
+		}
+		o = options_next(o);
 	}
-
 	return (CMD_RETURN_NORMAL);
 }

cmd-source-file.c

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
  * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
@@ -18,7 +18,10 @@
 
 #include <sys/types.h>
 
+#include <errno.h>
+#include <glob.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "tmux.h"
 
@@ -26,83 +29,70 @@
  * Sources a configuration file.
  */
 
-enum cmd_retval	cmd_source_file_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_source_file_exec(struct cmd *, struct cmdq_item *);
 
-void		cmd_source_file_show(struct cmd_q *);
+static enum cmd_retval	cmd_source_file_done(struct cmdq_item *, void *);
-void		cmd_source_file_done(struct cmd_q *);
 
 const struct cmd_entry cmd_source_file_entry = {
-	"source-file", "source",
+	.name = "source-file",
-	"", 1, 1,
+	.alias = "source",
-	"path",
+
-	0,
+	.args = { "q", 1, 1 },
-	NULL,
+	.usage = "[-q] path",
-	NULL,
+
-	cmd_source_file_exec
+	.flags = 0,
+	.exec = cmd_source_file_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args	*args = self->args;
+	struct args		*args = self->args;
-	struct cmd_q	*cmdq1;
+	int			 quiet = args_has(args, 'q');
-	char		*cause;
+	struct client		*c = item->client;
+	struct cmdq_item	*new_item;
+	enum cmd_retval		 retval;
+	char			*pattern, *tmp;
+	const char		*path = args->argv[0];
+	glob_t			 g;
+	u_int			 i;
 
-	cmdq1 = cmdq_new(NULL);
+	if (*path == '/')
-	cmdq1->emptyfn = cmd_source_file_done;
+		pattern = xstrdup(path);
-	cmdq1->data = cmdq;
+	else {
+		utf8_stravis(&tmp, server_client_get_cwd(c), VIS_GLOB);
+		xasprintf(&pattern, "%s/%s", tmp, path);
+		free(tmp);
+	}
+	log_debug("%s: %s", __func__, pattern);
 
-	switch (load_cfg(args->argv[0], cmdq1, &cause)) {
+	retval = CMD_RETURN_NORMAL;
-	case -1:
+	if (glob(pattern, 0, NULL, &g) != 0) {
-		if (cfg_references == 0) {
+		if (!quiet || errno != ENOENT) {
-			cmdq_free(cmdq1);
+			cmdq_error(item, "%s: %s", path, strerror(errno));
-			cmdq_error(cmdq, "%s", cause);
+			retval = CMD_RETURN_ERROR;
-			free(cause);
-			return (CMD_RETURN_ERROR);
 		}
-		ARRAY_ADD(&cfg_causes, cause);
+		free(pattern);
-		/* FALLTHROUGH */
+		return (retval);
-	case 0:
+	}
-		if (cfg_references == 0)
+	free(pattern);
-			cmd_source_file_show(cmdq);
+
-		cmdq_free(cmdq1);
+	for (i = 0; i < (u_int)g.gl_pathc; i++) {
-		return (CMD_RETURN_NORMAL);
+		if (load_cfg(g.gl_pathv[i], c, item, quiet) < 0)
+			retval = CMD_RETURN_ERROR;
+	}
+	if (cfg_finished) {
+		new_item = cmdq_get_callback(cmd_source_file_done, NULL);
+		cmdq_insert_after(item, new_item);
 	}
 
-	cmdq->references++;
+	globfree(&g);
-	cfg_references++;
+	return (retval);
-
-	cmdq_continue(cmdq1);
-	return (CMD_RETURN_WAIT);
 }
 
-void
+static enum cmd_retval
-cmd_source_file_show(struct cmd_q *cmdq)
+cmd_source_file_done(struct cmdq_item *item, __unused void *data)
 {
-	u_int	 i;
+	cfg_print_causes(item);
-	char	*cause;
+	return (CMD_RETURN_NORMAL);
-
-	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

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -18,7 +18,10 @@
 
 #include <sys/types.h>
 
+#include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "tmux.h"
@@ -27,63 +30,68 @@
  * Split a window (add a new pane).
  */
 
-void		 cmd_split_window_key_binding(struct cmd *, int);
+#define SPLIT_WINDOW_TEMPLATE "#{session_name}:#{window_index}.#{pane_index}"
-enum cmd_retval	 cmd_split_window_exec(struct cmd *, struct cmd_q *);
+
+static enum cmd_retval	cmd_split_window_exec(struct cmd *,
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_split_window_entry = {
-	"split-window", "splitw",
+	.name = "split-window",
-	"c:dF:l:hp:Pt:v", 0, 1,
+	.alias = "splitw",
-	"[-dhvP] [-c start-directory] [-F format] [-p percentage|-l size] "
+
-	CMD_TARGET_PANE_USAGE " [command]",
+	.args = { "bc:dfF:l:hp:Pt:v", 0, -1 },
-	0,
+	.usage = "[-bdfhvP] [-c start-directory] [-F format] "
-	cmd_split_window_key_binding,
+		 "[-p percentage|-l size] " CMD_TARGET_PANE_USAGE " [command]",
-	NULL,
+
-	cmd_split_window_exec
+	.tflag = CMD_PANE,
+
+	.flags = 0,
+	.exec = cmd_split_window_exec
 };
 
-void
+static enum cmd_retval
-cmd_split_window_key_binding(struct cmd *self, int key)
+cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
-{
-	self->args = args_create(0);
-	if (key == '%')
-		args_set(self->args, 'h', NULL);
-}
-
-enum cmd_retval
-cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
-	struct session		*s;
+	struct client		*c = item->state.c;
-	struct winlink		*wl;
+	struct session		*s = item->state.tflag.s;
-	struct window		*w;
+	struct winlink		*wl = item->state.tflag.wl;
-	struct window_pane	*wp, *new_wp = NULL;
+	struct window		*w = wl->window;
-	struct environ		 env;
+	struct window_pane	*wp = item->state.tflag.wp, *new_wp = NULL;
-	const char		*cmd, *cwd, *shell;
+	struct environ		*env;
-	char			*cause, *new_cause;
+	const char		*cmd, *path, *shell, *template, *cwd, *to_free;
+	char		       **argv, *cause, *new_cause, *cp;
 	u_int			 hlimit;
-	int			 size, percentage;
+	int			 argc, size, percentage;
 	enum layout_type	 type;
 	struct layout_cell	*lc;
-	const char		*template;
+	struct environ_entry	*envent;
-	struct client		*c;
+	struct cmd_find_state    fs;
-	struct format_tree	*ft;
-	char			*cp;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
-		return (CMD_RETURN_ERROR);
-	w = wl->window;
 	server_unzoom_window(w);
 
-	environ_init(&env);
+	if (args->argc == 0) {
-	environ_copy(&global_environ, &env);
+		cmd = options_get_string(s->options, "default-command");
-	environ_copy(&s->environ, &env);
+		if (cmd != NULL && *cmd != '\0') {
-	server_fill_environ(s, &env);
+			argc = 1;
+			argv = (char **)&cmd;
+		} else {
+			argc = 0;
+			argv = NULL;
+		}
+	} else {
+		argc = args->argc;
+		argv = args->argv;
+	}
 
-	if (args->argc == 0)
+	to_free = NULL;
-		cmd = options_get_string(&s->options, "default-command");
+	if (args_has(args, 'c')) {
+		cwd = args_get(args, 'c');
+		to_free = cwd = format_single(item, cwd, c, s, NULL, NULL);
+	} else if (item->client != NULL && item->client->session == NULL)
+		cwd = item->client->cwd;
 	else
-		cmd = args->argv[0];
+		cwd = s->cwd;
-	cwd = cmd_get_default_path(cmdq, args_get(args, 'c'));
 
 	type = LAYOUT_TOPBOTTOM;
 	if (args_has(args, 'h'))
@@ -111,22 +119,37 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		else
 			size = (wp->sx * percentage) / 100;
 	}
-	hlimit = options_get_number(&s->options, "history-limit");
+	hlimit = options_get_number(s->options, "history-limit");
 
-	shell = options_get_string(&s->options, "default-shell");
+	shell = options_get_string(s->options, "default-shell");
 	if (*shell == '\0' || areshell(shell))
 		shell = _PATH_BSHELL;
 
-	if ((lc = layout_split_pane(wp, type, size, 0)) == NULL) {
+	lc = layout_split_pane(wp, type, size, args_has(args, 'b'),
+	    args_has(args, 'f'));
+	if (lc == NULL) {
 		cause = xstrdup("pane too small");
 		goto error;
 	}
-	new_wp = window_add_pane(w, hlimit);
+	new_wp = window_add_pane(w, wp, args_has(args, 'b'), hlimit);
-	if (window_pane_spawn(
-	    new_wp, cmd, shell, cwd, &env, s->tio, &cause) != 0)
-		goto error;
 	layout_assign_pane(lc, new_wp);
 
+	path = NULL;
+	if (item->client != NULL && item->client->session == NULL)
+		envent = environ_find(item->client->environ, "PATH");
+	else
+		envent = environ_find(s->environ, "PATH");
+	if (envent != NULL)
+		path = envent->value;
+
+	env = environ_for_session(s);
+	if (window_pane_spawn(new_wp, argc, argv, path, shell, cwd, env,
+	    s->tio, &cause) != 0) {
+		environ_free(env);
+		goto error;
+	}
+	environ_free(env);
+
 	server_redraw_window(w);
 
 	if (!args_has(args, 'd')) {
@@ -136,33 +159,37 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 	} else
 		server_status_session(s);
 
-	environ_free(&env);
-
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
 			template = SPLIT_WINDOW_TEMPLATE;
-
+		cp = format_single(item, template, c, s, wl, new_wp);
-		ft = format_create();
+		cmdq_print(item, "%s", cp);
-		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);
+	notify_window("window-layout-changed", w);
+
+	if (to_free != NULL)
+		free((void *)to_free);
+
+	cmd_find_clear_state(&fs, NULL, 0);
+	fs.s = s;
+	fs.wl = wl;
+	fs.w = w;
+	fs.wp = new_wp;
+	cmd_find_log_state(__func__, &fs);
+	hooks_insert(s->hooks, item, &fs, "after-split-window");
+
 	return (CMD_RETURN_NORMAL);
 
 error:
-	environ_free(&env);
+	if (new_wp != NULL) {
-	if (new_wp != NULL)
+		layout_close_pane(new_wp);
 		window_remove_pane(w, new_wp);
-	cmdq_error(cmdq, "create pane failed: %s", cause);
+	}
+	cmdq_error(item, "create pane failed: %s", cause);
 	free(cause);
+
+	if (to_free != NULL)
+		free((void *)to_free);
 	return (CMD_RETURN_ERROR);
 }

cmd-string.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@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
@@ -31,14 +31,14 @@
  * Parse a command from a string.
  */
 
-int	 cmd_string_getc(const char *, size_t *);
+static int	 cmd_string_getc(const char *, size_t *);
-void	 cmd_string_ungetc(size_t *);
+static void	 cmd_string_ungetc(size_t *);
-void	 cmd_string_copy(char **, char *, size_t *);
+static void	 cmd_string_copy(char **, char *, size_t *);
-char	*cmd_string_string(const char *, size_t *, char, int);
+static char	*cmd_string_string(const char *, size_t *, char, int);
-char	*cmd_string_variable(const char *, size_t *);
+static char	*cmd_string_variable(const char *, size_t *);
-char	*cmd_string_expand_tilde(const char *, size_t *);
+static char	*cmd_string_expand_tilde(const char *, size_t *);
 
-int
+static int
 cmd_string_getc(const char *s, size_t *p)
 {
 	const u_char	*ucs = s;
@@ -48,38 +48,21 @@ cmd_string_getc(const char *s, size_t *p)
 	return (ucs[(*p)++]);
 }
 
-void
+static void
 cmd_string_ungetc(size_t *p)
 {
 	(*p)--;
 }
 
-/*
- * Parse command string. Returns -1 on error. If returning -1, cause is error
- * string, or NULL for empty command.
- */
 int
-cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
+cmd_string_split(const char *s, int *rargc, char ***rargv)
-    u_int line, char **cause)
 {
-	size_t		p;
+	size_t		p = 0;
-	int		ch, i, argc, rval;
+	int		ch, argc = 0, append = 0;
-	char	      **argv, *buf, *t;
+	char	      **argv = NULL, *buf = NULL, *t;
 	const char     *whitespace, *equals;
-	size_t		len;
+	size_t		len = 0;
 
-	argv = NULL;
-	argc = 0;
-
-	buf = NULL;
-	len = 0;
-
-	*cause = NULL;
-
-	*cmdlist = NULL;
-	rval = -1;
-
-	p = 0;
 	for (;;) {
 		ch = cmd_string_getc(s, &p);
 		switch (ch) {
@@ -107,10 +90,11 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
 		case ' ':
 		case '\t':
 			if (buf != NULL) {
-				buf = xrealloc(buf, 1, len + 1);
+				buf = xrealloc(buf, len + 1);
 				buf[len] = '\0';
 
-				argv = xrealloc(argv, argc + 1, sizeof *argv);
+				argv = xreallocarray(argv, argc + 1,
+				    sizeof *argv);
 				argv[argc++] = buf;
 
 				buf = NULL;
@@ -125,68 +109,88 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
 				whitespace = argv[0] + strcspn(argv[0], " \t");
 				if (equals == NULL || equals > whitespace)
 					break;
-				environ_put(&global_environ, argv[0]);
+				environ_put(global_environ, argv[0]);
 				argc--;
 				memmove(argv, argv + 1, argc * (sizeof *argv));
 			}
-			if (argc == 0)
+			goto done;
-				goto out;
-
-			*cmdlist = cmd_list_parse(argc, argv, file, line, cause);
-			if (*cmdlist == NULL)
-				goto out;
-
-			rval = 0;
-			goto out;
 		case '~':
-			if (buf == NULL) {
+			if (buf != NULL) {
-				t = cmd_string_expand_tilde(s, &p);
+				append = 1;
-				if (t == NULL)
-					goto error;
-				cmd_string_copy(&buf, t, &len);
 				break;
 			}
-			/* FALLTHROUGH */
+			t = cmd_string_expand_tilde(s, &p);
-		default:
+			if (t == NULL)
-			if (len >= SIZE_MAX - 2)
 				goto error;
-
+			cmd_string_copy(&buf, t, &len);
-			buf = xrealloc(buf, 1, len + 1);
+			break;
-			buf[len++] = ch;
+		default:
+			append = 1;
 			break;
 		}
+		if (append) {
+			if (len >= SIZE_MAX - 2)
+				goto error;
+			buf = xrealloc(buf, len + 1);
+			buf[len++] = ch;
+		}
+		append = 0;
 	}
 
+done:
+	*rargc = argc;
+	*rargv = argv;
+
+	free(buf);
+	return (0);
+
+error:
+	if (argv != NULL)
+		cmd_free_argv(argc, argv);
+	free(buf);
+	return (-1);
+}
+
+struct cmd_list *
+cmd_string_parse(const char *s, const char *file, u_int line, char **cause)
+{
+	struct cmd_list	 *cmdlist = NULL;
+	int		  argc;
+	char		**argv;
+
+	*cause = NULL;
+	if (cmd_string_split(s, &argc, &argv) != 0)
+		goto error;
+	if (argc != 0) {
+		cmdlist = cmd_list_parse(argc, argv, file, line, cause);
+		if (cmdlist == NULL) {
+			cmd_free_argv(argc, argv);
+			goto error;
+		}
+	}
+	cmd_free_argv(argc, argv);
+	return (cmdlist);
+
 error:
 	xasprintf(cause, "invalid or unknown command: %s", s);
-
+	return (NULL);
-out:
-	free(buf);
-
-	if (argv != NULL) {
-		for (i = 0; i < argc; i++)
-			free(argv[i]);
-		free(argv);
-	}
-
-	return (rval);
 }
 
-void
+static void
 cmd_string_copy(char **dst, char *src, size_t *len)
 {
 	size_t srclen;
 
 	srclen = strlen(src);
 
-	*dst = xrealloc(*dst, 1, *len + srclen + 1);
+	*dst = xrealloc(*dst, *len + srclen + 1);
 	strlcpy(*dst + *len, src, srclen + 1);
 
 	*len += srclen;
 	free(src);
 }
 
-char *
+static char *
 cmd_string_string(const char *s, size_t *p, char endch, int esc)
 {
 	int	ch;
@@ -231,11 +235,11 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc)
 
 		if (len >= SIZE_MAX - 2)
 			goto error;
-		buf = xrealloc(buf, 1, len + 1);
+		buf = xrealloc(buf, len + 1);
 		buf[len++] = ch;
 	}
 
-	buf = xrealloc(buf, 1, len + 1);
+	buf = xrealloc(buf, len + 1);
 	buf[len] = '\0';
 	return (buf);
 
@@ -244,7 +248,7 @@ error:
 	return (NULL);
 }
 
-char *
+static char *
 cmd_string_variable(const char *s, size_t *p)
 {
 	int			ch, fch;
@@ -278,7 +282,7 @@ cmd_string_variable(const char *s, size_t *p)
 			return (t);
 		}
 
-		buf = xrealloc(buf, 1, len + 1);
+		buf = xrealloc(buf, len + 1);
 		buf[len++] = ch;
 
 		for (;;) {
@@ -288,7 +292,7 @@ cmd_string_variable(const char *s, size_t *p)
 			else {
 				if (len >= SIZE_MAX - 3)
 					goto error;
-				buf = xrealloc(buf, 1, len + 1);
+				buf = xrealloc(buf, len + 1);
 				buf[len++] = ch;
 			}
 		}
@@ -299,10 +303,10 @@ cmd_string_variable(const char *s, size_t *p)
 	if (ch != EOF && fch != '{')
 		cmd_string_ungetc(p); /* ch */
 
-	buf = xrealloc(buf, 1, len + 1);
+	buf = xrealloc(buf, len + 1);
 	buf[len] = '\0';
 
-	envent = environ_find(&global_environ, buf);
+	envent = environ_find(global_environ, buf);
 	free(buf);
 	if (envent == NULL)
 		return (xstrdup(""));
@@ -313,31 +317,49 @@ error:
 	return (NULL);
 }
 
-char *
+static char *
 cmd_string_expand_tilde(const char *s, size_t *p)
 {
 	struct passwd		*pw;
 	struct environ_entry	*envent;
-	char			*home, *path, *username;
+	char			*home, *path, *user, *cp;
+	int			 last;
 
 	home = NULL;
-	if (cmd_string_getc(s, p) == '/') {
+
-		envent = environ_find(&global_environ, "HOME");
+	last = cmd_string_getc(s, p);
+	if (last == EOF || last == '/' || last == ' '|| last == '\t') {
+		envent = environ_find(global_environ, "HOME");
 		if (envent != NULL && *envent->value != '\0')
 			home = envent->value;
 		else if ((pw = getpwuid(getuid())) != NULL)
 			home = pw->pw_dir;
 	} else {
 		cmd_string_ungetc(p);
-		if ((username = cmd_string_string(s, p, '/', 0)) == NULL)
+
-			return (NULL);
+		cp = user = xmalloc(strlen(s));
-		if ((pw = getpwnam(username)) != NULL)
+		for (;;) {
+			last = cmd_string_getc(s, p);
+			if (last == EOF ||
+			    last == '/' ||
+			    last == ' '||
+			    last == '\t')
+				break;
+			*cp++ = last;
+		}
+		*cp = '\0';
+
+		if ((pw = getpwnam(user)) != NULL)
 			home = pw->pw_dir;
-		free(username);
+		free(user);
 	}
+
 	if (home == NULL)
 		return (NULL);
 
-	xasprintf(&path, "%s/", home);
+	if (last != EOF)
+		xasprintf(&path, "%s%c", home, last);
+	else
+		xasprintf(&path, "%s", home);
 	return (path);
 }

cmd-suspend-client.c

@@ -1,56 +0,0 @@
-/* $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 <stdlib.h>
-#include <string.h>
-
-#include "tmux.h"
-
-/*
- * Suspend client with SIGTSTP.
- */
-
-enum cmd_retval	 cmd_suspend_client_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_suspend_client_entry = {
-	"suspend-client", "suspendc",
-	"t:", 0, 0,
-	CMD_TARGET_CLIENT_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_suspend_client_exec
-};
-
-enum cmd_retval
-cmd_suspend_client_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args	*args = self->args;
-	struct client	*c;
-
-	if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-
-	tty_stop_tty(&c->tty);
-	c->flags |= CLIENT_SUSPENDED;
-	server_write_client(c, MSG_SUSPEND, NULL, 0);
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-swap-pane.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@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
@@ -26,62 +26,46 @@
  * Swap two panes.
  */
 
-void		 cmd_swap_pane_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_swap_pane_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_swap_pane_exec(struct cmd *, struct cmd_q *);
 
 const struct cmd_entry cmd_swap_pane_entry = {
-	"swap-pane", "swapp",
+	.name = "swap-pane",
-	"dDs:t:U", 0, 0,
+	.alias = "swapp",
-	"[-dDU] " CMD_SRCDST_PANE_USAGE,
+
-	0,
+	.args = { "dDs:t:U", 0, 0 },
-	cmd_swap_pane_key_binding,
+	.usage = "[-dDU] " CMD_SRCDST_PANE_USAGE,
-	NULL,
+
-	cmd_swap_pane_exec
+	.sflag = CMD_PANE_MARKED,
+	.tflag = CMD_PANE,
+
+	.flags = 0,
+	.exec = cmd_swap_pane_exec
 };
 
-void
+static enum cmd_retval
-cmd_swap_pane_key_binding(struct cmd *self, int key)
+cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
-	self->args = args_create(0);
-	if (key == '{')
-		args_set(self->args, 'U', NULL);
-	else if (key == '}')
-		args_set(self->args, 'D', NULL);
-}
-
-enum cmd_retval
-cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args		*args = self->args;
-	struct winlink		*src_wl, *dst_wl;
 	struct window		*src_w, *dst_w;
 	struct window_pane	*tmp_wp, *src_wp, *dst_wp;
 	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_w = item->state.tflag.wl->window;
-	if (dst_wl == NULL)
+	dst_wp = item->state.tflag.wp;
-		return (CMD_RETURN_ERROR);
+	src_w = item->state.sflag.wl->window;
-	dst_w = dst_wl->window;
+	src_wp = item->state.sflag.wp;
 	server_unzoom_window(dst_w);
 
-	if (!args_has(args, 's')) {
+	if (args_has(self->args, 'D')) {
 		src_w = dst_w;
-		if (args_has(self->args, 'D')) {
+		src_wp = TAILQ_NEXT(dst_wp, entry);
-			src_wp = TAILQ_NEXT(dst_wp, entry);
+		if (src_wp == NULL)
-			if (src_wp == NULL)
+			src_wp = TAILQ_FIRST(&dst_w->panes);
-				src_wp = TAILQ_FIRST(&dst_w->panes);
+	} else if (args_has(self->args, 'U')) {
-		} else if (args_has(self->args, 'U')) {
+		src_w = dst_w;
-			src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
+		src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
-			if (src_wp == NULL)
+		if (src_wp == NULL)
-				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
+			src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
-		} else
-			return (CMD_RETURN_NORMAL);
-	} else {
-		src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp);
-		if (src_wl == NULL)
-			return (CMD_RETURN_ERROR);
-		src_w = src_wl->window;
 	}
 	server_unzoom_window(src_w);
 

cmd-swap-window.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -26,49 +26,56 @@
  * Swap one window with another.
  */
 
-enum cmd_retval	cmd_swap_window_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_swap_window_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_swap_window_entry = {
-	"swap-window", "swapw",
+	.name = "swap-window",
-	"ds:t:", 0, 0,
+	.alias = "swapw",
-	"[-d] " CMD_SRCDST_WINDOW_USAGE,
+
-	0,
+	.args = { "ds:t:", 0, 0 },
-	NULL,
+	.usage = "[-d] " CMD_SRCDST_WINDOW_USAGE,
-	NULL,
+
-	cmd_swap_window_exec
+	.sflag = CMD_WINDOW_MARKED,
+	.tflag = CMD_WINDOW,
+
+	.flags = 0,
+	.exec = cmd_swap_window_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_swap_window_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_swap_window_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args		*args = self->args;
-	const char		*target_src, *target_dst;
 	struct session		*src, *dst;
 	struct session_group	*sg_src, *sg_dst;
 	struct winlink		*wl_src, *wl_dst;
-	struct window		*w;
+	struct window		*w_src, *w_dst;
 
-	target_src = args_get(args, 's');
+	wl_src = item->state.sflag.wl;
-	if ((wl_src = cmd_find_window(cmdq, target_src, &src)) == NULL)
+	src = item->state.sflag.s;
-		return (CMD_RETURN_ERROR);
+	sg_src = session_group_contains(src);
-	target_dst = args_get(args, 't');
-	if ((wl_dst = cmd_find_window(cmdq, target_dst, &dst)) == NULL)
-		return (CMD_RETURN_ERROR);
 
-	sg_src = session_group_find(src);
+	wl_dst = item->state.tflag.wl;
-	sg_dst = session_group_find(dst);
+	dst = item->state.tflag.s;
-	if (src != dst &&
+	sg_dst = session_group_contains(dst);
-	    sg_src != NULL && sg_dst != NULL && sg_src == sg_dst) {
+
-		cmdq_error(cmdq, "can't move window, sessions are grouped");
+	if (src != dst && sg_src != NULL && sg_dst != NULL &&
+	    sg_src == sg_dst) {
+		cmdq_error(item, "can't move window, sessions are grouped");
 		return (CMD_RETURN_ERROR);
 	}
 
 	if (wl_dst->window == wl_src->window)
 		return (CMD_RETURN_NORMAL);
 
-	w = wl_dst->window;
+	w_dst = wl_dst->window;
-	wl_dst->window = wl_src->window;
+	TAILQ_REMOVE(&w_dst->winlinks, wl_dst, wentry);
-	wl_src->window = w;
+	w_src = wl_src->window;
+	TAILQ_REMOVE(&w_src->winlinks, wl_src, wentry);
+
+	wl_dst->window = w_src;
+	TAILQ_INSERT_TAIL(&w_src->winlinks, wl_dst, wentry);
+	wl_src->window = w_dst;
+	TAILQ_INSERT_TAIL(&w_dst->winlinks, wl_src, wentry);
 
 	if (!args_has(self->args, 'd')) {
 		session_select(dst, wl_dst->idx);

cmd-switch-client.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -27,88 +27,98 @@
  * Switch client to a different session.
  */
 
-void		 cmd_switch_client_key_binding(struct cmd *, int);
+static enum cmd_retval	cmd_switch_client_exec(struct cmd *,
-enum cmd_retval	 cmd_switch_client_exec(struct cmd *, struct cmd_q *);
+			    struct cmdq_item *);
 
 const struct cmd_entry cmd_switch_client_entry = {
-	"switch-client", "switchc",
+	.name = "switch-client",
-	"lc:npt:r", 0, 0,
+	.alias = "switchc",
-	"[-lnpr] [-c target-client] [-t target-session]",
+
-	CMD_READONLY,
+	.args = { "lc:Enpt:rT:", 0, 0 },
-	cmd_switch_client_key_binding,
+	.usage = "[-Elnpr] [-c target-client] [-t target-session] "
-	NULL,
+		 "[-T key-table]",
-	cmd_switch_client_exec
+
+	.cflag = CMD_CLIENT,
+	.tflag = CMD_SESSION_WITHPANE,
+
+	.flags = CMD_READONLY,
+	.exec = cmd_switch_client_exec
 };
 
-void
+static enum cmd_retval
-cmd_switch_client_key_binding(struct cmd *self, int key)
+cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 {
-	self->args = args_create(0);
+	struct args		*args = self->args;
-	switch (key) {
+	struct cmd_state	*state = &item->state;
-	case '(':
+	struct client		*c = state->c;
-		args_set(self->args, 'p', NULL);
+	struct session		*s = item->state.tflag.s;
-		break;
+	struct window_pane	*wp;
-	case ')':
+	const char		*tablename;
-		args_set(self->args, 'n', NULL);
+	struct key_table	*table;
-		break;
-	case 'L':
-		args_set(self->args, 'l', NULL);
-		break;
-	}
-}
 
-enum cmd_retval
+	if (args_has(args, 'r'))
-cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
+		c->flags ^= CLIENT_READONLY;
-{
-	struct args	*args = self->args;
-	struct client	*c;
-	struct session	*s;
 
-	if ((c = cmd_find_client(cmdq, args_get(args, 'c'), 0)) == NULL)
+	tablename = args_get(args, 'T');
-		return (CMD_RETURN_ERROR);
+	if (tablename != NULL) {
-
+		table = key_bindings_get_table(tablename, 0);
-	if (args_has(args, 'r')) {
+		if (table == NULL) {
-		if (c->flags & CLIENT_READONLY) {
+			cmdq_error(item, "table %s doesn't exist", tablename);
-			c->flags &= ~CLIENT_READONLY;
+			return (CMD_RETURN_ERROR);
-			cmdq_info(cmdq, "made client writable");
-		} else {
-			c->flags |= CLIENT_READONLY;
-			cmdq_info(cmdq, "made client read-only");
 		}
+		table->references++;
+		key_bindings_unref_table(c->keytable);
+		c->keytable = table;
+		return (CMD_RETURN_NORMAL);
 	}
 
-	s = NULL;
 	if (args_has(args, 'n')) {
 		if ((s = session_next_session(c->session)) == NULL) {
-			cmdq_error(cmdq, "can't find next session");
+			cmdq_error(item, "can't find next session");
 			return (CMD_RETURN_ERROR);
 		}
 	} else if (args_has(args, 'p')) {
 		if ((s = session_previous_session(c->session)) == NULL) {
-			cmdq_error(cmdq, "can't find previous session");
+			cmdq_error(item, "can't find previous session");
 			return (CMD_RETURN_ERROR);
 		}
 	} else if (args_has(args, 'l')) {
 		if (c->last_session != NULL && session_alive(c->last_session))
 			s = c->last_session;
+		else
+			s = NULL;
 		if (s == NULL) {
-			cmdq_error(cmdq, "can't find last session");
+			cmdq_error(item, "can't find last session");
 			return (CMD_RETURN_ERROR);
 		}
-	} else
+	} else {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
+		if (item->client == NULL)
-	if (s == NULL)
+			return (CMD_RETURN_NORMAL);
-		return (CMD_RETURN_ERROR);
+		if (state->tflag.wl != NULL) {
+			wp = state->tflag.wp;
+			if (wp != NULL)
+				window_set_active_pane(wp->window, wp);
+			session_set_current(s, state->tflag.wl);
+		}
+	}
 
-	if (c->session != NULL)
+	if (!args_has(args, 'E'))
+		environ_update(s->options, c->environ, s->environ);
+
+	if (c->session != NULL && c->session != s)
 		c->last_session = c->session;
 	c->session = s;
-	session_update_activity(s);
+	if (!item->repeat)
+		server_client_set_key_table(c, NULL);
+	status_timer_start(c);
+	session_update_activity(s, NULL);
+	gettimeofday(&s->last_attached_time, NULL);
 
 	recalculate_sizes();
 	server_check_unattached();
 	server_redraw_client(c);
 	s->curw->flags &= ~WINLINK_ALERTFLAGS;
+	alerts_check_session(s);
 
 	return (CMD_RETURN_NORMAL);
 }

cmd-unbind-key.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -26,91 +26,69 @@
  * Unbind key from command.
  */
 
-enum cmd_retval	 cmd_unbind_key_check(struct args *);
+static enum cmd_retval	cmd_unbind_key_exec(struct cmd *, struct cmdq_item *);
-enum cmd_retval	 cmd_unbind_key_exec(struct cmd *, struct cmd_q *);
-enum cmd_retval	 cmd_unbind_key_table(struct cmd *, struct cmd_q *, int);
 
 const struct cmd_entry cmd_unbind_key_entry = {
-	"unbind-key", "unbind",
+	.name = "unbind-key",
-	"acnt:", 0, 1,
+	.alias = "unbind",
-	"[-acn] [-t key-table] key",
+
-	0,
+	.args = { "anT:", 0, 1 },
-	NULL,
+	.usage = "[-an] [-T key-table] key",
-	cmd_unbind_key_check,
+
-	cmd_unbind_key_exec
+	.flags = CMD_AFTERHOOK,
+	.exec = cmd_unbind_key_exec
 };
 
-enum cmd_retval
+static enum cmd_retval
-cmd_unbind_key_check(struct args *args)
+cmd_unbind_key_exec(struct cmd *self, struct cmdq_item *item)
 {
-	if (args_has(args, 'a') && args->argc != 0)
+	struct args	*args = self->args;
-		return (CMD_RETURN_ERROR);
+	key_code	 key;
-	if (!args_has(args, 'a') && args->argc != 1)
+	const char	*tablename;
-		return (CMD_RETURN_ERROR);
-	return (CMD_RETURN_NORMAL);
-}
-
-enum cmd_retval
-cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args		*args = self->args;
-	struct key_binding	*bd;
-	int			 key;
 
 	if (!args_has(args, 'a')) {
-		key = key_string_lookup_string(args->argv[0]);
+		if (args->argc != 1) {
-		if (key == KEYC_NONE) {
+			cmdq_error(item, "missing key");
-			cmdq_error(cmdq, "unknown key: %s", args->argv[0]);
 			return (CMD_RETURN_ERROR);
 		}
-	} else
+		key = key_string_lookup_string(args->argv[0]);
-		key = KEYC_NONE;
+		if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
-
+			cmdq_error(item, "unknown key: %s", args->argv[0]);
-	if (args_has(args, 't'))
+			return (CMD_RETURN_ERROR);
-		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);
 		}
+	} else {
+		if (args->argc != 0) {
+			cmdq_error(item, "key given with -a");
+			return (CMD_RETURN_ERROR);
+		}
+		key = KEYC_UNKNOWN;
+	}
+
+	if (key == KEYC_UNKNOWN) {
+		tablename = args_get(args, 'T');
+		if (tablename == NULL) {
+			key_bindings_remove_table("root");
+			key_bindings_remove_table("prefix");
+			return (CMD_RETURN_NORMAL);
+		}
+		if (key_bindings_get_table(tablename, 0) == NULL) {
+			cmdq_error(item, "table %s doesn't exist", tablename);
+			return (CMD_RETURN_ERROR);
+		}
+		key_bindings_remove_table(tablename);
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if (!args_has(args, 'n'))
+	if (args_has(args, 'T')) {
-		key |= KEYC_PREFIX;
+		tablename = args_get(args, 'T');
-	key_bindings_remove(key);
+		if (key_bindings_get_table(tablename, 0) == NULL) {
-	return (CMD_RETURN_NORMAL);
+			cmdq_error(item, "table %s doesn't exist", tablename);
-}
+			return (CMD_RETURN_ERROR);
-
-enum cmd_retval
-cmd_unbind_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
-{
-	struct args			*args = self->args;
-	const char			*tablename;
-	const struct mode_key_table	*mtab;
-	struct mode_key_binding		*mbind, mtmp;
-
-	tablename = args_get(args, 't');
-	if ((mtab = mode_key_findtable(tablename)) == NULL) {
-		cmdq_error(cmdq, "unknown key table: %s", tablename);
-		return (CMD_RETURN_ERROR);
-	}
-
-	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);
+	} else if (args_has(args, 'n'))
-	}
+		tablename = "root";
-
+	else
-	mtmp.key = key;
+		tablename = "prefix";
-	mtmp.mode = !!args_has(args, 'c');
+	key_bindings_remove(tablename, key);
-	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) != NULL) {
-		RB_REMOVE(mode_key_tree, mtab->tree, mbind);
-		free(mbind);
-	}
 	return (CMD_RETURN_NORMAL);
 }

cmd-unlink-window.c

@@ -1,70 +0,0 @@
-/* $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"
-
-/*
- * 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 *);
-
-const struct cmd_entry cmd_unlink_window_entry = {
-	"unlink-window", "unlinkw",
-	"kt:", 0, 0,
-	"[-k] " CMD_TARGET_WINDOW_USAGE,
-	0,
-	NULL,
-	NULL,
-	cmd_unlink_window_exec
-};
-
-enum cmd_retval
-cmd_unlink_window_exec(struct cmd *self, struct cmd_q *cmdq)
-{
-	struct args		*args = self->args;
-	struct winlink		*wl;
-	struct window		*w;
-	struct session		*s, *s2;
-	struct session_group	*sg;
-	u_int			 references;
-
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
-		return (CMD_RETURN_ERROR);
-	w = wl->window;
-
-	sg = session_group_find(s);
-	if (sg != NULL) {
-		references = 0;
-		TAILQ_FOREACH(s2, &sg->sessions, gentry)
-			references++;
-	} else
-		references = 1;
-
-	if (!args_has(self->args, 'k') && w->references == references) {
-		cmdq_error(cmdq, "window is only linked to one session");
-		return (CMD_RETURN_ERROR);
-	}
-
-	server_unlink_window(s, wl);
-	recalculate_sizes();
-
-	return (CMD_RETURN_NORMAL);
-}

cmd-wait-for.c

@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
  * Copyright (c) 2013 Thiago de Arruda <tpadilha84@gmail.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -28,51 +28,97 @@
  * Block or wake a client on a named wait channel.
  */
 
-enum cmd_retval cmd_wait_for_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval cmd_wait_for_exec(struct cmd *, struct cmdq_item *);
 
 const struct cmd_entry cmd_wait_for_entry = {
-	"wait-for", "wait",
+	.name = "wait-for",
-	"LSU", 1, 1,
+	.alias = "wait",
-	"[-LSU] channel",
+
-	0,
+	.args = { "LSU", 1, 1 },
-	NULL,
+	.usage = "[-L|-S|-U] channel",
-	NULL,
+
-	cmd_wait_for_exec
+	.flags = 0,
+	.exec = cmd_wait_for_exec
+};
+
+struct wait_item {
+	struct cmdq_item	*item;
+	TAILQ_ENTRY(wait_item)	 entry;
 };
 
 struct wait_channel {
 	const char	       *name;
 	int			locked;
+	int			woken;
 
-	TAILQ_HEAD(, cmd_q)	waiters;
+	TAILQ_HEAD(, wait_item)	waiters;
-	TAILQ_HEAD(, cmd_q)	lockers;
+	TAILQ_HEAD(, wait_item)	lockers;
 
 	RB_ENTRY(wait_channel)	entry;
 };
 RB_HEAD(wait_channels, wait_channel);
-struct wait_channels wait_channels = RB_INITIALIZER(wait_channels);
+static struct wait_channels wait_channels = RB_INITIALIZER(wait_channels);
 
-int	wait_channel_cmp(struct wait_channel *, struct wait_channel *);
+static int wait_channel_cmp(struct wait_channel *, struct wait_channel *);
-RB_PROTOTYPE(wait_channels, wait_channel, entry, wait_channel_cmp);
+RB_GENERATE_STATIC(wait_channels, wait_channel, entry, wait_channel_cmp);
-RB_GENERATE(wait_channels, wait_channel, entry, wait_channel_cmp);
 
-int
+static 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 *,
+static enum cmd_retval	cmd_wait_for_signal(struct cmdq_item *, const char *,
-		    struct wait_channel *);
+			    struct wait_channel *);
-enum cmd_retval	cmd_wait_for_wait(struct cmd_q *, const char *,
+static enum cmd_retval	cmd_wait_for_wait(struct cmdq_item *, const char *,
-		    struct wait_channel *);
+			    struct wait_channel *);
-enum cmd_retval	cmd_wait_for_lock(struct cmd_q *, const char *,
+static enum cmd_retval	cmd_wait_for_lock(struct cmdq_item *, const char *,
-		    struct wait_channel *);
+			    struct wait_channel *);
-enum cmd_retval	cmd_wait_for_unlock(struct cmd_q *, const char *,
+static enum cmd_retval	cmd_wait_for_unlock(struct cmdq_item *, const char *,
-		    struct wait_channel *);
+			    struct wait_channel *);
 
-enum cmd_retval
+static struct wait_channel	*cmd_wait_for_add(const char *);
-cmd_wait_for_exec(struct cmd *self, struct cmd_q *cmdq)
+static void			 cmd_wait_for_remove(struct wait_channel *);
+
+static struct wait_channel *
+cmd_wait_for_add(const char *name)
+{
+	struct wait_channel *wc;
+
+	wc = xmalloc(sizeof *wc);
+	wc->name = xstrdup(name);
+
+	wc->locked = 0;
+	wc->woken = 0;
+
+	TAILQ_INIT(&wc->waiters);
+	TAILQ_INIT(&wc->lockers);
+
+	RB_INSERT(wait_channels, &wait_channels, wc);
+
+	log_debug("add wait channel %s", wc->name);
+
+	return (wc);
+}
+
+static void
+cmd_wait_for_remove(struct wait_channel *wc)
+{
+	if (wc->locked)
+		return;
+	if (!TAILQ_EMPTY(&wc->waiters) || !wc->woken)
+		return;
+
+	log_debug("remove wait channel %s", wc->name);
+
+	RB_REMOVE(wait_channels, &wait_channels, wc);
+
+	free((void *)wc->name);
+	free(wc);
+}
+
+static enum cmd_retval
+cmd_wait_for_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args     	*args = self->args;
 	const char		*name = args->argv[0];
@@ -82,85 +128,88 @@ cmd_wait_for_exec(struct cmd *self, struct cmd_q *cmdq)
 	wc = RB_FIND(wait_channels, &wait_channels, &wc0);
 
 	if (args_has(args, 'S'))
-		return (cmd_wait_for_signal(cmdq, name, wc));
+		return (cmd_wait_for_signal(item, name, wc));
 	if (args_has(args, 'L'))
-		return (cmd_wait_for_lock(cmdq, name, wc));
+		return (cmd_wait_for_lock(item, name, wc));
 	if (args_has(args, 'U'))
-		return (cmd_wait_for_unlock(cmdq, name, wc));
+		return (cmd_wait_for_unlock(item, name, wc));
-	return (cmd_wait_for_wait(cmdq, name, wc));
+	return (cmd_wait_for_wait(item, name, wc));
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_wait_for_signal(struct cmd_q *cmdq, const char *name,
+cmd_wait_for_signal(__unused struct cmdq_item *item, const char *name,
     struct wait_channel *wc)
 {
-	struct cmd_q	*wq, *wq1;
+	struct wait_item	*wi, *wi1;
 
-	if (wc == NULL || TAILQ_EMPTY(&wc->waiters)) {
+	if (wc == NULL)
-		cmdq_error(cmdq, "no waiting clients on %s", name);
+		wc = cmd_wait_for_add(name);
-		return (CMD_RETURN_ERROR);
+
-	}
+	if (TAILQ_EMPTY(&wc->waiters) && !wc->woken) {
-
+		log_debug("signal wait channel %s, no waiters", wc->name);
-	TAILQ_FOREACH_SAFE(wq, &wc->waiters, waitentry, wq1) {
+		wc->woken = 1;
-		TAILQ_REMOVE(&wc->waiters, wq, waitentry);
+		return (CMD_RETURN_NORMAL);
-		if (!cmdq_free(wq))
+	}
-			cmdq_continue(wq);
+	log_debug("signal wait channel %s, with waiters", wc->name);
-	}
+
-
+	TAILQ_FOREACH_SAFE(wi, &wc->waiters, entry, wi1) {
-	if (!wc->locked) {
+		wi->item->flags &= ~CMDQ_WAITING;
-		RB_REMOVE(wait_channels, &wait_channels, wc);
+
-		free((void*) wc->name);
+		TAILQ_REMOVE(&wc->waiters, wi, entry);
-		free(wc);
+		free(wi);
 	}
 
+	cmd_wait_for_remove(wc);
 	return (CMD_RETURN_NORMAL);
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_wait_for_wait(struct cmd_q *cmdq, const char *name,
+cmd_wait_for_wait(struct cmdq_item *item, const char *name,
     struct wait_channel *wc)
 {
-	if (cmdq->client == NULL || cmdq->client->session != NULL) {
+	struct client		*c = item->client;
-		cmdq_error(cmdq, "not able to wait");
+	struct wait_item	*wi;
+
+	if (c == NULL || c->session != NULL) {
+		cmdq_error(item, "not able to wait");
 		return (CMD_RETURN_ERROR);
 	}
 
-	if (wc == NULL) {
+	if (wc == NULL)
-		wc = xmalloc(sizeof *wc);
+		wc = cmd_wait_for_add(name);
-		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);
+	if (wc->woken) {
-	cmdq->references++;
+		log_debug("wait channel %s already woken (%p)", wc->name, c);
+		cmd_wait_for_remove(wc);
+		return (CMD_RETURN_NORMAL);
+	}
+	log_debug("wait channel %s not woken (%p)", wc->name, c);
+
+	wi = xcalloc(1, sizeof *wi);
+	wi->item = item;
+	TAILQ_INSERT_TAIL(&wc->waiters, wi, entry);
 
 	return (CMD_RETURN_WAIT);
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_wait_for_lock(struct cmd_q *cmdq, const char *name,
+cmd_wait_for_lock(struct cmdq_item *item, const char *name,
     struct wait_channel *wc)
 {
-	if (cmdq->client == NULL || cmdq->client->session != NULL) {
+	struct wait_item	*wi;
-		cmdq_error(cmdq, "not able to lock");
+
+	if (item->client == NULL || item->client->session != NULL) {
+		cmdq_error(item, "not able to lock");
 		return (CMD_RETURN_ERROR);
 	}
 
-	if (wc == NULL) {
+	if (wc == NULL)
-		wc = xmalloc(sizeof *wc);
+		wc = cmd_wait_for_add(name);
-		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);
+		wi = xcalloc(1, sizeof *wi);
-		cmdq->references++;
+		wi->item = item;
+		TAILQ_INSERT_TAIL(&wc->lockers, wi, entry);
 		return (CMD_RETURN_WAIT);
 	}
 	wc->locked = 1;
@@ -168,30 +217,48 @@ cmd_wait_for_lock(struct cmd_q *cmdq, const char *name,
 	return (CMD_RETURN_NORMAL);
 }
 
-enum cmd_retval
+static enum cmd_retval
-cmd_wait_for_unlock(struct cmd_q *cmdq, const char *name,
+cmd_wait_for_unlock(struct cmdq_item *item, const char *name,
     struct wait_channel *wc)
 {
-	struct cmd_q	*wq;
+	struct wait_item	*wi;
 
 	if (wc == NULL || !wc->locked) {
-		cmdq_error(cmdq, "channel %s not locked", name);
+		cmdq_error(item, "channel %s not locked", name);
 		return (CMD_RETURN_ERROR);
 	}
 
-	if ((wq = TAILQ_FIRST(&wc->lockers)) != NULL) {
+	if ((wi = TAILQ_FIRST(&wc->lockers)) != NULL) {
-		TAILQ_REMOVE(&wc->lockers, wq, waitentry);
+		wi->item->flags &= ~CMDQ_WAITING;
-		if (!cmdq_free(wq))
+		TAILQ_REMOVE(&wc->lockers, wi, entry);
-			cmdq_continue(wq);
+		free(wi);
 	} else {
 		wc->locked = 0;
-		if (TAILQ_EMPTY(&wc->waiters)) {
+		cmd_wait_for_remove(wc);
-			RB_REMOVE(wait_channels, &wait_channels, wc);
-			free((void*) wc->name);
-			free(wc);
-		}
 	}
 
 	return (CMD_RETURN_NORMAL);
 }
 
+void
+cmd_wait_for_flush(void)
+{
+	struct wait_channel	*wc, *wc1;
+	struct wait_item	*wi, *wi1;
+
+	RB_FOREACH_SAFE(wc, wait_channels, &wait_channels, wc1) {
+		TAILQ_FOREACH_SAFE(wi, &wc->waiters, entry, wi1) {
+			wi->item->flags &= ~CMDQ_WAITING;
+			TAILQ_REMOVE(&wc->waiters, wi, entry);
+			free(wi);
+		}
+		wc->woken = 1;
+		TAILQ_FOREACH_SAFE(wi, &wc->lockers, entry, wi1) {
+			wi->item->flags &= ~CMDQ_WAITING;
+			TAILQ_REMOVE(&wc->lockers, wi, entry);
+			free(wi);
+		}
+		wc->locked = 0;
+		cmd_wait_for_remove(wc);
+	}
+}

colour.c

@@ -1,7 +1,8 @@
-/* $Id$ */
+/* $OpenBSD$ */
 
 /*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
+ * Copyright (c) 2016 Avi Halachmi <avihpit@yahoo.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -24,120 +25,83 @@
 
 #include "tmux.h"
 
+static int
+colour_dist_sq(int R, int G, int B, int r, int g, int b)
+{
+	return ((R - r) * (R - r) + (G - g) * (G - g) + (B - b) * (B - b));
+}
+
+static int
+colour_to_6cube(int v)
+{
+	if (v < 48)
+		return (0);
+	if (v < 114)
+		return (1);
+	return ((v - 35) / 40);
+}
+
 /*
- * Colour to string conversion functions. Bit 8 of the colour means it is one
+ * Convert an RGB triplet to the xterm(1) 256 colour palette.
- * of the 256 colour palette.
+ *
+ * xterm provides a 6x6x6 colour cube (16 - 231) and 24 greys (232 - 255). We
+ * map our RGB colour to the closest in the cube, also work out the closest
+ * grey, and use the nearest of the two.
+ *
+ * Note that the xterm has much lower resolution for darker colours (they are
+ * not evenly spread out), so our 6 levels are not evenly spread: 0x0, 0x5f
+ * (95), 0x87 (135), 0xaf (175), 0xd7 (215) and 0xff (255). Greys are more
+ * evenly spread (8, 18, 28 ... 238).
  */
-
-/* An RGB colour. */
-struct colour_rgb {
-	u_char	r;
-	u_char	g;
-	u_char	b;
-};
-
-/* 256 colour RGB table, generated on first use. */
-struct colour_rgb *colour_rgb_256;
-
-void	colour_rgb_generate256(void);
-u_int	colour_rgb_distance(struct colour_rgb *, struct colour_rgb *);
-int	colour_rgb_find(struct colour_rgb *);
-
-/* Generate 256 colour RGB table. */
-void
-colour_rgb_generate256(void)
-{
-	struct colour_rgb	*rgb;
-	u_int			 i, r, g, b;
-
-	/*
-	 * Allocate the table. The first 16 colours are often changed by users
-	 * and terminals so don't include them.
-	 */
-	colour_rgb_256 = xcalloc(240, sizeof *colour_rgb_256);
-
-	/* Add the colours first. */
-	r = g = b = 0;
-	for (i = 240; i > 24; i--) {
-		rgb = &colour_rgb_256[240 - i];
-
-		if (r != 0)
-			rgb->r = (r * 40) + 55;
-		if (g != 0)
-			rgb->g = (g * 40) + 55;
-		if (b != 0)
-			rgb->b = (b * 40) + 55;
-
-		b++;
-		if (b > 5) {
-			b = 0;
-			g++;
-		}
-		if (g > 5) {
-			g = 0;
-			r++;
-		}
-	}
-
-	/* Then add the greys. */
-	for (i = 24; i > 0; i--) {
-		rgb = &colour_rgb_256[240 - i];
-
-		rgb->r = 8 + (24 - i) * 10;
-		rgb->g = 8 + (24 - i) * 10;
-		rgb->b = 8 + (24 - i) * 10;
-	}
-}
-
-/* Get colour RGB distance. */
-u_int
-colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2)
-{
-	int	r, g, b;
-
-	r = rgb1->r - rgb2->r;
-	g = rgb1->g - rgb2->g;
-	b = rgb1->b - rgb2->b;
-	return (r * r + g * g + b * b);
-}
-
-/* Work out the nearest colour from the 256 colour set. */
 int
-colour_rgb_find(struct colour_rgb *rgb)
+colour_find_rgb(u_char r, u_char g, u_char b)
 {
-	u_int	distance, lowest, colour, i;
+	static const int	q2c[6] = { 0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff };
+	int			qr, qg, qb, cr, cg, cb, d, idx;
+	int			grey_avg, grey_idx, grey;
 
-	if (colour_rgb_256 == NULL)
+	/* Map RGB to 6x6x6 cube. */
-		colour_rgb_generate256();
+	qr = colour_to_6cube(r); cr = q2c[qr];
+	qg = colour_to_6cube(g); cg = q2c[qg];
+	qb = colour_to_6cube(b); cb = q2c[qb];
 
-	colour = 16;
+	/* If we have hit the colour exactly, return early. */
-	lowest = UINT_MAX;
+	if (cr == r && cg == g && cb == b)
-	for (i = 0; i < 240; i++) {
+		return ((16 + (36 * qr) + (6 * qg) + qb) | COLOUR_FLAG_256);
-		distance = colour_rgb_distance(&colour_rgb_256[i], rgb);
+
-		if (distance < lowest) {
+	/* Work out the closest grey (average of RGB). */
-			lowest = distance;
+	grey_avg = (r + g + b) / 3;
-			colour = 16 + i;
+	if (grey_avg > 238)
-		}
+		grey_idx = 23;
-	}
+	else
-	return (colour);
+		grey_idx = (grey_avg - 3) / 10;
+	grey = 8 + (10 * grey_idx);
+
+	/* Is grey or 6x6x6 colour closest? */
+	d = colour_dist_sq(cr, cg, cb, r, g, b);
+	if (colour_dist_sq(grey, grey, grey, r, g, b) < d)
+		idx = 232 + grey_idx;
+	else
+		idx = 16 + (36 * qr) + (6 * qg) + qb;
+	return (idx | COLOUR_FLAG_256);
 }
 
-/* Set grid cell foreground colour. */
+/* Join RGB into a colour. */
-void
+int
-colour_set_fg(struct grid_cell *gc, int c)
+colour_join_rgb(u_char r, u_char g, u_char b)
 {
-	if (c & 0x100)
+	return ((((int)((r) & 0xff)) << 16) |
-		gc->flags |= GRID_FLAG_FG256;
+	    (((int)((g) & 0xff)) << 8) |
-	gc->fg = c;
+	    (((int)((b) & 0xff))) | COLOUR_FLAG_RGB);
 }
 
-/* Set grid cell background colour. */
+/* Split colour into RGB. */
 void
-colour_set_bg(struct grid_cell *gc, int c)
+colour_split_rgb(int c, u_char *r, u_char *g, u_char *b)
 {
-	if (c & 0x100)
+	*r = (c >> 16) & 0xff;
-		gc->flags |= GRID_FLAG_BG256;
+	*g = (c >> 8) & 0xff;
-	gc->bg = c;
+	*b = c & 0xff;
 }
 
 /* Convert colour to a string. */
@@ -145,9 +109,16 @@ const char *
 colour_tostring(int c)
 {
 	static char	s[32];
+	u_char		r, g, b;
 
-	if (c & 0x100) {
+	if (c & COLOUR_FLAG_RGB) {
-		xsnprintf(s, sizeof s, "colour%u", c & ~0x100);
+		colour_split_rgb(c, &r, &g, &b);
+		xsnprintf(s, sizeof s, "#%02x%02x%02x", r, g, b);
+		return (s);
+	}
+
+	if (c & COLOUR_FLAG_256) {
+		xsnprintf(s, sizeof s, "colour%u", c & 0xff);
 		return (s);
 	}
 
@@ -194,70 +165,62 @@ colour_tostring(int c)
 int
 colour_fromstring(const char *s)
 {
-	const char		*errstr;
+	const char	*errstr;
-	const char		*cp;
+	const char	*cp;
-	struct colour_rgb	 rgb;
+	int		 n;
-	int			 n;
+	u_char		 r, g, b;
 
 	if (*s == '#' && strlen(s) == 7) {
 		for (cp = s + 1; isxdigit((u_char) *cp); cp++)
 			;
 		if (*cp != '\0')
 			return (-1);
-		n = sscanf(s + 1, "%2hhx%2hhx%2hhx", &rgb.r, &rgb.g, &rgb.b);
+		n = sscanf(s + 1, "%2hhx%2hhx%2hhx", &r, &g, &b);
 		if (n != 3)
 			return (-1);
-		return (colour_rgb_find(&rgb) | 0x100);
+		return (colour_join_rgb(r, g, b));
 	}
 
 	if (strncasecmp(s, "colour", (sizeof "colour") - 1) == 0) {
 		n = strtonum(s + (sizeof "colour") - 1, 0, 255, &errstr);
 		if (errstr != NULL)
 			return (-1);
-		return (n | 0x100);
+		return (n | COLOUR_FLAG_256);
 	}
 
-	if (strcasecmp(s, "black") == 0 || (s[0] == '0' && s[1] == '\0'))
+	if (strcasecmp(s, "black") == 0 || strcmp(s, "0") == 0)
 		return (0);
-	if (strcasecmp(s, "red") == 0 || (s[0] == '1' && s[1] == '\0'))
+	if (strcasecmp(s, "red") == 0 || strcmp(s, "1") == 0)
 		return (1);
-	if (strcasecmp(s, "green") == 0 || (s[0] == '2' && s[1] == '\0'))
+	if (strcasecmp(s, "green") == 0 || strcmp(s, "2") == 0)
 		return (2);
-	if (strcasecmp(s, "yellow") == 0 || (s[0] == '3' && s[1] == '\0'))
+	if (strcasecmp(s, "yellow") == 0 || strcmp(s, "3") == 0)
 		return (3);
-	if (strcasecmp(s, "blue") == 0 || (s[0] == '4' && s[1] == '\0'))
+	if (strcasecmp(s, "blue") == 0 || strcmp(s, "4") == 0)
 		return (4);
-	if (strcasecmp(s, "magenta") == 0 || (s[0] == '5' && s[1] == '\0'))
+	if (strcasecmp(s, "magenta") == 0 || strcmp(s, "5") == 0)
 		return (5);
-	if (strcasecmp(s, "cyan") == 0 || (s[0] == '6' && s[1] == '\0'))
+	if (strcasecmp(s, "cyan") == 0 || strcmp(s, "6") == 0)
 		return (6);
-	if (strcasecmp(s, "white") == 0 || (s[0] == '7' && s[1] == '\0'))
+	if (strcasecmp(s, "white") == 0 || strcmp(s, "7") == 0)
 		return (7);
-	if (strcasecmp(s, "default") == 0 || (s[0] == '8' && s[1] == '\0'))
+	if (strcasecmp(s, "default") == 0 || strcmp(s, "8") == 0)
 		return (8);
-	if (strcasecmp(s, "brightblack") == 0 ||
+	if (strcasecmp(s, "brightblack") == 0 || strcmp(s, "90") == 0)
-	    (s[0] == '9' && s[1] == '0' && s[1] == '\0'))
 		return (90);
-	if (strcasecmp(s, "brightred") == 0 ||
+	if (strcasecmp(s, "brightred") == 0 || strcmp(s, "91") == 0)
-	    (s[0] == '9' && s[1] == '1' && s[1] == '\0'))
 		return (91);
-	if (strcasecmp(s, "brightgreen") == 0 ||
+	if (strcasecmp(s, "brightgreen") == 0 || strcmp(s, "92") == 0)
-	    (s[0] == '9' && s[1] == '2' && s[1] == '\0'))
 		return (92);
-	if (strcasecmp(s, "brightyellow") == 0 ||
+	if (strcasecmp(s, "brightyellow") == 0 || strcmp(s, "93") == 0)
-	    (s[0] == '9' && s[1] == '3' && s[1] == '\0'))
 		return (93);
-	if (strcasecmp(s, "brightblue") == 0 ||
+	if (strcasecmp(s, "brightblue") == 0 || strcmp(s, "94") == 0)
-	    (s[0] == '9' && s[1] == '4' && s[1] == '\0'))
 		return (94);
-	if (strcasecmp(s, "brightmagenta") == 0 ||
+	if (strcasecmp(s, "brightmagenta") == 0 || strcmp(s, "95") == 0)
-	    (s[0] == '9' && s[1] == '5' && s[1] == '\0'))
 		return (95);
-	if (strcasecmp(s, "brightcyan") == 0 ||
+	if (strcasecmp(s, "brightcyan") == 0 || strcmp(s, "96") == 0)
-	    (s[0] == '9' && s[1] == '6' && s[1] == '\0'))
 		return (96);
-	if (strcasecmp(s, "brightwhite") == 0 ||
+	if (strcasecmp(s, "brightwhite") == 0 || strcmp(s, "97") == 0)
-	    (s[0] == '9' && s[1] == '7' && s[1] == '\0'))
 		return (97);
 	return (-1);
 }
@@ -287,29 +250,3 @@ colour_256to16(u_char c)
 
 	return (table[c]);
 }
-
-/* Convert 256 colour palette to 88. */
-u_char
-colour_256to88(u_char c)
-{
-	static const u_char table[256] = {
-		 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-		16, 17, 17, 18, 18, 19, 20, 21, 21, 22, 22, 23, 20, 21, 21, 22,
-		22, 23, 24, 25, 25, 26, 26, 27, 24, 25, 25, 26, 26, 27, 28, 29,
-		29, 30, 30, 31, 32, 33, 33, 34, 34, 35, 36, 37, 37, 38, 38, 39,
-		36, 37, 37, 38, 38, 39, 40, 41, 41, 42, 42, 43, 40, 41, 41, 42,
-		42, 43, 44, 45, 45, 46, 46, 47, 32, 33, 33, 34, 34, 35, 36, 37,
-		37, 38, 38, 39, 36, 37, 37, 38, 38, 39, 40, 41, 41, 42, 42, 43,
-		40, 41, 41, 42, 42, 43, 44, 45, 45, 46, 46, 47, 48, 49, 49, 50,
-		50, 51, 52, 53, 53, 54, 54, 55, 52, 53, 53, 54, 54, 55, 56, 57,
-		57, 58, 58, 59, 56, 57, 57, 58, 58, 59, 60, 61, 61, 62, 62, 63,
-		48, 49, 49, 50, 50, 51, 52, 53, 53, 54, 54, 55, 52, 53, 53, 54,
-		54, 55, 56, 57, 57, 58, 58, 59, 56, 57, 57, 58, 58, 59, 60, 61,
-		61, 62, 62, 63, 64, 65, 65, 66, 66, 67, 68, 69, 69, 70, 70, 71,
-		68, 69, 69, 70, 70, 71, 72, 73, 73, 74, 74, 75, 72, 73, 73, 74,
-		74, 75, 76, 77, 77, 78, 78, 79,  0,  0, 80, 80, 80, 81, 81, 81,
-		82, 82, 82, 83, 83, 83, 84, 84, 84, 85, 85, 85, 86, 86, 86, 87
-	};
-
-	return (table[c]);
-}

compat.h

@@ -1,7 +1,5 @@
-/* $Id$ */
-
 /*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@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
@@ -19,10 +17,21 @@
 #ifndef COMPAT_H
 #define COMPAT_H
 
+#include <sys/types.h>
+#include <sys/uio.h>
+
+#include <limits.h>
+#include <stdio.h>
+#include <termios.h>
+#include <wchar.h>
+
 #ifndef __GNUC__
 #define __attribute__(a)
 #endif
 
+#ifndef __unused
+#define __unused __attribute__ ((__unused__))
+#endif
 #ifndef __dead
 #define __dead __attribute__ ((__noreturn__))
 #endif
@@ -30,11 +39,25 @@
 #define __packed __attribute__ ((__packed__))
 #endif
 
-#ifndef HAVE_BSD_TYPES
+#ifndef ECHOPRT
-typedef uint8_t u_int8_t;
+#define ECHOPRT 0
-typedef uint16_t u_int16_t;
+#endif
-typedef uint32_t u_int32_t;
+
-typedef uint64_t u_int64_t;
+#ifndef ACCESSPERMS
+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
+#endif
+
+#if !defined(FIONREAD) && defined(__sun)
+#include <sys/filio.h>
+#endif
+
+#ifdef HAVE_ERR_H
+#include <err.h>
+#else
+void	err(int, const char *, ...);
+void	errx(int, const char *, ...);
+void	warn(const char *, ...);
+void	warnx(const char *, ...);
 #endif
 
 #ifndef HAVE_PATHS_H
@@ -45,6 +68,16 @@ typedef uint64_t u_int64_t;
 #define _PATH_DEV	"/dev/"
 #endif
 
+#ifndef __OpenBSD__
+#define pledge(s, p) (0)
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
+
 #ifdef HAVE_QUEUE_H
 #include <sys/queue.h>
 #else
@@ -91,12 +124,6 @@ typedef uint64_t u_int64_t;
 #include "compat/imsg.h"
 #endif
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-
 #ifdef BROKEN_CMSG_FIRSTHDR
 #undef CMSG_FIRSTHDR
 #define CMSG_FIRSTHDR(mhdr) \
@@ -121,6 +148,10 @@ typedef uint64_t u_int64_t;
 #define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
 #endif
 
+#ifndef O_DIRECTORY
+#define O_DIRECTORY 0
+#endif
+
 #ifndef INFTIM
 #define INFTIM -1
 #endif
@@ -152,18 +183,46 @@ typedef uint64_t u_int64_t;
 	} while (0)
 #endif
 
+#ifndef timersub
+#define timersub(tvp, uvp, vvp)                                         \
+	do {                                                            \
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;          \
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;       \
+		if ((vvp)->tv_usec < 0) {                               \
+			(vvp)->tv_sec--;                                \
+			(vvp)->tv_usec += 1000000;                      \
+		}                                                       \
+	} while (0)
+#endif
+
 #ifndef TTY_NAME_MAX
 #define TTY_NAME_MAX 32
 #endif
 
-#ifndef HAVE_BZERO
+#ifndef HOST_NAME_MAX
-#undef bzero
+#define HOST_NAME_MAX 255
-#define bzero(buf, len) memset(buf, 0, len);
+#endif
+
+#ifndef HAVE_FLOCK
+#define LOCK_SH 0
+#define LOCK_EX 0
+#define LOCK_NB 0
+#define flock(fd, op) (0)
+#endif
+
+#ifndef HAVE_EXPLICIT_BZERO
+/* explicit_bzero.c */
+void		 explicit_bzero(void *, size_t);
+#endif
+
+#ifndef HAVE_GETDTABLECOUNT
+/* getdtablecount.c */
+int		 getdtablecount(void);
 #endif
 
 #ifndef HAVE_CLOSEFROM
 /* closefrom.c */
-void	closefrom(int);
+void		 closefrom(int);
 #endif
 
 #ifndef HAVE_STRCASESTR
@@ -191,14 +250,37 @@ size_t	 	 strlcpy(char *, const char *, size_t);
 size_t	 	 strlcat(char *, const char *, size_t);
 #endif
 
+#ifndef HAVE_STRNLEN
+/* strnlen.c */
+size_t		 strnlen(const char *, size_t);
+#endif
+
+#ifndef HAVE_STRNDUP
+/* strndup.c */
+char		*strndup(const char *, size_t);
+#endif
+
 #ifndef HAVE_DAEMON
 /* daemon.c */
 int	 	 daemon(int, int);
 #endif
 
+#ifndef HAVE_GETPROGNAME
+/* getprogname.c */
+const char	*getprogname(void);
+#endif
+
+#ifndef HAVE_SETPROCTITLE
+/* setproctitle.c */
+void		 setproctitle(const char *, ...);
+#endif
+
 #ifndef HAVE_B64_NTOP
-/* b64_ntop.c */
+/* base64.c */
+#undef b64_ntop
+#undef b64_pton
 int		 b64_ntop(const char *, size_t, char *, size_t);
+int		 b64_pton(const char *, u_char *, size_t);
 #endif
 
 #ifndef HAVE_FORKPTY
@@ -218,12 +300,43 @@ int		 vasprintf(char **, const char *, va_list);
 char		*fgetln(FILE *, size_t *);
 #endif
 
+#ifndef HAVE_FPARSELN
+char		*fparseln(FILE *, size_t *, size_t *, const char *, int);
+#endif
+
 #ifndef HAVE_SETENV
 /* setenv.c */
 int		 setenv(const char *, const char *, int);
 int		 unsetenv(const char *);
 #endif
 
+#ifndef HAVE_CFMAKERAW
+/* cfmakeraw.c */
+void		 cfmakeraw(struct termios *);
+#endif
+
+#ifndef HAVE_FREEZERO
+/* freezero.c */
+void		 freezero(void *, size_t);
+#endif
+
+#ifndef HAVE_REALLOCARRAY
+/* reallocarray.c */
+void		*reallocarray(void *, size_t, size_t);
+#endif
+
+#ifndef HAVE_RECALLOCARRAY
+/* recallocarray.c */
+void		*recallocarray(void *, size_t, size_t, size_t);
+#endif
+
+#ifdef HAVE_UTF8PROC
+/* utf8proc.c */
+int		 utf8proc_wcwidth(wchar_t);
+int		 utf8proc_mbtowc(wchar_t *, const char *, size_t);
+int		 utf8proc_wctomb(char *, wchar_t);
+#endif
+
 #ifdef HAVE_GETOPT
 #include <getopt.h>
 #else

compat/asprintf.c

@@ -1,7 +1,5 @@
-/* $Id$ */
-
 /*
- * Copyright (c) 2006 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2006 Nicholas Marriott <nicholas.marriott@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
@@ -16,16 +14,13 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 #include <string.h>
 
-#include "tmux.h"
+#include "compat.h"
 
 int
 asprintf(char **ret, const char *fmt, ...)
@@ -56,10 +51,12 @@ vasprintf(char **ret, const char *fmt, va_list ap)
 		free(*ret);
 		goto error;
 	}
+	va_end(ap2);
 
 	return (n);
 
 error:
+	va_end(ap2);
 	*ret = NULL;
 	return (-1);
 }

compat/base64.c

@@ -1,5 +1,7 @@
+/*	$OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $	*/
+
 /*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
+ * Copyright (c) 1996 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -41,19 +43,18 @@
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/socket.h>
-
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <arpa/nameser.h>
 
 #include <ctype.h>
+#include <resolv.h>
 #include <stdio.h>
+
 #include <stdlib.h>
 #include <string.h>
 
-#define Assert(Cond) if (!(Cond)) abort()
-
 static const char Base64[] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 static const char Pad64 = '=';
@@ -122,11 +123,16 @@ static const char Pad64 = '=';
    */
 
 int
-b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
+b64_ntop(src, srclength, target, targsize)
+	u_char const *src;
+	size_t srclength;
+	char *target;
+	size_t targsize;
+{
 	size_t datalength = 0;
-	uint8_t input[3];
+	u_char input[3];
-	uint8_t output[4];
+	u_char output[4];
-	size_t i;
+	int i;
 
 	while (2 < srclength) {
 		input[0] = *src++;
@@ -138,10 +144,6 @@ b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
 		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
 		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
 		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
 
 		if (datalength + 4 > targsize)
 			return (-1);
@@ -161,9 +163,6 @@ b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
 		output[0] = input[0] >> 2;
 		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
 		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
 
 		if (datalength + 4 > targsize)
 			return (-1);
@@ -180,3 +179,137 @@ b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
 	target[datalength] = '\0';	/* Returned value doesn't count \0. */
 	return (datalength);
 }
+
+/* skips all whitespace anywhere.
+   converts characters, four at a time, starting at (or after)
+   src from base - 64 numbers into three 8 bit bytes in the target area.
+   it returns the number of data bytes stored at the target, or -1 on error.
+ */
+
+int
+b64_pton(src, target, targsize)
+	char const *src;
+	u_char *target;
+	size_t targsize;
+{
+	int tarindex, state, ch;
+	u_char nextbyte;
+	char *pos;
+
+	state = 0;
+	tarindex = 0;
+
+	while ((ch = (unsigned char)*src++) != '\0') {
+		if (isspace(ch))	/* Skip whitespace anywhere. */
+			continue;
+
+		if (ch == Pad64)
+			break;
+
+		pos = strchr(Base64, ch);
+		if (pos == 0) 		/* A non-base64 character. */
+			return (-1);
+
+		switch (state) {
+		case 0:
+			if (target) {
+				if (tarindex >= targsize)
+					return (-1);
+				target[tarindex] = (pos - Base64) << 2;
+			}
+			state = 1;
+			break;
+		case 1:
+			if (target) {
+				if (tarindex >= targsize)
+					return (-1);
+				target[tarindex]   |=  (pos - Base64) >> 4;
+				nextbyte = ((pos - Base64) & 0x0f) << 4;
+				if (tarindex + 1 < targsize)
+					target[tarindex+1] = nextbyte;
+				else if (nextbyte)
+					return (-1);
+			}
+			tarindex++;
+			state = 2;
+			break;
+		case 2:
+			if (target) {
+				if (tarindex >= targsize)
+					return (-1);
+				target[tarindex]   |=  (pos - Base64) >> 2;
+				nextbyte = ((pos - Base64) & 0x03) << 6;
+				if (tarindex + 1 < targsize)
+					target[tarindex+1] = nextbyte;
+				else if (nextbyte)
+					return (-1);
+			}
+			tarindex++;
+			state = 3;
+			break;
+		case 3:
+			if (target) {
+				if (tarindex >= targsize)
+					return (-1);
+				target[tarindex] |= (pos - Base64);
+			}
+			tarindex++;
+			state = 0;
+			break;
+		}
+	}
+
+	/*
+	 * We are done decoding Base-64 chars.  Let's see if we ended
+	 * on a byte boundary, and/or with erroneous trailing characters.
+	 */
+
+	if (ch == Pad64) {			/* We got a pad char. */
+		ch = (unsigned char)*src++;	/* Skip it, get next. */
+		switch (state) {
+		case 0:		/* Invalid = in first position */
+		case 1:		/* Invalid = in second position */
+			return (-1);
+
+		case 2:		/* Valid, means one byte of info */
+			/* Skip any number of spaces. */
+			for (; ch != '\0'; ch = (unsigned char)*src++)
+				if (!isspace(ch))
+					break;
+			/* Make sure there is another trailing = sign. */
+			if (ch != Pad64)
+				return (-1);
+			ch = (unsigned char)*src++;		/* Skip the = */
+			/* Fall through to "single trailing =" case. */
+			/* FALLTHROUGH */
+
+		case 3:		/* Valid, means two bytes of info */
+			/*
+			 * We know this char is an =.  Is there anything but
+			 * whitespace after it?
+			 */
+			for (; ch != '\0'; ch = (unsigned char)*src++)
+				if (!isspace(ch))
+					return (-1);
+
+			/*
+			 * Now make sure for cases 2 and 3 that the "extra"
+			 * bits that slopped past the last full byte were
+			 * zeros.  If we don't check them, they become a
+			 * subliminal channel.
+			 */
+			if (target && tarindex < targsize &&
+			    target[tarindex] != 0)
+				return (-1);
+		}
+	} else {
+		/*
+		 * We ended by seeing the end of the string.  Make sure we
+		 * have no partial bytes lying around.
+		 */
+		if (state != 0)
+			return (-1);
+	}
+
+	return (tarindex);
+}

compat/bitstring.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*	$OpenBSD: bitstring.h,v 1.5 2003/06/02 19:34:12 millert Exp $	*/
 /*	$NetBSD: bitstring.h,v 1.5 1997/05/14 15:49:55 pk Exp $	*/
 

compat/cfmakeraw.c

@@ -1,7 +1,6 @@
-/* $OpenBSD$ */
-
 /*
- * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
+ * Copyright (c) 2013 Dagobert Michelsen
+ * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@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
@@ -19,37 +18,16 @@
 #include <sys/types.h>
 
 #include <string.h>
+#include <termios.h>
 
-#include "tmux.h"
+#include "compat.h"
 
-/* Get cell width. */
-u_int
-grid_cell_width(const struct grid_cell *gc)
-{
-	return (gc->xstate >> 4);
-}
-
-/* Get cell data. */
 void
-grid_cell_get(const struct grid_cell *gc, struct utf8_data *ud)
+cfmakeraw(struct termios *tio)
 {
-	ud->size = gc->xstate & 0xf;
+	tio->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
-	ud->width = gc->xstate >> 4;
+	tio->c_oflag &= ~OPOST;
-	memcpy(ud->data, gc->xdata, ud->size);
+	tio->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
-}
+	tio->c_cflag &= ~(CSIZE|PARENB);
-
+	tio->c_cflag |= CS8;
-/* Set cell data. */
-void
-grid_cell_set(struct grid_cell *gc, const struct utf8_data *ud)
-{
-	memcpy(gc->xdata, ud->data, ud->size);
-	gc->xstate = (ud->width << 4) | ud->size;
-}
-
-/* Set a single character as cell data. */
-void
-grid_cell_one(struct grid_cell *gc, u_char ch)
-{
-	*gc->xdata = ch;
-	gc->xstate = (1 << 4) | 1;
 }

compat/closefrom.c

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * Copyright (c) 2004-2005 Todd C. Miller <Todd.Miller@courtesan.com>
  *
@@ -16,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "tmux.h"
-
 #ifndef HAVE_CLOSEFROM
 
 #include <sys/types.h>
@@ -49,6 +45,8 @@
 # endif
 #endif
 
+#include "compat.h"
+
 #ifndef OPEN_MAX
 # define OPEN_MAX	256
 #endif