===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** src/usr.bin/tmux/tmux.h	2009/07/23 20:24:27	1.53
--- src/usr.bin/tmux/tmux.h	2009/07/24 14:52:47	1.54
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.53 2009/07/23 20:24:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.54 2009/07/24 14:52:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 102,111 ****
  #define BELL_CURRENT 2
  
  /* Key codes. ncurses defines KEY_*. Grrr. */
! #define KEYC_NONE    0x0fff
! #define KEYC_ESCAPE  0x2000
! #define KEYC_CTRL    0x4000
! #define KEYC_SHIFT   0x8000
  
  enum key_code {
  	/* Mouse key. */
--- 102,113 ----
  #define BELL_CURRENT 2
  
  /* Key codes. ncurses defines KEY_*. Grrr. */
! #define KEYC_NONE 0xfff
! /* 0x1000 is base for special keys */
! #define KEYC_ESCAPE 0x2000
! #define KEYC_CTRL 0x4000
! #define KEYC_SHIFT 0x8000
! #define KEYC_PREFIX 0x10000
  
  enum key_code {
  	/* Mouse key. */
***************
*** 856,863 ****
  
  /* Key/command line command. */
  struct cmd_ctx {
- 	struct client  *cmdclient;
- 
  	/*
  	 * curclient is the client where this command was executed if inside
  	 * tmux. This is NULL if the command came from the command-line.
--- 858,863 ----
***************
*** 869,874 ****
--- 869,876 ----
  	 * configuration file.
  	 */
  	struct client  *curclient;
+ 	struct client  *cmdclient;
+ 
  	struct session *cursession;
  
  	struct msg_command_data	*msgdata;