circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-25 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-07-02 23:02:26 +01:00
commit be5af704ad
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server-client.c
View File

@ -1024,16 +1024,6 @@ server_client_key_callback(struct cmdq_item *item, void *data)
fatal("gettimeofday failed"); fatal("gettimeofday failed");
session_update_activity(s, &c->activity_time); session_update_activity(s, &c->activity_time);
/* Handle status line. */
if (~c->flags & CLIENT_READONLY)
status_message_clear(c);
if (c->prompt_string != NULL) {
if (c->flags & CLIENT_READONLY)
goto out;
if (status_prompt_key(c, key) == 0)
goto out;
}
/* Check for mouse keys. */ /* Check for mouse keys. */
m->valid = 0; m->valid = 0;
if (key == KEYC_MOUSE) { if (key == KEYC_MOUSE) {
@ -1214,16 +1204,24 @@ server_client_handle_key(struct client *c, struct key_event *event)
return (0); return (0);
/* /*
* Key presses in overlay mode are a special case. The queue might be * Key presses in overlay mode and the command prompt are a special
* blocked so they need to be processed immediately rather than queued. * case. The queue might be blocked so they need to be processed
* immediately rather than queued.
*/ */
if ((~c->flags & CLIENT_READONLY) && c->overlay_key != NULL) { if (~c->flags & CLIENT_READONLY) {
switch (c->overlay_key(c, event)) { status_message_clear(c);
case 0: if (c->prompt_string != NULL) {
return (0); if (status_prompt_key(c, event->key) == 0)
case 1: return (0);
server_client_clear_overlay(c); }
return (0); if (c->overlay_key != NULL) {
switch (c->overlay_key(c, event)) {
case 0:
return (0);
case 1:
server_client_clear_overlay(c);
return (0);
}
} }
} }

3
tmux.1
View File

@ -4344,8 +4344,7 @@ to unset.
.Ic align=right .Ic align=right
.Xc .Xc
Align text to the left, centre or right of the available space if appropriate. Align text to the left, centre or right of the available space if appropriate.
.It Xo Ic fill=colour .It Ic fill=colour
.Xc
Fill the available space with a background colour if appropriate. Fill the available space with a background colour if appropriate.
.It Xo Ic list=on , .It Xo Ic list=on ,
.Ic list=focus , .Ic list=focus ,