Changes in uspace/lib/ui/src/list.c [5e758e4:7cf5ddb] in mainline

File:

• uspace/lib/ui/src/list.c (modified) (9 diffs)

uspace/lib/ui/src/list.c

@@ -149 +149 @@
         list->cb = cb;
         list->cb_arg = arg;
-}
-
-/** Get UI list callback argument.
- *
- * @param list UI list
- * @return Callback argument
- */
-void *ui_list_get_cb_arg(ui_list_t *list)
-{
-        return list->cb_arg;
 }
 
@@ -711 +701 @@
 }
 
-/** Destroy UI list entry.
- *
- * This is the quick way, but does not update cursor or page position.
+/** Delete UI list entry.
  *
  * @param entry UI list entry
  */
-void ui_list_entry_destroy(ui_list_entry_t *entry)
+void ui_list_entry_delete(ui_list_entry_t *entry)
 {
         if (entry->list->cursor == entry)
@@ -730 +718 @@
 }
 
-/** Delete UI list entry.
- *
- * If required, update cursor and page position and repaint.
- *
- * @param entry UI list entry
- */
-void ui_list_entry_delete(ui_list_entry_t *entry)
-{
-        ui_list_t *list = entry->list;
-
-        /* Try to make sure entry does not disappear under cursor or page */
-        if (entry->list->cursor == entry)
-                ui_list_cursor_up(entry->list);
-        if (entry->list->cursor == entry)
-                ui_list_cursor_down(entry->list);
-        if (entry->list->page == entry)
-                ui_list_scroll_up(entry->list);
-        if (entry->list->page == entry)
-                ui_list_scroll_down(entry->list);
-
-        ui_list_entry_destroy(entry);
-
-        /*
-         * But it could still happen if there are not enough entries.
-         * In that case just move page and/or cursor to the first
-         * entry.
-         */
-        if (list->page == NULL) {
-                list->page = ui_list_first(list);
-                list->page_idx = 0;
-        } else {
-                /*
-                 * Entry index might have changed if earlier entry
-                 * was deleted.
-                 */
-                list->page_idx = ui_list_entry_get_idx(list->page);
-        }
-
-        if (list->cursor == NULL) {
-                list->cursor = ui_list_first(list);
-                list->cursor_idx = 0;
-        } else {
-                /*
-                 * Entry index might have changed if earlier entry
-                 * was deleted.
-                 */
-                list->cursor_idx = ui_list_entry_get_idx(list->cursor);
-        }
-}
-
 /** Get entry argument.
  *
@@ -790 +728 @@
 }
 
-/** Get containing list.
- *
- * @param entry UI list entry
- * @return Containing list
- */
-ui_list_t *ui_list_entry_get_list(ui_list_entry_t *entry)
-{
-        return entry->list;
-}
-
-/** Change list entry caption.
- *
- * @param entry UI list entry
- * @param caption New caption
- *
- * @return EOK on success, ENOMEM if out of memory
- */
-errno_t ui_list_entry_set_caption(ui_list_entry_t *entry, const char *caption)
-{
-        char *dcaption;
-
-        dcaption = str_dup(caption);
-        if (dcaption == NULL)
-                return ENOMEM;
-
-        free(entry->caption);
-        entry->caption = dcaption;
-
-        (void)ui_list_entry_paint(entry, ui_list_entry_get_idx(entry));
-        return EOK;
-}
-
 /** Clear UI list entry list.
  *
@@ -832 +738 @@
         entry = ui_list_first(list);
         while (entry != NULL) {
-                ui_list_entry_destroy(entry);
+                ui_list_entry_delete(entry);
                 entry = ui_list_first(list);
         }
@@ -952 +858 @@
 {
         return list->cursor;
-}
-
-/** Set new cursor position.
- *
- * O(N) in list size, use with caution.
- *
- * @param list UI list
- * @param entry New cursor position
- */
-void ui_list_set_cursor(ui_list_t *list, ui_list_entry_t *entry)
-{
-        size_t idx;
-
-        idx = ui_list_entry_get_idx(entry);
-        ui_list_cursor_move(list, entry, idx);
 }
 
@@ -1021 +912 @@
                                 /* Find first page entry (go back rows - 1) */
                                 e = entry;
-                                for (i = 0; i + 1 < rows; i++) {
+                                for (i = 0; i < rows - 1; i++) {
                                         e = ui_list_prev(e);
                                 }
@@ -1207 +1098 @@
         ui_list_entry_t *prev;
 
-        if (list->page == NULL)
-                return;
-
         prev = ui_list_prev(list->page);
         if (prev == NULL)
@@ -1232 +1120 @@
         size_t i;
         size_t rows;
-
-        if (list->page == NULL)
-                return;
 
         next = ui_list_next(list->page);