diff options
author | Tiago Cunha <tcunha@gmx.com> | 2009-09-23 15:00:09 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2009-09-23 15:00:09 +0000 |
commit | 1310ea2729c4f51b9de29c10fb7ea176345cfd44 (patch) | |
tree | 1208cd7be9b03ee7b14cb3bf5a28273089cc97b7 /status.c | |
parent | 2acf349d4e855eeb8b5d8303cc89aec016210e30 (diff) | |
download | rtmux-1310ea2729c4f51b9de29c10fb7ea176345cfd44.tar.gz rtmux-1310ea2729c4f51b9de29c10fb7ea176345cfd44.tar.bz2 rtmux-1310ea2729c4f51b9de29c10fb7ea176345cfd44.zip |
Sync OpenBSD patchset 347:
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 'status.c')
-rw-r--r-- | status.c | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $Id: status.c,v 1.119 2009-09-20 22:11:27 tcunha Exp $ */ +/* $Id: status.c,v 1.120 2009-09-23 15:00:09 tcunha 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; |