Changeset 8c72f533 in mainline for uspace/app/nav/panel.c

Timestamp:

2021-10-25T00:32:45Z (2 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2fb49522

Parents:

be1d74c1

git-author:

Jiri Svoboda <jiri@…> (2021-10-12 19:41:17)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Page up and page down

File:

• uspace/app/nav/panel.c (modified) (7 diffs)

uspace/app/nav/panel.c

@@ -137 +137 @@
 
         gfx_text_fmt_init(&fmt);
-
-        rows = panel->rect.p1.y - panel->rect.p0.y - 2;
+        rows = panel_page_size(panel);
 
         /* Do not display entry outside of current page */
@@ -201 +200 @@
                 return rc;
 
-        lines = panel->rect.p1.y - panel->rect.p0.y - 2;
+        lines = panel_page_size(panel);
         i = 0;
 
@@ -244 +243 @@
                                 panel_cursor_bottom(panel);
                                 break;
+                        case KC_PAGE_UP:
+                                panel_page_up(panel);
+                                break;
+                        case KC_PAGE_DOWN:
+                                panel_page_down(panel);
+                                break;
                         default:
                                 break;
@@ -282 +287 @@
 {
         panel->rect = *rect;
+}
+
+/** Get panel page size.
+ *
+ * @param panel Panel
+ * @return Number of entries that fit in panel at the same time.
+ */
+unsigned panel_page_size(panel_t *panel)
+{
+        return panel->rect.p1.y - panel->rect.p0.y - 2;
 }
 
@@ -494 +509 @@
 }
 
+/** Move cursor to a new position, possibly scrolling.
+ *
+ * @param panel Panel
+ * @param entry New entry under cursor
+ * @param entry_idx Index of new entry under cursor
+ */
 void panel_cursor_move(panel_t *panel, panel_entry_t *entry, size_t entry_idx)
 {
@@ -503 +524 @@
         size_t i;
 
-        rows = panel->rect.p1.y - panel->rect.p0.y - 2;
+        rows = panel_page_size(panel);
 
         old_cursor = panel->cursor;
@@ -604 +625 @@
 }
 
+/** Move one page up.
+ *
+ * @param panel Panel
+ */
+void panel_page_up(panel_t *panel)
+{
+        gfx_context_t *gc = ui_window_get_gc(panel->window);
+        panel_entry_t *old_page;
+        panel_entry_t *old_cursor;
+        size_t old_idx;
+        size_t rows;
+        panel_entry_t *entry;
+        size_t i;
+
+        rows = panel_page_size(panel);
+
+        old_page = panel->page;
+        old_cursor = panel->cursor;
+        old_idx = panel->cursor_idx;
+
+        /* Move page by rows entries up (if possible) */
+        for (i = 0; i < rows; i++) {
+                entry = panel_prev(panel->page);
+                if (entry != NULL) {
+                        panel->page = entry;
+                        --panel->page_idx;
+                }
+        }
+
+        /* Move cursor by rows entries up (if possible) */
+
+        for (i = 0; i < rows; i++) {
+                entry = panel_prev(panel->cursor);
+                if (entry != NULL) {
+                        panel->cursor = entry;
+                        --panel->cursor_idx;
+                }
+        }
+
+        if (panel->page != old_page) {
+                /* We have scrolled. Need to repaint all entries */
+                (void) panel_paint(panel);
+        } else if (panel->cursor != old_cursor) {
+                /* No scrolling, but cursor has moved */
+                panel_entry_paint(old_cursor, old_idx);
+                panel_entry_paint(panel->cursor, panel->cursor_idx);
+
+                (void) gfx_update(gc);
+        }
+}
+
+/** Move one page down.
+ *
+ * @param panel Panel
+ */
+void panel_page_down(panel_t *panel)
+{
+        gfx_context_t *gc = ui_window_get_gc(panel->window);
+        panel_entry_t *old_page;
+        panel_entry_t *old_cursor;
+        size_t old_idx;
+        size_t max_idx;
+        size_t rows;
+        panel_entry_t *entry;
+        size_t i;
+
+        rows = panel_page_size(panel);
+
+        old_page = panel->page;
+        old_cursor = panel->cursor;
+        old_idx = panel->cursor_idx;
+        max_idx = panel->entries_cnt - rows;
+
+        /* Move page by rows entries down (if possible) */
+        for (i = 0; i < rows; i++) {
+                entry = panel_next(panel->page);
+                /* Do not scroll that results in a short page */
+                if (entry != NULL && panel->page_idx < max_idx) {
+                        panel->page = entry;
+                        ++panel->page_idx;
+                }
+        }
+
+        /* Move cursor by rows entries down (if possible) */
+
+        for (i = 0; i < rows; i++) {
+                entry = panel_next(panel->cursor);
+                if (entry != NULL) {
+                        panel->cursor = entry;
+                        ++panel->cursor_idx;
+                }
+        }
+
+        if (panel->page != old_page) {
+                /* We have scrolled. Need to repaint all entries */
+                (void) panel_paint(panel);
+        } else if (panel->cursor != old_cursor) {
+                /* No scrolling, but cursor has moved */
+                panel_entry_paint(old_cursor, old_idx);
+                panel_entry_paint(panel->cursor, panel->cursor_idx);
+
+                (void) gfx_update(gc);
+        }
+}
+
 /** @}
  */