zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 12:23:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #762 from ailin-nemui/global-history

Browse source 
allow access to global command history when using a specifc history
This commit is contained in:
ailin-nemui 2017-11-26 00:28:58 +01:00 • committed by GitHub
commit 3792bc9ba9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 410 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

247
src/fe-common/core/command-history.c
View file

@ -30,10 +30,93 @@
#include "command-history.h"
/* command history */
static GList *history_entries;
static HISTORY_REC *global_history;
static int window_history;
static GSList *histories;
static HISTORY_ENTRY_REC *history_entry_new(HISTORY_REC *history, const char *text)
{
HISTORY_ENTRY_REC *entry;
entry = g_new0(HISTORY_ENTRY_REC, 1);
entry->text = g_strdup(text);
entry->history = history;
entry->time = time(NULL);
return entry;
}
static void history_entry_destroy(HISTORY_ENTRY_REC *entry)
{
g_free((char *)entry->text);
g_free(entry);
}
GList *command_history_list_last(HISTORY_REC *history)
{
GList *link;
link = g_list_last(history_entries);
while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
link = link->prev;
}
return link;
}
GList *command_history_list_first(HISTORY_REC *history)
{
GList *link;
link = history_entries;
while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
link = link->next;
}
return link;
}
GList *command_history_list_prev(HISTORY_REC *history, GList *pos)
{
GList *link;
link = pos != NULL ? pos->prev : NULL;
while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
link = link->prev;
}
return link;
}
GList *command_history_list_next(HISTORY_REC *history, GList *pos)
{
GList *link;
link = pos != NULL ? pos->next : NULL;
while (link != NULL && history != NULL && ((HISTORY_ENTRY_REC *)link->data)->history != history) {
link = link->next;
}
return link;
}
static void command_history_clear_pos_for_unlink_func(HISTORY_REC *history, GList* link)
{
if (history->pos == link) {
history->pos = command_history_list_next(history, link);
history->redo = 1;
}
}
static void history_list_delete_link_and_destroy(GList *link)
{
g_slist_foreach(histories,
(GFunc) command_history_clear_pos_for_unlink_func, link);
history_entry_destroy(link->data);
history_entries = g_list_delete_link(history_entries, link);
}
void command_history_add(HISTORY_REC *history, const char *text)
{
GList *link;
@ -41,21 +124,19 @@ void command_history_add(HISTORY_REC *history, const char *text)
g_return_if_fail(history != NULL);
g_return_if_fail(text != NULL);
link = g_list_last(history->list);
if (link != NULL && g_strcmp0(link->data, text) == 0)
return; /* same as previous entry */
link = command_history_list_last(history);
if (link != NULL && g_strcmp0(((HISTORY_ENTRY_REC *)link->data)->text, text) == 0)
return; /* same as previous entry */
if (settings_get_int("max_command_history") < 1 ||
history->lines < settings_get_int("max_command_history"))
history->lines++;
else {
link = history->list;
g_free(link->data);
history->list = g_list_remove_link(history->list, link);
g_list_free_1(link);
link = command_history_list_first(history);
history_list_delete_link_and_destroy(link);
}
history->list = g_list_append(history->list, g_strdup(text));
history_entries = g_list_append(history_entries, history_entry_new(history, text));
}
HISTORY_REC *command_history_find(HISTORY_REC *history)
@ -87,6 +168,61 @@ HISTORY_REC *command_history_find_name(const char *name)
return NULL;
}
static int history_entry_after_time_sort(const HISTORY_ENTRY_REC *a, const HISTORY_ENTRY_REC *b)
{
return a->time == b->time ? 1 : a->time - b->time;
}
void command_history_load_entry(time_t history_time, HISTORY_REC *history, const char *text)
{
HISTORY_ENTRY_REC *entry;
g_return_if_fail(history != NULL);
g_return_if_fail(text != NULL);
entry = g_new0(HISTORY_ENTRY_REC, 1);
entry->text = g_strdup(text);
entry->history = history;
entry->time = history_time;
history->lines++;
history_entries = g_list_insert_sorted(history_entries, entry, (GCompareFunc)history_entry_after_time_sort);
}
static int history_entry_find_func(const HISTORY_ENTRY_REC *data, const HISTORY_ENTRY_REC *user_data)
{
if ((user_data->time == -1 || (data->time == user_data->time)) &&
(user_data->history == NULL || (data->history == user_data->history)) &&
g_strcmp0(data->text, user_data->text) == 0) {
return 0;
} else {
return -1;
}
}
gboolean command_history_delete_entry(time_t history_time, HISTORY_REC *history, const char *text)
{
GList *link;
HISTORY_ENTRY_REC entry;
g_return_val_if_fail(history != NULL, FALSE);
g_return_val_if_fail(text != NULL, FALSE);
entry.text = text;
entry.history = history;
entry.time = history_time;
link = g_list_find_custom(history_entries, &entry, (GCompareFunc)history_entry_find_func);
if (link != NULL) {
((HISTORY_ENTRY_REC *)link->data)->history->lines--;
history_list_delete_link_and_destroy(link);
return TRUE;
} else {
return FALSE;
}
}
HISTORY_REC *command_history_current(WINDOW_REC *window)
{
HISTORY_REC *rec;
@ -104,7 +240,44 @@ HISTORY_REC *command_history_current(WINDOW_REC *window)
return global_history;
}
static const char *command_history_prev_int(WINDOW_REC *window, const char *text, gboolean global)
{
HISTORY_REC *history;
GList *pos;
history = command_history_current(window);
pos = history->pos;
history->redo = 0;
if (pos != NULL) {
/* don't go past the first entry (no wrap around) */
GList *prev = command_history_list_prev(global ? NULL : history, history->pos);
if (prev != NULL)
history->pos = prev;
} else {
history->pos = command_history_list_last(global ? NULL : history);
}
if (*text != '\0' &&
(pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
/* save the old entry to history */
command_history_add(history, text);
}
return history->pos == NULL ? text : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
}
const char *command_history_prev(WINDOW_REC *window, const char *text)
{
return command_history_prev_int(window, text, FALSE);
}
const char *command_global_history_prev(WINDOW_REC *window, const char *text)
{
return command_history_prev_int(window, text, TRUE);
}
static const char *command_history_next_int(WINDOW_REC *window, const char *text, gboolean global)
{
HISTORY_REC *history;
GList *pos;
@ -112,24 +285,29 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
history = command_history_current(window);
pos = history->pos;
if (pos != NULL) {
/* don't go past the first entry (no wrap around) */
if (history->pos->prev != NULL)
history->pos = history->pos->prev;
} else {
history->pos = g_list_last(history->list);
}
if (!(history->redo) && pos != NULL)
history->pos = command_history_list_next(global ? NULL : history, history->pos);
history->redo = 0;
if (*text != '\0' &&
(pos == NULL || g_strcmp0(pos->data, text) != 0)) {
(pos == NULL || g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) != 0)) {
/* save the old entry to history */
command_history_add(history, text);
}
return history->pos == NULL ? text : history->pos->data;
return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
}
const char *command_history_next(WINDOW_REC *window, const char *text)
{
return command_history_next_int(window, text, FALSE);
}
const char *command_global_history_next(WINDOW_REC *window, const char *text)
{
return command_history_next_int(window, text, TRUE);
}
const char *command_history_delete_current(WINDOW_REC *window, const char *text)
{
HISTORY_REC *history;
GList *pos;
@ -137,15 +315,13 @@ const char *command_history_next(WINDOW_REC *window, const char *text)
history = command_history_current(window);
pos = history->pos;
if (pos != NULL)
history->pos = history->pos->next;
if (*text != '\0' &&
(pos == NULL || g_strcmp0(pos->data, text) != 0)) {
/* save the old entry to history */
command_history_add(history, text);
if (pos != NULL && g_strcmp0(((HISTORY_ENTRY_REC *)pos->data)->text, text) == 0) {
((HISTORY_ENTRY_REC *)pos->data)->history->lines--;
history_list_delete_link_and_destroy(pos);
}
return history->pos == NULL ? "" : history->pos->data;
history->redo = 0;
return history->pos == NULL ? "" : ((HISTORY_ENTRY_REC *)history->pos->data)->text;
}
void command_history_clear_pos_func(HISTORY_REC *history, gpointer user_data)
@ -175,12 +351,17 @@ HISTORY_REC *command_history_create(const char *name)
void command_history_clear(HISTORY_REC *history)
{
GList *link, *next;
g_return_if_fail(history != NULL);
command_history_clear_pos_func(history, NULL);
g_list_foreach(history->list, (GFunc) g_free, NULL);
g_list_free(history->list);
history->list = NULL;
link = command_history_list_first(history);
while (link != NULL) {
next = command_history_list_next(history, link);
history_list_delete_link_and_destroy(link);
link = next;
}
history->lines = 0;
}
@ -264,8 +445,8 @@ static char *special_history_func(const char *text, void *item, int *free_ret)
ret = NULL;
history = command_history_current(window);
for (tmp = history->list; tmp != NULL; tmp = tmp->next) {
const char *line = tmp->data;
for (tmp = command_history_list_first(history); tmp != NULL; tmp = command_history_list_next(history, tmp)) {
const char *line = ((HISTORY_ENTRY_REC *)tmp->data)->text;
if (match_wildcards(findtext, line)) {
*free_ret = TRUE;
@ -289,6 +470,8 @@ void command_history_init(void)
special_history_func_set(special_history_func);
history_entries = NULL;
global_history = command_history_create(NULL);
read_settings();
@ -308,4 +491,6 @@ void command_history_deinit(void)
signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
command_history_destroy(global_history);
g_list_free_full(history_entries, (GDestroyNotify) history_entry_destroy);
}

19
src/fe-common/core/command-history.h
View file

@ -6,12 +6,19 @@
typedef struct {
char *name;
GList *list, *pos;
GList *pos;
int lines;
int refcount;
int redo:1;
} HISTORY_REC;
typedef struct {
const char *text;
HISTORY_REC *history;
time_t time;
} HISTORY_ENTRY_REC;
HISTORY_REC *command_history_find(HISTORY_REC *history);
HISTORY_REC *command_history_find_name(const char *name);
@ -21,9 +28,19 @@ void command_history_init(void);
void command_history_deinit(void);
void command_history_add(HISTORY_REC *history, const char *text);
void command_history_load_entry(time_t time, HISTORY_REC *history, const char *text);
gboolean command_history_delete_entry(time_t history_time, HISTORY_REC *history, const char *text);
GList *command_history_list_last(HISTORY_REC *history);
GList *command_history_list_first(HISTORY_REC *history);
GList *command_history_list_prev(HISTORY_REC *history, GList *pos);
GList *command_history_list_next(HISTORY_REC *history, GList *pos);
const char *command_history_prev(WINDOW_REC *window, const char *text);
const char *command_history_next(WINDOW_REC *window, const char *text);
const char *command_global_history_prev(WINDOW_REC *window, const char *text);
const char *command_global_history_next(WINDOW_REC *window, const char *text);
const char *command_history_delete_current(WINDOW_REC *window, const char *text);
void command_history_clear_pos(WINDOW_REC *window);