perf ui: Shorten ui_browser member names

LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-08-07 13:56:04 -03:00
parent ef8f34aabf
commit d247eb6b92
3 changed files with 49 additions and 50 deletions

View file

@ -49,7 +49,7 @@ void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whenc
pos = head->next;
break;
case SEEK_CUR:
pos = self->first_visible_entry;
pos = self->top;
break;
case SEEK_END:
pos = head->prev;
@ -66,7 +66,7 @@ void ui_browser__list_head_seek(struct ui_browser *self, off_t offset, int whenc
pos = pos->prev;
}
self->first_visible_entry = pos;
self->top = pos;
}
void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence)
@ -79,7 +79,7 @@ void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence)
nd = rb_first(root);
break;
case SEEK_CUR:
nd = self->first_visible_entry;
nd = self->top;
break;
case SEEK_END:
nd = rb_last(root);
@ -96,7 +96,7 @@ void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence)
nd = rb_prev(nd);
}
self->first_visible_entry = nd;
self->top = nd;
}
unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self)
@ -104,13 +104,13 @@ unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self)
struct rb_node *nd;
int row = 0;
if (self->first_visible_entry == NULL)
self->first_visible_entry = rb_first(self->entries);
if (self->top == NULL)
self->top = rb_first(self->entries);
nd = self->first_visible_entry;
nd = self->top;
while (nd != NULL) {
SLsmg_gotorc(self->top + row, self->left);
SLsmg_gotorc(self->y + row, self->x);
self->write(self, nd, row);
if (++row == self->height)
break;
@ -122,7 +122,7 @@ unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self)
bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row)
{
return (self->first_visible_entry_idx + row) == self->index;
return self->top_idx + row == self->index;
}
void ui_browser__refresh_dimensions(struct ui_browser *self)
@ -135,13 +135,13 @@ void ui_browser__refresh_dimensions(struct ui_browser *self)
self->height = rows - 5;
if (self->height > self->nr_entries)
self->height = self->nr_entries;
self->top = (rows - self->height) / 2;
self->left = (cols - self->width) / 2;
self->y = (rows - self->height) / 2;
self->x = (cols - self->width) / 2;
}
void ui_browser__reset_index(struct ui_browser *self)
{
self->index = self->first_visible_entry_idx = 0;
self->index = self->top_idx = 0;
self->seek(self, 0, SEEK_SET);
}
@ -180,7 +180,7 @@ int ui_browser__refresh(struct ui_browser *self)
newtScrollbarSet(self->sb, self->index, self->nr_entries - 1);
row = self->refresh(self);
SLsmg_set_color(HE_COLORSET_NORMAL);
SLsmg_fill_region(self->top + row, self->left,
SLsmg_fill_region(self->y + row, self->x,
self->height - row, self->width, ' ');
return 0;
@ -205,8 +205,8 @@ int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es)
if (self->index == self->nr_entries - 1)
break;
++self->index;
if (self->index == self->first_visible_entry_idx + self->height) {
++self->first_visible_entry_idx;
if (self->index == self->top_idx + self->height) {
++self->top_idx;
self->seek(self, +1, SEEK_CUR);
}
break;
@ -214,34 +214,34 @@ int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es)
if (self->index == 0)
break;
--self->index;
if (self->index < self->first_visible_entry_idx) {
--self->first_visible_entry_idx;
if (self->index < self->top_idx) {
--self->top_idx;
self->seek(self, -1, SEEK_CUR);
}
break;
case NEWT_KEY_PGDN:
case ' ':
if (self->first_visible_entry_idx + self->height > self->nr_entries - 1)
if (self->top_idx + self->height > self->nr_entries - 1)
break;
offset = self->height;
if (self->index + offset > self->nr_entries - 1)
offset = self->nr_entries - 1 - self->index;
self->index += offset;
self->first_visible_entry_idx += offset;
self->top_idx += offset;
self->seek(self, +offset, SEEK_CUR);
break;
case NEWT_KEY_PGUP:
if (self->first_visible_entry_idx == 0)
if (self->top_idx == 0)
break;
if (self->first_visible_entry_idx < self->height)
offset = self->first_visible_entry_idx;
if (self->top_idx < self->height)
offset = self->top_idx;
else
offset = self->height;
self->index -= offset;
self->first_visible_entry_idx -= offset;
self->top_idx -= offset;
self->seek(self, -offset, SEEK_CUR);
break;
case NEWT_KEY_HOME:
@ -253,7 +253,7 @@ int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es)
offset = self->nr_entries - 1;
self->index = self->nr_entries - 1;
self->first_visible_entry_idx = self->index - offset;
self->top_idx = self->index - offset;
self->seek(self, -offset, SEEK_END);
break;
default:
@ -271,14 +271,13 @@ unsigned int ui_browser__list_head_refresh(struct ui_browser *self)
struct list_head *head = self->entries;
int row = 0;
if (self->first_visible_entry == NULL ||
self->first_visible_entry == self->entries)
self->first_visible_entry = head->next;
if (self->top == NULL || self->top == self->entries)
self->top = head->next;
pos = self->first_visible_entry;
pos = self->top;
list_for_each_from(pos, head) {
SLsmg_gotorc(self->top + row, self->left);
SLsmg_gotorc(self->y + row, self->x);
self->write(self, pos, row);
if (++row == self->height)
break;