diff --git a/src/list_window.c b/src/list_window.c
index 93bed86667db070332e3da3bb344dca1b28fa57e..010deb86002916951dbee3572d35112f9d13ee9d 100644 (file)
--- a/src/list_window.c
+++ b/src/list_window.c
-/*
- * $Id$
- *
+/*
* (c) 2004 by Kalle Wallin <kaw@linux.se>
*
* This program is free software; you can redistribute it and/or modify
#include "config.h"
#include "options.h"
#include "charset.h"
-#include "support.h"
+#include "match.h"
#include "command.h"
#include "colors.h"
if (lw->selected < lw->start)
lw->selected = lw->start;
- if (length > 0 && lw->selected >= length)
+ if (length == 0)
+ lw->selected = 0;
+ else if (lw->selected >= length)
lw->selected = length - 1;
}
void *callback_data)
{
unsigned i;
- int fill = options.wide_cursor;
- int show_cursor = !(lw->flags & LW_HIDE_CURSOR);
+ bool fill = options.wide_cursor;
+ bool show_cursor = !lw->hide_cursor;
if (show_cursor) {
if (lw->selected < lw->start)
}
for (i = 0; i < lw->rows; i++) {
- int highlight = 0;
+ bool highlight = false;
const char *label;
label = callback(lw->start + i, &highlight, callback_data);
wmove(lw->w, i, 0);
if (label) {
- int selected = lw->start + i == lw->selected;
+ bool selected = lw->start + i == lw->selected;
unsigned len = utf8_width(label);
if (highlight)
}
}
-int
+bool
list_window_find(struct list_window *lw,
list_window_callback_fn_t callback,
void *callback_data,
const char *str,
- int wrap)
+ bool wrap)
{
- int h;
+ bool h;
unsigned i = lw->selected + 1;
const char *label;
- while (wrap || i == lw->selected + 1) {
+ do {
while ((label = callback(i,&h,callback_data))) {
- if (str && label && strcasestr(label, str)) {
+ if (str && label && match_line(label, str)) {
lw->selected = i;
- return 0;
+ return true;
}
if (wrap && i == lw->selected)
- return 1;
+ return false;
i++;
}
if (wrap) {
i=0; /* first item */
screen_bell();
}
- }
+ } while (wrap);
- return 1;
+ return false;
}
-int
+bool
list_window_rfind(struct list_window *lw,
list_window_callback_fn_t callback,
void *callback_data,
const char *str,
- int wrap,
+ bool wrap,
unsigned rows)
{
- int h;
+ bool h;
int i = lw->selected - 1;
const char *label;
if (rows == 0)
- return 1;
+ return false;
- while (wrap || i == (int)lw->selected - 1) {
+ do {
while (i >= 0 && (label = callback(i,&h,callback_data))) {
- if( str && label && strcasestr(label, str) ) {
+ if( str && label && match_line(label, str) ) {
lw->selected = i;
- return 0;
+ return true;
}
if (wrap && i == (int)lw->selected)
- return 1;
+ return false;
i--;
}
if (wrap) {
i = rows - 1; /* last item */
screen_bell();
}
- }
- return 1;
+ } while (wrap);
+
+ return false;
}
/* perform basic list window commands (movement) */
-int
+bool
list_window_cmd(struct list_window *lw, unsigned rows, command_t cmd)
{
switch (cmd) {
list_window_previous_page(lw);
break;
default:
- return 0;
+ return false;
}
- return 1;
+ return true;
}
-int
+bool
list_window_scroll_cmd(struct list_window *lw, unsigned rows, command_t cmd)
{
switch (cmd) {
break;
default:
- return 0;
+ return false;
}
- return 1;
+ return true;
}
#ifdef HAVE_GETMOUSE
-int
+bool
list_window_mouse(struct list_window *lw, unsigned rows,
unsigned long bstate, int y)
{
list_window_first(lw);
else
list_window_previous_page(lw);
- return 1;
+ return true;
}
/* if the even occured below the list window move down */
list_window_last(lw, rows);
else
list_window_next_page(lw, rows);
- return 1;
+ return true;
}
- return 0;
+ return false;
}
#endif
-
-list_window_state_t *
-list_window_init_state(void)
-{
- return g_malloc0(sizeof(list_window_state_t));
-}
-
-void
-list_window_free_state(list_window_state_t *state)
-{
- if (state) {
- if (state->list) {
- GList *list = state->list;
-
- while (list) {
- g_free(list->data);
- list->data = NULL;
- list = list->next;
- }
-
- g_list_free(state->list);
- state->list = NULL;
- }
-
- g_free(state);
- }
-}
-
-void
-list_window_push_state(list_window_state_t *state, struct list_window *lw)
-{
- if (state) {
- struct list_window *tmp = g_malloc(sizeof(list_window_t));
- memcpy(tmp, lw, sizeof(list_window_t));
- state->list = g_list_prepend(state->list, (gpointer) tmp);
- list_window_reset(lw);
- }
-}
-
-bool
-list_window_pop_state(list_window_state_t *state, struct list_window *lw)
-{
- if (state && state->list) {
- struct list_window *tmp = state->list->data;
-
- memcpy(lw, tmp, sizeof(list_window_t));
- g_free(tmp);
- state->list->data = NULL;
- state->list = g_list_delete_link(state->list, state->list);
- }
-
- // return TRUE if there are still states in the list
- return (state && state->list) ? TRUE : FALSE;
-}