Thomas Adam 
							
						 
					 
					
						
						
							
						
						130b77edc7 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2017-02-08 18:01:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						e100d465da 
					 
					
						
						
							
							Add support for scroll up escape sequence (CSI S) and use it when  
						
						 
						
						... 
						
						
						
						possible instead of sending individual line feeds. 
						
						
					 
					
						2017-02-08 17:31:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						9f66fb4fd7 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2017-02-07 00:01:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						d60e585d9e 
					 
					
						
						
							
							Use DECFRA on VT420 compatible terminals (so, xterm) and ED on all  
						
						 
						
						... 
						
						
						
						others for clearing panes. 
						
						
					 
					
						2017-02-06 22:05:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						418ab1a553 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2017-01-24 22:01:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						b77dd75b57 
					 
					
						
						
							
							Convert terminal-overrides to an array option.  
						
						 
						
						
						
						
					 
					
						2017-01-24 20:05:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						780dd7ac82 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2017-01-13 14:01:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						22a528905d 
					 
					
						
						
							
							Make options_get_string return const string.  
						
						 
						
						
						
						
					 
					
						2017-01-13 11:56:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						a64b7cfe5d 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2016-12-10 00:01:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						bee95bf378 
					 
					
						
						
							
							Spacing nits.  
						
						 
						
						
						
						
					 
					
						2016-12-09 21:39:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						b9dc855016 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	format.c
	osdep-openbsd.c 
						
						
					 
					
						2016-10-12 09:45:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						c426e485e5 
					 
					
						
						
							
							Loads more static, except for cmd-*.c and window-*.c.  
						
						 
						
						
						
						
					 
					
						2016-10-10 21:29:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						8cf1504ba6 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2016-01-29 12:01:16 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						427b820426 
					 
					
						
						
							
							Support for RGB colour, using the extended cell mechanism to avoid  
						
						 
						
						... 
						
						
						
						wasting unnecessary space. The 'Tc' flag must be set in the external
TERM entry (using terminal-overrides or a custom terminfo entry), if not
tmux will map to the closest of the 256 or 16 colour palettes.
Mostly from Suraj N Kurapati, based on a diff originally by someone else. 
						
						
					 
					
						2016-01-29 11:13:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						dc42c35f1f 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2016-01-19 18:01:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						995af0e2b7 
					 
					
						
						
							
							I no longer use my SourceForge address so replace it.  
						
						 
						
						
						
						
					 
					
						2016-01-19 15:59:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						5a5db02b85 
					 
					
						
						
							
							Merge branch 'master' of github.com:tmux/tmux  
						
						 
						
						
						
						
					 
					
						2015-12-11 19:59:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						38cc1a1843 
					 
					
						
						
							
							Look for ncurses with PKG_CONFIG, and remove libtinfo because it just causes  
						
						 
						
						... 
						
						
						
						confusion. 
						
						
					 
					
						2015-12-11 19:58:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						2a6b215328 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2015-12-11 18:01:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						88bc8f3528 
					 
					
						
						
							
							Style nits and line wrapping of function declarations.  
						
						 
						
						
						
						
					 
					
						2015-12-11 16:37:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						8fa822b521 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2015-11-18 14:01:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						64571368dc 
					 
					
						
						
							
							Sync the entire xmalloc.[ch] with the other users, but with the addition  
						
						 
						
						... 
						
						
						
						of xrealloc, xvasprintf, xvsnprintf. 
						
						
					 
					
						2015-11-18 13:06:54 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						da1f6fc2c8 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h 
						
						
					 
					
						2015-10-27 23:27:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						44657bf932 
					 
					
						
						
							
							Move struct options into options.c.  
						
						 
						
						
						
						
					 
					
						2015-10-27 15:58:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						ed17760a52 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2015-09-24 10:01:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						ddb2d1221b 
					 
					
						
						
							
							Assign flag not number for flag types (we got away with it so far  
						
						 
						
						... 
						
						
						
						because that are a union). From Filipe Brandenburger. 
						
						
					 
					
						2015-09-24 07:02:18 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						76688d2040 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	cfg.c
	tmux.c 
						
						
					 
					
						2015-09-06 20:47:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						93b946ee50 
					 
					
						
						
							
							Tweak some error messages/comments.  
						
						 
						
						
						
						
					 
					
						2015-09-01 19:50:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						a568aaa0c0 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2015-07-28 18:01:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						b254115acd 
					 
					
						
						
							
							Tidy up the way terminals are described and move some structs out of tmux.h.  
						
						 
						
						
						
						
					 
					
						2015-07-28 15:18:10 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						b25dc423b0 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2015-04-20 15:44:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						ee123c2489 
					 
					
						
						
							
							Support setting the default window and pane background colours (window  
						
						 
						
						... 
						
						
						
						and active pane via window-style and window-active-style options, an
individual pane by a new select-pane -P flag). From J Raynor. 
						
						
					 
					
						2015-04-19 21:05:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						833fe5bdee 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	cmd-pipe-pane.c 
						
						
					 
					
						2015-02-06 19:07:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						16bdd970dc 
					 
					
						
						
							
							Support blinking cursor mode, both the xterm CSI ?12 h/l and (the  
						
						 
						
						... 
						
						
						
						backwards) screen CSI 34 h/l. From Guanpeng Xu. 
						
						
					 
					
						2015-01-20 08:18:04 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						747cab4281 
					 
					
						
						
							
							No need for $Id$ now.  
						
						 
						
						
						
						
					 
					
						2014-11-08 12:27:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						a131b82e95 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	client.c 
						
						
					 
					
						2014-08-09 20:31:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						2056a9ef9e 
					 
					
						
						
							
							Drop explicit support for F13-F20 and change to match the xterm terminfo  
						
						 
						
						... 
						
						
						
						entry:
        F13-F24 are S-F1 to S-F12
        F25-F36 are C-F1 to C-F12
        F37-F48 are C-S-F1 to C-S-F12
        F49-F60 are M-F1 to M-F12
and     F61-F63 are M-S-F1 to M-S-F3
This should be no difference for applications inside tmux, but means
that any key binding for F13 will need to be replaced by S-F1 and so on. 
						
						
					 
					
						2014-07-21 10:25:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						953c3ef47a 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	Makefile
	tmux.1
	window.c 
						
						
					 
					
						2014-04-23 11:26:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						c3b2e5eed3 
					 
					
						
						
							
							Wrap some long lines.  
						
						 
						
						
						
						
					 
					
						2014-04-17 12:57:28 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						0c99c7dbff 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	Makefile
	tty-keys.c 
						
						
					 
					
						2014-04-05 12:36:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nicm 
							
						 
					 
					
						
						
							
						
						f1828921df 
					 
					
						
						
							
							Change terminal-overrides to a server option (now that we have them), it  
						
						 
						
						... 
						
						
						
						doesn't make much sense as a session option. 
						
						
					 
					
						2014-02-23 00:53:06 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						06b5805479 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2013-06-13 18:12:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						13441e8cb8 
					 
					
						
						
							
							The actual terminfo entries we ended up with for cursor changes are Cs,  
						
						 
						
						... 
						
						
						
						Ce, Ss and Se (not Cc, Ce, Cs, Csr). So use and document these instead
of the ones we were using earlier. 
						
						
					 
					
						2013-06-02 07:52:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						b58bca9a72 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						... 
						
						
						
						Conflicts:
	tmux.c 
						
						
					 
					
						2013-04-13 17:05:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						982354765b 
					 
					
						
						
							
							Remove tmux's (already minimal) 88 colour support. Such terminals are  
						
						 
						
						... 
						
						
						
						few and unnecessary. 
						
						
					 
					
						2013-03-27 11:17:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						0ccd84d2ef 
					 
					
						
						
							
							Instead of skipping del_curterm on FreeBSD < 7, skip it on ncurses < 5.7. It  
						
						 
						
						... 
						
						
						
						looks like 5.6 on Linux has the problem too. Reported by Myles Dear. 
						
						
					 
					
						2013-03-22 15:36:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Adam 
							
						 
					 
					
						
						
							
						
						de194016ec 
					 
					
						
						
							
							Merge branch 'obsd-master'  
						
						 
						
						
						
						
					 
					
						2013-01-17 01:38:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						44f8e1caff 
					 
					
						
						
							
							Implement ECH (erase character, CSI X). Reported by Christian Neukirchen.  
						
						 
						
						
						
						
					 
					
						2013-01-15 23:18:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiago Cunha 
							
						 
					 
					
						
						
							
						
						a432fcd306 
					 
					
						
						
							
							Sync OpenBSD patchset 1150:  
						
						 
						
						... 
						
						
						
						xfree is not particularly helpful, remove it. From Thomas Adam. 
						
						
					 
					
						2012-07-11 19:34:16 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicholas Marriott 
							
						 
					 
					
						
						
							
						
						df912e3540 
					 
					
						
						
							
							xfree is not particularly helpful, remove it. From Thomas Adam.  
						
						 
						
						
						
						
					 
					
						2012-07-10 11:53:01 +00:00