This commit was manufactured by cvs2svn to create tag 'TMUX_1_1'.

2026-03-12 03:25:45 +00:00 · 2009-11-05 12:35:48 +00:00
158 changed files with 6730 additions and 9778 deletions
--- a/105
+++ b/105
@@ -1,106 +1,3 @@
-CHANGES FROM 1.2 TO 1.3, 18 July 2010
-
-* New input parser.
-* Flags to move through panes -UDLR added to select-pane.
-* Commands up-pane, and down-pane removed, since equivalent behaviour is now
-  available through the target flag (-t:+ and -t:-).
-* Jump-forward/backward in copy move (based on vi's F, and f commands).
-* Make paste-buffer accept a pane as a target.
-* Flag -a added to new-window to insert a window after an existing one, moving
-  windows up if necessary.
-* Merge more mode into copy mode.
-* Run job commands explicitly in the global environment (which can be modified
-  with setenv -g), rather than with the environment tmux started with.
-* Use the machine's hostname as the default title, instead of an empty string.
-* Prevent double free if the window option remain-on-exit is set. 
-* Key string conversions rewritten.
-* Mark zombie windows as dead in the choose-window list.
-* Tiled layout added.
-* Signal handling reworked.
-* Reset SIGCHLD after fork to fix problems with some shells.
-* Select-prompt command removed. Therefore, bound ' to command-prompt -p index
-  "select-window -t:%%" by default.
-* Catch SIGHUP and terminate if running as a client, thus avoiding clients from
-  being left hanging around when, for instance, a SSH session is disconnected.
-* Solaris 9 fixes (such as adding compat {get,set}env(3) code).
-* Accept none instead of default for attributes.
-* Window options window-status-alert-{alert,bg,fg} added.
-* Flag -s added to the paste-buffer command to specify a custom separator.
-* Allow dragging to make a selection in copy mode if the mode-mouse option is
-  set.
-* Support the mouse scroll wheel.
-* Make pipe-pane accept special character sequences (eg #I).
-* Fix problems with window sizing when starting tmux from .xinitrc.
-* Give tmux sockets (but not the containing folder) group permissions.
-* Extend the target flags (ie -t) to accept an offset (for example -t:+2), and
-  make it wrap windows, and panes.
-* New command choose-buffer added.
-* New server option detach-on-destroy to set what happens to a client when the
-  session it is attached to is destroyed. If on (default), the client is
-  detached. Otherwise, the client is switched to the most recently active of
-  the remaining sessions.
-* The commands load-buffer, and save-buffer now accept a dash (-) as the file
-  to read from stdin, or write to stdout.
-* Custom layouts added.
-* Additional code reduction, bug fixes, and manpage enhancements.
-
-CHANGES FROM 1.1 TO 1.2, 10 March 2010
-
-* Switch to libevent.
-* Emulate the ri (reverse index) capability, ergo allowing tmux to at least
-  start on Sun consoles (TERM=sun, or sun-color).
-* Assign each entry a number, or lowercase letter in choose mode, and accept
-  that as a shortcut key.
-* Permit top-bit-set characters to be entered in the status line.
-* Mark no-prefix keys with (no prefix), rather than [] in list-keys.
-* New command show-messages (alias showmsgs), and new session option
-  message-limit, to show a per-client log of status lines messages up to the
-  number defined by message-limit.
-* Do not interpret #() for display-message to avoid leaking commands.
-* New window options window-status-format, and window-status-current-format to
-  control the format of each window in the status line.
-* Add a -p flag to display-message to print the output, instead of displaying
-  it in the status line.
-* Emulate il1, dl1, ich1 to run with vt100 feature set.
-* New command capture-pane (alias capturep) to copy the entire pane contents
-  to a paste buffer.
-* Avoid duplicating code by adding a -w flag to set-option, and show-options to
-  set, and show window options. The commands set-window-option, and
-  show-window-options are now aliases.
-* Panes can now be referred to as top, bottom, top-left, etc.
-* Add server-wide options, which can be set with set-option -s, and shown with
-  show-options -s.
-* New server option quiet (like -q from the command line).
-* New server option escape-time to set the timeout used to detect if escapes
-  are alone, part of a function key, or meta sequence.
-* New session options pane-active-border-bg, pane-active-border-fg,
-  pane-border-bg, and pane-border-fg to set pane colours.
-* Make split-window accept a pane target, instead of a window.
-* New command join-pane (alias joinp) to split, and move an existing pane into
-  the space (the opposite of break-pane), thus simplifying calls to
-  split-window, followed by move-window.
-* Permit S- prefix on keys for shift when the terminal/terminfo supports them.
-* Window targets (-t flag) can now refer to the last window (!), next (+), and
-  previous (-) window by number.
-* Mode keys to jump to the bottom/top of history, end of the next word, scroll
-  up/down, and reverse search in copy mode.
-* New session option display-panes-active-colour to display the active pane in
-  a different colour with the display-panes command.
-* Read the socket path from $TMUX if it's present, and -L, and -S are not
-  given.
-* Vi-style mode keys B, W, and E to navigate between words in copy mode.
-* Start in more mode when configuration file errors are detected.
-* Rectangle copy support added.
-* If attach-session was specified with the -r flag, make the client read-only.
-* Per-window alternate-screen option.
-* Make load-buffer work with FIFOs.
-* New window option word-separators to set the characters considered as word
-  separators in copy mode.
-* Permit keys in copy mode to be prefixed by a repeat count, entered with [1-9]
-  in vi mode, or M-[1-9] in emacs mode.
-* utf8 improvements.
-* As usual, additional code reduction, bug fixes, and manpage enhancements.
-
 CHANGES FROM 1.0 TO 1.1, 05 November 2009

 * New run-shell (alias run) command to run an external command without a
@@ -1513,7 +1410,7 @@ The list of older changes is below.
  (including mutt, emacs). No status bar yet and no key remapping or other
  customisation.

-$Id: CHANGES,v 1.303 2010-07-18 13:40:59 tcunha Exp $
+$Id: CHANGES,v 1.301 2009-11-05 12:35:47 tcunha Exp $

 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
--- a/58
+++ b/58
@@ -1,17 +1,5 @@
 tmux frequently asked questions

-******************************************************************************
-* PLEASE NOTE: most display problems are due to incorrect TERM! Before       *
-* reporting problems make SURE that TERM settings are correct inside and     *
-* outside tmux.                                                              *
-*                                                                            *
-* Inside tmux TERM must be "screen" or similar (such as "screen-256color").  *
-* Don't bother reporting problems where it isn't!                            *
-*                                                                            *
-* Outside, it must match your terminal: particularly, use "rxvt" for rxvt    *
-* and derivatives.                                                           *
-******************************************************************************
-
 * How is tmux different from GNU screen? What else does it offer?

 tmux offers several advantages over screen:
@@ -38,9 +26,8 @@ There are still a few features screen includes that tmux omits:

 * I found a bug! What do I do?

-Please send bug reports by email to nicm@users.sourceforge.net or
-tmux-users@lists.sourceforge.net. Please include as much of the following
-information as possible:
+Please send bug reports by email to nicm@users.sourceforge.net. Please
+include as much of the following information as possible:

 - the version of tmux you are running;
 - the operating system you are using and its version;
@@ -95,17 +82,19 @@ default) to the new key. For example:

 * How do I use UTF-8?

-When running tmux in a UTF-8 capable terminal, UTF-8 must be turned on in tmux;
-as of release 0.9, tmux attempts to autodetect a UTF-8-capable terminal by
+When running tmux in a UTF-8 capable terminal, two things must be done to
+enable support. UTF-8 must be turned on in tmux; this may be done separately
+for each tmux window or globally by setting the "utf8" flag:
+
+	setw -g utf8 on
+
+As of release 0.9, tmux attempts to autodetect a UTF-8-capable terminal by
 checking the LC_ALL, LC_CTYPE and LANG environment variables. list-clients may
 be used to check if this is detected correctly; if not, the -u command-line
 flag may be specified when creating or attaching a client to a tmux session:

 	$ tmux -u new

-Since the 1.0 release, tmux will turn on UTF-8 related options automatically
-(ie status-utf8, and utf8) if the above conditions are met.
-
 * How do I use a 256 colour terminal?

 Provided the underlying terminal supports 256 colours, it is usually sufficient
@@ -212,31 +201,4 @@ on the Window -> Translation configuration page. For example, change UTF-8 to
 ISO-8859-1 or CP437. It may also be necessary to adjust the way PuTTY treats
 line drawing characters in the lower part of the same configuration page.

-* What is the best way to display the load average? Why no #L?
-
-It isn't possible to get the load average portably in code and it is preferable
-not to add portability goop. The following works on at least Linux, *BSD and OS
-X:
-
-uptime|awk '{split(substr($0, index($0, "load")), a, ":"); print a[2]}'
-
-* How do I attach the same session to multiple clients but with a different
-  current window, like screen -x?
-
-One or more of the windows can be linked into multiple sessions manually with
-link-window, or a grouped session with all the windows can be created with
-new-session -t.
-
-* Ctrl and arrow keys doesn't work in putty! What do I do?
-
-putty inverts the sense of the cursor key mode on ctrl, which is a bit hard for
-tmux to detect properly. To get ctrl keys right, change the terminfo settings
-so kUP5 (Ctrl-Up etc) are the adjusted versions, and disable smkx/rmkx so tmux
-doesn't change the mode. For example with this line in .tmux.conf (assuming you
-have TERM set to xterm):
-
-set -g terminal-overrides "xterm*:kLFT5=\eOD:kRIT5=\eOC:kUP5=\eOA:kDN5=\eOB:smkx@:rmkx@"
-
-Note that this will only work in tmux 1.2 and above.
-
-$Id: FAQ,v 1.36 2010-02-04 21:01:59 nicm Exp $
+$Id: FAQ,v 1.29 2009-08-08 20:46:26 nicm Exp $
--- a/15
+++ b/15
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.128 2010-07-18 13:36:52 tcunha Exp $
+# $Id: GNUmakefile,v 1.120 2009-11-05 12:30:55 tcunha Exp $
 #
 # Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
 #
@@ -17,7 +17,7 @@

 .PHONY: clean

-VERSION= 1.3
+VERSION= 1.1

 #FDEBUG= 1

@@ -28,7 +28,7 @@ LIBS+=

 # Sun CC 
 ifneq ($(shell ($(CC) -V 2>&1|awk '/Sun C/' || true)), )
-	CFLAGS+= -erroff=E_EMPTY_DECLARATION
+	CFLAGS+=-erroff=E_EMPTY_DECLARATION
 	FDEBUG=
 endif

@@ -52,12 +52,11 @@ endif
 endif

 PREFIX?= /usr/local
-INSTALL?= install
-INSTALLDIR= $(INSTALL) -d
-INSTALLBIN= $(INSTALL) -m 555
-INSTALLMAN= $(INSTALL) -m 444
+INSTALLDIR= install -d
+INSTALLBIN= install -g bin -o root -m 555
+INSTALLMAN= install -g bin -o root -m 444

-SRCS= $(shell echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g')
+SRCS= $(shell echo *.c|sed 's|osdep-[a-z0-9]*.c||g')
 include config.mk
 OBJS= $(patsubst %.c,%.o,$(SRCS))

--- a/13
+++ b/13
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.160 2010-07-18 13:36:52 tcunha Exp $
+# $Id: Makefile,v 1.153 2009-11-05 12:30:55 tcunha Exp $
 #
 # Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
 #
@@ -18,7 +18,7 @@
 .SUFFIXES: .c .o
 .PHONY: clean

-VERSION= 1.3
+VERSION= 1.1

 #FDEBUG= 1

@@ -48,12 +48,11 @@ CFLAGS+= -Wno-pointer-sign
 .endif

 PREFIX?= /usr/local
-INSTALL?= install
-INSTALLDIR= ${INSTALL} -d
-INSTALLBIN= ${INSTALL} -m 555
-INSTALLMAN= ${INSTALL} -m 444
+INSTALLDIR= install -d
+INSTALLBIN= install -g bin -o root -m 555
+INSTALLMAN= install -g bin -o root -m 444

-SRCS!= echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g'
+SRCS!= echo *.c|sed 's|osdep-[a-z0-9]*.c||g'
 .include "config.mk"
 OBJS= ${SRCS:S/.c/.o/}

--- a/14
+++ b/14
@@ -9,10 +9,12 @@ run on Solaris and AIX (although they haven't been tested in a while). It is
 usable, although there remain a number of missing features and some remaining
 bugs are expected.

-Since the 1.2 release that tmux depends on libevent. Download the stable
-version from:
-
-	http://www.monkey.org/~provos/libevent/
+If upgrading from 1.0, PLEASE NOTE:
+- The internal locking mechanism has gone, so the set-password command and -U
+  command line option have been removed.
+- The -d command line flag was dropped. It will now automatically detect the
+  default colours by using op/AX. Nevertheless, if needed, the
+  terminal-overrides session option can replace it.

 tmux consists of a server part and multiple clients. The server is created when
 required and runs continuously unless killed by the user. Clients access the
@@ -49,7 +51,7 @@ are missing it may refuse to run, or not behave correctly.
 tmux supports UTF-8. To use it, the utf8 option must be set on each window;
 this may be turned on for all windows by setting it as a global option, see
 tmux(1) and the FAQ file. As of 0.9, tmux attempts to autodetect a
-UTF-8 capable terminal by checking the LC_ALL, LC_CTYPE and LANG environment
+UTF-8-capable terminal by checking the LC_ALL, LC_CTYPE and LANG environment
 variables. list-clients may be used to check if this is detected correctly; if
 not, the -u command-line flag may be specified.

@@ -86,4 +88,4 @@ start. Please contact me with any queries.

 -- Nicholas Marriott <nicm@users.sf.net>

-$Id: NOTES,v 1.53 2010-03-10 15:18:11 tcunha Exp $
+$Id: NOTES,v 1.51 2009-11-05 12:35:47 tcunha Exp $
--- a/91
+++ b/91
@@ -15,6 +15,7 @@
  session not being watched?
 - next prev word etc in command prompt
 - many more info() displays for various things
+- input.c is too complicated. simplify?
 - use a better termcap internally instead of screen, perhaps xterm
 - fix rxvt cursor fg issue (text under cursor can have non-white fg)
 - should be able to move to a hidden pane and it would be moved into view. pane
@@ -37,8 +38,8 @@
  "new-session" if-shell "[ -e $HOME/.tmux-session.conf ]" source-file
  $HOME/.tmux-session.conf
 - get it passing all the vttest tests that don't require resizing the terminal
- esc seq to set window name and title should be documented, and name variant
-  should clear automatic-rename
+- esc seq to set window title should be documented and should set
+  automatic-rename
 - way to set socket path from config file
 - XXX once env stuff is in, default-path and VISUAL/EDITOR should be picked up
  when session is started
@@ -55,6 +56,9 @@
 - a way for force-width/height to apply to only one pane (how?)
 - command to list what is actually running in each window with command line,
  pid (need some adaption of the osdep code)
+- string option to change/remove the symbols (*-+ etc) in status line
+  * or to set entire format, eg window-list-format '#N:#W#P' or something,
+  then could use embedded colours
 - support for bce
 - it would be nice if the start/end line keys in copy mode were aware of
  wrapped lines
@@ -64,6 +68,7 @@
 		   for redraw
 - handle resize better in copy mode
 - way to copy stuff that is off screen due to resize
+- a way to address panes by name ("top-left") and position ("0,0")
 - commands should be able to succeed or fail and have || or && for command
  lists
 - support the mouse wheel to scroll through history
@@ -73,80 +78,20 @@
 - UTF-8 to a non-UTF-8 terminal should not be able to balls up
  the terminal - www/ruby-addressable; make regress
 - copy mode needs a tidy/cleanup
+- things like display-message will leak job entries if #() is used
+- message log
+- an option to NOT remove message when key pressed
+- would be nice to be able to press 0-9a-zA-Z to select window in choose-window
+  mode, also to start typing and it searches
+- the wrapping stuff should work when redrawn from scroll mode too (screen_write_copy)
 - ability to save history (to buffer?)
 - multiple keys could be done with tables, ie have prefixes go and instead
 	bind -n ^A prefix-table "default"
-  where prefix-table sets command lookup table and sets prefix flag, then next
-  key is looked up in that table
+  where prefix-table sets command lookup table and sets prefix flag, then next key
+  is looked up in that table
+- check fix UTF-8 and split-window? should be okay
 - UTF-8 should be a pointer into a combined string buffer
 - check irssi (term_charset) works with UTF-8
+- rectangle copy/paste
+- half page/up down are missing from key table
 - support esc-esc to quit in modes
- fix ctrl+F1-F4 output. to what?
- look into xterm clearing its selection when scrolling etc
- better utf8 support:
-  	 window names
-	 prompt input
-	 message display
-	 copy and paste cursor and wide characters
-	 ...?
- session history for client and last-session command
- option to change status line colour when current window is in a mode?
- option to move copy mode indicator into status line
- list-buffer/show-buffer should display UTF-8
- selection behaviour closer to vi in vi mode
- live update: server started with -U connects to server, requests sessions and
-  windows, receives fds
- convert status line history to be server global (anything else?)
- command to show a tree of sessions-windows-panes (active marked with *)
- sort out inheriting config from shell on new sessions/windows:
-        should pick up default-path/termios/etc from client if possible,
-	else leave empty/default
- link panes into multiple windows
- -h option to capture-pane to capture the history as well
- bells should be passed between sessions with visual-bell etc
- use screen-256color when started on 256 colour terminal??
- if-shell/run-shell should block further command execution in the same command
-  sequence until its shell exits, to allow them to be used from the config file
- better session sharing: create-socket command to create socket somewhere (-r
-  flag for readonly)
- allow buffer to be specified when copying in copy mode
- multiline status line
- flag for absolute pane size to resize-pane
- sanity check input to socket
- select-buffer command
- support title stack, both internally and externally
-	http://docs.freebsd.org/cgi/getmsg.cgi?fetch=1149299+0+archive/2010/freebsd-questions/20100207.freebsd-questions
- copy buffers should be global, limit can be server option, nuke copy-buffer
-  command
- command to show status line information briefly when it is off
- some way to pad # stuff with spaces, #!2T maybe
- FreeBSD console problems
- a binding to "scroll down and exit at bottom" copy mode
- some way to pass keystrokes in copy mode through to underlying window
- last window update time and # replacement for it for display-message
- find-window across sessions - other ways to make session handling easier?
- ' and " should be parsed the same (eg "\e" vs '\e') in config and command
-  prompt?
- command to toggle selection not to move it in copy-mode
-
-For 1.3 (not in order):
-
-3 why are alerts per-winlink? try per window?
-4 audit of escape sequence support vs xterm
-6 rectangle copy: when selecting leftward, cursor should be inside block per
-  emacs key to rotate corner at which cursor is
-9 something for -t "last window in session" so a session can be used as a stack
-10 synchronous commands - client sends cmd and blocks, neww/splitw saves client
-   ptr then when program inside died, sends MSG_SOMETHING with wait status to
-   client
-11 documentation improvements - rlpowell's tutorial
-                              - build instructions
-12 better configure? with-libevent
-14 bind commands to key sequences?
-16 monitor, bell etc should monitor /all/ panes in the window not just one
-17 wd should be updated on attach etc. maybe lose default-path and use PWD
-18 a history of commands that can be reversed (reverse member of each command, and a buffer)
-19 info() when changing to same window
-20 don't pass UTF-8 through vis for titles
-...
-
--- a/array.h
+++ b/array.h
@@ -1,4 +1,4 @@
-/* $Id: array.h,v 1.11 2010-06-06 00:27:08 tcunha Exp $ */
+/* $Id: array.h,v 1.9 2009-11-02 21:34:32 tcunha Exp $ */

 /*
 * Copyright (c) 2006 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -19,8 +19,6 @@
 #ifndef ARRAY_H
 #define ARRAY_H

-#define ARRAY_INITIALIZER { NULL, 0, 0 }
-
 #define ARRAY_DECL(n, c)						\
 	struct n {							\
 		c	*list;						\
@@ -47,7 +45,7 @@
 	}								\
 } while (0)

-#define ARRAY_EMPTY(a) (((void *) (a)) == NULL || (a)->num == 0)
+#define ARRAY_EMPTY(a) ((a) == NULL || (a)->num == 0)
 #define ARRAY_LENGTH(a) ((a)->num)
 #define ARRAY_DATA(a) ((a)->list)

--- a/attributes.c
+++ b/attributes.c
@@ -1,4 +1,4 @@
-/* $Id: attributes.c,v 1.4 2010-06-05 23:54:51 tcunha Exp $ */
+/* $Id: attributes.c,v 1.2 2009-06-25 15:25:45 nicm Exp $ */

 /*
 * Copyright (c) 2009 Joshua Elsasser <josh@elsasser.org>
@@ -23,29 +23,29 @@
 #include "tmux.h"

 const char *
-attributes_tostring(u_char attr)
+attributes_tostring(u_char ch)
 {
 	static char	buf[128];

-	if (attr == 0)
-		return ("none");
+	if (ch == 0)
+		return ("default");

 	buf[0] = '\0';
-	if (attr & GRID_ATTR_BRIGHT)
+	if (ch & GRID_ATTR_BRIGHT)
 		strlcat(buf, "bright,", sizeof (buf));
-	if (attr & GRID_ATTR_DIM)
+	if (ch & GRID_ATTR_DIM)
 		strlcat(buf, "dim,", sizeof (buf));
-	if (attr & GRID_ATTR_UNDERSCORE)
+	if (ch & GRID_ATTR_UNDERSCORE)
 		strlcat(buf, "underscore,", sizeof (buf));
-	if (attr & GRID_ATTR_BLINK)
+	if (ch & GRID_ATTR_BLINK)
 		strlcat(buf, "blink,", sizeof (buf));
-	if (attr & GRID_ATTR_REVERSE)
+	if (ch & GRID_ATTR_REVERSE)
 		strlcat(buf, "reverse,", sizeof (buf));
-	if (attr & GRID_ATTR_HIDDEN)
+	if (ch & GRID_ATTR_HIDDEN)
 		strlcat(buf, "hidden,", sizeof (buf));
-	if (attr & GRID_ATTR_ITALICS)
+	if (ch & GRID_ATTR_ITALICS)
 		strlcat(buf, "italics,", sizeof (buf));
-	if (*buf != '\0')
+	if (*buf)
 		*(strrchr(buf, ',')) = '\0';

 	return (buf);
@@ -55,7 +55,7 @@ int
 attributes_fromstring(const char *str)
 {
 	const char	delimiters[] = " ,|";
-	u_char		attr;
+	u_char		ch;
 	size_t		end;

 	if (*str == '\0' || strcspn(str, delimiters) == 0)
@@ -63,31 +63,31 @@ attributes_fromstring(const char *str)
 	if (strchr(delimiters, str[strlen(str) - 1]) != NULL)
 		return (-1);

-	if (strcasecmp(str, "default") == 0 || strcasecmp(str, "none") == 0)
+	if (strcasecmp(str, "default") == 0)
 		return (0);

-	attr = 0;
+	ch = 0;
 	do {
 		end = strcspn(str, delimiters);
 		if ((end == 6 && strncasecmp(str, "bright", end) == 0) ||
 		    (end == 4 && strncasecmp(str, "bold", end) == 0))
-			attr |= GRID_ATTR_BRIGHT;
+			ch |= GRID_ATTR_BRIGHT;
 		else if (end == 3 && strncasecmp(str, "dim", end) == 0)
-			attr |= GRID_ATTR_DIM;
+			ch |= GRID_ATTR_DIM;
 		else if (end == 10 && strncasecmp(str, "underscore", end) == 0)
-			attr |= GRID_ATTR_UNDERSCORE;
+			ch |= GRID_ATTR_UNDERSCORE;
 		else if (end == 5 && strncasecmp(str, "blink", end) == 0)
-			attr |= GRID_ATTR_BLINK;
+			ch |= GRID_ATTR_BLINK;
 		else if (end == 7 && strncasecmp(str, "reverse", end) == 0)
-			attr |= GRID_ATTR_REVERSE;
+			ch |= GRID_ATTR_REVERSE;
 		else if (end == 6 && strncasecmp(str, "hidden", end) == 0)
-			attr |= GRID_ATTR_HIDDEN;
+			ch |= GRID_ATTR_HIDDEN;
 		else if (end == 7 && strncasecmp(str, "italics", end) == 0)
-			attr |= GRID_ATTR_ITALICS;
+			ch |= GRID_ATTR_ITALICS;
 		else
 			return (-1);
 		str += end + strspn(str + end, delimiters);
 	} while (*str != '\0');

-	return (attr);
+	return (ch);
 }
--- a/buffer-poll.c
+++ b/buffer-poll.c
@@ -0,0 +1,55 @@
+/* $Id: buffer-poll.c,v 1.18 2009-10-23 17:49:47 tcunha Exp $ */
+
+/*
+ * 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 <errno.h>
+#include <unistd.h>
+
+#include "tmux.h"
+
+/* Fill buffers from socket based on poll results. */
+int
+buffer_poll(int fd, int events, struct buffer *in, struct buffer *out)
+{
+	ssize_t	n;
+
+	if (events & (POLLERR|POLLNVAL))
+		return (-1);
+	if (in != NULL && events & POLLIN) {
+		buffer_ensure(in, BUFSIZ);
+		n = read(fd, BUFFER_IN(in), BUFFER_FREE(in));
+		if (n == 0)
+			return (-1);
+		if (n == -1) {
+			if (errno != EINTR && errno != EAGAIN)
+				return (-1);
+		} else
+			buffer_add(in, n);
+	} else if (events & POLLHUP)
+		return (-1);
+	if (out != NULL && BUFFER_USED(out) > 0 && events & POLLOUT) {
+		n = write(fd, BUFFER_OUT(out), BUFFER_USED(out));
+		if (n == -1) {
+			if (errno != EINTR && errno != EAGAIN)
+				return (-1);
+		} else
+			buffer_remove(out, n);
+	}
+	return (0);
+}
--- a/buffer.c
+++ b/buffer.c
@@ -0,0 +1,139 @@
+/* $Id: buffer.c,v 1.8 2009-08-21 21:09:13 tcunha Exp $ */
+
+/*
+ * 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 <string.h>
+
+#include "tmux.h"
+
+/* Create a buffer. */
+struct buffer *
+buffer_create(size_t size)
+{
+	struct buffer	*b;
+
+	if (size == 0)
+		fatalx("zero size");
+
+	b = xcalloc(1, sizeof *b);
+
+	b->base = xmalloc(size);
+	b->space = size;
+
+	return (b);
+}
+
+/* Destroy a buffer. */
+void
+buffer_destroy(struct buffer *b)
+{
+	xfree(b->base);
+	xfree(b);
+}
+
+/* Ensure free space for size in buffer. */
+void
+buffer_ensure(struct buffer *b, size_t size)
+{
+	if (size == 0)
+		fatalx("zero size");
+
+	if (BUFFER_FREE(b) >= size)
+		return;
+
+	if (b->off > 0) {
+		if (b->size > 0)
+			memmove(b->base, b->base + b->off, b->size);
+		b->off = 0;
+	}
+
+	if (SIZE_MAX - b->size < size)
+		fatalx("size too big");
+	while (b->space < b->size + size) {
+		b->base = xrealloc(b->base, 2, b->space);
+		b->space *= 2;
+	}
+}
+
+/* Adjust buffer after data appended. */
+void
+buffer_add(struct buffer *b, size_t size)
+{
+	if (size == 0)
+		fatalx("zero size");
+	if (size > b->space - b->size)
+		fatalx("overflow");
+
+	b->size += size;
+}
+
+/* Adjust buffer after data removed. */
+void
+buffer_remove(struct buffer *b, size_t size)
+{
+	if (size == 0)
+		fatalx("zero size");
+	if (size > b->size)
+		fatalx("underflow");
+
+	b->size -= size;
+	b->off += size;
+}
+
+/* Copy data into a buffer. */
+void
+buffer_write(struct buffer *b, const void *data, size_t size)
+{
+	buffer_ensure(b, size);
+	memcpy(BUFFER_IN(b), data, size);
+	buffer_add(b, size);
+}
+
+/* Copy data out of a buffer. */
+void
+buffer_read(struct buffer *b, void *data, size_t size)
+{
+	if (size == 0)
+		fatalx("zero size");
+	if (size > b->size)
+		fatalx("underflow");
+
+	memcpy(data, BUFFER_OUT(b), size);
+	buffer_remove(b, size);
+}
+
+/* Store an 8-bit value. */
+void
+buffer_write8(struct buffer *b, uint8_t n)
+{
+	buffer_ensure(b, 1);
+	BUFFER_IN(b)[0] = n;
+	b->size++;
+}
+
+/* Extract an 8-bit value. */
+uint8_t
+buffer_read8(struct buffer *b)
+{
+	uint8_t	n;
+
+	n = BUFFER_OUT(b)[0];
+	buffer_remove(b, 1);
+	return (n);
+}
--- a/cfg.c
+++ b/cfg.c
@@ -1,4 +1,4 @@
-/* $Id: cfg.c,v 1.27 2010-06-06 00:04:18 tcunha Exp $ */
+/* $Id: cfg.c,v 1.23 2009-10-28 23:12:38 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,17 +33,13 @@
 void printflike2 cfg_print(struct cmd_ctx *, const char *, ...);
 void printflike2 cfg_error(struct cmd_ctx *, const char *, ...);

-char	 	       *cfg_cause;
-int     	 	cfg_finished;
-struct causelist	cfg_causes = ARRAY_INITIALIZER;
+char	 *cfg_cause;

-/* ARGSUSED */
 void printflike2
 cfg_print(unused struct cmd_ctx *ctx, unused const char *fmt, ...)
 {
 }

-/* ARGSUSED */
 void printflike2
 cfg_error(unused struct cmd_ctx *ctx, const char *fmt, ...)
 {
@@ -54,36 +50,19 @@ cfg_error(unused struct cmd_ctx *ctx, const char *fmt, ...)
 	va_end(ap);
 }

-void printflike2
-cfg_add_cause(struct causelist *causes, const char *fmt, ...)
-{
-	char	*cause;
-	va_list	 ap;
-
-	va_start(ap, fmt);
-	xvasprintf(&cause, fmt, ap);
-	va_end(ap);
-
-	ARRAY_ADD(causes, cause);
-}
-
-/*
- * Load configuration file. Returns -1 for an error with a list of messages in
- * causes. Note that causes must be initialised by the caller!
- */
 int
-load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
+load_cfg(const char *path, struct cmd_ctx *ctxin, char **cause)
 {
 	FILE		*f;
 	u_int		 n;
-	char		*buf, *line, *cause;
+	char		*buf, *line, *ptr;
 	size_t		 len;
 	struct cmd_list	*cmdlist;
 	struct cmd_ctx	 ctx;

 	if ((f = fopen(path, "rb")) == NULL) {
-		cfg_add_cause(causes, "%s: %s", path, strerror(errno));
-		return (-1);
+		xasprintf(cause, "%s: %s", path, strerror(errno));
+		return (1);
 	}
 	n = 0;

@@ -99,12 +78,10 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
 		}
 		n++;

-		if (cmd_string_parse(buf, &cmdlist, &cause) != 0) {
-			if (cause == NULL)
+		if (cmd_string_parse(buf, &cmdlist, cause) != 0) {
+			if (*cause == NULL)
 				continue;
-			cfg_add_cause(causes, "%s: %u: %s", path, n, cause);
-			xfree(cause);
-			continue;
+			goto error;
 		}
 		if (cmdlist == NULL)
 			continue;
@@ -128,16 +105,23 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
 		cmd_list_exec(cmdlist, &ctx);
 		cmd_list_free(cmdlist);
 		if (cfg_cause != NULL) {
-			cfg_add_cause(causes, "%s: %d: %s", path, n, cfg_cause);
-			xfree(cfg_cause);
-			continue;
+			*cause = cfg_cause;
+			goto error;
 		}
 	}
 	if (line != NULL)
 		xfree(line);
 	fclose(f);

-	if (ARRAY_LENGTH(causes) != 0)
-		return (-1);
 	return (0);
+
+error:
+	if (line != NULL)
+		xfree(line);
+	fclose(f);
+
+	xasprintf(&ptr, "%s: %s at line %u", path, *cause, n);
+	xfree(*cause);
+	*cause = ptr;
+	return (1);
 }
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.95 2010-07-02 02:52:13 tcunha Exp $ */
+/* $Id: client.c,v 1.84 2009-11-02 21:41:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -17,13 +17,13 @@
 */

 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
 #include <sys/wait.h>

 #include <errno.h>
-#include <event.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdlib.h>
@@ -34,17 +34,13 @@
 #include "tmux.h"

 struct imsgbuf	client_ibuf;
-struct event	client_event;
 const char     *client_exitmsg;
-int		client_exitval;

-void		client_send_identify(int);
-void		client_send_environ(void);
-void		client_write_server(enum msgtype, void *, size_t);
-void		client_update_event(void);
-void		client_signal(int, short, void *);
-void		client_callback(int, short, void *);
-int		client_dispatch(void);
+void	client_send_identify(int);
+void	client_send_environ(void);
+void	client_write_server(enum msgtype, void *, size_t);
+int	client_dispatch(void);
+void	client_suspend(void);

 struct imsgbuf *
 client_init(char *path, int cmdflags, int flags)
@@ -100,7 +96,8 @@ server_started:

 	if (cmdflags & CMD_SENDENVIRON)
 		client_send_environ();
-	client_send_identify(flags);
+	if (isatty(STDIN_FILENO))
+		client_send_identify(flags);

 	return (&client_ibuf);

@@ -117,14 +114,17 @@ void
 client_send_identify(int flags)
 {
 	struct msg_identify_data	data;
+	struct winsize			ws;
 	char			       *term;
 	int				fd;

+	if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) == -1)
+		fatal("ioctl(TIOCGWINSZ)");
 	data.flags = flags;

 	if (getcwd(data.cwd, sizeof data.cwd) == NULL)
 		*data.cwd = '\0';
-
+	
 	term = getenv("TERM");
 	if (term == NULL ||
 	    strlcpy(data.term, term, sizeof data.term) >= sizeof data.term)
@@ -134,14 +134,6 @@ client_send_identify(int flags)
 		fatal("dup failed");
 	imsg_compose(&client_ibuf,
 	    MSG_IDENTIFY, PROTOCOL_VERSION, -1, fd, &data, sizeof data);
-
-	if ((fd = dup(STDOUT_FILENO)) == -1)
-		fatal("dup failed");
-	imsg_compose(&client_ibuf, MSG_STDOUT, PROTOCOL_VERSION, -1, fd, NULL, 0);
-
-	if ((fd = dup(STDERR_FILENO)) == -1)
-		fatal("dup failed");
-	imsg_compose(&client_ibuf, MSG_STDERR, PROTOCOL_VERSION, -1, fd, NULL, 0);
 }

 void
@@ -150,7 +142,7 @@ client_send_environ(void)
 	struct msg_environ_data	data;
 	char		      **var;

-	for (var = environ; *var != NULL; var++) {
+ 	for (var = environ; *var != NULL; var++) {
 		if (strlcpy(data.var, *var, sizeof data.var) >= sizeof data.var)
 			continue;
 		client_write_server(MSG_ENVIRON, &data, sizeof data);
@@ -160,129 +152,99 @@ client_send_environ(void)
 void
 client_write_server(enum msgtype type, void *buf, size_t len)
 {
-	imsg_compose(&client_ibuf, type, PROTOCOL_VERSION, -1, -1, buf, len);
-}
-
-void
-client_update_event(void)
-{
-	short	events;
-
-	event_del(&client_event);
-	events = EV_READ;
-	if (client_ibuf.w.queued > 0)
-		events |= EV_WRITE;
-	event_set(&client_event, client_ibuf.fd, events, client_callback, NULL);
-	event_add(&client_event, NULL);
+ 	imsg_compose(&client_ibuf, type, PROTOCOL_VERSION, -1, -1, buf, len);
 }

 __dead void
 client_main(void)
 {
+	struct pollfd	 pfd;
+	int		 n, nfds;
+
+	siginit();
+
 	logfile("client");

-	/* Note: event_init() has already been called. */
-
-	/* Set up signals. */
-	set_signals(client_signal);
-
-	/*
-	 * Send a resize message immediately in case the terminal size has
-	 * changed between the identify message to the server and the MSG_READY
-	 * telling us to move into the client code.
-	 */
-	 client_write_server(MSG_RESIZE, NULL, 0);
-
 	/*
 	 * imsg_read in the first client poll loop (before the terminal has
-	 * been initialised) may have read messages into the buffer after the
-	 * MSG_READY switched to here. Process anything outstanding now to
-	 * avoid hanging waiting for messages that have already arrived.
+	 * been initialiased) may have read messages into the buffer after the
+	 * MSG_READY switched to here. Process anything outstanding now so poll
+	 * doesn't hang waiting for messages that have already arrived.
 	 */
 	if (client_dispatch() != 0)
 		goto out;

-	/* Set the event and dispatch. */
-	client_update_event();
-	event_dispatch();
+	for (;;) {
+		if (sigterm) {
+			client_exitmsg = "terminated";
+			client_write_server(MSG_EXITING, NULL, 0);
+		}
+		if (sigchld) {
+			sigchld = 0;
+			waitpid(WAIT_ANY, NULL, WNOHANG);
+			continue;
+		}
+		if (sigwinch) {
+			sigwinch = 0;
+			client_write_server(MSG_RESIZE, NULL, 0);
+			continue;
+		}
+		if (sigcont) {
+			sigcont = 0;
+			siginit();
+			client_write_server(MSG_WAKEUP, NULL, 0);
+			continue;
+		}

-out:
-	/* Print the exit message, if any, and exit. */
-	if (client_exitmsg != NULL && !login_shell)
-		printf("[%s]\n", client_exitmsg);
-	exit(client_exitval);
-}
+		pfd.fd = client_ibuf.fd;
+		pfd.events = POLLIN;
+		if (client_ibuf.w.queued > 0)
+			pfd.events |= POLLOUT;

-/* ARGSUSED */
-void
-client_signal(int sig, unused short events, unused void *data)
-{
-	struct sigaction	sigact;
+		if ((nfds = poll(&pfd, 1, INFTIM)) == -1) {
+			if (errno == EAGAIN || errno == EINTR)
+				continue;
+			fatal("poll failed");
+		}
+		if (nfds == 0)
+			continue;

-	switch (sig) {
-	case SIGHUP:
-		client_exitmsg = "lost tty";
-		client_exitval = 1;
-		client_write_server(MSG_EXITING, NULL, 0);
-		break;
-	case SIGTERM:
-		client_exitmsg = "terminated";
-		client_exitval = 1;
-		client_write_server(MSG_EXITING, NULL, 0);
-		break;
-	case SIGWINCH:
-		client_write_server(MSG_RESIZE, NULL, 0);
-		break;
-	case SIGCONT:
-		memset(&sigact, 0, sizeof sigact);
-		sigemptyset(&sigact.sa_mask);
-		sigact.sa_flags = SA_RESTART;
-		sigact.sa_handler = SIG_IGN;
-		if (sigaction(SIGTSTP, &sigact, NULL) != 0)
-			fatal("sigaction failed");
-		client_write_server(MSG_WAKEUP, NULL, 0);
-		break;
-	}
+		if (pfd.revents & (POLLERR|POLLHUP|POLLNVAL))
+			fatalx("socket error");

-	client_update_event();
-}
+		if (pfd.revents & POLLIN) {
+			if ((n = imsg_read(&client_ibuf)) == -1 || n == 0) {
+				client_exitmsg = "lost server";
+				break;
+			}
+			if (client_dispatch() != 0)
+				break;
+		}

-/* ARGSUSED */
-void
-client_callback(unused int fd, short events, unused void *data)
-{
-	ssize_t	n;
-
-	if (events & EV_READ) {
-		if ((n = imsg_read(&client_ibuf)) == -1 || n == 0)
-			goto lost_server;
-		if (client_dispatch() != 0) {
-			event_loopexit(NULL);
-			return;
+		if (pfd.revents & POLLOUT) {
+			if (msgbuf_write(&client_ibuf.w) < 0) {
+				client_exitmsg = "lost server";
+				break;
+			}
 		}
 	}

-	if (events & EV_WRITE) {
-		if (msgbuf_write(&client_ibuf.w) < 0)
-			goto lost_server;
+out:
+	/* Print the exit message, if any, and exit. */
+	if (client_exitmsg != NULL) {
+		if (!login_shell)
+			printf("[%s]\n", client_exitmsg);
+		exit(1);
 	}
-
-	client_update_event();
-	return;
-
-lost_server:
-	client_exitmsg = "lost server";
-	client_exitval = 1;
-	event_loopexit(NULL);
+	exit(0);
 }

 int
 client_dispatch(void)
 {
-	struct imsg		imsg;
-	struct msg_lock_data	lockdata;
-	struct sigaction	sigact;
-	ssize_t			n, datalen;
+	struct imsg		 imsg;
+	struct msg_lock_data	 lockdata;
+	ssize_t			 n, datalen;

 	for (;;) {
 		if ((n = imsg_get(&client_ibuf, &imsg)) == -1)
@@ -291,7 +253,6 @@ client_dispatch(void)
 			return (0);
 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;

-		log_debug("client got %d", imsg.hdr.type);
 		switch (imsg.hdr.type) {
 		case MSG_DETACH:
 			if (datalen != 0)
@@ -319,25 +280,18 @@ client_dispatch(void)

 			client_write_server(MSG_EXITING, NULL, 0);
 			client_exitmsg = "server exited";
-			client_exitval = 1;
 			break;
 		case MSG_SUSPEND:
 			if (datalen != 0)
 				fatalx("bad MSG_SUSPEND size");

-			memset(&sigact, 0, sizeof sigact);
-			sigemptyset(&sigact.sa_mask);
-			sigact.sa_flags = SA_RESTART;
-			sigact.sa_handler = SIG_DFL;
-			if (sigaction(SIGTSTP, &sigact, NULL) != 0)
-				fatal("sigaction failed");
-			kill(getpid(), SIGTSTP);
+			client_suspend();
 			break;
 		case MSG_LOCK:
 			if (datalen != sizeof lockdata)
 				fatalx("bad MSG_LOCK size");
 			memcpy(&lockdata, imsg.data, sizeof lockdata);
-
+			
 			lockdata.cmd[(sizeof lockdata.cmd) - 1] = '\0';
 			system(lockdata.cmd);
 			client_write_server(MSG_UNLOCK, NULL, 0);
@@ -349,3 +303,23 @@ client_dispatch(void)
 		imsg_free(&imsg);
 	}
 }
+
+void
+client_suspend(void)
+{
+	struct sigaction	 act;
+
+	memset(&act, 0, sizeof act);
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = SA_RESTART;
+
+	act.sa_handler = SIG_DFL;
+	if (sigaction(SIGTSTP, &act, NULL) != 0)
+		fatal("sigaction failed");
+
+	act.sa_handler = sighandler;
+	if (sigaction(SIGCONT, &act, NULL) != 0)
+		fatal("sigaction failed");
+
+	kill(getpid(), SIGTSTP);
+}
--- a/clock.c
+++ b/clock.c
@@ -1,4 +1,4 @@
-/* $Id: clock.c,v 1.9 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: clock.c,v 1.7 2009-09-11 14:13:52 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -97,7 +97,7 @@ const char clock_table[14][5][5] = {
 };

 void
-clock_draw(struct screen_write_ctx *ctx, int colour, int style)
+clock_draw(struct screen_write_ctx *ctx, u_int colour, int style)
 {
 	struct screen		*s = ctx->s;
 	struct grid_cell	 gc;
@@ -134,13 +134,13 @@ clock_draw(struct screen_write_ctx *ctx, int colour, int style)
 	for (ptr = tim; *ptr != '\0'; ptr++) {
 		if (*ptr >= '0' && *ptr <= '9')
 			idx = *ptr - '0';
-		else if (*ptr == ':')
+ 		else if (*ptr == ':')
 			idx = 10;
-		else if (*ptr == 'A')
+ 		else if (*ptr == 'A')
 			idx = 11;
-		else if (*ptr == 'P')
+ 		else if (*ptr == 'P')
 			idx = 12;
-		else if (*ptr == 'M')
+ 		else if (*ptr == 'M')
 			idx = 13;
 		else {
 			x += 6;
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-attach-session.c,v 1.36 2010-02-08 18:27:34 tcunha Exp $ */
+/* $Id: cmd-attach-session.c,v 1.32 2009-08-09 17:48:55 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,8 +28,8 @@ int	cmd_attach_session_exec(struct cmd *, struct cmd_ctx *);

 const struct cmd_entry cmd_attach_session_entry = {
 	"attach-session", "attach",
-	"[-dr] " CMD_TARGET_SESSION_USAGE,
-	CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, "dr",
+	"[-d] " CMD_TARGET_SESSION_USAGE,
+       	CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, CMD_CHFLAG('d'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_attach_session_exec,
@@ -58,8 +58,8 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (0);

 	if (ctx->cmdclient == NULL) {
-		if (cmd_check_flag(data->chflags, 'd')) {
-			/*
+		if (data->chflags & CMD_CHFLAG('d')) {
+			/* 
 			 * Can't use server_write_session in case attaching to
 			 * the same session as currently attached to.
 			 */
@@ -72,7 +72,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 				server_write_client(c, MSG_DETACH, NULL, 0);
 			}
 		}
-
+		
 		ctx->curclient->session = s;
 		server_redraw_client(ctx->curclient);
 	} else {
@@ -89,10 +89,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 			return (-1);
 		}

-		if (cmd_check_flag(data->chflags, 'r'))
-			ctx->cmdclient->flags |= CLIENT_READONLY;
-
-		if (cmd_check_flag(data->chflags, 'd'))
+		if (data->chflags & CMD_CHFLAG('d'))
 			server_write_session(s, MSG_DETACH, NULL, 0);

 		ctx->cmdclient->session = s;
@@ -104,7 +101,6 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 		server_redraw_client(ctx->cmdclient);
 	}
 	recalculate_sizes();
-	server_update_socket();

 	return (1);	/* 1 means don't tell command client to exit */
 }
--- a/cmd-bind-key.c
+++ b/cmd-bind-key.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-bind-key.c,v 1.29 2010-07-02 02:43:01 tcunha Exp $ */
+/* $Id: cmd-bind-key.c,v 1.25 2009-07-28 23:19:06 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -46,7 +46,7 @@ struct cmd_bind_key_data {
 const struct cmd_entry cmd_bind_key_entry = {
 	"bind-key", "bind",
 	"[-cnr] [-t key-table] key command [arguments]",
-	0, "",
+	0, 0,
 	NULL,
 	cmd_bind_key_parse,
 	cmd_bind_key_exec,
@@ -79,8 +79,7 @@ cmd_bind_key_parse(struct cmd *self, int argc, char **argv, char **cause)
 			data->can_repeat = 1;
 			break;
 		case 't':
-			if (data->tablename == NULL)
-				data->tablename = xstrdup(optarg);
+			data->tablename = xstrdup(optarg);
 			break;
 		default:
 			goto usage;
@@ -130,7 +129,7 @@ cmd_bind_key_exec(struct cmd *self, unused struct cmd_ctx *ctx)
 		return (cmd_bind_key_table(self, ctx));

 	key_bindings_add(data->key, data->can_repeat, data->cmdlist);
-	data->cmdlist->references++;
+	data->cmdlist = NULL;	/* avoid free */

 	return (0);
 }
@@ -153,7 +152,7 @@ cmd_bind_key_table(struct cmd *self, struct cmd_ctx *ctx)
 		ctx->error(ctx, "unknown command: %s", data->modecmd);
 		return (-1);
 	}
-
+	
 	mtmp.key = data->key & ~KEYC_PREFIX;
 	mtmp.mode = data->command_key ? 1 : 0;
 	if ((mbind = SPLAY_FIND(mode_key_tree, mtab->tree, &mtmp)) != NULL) {
@@ -192,17 +191,8 @@ cmd_bind_key_print(struct cmd *self, char *buf, size_t len)
 	off += xsnprintf(buf, len, "%s", self->entry->name);
 	if (data == NULL)
 		return (off);
-
-	if (off < len && data->command_key)
-		off += xsnprintf(buf + off, len - off, " -c");
-	if (off < len && !(data->key & KEYC_PREFIX))
-		off += xsnprintf(buf + off, len - off, " -n");
-	if (off < len && data->can_repeat)
-		off += xsnprintf(buf + off, len - off, " -r");
-	if (off < len && data->tablename != NULL)
-		off += cmd_prarg(buf + off, len - off, " -t ", data->tablename);
 	if (off < len) {
-		skey = key_string_lookup_key(data->key & ~KEYC_PREFIX);
+		skey = key_string_lookup_key(data->key);
 		off += xsnprintf(buf + off, len - off, " %s ", skey);
 	}
 	if (off < len)
--- a/cmd-break-pane.c
+++ b/cmd-break-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-break-pane.c,v 1.11 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-break-pane.c,v 1.9 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_break_pane_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_break_pane_entry = {
 	"break-pane", "breakp",
 	CMD_TARGET_PANE_USAGE " [-d]",
-	0, "d",
+	0, CMD_CHFLAG('d'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_break_pane_exec,
@@ -64,18 +64,18 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 		if (wl->window->active == NULL)
 			wl->window->active = TAILQ_NEXT(wp, entry);
 	}
-	layout_close_pane(wp);
+ 	layout_close_pane(wp);

-	w = wp->window = window_create1(s->sx, s->sy);
-	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
-	w->active = wp;
-	w->name = default_window_name(w);
+ 	w = wp->window = window_create1(s->sx, s->sy);
+ 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
+ 	w->active = wp;
+ 	w->name = default_window_name(w);
 	layout_init(w);

 	base_idx = options_get_number(&s->options, "base-index");
-	wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */
-	if (!cmd_check_flag(data->chflags, 'd'))
-		session_select(s, wl->idx);
+ 	wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */
+ 	if (!(data->chflags & CMD_CHFLAG('d')))
+ 		session_select(s, wl->idx);

 	server_redraw_session(s);
 	server_status_session_group(s);
--- a/cmd-capture-pane.c
+++ b/cmd-capture-pane.c
@@ -1,83 +0,0 @@
-/* $Id: cmd-capture-pane.c,v 1.3 2010-01-22 17:29:19 tcunha Exp $ */
-
-/*
- * Copyright (c) 2009 Jonathan Alvarado <radobobo@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 "tmux.h"
-
-/*
- * Write the entire contents of a pane to a buffer.
- */
-
-int	cmd_capture_pane_exec(struct cmd *, struct cmd_ctx *);
-
-const struct cmd_entry cmd_capture_pane_entry = {
-	"capture-pane", "capturep",
-	CMD_BUFFER_PANE_USAGE,
-	0, "",
-	cmd_buffer_init,
-	cmd_buffer_parse,
-	cmd_capture_pane_exec,
-	cmd_buffer_free,
-	cmd_buffer_print
-};
-
-int
-cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
-	struct cmd_buffer_data	*data = self->data;
-	struct window_pane	*wp;
-	char 			*buf, *line;
-	struct screen		*s;
-	struct session		*sess;
-	u_int			 i, limit;
-	size_t         		 len, linelen;
-
-	if (cmd_find_pane(ctx, data->target, &sess, &wp) == NULL)
-		return (-1);
-	s = &wp->base;
-
-	buf = NULL;
-	len = 0;
-
-	for (i = 0; i < screen_size_y(s); i++) {
-	       line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
-	       linelen = strlen(line);
-
-	       buf = xrealloc(buf, 1, len + linelen + 1);
-	       memcpy(buf + len, line, linelen);
-	       len += linelen;
-	       buf[len++] = '\n';
-
-	       xfree(line);
-	}
-
-	limit = options_get_number(&sess->options, "buffer-limit");
-	if (data->buffer == -1) {
-		paste_add(&sess->buffers, buf, len, limit);
-		return (0);
-	}
-	if (paste_replace(&sess->buffers, data->buffer, buf, len) != 0) {
-		ctx->error(ctx, "no buffer %d", data->buffer);
-		xfree(buf);
-		return (-1);
-	}
-	return (0);
-}
--- a/cmd-choose-buffer.c
+++ b/cmd-choose-buffer.c
@@ -1,146 +0,0 @@
-/* $Id: cmd-choose-buffer.c,v 1.1 2010-06-22 23:35:20 tcunha Exp $ */
-
-/*
- * Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <ctype.h>
-
-#include "tmux.h"
-
-/*
- * Enter choice mode to choose a buffer.
- */
-
-int	cmd_choose_buffer_exec(struct cmd *, struct cmd_ctx *);
-
-void	cmd_choose_buffer_callback(void *, int);
-void	cmd_choose_buffer_free(void *);
-
-const struct cmd_entry cmd_choose_buffer_entry = {
-	"choose-buffer", NULL,
-	CMD_TARGET_WINDOW_USAGE " [template]",
-	CMD_ARG01, "",
-	cmd_target_init,
-	cmd_target_parse,
-	cmd_choose_buffer_exec,
-	cmd_target_free,
-	cmd_target_print
-};
-
-struct cmd_choose_buffer_data {
-	struct client	*client;
-	char   		*template;
-};
-
-int
-cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
-	struct cmd_target_data		*data = self->data;
-	struct cmd_choose_buffer_data	*cdata;
-	struct session			*s;
-	struct winlink			*wl;
-	struct paste_buffer		*pb;
-	u_int				 idx;
-	char				*tmp;
-
-	if (ctx->curclient == NULL) {
-		ctx->error(ctx, "must be run interactively");
-		return (-1);
-	}
-	s = ctx->curclient->session;
-
-	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
-		return (-1);
-
-	if (paste_get_top(&s->buffers) == NULL)
-		return (0);
-
-	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
-		return (0);
-
-	idx = 0;
-	while ((pb = paste_walk_stack(&s->buffers, &idx)) != NULL) {
-		tmp = paste_print(pb, 50);
-		window_choose_add(wl->window->active, idx - 1,
-		    "%u: %zu bytes: \"%s\"", idx - 1, pb->size, tmp);
-		xfree(tmp);
-	}
-
-	cdata = xmalloc(sizeof *cdata);
-	if (data->arg != NULL)
-		cdata->template = xstrdup(data->arg);
-	else
-		cdata->template = xstrdup("paste-buffer -b '%%'");
-	cdata->client = ctx->curclient;
-	cdata->client->references++;
-
-	window_choose_ready(wl->window->active,
-	    0, cmd_choose_buffer_callback, cmd_choose_buffer_free, cdata);
-
-	return (0);
-}
-
-void
-cmd_choose_buffer_callback(void *data, int idx)
-{
-	struct cmd_choose_buffer_data	*cdata = data;
-	struct cmd_list			*cmdlist;
-	struct cmd_ctx			 ctx;
-	char				*template, *cause, tmp[16];
-
-	if (idx == -1)
-		return;
-	if (cdata->client->flags & CLIENT_DEAD)
-		return;
-
-	xsnprintf(tmp, sizeof tmp, "%u", idx);
-	template = cmd_template_replace(cdata->template, tmp, 1);
-
-	if (cmd_string_parse(template, &cmdlist, &cause) != 0) {
-		if (cause != NULL) {
-			*cause = toupper((u_char) *cause);
-			status_message_set(cdata->client, "%s", cause);
-			xfree(cause);
-		}
-		xfree(template);
-		return;
-	}
-	xfree(template);
-
-	ctx.msgdata = NULL;
-	ctx.curclient = cdata->client;
-
-	ctx.error = key_bindings_error;
-	ctx.print = key_bindings_print;
-	ctx.info = key_bindings_info;
-
-	ctx.cmdclient = NULL;
-
-	cmd_list_exec(cmdlist, &ctx);
-	cmd_list_free(cmdlist);
-}
-
-void
-cmd_choose_buffer_free(void *data)
-{
-	struct cmd_choose_buffer_data	*cdata = data;
-
-	cdata->client->references--;
-	xfree(cdata->template);
-	xfree(cdata);
-}
--- a/cmd-choose-client.c
+++ b/cmd-choose-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-client.c,v 1.4 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-choose-client.c,v 1.3 2009-09-07 23:59:19 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -34,7 +34,7 @@ void	cmd_choose_client_free(void *);
 const struct cmd_entry cmd_choose_client_entry = {
 	"choose-client", NULL,
 	CMD_TARGET_WINDOW_USAGE " [template]",
-	CMD_ARG01, "",
+	CMD_ARG01, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_choose_client_exec,
--- a/cmd-choose-session.c
+++ b/cmd-choose-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-session.c,v 1.15 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-choose-session.c,v 1.14 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -34,7 +34,7 @@ void	cmd_choose_session_free(void *);
 const struct cmd_entry cmd_choose_session_entry = {
 	"choose-session", NULL,
 	CMD_TARGET_WINDOW_USAGE " [template]",
-	CMD_ARG01, "",
+	CMD_ARG01, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_choose_session_exec,
--- a/cmd-choose-window.c
+++ b/cmd-choose-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-window.c,v 1.22 2010-06-22 23:26:18 tcunha Exp $ */
+/* $Id: cmd-choose-window.c,v 1.18 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -34,7 +34,7 @@ void	cmd_choose_window_free(void *);
 const struct cmd_entry cmd_choose_window_entry = {
 	"choose-window", NULL,
 	CMD_TARGET_WINDOW_USAGE " [template]",
-	CMD_ARG01, "",
+	CMD_ARG01, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_choose_window_exec,
@@ -81,11 +81,11 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		idx++;

 		flag = ' ';
-		if (wm->flags & WINLINK_ACTIVITY)
+		if (session_alert_has(s, wm, WINDOW_ACTIVITY))
 			flag = '#';
-		else if (wm->flags & WINLINK_BELL)
+		else if (session_alert_has(s, wm, WINDOW_BELL))
 			flag = '!';
-		else if (wm->flags & WINLINK_CONTENT)
+		else if (session_alert_has(s, wm, WINDOW_CONTENT))
 			flag = '+';
 		else if (wm == s->curw)
 			flag = '*';
@@ -101,9 +101,8 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 			left = right = "";

 		window_choose_add(wl->window->active,
-		    wm->idx, "%3d: %s%c [%ux%u] (%u panes%s)%s%s%s",
+		    wm->idx, "%3d: %s%c [%ux%u] (%u panes)%s%s%s",
 		    wm->idx, w->name, flag, w->sx, w->sy, window_count_panes(w),
-		    w->active->fd == -1 ? ", dead" : "",
 		    left, title, right);
 	}

@@ -117,10 +116,10 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	cdata->client = ctx->curclient;
 	cdata->client->references++;

-	window_choose_ready(wl->window->active,
+	window_choose_ready(wl->window->active, 
 	    cur, cmd_choose_window_callback, cmd_choose_window_free, cdata);

-	return (0);
+ 	return (0);
 }

 void
@@ -134,7 +133,7 @@ cmd_choose_window_callback(void *data, int idx)
 	if (idx == -1)
 		return;
 	if (cdata->client->flags & CLIENT_DEAD)
-		return;
+		return;	
 	if (cdata->session->flags & SESSION_DEAD)
 		return;
 	if (cdata->client->session != cdata->session)
--- a/cmd-clear-history.c
+++ b/cmd-clear-history.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-clear-history.c,v 1.8 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-clear-history.c,v 1.7 2009-07-30 21:04:40 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_clear_history_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_clear_history_entry = {
 	"clear-history", "clearhist",
 	CMD_TARGET_PANE_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_clear_history_exec,
--- a/cmd-clock-mode.c
+++ b/cmd-clock-mode.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-clock-mode.c,v 1.7 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-clock-mode.c,v 1.6 2009-08-20 11:37:46 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_clock_mode_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_clock_mode_entry = {
 	"clock-mode", NULL,
 	CMD_TARGET_PANE_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_clock_mode_exec,
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-command-prompt.c,v 1.28 2010-05-14 14:33:39 tcunha Exp $ */
+/* $Id: cmd-command-prompt.c,v 1.26 2009-09-22 14:06:40 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -39,7 +39,7 @@ void	 cmd_command_prompt_cfree(void *);
 const struct cmd_entry cmd_command_prompt_entry = {
 	"command-prompt", NULL,
 	CMD_TARGET_CLIENT_USAGE " [-p prompts] [template]",
-	0, "",
+	0, 0,
 	cmd_command_prompt_init,
 	cmd_command_prompt_parse,
 	cmd_command_prompt_exec,
@@ -81,10 +81,6 @@ cmd_command_prompt_init(struct cmd *self, int key)
 	case 'f':
 		data->template = xstrdup("find-window '%%'");
 		break;
-	case '\'':
-		data->template = xstrdup("select-window -t ':%%'");
-		data->prompts = xstrdup("index");
-		break;
 	}
 }

--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-confirm-before.c,v 1.12 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-confirm-before.c,v 1.11 2009-08-24 16:24:18 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -34,7 +34,7 @@ void	cmd_confirm_before_free(void *);
 const struct cmd_entry cmd_confirm_before_entry = {
 	"confirm-before", "confirm",
 	CMD_TARGET_CLIENT_USAGE " command",
-	CMD_ARG1, "",
+	CMD_ARG1, 0,
 	cmd_confirm_before_init,
 	cmd_target_parse,
 	cmd_confirm_before_exec,
--- a/cmd-copy-buffer.c
+++ b/cmd-copy-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-copy-buffer.c,v 1.7 2009-11-28 14:50:36 tcunha Exp $ */
+/* $Id: cmd-copy-buffer.c,v 1.5 2009-09-22 14:06:40 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -43,7 +43,7 @@ struct cmd_copy_buffer_data {
 const struct cmd_entry cmd_copy_buffer_entry = {
 	"copy-buffer", "copyb",
 	"[-a src-index] [-b dst-index] [-s src-session] [-t dst-session]",
-	0, "",
+	0, 0,
 	cmd_copy_buffer_init,
 	cmd_copy_buffer_parse,
 	cmd_copy_buffer_exec,
@@ -51,7 +51,6 @@ const struct cmd_entry cmd_copy_buffer_entry = {
 	cmd_copy_buffer_print
 };

-/* ARGSUSED */
 void
 cmd_copy_buffer_init(struct cmd *self, unused int arg)
 {
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-copy-mode.c,v 1.27 2010-04-05 05:11:42 micahcowan Exp $ */
+/* $Id: cmd-copy-mode.c,v 1.24 2009-10-06 14:14:06 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,12 +30,12 @@ int	cmd_copy_mode_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_copy_mode_entry = {
 	"copy-mode", NULL,
 	"[-u] " CMD_TARGET_PANE_USAGE,
-	0, "u",
+	0, CMD_CHFLAG('u'),
 	cmd_copy_mode_init,
 	cmd_target_parse,
 	cmd_copy_mode_exec,
 	cmd_target_free,
-	cmd_target_print
+	NULL
 };

 void
@@ -48,7 +48,7 @@ cmd_copy_mode_init(struct cmd *self, int key)

 	switch (key) {
 	case KEYC_PPAGE:
-		cmd_set_flag(&data->chflags, 'u');
+		data->chflags |= CMD_CHFLAG('u');
 		break;
 	}
 }
@@ -63,8 +63,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);

 	window_pane_set_mode(wp, &window_copy_mode);
-	window_copy_init_from_pane(wp);
-	if (wp->mode == &window_copy_mode && cmd_check_flag(data->chflags, 'u'))
+	if (wp->mode == &window_copy_mode && data->chflags & CMD_CHFLAG('u'))
 		window_copy_pageup(wp);

 	return (0);
--- a/cmd-delete-buffer.c
+++ b/cmd-delete-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-delete-buffer.c,v 1.8 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-delete-buffer.c,v 1.7 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_delete_buffer_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_delete_buffer_entry = {
 	"delete-buffer", "deleteb",
 	CMD_BUFFER_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_buffer_init,
 	cmd_buffer_parse,
 	cmd_delete_buffer_exec,
--- a/cmd-detach-client.c
+++ b/cmd-detach-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-detach-client.c,v 1.11 2010-02-08 18:27:34 tcunha Exp $ */
+/* $Id: cmd-detach-client.c,v 1.9 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_detach_client_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_detach_client_entry = {
 	"detach-client", "detach",
 	CMD_TARGET_CLIENT_USAGE,
-	CMD_READONLY, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_detach_client_exec,
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-display-message.c,v 1.7 2009-11-28 14:39:53 tcunha Exp $ */
+/* $Id: cmd-display-message.c,v 1.3 2009-10-11 23:55:26 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -30,8 +30,8 @@ int	cmd_display_message_exec(struct cmd *, struct cmd_ctx *);

 const struct cmd_entry cmd_display_message_entry = {
 	"display-message", "display",
-	"[-p] " CMD_TARGET_CLIENT_USAGE " [message]",
-	CMD_ARG01, "p",
+	CMD_TARGET_CLIENT_USAGE " [message]",
+	CMD_ARG01, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_display_message_exec,
@@ -55,11 +55,8 @@ cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
 	else
 		template = data->arg;

-	msg = status_replace(c, NULL, template, time(NULL), 0);
-	if (cmd_check_flag(data->chflags, 'p'))
-		ctx->print(ctx, "%s", msg);
-	else
-		status_message_set(c, "%s", msg);
+	msg = status_replace(c, template, time(NULL));
+	status_message_set(c, "%s", msg);
 	xfree(msg);

 	return (0);
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-display-panes.c,v 1.2 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-display-panes.c,v 1.1 2009-08-31 22:30:15 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_display_panes_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_display_panes_entry = {
 	"display-panes", "displayp",
 	CMD_TARGET_CLIENT_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_display_panes_exec,
--- a/cmd-down-pane.c
+++ b/cmd-down-pane.c
@@ -0,0 +1,59 @@
+/* $Id: cmd-down-pane.c,v 1.12 2009-07-28 22:12:16 tcunha Exp $ */
+
+/*
+ * 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"
+
+/*
+ * Move down a pane.
+ */
+
+int	cmd_down_pane_exec(struct cmd *, struct cmd_ctx *);
+
+const struct cmd_entry cmd_down_pane_entry = {
+	"down-pane", "downp",
+	CMD_TARGET_WINDOW_USAGE,
+	0, 0,
+	cmd_target_init,
+	cmd_target_parse,
+	cmd_down_pane_exec,
+	cmd_target_free,
+	cmd_target_print
+};
+
+int
+cmd_down_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct cmd_target_data	*data = self->data;
+	struct winlink		*wl;
+	struct window		*w;
+
+	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
+		return (-1);
+	w = wl->window;
+
+	do {
+		w->active = TAILQ_NEXT(w->active, entry);
+		if (w->active == NULL)
+			w->active = TAILQ_FIRST(&w->panes);
+	} while (!window_pane_visible(w->active));
+	server_status_window(wl->window);
+
+	return (0);
+}
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-find-window.c,v 1.14 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-find-window.c,v 1.13 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -34,7 +34,7 @@ void	cmd_find_window_callback(void *, int);
 const struct cmd_entry cmd_find_window_entry = {
 	"find-window", "findw",
 	CMD_TARGET_WINDOW_USAGE " match-string",
-	CMD_ARG1, "",
+	CMD_ARG1, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_find_window_exec,
--- a/cmd-generic.c
+++ b/cmd-generic.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-generic.c,v 1.38 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-generic.c,v 1.34 2009-08-26 22:13:52 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -23,8 +23,8 @@

 #include "tmux.h"

-int	cmd_getopt(int, char **, const char *, const char *);
-int	cmd_parse_flags(int, const char *, uint64_t *);
+int	cmd_getopt(int, char **, const char *, uint64_t);
+int	cmd_flags(int, uint64_t, uint64_t *);
 size_t	cmd_print_flags(char *, size_t, size_t, uint64_t);
 int	cmd_fill_argument(int, char **, char **, int, char **);

@@ -36,56 +36,54 @@ cmd_prarg(char *buf, size_t len, const char *prefix, char *arg)
 	return (xsnprintf(buf, len, "%s%s", prefix, arg));
 }

-/* Append two flag strings together and call getopt. */
+/* Prepend flags from chflags onto flagstr and call getopt. */
 int
-cmd_getopt(int argc, char **argv, const char *flagstr, const char *chflagstr)
+cmd_getopt(int argc, char **argv, const char *flagstr, uint64_t chflags)
 {
-	char	tmp[BUFSIZ];
+	u_char	ch;
+	char	buf[128];
+	size_t	len, off;

-	if (strlcpy(tmp, flagstr, sizeof tmp) >= sizeof tmp)
-		fatalx("strlcpy overflow");
-	if (strlcat(tmp, chflagstr, sizeof tmp) >= sizeof tmp)
-		fatalx("strlcat overflow");
-	return (getopt(argc, argv, tmp));
+	*buf = '\0';
+
+	len = sizeof buf;
+	off = 0;
+
+	for (ch = 0; ch < 26; ch++) {
+		if (chflags & CMD_CHFLAG('a' + ch))
+			off += xsnprintf(buf + off, len - off, "%c", 'a' + ch);
+		if (chflags & CMD_CHFLAG('A' + ch))
+			off += xsnprintf(buf + off, len - off, "%c", 'A' + ch);
+	}
+	
+	strlcat(buf, flagstr, sizeof buf);
+
+	return (getopt(argc, argv, buf));
 }

-/* Return if flag character is set. */
+/* 
+ * If this option is expected (in ichflags), set it in ochflags, otherwise
+ * return -1.
+ */
 int
-cmd_check_flag(uint64_t chflags, int flag)
+cmd_flags(int opt, uint64_t ichflags, uint64_t *ochflags)
 {
-	if (flag >= 'A' && flag <= 'Z')
-		flag = 26 + flag - 'A';
-	else if (flag >= 'a' && flag <= 'z')
-		flag = flag - 'a';
-	else
-		return (0);
-	return ((chflags & (1ULL << flag)) != 0);
+	u_char	ch;
+
+	for (ch = 0; ch < 26; ch++) {
+		if (opt == 'a' + ch && ichflags & CMD_CHFLAG(opt)) {
+			(*ochflags) |= CMD_CHFLAG(opt);
+			return (0);
+		}
+		if (opt == 'A' + ch && ichflags & CMD_CHFLAG(opt)) {
+			(*ochflags) |= CMD_CHFLAG(opt);
+			return (0);
+		}
+	}
+	return (-1);
 }

-/* Set flag character. */
-void
-cmd_set_flag(uint64_t *chflags, int flag)
-{
-	if (flag >= 'A' && flag <= 'Z')
-		flag = 26 + flag - 'A';
-	else if (flag >= 'a' && flag <= 'z')
-		flag = flag - 'a';
-	else
-		return;
-	(*chflags) |= (1ULL << flag);
-}
-
-/* If this option is expected, set it in chflags, otherwise return -1. */
-int
-cmd_parse_flags(int opt, const char *chflagstr, uint64_t *chflags)
-{
-	if (strchr(chflagstr, opt) == NULL)
-		return (-1);
-	cmd_set_flag(chflags, opt);
-	return (0);
-}
-
-/* Print the flags present in chflags. */
+/* Print the flags supported in chflags. */
 size_t
 cmd_print_flags(char *buf, size_t len, size_t off, uint64_t chflags)
 {
@@ -97,9 +95,9 @@ cmd_print_flags(char *buf, size_t len, size_t off, uint64_t chflags)
 	off += xsnprintf(buf + off, len - off, " -");

 	for (ch = 0; ch < 26; ch++) {
-		if (cmd_check_flag(chflags, 'a' + ch))
+		if (chflags & CMD_CHFLAG('a' + ch))
 			off += xsnprintf(buf + off, len - off, "%c", 'a' + ch);
-		if (cmd_check_flag(chflags, 'A' + ch))
+		if (chflags & CMD_CHFLAG('A' + ch))
 			off += xsnprintf(buf + off, len - off, "%c", 'A' + ch);
 	}
 	return (off - boff);
@@ -141,14 +139,13 @@ cmd_fill_argument(int flags, char **arg, char **arg2, int argc, char **argv)
 		if (argc == 2)
 			*arg2 = xstrdup(argv[1]);
 		return (0);
-	}
+	}		

 	if (argc != 0)
 		return (-1);
 	return (0);
 }

-/* ARGSUSED */
 void
 cmd_target_init(struct cmd *self, unused int key)
 {
@@ -173,7 +170,7 @@ cmd_target_parse(struct cmd *self, int argc, char **argv, char **cause)
 	data = self->data;

 	while ((opt = cmd_getopt(argc, argv, "t:", entry->chflags)) != -1) {
-		if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0)
+		if (cmd_flags(opt, entry->chflags, &data->chflags) == 0)
 			continue;
 		switch (opt) {
 		case 't':
@@ -225,14 +222,13 @@ cmd_target_print(struct cmd *self, char *buf, size_t len)
 	off += cmd_print_flags(buf, len, off, data->chflags);
 	if (off < len && data->target != NULL)
 		off += cmd_prarg(buf + off, len - off, " -t ", data->target);
-	if (off < len && data->arg != NULL)
+ 	if (off < len && data->arg != NULL)
 		off += cmd_prarg(buf + off, len - off, " ", data->arg);
-	if (off < len && data->arg2 != NULL)
+ 	if (off < len && data->arg2 != NULL)
 		off += cmd_prarg(buf + off, len - off, " ", data->arg2);
 	return (off);
 }

-/* ARGSUSED */
 void
 cmd_srcdst_init(struct cmd *self, unused int key)
 {
@@ -257,7 +253,7 @@ cmd_srcdst_parse(struct cmd *self, int argc, char **argv, char **cause)
 	data = self->data;

 	while ((opt = cmd_getopt(argc, argv, "s:t:", entry->chflags)) != -1) {
-		if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0)
+		if (cmd_flags(opt, entry->chflags, &data->chflags) == 0)
 			continue;
 		switch (opt) {
 		case 's':
@@ -317,14 +313,13 @@ cmd_srcdst_print(struct cmd *self, char *buf, size_t len)
 		off += xsnprintf(buf + off, len - off, " -s %s", data->src);
 	if (off < len && data->dst != NULL)
 		off += xsnprintf(buf + off, len - off, " -t %s", data->dst);
-	if (off < len && data->arg != NULL)
+ 	if (off < len && data->arg != NULL)
 		off += cmd_prarg(buf + off, len - off, " ", data->arg);
-	if (off < len && data->arg2 != NULL)
+ 	if (off < len && data->arg2 != NULL)
 		off += cmd_prarg(buf + off, len - off, " ", data->arg2);
 	return (off);
 }

-/* ARGSUSED */
 void
 cmd_buffer_init(struct cmd *self, unused int key)
 {
@@ -350,7 +345,7 @@ cmd_buffer_parse(struct cmd *self, int argc, char **argv, char **cause)
 	data = self->data;

 	while ((opt = cmd_getopt(argc, argv, "b:t:", entry->chflags)) != -1) {
-		if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0)
+		if (cmd_flags(opt, entry->chflags, &data->chflags) == 0)
 			continue;
 		switch (opt) {
 		case 'b':
@@ -415,9 +410,9 @@ cmd_buffer_print(struct cmd *self, char *buf, size_t len)
 		off += xsnprintf(buf + off, len - off, " -b %d", data->buffer);
 	if (off < len && data->target != NULL)
 		off += cmd_prarg(buf + off, len - off, " -t ", data->target);
-	if (off < len && data->arg != NULL)
+ 	if (off < len && data->arg != NULL)
 		off += cmd_prarg(buf + off, len - off, " ", data->arg);
-	if (off < len && data->arg2 != NULL)
+ 	if (off < len && data->arg2 != NULL)
 		off += cmd_prarg(buf + off, len - off, " ", data->arg2);
 	return (off);
 }
--- a/cmd-has-session.c
+++ b/cmd-has-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-has-session.c,v 1.15 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-has-session.c,v 1.14 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_has_session_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_has_session_entry = {
 	"has-session", "has",
 	CMD_TARGET_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_has_session_exec,
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-if-shell.c,v 1.9 2010-07-17 14:36:40 tcunha Exp $ */
+/* $Id: cmd-if-shell.c,v 1.7 2009-11-02 21:38:26 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -36,7 +36,7 @@ void	cmd_if_shell_free(void *);
 const struct cmd_entry cmd_if_shell_entry = {
 	"if-shell", "if",
 	"shell-command command",
-	CMD_ARG2, "",
+	CMD_ARG2, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_if_shell_exec,
@@ -104,13 +104,10 @@ cmd_if_shell_free(void *data)
 {
 	struct cmd_if_shell_data	*cdata = data;
 	struct cmd_ctx			*ctx = &cdata->ctx;
-	struct msg_exit_data		 exitdata;

 	if (ctx->cmdclient != NULL) {
 		ctx->cmdclient->references--;
-		exitdata.retcode = ctx->cmdclient->retcode;
-		server_write_client(
-		    ctx->cmdclient, MSG_EXIT, &exitdata, sizeof exitdata);
+		server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0);
 	}
 	if (ctx->curclient != NULL)
 		ctx->curclient->references--;
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -1,257 +0,0 @@
-/* $Id: cmd-join-pane.c,v 1.4 2010-04-09 07:09:37 micahcowan Exp $ */
-
-/*
- * 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 <unistd.h>
-
-#include "tmux.h"
-
-/*
- * Join a pane into another (like split/swap/kill).
- */
-
-int	cmd_join_pane_parse(struct cmd *, int, char **, char **);
-int	cmd_join_pane_exec(struct cmd *, struct cmd_ctx *);
-void	cmd_join_pane_free(struct cmd *);
-void	cmd_join_pane_init(struct cmd *, int);
-size_t	cmd_join_pane_print(struct cmd *, char *, size_t);
-
-struct cmd_join_pane_data {
-	char	*src;
-	char	*dst;
-	int	 flag_detached;
-	int	 flag_horizontal;
-	int	 percentage;
-	int	 size;
-};
-
-const struct cmd_entry cmd_join_pane_entry = {
-	"join-pane", "joinp",
-	"[-dhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane] [command]",
-	0, "",
-	cmd_join_pane_init,
-	cmd_join_pane_parse,
-	cmd_join_pane_exec,
-	cmd_join_pane_free,
-	cmd_join_pane_print
-};
-
-void
-cmd_join_pane_init(struct cmd *self, int key)
-{
-	struct cmd_join_pane_data	 *data;
-
-	self->data = data = xmalloc(sizeof *data);
-	data->src = NULL;
-	data->dst = NULL;
-	data->flag_detached = 0;
-	data->flag_horizontal = 0;
-	data->percentage = -1;
-	data->size = -1;
-
-	switch (key) {
-	case '%':
-		data->flag_horizontal = 1;
-		break;
-	case '"':
-		data->flag_horizontal = 0;
-		break;
-	}
-}
-
-int
-cmd_join_pane_parse(struct cmd *self, int argc, char **argv, char **cause)
-{
-	struct cmd_join_pane_data	*data;
-	int				 opt;
-	const char			*errstr;
-
-	self->entry->init(self, KEYC_NONE);
-	data = self->data;
-
-	while ((opt = getopt(argc, argv, "dhl:p:s:t:v")) != -1) {
-		switch (opt) {
-		case 'd':
-			data->flag_detached = 1;
-			break;
-		case 'h':
-			data->flag_horizontal = 1;
-			break;
-		case 's':
-			if (data->src == NULL)
-				data->src = xstrdup(optarg);
-			break;
-		case 't':
-			if (data->dst == NULL)
-				data->dst = xstrdup(optarg);
-			break;
-		case 'l':
-			if (data->percentage != -1 || data->size != -1)
-				break;
-			data->size = strtonum(optarg, 1, INT_MAX, &errstr);
-			if (errstr != NULL) {
-				xasprintf(cause, "size %s", errstr);
-				goto error;
-			}
-			break;
-		case 'p':
-			if (data->size != -1 || data->percentage != -1)
-				break;
-			data->percentage = strtonum(optarg, 1, 100, &errstr);
-			if (errstr != NULL) {
-				xasprintf(cause, "percentage %s", errstr);
-				goto error;
-			}
-			break;
-		case 'v':
-			data->flag_horizontal = 0;
-			break;
-		default:
-			goto usage;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-	if (argc != 0)
-		goto usage;
-
-	return (0);
-
-usage:
-	xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
-
-error:
-	self->entry->free(self);
-	return (-1);
-}
-
-int
-cmd_join_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
-	struct cmd_join_pane_data	*data = self->data;
-	struct session			*dst_s;
-	struct winlink			*src_wl, *dst_wl;
-	struct window			*src_w, *dst_w;
-	struct window_pane		*src_wp, *dst_wp;
-	int				 size, dst_idx;
-	enum layout_type		 type;
-	struct layout_cell		*lc;
-
-	if ((dst_wl = cmd_find_pane(ctx, data->dst, &dst_s, &dst_wp)) == NULL)
-		return (-1);
-	dst_w = dst_wl->window;
-	dst_idx = dst_wl->idx;
-
-	if ((src_wl = cmd_find_pane(ctx, data->src, NULL, &src_wp)) == NULL)
-		return (-1);
-	src_w = src_wl->window;
-
-	if (src_w == dst_w) {
-		ctx->error(ctx, "can't join a pane to its own window");
-		return (-1);
-	}
-
-	type = LAYOUT_TOPBOTTOM;
-	if (data->flag_horizontal)
-		type = LAYOUT_LEFTRIGHT;
-
-	size = -1;
-	if (data->size != -1)
-		size = data->size;
-	else if (data->percentage != -1) {
-		if (type == LAYOUT_TOPBOTTOM)
-			size = (dst_wp->sy * data->percentage) / 100;
-		else
-			size = (dst_wp->sx * data->percentage) / 100;
-	}
-
-	if ((lc = layout_split_pane(dst_wp, type, size)) == NULL) {
-		ctx->error(ctx, "create pane failed: pane too small");
-		return (-1);
-	}
-
-	layout_close_pane(src_wp);
-
-	if (src_w->active == 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);
-
-	src_wp->window = dst_w;
-	TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry);
-	layout_assign_pane(lc, src_wp);
-
-	recalculate_sizes();
-
-	server_redraw_window(src_w);
-	server_redraw_window(dst_w);
-
-	if (!data->flag_detached) {
-		window_set_active_pane(dst_w, src_wp);
-		session_select(dst_s, dst_idx);
-		server_redraw_session(dst_s);
-	} else
-		server_status_session(dst_s);
-
-	return (0);
-}
-
-void
-cmd_join_pane_free(struct cmd *self)
-{
-	struct cmd_join_pane_data	*data = self->data;
-
-	if (data->src != NULL)
-		xfree(data->src);
-	if (data->dst != NULL)
-		xfree(data->dst);
-	xfree(data);
-}
-
-size_t
-cmd_join_pane_print(struct cmd *self, char *buf, size_t len)
-{
-	struct cmd_join_pane_data	*data = self->data;
-	size_t				 off = 0;
-
-	off += xsnprintf(buf, len, "%s", self->entry->name);
-	if (data == NULL)
-		return (off);
-	if (off < len && data->flag_detached)
-		off += xsnprintf(buf + off, len - off, " -d");
-	if (off < len && data->flag_horizontal)
-		off += xsnprintf(buf + off, len - off, " -h");
-	if (off < len && data->size > 0)
-		off += xsnprintf(buf + off, len - off, " -l %d", data->size);
-	if (off < len && data->percentage > 0) {
-		off += xsnprintf(
-		    buf + off, len - off, " -p %d", data->percentage);
-	}
-	if (off < len && data->src != NULL)
-		off += cmd_prarg(buf + off, len - off, " -s ", data->src);
-	if (off < len && data->dst != NULL)
-		off += cmd_prarg(buf + off, len - off, " -t ", data->dst);
-	return (off);
-}
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-kill-pane.c,v 1.15 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-kill-pane.c,v 1.14 2009-10-25 10:41:03 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_kill_pane_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_kill_pane_entry = {
 	"kill-pane", "killp",
 	"[-a] " CMD_TARGET_PANE_USAGE,
-	0, "a",
+	0, CMD_CHFLAG('a'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_kill_pane_exec,
@@ -56,7 +56,7 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (0);
 	}

-	if (cmd_check_flag(data->chflags, 'a')) {
+	if (data->chflags & CMD_CHFLAG('a')) {
 		loopwp = TAILQ_FIRST(&wl->window->panes);
 		while (loopwp != NULL) {
 			nextwp = TAILQ_NEXT(loopwp, entry);
--- a/cmd-kill-server.c
+++ b/cmd-kill-server.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-kill-server.c,v 1.11 2009-11-28 14:50:36 tcunha Exp $ */
+/* $Id: cmd-kill-server.c,v 1.8 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ int	cmd_kill_server_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_kill_server_entry = {
 	"kill-server", NULL,
 	"",
-	0, "",
+	0, 0,
 	NULL,
 	NULL,
 	cmd_kill_server_exec,
@@ -40,11 +40,10 @@ const struct cmd_entry cmd_kill_server_entry = {
 	NULL
 };

-/* ARGSUSED */
 int
 cmd_kill_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
-	kill(getpid(), SIGTERM);
+	sigterm = 1;

 	return (0);
 }
--- a/cmd-kill-session.c
+++ b/cmd-kill-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-kill-session.c,v 1.18 2010-07-02 02:43:50 tcunha Exp $ */
+/* $Id: cmd-kill-session.c,v 1.15 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ int	cmd_kill_session_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_kill_session_entry = {
 	"kill-session", NULL,
 	CMD_TARGET_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_kill_session_exec,
@@ -45,11 +45,21 @@ cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data	*data = self->data;
 	struct session		*s;
+ 	struct client		*c;
+	u_int			 i;

 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
 		return (-1);

-	server_destroy_session(s);
+	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+		c = ARRAY_ITEM(&clients, i);
+		if (c != NULL && c->session == s) {
+			c->session = NULL;
+			server_write_client(c, MSG_EXIT, NULL, 0);
+		}
+	}
+	recalculate_sizes();
+
 	session_destroy(s);

 	return (0);
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-kill-window.c,v 1.21 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-kill-window.c,v 1.20 2009-09-20 22:15:32 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_kill_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_kill_window_entry = {
 	"kill-window", "killw",
 	CMD_TARGET_WINDOW_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_kill_window_exec,
--- a/cmd-last-window.c
+++ b/cmd-last-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-last-window.c,v 1.19 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-last-window.c,v 1.18 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_last_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_last_window_entry = {
 	"last-window", "last",
 	CMD_TARGET_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_last_window_exec,
--- a/cmd-link-window.c
+++ b/cmd-link-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-link-window.c,v 1.36 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-link-window.c,v 1.35 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_link_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_link_window_entry = {
 	"link-window", "linkw",
 	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
-	0, "dk",
+	0, CMD_CHFLAG('d')|CMD_CHFLAG('k'),
 	cmd_srcdst_init,
 	cmd_srcdst_parse,
 	cmd_link_window_exec,
@@ -53,8 +53,8 @@ cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2)
 		return (-1);

-	kflag = cmd_check_flag(data->chflags, 'k');
-	dflag = cmd_check_flag(data->chflags, 'd');
+	kflag = data->chflags & CMD_CHFLAG('k');
+	dflag = data->chflags & CMD_CHFLAG('d');
 	if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
 		ctx->error(ctx, "can't link window: %s", cause);
 		xfree(cause);
--- a/cmd-list-buffers.c
+++ b/cmd-list-buffers.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-buffers.c,v 1.16 2010-06-22 23:35:20 tcunha Exp $ */
+/* $Id: cmd-list-buffers.c,v 1.12 2009-09-07 23:48:54 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_list_buffers_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_list_buffers_entry = {
 	"list-buffers", "lsb",
 	CMD_TARGET_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_list_buffers_exec,
@@ -46,17 +46,32 @@ cmd_list_buffers_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session		*s;
 	struct paste_buffer	*pb;
 	u_int			 idx;
-	char			*tmp;
+	char			 tmp[51 * 4 + 1];
+	size_t			 size, len;

 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
 		return (-1);

 	idx = 0;
 	while ((pb = paste_walk_stack(&s->buffers, &idx)) != NULL) {
-		tmp = paste_print(pb, 50);
-		ctx->print(ctx,
-		    "%u: %zu bytes: \"%s\"", idx - 1, pb->size, tmp);
-		xfree(tmp);
+		size = pb->size;
+
+		/* Translate the first 50 characters. */
+		len = size;
+		if (len > 50)
+			len = 50;
+		strvisx(tmp, pb->data, len, VIS_OCTAL|VIS_TAB|VIS_NL);
+
+		/*
+		 * If the first 50 characterswere encoded as a longer string,
+		 * or there is definitely more data, add "...".
+		 */
+		if (size > 50 || strlen(tmp) > 50) {
+			tmp[50 - 3] = '\0';
+			strlcat(tmp, "...", sizeof tmp);
+		}
+		
+		ctx->print(ctx, "%u: %zu bytes: \"%s\"", idx - 1, size, tmp);
 	}

 	return (0);
--- a/cmd-list-clients.c
+++ b/cmd-list-clients.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-clients.c,v 1.20 2009-11-28 14:50:36 tcunha Exp $ */
+/* $Id: cmd-list-clients.c,v 1.18 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ int	cmd_list_clients_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_list_clients_entry = {
 	"list-clients", "lsc",
 	"",
-	0, "",
+	0, 0,
 	NULL,
 	NULL,
 	cmd_list_clients_exec,
@@ -40,7 +40,6 @@ const struct cmd_entry cmd_list_clients_entry = {
 	NULL
 };

-/* ARGSUSED */
 int
 cmd_list_clients_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
--- a/cmd-list-commands.c
+++ b/cmd-list-commands.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-commands.c,v 1.7 2009-11-28 14:50:36 tcunha Exp $ */
+/* $Id: cmd-list-commands.c,v 1.5 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_list_commands_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_list_commands_entry = {
 	"list-commands", "lscm",
 	"",
-	0, "",
+	0, 0,
 	NULL,
 	NULL,
 	cmd_list_commands_exec,
@@ -37,7 +37,6 @@ const struct cmd_entry cmd_list_commands_entry = {
 	NULL
 };

-/* ARGSUSED */
 int
 cmd_list_commands_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-keys.c,v 1.24 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-list-keys.c,v 1.20 2009-07-28 23:19:06 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,7 +33,7 @@ int	cmd_list_keys_table(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_list_keys_entry = {
 	"list-keys", "lsk",
 	"[-t key-table]",
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_list_keys_exec,
@@ -47,8 +47,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct cmd_target_data	*data = self->data;
 	struct key_binding	*bd;
 	const char		*key;
-	char			 tmp[BUFSIZ];
-	size_t			 used;
+	char			 tmp[BUFSIZ], keytmp[64];
 	int			 width, keywidth;

 	if (data->target != NULL)
@@ -71,17 +70,14 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
 		key = key_string_lookup_key(bd->key & ~KEYC_PREFIX);
 		if (key == NULL)
 			continue;
-		used = xsnprintf(tmp, sizeof tmp, "%*s: ", width, key);
-		if (used >= sizeof tmp)
-			continue;

+		*tmp = '\0';
+		cmd_list_print(bd->cmdlist, tmp, sizeof tmp);
 		if (!(bd->key & KEYC_PREFIX)) {
-			used = strlcat(tmp, "(no prefix) ", sizeof tmp);
-			if (used >= sizeof tmp)
-				continue;
+			xsnprintf(keytmp, sizeof keytmp, "[%s]", key);
+			key = keytmp;
 		}
-		cmd_list_print(bd->cmdlist, tmp + used, (sizeof tmp) - used);
-		ctx->print(ctx, "%s", tmp);
+		ctx->print(ctx, "%*s: %s", width, key, tmp);
 	}

 	return (0);
--- a/cmd-list-panes.c
+++ b/cmd-list-panes.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-panes.c,v 1.4 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-list-panes.c,v 1.2 2009-10-15 20:10:28 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -23,7 +23,7 @@
 #include "tmux.h"

 /*
- * List panes on given window.
+ * List panes on given window..
 */

 int	cmd_list_panes_exec(struct cmd *, struct cmd_ctx *);
@@ -31,7 +31,7 @@ int	cmd_list_panes_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_list_panes_entry = {
 	"list-panes", "lsp",
 	CMD_TARGET_WINDOW_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_list_panes_exec,
@@ -56,7 +56,7 @@ cmd_list_panes_exec(struct cmd *self, struct cmd_ctx *ctx)
 	n = 0;
 	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
 		gd = wp->base.grid;
-
+		
 		size = 0;
 		for (i = 0; i < gd->hsize; i++) {
 			gl = &gd->linedata[i];
@@ -64,7 +64,7 @@ cmd_list_panes_exec(struct cmd *self, struct cmd_ctx *ctx)
 			size += gl->utf8size * sizeof *gl->utf8data;
 		}
 		size += gd->hsize * sizeof *gd->linedata;
-
+		
 		ctx->print(ctx, "%u: [%ux%u] [history %u/%u, %llu bytes]",
 		    n, wp->sx, wp->sy, gd->hsize, gd->hlimit, size);
 		n++;
--- a/cmd-list-sessions.c
+++ b/cmd-list-sessions.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-sessions.c,v 1.25 2009-11-28 14:50:36 tcunha Exp $ */
+/* $Id: cmd-list-sessions.c,v 1.23 2009-11-04 22:42:31 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_list_sessions_exec(struct cmd *, struct cmd_ctx *);

 const struct cmd_entry cmd_list_sessions_entry = {
 	"list-sessions", "ls", "",
-	0, "",
+	0, 0,
 	NULL,
 	NULL,
 	cmd_list_sessions_exec,
@@ -39,7 +39,6 @@ const struct cmd_entry cmd_list_sessions_entry = {
 	NULL
 };

-/* ARGSUSED */
 int
 cmd_list_sessions_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-windows.c,v 1.43 2010-07-02 02:54:52 tcunha Exp $ */
+/* $Id: cmd-list-windows.c,v 1.41 2009-10-12 00:08:12 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_list_windows_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_list_windows_entry = {
 	"list-windows", "lsw",
 	CMD_TARGET_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_list_windows_exec,
@@ -45,7 +45,6 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct cmd_target_data	*data = self->data;
 	struct session		*s;
 	struct winlink		*wl;
-	char			*layout;

 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
 		return (-1);
@@ -53,9 +52,6 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 	RB_FOREACH(wl, winlinks, &s->windows) {
 		ctx->print(ctx, "%d: %s [%ux%u]",
 		    wl->idx, wl->window->name, wl->window->sx, wl->window->sy);
-		layout = layout_dump(wl->window);
-		ctx->print(ctx, "    layout: %s", layout);
-		xfree(layout);
 	}

 	return (0);
--- a/cmd-list.c
+++ b/cmd-list.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list.c,v 1.9 2010-07-02 02:43:01 tcunha Exp $ */
+/* $Id: cmd-list.c,v 1.6 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,8 +32,7 @@ cmd_list_parse(int argc, char **argv, char **cause)
 	char	       **new_argv;

 	cmdlist = xmalloc(sizeof *cmdlist);
-	cmdlist->references = 1;
-	TAILQ_INIT(&cmdlist->list);
+	TAILQ_INIT(cmdlist);

 	lastsplit = 0;
 	for (i = 0; i < argc; i++) {
@@ -55,7 +54,7 @@ cmd_list_parse(int argc, char **argv, char **cause)
 		cmd = cmd_parse(new_argc, new_argv, cause);
 		if (cmd == NULL)
 			goto bad;
-		TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
+		TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);

 		lastsplit = i + 1;
 	}
@@ -64,7 +63,7 @@ cmd_list_parse(int argc, char **argv, char **cause)
 		cmd = cmd_parse(argc - lastsplit, argv + lastsplit, cause);
 		if (cmd == NULL)
 			goto bad;
-		TAILQ_INSERT_TAIL(&cmdlist->list, cmd, qentry);
+		TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
 	}

 	return (cmdlist);
@@ -78,36 +77,13 @@ int
 cmd_list_exec(struct cmd_list *cmdlist, struct cmd_ctx *ctx)
 {
 	struct cmd	*cmd;
-	int		 n, retval;
+	int		 n;

-	retval = 0;
-	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
-		if ((n = cmd_exec(cmd, ctx)) == -1)
-			return (-1);
-
-		/*
-		 * A 1 return value means the command client is being attached
-		 * (sent MSG_READY).
-		 */
-		if (n == 1) {
-			retval = 1;
-
-			/*
-			 * The command client has been attached, so mangle the
-			 * context to treat any following commands as if they
-			 * were called from inside.
-			 */
-			if (ctx->curclient == NULL) {
-				ctx->curclient = ctx->cmdclient;
-				ctx->cmdclient = NULL;
-
-				ctx->error = key_bindings_error;
-				ctx->print = key_bindings_print;
-				ctx->info = key_bindings_info;
-			}
-		}
+	TAILQ_FOREACH(cmd, cmdlist, qentry) {
+		if ((n = cmd_exec(cmd, ctx)) != 0)
+			return (n);
 	}
-	return (retval);
+	return (0);
 }

 void
@@ -115,12 +91,9 @@ cmd_list_free(struct cmd_list *cmdlist)
 {
 	struct cmd	*cmd;

-	if (--cmdlist->references != 0)
-		return;
-
-	while (!TAILQ_EMPTY(&cmdlist->list)) {
-		cmd = TAILQ_FIRST(&cmdlist->list);
-		TAILQ_REMOVE(&cmdlist->list, cmd, qentry);
+	while (!TAILQ_EMPTY(cmdlist)) {
+		cmd = TAILQ_FIRST(cmdlist);
+		TAILQ_REMOVE(cmdlist, cmd, qentry);
 		cmd_free(cmd);
 	}
 	xfree(cmdlist);
@@ -133,7 +106,7 @@ cmd_list_print(struct cmd_list *cmdlist, char *buf, size_t len)
 	size_t		 off;

 	off = 0;
-	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
+	TAILQ_FOREACH(cmd, cmdlist, qentry) {
 		if (off >= len)
 			break;
 		off += cmd_print(cmd, buf + off, len - off);
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-load-buffer.c,v 1.16 2010-07-02 02:52:13 tcunha Exp $ */
+/* $Id: cmd-load-buffer.c,v 1.11 2009-10-28 23:10:05 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -17,9 +17,9 @@
 */

 #include <sys/types.h>
+#include <sys/stat.h>

 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -35,7 +35,7 @@ int	cmd_load_buffer_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_load_buffer_entry = {
 	"load-buffer", "loadb",
 	CMD_BUFFER_SESSION_USAGE " path",
-	CMD_ARG1, "",
+	CMD_ARG1, 0,
 	cmd_buffer_init,
 	cmd_buffer_parse,
 	cmd_load_buffer_exec,
@@ -48,71 +48,54 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_buffer_data	*data = self->data;
 	struct session		*s;
-	FILE			*f, *close_f;
-	char		      	*pdata, *new_pdata;
-	size_t			 psize;
+	struct stat		 sb;
+	FILE			*f;
+	u_char		      	*buf;
 	u_int			 limit;
-	int			 ch;

 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
 		return (-1);

-	if (strcmp(data->arg, "-") == 0 ) {
-		if (ctx->cmdclient == NULL) {
-			ctx->error(ctx, "%s: can't read from stdin", data->arg);
-			return (-1);
-		}
-		f = ctx->cmdclient->stdin_file;
-		if (isatty(fileno(ctx->cmdclient->stdin_file))) {
-			ctx->error(ctx, "%s: stdin is a tty", data->arg);
-			return (-1);
-		}
-		close_f = NULL;
-	} else {
-		if ((f = fopen(data->arg, "rb")) == NULL) {
-			ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
-			return (-1);
-		}
-		close_f = f;
+	if ((f = fopen(data->arg, "rb")) == NULL) {
+		ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
+		return (-1);
 	}

-	pdata = NULL;
-	psize = 0;
-	while ((ch = getc(f)) != EOF) {
-		/* Do not let the server die due to memory exhaustion. */
-		if ((new_pdata = realloc(pdata, psize + 2)) == NULL) {
-			ctx->error(ctx, "realloc error: %s", strerror(errno));
-			goto error;
-		}
-		pdata = new_pdata;
-		pdata[psize++] = ch;
+	if (fstat(fileno(f), &sb) < 0) {
+		ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
+		fclose(f);
+		return (-1);
 	}
-	if (ferror(f)) {
-		ctx->error(ctx, "%s: read error", data->arg);
-		goto error;
-	}
-	if (pdata != NULL)
-		pdata[psize] = '\0';

-	if (close_f != NULL)
-		fclose(close_f);
+	/*
+	 * We don't want to die due to memory exhaustion, hence xmalloc can't
+	 * be used here.
+	 */
+	if ((buf = malloc(sb.st_size + 1)) == NULL) {
+		ctx->error(ctx, "malloc error: %s", strerror(errno));
+		fclose(f);
+		return (-1);
+	}
+
+	if (fread(buf, 1, sb.st_size, f) != (size_t) sb.st_size) {
+		ctx->error(ctx, "%s: fread error", data->arg);
+		xfree(buf);
+		fclose(f);
+		return (-1);
+	}
+
+	fclose(f);

 	limit = options_get_number(&s->options, "buffer-limit");
 	if (data->buffer == -1) {
-		paste_add(&s->buffers, pdata, psize, limit);
+		paste_add(&s->buffers, buf, sb.st_size, limit);
 		return (0);
 	}
-	if (paste_replace(&s->buffers, data->buffer, pdata, psize) != 0) {
+	if (paste_replace(&s->buffers, data->buffer, buf, sb.st_size) != 0) {
 		ctx->error(ctx, "no buffer %d", data->buffer);
-		goto error;
+		xfree(buf);
+		return (-1);
 	}

 	return (0);
-
-error:
-	if (pdata != NULL)
-		xfree(pdata);
-	if (close_f != NULL)
-		fclose(close_f);
-	return (-1);
 }
--- a/cmd-lock-client.c
+++ b/cmd-lock-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-lock-client.c,v 1.2 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-lock-client.c,v 1.1 2009-09-25 17:51:39 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_lock_client_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_lock_client_entry = {
 	"lock-client", "lockc",
 	CMD_TARGET_CLIENT_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_lock_client_exec,
--- a/cmd-lock-server.c
+++ b/cmd-lock-server.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-lock-server.c,v 1.9 2009-11-28 14:50:36 tcunha Exp $ */
+/* $Id: cmd-lock-server.c,v 1.7 2009-09-25 17:47:42 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,7 +33,7 @@ int	cmd_lock_server_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_lock_server_entry = {
 	"lock-server", "lock",
 	"",
-	0, "",
+	0, 0,
 	NULL,
 	NULL,
 	cmd_lock_server_exec,
@@ -41,7 +41,6 @@ const struct cmd_entry cmd_lock_server_entry = {
 	NULL,
 };

-/* ARGSUSED */
 int
 cmd_lock_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
--- a/cmd-lock-session.c
+++ b/cmd-lock-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-lock-session.c,v 1.2 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-lock-session.c,v 1.1 2009-09-25 17:51:39 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_lock_session_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_lock_session_entry = {
 	"lock-session", "locks",
 	CMD_TARGET_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_lock_session_exec,
--- a/cmd-move-window.c
+++ b/cmd-move-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-move-window.c,v 1.13 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-move-window.c,v 1.12 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_move_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_move_window_entry = {
 	"move-window", "movew",
 	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
-	0, "dk",
+	0, CMD_CHFLAG('d')|CMD_CHFLAG('k'),
 	cmd_srcdst_init,
 	cmd_srcdst_parse,
 	cmd_move_window_exec,
@@ -53,8 +53,8 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2)
 		return (-1);

-	kflag = cmd_check_flag(data->chflags, 'k');
-	dflag = cmd_check_flag(data->chflags, 'd');
+	kflag = data->chflags & CMD_CHFLAG('k');
+	dflag = data->chflags & CMD_CHFLAG('d');
 	if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
 		ctx->error(ctx, "can't move window: %s", cause);
 		xfree(cause);
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.78 2010-07-02 02:49:19 tcunha Exp $ */
+/* $Id: cmd-new-session.c,v 1.69 2009-10-12 00:49:06 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,10 +18,8 @@

 #include <sys/types.h>

-#include <pwd.h>
 #include <string.h>
 #include <termios.h>
-#include <unistd.h>

 #include "tmux.h"

@@ -46,7 +44,7 @@ struct cmd_new_session_data {
 const struct cmd_entry cmd_new_session_entry = {
 	"new-session", "new",
 	"[-d] [-n window-name] [-s session-name] [-t target-session] [command]",
-	CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON, "",
+	CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON, 0,
 	cmd_new_session_init,
 	cmd_new_session_parse,
 	cmd_new_session_exec,
@@ -54,7 +52,6 @@ const struct cmd_entry cmd_new_session_entry = {
 	cmd_new_session_print
 };

-/* ARGSUSED */
 void
 cmd_new_session_init(struct cmd *self, unused int arg)
 {
@@ -124,14 +121,12 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct cmd_new_session_data	*data = self->data;
 	struct session			*s, *groupwith;
 	struct window			*w;
-	struct window_pane		*wp;
 	struct environ			 env;
 	struct termios			 tio, *tiop;
-	struct passwd			*pw;
-	const char			*update, *cwd;
-	char				*overrides, *cmd, *cause;
+	const char			*update;
+	char				*overrides, *cmd, *cwd, *cause;
 	int				 detached, idx;
-	u_int				 sx, sy, i;
+	u_int				 sx, sy;

 	if (data->newname != NULL && session_find(data->newname) != NULL) {
 		ctx->error(ctx, "duplicate session: %s", data->newname);
@@ -188,8 +183,8 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 			ctx->error(ctx, "not a terminal");
 			return (-1);
 		}
-
-		overrides =
+		
+		overrides = 
 		    options_get_string(&global_s_options, "terminal-overrides");
 		if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
 			ctx->error(ctx, "open terminal failed: %s", cause);
@@ -201,13 +196,8 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	/* Get the new session working directory. */
 	if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
 		cwd = ctx->cmdclient->cwd;
-	else {
-		pw = getpwuid(getuid());
-		if (pw->pw_dir != NULL && *pw->pw_dir != '\0')
-			cwd = pw->pw_dir;
-		else
-			cwd = "/";
-	}
+	else
+		cwd = options_get_string(&global_s_options, "default-path");

 	/* Find new session size. */
 	if (detached) {
@@ -276,34 +266,17 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	 * 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 (!detached) {
 		if (ctx->cmdclient != NULL) {
 			server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
-			ctx->cmdclient->session = s;
+ 			ctx->cmdclient->session = s;
 			server_redraw_client(ctx->cmdclient);
 		} else {
-			ctx->curclient->session = s;
+ 			ctx->curclient->session = s;
 			server_redraw_client(ctx->curclient);
 		}
 	}
 	recalculate_sizes();
-	server_update_socket();
-
-	/*
-	 * If there are still configuration file errors to display, put the new
-	 * session's current window into more mode and display them now.
-	 */
-	if (cfg_finished && !ARRAY_EMPTY(&cfg_causes)) {
-		wp = s->curw->window->active;
-		window_pane_set_mode(wp, &window_copy_mode);
-		window_copy_init_for_output(wp);
-		for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
-			cause = ARRAY_ITEM(&cfg_causes, i);
-			window_copy_add(wp, "%s", cause);
-			xfree(cause);
-		}
-		ARRAY_FREE(&cfg_causes);
-	}

 	return (!detached);	/* 1 means don't tell command client to exit */
 }
@@ -333,12 +306,10 @@ cmd_new_session_print(struct cmd *self, char *buf, size_t len)
 		return (off);
 	if (off < len && data->flag_detached)
 		off += xsnprintf(buf + off, len - off, " -d");
-	if (off < len && data->winname != NULL)
-		off += cmd_prarg(buf + off, len - off, " -n ", data->winname);
 	if (off < len && data->newname != NULL)
 		off += cmd_prarg(buf + off, len - off, " -s ", data->newname);
-	if (off < len && data->target != NULL)
-		off += cmd_prarg(buf + off, len - off, " -t ", data->target);
+	if (off < len && data->winname != NULL)
+		off += cmd_prarg(buf + off, len - off, " -n ", data->winname);
 	if (off < len && data->cmd != NULL)
 		off += cmd_prarg(buf + off, len - off, " ", data->cmd);
 	return (off);
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-window.c,v 1.47 2010-07-02 02:49:19 tcunha Exp $ */
+/* $Id: cmd-new-window.c,v 1.39 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -36,15 +36,14 @@ struct cmd_new_window_data {
 	char	*target;
 	char	*name;
 	char	*cmd;
-	int	 flag_insert_after;
 	int	 flag_detached;
 	int	 flag_kill;
 };

 const struct cmd_entry cmd_new_window_entry = {
 	"new-window", "neww",
-	"[-adk] [-n window-name] [-t target-window] [command]",
-	0, "",
+	"[-dk] [-n window-name] [-t target-window] [command]",
+	0, 0,
 	cmd_new_window_init,
 	cmd_new_window_parse,
 	cmd_new_window_exec,
@@ -52,7 +51,6 @@ const struct cmd_entry cmd_new_window_entry = {
 	cmd_new_window_print
 };

-/* ARGSUSED */
 void
 cmd_new_window_init(struct cmd *self, unused int arg)
 {
@@ -62,7 +60,6 @@ cmd_new_window_init(struct cmd *self, unused int arg)
 	data->target = NULL;
 	data->name = NULL;
 	data->cmd = NULL;
-	data->flag_insert_after = 0;
 	data->flag_detached = 0;
 	data->flag_kill = 0;
 }
@@ -76,11 +73,8 @@ cmd_new_window_parse(struct cmd *self, int argc, char **argv, char **cause)
 	self->entry->init(self, KEYC_NONE);
 	data = self->data;

-	while ((opt = getopt(argc, argv, "adkt:n:")) != -1) {
+	while ((opt = getopt(argc, argv, "dkt:n:")) != -1) {
 		switch (opt) {
-		case 'a':
-			data->flag_insert_after = 1;
-			break;
 		case 'd':
 			data->flag_detached = 1;
 			break;
@@ -123,66 +117,42 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session			*s;
 	struct winlink			*wl;
 	char				*cmd, *cwd, *cause;
-	int				 idx, last;
+	int				 idx;

 	if (data == NULL)
 		return (0);

-	if (data->flag_insert_after) {
-		if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
-			return (-1);
-		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) {
-			ctx->error(ctx, "no free window indexes");
-			return (-1);
-		}
-
-		/* 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(ctx, data->target, &s)) == -2)
-			return (-1);
-	}
+	if ((idx = cmd_find_index(ctx, data->target, &s)) == -2)
+		return (-1);

 	wl = NULL;
 	if (idx != -1)
 		wl = winlink_find_by_index(&s->windows, idx);
-	if (wl != NULL && data->flag_kill) {
-		/*
-		 * Can't use session_detach as it will destroy session if this
-		 * makes it empty.
-		 */
-		wl->flags &= ~WINLINK_ALERTFLAGS;
-		winlink_stack_remove(&s->lastw, wl);
-		winlink_remove(&s->windows, wl);
+	if (wl != NULL) {
+		if (data->flag_kill) {
+			/*
+			 * Can't use session_detach as it will destroy session
+			 * if this makes it empty.
+			 */
+			session_alert_cancel(s, wl);
+			winlink_stack_remove(&s->lastw, wl);
+			winlink_remove(&s->windows, wl);

-		/* Force select/redraw if current. */
-		if (wl == s->curw) {
-			data->flag_detached = 0;
-			s->curw = NULL;
+			/* Force select/redraw if current. */
+			if (wl == s->curw) {
+				data->flag_detached = 0;
+				s->curw = NULL;
+			}
 		}
 	}

 	cmd = data->cmd;
 	if (cmd == NULL)
 		cmd = options_get_string(&s->options, "default-command");
-	cwd = options_get_string(&s->options, "default-path");
-	if (*cwd == '\0') {
-		if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
-			cwd = ctx->cmdclient->cwd;
-		else
-			cwd = s->cwd;
-	}
+	if (ctx->cmdclient == NULL || ctx->cmdclient->cwd == NULL)
+		cwd = options_get_string(&s->options, "default-path");
+	else
+		cwd = ctx->cmdclient->cwd;

 	if (idx == -1)
 		idx = -1 - options_get_number(&s->options, "base-index");
@@ -195,7 +165,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	if (!data->flag_detached) {
 		session_select(s, wl->idx);
 		server_redraw_session_group(s);
-	} else
+	} else	
 		server_status_session_group(s);

 	return (0);
--- a/cmd-next-layout.c
+++ b/cmd-next-layout.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-next-layout.c,v 1.6 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-next-layout.c,v 1.5 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_next_layout_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_next_layout_entry = {
 	"next-layout", "nextl",
 	CMD_TARGET_WINDOW_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_next_layout_exec,
--- a/cmd-next-window.c
+++ b/cmd-next-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-next-window.c,v 1.21 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-next-window.c,v 1.20 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,7 +30,7 @@ int	cmd_next_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_next_window_entry = {
 	"next-window", "next",
 	"[-a] " CMD_TARGET_SESSION_USAGE,
-	0, "a",
+	0, CMD_CHFLAG('a'),
 	cmd_next_window_init,
 	cmd_target_parse,
 	cmd_next_window_exec,
@@ -47,7 +47,7 @@ cmd_next_window_init(struct cmd *self, int key)
 	data = self->data;

 	if (key == ('n' | KEYC_ESCAPE))
-		cmd_set_flag(&data->chflags, 'a');
+		data->chflags |= CMD_CHFLAG('a');
 }

 int
@@ -61,7 +61,7 @@ cmd_next_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);

 	activity = 0;
-	if (cmd_check_flag(data->chflags, 'a'))
+	if (data->chflags & CMD_CHFLAG('a'))
 		activity = 1;

 	if (session_next(s, activity) == 0)
--- a/cmd-paste-buffer.c
+++ b/cmd-paste-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-paste-buffer.c,v 1.28 2010-06-06 00:03:02 tcunha Exp $ */
+/* $Id: cmd-paste-buffer.c,v 1.20 2009-09-07 23:48:54 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,7 +18,6 @@

 #include <sys/types.h>

-#include <stdlib.h>
 #include <string.h>

 #include "tmux.h"
@@ -27,112 +26,32 @@
 * Paste paste buffer if present.
 */

-struct cmd_paste_buffer_data {
-	char	*target;
-	int	 buffer;
-
-	int	 flag_delete;
-	char	*sepstr;
-};
-
-void	cmd_paste_buffer_init(struct cmd *, int);
-int	cmd_paste_buffer_parse(struct cmd *, int, char **, char **);
 int	cmd_paste_buffer_exec(struct cmd *, struct cmd_ctx *);
-void	cmd_paste_buffer_filter(
-	    struct window_pane *, const char *, size_t, char *);
-void	cmd_paste_buffer_free(struct cmd *);
-size_t	cmd_paste_buffer_print(struct cmd *, char *, size_t);
+void	cmd_paste_buffer_lf2cr(struct buffer *, const char *, size_t);

 const struct cmd_entry cmd_paste_buffer_entry = {
 	"paste-buffer", "pasteb",
-	"[-dr] [-s separator] [-b buffer-index] [-t target-window]",
-	0, "",
-	cmd_paste_buffer_init,
-	cmd_paste_buffer_parse,
+	"[-dr] " CMD_BUFFER_WINDOW_USAGE,
+	0, CMD_CHFLAG('d')|CMD_CHFLAG('r'),
+	cmd_buffer_init,
+	cmd_buffer_parse,
 	cmd_paste_buffer_exec,
-	cmd_paste_buffer_free,
-	cmd_paste_buffer_print
+	cmd_buffer_free,
+	cmd_buffer_print
 };

-/* ARGSUSED */
-void
-cmd_paste_buffer_init(struct cmd *self, unused int arg)
-{
-	struct cmd_paste_buffer_data	*data;
-
-	self->data = data = xmalloc(sizeof *data);
-	data->target = NULL;
-	data->buffer = -1;
-	data->flag_delete = 0;
-	data->sepstr = xstrdup("\r");
-}
-
-int
-cmd_paste_buffer_parse(struct cmd *self, int argc, char **argv, char **cause)
-{
-	struct cmd_paste_buffer_data	*data;
-	int			 opt, n;
-	const char		*errstr;
-
-	cmd_paste_buffer_init(self, 0);
-	data = self->data;
-
-	while ((opt = getopt(argc, argv, "b:ds:t:r")) != -1) {
-		switch (opt) {
-		case 'b':
-			if (data->buffer == -1) {
-				n = strtonum(optarg, 0, INT_MAX, &errstr);
-				if (errstr != NULL) {
-					xasprintf(cause, "buffer %s", errstr);
-					goto error;
-				}
-				data->buffer = n;
-			}
-			break;
-		case 'd':
-			data->flag_delete = 1;
-			break;
-		case 's':
-			if (data->sepstr != NULL)
-				xfree(data->sepstr);
-			data->sepstr = xstrdup(optarg);
-			break;
-		case 't':
-			if (data->target == NULL)
-				data->target = xstrdup(optarg);
-			break;
-		case 'r':
-			if (data->sepstr != NULL)
-				xfree(data->sepstr);
-			data->sepstr = xstrdup("\n");
-			break;
-		default:
-			goto usage;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	return (0);
-
-usage:
-	xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
-
-error:
-	self->entry->free(self);
-	return (-1);
-}
-
 int
 cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct cmd_paste_buffer_data	*data = self->data;
-	struct window_pane		*wp;
-	struct session			*s;
-	struct paste_buffer		*pb;
+	struct cmd_buffer_data	*data = self->data;
+	struct winlink		*wl;
+	struct window_pane	*wp;
+	struct session		*s;
+	struct paste_buffer	*pb;

-	if (cmd_find_pane(ctx, data->target, &s, &wp) == NULL)
+	if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
 		return (-1);
+	wp = wl->window->active;

 	if (data->buffer == -1)
 		pb = paste_get_top(&s->buffers);
@@ -143,80 +62,39 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 		}
 	}

-	if (pb != NULL)
-		cmd_paste_buffer_filter(wp, pb->data, pb->size, data->sepstr);
+	if (pb != NULL && *pb->data != '\0') {
+		/* -r means raw data without LF->CR conversion. */
+		if (data->chflags & CMD_CHFLAG('r'))
+			buffer_write(wp->out, pb->data, pb->size);
+		else
+			cmd_paste_buffer_lf2cr(wp->out, pb->data, pb->size);
+	}

 	/* Delete the buffer if -d. */
-	if (data->flag_delete) {
+	if (data->chflags & CMD_CHFLAG('d')) {
 		if (data->buffer == -1)
 			paste_free_top(&s->buffers);
 		else
 			paste_free_index(&s->buffers, data->buffer);
 	}

-	return (0);
+ 	return (0);
 }

-/* Add bytes to a buffer and filter '\n' according to separator. */
+/* Add bytes to a buffer but change every '\n' to '\r'. */
 void
-cmd_paste_buffer_filter(
-    struct window_pane *wp, const char *data, size_t size, char *sep)
+cmd_paste_buffer_lf2cr(struct buffer *b, const char *data, size_t size)
 {
 	const char	*end = data + size;
 	const char	*lf;
-	size_t		 seplen;

-	seplen = strlen(sep);
 	while ((lf = memchr(data, '\n', end - data)) != NULL) {
 		if (lf != data)
-			bufferevent_write(wp->event, data, lf - data);
-		bufferevent_write(wp->event, sep, seplen);
+			buffer_write(b, data, lf - data);
+		buffer_write8(b, '\r');
 		data = lf + 1;
 	}

 	if (end != data)
-		bufferevent_write(wp->event, data, end - data);
-}
-
-void
-cmd_paste_buffer_free(struct cmd *self)
-{
-	struct cmd_paste_buffer_data	*data = self->data;
-
-	if (data->target != NULL)
-		xfree(data->target);
-	if (data->sepstr != NULL)
-		xfree(data->sepstr);
-	xfree(data);
-}
-
-size_t
-cmd_paste_buffer_print(struct cmd *self, char *buf, size_t len)
-{
-	struct cmd_paste_buffer_data	*data = self->data;
-	size_t				 off = 0;
-	char                             tmp[BUFSIZ];
-	int				 r_flag;
-
-	r_flag = 0;
-	if (data->sepstr != NULL)
-		r_flag = (data->sepstr[0] == '\n' && data->sepstr[1] == '\0');
-
-	off += xsnprintf(buf, len, "%s", self->entry->name);
-	if (data == NULL)
-		return (off);
-	if (off < len && data->flag_delete)
-		off += xsnprintf(buf + off, len - off, " -d");
-	if (off < len && r_flag)
-		off += xsnprintf(buf + off, len - off, " -r");
-	if (off < len && data->buffer != -1)
-		off += xsnprintf(buf + off, len - off, " -b %d", data->buffer);
-	if (off < len && data->sepstr != NULL && !r_flag) {
-		strnvis(
-		    tmp, data->sepstr, sizeof tmp, VIS_OCTAL|VIS_TAB|VIS_NL);
-		off += cmd_prarg(buf + off, len - off, " -s ", tmp);
-	}
-	if (off < len && data->target != NULL)
-		off += cmd_prarg(buf + off, len - off, " -t ", data->target);
-	return (off);
+		buffer_write(b, data, end - data);
 }
--- a/cmd-pipe-pane.c
+++ b/cmd-pipe-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-pipe-pane.c,v 1.13 2010-06-15 20:25:40 tcunha Exp $ */
+/* $Id: cmd-pipe-pane.c,v 1.3 2009-10-23 17:26:40 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -17,12 +17,10 @@
 */

 #include <sys/types.h>
-#include <sys/socket.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>

 #include "tmux.h"
@@ -33,12 +31,10 @@

 int	cmd_pipe_pane_exec(struct cmd *, struct cmd_ctx *);

-void	cmd_pipe_pane_error_callback(struct bufferevent *, short, void *);
-
 const struct cmd_entry cmd_pipe_pane_entry = {
 	"pipe-pane", "pipep",
 	CMD_TARGET_PANE_USAGE "[-o] [command]",
-	CMD_ARG01, "o",
+	CMD_ARG01, CMD_CHFLAG('o'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_pipe_pane_exec,
@@ -50,21 +46,16 @@ int
 cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data	*data = self->data;
-	struct client		*c;
 	struct window_pane	*wp;
-	char			*command;
 	int			 old_fd, pipe_fd[2], null_fd, mode;

-	if ((c = cmd_find_client(ctx, NULL)) == NULL)
-		return (-1);
-
 	if (cmd_find_pane(ctx, data->target, NULL, &wp) == NULL)
 		return (-1);

 	/* Destroy the old pipe. */
 	old_fd = wp->pipe_fd;
 	if (wp->pipe_fd != -1) {
-		bufferevent_free(wp->pipe_event);
+		buffer_destroy(wp->pipe_buf);
 		close(wp->pipe_fd);
 		wp->pipe_fd = -1;
 	}
@@ -79,12 +70,12 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	 *
 	 *	bind ^p pipep -o 'cat >>~/output'
 	 */
-	if (cmd_check_flag(data->chflags, 'o') && old_fd != -1)
+	if (data->chflags & CMD_CHFLAG('o') && old_fd != -1)
 		return (0);

 	/* Open the new pipe. */
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_fd) != 0) {
-		ctx->error(ctx, "socketpair error: %s", strerror(errno));
+	if (pipe(pipe_fd) != 0) {
+		ctx->error(ctx, "pipe error: %s", strerror(errno));
 		return (-1);
 	}

@@ -92,11 +83,11 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	switch (fork()) {
 	case -1:
 		ctx->error(ctx, "fork error: %s", strerror(errno));
-		return (-1);
+		return (-1);		
 	case 0:
 		/* Child process. */
 		close(pipe_fd[0]);
-		clear_signals();
+		sigreset();

 		if (dup2(pipe_fd[1], STDIN_FILENO) == -1)
 			_exit(1);
@@ -111,38 +102,24 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 		if (null_fd != STDOUT_FILENO && null_fd != STDERR_FILENO)
 			close(null_fd);

-		command = status_replace(c, NULL, data->arg, time(NULL), 0);
-		execl(_PATH_BSHELL, "sh", "-c", command, (char *) NULL);
+		execl(_PATH_BSHELL, "sh", "-c", data->arg, (char *) NULL);
 		_exit(1);
 	default:
 		/* Parent process. */
 		close(pipe_fd[1]);

 		wp->pipe_fd = pipe_fd[0];
-		wp->pipe_off = EVBUFFER_LENGTH(wp->event->input);
-
-		wp->pipe_event = bufferevent_new(wp->pipe_fd,
-		    NULL, NULL, cmd_pipe_pane_error_callback, wp);
-		bufferevent_enable(wp->pipe_event, EV_WRITE);
-
+		wp->pipe_buf = buffer_create(BUFSIZ);
+		wp->pipe_off = BUFFER_USED(wp->in);
+		
 		if ((mode = fcntl(wp->pipe_fd, F_GETFL)) == -1)
 			fatal("fcntl failed");
 		if (fcntl(wp->pipe_fd, F_SETFL, mode|O_NONBLOCK) == -1)
 			fatal("fcntl failed");
 		if (fcntl(wp->pipe_fd, F_SETFD, FD_CLOEXEC) == -1)
-			fatal("fcntl failed");
+			fatal("fcntl failed");	
 		return (0);
 	}
-}

-/* ARGSUSED */
-void
-cmd_pipe_pane_error_callback(
-    unused struct bufferevent *bufev, unused short what, void *data)
-{
-	struct window_pane	*wp = data;
-
-	bufferevent_free(wp->pipe_event);
-	close(wp->pipe_fd);
-	wp->pipe_fd = -1;
+	return (0);
 }
--- a/cmd-previous-layout.c
+++ b/cmd-previous-layout.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-previous-layout.c,v 1.6 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-previous-layout.c,v 1.4 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_previous_layout_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_previous_layout_entry = {
 	"previous-layout", "prevl",
 	CMD_TARGET_WINDOW_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_previous_layout_exec,
@@ -43,7 +43,7 @@ cmd_previous_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct cmd_target_data	*data = self->data;
 	struct winlink		*wl;
 	u_int			 layout;
-
+	
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);

--- a/cmd-previous-window.c
+++ b/cmd-previous-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-previous-window.c,v 1.21 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-previous-window.c,v 1.20 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,7 +30,7 @@ int	cmd_previous_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_previous_window_entry = {
 	"previous-window", "prev",
 	"[-a] " CMD_TARGET_SESSION_USAGE,
-	0, "a",
+	0, CMD_CHFLAG('a'),
 	cmd_previous_window_init,
 	cmd_target_parse,
 	cmd_previous_window_exec,
@@ -47,7 +47,7 @@ cmd_previous_window_init(struct cmd *self, int key)
 	data = self->data;

 	if (key == ('p' | KEYC_ESCAPE))
-		cmd_set_flag(&data->chflags, 'a');
+		data->chflags |= CMD_CHFLAG('a');
 }

 int
@@ -61,7 +61,7 @@ cmd_previous_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);

 	activity = 0;
-	if (cmd_check_flag(data->chflags, 'a'))
+	if (data->chflags & CMD_CHFLAG('a'))
 		activity = 1;

 	if (session_previous(s, activity) == 0)
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-refresh-client.c,v 1.11 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-refresh-client.c,v 1.10 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_refresh_client_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_refresh_client_entry = {
 	"refresh-client", "refresh",
 	CMD_TARGET_CLIENT_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_refresh_client_exec,
--- a/cmd-rename-session.c
+++ b/cmd-rename-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-rename-session.c,v 1.19 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-rename-session.c,v 1.18 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_rename_session_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_rename_session_entry = {
 	"rename-session", "rename",
 	CMD_TARGET_SESSION_USAGE " new-name",
-	CMD_ARG1, "",
+	CMD_ARG1, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_rename_session_exec,
--- a/cmd-rename-window.c
+++ b/cmd-rename-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-rename-window.c,v 1.31 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-rename-window.c,v 1.30 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_rename_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_rename_window_entry = {
 	"rename-window", "renamew",
 	CMD_TARGET_WINDOW_USAGE " new-name",
-	CMD_ARG1, "",
+	CMD_ARG1, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_rename_window_exec,
--- a/cmd-resize-pane.c
+++ b/cmd-resize-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-resize-pane.c,v 1.14 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-resize-pane.c,v 1.12 2009-07-30 20:45:20 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,8 +31,9 @@ int	cmd_resize_pane_exec(struct cmd *, struct cmd_ctx *);

 const struct cmd_entry cmd_resize_pane_entry = {
 	"resize-pane", "resizep",
-	"[-DLRU] " CMD_TARGET_PANE_USAGE " [adjustment]",
-	CMD_ARG01, "DLRU",
+	"[-DU] " CMD_TARGET_PANE_USAGE " [adjustment]",
+	CMD_ARG01,
+	CMD_CHFLAG('D')|CMD_CHFLAG('L')|CMD_CHFLAG('R')|CMD_CHFLAG('U'),
 	cmd_resize_pane_init,
 	cmd_target_parse,
 	cmd_resize_pane_exec,
@@ -49,28 +50,28 @@ cmd_resize_pane_init(struct cmd *self, int key)
 	data = self->data;

 	if (key == (KEYC_UP | KEYC_CTRL))
-		cmd_set_flag(&data->chflags, 'U');
+		data->chflags |= CMD_CHFLAG('U');
 	if (key == (KEYC_DOWN | KEYC_CTRL))
-		cmd_set_flag(&data->chflags, 'D');
+		data->chflags |= CMD_CHFLAG('D');
 	if (key == (KEYC_LEFT | KEYC_CTRL))
-		cmd_set_flag(&data->chflags, 'L');
+		data->chflags |= CMD_CHFLAG('L');
 	if (key == (KEYC_RIGHT | KEYC_CTRL))
-		cmd_set_flag(&data->chflags, 'R');
-
+		data->chflags |= CMD_CHFLAG('R');
+	
 	if (key == (KEYC_UP | KEYC_ESCAPE)) {
-		cmd_set_flag(&data->chflags, 'U');
+		data->chflags |= CMD_CHFLAG('U');
 		data->arg = xstrdup("5");
 	}
 	if (key == (KEYC_DOWN | KEYC_ESCAPE)) {
-		cmd_set_flag(&data->chflags, 'D');
+		data->chflags |= CMD_CHFLAG('D');
 		data->arg = xstrdup("5");
 	}
 	if (key == (KEYC_LEFT | KEYC_ESCAPE)) {
-		cmd_set_flag(&data->chflags, 'L');
+		data->chflags |= CMD_CHFLAG('L');
 		data->arg = xstrdup("5");
 	}
 	if (key == (KEYC_RIGHT | KEYC_ESCAPE)) {
-		cmd_set_flag(&data->chflags, 'R');
+		data->chflags |= CMD_CHFLAG('R');
 		data->arg = xstrdup("5");
 	}
 }
@@ -97,14 +98,15 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 		}
 	}

-	if (cmd_check_flag(data->chflags, 'L'))
-		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, -adjust);
-	else if (cmd_check_flag(data->chflags, 'R'))
+	if (data->chflags & (CMD_CHFLAG('L')|CMD_CHFLAG('R'))) {
+		if (data->chflags & CMD_CHFLAG('L'))
+			adjust = -adjust;
 		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust);
-	else if (cmd_check_flag(data->chflags, 'U'))
-		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, -adjust);
-	else if (cmd_check_flag(data->chflags, 'D'))
+	} else {
+		if (data->chflags & CMD_CHFLAG('U'))
+			adjust = -adjust;
 		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust);
+	}
 	server_redraw_window(wl->window);

 	return (0);
--- a/cmd-respawn-window.c
+++ b/cmd-respawn-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-respawn-window.c,v 1.25 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-respawn-window.c,v 1.22 2009-09-16 12:36:27 nicm Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_respawn_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_respawn_window_entry = {
 	"respawn-window", "respawnw",
 	"[-k] " CMD_TARGET_WINDOW_USAGE " [command]",
-	CMD_ARG01, "k",
+	CMD_ARG01, CMD_CHFLAG('k'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_respawn_window_exec,
@@ -54,7 +54,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 	w = wl->window;

-	if (!cmd_check_flag(data->chflags, 'k')) {
+	if (!(data->chflags & CMD_CHFLAG('k'))) {
 		TAILQ_FOREACH(wp, &w->panes, entry) {
 			if (wp->fd == -1)
 				continue;
@@ -72,7 +72,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	wp = TAILQ_FIRST(&w->panes);
 	TAILQ_REMOVE(&w->panes, wp, entry);
 	layout_free(w);
-	window_destroy_panes(w);
+ 	window_destroy_panes(w);
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 	window_pane_resize(wp, w->sx, w->sy);
 	if (window_pane_spawn(
@@ -80,7 +80,6 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		ctx->error(ctx, "respawn window failed: %s", cause);
 		xfree(cause);
 		environ_free(&env);
-		server_destroy_pane(wp);
 		return (-1);
 	}
 	layout_init(w);
--- a/cmd-rotate-window.c
+++ b/cmd-rotate-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-rotate-window.c,v 1.10 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-rotate-window.c,v 1.9 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,7 +30,7 @@ int	cmd_rotate_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_rotate_window_entry = {
 	"rotate-window", "rotatew",
 	"[-DU] " CMD_TARGET_WINDOW_USAGE,
-	0, "DU",
+	0, CMD_CHFLAG('D')|CMD_CHFLAG('U'),
 	cmd_rotate_window_init,
 	cmd_target_parse,
 	cmd_rotate_window_exec,
@@ -47,7 +47,7 @@ cmd_rotate_window_init(struct cmd *self, int key)
 	data = self->data;

 	if (key == ('o' | KEYC_ESCAPE))
-		cmd_set_flag(&data->chflags, 'D');
+		data->chflags |= CMD_CHFLAG('D');
 }

 int
@@ -64,7 +64,7 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 	w = wl->window;

-	if (cmd_check_flag(data->chflags, 'D')) {
+	if (data->chflags & CMD_CHFLAG('D')) {
 		wp = TAILQ_LAST(&w->panes, window_panes);
 		TAILQ_REMOVE(&w->panes, wp, entry);
 		TAILQ_INSERT_HEAD(&w->panes, wp, entry);
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-run-shell.c,v 1.8 2010-07-17 14:36:40 tcunha Exp $ */
+/* $Id: cmd-run-shell.c,v 1.4 2009-11-02 21:38:26 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -36,7 +36,7 @@ void	cmd_run_shell_free(void *);
 const struct cmd_entry cmd_run_shell_entry = {
 	"run-shell", "run",
 	"command",
-	CMD_ARG1, "",
+	CMD_ARG1, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_run_shell_exec,
@@ -77,38 +77,31 @@ cmd_run_shell_callback(struct job *job)
 {
 	struct cmd_run_shell_data	*cdata = job->data;
 	struct cmd_ctx			*ctx = &cdata->ctx;
-	char				*cmd, *msg, *line;
-	size_t				 size;
+	char				*cmd, *msg, *line, *buf;
+	size_t				 off, len, llen;
 	int				 retcode;
-	u_int				 lines;

-	if (ctx->cmdclient != NULL && ctx->cmdclient->flags & CLIENT_DEAD)
-		return;
-	if (ctx->curclient != NULL && ctx->curclient->flags & CLIENT_DEAD)
-		return;
-
-	lines = 0;
-	do {
-		if ((line = evbuffer_readline(job->event->input)) != NULL) {
-			ctx->print(ctx, "%s", line);
-			lines++;
-		}
-	} while (line != NULL);
-
-	size = EVBUFFER_LENGTH(job->event->input);
-	if (size != 0) {
-		line = xmalloc(size + 1);
-		memcpy(line, EVBUFFER_DATA(job->event->input), size);
-		line[size] = '\0';
-
-		ctx->print(ctx, "%s", line);
-		lines++;
-
-		xfree(line);
-	}
+	buf = BUFFER_OUT(job->out);
+	len = BUFFER_USED(job->out);

 	cmd = cdata->cmd;

+	if (len != 0) {
+		line = buf;
+		for (off = 0; off < len; off++) {
+			if (buf[off] == '\n') {
+				llen = buf + off - line;
+				if (llen > INT_MAX)
+					break;
+				ctx->print(ctx, "%.*s", (int) llen, line);
+				line = buf + off + 1;
+			}
+		}
+		llen = buf + len - line;
+		if (llen > 0 && llen < INT_MAX)
+			ctx->print(ctx, "%.*s", (int) llen, line);
+	}
+
 	msg = NULL;
 	if (WIFEXITED(job->status)) {
 		if ((retcode = WEXITSTATUS(job->status)) != 0)
@@ -118,7 +111,7 @@ cmd_run_shell_callback(struct job *job)
 		xasprintf(&msg, "'%s' terminated by signal %d", cmd, retcode);
 	}
 	if (msg != NULL) {
-		if (lines != 0)
+		if (len != 0)
 			ctx->print(ctx, "%s", msg);
 		else
 			ctx->info(ctx, "%s", msg);
@@ -131,13 +124,10 @@ cmd_run_shell_free(void *data)
 {
 	struct cmd_run_shell_data	*cdata = data;
 	struct cmd_ctx			*ctx = &cdata->ctx;
-	struct msg_exit_data		 exitdata;

 	if (ctx->cmdclient != NULL) {
 		ctx->cmdclient->references--;
-		exitdata.retcode = ctx->cmdclient->retcode;
-		server_write_client(
-		    ctx->cmdclient, MSG_EXIT, &exitdata, sizeof exitdata);
+		server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0);
 	}
 	if (ctx->curclient != NULL)
 		ctx->curclient->references--;
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-save-buffer.c,v 1.11 2010-07-02 02:52:13 tcunha Exp $ */
+/* $Id: cmd-save-buffer.c,v 1.9 2009-10-28 23:08:52 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -33,7 +33,7 @@ int	cmd_save_buffer_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_save_buffer_entry = {
 	"save-buffer", "saveb",
 	"[-a] " CMD_BUFFER_SESSION_USAGE " path",
-	CMD_ARG1, "a",
+	CMD_ARG1, CMD_CHFLAG('a'),
 	cmd_buffer_init,
 	cmd_buffer_parse,
 	cmd_save_buffer_exec,
@@ -48,7 +48,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session		*s;
 	struct paste_buffer	*pb;
 	mode_t			mask;
-	FILE			*f, *close_f;
+	FILE			*f;

 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
 		return (-1);
@@ -65,25 +65,15 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 		}
 	}

-	if (strcmp(data->arg, "-") == 0) {
-		if (ctx->cmdclient == NULL) {
-			ctx->error(ctx, "%s: can't write to stdout", data->arg);
-			return (-1);
-		}
-		f = ctx->cmdclient->stdout_file;
-		close_f = NULL;
-	} else {
-		mask = umask(S_IRWXG | S_IRWXO);
-		if (cmd_check_flag(data->chflags, 'a'))
-			f = fopen(data->arg, "ab");
-		else
-			f = fopen(data->arg, "wb");
-		umask(mask);
-		if (f == NULL) {
-			ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
-			return (-1);
-		}
-		close_f = f;
+	mask = umask(S_IRWXG | S_IRWXO);
+	if (data->chflags & CMD_CHFLAG('a'))
+		f = fopen(data->arg, "ab");
+	else
+		f = fopen(data->arg, "wb");
+	umask(mask);
+	if (f == NULL) {
+		ctx->error(ctx, "%s: %s", data->arg, strerror(errno));
+		return (-1);
 	}

 	if (fwrite(pb->data, 1, pb->size, f) != pb->size) {
@@ -92,8 +82,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 	    	return (-1);
 	}

-	if (close_f != NULL)
-		fclose(close_f);
+	fclose(f);

 	return (0);
 }
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-select-layout.c,v 1.12 2010-07-02 02:54:52 tcunha Exp $ */
+/* $Id: cmd-select-layout.c,v 1.8 2009-07-28 23:04:29 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,7 +30,7 @@ int	cmd_select_layout_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_select_layout_entry = {
 	"select-layout", "selectl",
 	CMD_TARGET_WINDOW_USAGE " [layout-name]",
-	CMD_ARG01, "",
+	CMD_ARG01, 0,
 	cmd_select_layout_init,
 	cmd_target_parse,
 	cmd_select_layout_exec,
@@ -52,16 +52,13 @@ cmd_select_layout_init(struct cmd *self, int key)
 		break;
 	case ('2' | KEYC_ESCAPE):
 		data->arg = xstrdup("even-vertical");
-		break;
+    		break;
 	case ('3' | KEYC_ESCAPE):
 		data->arg = xstrdup("main-horizontal");
 		break;
 	case ('4' | KEYC_ESCAPE):
 		data->arg = xstrdup("main-vertical");
 		break;
-	case ('5' | KEYC_ESCAPE):
-		data->arg = xstrdup("tiled");
-		break;
 	}
 }

@@ -79,16 +76,13 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 		layout = wl->window->lastlayout;
 		if (layout == -1)
 			return (0);
-	} else if ((layout = layout_set_lookup(data->arg)) != -1) {
-		layout = layout_set_select(wl->window, layout);
-		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
-	} else {
-		if (layout_parse(wl->window, data->arg) == -1) {
-			ctx->error(ctx, "can't set layout: %s", data->arg);
-			return (-1);
-		}
-		ctx->info(ctx, "arranging in: %s", data->arg);
+	} else if ((layout = layout_set_lookup(data->arg)) == -1) {
+		ctx->error(ctx, "unknown layout or ambiguous: %s", data->arg);
+		return (-1);
 	}
+	
+	layout = layout_set_select(wl->window, layout);
+	ctx->info(ctx, "arranging in: %s", layout_set_name(layout));

 	return (0);
 }
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-select-pane.c,v 1.13 2010-03-15 22:03:38 nicm Exp $ */
+/* $Id: cmd-select-pane.c,v 1.10 2009-07-30 20:45:20 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,40 +24,19 @@
 * Select pane.
 */

-void	cmd_select_pane_init(struct cmd *, int);
 int	cmd_select_pane_exec(struct cmd *, struct cmd_ctx *);

 const struct cmd_entry cmd_select_pane_entry = {
 	"select-pane", "selectp",
-	"[-DLRU] " CMD_TARGET_PANE_USAGE,
-	0, "DLRU",
-	cmd_select_pane_init,
+	CMD_TARGET_PANE_USAGE,
+	0, 0,
+	cmd_target_init,
 	cmd_target_parse,
 	cmd_select_pane_exec,
 	cmd_target_free,
 	cmd_target_print
 };

-void
-cmd_select_pane_init(struct cmd *self, int key)
-{
-	struct cmd_target_data	*data;
-
-	cmd_target_init(self, key);
-	data = self->data;
-
-	if (key == KEYC_UP)
-		cmd_set_flag(&data->chflags, 'U');
-	if (key == KEYC_DOWN)
-		cmd_set_flag(&data->chflags, 'D');
-	if (key == KEYC_LEFT)
-		cmd_set_flag(&data->chflags, 'L');
-	if (key == KEYC_RIGHT)
-		cmd_set_flag(&data->chflags, 'R');
-	if (key == 'o')
-		data->target = xstrdup(":.+");
-}
-
 int
 cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
@@ -72,23 +51,8 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 		ctx->error(ctx, "pane not visible: %s", data->target);
 		return (-1);
 	}
-
-	if (cmd_check_flag(data->chflags, 'L'))
-		wp = window_pane_find_left(wp);
-	else if (cmd_check_flag(data->chflags, 'R'))
-		wp = window_pane_find_right(wp);
-	else if (cmd_check_flag(data->chflags, 'U'))
-		wp = window_pane_find_up(wp);
-	else if (cmd_check_flag(data->chflags, 'D'))
-		wp = window_pane_find_down(wp);
-	if (wp == NULL) {
-		ctx->error(ctx, "pane not found");
-		return (-1);
-	}
-
 	window_set_active_pane(wl->window, wp);
 	server_status_window(wl->window);
-	server_redraw_window_borders(wl->window);

 	return (0);
 }
--- a/cmd-select-prompt.c
+++ b/cmd-select-prompt.c
@@ -0,0 +1,91 @@
+/* $Id: cmd-select-prompt.c,v 1.12 2009-08-16 19:29:24 tcunha Exp $ */
+
+/*
+ * 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 <stdlib.h>
+
+#include "tmux.h"
+
+/*
+ * Prompt for window index and select it.
+ */
+
+int	cmd_select_prompt_exec(struct cmd *, struct cmd_ctx *);
+
+int	cmd_select_prompt_callback(void *, const char *);
+
+const struct cmd_entry cmd_select_prompt_entry = {
+	"select-prompt", NULL,
+	CMD_TARGET_CLIENT_USAGE,
+	0, 0,
+	cmd_target_init,
+	cmd_target_parse,
+	cmd_select_prompt_exec,
+	cmd_target_free,
+	cmd_target_print
+};
+
+int
+cmd_select_prompt_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct cmd_target_data	*data = self->data;
+	struct client		*c;
+
+	if ((c = cmd_find_client(ctx, data->target)) == NULL)
+		return (-1);
+
+	if (c->prompt_string != NULL)
+		return (0);
+
+	status_prompt_set(c, "index ", cmd_select_prompt_callback, NULL, c, 0);
+
+	return (0);
+}
+
+int
+cmd_select_prompt_callback(void *data, const char *s)
+{
+	struct client	*c = data;
+	const char	*errstr;
+	char		 msg[128];
+	u_int		 idx;
+
+	if (s == NULL || *s == '\0')
+		return (0);
+
+	idx = strtonum(s, 0, UINT_MAX, &errstr);
+	if (errstr != NULL) {
+		xsnprintf(msg, sizeof msg, "Index %s: %s", errstr, s);
+		status_message_set(c, "%s", msg);
+		return (0);
+	}
+
+	if (winlink_find_by_index(&c->session->windows, idx) == NULL) {
+		xsnprintf(msg, sizeof msg,
+		    "Window not found: %s:%d", c->session->name, idx);
+		status_message_set(c, "%s", msg);
+		return (0);
+	}
+
+	if (session_select(c->session, idx) == 0)
+		server_redraw_session(c->session);
+	recalculate_sizes();
+
+	return (0);
+}
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-select-window.c,v 1.24 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-select-window.c,v 1.23 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ int	cmd_select_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_select_window_entry = {
 	"select-window", "selectw",
 	CMD_TARGET_WINDOW_USAGE,
-	0, "",
+	0, 0,
 	cmd_select_window_init,
 	cmd_target_parse,
 	cmd_select_window_exec,
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-send-keys.c,v 1.25 2010-05-22 21:56:04 micahcowan Exp $ */
+/* $Id: cmd-send-keys.c,v 1.22 2009-09-22 14:03:11 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,14 +33,14 @@ size_t	cmd_send_keys_print(struct cmd *, char *, size_t);

 struct cmd_send_keys_data {
 	char	*target;
-	u_int	 nkeys;
+  	u_int	 nkeys;
 	int	*keys;
 };

 const struct cmd_entry cmd_send_keys_entry = {
 	"send-keys", "send",
 	"[-t target-pane] key ...",
-	0, "",
+	0, 0,
 	NULL,
 	cmd_send_keys_parse,
 	cmd_send_keys_exec,
@@ -105,17 +105,16 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_send_keys_data	*data = self->data;
 	struct window_pane		*wp;
-	struct session			*s;
 	u_int				 i;

 	if (data == NULL)
 		return (-1);

-	if (cmd_find_pane(ctx, data->target, &s, &wp) == NULL)
+	if (cmd_find_pane(ctx, data->target, NULL, &wp) == NULL)
 		return (-1);

 	for (i = 0; i < data->nkeys; i++)
-		window_pane_key(wp, s, data->keys[i]);
+		window_pane_key(wp, ctx->curclient, data->keys[i]);

 	return (0);
 }
--- a/cmd-send-prefix.c
+++ b/cmd-send-prefix.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-send-prefix.c,v 1.29 2010-05-22 21:56:04 micahcowan Exp $ */
+/* $Id: cmd-send-prefix.c,v 1.27 2009-09-22 14:22:20 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_send_prefix_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_send_prefix_entry = {
 	"send-prefix", NULL,
 	CMD_TARGET_PANE_USAGE,
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_send_prefix_exec,
@@ -49,7 +49,7 @@ cmd_send_prefix_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);

 	keylist = options_get_data(&s->options, "prefix");
-	window_pane_key(wp, s, ARRAY_FIRST(keylist));
+	window_pane_key(wp, ctx->curclient, ARRAY_FIRST(keylist));

 	return (0);
 }
--- a/cmd-server-info.c
+++ b/cmd-server-info.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-server-info.c,v 1.37 2009-12-10 16:59:02 tcunha Exp $ */
+/* $Id: cmd-server-info.c,v 1.33 2009-11-04 22:42:31 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -35,7 +35,7 @@ int	cmd_server_info_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_server_info_entry = {
 	"server-info", "info",
 	"",
-	0, "",
+	0, 0,
 	NULL,
 	NULL,
 	cmd_server_info_exec,
@@ -43,7 +43,6 @@ const struct cmd_entry cmd_server_info_entry = {
 	NULL
 };

-/* ARGSUSED */
 int
 cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 {
@@ -70,8 +69,8 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	*strchr(tim, '\n') = '\0';
 	ctx->print(ctx,
 	    "tmux " BUILD ", pid %ld, started %s", (long) getpid(), tim);
-	ctx->print(
-	    ctx, "socket path %s, debug level %d", socket_path, debug_level);
+	ctx->print(ctx, "socket path %s, debug level %d%s",
+	    socket_path, debug_level, be_quiet ? ", quiet" : "");
 	if (uname(&un) == 0) {
 		ctx->print(ctx, "system is %s %s %s %s",
 		    un.sysname, un.release, un.version, un.machine);
@@ -94,12 +93,12 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 		ctx->print(ctx, "%2d: %s (%d, %d): %s [%ux%u %s] "
 		    "[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->flags,
+		    c->tty.sx, c->tty.sy, c->tty.termname, c->flags, 
 		    c->tty.flags, c->references);
 	}
 	ctx->print(ctx, "%s", "");

-	ctx->print(ctx, "Sessions: [%zu/%zu]",
+ 	ctx->print(ctx, "Sessions: [%zu/%zu]",
 	    sizeof (struct grid_cell), sizeof (struct grid_utf8));
 	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
 		s = ARRAY_ITEM(&sessions, i);
@@ -148,7 +147,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	}
 	ctx->print(ctx, "%s", "");

-	ctx->print(ctx, "Terminals:");
+  	ctx->print(ctx, "Terminals:");
 	SLIST_FOREACH(term, &tty_terms, entry) {
 		ctx->print(ctx, "%s [references=%u, flags=0x%x]:",
 		    term->name, term->references, term->flags);
@@ -180,7 +179,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	}
 	ctx->print(ctx, "%s", "");

-	ctx->print(ctx, "Jobs:");
+  	ctx->print(ctx, "Jobs:");
 	SLIST_FOREACH(job, &all_jobs, lentry) {
 		ctx->print(ctx, "%s [fd=%d, pid=%d, status=%d, flags=0x%x]",
 		    job->cmd, job->fd, job->pid, job->status, job->flags);
--- a/cmd-set-buffer.c
+++ b/cmd-set-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-buffer.c,v 1.12 2009-11-28 14:54:12 tcunha Exp $ */
+/* $Id: cmd-set-buffer.c,v 1.10 2009-09-07 23:48:54 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_set_buffer_entry = {
 	"set-buffer", "setb",
 	CMD_BUFFER_SESSION_USAGE " data",
-	CMD_ARG1, "",
+	CMD_ARG1, 0,
 	cmd_buffer_init,
 	cmd_buffer_parse,
 	cmd_set_buffer_exec,
@@ -45,7 +45,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct cmd_buffer_data	*data = self->data;
 	struct session		*s;
 	u_int			 limit;
-	char			*pdata;
+	u_char			*pdata;
 	size_t			 psize;

 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
--- a/cmd-set-environment.c
+++ b/cmd-set-environment.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-environment.c,v 1.3 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-set-environment.c,v 1.2 2009-08-11 14:42:59 nicm Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ int	cmd_set_environment_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_set_environment_entry = {
 	"set-environment", "setenv",
 	"[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
-	CMD_ARG12, "gru",
+	CMD_ARG12, CMD_CHFLAG('g')|CMD_CHFLAG('r')|CMD_CHFLAG('u'),
 	NULL,
 	cmd_target_parse,
 	cmd_set_environment_exec,
@@ -56,7 +56,7 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 	}

-	if (cmd_check_flag(data->chflags, 'g'))
+	if (data->chflags & CMD_CHFLAG('g'))
 		env = &global_environ;
 	else {
 		if ((s = cmd_find_session(ctx, data->target)) == NULL)
@@ -64,13 +64,13 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_ctx *ctx)
 		env = &s->environ;
 	}

-	if (cmd_check_flag(data->chflags, 'u')) {
+	if (data->chflags & CMD_CHFLAG('u')) {
 		if (data->arg2 != NULL) {
 			ctx->error(ctx, "can't specify a value with -u");
 			return (-1);
 		}
 		environ_unset(env, data->arg);
-	} else if (cmd_check_flag(data->chflags, 'r')) {
+	} else if (data->chflags & CMD_CHFLAG('r')) {
 		if (data->arg2 != NULL) {
 			ctx->error(ctx, "can't specify a value with -r");
 			return (-1);
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-option.c,v 1.98 2010-07-02 02:45:52 tcunha Exp $ */
+/* $Id: cmd-set-option.c,v 1.85 2009-11-02 21:38:26 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,27 +29,10 @@

 int	cmd_set_option_exec(struct cmd *, struct cmd_ctx *);

-const char *cmd_set_option_print(
-	    const struct set_option_entry *, struct options_entry *);
-void	cmd_set_option_string(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *, int);
-void	cmd_set_option_number(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *);
-void	cmd_set_option_keys(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *);
-void	cmd_set_option_colour(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *);
-void	cmd_set_option_attributes(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *);
-void	cmd_set_option_flag(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *);
-void	cmd_set_option_choice(struct cmd_ctx *,
-	    struct options *, const struct set_option_entry *, char *);
-
 const struct cmd_entry cmd_set_option_entry = {
 	"set-option", "set",
-	"[-agsuw] [-t target-session|target-window] option [value]",
-	CMD_ARG12, "agsuw",
+	"[-agu] " CMD_TARGET_SESSION_USAGE " option [value]",
+	CMD_ARG12, CMD_CHFLAG('a')|CMD_CHFLAG('g')|CMD_CHFLAG('u'),
 	NULL,
 	cmd_target_parse,
 	cmd_set_option_exec,
@@ -57,12 +40,6 @@ const struct cmd_entry cmd_set_option_entry = {
 	cmd_target_print
 };

-const char *set_option_mode_keys_list[] = {
-	"emacs", "vi", NULL
-};
-const char *set_option_clock_mode_style_list[] = {
-	"12", "24", NULL
-};
 const char *set_option_status_keys_list[] = {
 	"emacs", "vi", NULL
 };
@@ -72,14 +49,7 @@ const char *set_option_status_justify_list[] = {
 const char *set_option_bell_action_list[] = {
 	"none", "any", "current", NULL
 };
-
 const struct set_option_entry set_option_table[] = {
-	{ "escape-time", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
-	{ "quiet", SET_OPTION_FLAG, 0, 0, NULL },
-	{ NULL, 0, 0, 0, NULL }
-};
-
-const struct set_option_entry set_session_option_table[] = {
 	{ "base-index", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
 	{ "bell-action", SET_OPTION_CHOICE, 0, 0, set_option_bell_action_list },
 	{ "buffer-limit", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
@@ -87,9 +57,7 @@ const struct set_option_entry set_session_option_table[] = {
 	{ "default-path", SET_OPTION_STRING, 0, 0, NULL },
 	{ "default-shell", SET_OPTION_STRING, 0, 0, NULL },
 	{ "default-terminal", SET_OPTION_STRING, 0, 0, NULL },
-	{ "detach-on-destroy", SET_OPTION_FLAG, 0, 0, NULL },
 	{ "display-panes-colour", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "display-panes-active-colour", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "display-panes-time", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
 	{ "display-time", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
 	{ "history-limit", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
@@ -99,12 +67,7 @@ const struct set_option_entry set_session_option_table[] = {
 	{ "message-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
 	{ "message-bg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "message-fg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "message-limit", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
 	{ "mouse-select-pane", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "pane-active-border-bg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "pane-active-border-fg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "pane-border-bg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "pane-border-fg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "prefix", SET_OPTION_KEYS, 0, 0, NULL },
 	{ "repeat-time", SET_OPTION_NUMBER, 0, SHRT_MAX, NULL },
 	{ "set-remain-on-exit", SET_OPTION_FLAG, 0, 0, NULL },
@@ -115,7 +78,7 @@ const struct set_option_entry set_session_option_table[] = {
 	{ "status-bg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "status-fg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "status-interval", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
-	{ "status-justify",
+	{ "status-justify", 
 	  SET_OPTION_CHOICE, 0, 0, set_option_status_justify_list },
 	{ "status-keys", SET_OPTION_CHOICE, 0, 0, set_option_status_keys_list },
 	{ "status-left", SET_OPTION_STRING, 0, 0, NULL },
@@ -128,59 +91,20 @@ const struct set_option_entry set_session_option_table[] = {
 	{ "status-right-bg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "status-right-fg", SET_OPTION_COLOUR, 0, 0, NULL },
 	{ "status-right-length", SET_OPTION_NUMBER, 0, SHRT_MAX, NULL },
-	{ "status-utf8", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "status-utf8", SET_OPTION_FLAG, 0, 0, NULL },	
 	{ "terminal-overrides", SET_OPTION_STRING, 0, 0, NULL },
 	{ "update-environment", SET_OPTION_STRING, 0, 0, NULL },
 	{ "visual-activity", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "visual-bell", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "visual-bell", SET_OPTION_FLAG, 0, 0, NULL },	
 	{ "visual-content", SET_OPTION_FLAG, 0, 0, NULL },
 	{ NULL, 0, 0, 0, NULL }
 };

-const struct set_option_entry set_window_option_table[] = {
-	{ "aggressive-resize", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "alternate-screen", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "automatic-rename", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "clock-mode-colour", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "clock-mode-style",
-	  SET_OPTION_CHOICE, 0, 0, set_option_clock_mode_style_list },
-	{ "force-height", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
-	{ "force-width", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
-	{ "main-pane-height", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
-	{ "main-pane-width", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
-	{ "mode-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
-	{ "mode-bg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "mode-fg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "mode-keys", SET_OPTION_CHOICE, 0, 0, set_option_mode_keys_list },
-	{ "mode-mouse", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "monitor-activity", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "monitor-content", SET_OPTION_STRING, 0, 0, NULL },
-	{ "remain-on-exit", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "synchronize-panes", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "utf8", SET_OPTION_FLAG, 0, 0, NULL },
-	{ "window-status-alert-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
-	{ "window-status-alert-bg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "window-status-alert-fg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "window-status-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
-	{ "window-status-bg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "window-status-current-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
-	{ "window-status-current-bg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "window-status-current-fg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "window-status-current-format", SET_OPTION_STRING, 0, 0, NULL },
-	{ "window-status-fg", SET_OPTION_COLOUR, 0, 0, NULL },
-	{ "window-status-format", SET_OPTION_STRING, 0, 0, NULL },
-	{ "word-separators", SET_OPTION_STRING, 0, 0, NULL },
-	{ "xterm-keys", SET_OPTION_FLAG, 0, 0, NULL },
-	{ NULL, 0, 0, 0, NULL }
-};
-
 int
 cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data		*data = self->data;
-	const struct set_option_entry	*table;
 	struct session			*s;
-	struct winlink			*wl;
 	struct client			*c;
 	struct options			*oo;
 	const struct set_option_entry   *entry, *opt;
@@ -189,29 +113,12 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
 	u_int				 i;
 	int				 try_again;

-	if (cmd_check_flag(data->chflags, 's')) {
-		oo = &global_options;
-		table = set_option_table;
-	} else if (cmd_check_flag(data->chflags, 'w')) {
-		table = set_window_option_table;
-		if (cmd_check_flag(data->chflags, 'g'))
-			oo = &global_w_options;
-		else {
-			wl = cmd_find_window(ctx, data->target, NULL);
-			if (wl == NULL)
-				return (-1);
-			oo = &wl->window->options;
-		}
-	} else {
-		table = set_session_option_table;
-		if (cmd_check_flag(data->chflags, 'g'))
-			oo = &global_s_options;
-		else {
-			s = cmd_find_session(ctx, data->target);
-			if (s == NULL)
-				return (-1);
-			oo = &s->options;
-		}
+	if (data->chflags & CMD_CHFLAG('g'))
+		oo = &global_s_options;
+	else {
+		if ((s = cmd_find_session(ctx, data->target)) == NULL)
+			return (-1);
+		oo = &s->options;
 	}

 	if (*data->arg == '\0') {
@@ -220,7 +127,7 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
 	}

 	entry = NULL;
-	for (opt = table; opt->name != NULL; opt++) {
+	for (opt = set_option_table; opt->name != NULL; opt++) {
 		if (strncmp(opt->name, data->arg, strlen(data->arg)) != 0)
 			continue;
 		if (entry != NULL) {
@@ -238,8 +145,8 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 	}

-	if (cmd_check_flag(data->chflags, 'u')) {
-		if (cmd_check_flag(data->chflags, 'g')) {
+	if (data->chflags & CMD_CHFLAG('u')) {
+		if (data->chflags & CMD_CHFLAG('g')) {
 			ctx->error(ctx,
 			    "can't unset global option: %s", entry->name);
 			return (-1);
@@ -255,46 +162,40 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
 	} else {
 		switch (entry->type) {
 		case SET_OPTION_STRING:
-			cmd_set_option_string(ctx, oo, entry,
-			    data->arg2, cmd_check_flag(data->chflags, 'a'));
+			set_option_string(ctx, oo, entry,
+			    data->arg2, data->chflags & CMD_CHFLAG('a'));
 			break;
 		case SET_OPTION_NUMBER:
-			cmd_set_option_number(ctx, oo, entry, data->arg2);
+			set_option_number(ctx, oo, entry, data->arg2);
 			break;
 		case SET_OPTION_KEYS:
-			cmd_set_option_keys(ctx, oo, entry, data->arg2);
+			set_option_keys(ctx, oo, entry, data->arg2);
 			break;
 		case SET_OPTION_COLOUR:
-			cmd_set_option_colour(ctx, oo, entry, data->arg2);
+			set_option_colour(ctx, oo, entry, data->arg2);
 			break;
 		case SET_OPTION_ATTRIBUTES:
-			cmd_set_option_attributes(ctx, oo, entry, data->arg2);
+			set_option_attributes(ctx, oo, entry, data->arg2);
 			break;
 		case SET_OPTION_FLAG:
-			cmd_set_option_flag(ctx, oo, entry, data->arg2);
+			set_option_flag(ctx, oo, entry, data->arg2);
 			break;
 		case SET_OPTION_CHOICE:
-			cmd_set_option_choice(ctx, oo, entry, data->arg2);
+			set_option_choice(ctx, oo, entry, data->arg2);
 			break;
 		}
 	}

 	recalculate_sizes();
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL && c->session != NULL)
-			server_redraw_client(c);
-	}

-	/*
+	/* 
 	 * Special-case: kill all persistent jobs if status-left, status-right
 	 * or set-titles-string have changed. Persistent jobs are only used by
 	 * the status line at the moment so this works XXX.
 	 */
 	if (strcmp(entry->name, "status-left") == 0 ||
 	    strcmp(entry->name, "status-right") == 0 ||
-	    strcmp(entry->name, "set-titles-string") == 0 ||
-	    strcmp(entry->name, "window-status-format") == 0) {
+	    strcmp(entry->name, "set-titles-string") == 0) {
 		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 			c = ARRAY_ITEM(&clients, i);
 			if (c == NULL || c->session == NULL)
@@ -302,7 +203,7 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)

 			jobs = &c->status_jobs;
 			do {
-				try_again = 0;
+				try_again = 0;	
 				job = RB_ROOT(jobs);
 				while (job != NULL) {
 					nextjob = RB_NEXT(jobs, jobs, job);
@@ -320,243 +221,3 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)

 	return (0);
 }
-
-const char *
-cmd_set_option_print(
-    const struct set_option_entry *entry, struct options_entry *o)
-{
-	static char	out[BUFSIZ];
-	const char     *s;
-	struct keylist *keylist;
-	u_int		i;
-
-	*out = '\0';
-	switch (entry->type) {
-		case SET_OPTION_STRING:
-			xsnprintf(out, sizeof out, "\"%s\"", o->str);
-			break;
-		case SET_OPTION_NUMBER:
-			xsnprintf(out, sizeof out, "%lld", o->num);
-			break;
-		case SET_OPTION_KEYS:
-			keylist = o->data;
-			for (i = 0; i < ARRAY_LENGTH(keylist); i++) {
-				strlcat(out, key_string_lookup_key(
-				    ARRAY_ITEM(keylist, i)), sizeof out);
-				if (i != ARRAY_LENGTH(keylist) - 1)
-					strlcat(out, ",", sizeof out);
-			}
-			break;
-		case SET_OPTION_COLOUR:
-			s = colour_tostring(o->num);
-			xsnprintf(out, sizeof out, "%s", s);
-			break;
-		case SET_OPTION_ATTRIBUTES:
-			s = attributes_tostring(o->num);
-			xsnprintf(out, sizeof out, "%s", s);
-			break;
-		case SET_OPTION_FLAG:
-			if (o->num)
-				strlcpy(out, "on", sizeof out);
-			else
-				strlcpy(out, "off", sizeof out);
-			break;
-		case SET_OPTION_CHOICE:
-			s = entry->choices[o->num];
-			xsnprintf(out, sizeof out, "%s", s);
-			break;
-	}
-	return (out);
-}
-
-void
-cmd_set_option_string(struct cmd_ctx *ctx, struct options *oo,
-    const struct set_option_entry *entry, char *value, int append)
-{
-	struct options_entry	*o;
-	char			*oldvalue, *newvalue;
-
-	if (value == NULL) {
-		ctx->error(ctx, "empty value");
-		return;
-	}
-
-	if (append) {
-		oldvalue = options_get_string(oo, entry->name);
-		xasprintf(&newvalue, "%s%s", oldvalue, value);
-	} else
-		newvalue = value;
-
-	o = options_set_string(oo, entry->name, "%s", newvalue);
-	ctx->info(ctx,
-	    "set option: %s -> %s", o->name, cmd_set_option_print(entry, o));
-
-	if (newvalue != value)
-		xfree(newvalue);
-}
-
-void
-cmd_set_option_number(struct cmd_ctx *ctx, struct options *oo,
-    const struct set_option_entry *entry, char *value)
-{
-	struct options_entry	*o;
-	long long		 number;
-	const char     		*errstr;
-
-	if (value == NULL) {
-		ctx->error(ctx, "empty value");
-		return;
-	}
-
-	number = strtonum(value, entry->minimum, entry->maximum, &errstr);
-	if (errstr != NULL) {
-		ctx->error(ctx, "value is %s: %s", errstr, value);
-		return;
-	}
-
-	o = options_set_number(oo, entry->name, number);
-	ctx->info(ctx,
-	    "set option: %s -> %s", o->name, cmd_set_option_print(entry, o));
-}
-
-void
-cmd_set_option_keys(struct cmd_ctx *ctx, struct options *oo,
-    const struct set_option_entry *entry, char *value)
-{
-	struct options_entry	*o;
-	struct keylist		*keylist;
-	char			*copyvalue, *ptr, *str;
-	int		 	 key;
-
-	if (value == NULL) {
-		ctx->error(ctx, "empty value");
-		return;
-	}
-
-	keylist = xmalloc(sizeof *keylist);
-	ARRAY_INIT(keylist);
-
-	ptr = copyvalue = xstrdup(value);
-	while ((str = strsep(&ptr, ",")) != NULL) {
-		if ((key = key_string_lookup_string(str)) == KEYC_NONE) {
-			xfree(keylist);
-			ctx->error(ctx, "unknown key: %s", str);
-			xfree(copyvalue);
-			return;
-		}
-		ARRAY_ADD(keylist, key);
-	}
-	xfree(copyvalue);
-
-	o = options_set_data(oo, entry->name, keylist, xfree);
-	ctx->info(ctx,
-	    "set option: %s -> %s", o->name, cmd_set_option_print(entry, o));
-}
-
-void
-cmd_set_option_colour(struct cmd_ctx *ctx, struct options *oo,
-    const struct set_option_entry *entry, char *value)
-{
-	struct options_entry	*o;
-	int			 colour;
-
-	if (value == NULL) {
-		ctx->error(ctx, "empty value");
-		return;
-	}
-
-	if ((colour = colour_fromstring(value)) == -1) {
-		ctx->error(ctx, "bad colour: %s", value);
-		return;
-	}
-
-	o = options_set_number(oo, entry->name, colour);
-	ctx->info(ctx,
-	    "set option: %s -> %s", o->name, cmd_set_option_print(entry, o));
-}
-
-void
-cmd_set_option_attributes(struct cmd_ctx *ctx, struct options *oo,
-    const struct set_option_entry *entry, char *value)
-{
-	struct options_entry	*o;
-	int			 attr;
-
-	if (value == NULL) {
-		ctx->error(ctx, "empty value");
-		return;
-	}
-
-	if ((attr = attributes_fromstring(value)) == -1) {
-		ctx->error(ctx, "bad attributes: %s", value);
-		return;
-	}
-
-	o = options_set_number(oo, entry->name, attr);
-	ctx->info(ctx,
-	    "set option: %s -> %s", o->name, cmd_set_option_print(entry, o));
-}
-
-void
-cmd_set_option_flag(struct cmd_ctx *ctx, struct options *oo,
-    const struct set_option_entry *entry, char *value)
-{
-	struct options_entry	*o;
-	int			 flag;
-
-	if (value == NULL || *value == '\0')
-		flag = !options_get_number(oo, entry->name);
-	else {
-		if ((value[0] == '1' && value[1] == '\0') ||
-		    strcasecmp(value, "on") == 0 ||
-		    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 {
-			ctx->error(ctx, "bad value: %s", value);
-			return;
-		}
-	}
-
-	o = options_set_number(oo, entry->name, flag);
-	ctx->info(ctx,
-	    "set option: %s -> %s", o->name, cmd_set_option_print(entry, o));
-}
-
-void
-cmd_set_option_choice(struct cmd_ctx *ctx, struct options *oo,
-    const struct set_option_entry *entry, char *value)
-{
-	struct options_entry	*o;
-	const char     	       **choicep;
-	int		 	 n, choice = -1;
-
-	if (value == NULL) {
-		ctx->error(ctx, "empty value");
-		return;
-	}
-
-	n = 0;
-	for (choicep = entry->choices; *choicep != NULL; choicep++) {
-		n++;
-		if (strncmp(*choicep, value, strlen(value)) != 0)
-			continue;
-
-		if (choice != -1) {
-			ctx->error(ctx, "ambiguous option value: %s", value);
-			return;
-		}
-		choice = n - 1;
-	}
-	if (choice == -1) {
-		ctx->error(ctx, "unknown option value: %s", value);
-		return;
-	}
-
-	o = options_set_number(oo, entry->name, choice);
-	ctx->info(ctx,
-	    "set option: %s -> %s", o->name, cmd_set_option_print(entry, o));
-}
--- a/cmd-set-window-option.c
+++ b/cmd-set-window-option.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-window-option.c,v 1.43 2009-12-04 22:11:23 tcunha Exp $ */
+/* $Id: cmd-set-window-option.c,v 1.40 2009-10-09 13:07:04 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,10 +18,13 @@

 #include <sys/types.h>

+#include <stdlib.h>
+#include <string.h>
+
 #include "tmux.h"

 /*
- * Set a window option. This is just an alias for set-option -w.
+ * Set a window option.
 */

 int	cmd_set_window_option_exec(struct cmd *, struct cmd_ctx *);
@@ -29,7 +32,7 @@ int	cmd_set_window_option_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_set_window_option_entry = {
 	"set-window-option", "setw",
 	"[-agu] " CMD_TARGET_WINDOW_USAGE " option [value]",
-	CMD_ARG12, "agu",
+	CMD_ARG12, CMD_CHFLAG('a')|CMD_CHFLAG('g')|CMD_CHFLAG('u'),
 	NULL,
 	cmd_target_parse,
 	cmd_set_window_option_exec,
@@ -37,11 +40,131 @@ const struct cmd_entry cmd_set_window_option_entry = {
 	cmd_target_print
 };

+const char *set_option_mode_keys_list[] = {
+	"emacs", "vi", NULL
+};
+const char *set_option_clock_mode_style_list[] = {
+	"12", "24", NULL
+};
+const struct set_option_entry set_window_option_table[] = {
+	{ "aggressive-resize", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "automatic-rename", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "clock-mode-colour", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "clock-mode-style",
+	  SET_OPTION_CHOICE, 0, 0, set_option_clock_mode_style_list },
+	{ "force-height", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
+	{ "force-width", SET_OPTION_NUMBER, 0, INT_MAX, NULL },
+	{ "main-pane-height", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
+	{ "main-pane-width", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
+	{ "mode-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
+	{ "mode-bg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "mode-fg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "mode-keys", SET_OPTION_CHOICE, 0, 0, set_option_mode_keys_list },
+	{ "mode-mouse", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "monitor-activity", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "monitor-content", SET_OPTION_STRING, 0, 0, NULL },
+	{ "remain-on-exit", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "synchronize-panes", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "utf8", SET_OPTION_FLAG, 0, 0, NULL },
+	{ "window-status-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
+	{ "window-status-bg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "window-status-current-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
+	{ "window-status-current-bg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "window-status-current-fg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "window-status-fg", SET_OPTION_COLOUR, 0, 0, NULL },
+	{ "xterm-keys", SET_OPTION_FLAG, 0, 0, NULL },
+	{ NULL, 0, 0, 0, NULL }
+};
+
 int
 cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data		*data = self->data;
+	struct winlink			*wl;
+	struct client			*c;
+	struct options			*oo;
+	const struct set_option_entry   *entry, *opt;
+	u_int				 i;

-	cmd_set_flag(&data->chflags, 'w');
-	return (cmd_set_option_entry.exec(self, ctx));
+	if (data->chflags & CMD_CHFLAG('g'))
+		oo = &global_w_options;
+	else {
+		if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
+			return (-1);
+		oo = &wl->window->options;
+	}
+
+	if (*data->arg == '\0') {
+		ctx->error(ctx, "invalid option");
+		return (-1);
+	}
+
+	entry = NULL;
+	for (opt = set_window_option_table; opt->name != NULL; opt++) {
+		if (strncmp(opt->name, data->arg, strlen(data->arg)) != 0)
+			continue;
+		if (entry != NULL) {
+			ctx->error(ctx, "ambiguous option: %s", data->arg);
+			return (-1);
+		}
+		entry = opt;
+
+		/* Bail now if an exact match. */
+		if (strcmp(entry->name, data->arg) == 0)
+			break;
+	}
+	if (entry == NULL) {
+		ctx->error(ctx, "unknown option: %s", data->arg);
+		return (-1);
+	}
+
+	if (data->chflags & CMD_CHFLAG('u')) {
+		if (data->chflags & CMD_CHFLAG('g')) {
+			ctx->error(ctx,
+			    "can't unset global option: %s", entry->name);
+			return (-1);
+		}
+		if (data->arg2 != NULL) {
+			ctx->error(ctx,
+			    "value passed to unset option: %s", entry->name);
+			return (-1);
+		}
+
+		options_remove(oo, entry->name);
+		ctx->info(ctx, "unset option: %s", entry->name);
+	} else {
+		switch (entry->type) {
+		case SET_OPTION_STRING:
+			set_option_string(ctx, oo, entry,
+			    data->arg2, data->chflags & CMD_CHFLAG('a'));
+			break;
+		case SET_OPTION_NUMBER:
+			set_option_number(ctx, oo, entry, data->arg2);
+			break;
+		case SET_OPTION_KEYS:
+			set_option_keys(ctx, oo, entry, data->arg2);
+			break;
+		case SET_OPTION_COLOUR:
+			set_option_colour(ctx, oo, entry, data->arg2);
+			break;
+		case SET_OPTION_ATTRIBUTES:
+			set_option_attributes(ctx, oo, entry, data->arg2);
+			break;
+		case SET_OPTION_FLAG:
+			set_option_flag(ctx, oo, entry, data->arg2);
+			break;
+		case SET_OPTION_CHOICE:
+			set_option_choice(ctx, oo, entry, data->arg2);
+			break;
+		}
+	}
+
+	recalculate_sizes();
+	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+		c = ARRAY_ITEM(&clients, i);
+		if (c != NULL && c->session != NULL)
+			server_redraw_client(c);
+	}
+
+	return (0);
 }
--- a/cmd-show-buffer.c
+++ b/cmd-show-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-show-buffer.c,v 1.12 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-show-buffer.c,v 1.10 2009-09-07 23:48:54 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_show_buffer_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_show_buffer_entry = {
 	"show-buffer", "showb",
 	CMD_BUFFER_SESSION_USAGE,
-	0, "",
+	0, 0,
 	cmd_buffer_init,
 	cmd_buffer_parse,
 	cmd_show_buffer_exec,
@@ -71,24 +71,24 @@ cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 	width = s->sx;
 	if (ctx->cmdclient != NULL)
 		width = ctx->cmdclient->tty.sx;
-
+	
 	buf = xmalloc(width + 1);
 	len = 0;
-
+	
 	ptr = in;
 	do {
 		buf[len++] = *ptr++;
-
+		
 		if (len == width || buf[len - 1] == '\n') {
 			if (buf[len - 1] == '\n')
 				len--;
 			buf[len] = '\0';

-			ctx->print(ctx, "%s", buf);
+			ctx->print(ctx, "%s", buf);		
 			len = 0;
 		}
 	} while (*ptr != '\0');
-
+	
 	if (len != 0) {
 		buf[len] = '\0';
 		ctx->print(ctx, "%s", buf);
--- a/cmd-show-environment.c
+++ b/cmd-show-environment.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-show-environment.c,v 1.2 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-show-environment.c,v 1.1 2009-08-09 17:48:55 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ int	cmd_show_environment_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_show_environment_entry = {
 	"show-environment", "showenv",
 	"[-g] " CMD_TARGET_SESSION_USAGE,
-	0, "g",
+	0, CMD_CHFLAG('g'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_show_environment_exec,
@@ -48,7 +48,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct environ			*env;
 	struct environ_entry		*envent;

-	if (cmd_check_flag(data->chflags, 'g'))
+	if (data->chflags & CMD_CHFLAG('g'))
 		env = &global_environ;
 	else {
 		if ((s = cmd_find_session(ctx, data->target)) == NULL)
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-show-options.c,v 1.21 2009-12-10 16:59:02 tcunha Exp $ */
+/* $Id: cmd-show-options.c,v 1.17 2009-09-22 13:56:02 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,8 +31,8 @@ int	cmd_show_options_exec(struct cmd *, struct cmd_ctx *);

 const struct cmd_entry cmd_show_options_entry = {
 	"show-options", "show",
-	"[-gsw] [-t target-session|target-window]",
-	0, "gsw",
+	"[-g] " CMD_TARGET_SESSION_USAGE,
+	0, CMD_CHFLAG('g'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_show_options_exec,
@@ -44,43 +44,24 @@ int
 cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data		*data = self->data;
-	const struct set_option_entry	*table;
 	struct session			*s;
-	struct winlink			*wl;
 	struct options			*oo;
 	struct options_entry		*o;
 	const struct set_option_entry   *entry;
 	const char			*optval;

-	if (cmd_check_flag(data->chflags, 's')) {
-		oo = &global_options;
-		table = set_option_table;
-	} else if (cmd_check_flag(data->chflags, 'w')) {
-		table = set_window_option_table;
-		if (cmd_check_flag(data->chflags, 'g'))
-			oo = &global_w_options;
-		else {
-			wl = cmd_find_window(ctx, data->target, NULL);
-			if (wl == NULL)
-				return (-1);
-			oo = &wl->window->options;
-		}
-	} else {
-		table = set_session_option_table;
-		if (cmd_check_flag(data->chflags, 'g'))
-			oo = &global_s_options;
-		else {
-			s = cmd_find_session(ctx, data->target);
-			if (s == NULL)
-				return (-1);
-			oo = &s->options;
-		}
+	if (data->chflags & CMD_CHFLAG('g'))
+		oo = &global_s_options;
+	else {
+		if ((s = cmd_find_session(ctx, data->target)) == NULL)
+			return (-1);
+		oo = &s->options;
 	}

-	for (entry = table; entry->name != NULL; entry++) {
+	for (entry = set_option_table; entry->name != NULL; entry++) {
 		if ((o = options_find1(oo, entry->name)) == NULL)
 			continue;
-		optval = cmd_set_option_print(entry, o);
+		optval = set_option_print(entry, o);
 		ctx->print(ctx, "%s %s", entry->name, optval);
 	}

--- a/cmd-show-window-options.c
+++ b/cmd-show-window-options.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-show-window-options.c,v 1.15 2009-12-04 22:11:23 tcunha Exp $ */
+/* $Id: cmd-show-window-options.c,v 1.13 2009-09-22 13:56:02 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,7 +24,7 @@
 #include "tmux.h"

 /*
- * Show window options. This is an alias for show-options -w.
+ * Show window options.
 */

 int	cmd_show_window_options_exec(struct cmd *, struct cmd_ctx *);
@@ -32,7 +32,7 @@ int	cmd_show_window_options_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_show_window_options_entry = {
 	"show-window-options", "showw",
 	"[-g] " CMD_TARGET_WINDOW_USAGE,
-	0, "g",
+	0, CMD_CHFLAG('g'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_show_window_options_exec,
@@ -44,7 +44,26 @@ int
 cmd_show_window_options_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data		*data = self->data;
+	struct winlink			*wl;
+	struct options			*oo;
+	struct options_entry		*o;
+	const struct set_option_entry	*entry;
+	const char			*optval;

-	cmd_set_flag(&data->chflags, 'w');
-	return (cmd_show_options_entry.exec(self, ctx));
+	if (data->chflags & CMD_CHFLAG('g'))
+		oo = &global_w_options;
+	else {
+		if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
+			return (-1);
+		oo = &wl->window->options;
+	}
+
+	for (entry = set_window_option_table; entry->name != NULL; entry++) {
+		if ((o = options_find1(oo, entry->name)) == NULL)
+			continue;
+		optval = set_option_print(entry, o);
+		ctx->print(ctx, "%s %s", entry->name, optval);
+	}
+
+	return (0);
 }
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-source-file.c,v 1.13 2010-02-08 18:29:32 tcunha Exp $ */
+/* $Id: cmd-source-file.c,v 1.9 2009-09-22 14:06:40 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
@@ -37,7 +37,7 @@ struct cmd_source_file_data {
 const struct cmd_entry cmd_source_file_entry = {
 	"source-file", "source",
 	"path",
-	0, "",
+	0, 0,
 	cmd_source_file_init,
 	cmd_source_file_parse,
 	cmd_source_file_exec,
@@ -45,7 +45,6 @@ const struct cmd_entry cmd_source_file_entry = {
 	cmd_source_file_print
 };

-/* ARGSUSED */
 void
 cmd_source_file_init(struct cmd *self, unused int arg)
 {
@@ -89,18 +88,12 @@ int
 cmd_source_file_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_source_file_data	*data = self->data;
-	struct causelist		 causes;
 	char				*cause;
-	u_int				 i;

-	ARRAY_INIT(&causes);
-	if (load_cfg(data->path, ctx, &causes) != 0) {
-		for (i = 0; i < ARRAY_LENGTH(&causes); i++) {
-			cause = ARRAY_ITEM(&causes, i);
-			ctx->print(ctx, "%s", cause);
-			xfree(cause);
-		}
-		ARRAY_FREE(&causes);
+	if (load_cfg(data->path, ctx, &cause) != 0) {
+		ctx->error(ctx, "%s", cause);
+		xfree(cause);
+		return (-1);
 	}

 	return (0);
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-split-window.c,v 1.35 2010-07-02 02:49:19 tcunha Exp $ */
+/* $Id: cmd-split-window.c,v 1.28 2009-09-22 14:06:40 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,8 +44,8 @@ struct cmd_split_window_data {

 const struct cmd_entry cmd_split_window_entry = {
 	"split-window", "splitw",
-	"[-dhv] [-p percentage|-l size] [-t target-pane] [command]",
-	0, "",
+	"[-dhv] [-p percentage|-l size] [-t target-window] [command]",
+	0, 0,
 	cmd_split_window_init,
 	cmd_split_window_parse,
 	cmd_split_window_exec,
@@ -69,7 +69,7 @@ cmd_split_window_init(struct cmd *self, int key)
 	switch (key) {
 	case '%':
 		data->flag_horizontal = 1;
-		break;
+		break;		
 	case '"':
 		data->flag_horizontal = 0;
 		break;
@@ -148,16 +148,15 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session			*s;
 	struct winlink			*wl;
 	struct window			*w;
-	struct window_pane		*wp, *new_wp = NULL;
+	struct window_pane		*wp;
 	struct environ			 env;
 	char		 		*cmd, *cwd, *cause;
 	const char			*shell;
 	u_int				 hlimit;
 	int				 size;
 	enum layout_type		 type;
-	struct layout_cell		*lc;

-	if ((wl = cmd_find_pane(ctx, data->target, &s, &wp)) == NULL)
+	if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
 		return (-1);
 	w = wl->window;

@@ -169,47 +168,38 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	cmd = data->cmd;
 	if (cmd == NULL)
 		cmd = options_get_string(&s->options, "default-command");
-	cwd = options_get_string(&s->options, "default-path");
-	if (*cwd == '\0') {
-		if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
-			cwd = ctx->cmdclient->cwd;
-		else
-			cwd = s->cwd;
-	}
+	if (ctx->cmdclient == NULL || ctx->cmdclient->cwd == NULL)
+		cwd = options_get_string(&s->options, "default-path");
+	else
+		cwd = ctx->cmdclient->cwd;
+
+	size = -1;
+	if (data->size != -1)
+		size = data->size;
+	else if (data->percentage != -1)
+		size = (w->active->sy * data->percentage) / 100;
+	hlimit = options_get_number(&s->options, "history-limit");

 	type = LAYOUT_TOPBOTTOM;
 	if (data->flag_horizontal)
 		type = LAYOUT_LEFTRIGHT;

-	size = -1;
-	if (data->size != -1)
-		size = data->size;
-	else if (data->percentage != -1) {
-		if (type == LAYOUT_TOPBOTTOM)
-			size = (wp->sy * data->percentage) / 100;
-		else
-			size = (wp->sx * data->percentage) / 100;
-	}
-	hlimit = options_get_number(&s->options, "history-limit");
-
 	shell = options_get_string(&s->options, "default-shell");
 	if (*shell == '\0' || areshell(shell))
 		shell = _PATH_BSHELL;

-	if ((lc = layout_split_pane(wp, type, size)) == NULL) {
+	wp = window_add_pane(w, hlimit);
+	if (window_pane_spawn(wp, cmd, shell, cwd, &env, s->tio, &cause) != 0)
+		goto error;
+	if (layout_split_pane(w->active, type, size, wp) != 0) {
 		cause = xstrdup("pane too small");
 		goto error;
 	}
-	new_wp = window_add_pane(w, hlimit);
-	if (window_pane_spawn(
-	    new_wp, cmd, shell, cwd, &env, s->tio, &cause) != 0)
-		goto error;
-	layout_assign_pane(lc, new_wp);

 	server_redraw_window(w);

 	if (!data->flag_detached) {
-		window_set_active_pane(w, new_wp);
+		window_set_active_pane(w, wp);
 		session_select(s, wl->idx);
 		server_redraw_session(s);
 	} else
@@ -220,8 +210,8 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)

 error:
 	environ_free(&env);
-	if (new_wp != NULL)
-		window_remove_pane(w, new_wp);
+	if (wp != NULL)
+		window_remove_pane(w, wp);
 	ctx->error(ctx, "create pane failed: %s", cause);
 	xfree(cause);
 	return (-1);
--- a/cmd-start-server.c
+++ b/cmd-start-server.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-start-server.c,v 1.10 2009-11-28 14:50:36 tcunha Exp $ */
+/* $Id: cmd-start-server.c,v 1.8 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_start_server_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_start_server_entry = {
 	"start-server", "start",
 	"",
-	CMD_STARTSERVER, "",
+	CMD_STARTSERVER, 0,
 	NULL,
 	NULL,
 	cmd_start_server_exec,
@@ -37,7 +37,6 @@ const struct cmd_entry cmd_start_server_entry = {
 	NULL
 };

-/* ARGSUSED */
 int
 cmd_start_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
 {
--- a/cmd-string.c
+++ b/cmd-string.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-string.c,v 1.31 2010-02-26 13:27:38 tcunha Exp $ */
+/* $Id: cmd-string.c,v 1.24 2009-10-28 23:12:38 tcunha Exp $ */

 /*
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@
 */

 int	cmd_string_getc(const char *, size_t *);
-void	cmd_string_ungetc(size_t *);
+void	cmd_string_ungetc(const char *, size_t *);
 char   *cmd_string_string(const char *, size_t *, char, int);
 char   *cmd_string_variable(const char *, size_t *);
 char   *cmd_string_expand_tilde(const char *, size_t *);
@@ -40,15 +40,13 @@ char   *cmd_string_expand_tilde(const char *, size_t *);
 int
 cmd_string_getc(const char *s, size_t *p)
 {
-	const u_char	*ucs = s;
-
-	if (ucs[*p] == '\0')
+	if (s[*p] == '\0')
 		return (EOF);
-	return (ucs[(*p)++]);
+	return (s[(*p)++]);
 }

 void
-cmd_string_ungetc(size_t *p)
+cmd_string_ungetc(unused const char *s, size_t *p)
 {
 	(*p)--;
 }
@@ -61,7 +59,7 @@ int
 cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
 {
 	size_t		p;
-	int		ch, i, argc, rval;
+	int		ch, i, argc, rval, have_arg;
 	char	      **argv, *buf, *t;
 	const char     *whitespace, *equals;
 	size_t		len;
@@ -72,6 +70,8 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
 	buf = NULL;
 	len = 0;

+	have_arg = 0;
+
 	*cause = NULL;

 	*cmdlist = NULL;
@@ -88,6 +88,8 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
 			strlcpy(buf + len, t, strlen(t) + 1);
 			len += strlen(t);
 			xfree(t);
+
+			have_arg = 1;
 			break;
 		case '"':
 			if ((t = cmd_string_string(s, &p, '"', 1)) == NULL)
@@ -96,6 +98,8 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
 			strlcpy(buf + len, t, strlen(t) + 1);
 			len += strlen(t);
 			xfree(t);
+
+			have_arg = 1;
 			break;
 		case '$':
 			if ((t = cmd_string_variable(s, &p)) == NULL)
@@ -104,6 +108,8 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
 			strlcpy(buf + len, t, strlen(t) + 1);
 			len += strlen(t);
 			xfree(t);
+
+			have_arg = 1;
 			break;
 		case '#':
 			/* Comment: discard rest of line. */
@@ -113,7 +119,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
 		case EOF:
 		case ' ':
 		case '\t':
-			if (buf != NULL) {
+ 			if (have_arg) {
 				buf = xrealloc(buf, 1, len + 1);
 				buf[len] = '\0';

@@ -122,19 +128,23 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)

 				buf = NULL;
 				len = 0;
+
+				have_arg = 0;
 			}

 			if (ch != EOF)
 				break;
+			if (argc == 0)
+				goto out;

-			while (argc != 0) {
-				equals = strchr(argv[0], '=');
-				whitespace = argv[0] + strcspn(argv[0], " \t");
+			for (i = 0; i < argc; i++) {
+				equals = strchr(argv[i], '=');
+				whitespace = argv[i] + strcspn(argv[i], " \t");
 				if (equals == NULL || equals > whitespace)
 					break;
-				environ_put(&global_environ, argv[0]);
+				environ_put(&global_environ, argv[i]);
+				memmove(&argv[i], &argv[i + 1], argc - i - 1);
 				argc--;
-				memmove(argv, argv + 1, argc * (sizeof *argv));
 			}
 			if (argc == 0)
 				goto out;
@@ -143,10 +153,14 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
 			if (*cmdlist == NULL)
 				goto out;

+			do
+				xfree(argv[argc - 1]);
+			while (--argc > 0);
+
 			rval = 0;
 			goto out;
 		case '~':
-			if (buf == NULL) {
+			if (have_arg == 0) {
 				if ((t = cmd_string_expand_tilde(s, &p)) == NULL)
 					goto error;
 				buf = xrealloc(buf, 1, len + strlen(t) + 1);
@@ -162,6 +176,8 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)

 			buf = xrealloc(buf, 1, len + 1);
 			buf[len++] = ch;
+
+			have_arg = 1;
 			break;
 		}
 	}
@@ -173,11 +189,10 @@ out:
 	if (buf != NULL)
 		xfree(buf);

-	if (argv != NULL) {
-		for (i = 0; i < argc; i++)
-			xfree(argv[i]);
+	while (--argc >= 0)
+		xfree(argv[argc]);
+	if (argv != NULL)
 		xfree(argv);
-	}

 	return (rval);
 }
@@ -296,7 +311,7 @@ cmd_string_variable(const char *s, size_t *p)
 	if (fch == '{' && ch != '}')
 		goto error;
 	if (ch != EOF && fch != '{')
-		cmd_string_ungetc(p); /* ch */
+		cmd_string_ungetc(s, p); /* ch */

 	buf = xrealloc(buf, 1, len + 1);
 	buf[len] = '\0';
@@ -322,17 +337,18 @@ cmd_string_expand_tilde(const char *s, size_t *p)

 	home = NULL;
 	if (cmd_string_getc(s, p) == '/') {
-		if ((home = getenv("HOME")) == NULL || *home == '\0') {
+		if ((home = getenv("HOME")) == NULL) {
 			if ((pw = getpwuid(getuid())) != NULL)
 				home = pw->pw_dir;
 		}
 	} else {
-		cmd_string_ungetc(p);
+		cmd_string_ungetc(s, p);
 		if ((username = cmd_string_string(s, p, '/', 0)) == NULL)
 			return (NULL);
 		if ((pw = getpwnam(username)) != NULL)
 			home = pw->pw_dir;
-		xfree(username);
+		if (username != NULL)
+			xfree(username);
 	}
 	if (home == NULL)
 		return (NULL);
--- a/cmd-suspend-client.c
+++ b/cmd-suspend-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-suspend-client.c,v 1.5 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-suspend-client.c,v 1.4 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -37,7 +37,7 @@ struct cmd_suspend_client_data {
 const struct cmd_entry cmd_suspend_client_entry = {
 	"suspend-client", "suspendc",
 	"[-c target-client]",
-	0, "",
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_suspend_client_exec,
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-swap-pane.c,v 1.15 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-swap-pane.c,v 1.13 2009-07-30 21:04:40 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ int	cmd_swap_pane_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_swap_pane_entry = {
 	"swap-pane", "swapp",
 	"[-dDU] " CMD_SRCDST_PANE_USAGE,
-	0, "dDU",
+	0, CMD_CHFLAG('d')|CMD_CHFLAG('D')|CMD_CHFLAG('U'),
 	cmd_swap_pane_init,
 	cmd_srcdst_parse,
 	cmd_swap_pane_exec,
@@ -49,12 +49,11 @@ cmd_swap_pane_init(struct cmd *self, int key)
 	data = self->data;

 	if (key == '{')
-		cmd_set_flag(&data->chflags, 'U');
+		data->chflags |= CMD_CHFLAG('U');
 	else if (key == '}')
-		cmd_set_flag(&data->chflags, 'D');
+		data->chflags |= CMD_CHFLAG('D');
 }

-
 int
 cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
@@ -74,11 +73,11 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)

 	if (data->src == NULL) {
 		src_w = dst_w;
-		if (cmd_check_flag(data->chflags, 'D')) {
+		if (data->chflags & CMD_CHFLAG('D')) {
 			src_wp = TAILQ_NEXT(dst_wp, entry);
 			if (src_wp == NULL)
 				src_wp = TAILQ_FIRST(&dst_w->panes);
-		} else if (cmd_check_flag(data->chflags, 'U')) {
+		} else if (data->chflags & CMD_CHFLAG('U')) {
 			src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
 			if (src_wp == NULL)
 				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
@@ -110,7 +109,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	dst_wp->layout_cell = src_lc;
 	dst_lc->wp = src_wp;
 	src_wp->layout_cell = dst_lc;
-
+	
 	src_wp->window = dst_w;
 	dst_wp->window = src_w;

@@ -121,7 +120,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	dst_wp->xoff = xoff; dst_wp->yoff = yoff;
 	window_pane_resize(dst_wp, sx, sy);

-	if (!cmd_check_flag(data->chflags, 'd')) {
+	if (!(data->chflags & CMD_CHFLAG('d'))) {
 		if (src_w != dst_w) {
 			window_set_active_pane(src_w, dst_wp);
 			window_set_active_pane(dst_w, src_wp);
--- a/cmd-swap-window.c
+++ b/cmd-swap-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-swap-window.c,v 1.19 2009-11-14 17:56:39 tcunha Exp $ */
+/* $Id: cmd-swap-window.c,v 1.18 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@ int	cmd_swap_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_swap_window_entry = {
 	"swap-window", "swapw",
 	"[-d] " CMD_SRCDST_WINDOW_USAGE,
-	0, "d",
+	0, CMD_CHFLAG('d'),
 	cmd_srcdst_init,
 	cmd_srcdst_parse,
 	cmd_swap_window_exec,
@@ -68,7 +68,7 @@ cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	wl_dst->window = wl_src->window;
 	wl_src->window = w;

-	if (!cmd_check_flag(data->chflags, 'd')) {
+	if (!(data->chflags & CMD_CHFLAG('d'))) {
 		session_select(dst, wl_dst->idx);
 		if (src != dst)
 			session_select(src, wl_src->idx);
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-switch-client.c,v 1.19 2010-01-25 17:12:44 tcunha Exp $ */
+/* $Id: cmd-switch-client.c,v 1.17 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -40,7 +40,7 @@ struct cmd_switch_client_data {
 const struct cmd_entry cmd_switch_client_entry = {
 	"switch-client", "switchc",
 	"[-c target-client] [-t target-session]",
-	0, "",
+	0, 0,
 	NULL,
 	cmd_switch_client_parse,
 	cmd_switch_client_exec,
@@ -61,12 +61,10 @@ cmd_switch_client_parse(struct cmd *self, int argc, char **argv, char **cause)
 	while ((opt = getopt(argc, argv, "c:t:")) != -1) {
 		switch (opt) {
 		case 'c':
-			if (data->name == NULL)
-				data->name = xstrdup(optarg);
+			data->name = xstrdup(optarg);
 			break;
 		case 't':
-			if (data->target == NULL)
-				data->target = xstrdup(optarg);
+			data->target = xstrdup(optarg);
 			break;
 		default:
 			goto usage;
--- a/cmd-unbind-key.c
+++ b/cmd-unbind-key.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-unbind-key.c,v 1.22 2010-01-25 17:12:44 tcunha Exp $ */
+/* $Id: cmd-unbind-key.c,v 1.20 2009-07-28 23:19:06 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -40,7 +40,7 @@ struct cmd_unbind_key_data {
 const struct cmd_entry cmd_unbind_key_entry = {
 	"unbind-key", "unbind",
 	"[-cn] [-t key-table] key",
-	0, "",
+	0, 0,
 	NULL,
 	cmd_unbind_key_parse,
 	cmd_unbind_key_exec,
@@ -67,8 +67,7 @@ cmd_unbind_key_parse(struct cmd *self, int argc, char **argv, char **cause)
 			no_prefix = 1;
 			break;
 		case 't':
-			if (data->tablename == NULL)
-				data->tablename = xstrdup(optarg);
+			data->tablename = xstrdup(optarg);
 			break;
 		default:
 			goto usage;
--- a/cmd-unlink-window.c
+++ b/cmd-unlink-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-unlink-window.c,v 1.21 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-unlink-window.c,v 1.19 2009-10-11 23:38:16 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ int	cmd_unlink_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_unlink_window_entry = {
 	"unlink-window", "unlinkw",
 	"[-k] " CMD_TARGET_WINDOW_USAGE,
-	0, "k",
+	0, CMD_CHFLAG('k'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_unlink_window_exec,
@@ -59,11 +59,11 @@ cmd_unlink_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	} else
 		references = 1;

-	if (!cmd_check_flag(data->chflags, 'k') && w->references == references) {
+	if (!(data->chflags & CMD_CHFLAG('k')) && w->references == references) {
 		ctx->error(ctx, "window is only linked to one session");
 		return (-1);
 	}
-
+	
 	server_unlink_window(s, wl);
 	recalculate_sizes();

--- a/cmd-show-messages.c
+++ b/cmd-show-messages.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-show-messages.c,v 1.2 2009-12-04 22:14:47 tcunha Exp $ */
+/* $Id: cmd-up-pane.c,v 1.12 2009-07-28 22:12:16 tcunha Exp $ */

 /*
 * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,48 +18,42 @@

 #include <sys/types.h>

-#include <string.h>
-#include <time.h>
-
 #include "tmux.h"

 /*
- * Show client message log.
+ * Move up a pane.
 */

-int	cmd_show_messages_exec(struct cmd *, struct cmd_ctx *);
+int	cmd_up_pane_exec(struct cmd *, struct cmd_ctx *);

-const struct cmd_entry cmd_show_messages_entry = {
-	"show-messages", "showmsgs",
-	CMD_TARGET_CLIENT_USAGE,
-	0, "",
+const struct cmd_entry cmd_up_pane_entry = {
+	"up-pane", "upp",
+	CMD_TARGET_WINDOW_USAGE,
+	0, 0,
 	cmd_target_init,
 	cmd_target_parse,
-	cmd_show_messages_exec,
+	cmd_up_pane_exec,
 	cmd_target_free,
 	cmd_target_print
 };

 int
-cmd_show_messages_exec(struct cmd *self, struct cmd_ctx *ctx)
+cmd_up_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct cmd_target_data		*data = self->data;
-	struct client			*c;
-	struct message_entry		*msg;
-	char				*tim;
-	u_int				 i;
+	struct cmd_target_data	*data = self->data;
+	struct winlink		*wl;
+	struct window		*w;

-	if ((c = cmd_find_client(ctx, data->target)) == NULL)
+	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
+	w = wl->window;

-	for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
-		msg = &ARRAY_ITEM(&c->message_log, i);
-
-		tim = ctime(&msg->msg_time);
-		*strchr(tim, '\n') = '\0';
-
-		ctx->print(ctx, "%s %s", tim, msg->msg);
-	}
+	do {
+		w->active = TAILQ_PREV(w->active, window_panes, entry);
+		if (w->active == NULL)
+			w->active = TAILQ_LAST(&w->panes, window_panes);
+	} while (!window_pane_visible(w->active));
+	server_status_window(wl->window);

 	return (0);
 }
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.142 2010-07-17 14:38:13 tcunha Exp $ */
+/* $Id: cmd.c,v 1.130 2009-11-04 22:46:25 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,8 +30,6 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_attach_session_entry,
 	&cmd_bind_key_entry,
 	&cmd_break_pane_entry,
-	&cmd_capture_pane_entry,
-	&cmd_choose_buffer_entry,
 	&cmd_choose_client_entry,
 	&cmd_choose_session_entry,
 	&cmd_choose_window_entry,
@@ -45,10 +43,10 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_detach_client_entry,
 	&cmd_display_message_entry,
 	&cmd_display_panes_entry,
+	&cmd_down_pane_entry,
 	&cmd_find_window_entry,
 	&cmd_has_session_entry,
 	&cmd_if_shell_entry,
-	&cmd_join_pane_entry,
 	&cmd_kill_pane_entry,
 	&cmd_kill_server_entry,
 	&cmd_kill_session_entry,
@@ -85,6 +83,7 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_save_buffer_entry,
 	&cmd_select_layout_entry,
 	&cmd_select_pane_entry,
+	&cmd_select_prompt_entry,
 	&cmd_select_window_entry,
 	&cmd_send_keys_entry,
 	&cmd_send_prefix_entry,
@@ -95,7 +94,6 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_set_window_option_entry,
 	&cmd_show_buffer_entry,
 	&cmd_show_environment_entry,
-	&cmd_show_messages_entry,
 	&cmd_show_options_entry,
 	&cmd_show_window_options_entry,
 	&cmd_source_file_entry,
@@ -107,6 +105,7 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_switch_client_entry,
 	&cmd_unbind_key_entry,
 	&cmd_unlink_window_entry,
+	&cmd_up_pane_entry,
 	NULL
 };

@@ -116,9 +115,6 @@ struct client	*cmd_lookup_client(const char *);
 struct session	*cmd_lookup_session(const char *, int *);
 struct winlink	*cmd_lookup_window(struct session *, const char *, int *);
 int		 cmd_lookup_index(struct session *, const char *, int *);
-struct winlink	*cmd_find_window_offset(const char *, struct session *, int *);
-int		 cmd_find_index_offset(const char *, struct session *, int *);
-struct window_pane	*cmd_find_pane_offset(const char *, struct winlink *);

 int
 cmd_pack_argv(int argc, char **argv, char *buf, size_t len)
@@ -170,7 +166,7 @@ cmd_free_argv(int argc, char **argv)
 	int	i;

 	if (argc == 0)
-		return;
+		return; 
 	for (i = 0; i < argc; i++) {
 		if (argv[i] != NULL)
 			xfree(argv[i]);
@@ -280,8 +276,9 @@ cmd_free(struct cmd *cmd)
 size_t
 cmd_print(struct cmd *cmd, char *buf, size_t len)
 {
-	if (cmd->entry->print == NULL)
+	if (cmd->entry->print == NULL) {
 		return (xsnprintf(buf, len, "%s", cmd->entry->name));
+	}
 	return (cmd->entry->print(cmd, buf, len));
 }

@@ -511,7 +508,7 @@ cmd_lookup_session(const char *name, int *ambiguous)
 	 * be unique so an exact match can't be ambigious and can just be
 	 * returned.
 	 */
-	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
+	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {	
 		if ((s = ARRAY_ITEM(&sessions, i)) == NULL)
 			continue;
 		if (strcmp(name, s->name) == 0)
@@ -523,7 +520,7 @@ cmd_lookup_session(const char *name, int *ambiguous)
 	 * be ambiguous.
 	 */
 	sfound = NULL;
-	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
+	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {	
 		if ((s = ARRAY_ITEM(&sessions, i)) == NULL)
 			continue;
 		if (strncmp(name, s->name, strlen(name)) == 0 ||
@@ -535,13 +532,13 @@ cmd_lookup_session(const char *name, int *ambiguous)
 			sfound = s;
 		}
 	}
-	return (sfound);
+ 	return (sfound);
 }

 /*
 * Lookup a window or return -1 if not found or ambigious. First try as an
 * index and if invalid, use fnmatch or leading prefix. Return NULL but fill in
- * idx if the window index is a valid number but there is no window with that
+ * idx if the window index is a valid number but there is now window with that
 * index.
 */
 struct winlink *
@@ -559,7 +556,7 @@ cmd_lookup_window(struct session *s, const char *name, int *ambiguous)
 		if ((wl = winlink_find_by_index(&s->windows, idx)) != NULL)
 			return (wl);
 	}
-
+		
 	/* Look for exact matches, error if more than one. */
 	wlfound = NULL;
 	RB_FOREACH(wl, winlinks, &s->windows) {
@@ -585,7 +582,7 @@ cmd_lookup_window(struct session *s, const char *name, int *ambiguous)
 			}
 			wlfound = wl;
 		}
-	}
+	}	
 	if (wlfound != NULL)
 		return (wlfound);

@@ -702,53 +699,32 @@ cmd_find_window(struct cmd_ctx *ctx, const char *arg, struct session **sp)

 	/*
 	 * Then work out the window. An empty string is the current window,
-	 * otherwise try special cases then to look it up in the session.
+	 * otherwise try to look it up in the session.
 	 */
 	if (*winptr == '\0')
 		wl = s->curw;
-	else if (winptr[0] == '!' && winptr[1] == '\0')
-		wl = TAILQ_FIRST(&s->lastw);
-	else if (winptr[0] == '+' || winptr[0] == '-')
-		wl = cmd_find_window_offset(winptr, s, &ambiguous);
-	else
-		wl = cmd_lookup_window(s, winptr, &ambiguous);
-	if (wl == NULL)
+	else if ((wl = cmd_lookup_window(s, winptr, &ambiguous)) == NULL)
 		goto not_found;
-
+	
 	if (sessptr != NULL)
 		xfree(sessptr);
 	return (wl);

 no_colon:
-	/*
-	 * No colon in the string, first try special cases, then as a window
-	 * and lastly as a session.
-	 */
-	if (arg[0] == '!' && arg[1] == '\0') {
-		if ((wl = TAILQ_FIRST(&s->lastw)) == NULL)
+	/* No colon in the string, first try as a window then as a session. */
+	if ((wl = cmd_lookup_window(s, arg, &ambiguous)) == NULL) {
+		if (ambiguous)
 			goto not_found;
-	} else if (arg[0] == '+' || arg[0] == '-') {
-		if ((wl = cmd_find_window_offset(arg, s, &ambiguous)) == NULL)
-			goto lookup_session;
-	} else if ((wl = cmd_lookup_window(s, arg, &ambiguous)) == NULL)
-		goto lookup_session;
+		if ((s = cmd_lookup_session(arg, &ambiguous)) == NULL)
+			goto no_session;
+		wl = s->curw;
+	}

 	if (sp != NULL)
 		*sp = s;

 	return (wl);

-lookup_session:
-	if (ambiguous)
-		goto not_found;
-	if ((s = cmd_lookup_session(arg, &ambiguous)) == NULL)
-		goto no_session;
-
-	if (sp != NULL)
-		*sp = s;
-
-	return (s->curw);
-
 no_session:
 	if (ambiguous)
 		ctx->error(ctx, "multiple sessions: %s", arg);
@@ -768,26 +744,6 @@ not_found:
 	return (NULL);
 }

-struct winlink *
-cmd_find_window_offset(const char *winptr, struct session *s, int *ambiguous)
-{
-	struct winlink	*wl;
-	int		 offset = 1;
-
-	if (winptr[1] != '\0')
-		offset = strtonum(winptr + 1, 1, INT_MAX, NULL);
-	if (offset == 0)
-		wl = cmd_lookup_window(s, winptr, ambiguous);
-	else {
-		if (winptr[0] == '+')
-			wl = winlink_next_by_number(s->curw, s, offset);
-		else
-			wl = winlink_previous_by_number(s->curw, s, offset);
-	}
-
-	return (wl);
-}
-
 /*
 * Find the target session and window index, whether or not it exists in the
 * session. Return -2 on error or -1 if no window index is specified. This is
@@ -798,7 +754,6 @@ int
 cmd_find_index(struct cmd_ctx *ctx, const char *arg, struct session **sp)
 {
 	struct session	*s;
-	struct winlink	*wl;
 	const char	*winptr;
 	char		*sessptr = NULL;
 	int		 idx, ambiguous = 0;
@@ -844,70 +799,42 @@ cmd_find_index(struct cmd_ctx *ctx, const char *arg, struct session **sp)
 	 * try to look it up in the session.
 	 */
 	if (*winptr == '\0')
-		idx = -1;
-	else if (winptr[0] == '!' && winptr[1] == '\0') {
-		if ((wl = TAILQ_FIRST(&s->lastw)) == NULL)
+		 idx = -1;
+	else if ((idx = cmd_lookup_index(s, winptr, &ambiguous)) == -1) {
+		if (ambiguous)
 			goto not_found;
-		idx = wl->idx;
-	} else if (winptr[0] == '+' || winptr[0] == '-') {
-		if ((idx = cmd_find_index_offset(winptr, s, &ambiguous)) < 0)
-			goto invalid_index;
-	} else if ((idx = cmd_lookup_index(s, winptr, &ambiguous)) == -1)
-		goto invalid_index;
-
+		ctx->error(ctx, "invalid index: %s", arg);
+		idx = -2;
+	}
+	
 	if (sessptr != NULL)
 		xfree(sessptr);
 	return (idx);

 no_colon:
-	/*
-	 * No colon in the string, first try special cases, then as a window
-	 * and lastly as a session.
-	 */
-	if (arg[0] == '!' && arg[1] == '\0') {
-		if ((wl = TAILQ_FIRST(&s->lastw)) == NULL)
+	/* No colon in the string, first try as a window then as a session. */
+	if ((idx = cmd_lookup_index(s, arg, &ambiguous)) == -1) {
+		if (ambiguous)
 			goto not_found;
-		idx = wl->idx;
-	} else if (arg[0] == '+' || arg[0] == '-') {
-		if ((idx = cmd_find_index_offset(arg, s, &ambiguous)) < 0)
-			goto lookup_session;
-	} else if ((idx = cmd_lookup_index(s, arg, &ambiguous)) == -1)
-		goto lookup_session;
+		if ((s = cmd_lookup_session(arg, &ambiguous)) == NULL)
+			goto no_session;
+		idx = -1;
+	}

 	if (sp != NULL)
 		*sp = s;

 	return (idx);

-lookup_session:
-	if (ambiguous)
-		goto not_found;
-	if ((s = cmd_lookup_session(arg, &ambiguous)) == NULL)
-		goto no_session;
-
-	if (sp != NULL)
-		*sp = s;
-
-	return (-1);
-
 no_session:
 	if (ambiguous)
-		ctx->error(ctx, "multiple sessions: %s", arg);
+ 		ctx->error(ctx, "multiple sessions: %s", arg);
 	else
 		ctx->error(ctx, "session not found: %s", arg);
 	if (sessptr != NULL)
 		xfree(sessptr);
 	return (-2);

-invalid_index:
-	if (ambiguous)
-		goto not_found;
-	ctx->error(ctx, "invalid index: %s", arg);
-
-	if (sessptr != NULL)
-		xfree(sessptr);
-	return (-2);
-
 not_found:
 	if (ambiguous)
 		ctx->error(ctx, "multiple windows: %s", arg);
@@ -918,32 +845,6 @@ not_found:
 	return (-2);
 }

-int
-cmd_find_index_offset(const char *winptr, struct session *s, int *ambiguous)
-{
-	int	idx, offset = 1;
-
-	if (winptr[1] != '\0')
-		offset = strtonum(winptr + 1, 1, INT_MAX, NULL);
-	if (offset == 0)
-		idx = cmd_lookup_index(s, winptr, ambiguous);
-	else {
-		if (winptr[0] == '+') {
-			if (s->curw->idx == INT_MAX)
-				idx = cmd_lookup_index(s, winptr, ambiguous);
-			else
-				idx = s->curw->idx + offset;
-		} else {
-			if (s->curw->idx == 0)
-				idx = cmd_lookup_index(s, winptr, ambiguous);
-			else
-				idx = s->curw->idx - offset;
-		}
-	}
-
-	return (idx);
-}
-
 /*
 * Find the target session, window and pane number or report an error and
 * return NULL. The pane number is separated from the session:window by a .,
@@ -953,12 +854,12 @@ struct winlink *
 cmd_find_pane(struct cmd_ctx *ctx,
    const char *arg, struct session **sp, struct window_pane **wpp)
 {
-	struct session		*s;
-	struct winlink		*wl;
-	struct layout_cell	*lc;
-	const char		*period, *errstr;
-	char			*winptr, *paneptr;
-	u_int			 idx;
+	struct session	*s;
+	struct winlink	*wl;
+	const char	*period;
+	char		*winptr, *paneptr;
+	const char	*errstr;
+	u_int		 idx;

 	/* Get the current session. */
 	if ((s = cmd_current_session(ctx)) == NULL) {
@@ -990,31 +891,22 @@ cmd_find_pane(struct cmd_ctx *ctx,
 	paneptr = winptr + (period - arg) + 1;
 	if (*paneptr == '\0')
 		*wpp = wl->window->active;
-	else if (paneptr[0] == '+' || paneptr[0] == '-')
-		*wpp = cmd_find_pane_offset(paneptr, wl);
 	else {
 		idx = strtonum(paneptr, 0, INT_MAX, &errstr);
-		if (errstr != NULL)
-			goto lookup_string;
+		if (errstr != NULL) {
+			ctx->error(ctx, "pane %s: %s", errstr, paneptr);
+			goto error;
+		}
 		*wpp = window_pane_at_index(wl->window, idx);
-		if (*wpp == NULL)
-			goto lookup_string;
+		if (*wpp == NULL) {
+			ctx->error(ctx, "no such pane: %u", idx);
+			goto error;
+		}
 	}

 	xfree(winptr);
 	return (wl);

-lookup_string:
-	/* Try pane string description. */
-	if ((lc = layout_find_string(wl->window, paneptr)) == NULL) {
-		ctx->error(ctx, "can't find pane: %s", paneptr);
-		goto error;
-	}
-	*wpp = lc->wp;
-
-	xfree(winptr);
-	return (wl);
-
 no_period:
 	/* Try as a pane number alone. */
 	idx = strtonum(arg, 0, INT_MAX, &errstr);
@@ -1024,45 +916,20 @@ no_period:
 	/* Try index in the current session and window. */
 	if ((*wpp = window_pane_at_index(s->curw->window, idx)) == NULL)
 		goto lookup_window;
-
+	
 	return (s->curw);

 lookup_window:
-	/* Try pane string description. */
-	if ((lc = layout_find_string(s->curw->window, arg)) != NULL) {
-		*wpp = lc->wp;
-		return (s->curw);
-	}
-
 	/* Try as a window and use the active pane. */
 	if ((wl = cmd_find_window(ctx, arg, sp)) != NULL)
 		*wpp = wl->window->active;
 	return (wl);
-
+	
 error:
 	xfree(winptr);
 	return (NULL);
 }

-struct window_pane *
-cmd_find_pane_offset(const char *paneptr, struct winlink *wl)
-{
-	struct window		*w = wl->window;
-	struct window_pane	*wp = w->active;
-	u_int			 offset = 1;
-
-	if (paneptr[1] != '\0')
-		offset = strtonum(paneptr + 1, 1, INT_MAX, NULL);
-	if (offset > 0) {
-		if (paneptr[0] == '+')
-			wp = window_pane_next_by_number(w, wp, offset);
-		else
-			wp = window_pane_previous_by_number(w, wp, offset);
-	}
-
-	return (wp);
-}
-
 /* Replace the first %% or %idx in template by s. */
 char *
 cmd_template_replace(char *template, const char *s, int idx)
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $Id: compat.h,v 1.25 2010-06-06 13:00:46 tcunha Exp $ */
+/* $Id: compat.h,v 1.19 2009-10-06 15:32:21 tcunha Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,13 +42,21 @@ typedef uint64_t u_int64_t;
 #else
 #include "compat/tree.h"
 #endif
-
+ 
 #ifdef HAVE_BITSTRING_H
 #include <bitstring.h>
 #else
 #include "compat/bitstring.h"
 #endif

+#ifdef HAVE_POLL
+#include <poll.h>
+#else
+#define POLLNVAL 0
+#define POLLHUP 0
+#include "compat/bsd-poll.h"
+#endif
+
 #ifdef HAVE_GETOPT
 #include <getopt.h>
 #endif
@@ -81,36 +89,17 @@ typedef uint64_t u_int64_t;

 #ifndef HAVE_IMSG
 #include "compat/imsg.h"
-#else
-#include <imsg.h>
 #endif

 #ifdef HAVE_BROKEN_CMSG_FIRSTHDR
-/* CMSG_FIRSTHDR broken on OS X. */
+/* Broken on OS X. */
 #undef CMSG_FIRSTHDR
 #define CMSG_FIRSTHDR(mhdr) \
-	((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
-	    (struct cmsghdr *)(mhdr)->msg_control :	    \
+        ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
+	    (struct cmsghdr *)(mhdr)->msg_control : \
 	    (struct cmsghdr *)NULL)
 #endif

-/* CMSG_ALIGN, CMSG_SPACE, CMSG_LEN missing from Solaris 9. */
-#ifndef CMSG_ALIGN
-#ifdef __sun
-#define CMSG_ALIGN _CMSG_DATA_ALIGN
-#else
-#define CMSG_ALIGN(len) (((len) + sizeof(long) - 1) & ~(sizeof(long) - 1))
-#endif
-#endif
-
-#ifndef CMSG_SPACE
-#define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(len))
-#endif
-
-#ifndef CMSG_LEN
-#define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
-#endif
-
 #ifndef INFTIM
 #define INFTIM -1
 #endif
@@ -154,7 +143,7 @@ typedef uint64_t u_int64_t;
 #endif

 #ifndef HAVE_BZERO
-#define bzero(buf, len) memset(buf, 0, len);
+#define bzero(buf, len) memset((buf), 0, (len));
 #endif

 #ifndef HAVE_STRCASESTR
@@ -194,19 +183,13 @@ pid_t		 forkpty(int *, char *, struct termios *, struct winsize *);

 #ifndef HAVE_ASPRINTF
 /* asprintf.c */
-int		 asprintf(char **, const char *, ...);
-int		 vasprintf(char **, const char *, va_list);
+int	asprintf(char **, const char *, ...);
+int	vasprintf(char **, const char *, va_list);
 #endif

 #ifndef HAVE_FGETLN
 /* fgetln.c */
-char		*fgetln(FILE *, size_t *);
-#endif
-
-#ifndef HAVE_SETENV
-/* setenv.c */
-int		 setenv(const char *, const char *, int);
-int		 unsetenv(const char *);
+char   *fgetln(FILE *, size_t *);
 #endif

 #ifndef HAVE_GETOPT
--- a/Show More
+++ b/Show More