diff --git a/src/list_window.c b/src/list_window.c
index 588725625c8708d600514ac5da6946e822400c76..05f5630e9b4e5d6228132a16edcd736a17c71278 100644 (file)
--- a/src/list_window.c
+++ b/src/list_window.c
#include "colors.h"
#include "list_window.h"
+extern void screen_bell(void);
+
list_window_t *
list_window_init(WINDOW *w, int width, int height)
{
list_window_t *lw;
- lw = g_malloc(sizeof(list_window_t));
- memset(lw, 0, sizeof(list_window_t));
+ lw = g_malloc0(sizeof(list_window_t));
lw->w = w;
lw->cols = width;
lw->rows = height;
list_window_reset(list_window_t *lw)
{
lw->selected = 0;
+ lw->xoffset = 0;
lw->start = 0;
lw->clear = 1;
}
{
if( lw->selected < length-1 )
lw->selected++;
+ else if ( options.list_wrap )
+ lw->selected = 0;
}
void
-list_window_previous(list_window_t *lw)
+list_window_previous(list_window_t *lw, int length)
{
if( lw->selected > 0 )
lw->selected--;
+ else if( options.list_wrap )
+ lw->selected = length-1;
+}
+
+void
+list_window_right(list_window_t *lw, int length)
+{
+ lw->xoffset++;
+}
+
+void
+list_window_left(list_window_t *lw)
+{
+ if( lw->xoffset > 0 )
+ lw->xoffset--;
}
void
list_window_first(list_window_t *lw)
{
+ lw->xoffset = 0;
lw->selected = 0;
}
void
list_window_last(list_window_t *lw, int length)
{
+ lw->xoffset = 0;
lw->selected = length-1;
}
{
int i;
int fill = options.wide_cursor;
+ int show_cursor = !(lw->flags & LW_HIDE_CURSOR);
- while( lw->selected < lw->start )
- {
- lw->start--;
- lw->clear=1;
- }
- while( lw->selected >= lw->start+lw->rows )
+ if( show_cursor )
{
- lw->start++;
- lw->clear=1;
+ while( lw->selected < lw->start )
+ {
+ lw->start--;
+ lw->clear=1;
+ }
+ while( lw->selected >= lw->start+lw->rows )
+ {
+ lw->start++;
+ lw->clear=1;
+ }
}
-
+
for(i=0; i<lw->rows; i++)
{
int highlight = 0;
if( label )
{
int selected = lw->start+i == lw->selected;
- size_t len = strlen(label);
+ size_t len = my_strlen(label);
if( highlight )
colors_use(lw->w, COLOR_LIST_BOLD);
else
colors_use(lw->w, COLOR_LIST);
- if( selected )
+ if( show_cursor && selected )
wattron(lw->w, A_REVERSE);
- waddnstr(lw->w, label, lw->cols);
+ //waddnstr(lw->w, label, lw->cols);
+ waddnstr(lw->w, label);
if( fill && len<lw->cols )
mvwhline(lw->w, i, len, ' ', lw->cols-len);
}
if( wrap )
{
+ if ( i==0 ) /* empty list */
+ return 1;
i=0; /* first item */
- beep();
+ screen_bell();
}
}
return 1;
int i = lw->selected-1;
char *label;
+ if ( rows == 0 )
+ return 1;
+
while( wrap || i==lw->selected-1 )
{
while( i>=0 && (label=(callback) (i,&h,callback_data)) )
if( wrap )
{
i=rows-1; /* last item */
- beep();
+ screen_bell();
}
}
return 1;
switch(cmd)
{
case CMD_LIST_PREVIOUS:
- list_window_previous(lw);
+ list_window_previous(lw, rows);
lw->repaint=1;
break;
case CMD_LIST_NEXT:
}
+
+
+
+list_window_state_t *
+list_window_init_state(void)
+{
+ return g_malloc0(sizeof(list_window_state_t));
+}
+
+list_window_state_t *
+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);
+ }
+ return NULL;
+}
+
+void
+list_window_push_state(list_window_state_t *state, list_window_t *lw)
+{
+ if( state )
+ {
+ list_window_t *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);
+ }
+}
+
+void
+list_window_pop_state(list_window_state_t *state, list_window_t *lw)
+{
+ if( state && state->list )
+ {
+ list_window_t *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);
+ }
+}
+
+
+