Merge bccfad3de2 into c6cf27e4e1

Fix underscrolling issue for alternative scrolling

src/command/cmd_funcs.c

@@ -9447,6 +9447,7 @@ _url_http_method(ProfWin* window, const char* cmd_template, gchar* url, gchar* p
     download->filename = strdup(filename);
     download->id = strdup(id);
     download->cmd_template = cmd_template ? strdup(cmd_template) : NULL;
+    download->silent = FALSE;
 
     pthread_create(&(download->worker), NULL, &http_file_get, download);
     http_download_add_download(download);

src/config/color.c

@@ -361,8 +361,19 @@ find_closest_col(int h, int s, int l)
 static int
 find_col(const char* col_name, int n)
 {
+    char* endptr;
+    unsigned long col_value = strtoul(col_name, &endptr, 0);
     char name[32] = { 0 };
 
+    /*
+     * When the col_name is a uint8, then we don’t need to look up by
+     * color name (which is problematic given the duplicate names)
+     */
+
+    if ((*endptr == '\0' || *endptr == '\n') && col_value <= UINT8_MAX) {
+        return (int)col_value;
+    }
+
     /*
      * make a null terminated version of col_name. we don't want to
      * use strNcasecmp because we could end up matching blue3 with

src/tools/aesgcm_download.c

@@ -110,6 +110,7 @@ aesgcm_file_get(void* userdata)
     http_dl->url = strdup(https_url);
     http_dl->filename = strdup(tmpname);
     http_dl->cmd_template = NULL;
+    http_dl->silent = FALSE;
     aesgcm_dl->http_dl = http_dl;
 
     http_file_get(http_dl); // TODO(wstrm): Verify result.

src/ui/window.c

@@ -694,7 +694,7 @@ win_page_down(ProfWin* window, int scroll_size)
     *page_start += scroll_size;
 
     // Scrolled down after reaching the bottom of the page
-    if ((*page_start == total_rows || (*page_start == page_space && *page_start >= total_rows)) && window->type == WIN_CHAT) {
+    if ((*page_start > total_rows - page_space || (*page_start == page_space && *page_start >= total_rows)) && window->type == WIN_CHAT) {
         int bf_size = buffer_size(window->layout->buffer);
         if (bf_size > 0) {
             ProfBuffEntry* last_entry = buffer_get_entry(window->layout->buffer, bf_size - 1);
@@ -708,19 +708,19 @@ win_page_down(ProfWin* window, int scroll_size)
             g_date_time_unref(now);
 
             int offset = last_entry->y_end_pos - 1;
-            *page_start = offset;
+            *page_start = offset - page_space + scroll_size;
         }
     }
 
     total_rows = getcury(window->layout->win);
 
-    // only got half a screen, show full screen
-    if ((total_rows - (*page_start)) < page_space)
+    // near the end, but will display only part of the page space, move a bit back to show full page
+    if ((total_rows - *page_start) < page_space) {
         *page_start = total_rows - page_space;
-
-    // went past end, show full screen
-    else if (*page_start >= total_rows)
+        // went past end, show last page
+    } else if (*page_start >= total_rows) {
         *page_start = total_rows - page_space - 1;
+    }
 
     window->layout->paged = 1;
 
@@ -730,7 +730,7 @@ win_page_down(ProfWin* window, int scroll_size)
     }
 
     // switch off page if last line and space line visible
-    if ((total_rows) - *page_start == page_space) {
+    if (total_rows - *page_start == page_space) {
         window->layout->paged = 0;
     }
 }