circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,068 Commits 1 Branch 35 Tags 74 MiB
Commit Graph

10068 Commits

Author SHA1 Message Date
nicm 01a2ddf3f8 Add getpw to pledge, makes tmux work in YP environments, discovered by 
matthieu, ok deraadt
 2015-11-22 19:41:19 +00:00
tim 4fcc02ee9d If display-time is set to 0, show status messages until a key is pressed; 
OK nicm@
 2015-11-22 18:28:01 +00:00
Thomas Adam 78a00c845c Merge branch 'obsd-master' 
Conflicts:
	tmux.h
 2015-11-21 14:24:33 +00:00
Nicholas Marriott 2c482939fd Move tmux.h below system includes. 2015-11-21 08:03:18 +00:00
nicm 933929cd62 Memory leaks and an uninitialized part of utf8_data, from Patrick Palka. 2015-11-20 22:02:54 +00:00
nicm 40fefe2cbc The alerts callback should be fired for bells even if bell-action is 
none because it also affects the status line bell indicator (and
bell-action does not). Fixes a problem reported by tim@.
 2015-11-20 16:33:46 +00:00
nicm fce56c56ef Instead of separate tables for different types of options, give each 
option a scope type (server, session, window) in one table.
 2015-11-20 12:01:19 +00:00
nicm 374e273df5 Only assume pasting with at least two characters, reduces problems for 
people who can type ^B c very fast, or who are using tmux inside
something else that buffers.
 2015-11-19 22:46:46 +00:00
Thomas Adam cf688db4b5 Merge branch 'obsd-master' 2015-11-19 16:01:12 +00:00
nicm 98967c5ec9 The activity flag could already be set, so queue the callback always (if 
not already queued) rather than only if the flag is being added. Fixes a
problem reported by tim@
 2015-11-19 14:55:25 +00:00
Thomas Adam 45b4e337cb Merge branch 'obsd-master' 2015-11-18 18:01:13 +00:00
nicm 82760a9960 Use format_expand_time for display-message. 2015-11-18 16:49:13 +00:00
Nicholas Marriott c15487318b unused -> __unused. 2015-11-18 16:45:44 +00:00
Nicholas Marriott a58eaec540 Merge branch 'master' of github.com:tmux/tmux 2015-11-18 16:42:25 +00:00
Thomas Adam 7fe8edc396 Merge branch 'obsd-master' 2015-11-18 16:01:23 +00:00
Nicholas Marriott 8b4b3ff4fc Add __unused, will be needed shortly. 2015-11-18 14:37:08 +00:00
nicm 577c0e3e5a Use __unused rather than rolling our own. 2015-11-18 14:27:44 +00:00
nicm 5a5b950e8b Add s/foo/bar/: prefix for formats to substitute bar for foo. 2015-11-18 14:13:55 +00:00
Nicholas Marriott f8a1f8843c Add -Wno-attributes. 2015-11-18 14:10:48 +00:00
Nicholas Marriott 9bba26f8c5 Add reallocarray prototype. 2015-11-18 14:09:17 +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
Nicholas Marriott 93742ed5df Merge branch 'master' of github.com:tmux/tmux 2015-11-18 12:55:22 +00:00
Nicholas Marriott a77960c540 Add reallocarray to compat. 2015-11-18 12:54:29 +00:00
Thomas Adam 4b703d3049 Merge branch 'obsd-master' 2015-11-18 10:01:11 +00:00
nicm ca5e6bf5f2 Don't update activity time twice for new sessions, and add some logging. 2015-11-18 09:22:29 +00:00
Thomas Adam 44cad8f4ed Merge branch 'obsd-master' 2015-11-17 20:01:12 +00:00
tobias d0505fd042 Merge xmalloc.[ch] files across base, skipping OpenSSH for now. 
ok nicm
 2015-11-17 18:25:03 +00:00
Thomas Adam 349a62ed4f Merge branch 'obsd-master' 2015-11-17 00:01:09 +00:00
nicm 775fb562bd 0x7f is a valid key. 2015-11-16 22:57:51 +00:00
Thomas Adam 1686a15fb6 Merge branch 'obsd-master' 2015-11-16 00:01:10 +00:00
nicm 661d0dfac9 Make key_code unsigned long long not uint64_t which is more portable for 
printf formats, and move UTF8_SIZE define down to near the rest of the
UTF-8 bits.
 2015-11-15 22:50:38 +00:00
Thomas Adam 8213558cc7 Merge branch 'obsd-master' 
Conflicts:
	server.c
	tmux.c
 2015-11-15 22:49:25 +00:00
nicm a582b62287 Accidentally turned off pledge, turn it back on. 2015-11-15 14:32:48 +00:00
Thomas Adam bb820fa761 Merge branch 'obsd-master' 2015-11-14 14:01:08 +00:00
nicm 14d90e4901 The character is an int so use %x not %hhx. 2015-11-14 12:20:19 +00:00
nicm 3db0d50df4 The private use area at U+E000 to U+F8FF is not very useful if it is 
width 0, make it width 1 instead.
 2015-11-14 12:03:23 +00:00
Thomas Adam f12d7f0d4b Merge branch 'obsd-master' 2015-11-14 12:01:09 +00:00
nicm 205d15e82d All these return values from utf8_* are confusing, use an enum. 2015-11-14 11:45:43 +00:00
Thomas Adam 7b4b78b419 Merge branch 'obsd-master' 2015-11-14 11:38:52 +00:00
Thomas Adam 7b749eff35 Merge branch 'obsd-master' 
Conflicts:
	server.c
	tmux.c
 2015-11-14 11:38:30 +00:00
nicm f401791a56 Rename a variable in utf8_combine for consistency and use 0xfffd for 
unknown Unicode.
 2015-11-14 11:13:44 +00:00
nicm dab63b029e Couple of assignments to remove compiler warnings. 2015-11-14 10:57:59 +00:00
nicm 64333e3ef8 Be more strict about invalid UTF-8. 2015-11-14 10:56:31 +00:00
nicm c56b81a2ce Push stdout and stderr to clients more aggressively, and add an event to 
continue if the send fails.
 2015-11-14 09:41:06 +00:00
Nicholas Marriott 23266e8e09 Merge branch 'master' of github.com:tmux/tmux 2015-11-14 09:04:41 +00:00
Nicholas Marriott 31d880f751 Update the TODO file. 2015-11-14 09:04:13 +00:00
nicm 908e6bb68f Log more of UTF-8 input. 2015-11-14 08:25:12 +00:00
Thomas Adam 276ca5f04c Merge branch 'obsd-master' 2015-11-13 18:01:13 +00:00
nicm c4893d8efd Log option names in fatal() for missing option. 2015-11-13 16:06:43 +00:00