Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'obsd-master' | Thomas Adam | 2015-11-24 |
|\ | |||
| * | Partly revert previous, it is harmless to keep support for UTF-8 mouse | nicm | 2015-11-23 |
| | | | | | | | | mode inside tmux, just no longer support it for tmux itself. | ||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-23 |
|\| | |||
| * | Remove support for the UTF-8 mouse extension. This was a briefly used, | nicm | 2015-11-23 |
| | | | | | | | | | | | | | | | | poor idea that was fairly quickly replaced by SGR mouse input (which is now widespread). It is impossible to tell the difference between UTF-8 and non-UTF-8 mouse input; since the mouse-utf8 option was removed tmux has not handled it correctly in any case; and it is ridiculous to have three different forms of mouse input. | ||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-23 |
|\| | | | | | | | | | | | Conflicts: server.c tmux.c | ||
| * | Don't leak extddata, memset after freeing it, not before. From Patrick | nicm | 2015-11-22 |
| | | | | | | | | Palka. | ||
| * | Add getpw to pledge, makes tmux work in YP environments, discovered by | nicm | 2015-11-22 |
| | | | | | | | | matthieu, ok deraadt | ||
| * | If display-time is set to 0, show status messages until a key is pressed; | tim | 2015-11-22 |
| | | | | | | | | OK nicm@ | ||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-21 |
|\| | | | | | | | | | Conflicts: tmux.h | ||
| * | Memory leaks and an uninitialized part of utf8_data, from Patrick Palka. | nicm | 2015-11-20 |
| | | |||
| * | The alerts callback should be fired for bells even if bell-action is | nicm | 2015-11-20 |
| | | | | | | | | | | none because it also affects the status line bell indicator (and bell-action does not). Fixes a problem reported by tim@. | ||
| * | Instead of separate tables for different types of options, give each | nicm | 2015-11-20 |
| | | | | | | | | option a scope type (server, session, window) in one table. | ||
| * | Only assume pasting with at least two characters, reduces problems for | nicm | 2015-11-19 |
| | | | | | | | | | | people who can type ^B c very fast, or who are using tmux inside something else that buffers. | ||
* | | Move tmux.h below system includes. | Nicholas Marriott | 2015-11-21 |
| | | |||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-19 |
|\| | |||
| * | The activity flag could already be set, so queue the callback always (if | nicm | 2015-11-19 |
| | | | | | | | | | | not already queued) rather than only if the flag is being added. Fixes a problem reported by tim@ | ||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-18 |
|\| | |||
| * | Use format_expand_time for display-message. | nicm | 2015-11-18 |
| | | |||
* | | unused -> __unused. | Nicholas Marriott | 2015-11-18 |
| | | |||
* | | Merge branch 'master' of github.com:tmux/tmux | Nicholas Marriott | 2015-11-18 |
|\ \ | |||
| * | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-18 |
| |\| | |||
| | * | Use __unused rather than rolling our own. | nicm | 2015-11-18 |
| | | | |||
| | * | Add s/foo/bar/: prefix for formats to substitute bar for foo. | nicm | 2015-11-18 |
| | | | |||
* | | | Add __unused, will be needed shortly. | Nicholas Marriott | 2015-11-18 |
|/ / | |||
* | | Add -Wno-attributes. | Nicholas Marriott | 2015-11-18 |
| | | |||
* | | Add reallocarray prototype. | Nicholas Marriott | 2015-11-18 |
| | | |||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-18 |
|\| | |||
| * | Sync the entire xmalloc.[ch] with the other users, but with the addition | nicm | 2015-11-18 |
| | | | | | | | | of xrealloc, xvasprintf, xvsnprintf. | ||
* | | Merge branch 'master' of github.com:tmux/tmux | Nicholas Marriott | 2015-11-18 |
|\ \ | |||
| * | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-18 |
| |\| | |||
| | * | Don't update activity time twice for new sessions, and add some logging. | nicm | 2015-11-18 |
| | | | |||
| * | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-17 |
| |\| | |||
| | * | Merge xmalloc.[ch] files across base, skipping OpenSSH for now. | tobias | 2015-11-17 |
| | | | | | | | | | | | | ok nicm | ||
* | | | Add reallocarray to compat. | Nicholas Marriott | 2015-11-18 |
|/ / | |||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-17 |
|\| | |||
| * | 0x7f is a valid key. | nicm | 2015-11-16 |
| | | |||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-16 |
|\| | |||
| * | Make key_code unsigned long long not uint64_t which is more portable for | nicm | 2015-11-15 |
| | | | | | | | | | | printf formats, and move UTF8_SIZE define down to near the rest of the UTF-8 bits. | ||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-15 |
|\| | | | | | | | | | | | Conflicts: server.c tmux.c | ||
| * | Accidentally turned off pledge, turn it back on. | nicm | 2015-11-15 |
| | | |||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-14 |
|\| | |||
| * | The character is an int so use %x not %hhx. | nicm | 2015-11-14 |
| | | |||
| * | The private use area at U+E000 to U+F8FF is not very useful if it is | nicm | 2015-11-14 |
| | | | | | | | | width 0, make it width 1 instead. | ||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-14 |
|\| | |||
| * | All these return values from utf8_* are confusing, use an enum. | nicm | 2015-11-14 |
| | | |||
| * | Rename a variable in utf8_combine for consistency and use 0xfffd for | nicm | 2015-11-14 |
| | | | | | | | | unknown Unicode. | ||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-14 |
|\| | |||
| * | Couple of assignments to remove compiler warnings. | nicm | 2015-11-14 |
| | | |||
| * | Be more strict about invalid UTF-8. | nicm | 2015-11-14 |
| | | |||
* | | Merge branch 'obsd-master' | Thomas Adam | 2015-11-14 |
|\| | | | | | | | | | | | Conflicts: server.c tmux.c |