circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make the prompt history global for all clients which is much more useful 

than per-client history.
pull/1/head
Nicholas Marriott 2010-12-11 16:15:02 +00:00
parent 1a4d78c7af
commit 095ffe9cd1
3 changed files with 62 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server-client.c
View File

@ -1,4 +1,4 @@
/* $Id: server-client.c,v 1.45 2010-10-24 01:51:34 tcunha Exp $ */
/* $Id: server-client.c,v 1.46 2010-12-11 16:15:02 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -69,8 +69,6 @@ server_client_create(int fd)
fatal("gettimeofday failed");
memcpy(&c->activity_time, &c->creation_time, sizeof c->activity_time);
ARRAY_INIT(&c->prompt_hdata);
c->stdin_event = NULL;
c->stdout_event = NULL;
c->stderr_event = NULL;
@ -160,9 +158,6 @@ server_client_lost(struct client *c)
xfree(c->prompt_string);
if (c->prompt_buffer != NULL)
xfree(c->prompt_buffer);
for (i = 0; i < ARRAY_LENGTH(&c->prompt_hdata); i++)
xfree(ARRAY_ITEM(&c->prompt_hdata, i));
ARRAY_FREE(&c->prompt_hdata);
if (c->cwd != NULL)
xfree(c->cwd);

85
status.c
View File

@ -1,4 +1,4 @@
/* $Id: status.c,v 1.150 2010-12-06 22:52:21 nicm Exp $ */
/* $Id: status.c,v 1.151 2010-12-11 16:15:02 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -41,9 +41,14 @@ void status_replace1(struct client *,
struct winlink *, char **, char **, char *, size_t, int);
void status_message_callback(int, short, void *);
void status_prompt_add_history(struct client *);
const char *status_prompt_up_history(u_int *);
const char *status_prompt_down_history(u_int *);
void status_prompt_add_history(const char *);
char *status_prompt_complete(const char *);
/* Status prompt history. */
ARRAY_DECL(, char *) status_prompt_history = ARRAY_INITIALIZER;
/* Retrieve options for left string. */
char *
status_redraw_get_left(struct client *c,
@ -860,6 +865,7 @@ status_prompt_key(struct client *c, int key)
{
struct paste_buffer *pb;
char *s, *first, *last, word[64], swapc;
const char *histstr;
u_char ch;
size_t size, n, off, idx;
@ -972,29 +978,20 @@ status_prompt_key(struct client *c, int key)
}
break;
case MODEKEYEDIT_HISTORYUP:
if (ARRAY_LENGTH(&c->prompt_hdata) == 0)
histstr = status_prompt_up_history(&c->prompt_hindex);
if (histstr == NULL)
break;
xfree(c->prompt_buffer);
c->prompt_buffer = xstrdup(ARRAY_ITEM(&c->prompt_hdata,
ARRAY_LENGTH(&c->prompt_hdata) - 1 - c->prompt_hindex));
if (c->prompt_hindex != ARRAY_LENGTH(&c->prompt_hdata) - 1)
c->prompt_hindex++;
c->prompt_buffer = xstrdup(histstr);
c->prompt_index = strlen(c->prompt_buffer);
c->flags |= CLIENT_STATUS;
break;
case MODEKEYEDIT_HISTORYDOWN:
histstr = status_prompt_down_history(&c->prompt_hindex);
if (histstr == NULL)
break;
xfree(c->prompt_buffer);
if (c->prompt_hindex != 0) {
c->prompt_hindex--;
c->prompt_buffer = xstrdup(ARRAY_ITEM(
&c->prompt_hdata, ARRAY_LENGTH(
&c->prompt_hdata) - 1 - c->prompt_hindex));
} else
c->prompt_buffer = xstrdup("");
c->prompt_buffer = xstrdup(histstr);
c->prompt_index = strlen(c->prompt_buffer);
c->flags |= CLIENT_STATUS;
break;
@ -1036,7 +1033,7 @@ status_prompt_key(struct client *c, int key)
break;
case MODEKEYEDIT_ENTER:
if (*c->prompt_buffer != '\0')
status_prompt_add_history(c);
status_prompt_add_history(c->prompt_buffer);
if (c->prompt_callbackfn(c->prompt_data, c->prompt_buffer) == 0)
status_prompt_clear(c);
break;
@ -1072,20 +1069,56 @@ status_prompt_key(struct client *c, int key)
}
}
/* Get previous line from the history. */
const char *
status_prompt_up_history(u_int *idx)
{
u_int size;
/*
* History runs from 0 to size - 1.
*
* Index is from 0 to size. Zero is empty.
*/
size = ARRAY_LENGTH(&status_prompt_history);
if (size == 0 || *idx == size)
return (NULL);
(*idx)++;
return (ARRAY_ITEM(&status_prompt_history, size - *idx));
}
/* Get next line from the history. */
const char *
status_prompt_down_history(u_int *idx)
{
u_int size;
size = ARRAY_LENGTH(&status_prompt_history);
if (size == 0 || *idx == 0)
return ("");
(*idx)--;
if (*idx == 0)
return ("");
return (ARRAY_ITEM(&status_prompt_history, size - *idx));
}
/* Add line to the history. */
void
status_prompt_add_history(struct client *c)
status_prompt_add_history(const char *line)
{
if (ARRAY_LENGTH(&c->prompt_hdata) > 0 &&
strcmp(ARRAY_LAST(&c->prompt_hdata), c->prompt_buffer) == 0)
u_int size;
size = ARRAY_LENGTH(&status_prompt_history);
if (size > 0 && strcmp(ARRAY_LAST(&status_prompt_history), line) == 0)
return;
if (ARRAY_LENGTH(&c->prompt_hdata) == PROMPT_HISTORY) {
xfree(ARRAY_FIRST(&c->prompt_hdata));
ARRAY_REMOVE(&c->prompt_hdata, 0);
if (size == PROMPT_HISTORY) {
xfree(ARRAY_FIRST(&status_prompt_history));
ARRAY_REMOVE(&status_prompt_history, 0);
}
ARRAY_ADD(&c->prompt_hdata, xstrdup(c->prompt_buffer));
ARRAY_ADD(&status_prompt_history, xstrdup(line));
}
/* Complete word. */

6
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.585 2010-12-06 22:52:21 nicm Exp $ */
/* $Id: tmux.h,v 1.586 2010-12-11 16:15:02 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1145,13 +1145,11 @@ struct client {
int (*prompt_callbackfn)(void *, const char *);
void (*prompt_freefn)(void *);
void *prompt_data;
u_int prompt_hindex;
#define PROMPT_SINGLE 0x1
int prompt_flags;
u_int prompt_hindex;
ARRAY_DECL(, char *) prompt_hdata;
struct mode_key_data prompt_mdata;
struct session *session;