diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-09-23 06:18:49 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-09-23 06:18:49 +0000 |
| commit | c5c58d8fcaaa66d223a253ba004b44f0a7006dff (patch) | |
| tree | 4498bb829e4ede704e7c1febd870b850686a3086 /usr.bin/tmux/status.c | |
| parent | f0935dc4d22d17994911925fa31450d1e56b9ed1 (diff) | |
Remove the internal tmux locking and instead detach each client and run the
command specified by a new option "lock-command" (by default "lock -np") in
each client.
This means each terminal has to be unlocked individually but simplifies the
code and allows the system password to be used to unlock.
Note that the set-password command is gone, so it will need to be removed from
configuration files, and the -U command line flag has been removed.
This is the third protocol version change so again it is best to stop the tmux
server before upgrading.
Diffstat (limited to 'usr.bin/tmux/status.c')
| -rw-r--r-- | usr.bin/tmux/status.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 3fefa2b1c23..af32c3453c0 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.34 2009/09/20 14:58:12 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.35 2009/09/23 06:18:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -890,9 +890,6 @@ status_prompt_key(struct client *c, int key) } break; case MODEKEYEDIT_HISTORYUP: - if (server_locked) - break; - if (ARRAY_LENGTH(&c->prompt_hdata) == 0) break; if (c->prompt_flags & PROMPT_HIDDEN) @@ -908,9 +905,6 @@ status_prompt_key(struct client *c, int key) c->flags |= CLIENT_STATUS; break; case MODEKEYEDIT_HISTORYDOWN: - if (server_locked) - break; - if (c->prompt_flags & PROMPT_HIDDEN) memset(c->prompt_buffer, 0, strlen(c->prompt_buffer)); xfree(c->prompt_buffer); @@ -1003,9 +997,6 @@ status_prompt_key(struct client *c, int key) void status_prompt_add_history(struct client *c) { - if (server_locked) - return; - if (ARRAY_LENGTH(&c->prompt_hdata) > 0 && strcmp(ARRAY_LAST(&c->prompt_hdata), c->prompt_buffer) == 0) return; |