From 0fc259002d3cdd442c94026c4ffb765583656f22 Mon Sep 17 00:00:00 2001 From: byakuren Date: Wed, 24 Sep 2025 17:04:57 +0100 Subject: [PATCH 1/3] Add ASCII art image display support Implement native ASCII art rendering for inline images, enabling image display in terminals without framebuffer or graphical capabilities. This feature is particularly useful for SSH sessions, TTY environments, and terminal multiplexers where traditional image display methods are unavailable. Key features: - New inline image protocol (5) for ASCII art rendering - Configurable ASCII art generator command - Automatic display refresh when remote images complete downloading - Single-refresh optimization to prevent flickering with multiple images - Terminal-aware size limits (3x width, 10x height for scrolling) - Preserves form state and cursor position during refresh - Works with any ASCII art generator (chafa, jp2a, img2txt, etc.) Implementation details: - Added INLINE_IMG_ASCII protocol constant in fm.h - New put_image_ascii() function in terms.c handles rendering - Smart refresh logic in image.c triggers once when all downloads complete - Automatic displayImage enable when ASCII art protocol selected - Viewport clipping for large scrollable images - Filters cursor control sequences from generator output Recommended configuration: inline_img_protocol 5 asciiart_display chafa --size=%dx%d --colors=256 --symbols=block --stretch '%s' 2>/dev/null The --stretch flag ensures images use the full specified dimensions for better ASCII art representation. Without it, aspect ratio is preserved which may result in smaller output. The implementation maintains full backwards compatibility with existing inline image protocols (0-4) and has no impact when not enabled. Documentation included in doc/README.ascii with configuration examples, troubleshooting guide, and terminal recommendations. --- display.c | 4 +- doc/README.ascii | 220 +++++++++++++++++++++++++++++++++++++ doc/README.img | 13 +++ file.c | 56 +++++++--- fm.h | 2 + image.c | 57 ++++++++-- main.c | 4 +- rc.c | 6 + terms.c | 278 +++++++++++++++++++++++++++++++++++++++++++++++ terms.h | 2 + 10 files changed, 614 insertions(+), 28 deletions(-) create mode 100644 doc/README.ascii diff --git a/display.c b/display.c index f3df215..96b8cd9 100644 --- a/display.c +++ b/display.c @@ -489,7 +489,9 @@ displayBuffer(Buffer *buf, int mode) term_title(conv_to_system(buf->buffername)); refresh(); #ifdef USE_IMAGE - if (activeImage && displayImage && buf->img && buf->image_loaded) { + if (activeImage && displayImage && buf->img && + (buf->image_loaded || enable_inline_image)) { + /* Draw images for inline protocols including ASCII art */ drawImage(); } #endif diff --git a/doc/README.ascii b/doc/README.ascii new file mode 100644 index 0000000..942b7db --- /dev/null +++ b/doc/README.ascii @@ -0,0 +1,220 @@ +ASCII Art Image Support for w3m +================================ + +Introduction +------------ + + This extension enables w3m to display inline images as colored ASCII art + in any terminal, including TTY environments without graphical capabilities. + Images are rendered directly in the terminal as text characters, making + them viewable over SSH, in tmux, or on systems without framebuffer support. + +Key Features +------------ + + - Native integration as inline image protocol 5 + - Automatic refresh when remote images finish downloading + - Smart single-refresh optimization to prevent flickering + - Full scrolling support for large images + - Terminal-aware sizing with configurable limits + - Preserves form state and cursor position during refresh + - Works with any ASCII art generator program + +Requirements +------------ + + An ASCII art generator program such as: + - chafa (https://github.com/hpjansson/chafa) - Recommended for best quality + - jp2a (https://github.com/Talinx/jp2a) - Classic ASCII art generator + - img2txt from libcaca (http://caca.zoy.org/wiki/libcaca) + - aview/asciiview (http://aa-project.sourceforge.net/) + - Any custom script that accepts image paths and outputs ASCII/ANSI text + +Configuration +------------- + + 1. Set inline image protocol to ASCII art (value 5): + + In ~/.w3m/config or via options menu: + inline_img_protocol 5 + + 2. Configure your ASCII art generator: + + In ~/.w3m/config: + asciiart_display + + The command format uses printf-style placeholders: + - %d,%d or %dx%d - width and height in characters + - %s - the image file path + + Note: The generator should output to stdout. Redirect stderr to avoid + interference with the display. The --stretch flag (for chafa) is + recommended to use the full specified dimensions. + +Configuration Examples +---------------------- + + High Quality (chafa with Unicode blocks and 256 colors): + asciiart_display chafa --size=%dx%d --colors=256 --symbols=block --stretch '%s' 2>/dev/null + + Classic ASCII (chafa with ASCII characters only): + asciiart_display chafa --size=%dx%d --colors=256 --symbols=ascii --stretch '%s' 2>/dev/null + + Monochrome ASCII (jp2a): + asciiart_display jp2a --width=%d --height=%d '%s' 2>/dev/null + + Colored ASCII (jp2a with ANSI colors): + asciiart_display jp2a --width=%d --height=%d --colors '%s' 2>/dev/null + + Retro Style (img2txt from libcaca): + asciiart_display img2txt -W %d -H %d '%s' 2>/dev/null + + Custom Script: + asciiart_display /path/to/my-ascii-art-generator %d %d '%s' 2>/dev/null + + With Options (chafa with custom settings): + asciiart_display chafa --size=%dx%d --colors=256 --symbols=block+border \ + --color-space=din99d --dither=ordered --stretch '%s' 2>/dev/null + +Auto-Refresh Behavior +--------------------- + + Remote images are automatically displayed when downloads complete: + + - No manual reload required (no need to press 'R') + - Single refresh after ALL images download (prevents flickering) + - Failed downloads don't block the refresh + - Form inputs and cursor position preserved during refresh + - Works seamlessly with mixed local and remote images + +Image Sizing +------------ + + Images are limited to reasonable terminal-based dimensions: + + - Maximum width: 3x terminal columns (for horizontal scrolling) + - Maximum height: 10x terminal rows (for vertical scrolling) + - HTML width/height attributes control displayed size + - Larger images are clipped but remain scrollable + + For best results with ASCII art: + - Icons: minimum 150x150 pixels + - Logos: minimum 300x100 pixels + - Photos: minimum 400x300 pixels + - Detailed images: 600x400 pixels or larger + +Usage +----- + + Once configured, images automatically display as ASCII art when browsing. + Standard w3m image options apply: + + - display_image: Enable/disable image display + - auto_image: Automatically load images + - max_load_image: Maximum parallel image downloads (default: 4) + - ext_image_viewer: Fallback for viewing images externally + - imgdisplay: Not used in ASCII art mode + +Key Functions +------------- + + Standard image control keys work with ASCII art: + + Key Function + --- -------- + I DISPLAY_IMAGE - Restart loading and drawing of images + ESC I STOP_IMAGE - Stop loading and drawing of images + o SET_OPTION - Toggle display_image option + + Navigation keys for scrolling large images: + h,j,k,l Vi-style navigation + Arrow keys Standard navigation + <,> Horizontal scrolling + +Differences from Other Image Modes +----------------------------------- + + ASCII art mode (protocol 5) differs from other inline image protocols: + + - No external imgdisplay process required + - Works in any terminal (no framebuffer/sixel/kitty protocol needed) + - ALT text automatically suppressed when images display + - Image filenames not shown in brackets + - Images render as part of the text buffer (copyable) + - Color depth depends on terminal and generator capabilities + +Troubleshooting +--------------- + + Images show as [IMG] placeholder: + - Check asciiart_display is configured + - Verify the ASCII art generator is installed + - Test generator manually: chafa --size=80x24 test.jpg + + Images show as [ERR] placeholder: + - Generator command failed + - Check file permissions and paths + - Verify command syntax with test image + + Remote images don't appear: + - Wait for download completion (check status line) + - Verify network connectivity + - Check max_load_image setting + + Display issues: + - Ensure terminal supports ANSI colors + - Try different generator or options + - Adjust terminal font for better ASCII rendering + + Cursor disappears: + - Generator may output cursor hide sequences + - w3m filters these, but report if issues persist + +Performance Notes +----------------- + + - Initial display may be slower than pixel-based methods + - Large images take longer to convert + - Generator choice affects speed and quality + - Consider caching frequently viewed images externally + - Remote images download in background (up to max_load_image) + +Examples +-------- + + View local image: + w3m file:///path/to/image.jpg + + View HTML with images: + w3m https://example.com/gallery.html + + Quick test: + echo '' | w3m -T text/html + +Terminal Recommendations +------------------------ + + For best ASCII art display: + + - Use terminals with 256 color support (xterm-256color) + - Monospace fonts with good Unicode coverage + - Sufficient terminal size (minimum 80x24, larger is better) + - Dark backgrounds often work better with colored ASCII + - Consider GPU-accelerated terminals for smooth scrolling + +Limitations +----------- + + - No animation support (GIFs display as static) + - Quality depends on terminal and generator capabilities + - Very small images may not be recognizable + - Some image formats may not be supported by all generators + - No alpha channel/transparency support in most generators + +See Also +-------- + + README.img - General image display documentation + README.sixel - Sixel graphics protocol support + w3m(1) - Main w3m manual page + w3mimg(1) - Image display helper documentation \ No newline at end of file diff --git a/doc/README.img b/doc/README.img index c0eeea8..334aa96 100644 --- a/doc/README.img +++ b/doc/README.img @@ -77,6 +77,19 @@ Option panel imgdisplay External command to display image. The default value is "w3mimgdisplay". See "w3mimgdisplay Settings" section + inline_img_protocol + Inline image display protocol. Available options: + 0: external command (w3mimgdisplay) - requires framebuffer/X11 + 1: OSC 5379 (mlterm) - mlterm specific + 2: sixel (img2sixel) - sixel-capable terminals + 3: OSC 1337 (iTerm2) - iTerm2 specific + 4: kitty (ImageMagick) - kitty terminal + 5: ASCII art - works in any terminal (see README.ascii) + asciiart_display + External command to generate ASCII art when inline_img_protocol is 5. + Format: command with %d,%d for size and %s for filename + Example: chafa --size=%dx%d --colors=256 --stretch '%s' 2>/dev/null + See "doc/README.ascii" for detailed configuration and examples Required programs diff --git a/file.c b/file.c index 9f8e97e..9b52be4 100644 --- a/file.c +++ b/file.c @@ -20,6 +20,7 @@ #include "parsetagx.h" #include "local.h" #include "regex.h" +#include "terms.h" #ifndef max #define max(a,b) ((a) > (b) ? (a) : (b)) @@ -3414,6 +3415,13 @@ process_img(struct parsed_tag *tag, int width) if (enable_inline_image) { nw = (w > 1) ? ((w - 1) / pixel_per_char_i + 1) : 1 ; ni = (i > 1) ? ((i - 1) / pixel_per_line_i + 1) : 1 ; + /* ASCII art: scale dimensions to fit terminal */ + if (enable_inline_image == INLINE_IMG_ASCII) { + int scaled_w, scaled_h; + calculate_ascii_dimensions(nw, ni, &scaled_w, &scaled_h); + nw = scaled_w; + ni = scaled_h; + } } else { nw = (w > 3) ? (int)((w - 3) / pixel_per_char + 1) : 1; @@ -3510,7 +3518,12 @@ process_img(struct parsed_tag *tag, int width) if (q != NULL) { n = get_strwidth(q); #ifdef USE_IMAGE - if (use_image) { + if (enable_inline_image == INLINE_IMG_ASCII) { + /* ASCII art: suppress ALT text */ + n = 0; + goto img_end; /* Skip to space padding */ + } + else if (use_image) { if (n > nw) { char *r; for (r = q, n = 0; *r; r += get_mclen(r), n += get_mcwidth(r)) { @@ -3562,25 +3575,34 @@ process_img(struct parsed_tag *tag, int width) goto img_end; } } - for (q = p; *q; q++) ; - while (q > p && *q != '/') - q--; - if (*q == '/') - q++; - Strcat_char(tmp, '['); - n = 1; - p = q; - for (; *q; q++) { - if (!IS_ALNUM(*q) && *q != '_' && *q != '-') { - break; +#ifdef USE_IMAGE + if (enable_inline_image == INLINE_IMG_ASCII) { + /* ASCII art: suppress filename display */ + n = 0; + goto img_end; /* Skip to space padding */ + } +#endif + { + for (q = p; *q; q++) ; + while (q > p && *q != '/') + q--; + if (*q == '/') + q++; + Strcat_char(tmp, '['); + n = 1; + p = q; + for (; *q; q++) { + if (!IS_ALNUM(*q) && *q != '_' && *q != '-') { + break; + } + Strcat_char(tmp, *q); + n++; + if (n + 1 >= nw) + break; } - Strcat_char(tmp, *q); + Strcat_char(tmp, ']'); n++; - if (n + 1 >= nw) - break; } - Strcat_char(tmp, ']'); - n++; img_end: #ifdef USE_IMAGE if (use_image) { diff --git a/fm.h b/fm.h index e6c760e..e2bae64 100644 --- a/fm.h +++ b/fm.h @@ -322,6 +322,7 @@ extern int REV_LB[]; #define INLINE_IMG_SIXEL 2 #define INLINE_IMG_ITERM2 3 #define INLINE_IMG_KITTY 4 +#define INLINE_IMG_ASCII 5 /* * Types. @@ -991,6 +992,7 @@ global int showLineNum init(FALSE); global int show_srch_str init(TRUE); #ifdef USE_IMAGE global char *Imgdisplay init(IMGDISPLAY); +global char *AsciiartDisplay init(ASCIIART_DISPLAY); global int activeImage init(FALSE); global int displayImage init(TRUE); global int autoImage init(TRUE); diff --git a/image.c b/image.c index ee5e51b..c1509a5 100644 --- a/image.c +++ b/image.c @@ -211,14 +211,30 @@ drawImage(void) i = &terminal_image[j]; if (enable_inline_image) { - /* - * So this shouldn't ever happen, but if it does then at least let's - * not have external programs fetch images from the Internet... - */ - if (!i->cache->touch || stat(i->cache->file,&st)) - return; - - char *url = i->cache->file; + char *url; + + if (enable_inline_image == INLINE_IMG_ASCII) { + /* ASCII art: determine image file path */ + if (!strncmp(i->cache->url, "file://", 7)) { + url = i->cache->url + 7; /* Skip "file://" prefix */ + } else if (!strncmp(i->cache->url, "/", 1)) { + url = i->cache->url; /* Already a local path */ + } else { + /* Remote URL - use downloaded file if available */ + if (!i->cache->touch || stat(i->cache->file, &st)) { + continue; /* Skip until downloaded */ + } + url = i->cache->file; + } + } else { + /* + * For other inline protocols, ensure the file exists + * to prevent external programs from fetching from Internet + */ + if (!i->cache->touch || stat(i->cache->file,&st)) + continue; /* Skip this image, but process others */ + url = i->cache->file; + } int x = i->x / pixel_per_char_i; int y = i->y / pixel_per_line_i; @@ -238,6 +254,14 @@ drawImage(void) int sh = (i->height + i->sy % pixel_per_line_i + pixel_per_line_i - 1) / pixel_per_line_i; + /* ASCII art: calculate proper space reservation */ + if (enable_inline_image == INLINE_IMG_ASCII) { + int scaled_pixel_w, scaled_pixel_h; + calculate_ascii_dimensions(w, h, &scaled_pixel_w, &scaled_pixel_h); + sw = scaled_pixel_w; + sh = scaled_pixel_h; + } + #if 0 fprintf(stderr,"file %s x %d y %d w %d h %d sx %d sy %d sw %d sh %d (ppc %d ppl %d)\n", i->cache->file, @@ -256,6 +280,8 @@ drawImage(void) put_image_iterm2(url, x, y, sw, sh); } else if (enable_inline_image == INLINE_IMG_KITTY) { put_image_kitty(url, x, y, i->width, i->height, i->sx, i->sy, sw * pixel_per_char, sh * pixel_per_line_i, sw, sh); + } else if (enable_inline_image == INLINE_IMG_ASCII) { + put_image_ascii(url, x, y, w, h, sx, sy, sw, sh); } continue ; @@ -494,8 +520,21 @@ loadImage(Buffer *buf, int flag) } if (draw && image_buffer) { - if (!enable_inline_image) + if (!enable_inline_image) { drawImage(); + } else if (enable_inline_image == INLINE_IMG_ASCII) { + /* ASCII art: refresh display only when all downloads complete */ + int all_done = 1; + for (i = 0; i < n_load_image; i++) { + if (image_cache[i] && image_cache[i]->pid > 0) { + all_done = 0; + break; + } + } + if (all_done) { + displayBuffer(image_buffer, B_REDRAW_IMAGE); + } + } showImageProgress(image_buffer); } diff --git a/main.c b/main.c index 710db9c..eb908a7 100644 --- a/main.c +++ b/main.c @@ -1241,7 +1241,9 @@ main(int argc, char **argv) #endif #ifdef USE_IMAGE if (activeImage && displayImage && Currentbuf->img && - !Currentbuf->image_loaded) { + (!Currentbuf->image_loaded || + enable_inline_image == INLINE_IMG_ASCII)) { + /* Poll for image downloads (regular images or ASCII art) */ do { #ifdef SIGWINCH if (need_resize_screen) diff --git a/rc.c b/rc.c index 45ab14f..a00941f 100644 --- a/rc.c +++ b/rc.c @@ -86,6 +86,7 @@ static int OptionEncode = FALSE; #define CMT_EXT_IMAGE_VIEWER N_("Use external image viewer") #define CMT_IMAGE_SCALE N_("Scale of image (%)") #define CMT_IMGDISPLAY N_("External command to display image") +#define CMT_ASCIIART_DISPLAY N_("ASCII art generator command (%d,%d = width,height; %s = filename)") #define CMT_IMAGE_MAP_LIST N_("Use link list of image map") #define CMT_INLINE_IMG_PROTOCOL N_("Inline image display method") #endif @@ -382,6 +383,7 @@ static struct sel_c inlineimgstr[] = { {N_S(INLINE_IMG_SIXEL), N_("sixel (img2sixel)")}, {N_S(INLINE_IMG_ITERM2), N_("OSC 1337 (iTerm2)")}, {N_S(INLINE_IMG_KITTY), N_("kitty (ImageMagick)")}, + {N_S(INLINE_IMG_ASCII), N_("ASCII art")}, {0, NULL, NULL} }; #endif /* USE_IMAGE */ @@ -453,6 +455,8 @@ struct param_ptr params1[] = { CMT_INLINE_IMG_PROTOCOL, (void *)inlineimgstr}, {"imgdisplay", P_STRING, PI_TEXT, (void *)&Imgdisplay, CMT_IMGDISPLAY, NULL}, + {"asciiart_display", P_STRING, PI_TEXT, (void *)&AsciiartDisplay, + CMT_ASCIIART_DISPLAY, NULL}, {"image_map_list", P_INT, PI_ONOFF, (void *)&image_map_list, CMT_IMAGE_MAP_LIST, NULL}, #endif @@ -1313,6 +1317,8 @@ sync_with_option(void) init_migemo(); #endif #ifdef USE_IMAGE + if (enable_inline_image == INLINE_IMG_ASCII) + displayImage = TRUE; /* ASCII art needs displayImage enabled */ if (fmInitialized && (displayImage || enable_inline_image)) initImage(); #else diff --git a/terms.c b/terms.c index b0a15f7..2cbc452 100644 --- a/terms.c +++ b/terms.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "config.h" #include #include @@ -856,6 +857,283 @@ put_image_sixel(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i MOVE(Currentbuf->cursorY,Currentbuf->cursorX); } +void +calculate_ascii_dimensions(int w, int h, int *full_w, int *full_h) +{ + /* Scale images to fit within terminal while preserving aspect ratio */ + int max_width = COLS; + int max_height = LINES; + if (w > max_width || h > max_height) { + double scale_w = (double)max_width / w; + double scale_h = (double)max_height / h; + double scale = (scale_w < scale_h) ? scale_w : scale_h; + + *full_w = (int)(w * scale); + *full_h = (int)(h * scale); + + /* Ensure minimum size */ + if (*full_w < 1) *full_w = 1; + if (*full_h < 1) *full_h = 1; + } else { + *full_w = (w < 1) ? 1 : w; + *full_h = (h < 1) ? 1 : h; + } +} + +static int +is_ansi_sequence(const char *s, int *length) +{ + if (s[0] != '\033' || s[1] != '[') + return 0; + + const char *p = s + 2; + + /* ANSI sequence: ESC [ parameters intermediate final */ + while (*p >= 0x30 && *p <= 0x3F) p++; /* parameters */ + while (*p >= 0x20 && *p <= 0x2F) p++; /* intermediate */ + + /* Check for final character */ + if (*p >= 0x40 && *p <= 0x7E) { + *length = p - s + 1; + return 1; + } + + return 0; +} + +static int +count_visible_chars(const char *s, int max_chars) +{ + int count = 0; + int i = 0; + int seq_len; + + while (s[i] && count < max_chars) { + if (is_ansi_sequence(&s[i], &seq_len)) { + i += seq_len; + } else { + /* Handle UTF-8 characters */ + unsigned char c = (unsigned char)s[i]; + if (c <= 0x7F) { + /* ASCII */ + count++; + i++; + } else if (c <= 0xBF) { + /* Invalid UTF-8 continuation byte, skip */ + i++; + } else if (c <= 0xDF) { + /* 2-byte UTF-8 character */ + count++; + i += 2; + } else if (c <= 0xEF) { + /* 3-byte UTF-8 character */ + count++; + i += 3; + } else if (c <= 0xF7) { + /* 4-byte UTF-8 character */ + count++; + i += 4; + } else { + /* Invalid UTF-8 byte, skip */ + i++; + } + } + } + + return count; +} + +static char * +extract_visible_substring(const char *s, int start_char, int max_chars, char *buffer, int buffer_size) +{ + int char_count = 0; + int i = 0; + int j = 0; + int seq_len; + + /* Skip to start position */ + while (s[i] && char_count < start_char) { + if (is_ansi_sequence(&s[i], &seq_len)) { + i += seq_len; + } else { + unsigned char c = (unsigned char)s[i]; + if (c <= 0x7F) { + char_count++; + i++; + } else if (c <= 0xBF) { + i++; + } else if (c <= 0xDF) { + char_count++; + i += 2; + } else if (c <= 0xEF) { + char_count++; + i += 3; + } else if (c <= 0xF7) { + char_count++; + i += 4; + } else { + i++; + } + } + } + + /* Extract visible characters while preserving ANSI sequences */ + char_count = 0; + while (s[i] && char_count < max_chars && j < buffer_size - 1) { + if (is_ansi_sequence(&s[i], &seq_len)) { + /* Copy ANSI sequence */ + while (seq_len > 0 && j < buffer_size - 1) { + buffer[j++] = s[i++]; + seq_len--; + } + } else { + unsigned char c = (unsigned char)s[i]; + if (c <= 0x7F) { + buffer[j++] = s[i++]; + char_count++; + } else if (c <= 0xBF) { + i++; + } else if (c <= 0xDF) { + if (j < buffer_size - 2) { + buffer[j++] = s[i++]; + buffer[j++] = s[i++]; + char_count++; + } else { + break; + } + } else if (c <= 0xEF) { + if (j < buffer_size - 3) { + buffer[j++] = s[i++]; + buffer[j++] = s[i++]; + buffer[j++] = s[i++]; + char_count++; + } else { + break; + } + } else if (c <= 0xF7) { + if (j < buffer_size - 4) { + buffer[j++] = s[i++]; + buffer[j++] = s[i++]; + buffer[j++] = s[i++]; + buffer[j++] = s[i++]; + char_count++; + } else { + break; + } + } else { + i++; + } + } + } + + buffer[j] = '\0'; + return buffer; +} + +void +put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh) +{ + FILE *fp; + char *cmd = NULL; + char *base_cmd = NULL; + char *line = NULL; + char *clipped = NULL; + int full_w, full_h; + int line_num = 0; + int skip_lines, start_col; + int lines_to_display, visible_cols; + int buffer_size = 8192; + + /* Calculate scaled dimensions preserving aspect ratio */ + calculate_ascii_dimensions(w, h, &full_w, &full_h); + + /* Calculate viewport clipping parameters */ + skip_lines = (sy > 0) ? sy : 0; + lines_to_display = sh; + if (lines_to_display > full_h - skip_lines) + lines_to_display = full_h - skip_lines; + if (lines_to_display <= 0) + return; + + start_col = (sx > 0) ? sx : 0; + visible_cols = sw; + if (visible_cols > full_w - start_col) + visible_cols = full_w - start_col; + + /* Check if ASCII art program is configured */ + if (!AsciiartDisplay || !*AsciiartDisplay) { + MOVE(y, x); + writestr("[IMG]"); + return; + } + + /* Allocate buffers */ + cmd = malloc(buffer_size); + base_cmd = malloc(buffer_size / 2); + line = malloc(buffer_size); + clipped = malloc(buffer_size); + + if (!cmd || !base_cmd || !line || !clipped) { + MOVE(y, x); + writestr("[MEM]"); + goto cleanup; + } + + /* Generate full-size image using configured ASCII art program */ + snprintf(base_cmd, buffer_size / 2, AsciiartDisplay, full_w, full_h, url); + + /* Filter out cursor control and positioning sequences */ + snprintf(cmd, buffer_size, + "%s | sed -e 's/\\x1b\\[?[0-9]*[hlc]//g' -e 's/\\x1b\\[[0-9;]*[HfABCDJK]//g' -e 's/\\x1b\\[s//g' -e 's/\\x1b\\[u//g'", + base_cmd); + + fp = popen(cmd, "r"); + if (!fp) { + MOVE(y, x); + writestr("[ERR]"); + goto cleanup; + } + + /* Skip lines above viewport */ + int i; + for (i = 0; i < skip_lines && fgets(line, buffer_size, fp); i++); + + /* Process and display visible lines */ + line_num = 0; + while (fgets(line, buffer_size, fp) && line_num < lines_to_display) { + /* Remove newline */ + line[strcspn(line, "\n\r")] = '\0'; + + /* Apply horizontal clipping if needed */ + if (start_col > 0 || visible_cols < count_visible_chars(line, INT_MAX)) { + extract_visible_substring(line, start_col, visible_cols, clipped, buffer_size); + + if (y + line_num >= 0 && y + line_num < LINES) { + MOVE(y + line_num, x); + writestr(clipped); + } + } else { + if (y + line_num >= 0 && y + line_num < LINES) { + MOVE(y + line_num, x); + writestr(line); + } + } + line_num++; + } + + pclose(fp); + + /* Restore cursor visibility and position */ + writestr("\033[?25h"); + MOVE(Currentbuf->cursorY, Currentbuf->cursorX); + +cleanup: + if (cmd) free(cmd); + if (base_cmd) free(base_cmd); + if (line) free(line); + if (clipped) free(clipped); +} + int get_pixel_per_cell(int *ppc, int *ppl) { diff --git a/terms.h b/terms.h index c45db2e..5fea7e3 100644 --- a/terms.h +++ b/terms.h @@ -35,6 +35,8 @@ extern void put_image_osc5379(char *url, int x, int y, int w, int h, int sx, int extern void put_image_sixel(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, int n_terminal_image); extern void put_image_iterm2(char *url, int x, int y, int w, int h); extern void put_image_kitty(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, int c, int r); +extern void put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh); +extern void calculate_ascii_dimensions(int w, int h, int *full_w, int *full_h); extern int get_pixel_per_cell(int *ppc, int *ppl); #endif -- 2.51.2 From 85e9410ce324ec15fbd80e7ab8026796bd8e48db Mon Sep 17 00:00:00 2001 From: byakuren Date: Wed, 24 Sep 2025 19:23:48 +0100 Subject: [PATCH 2/3] Improve ASCII art image display with parallel processing This commit enhances ASCII art image rendering in w3m with several key improvements: Display fixes: - Fix line truncation by properly handling ANSI escape sequences - Filter all ANSI escape codes (CSI sequences with terminators 0x40-0x7E) - Correct excessive space reservation through proper dimension calculations - Maintain correct aspect ratio using character cell dimensions Performance improvements: - Implement worker pool pattern for parallel image downloads and conversions - Set worker threads to half of system CPU cores (min 1, max 8) - Add CPU core detection via sysconf() with /proc/cpuinfo fallback - Process images concurrently with proper fork/wait handling User experience: - Single display refresh after all images complete (no flickering) - Show detailed progress: "X/Y images loaded, X/Y converted" - Track both download and conversion status separately Technical changes: - Add ascii_file and ascii_loaded fields to ImageCache structure - Implement getCpuCores() for cross-platform CPU detection - Extend put_image_ascii() to handle ImageCache parameter - Support proper ANSI escape sequence parsing in terms.c --- fm.h | 3 + image.c | 318 ++++++++++++++++++++++++++++++++++++++++++++++++++------ terms.c | 40 +++++-- terms.h | 2 +- 4 files changed, 318 insertions(+), 45 deletions(-) diff --git a/fm.h b/fm.h index e2bae64..f8a4a8e 100644 --- a/fm.h +++ b/fm.h @@ -389,6 +389,9 @@ typedef struct _imageCache { short height; short a_width; short a_height; + /* ASCII art cache */ + char *ascii_file; /* Path to cached ASCII art output */ + char ascii_loaded; /* ASCII conversion status */ } ImageCache; typedef struct _image { diff --git a/image.c b/image.c index c1509a5..013816e 100644 --- a/image.c +++ b/image.c @@ -34,6 +34,7 @@ static pid_t Imgdisplay_pid = 0; static int openImgdisplay(void); static void closeImgdisplay(void); static int getCharSize(void); +static int getCpuCores(void); void initImage() @@ -150,6 +151,35 @@ closeImgdisplay(void) Imgdisplay_pid = 0; } +static int +getCpuCores(void) +{ + int cores = 1; /* Default to 1 if detection fails */ + +#ifdef _SC_NPROCESSORS_ONLN + /* POSIX way to get number of online processors */ + long result = sysconf(_SC_NPROCESSORS_ONLN); + if (result > 0) + cores = (int)result; +#else + /* Try to read from /proc/cpuinfo on Linux */ + FILE *fp = fopen("/proc/cpuinfo", "r"); + if (fp) { + char line[256]; + cores = 0; + while (fgets(line, sizeof(line), fp)) { + if (strncmp(line, "processor", 9) == 0) + cores++; + } + fclose(fp); + if (cores == 0) + cores = 1; + } +#endif + + return cores; +} + void addImage(ImageCache * cache, int x, int y, int sx, int sy, int w, int h) { @@ -254,13 +284,7 @@ drawImage(void) int sh = (i->height + i->sy % pixel_per_line_i + pixel_per_line_i - 1) / pixel_per_line_i; - /* ASCII art: calculate proper space reservation */ - if (enable_inline_image == INLINE_IMG_ASCII) { - int scaled_pixel_w, scaled_pixel_h; - calculate_ascii_dimensions(w, h, &scaled_pixel_w, &scaled_pixel_h); - sw = scaled_pixel_w; - sh = scaled_pixel_h; - } + /* ASCII art uses original viewport dimensions */ #if 0 fprintf(stderr,"file %s x %d y %d w %d h %d sx %d sy %d sw %d sh %d (ppc %d ppl %d)\n", @@ -281,7 +305,7 @@ drawImage(void) } else if (enable_inline_image == INLINE_IMG_KITTY) { put_image_kitty(url, x, y, i->width, i->height, i->sx, i->sy, sw * pixel_per_char, sh * pixel_per_line_i, sw, sh); } else if (enable_inline_image == INLINE_IMG_ASCII) { - put_image_ascii(url, x, y, w, h, sx, sy, sw, sh); + put_image_ascii(url, x, y, w, h, sx, sy, sw, sh, i->cache); } continue ; @@ -353,7 +377,7 @@ clearImage() /* load image */ #ifndef MAX_LOAD_IMAGE -#define MAX_LOAD_IMAGE 8 +#define MAX_LOAD_IMAGE 8 /* Reasonable limit for concurrent processes */ #endif static int n_load_image = 0; static Hash_sv *image_hash = NULL; @@ -415,25 +439,36 @@ showImageProgress(Buffer *buf) { AnchorList *al; Anchor *a; - int i, l, n; + int i, l, n, c; if (!buf) return; al = buf->img; if (!al) return; - for (i = 0, l = 0, n = 0, a = al->anchors; i < al->nanchor; i++, a++) { + for (i = 0, l = 0, n = 0, c = 0, a = al->anchors; i < al->nanchor; i++, a++) { if (a->image && a->hseq >= 0) { n++; - if (a->image->cache && a->image->cache->loaded & IMG_FLAG_LOADED) - l++; + if (a->image->cache) { + if (a->image->cache->loaded & IMG_FLAG_LOADED) + l++; + /* Count ASCII conversions if in ASCII mode */ + if (enable_inline_image == INLINE_IMG_ASCII && + a->image->cache->ascii_loaded == IMG_FLAG_LOADED) + c++; + } } } if (n) { - if (enable_inline_image && n == l) + if (enable_inline_image && n == l && enable_inline_image != INLINE_IMG_ASCII) drawImage(); - message(Sprintf("%d/%d images loaded", l, n)->ptr, - buf->cursorX + buf->rootX, buf->cursorY + buf->rootY); + if (enable_inline_image == INLINE_IMG_ASCII) { + message(Sprintf("%d/%d images loaded, %d/%d converted", l, n, c, l)->ptr, + buf->cursorX + buf->rootX, buf->cursorY + buf->rootY); + } else { + message(Sprintf("%d/%d images loaded", l, n)->ptr, + buf->cursorX + buf->rootX, buf->cursorY + buf->rootY); + } refresh(); } } @@ -444,6 +479,7 @@ loadImage(Buffer *buf, int flag) ImageCache *cache; struct stat st; int i, draw = FALSE; + int all_complete = 1; /* Track if all images are complete */ /* int wait_st; */ #ifdef DONT_CALL_GC_AFTER_FORK char *loadargs[7]; @@ -455,10 +491,32 @@ loadImage(Buffer *buf, int flag) maxLoadImage = 1; if (n_load_image == 0) n_load_image = maxLoadImage; + /* For ASCII mode, use half CPU cores for worker pool */ + if (enable_inline_image == INLINE_IMG_ASCII) { + int cpu_cores = getCpuCores(); + int ascii_workers = cpu_cores / 2; + + /* Ensure at least 1 worker, max 8 for sanity */ + if (ascii_workers < 1) + ascii_workers = 1; + if (ascii_workers > 8) + ascii_workers = 8; + + /* Override maxLoadImage for ASCII mode */ + maxLoadImage = ascii_workers; + n_load_image = maxLoadImage; + + /* Debug info (can be removed later) */ +#if 0 + message(Sprintf("ASCII art: using %d workers (%d CPU cores detected)", + ascii_workers, cpu_cores)->ptr, 0, 0); +#endif + } if (!image_cache) { image_cache = New_N(ImageCache *, MAX_LOAD_IMAGE); bzero(image_cache, sizeof(ImageCache *) * MAX_LOAD_IMAGE); } + /* Check all active slots */ for (i = 0; i < n_load_image; i++) { cache = image_cache[i]; if (!cache || !cache->touch) @@ -482,12 +540,57 @@ loadImage(Buffer *buf, int flag) if (image_buffer) image_buffer->need_reshape = TRUE; } + if (enable_inline_image == INLINE_IMG_ASCII && cache->ascii_file) { + int full_w, full_h; + char *cmd; + + /* Convert pixel dimensions to character cells */ + int char_w = cache->width / pixel_per_char_i; + int char_h = cache->height / pixel_per_line_i; + if (char_w < 1) char_w = 1; + if (char_h < 1) char_h = 1; + + calculate_ascii_dimensions(char_w, char_h, &full_w, &full_h); + + cmd = Sprintf("%s > %s 2>/dev/null", + Sprintf(AsciiartDisplay, full_w, full_h, cache->file)->ptr, + cache->ascii_file)->ptr; + + /* Fork to run conversion */ + pid_t ascii_pid = fork(); + if (ascii_pid == 0) { + setup_child(FALSE, 0, -1); + system(cmd); + exit(0); + } else if (ascii_pid > 0) { + } + } draw = TRUE; } else cache->loaded = IMG_FLAG_ERROR; unlink(cache->touch); - image_cache[i] = NULL; + image_cache[i] = NULL; /* Free slot immediately for reuse */ + } + + if (enable_inline_image == INLINE_IMG_ASCII && buf && buf->img) { + AnchorList *al = buf->img; + Anchor *a; + int j; + for (j = 0, a = al->anchors; j < al->nanchor; j++, a++) { + if (a->image && a->image->cache) { + cache = a->image->cache; + if (cache->loaded == IMG_FLAG_LOADED && + cache->ascii_loaded == IMG_FLAG_UNLOADED && + cache->ascii_file) { + struct stat st; + if (!stat(cache->ascii_file, &st)) { + cache->ascii_loaded = IMG_FLAG_LOADED; + draw = TRUE; + } + } + } + } } for (i = (buf != image_buffer) ? 0 : maxLoadImage; i < n_load_image; i++) { @@ -505,9 +608,6 @@ loadImage(Buffer *buf, int flag) */ cache->pid = 0; } - /*TODO make sure removing this didn't break anything - unlink(cache->touch); - */ image_cache[i] = NULL; } @@ -519,29 +619,182 @@ loadImage(Buffer *buf, int flag) return; } + /* For ASCII art mode, check if ALL images are complete */ + if (enable_inline_image == INLINE_IMG_ASCII && buf && buf->img) { + AnchorList *al = buf->img; + Anchor *a; + int j; + int pending_loads = 0; + int active_downloads = 0; + int active_conversions = 0; + all_complete = 1; + + for (j = 0, a = al->anchors; j < al->nanchor; j++, a++) { + if (a->image && a->image->cache) { + cache = a->image->cache; + /* Check if image is still downloading */ + if (cache->loaded == IMG_FLAG_UNLOADED) { + all_complete = 0; + if (cache->pid == 0) + pending_loads++; /* Image not started yet */ + else + active_downloads++; /* Currently downloading */ + } else if (cache->pid > 0) { + all_complete = 0; + active_downloads++; + } + /* Check if ASCII conversion is complete (for ASCII mode) */ + if (enable_inline_image == INLINE_IMG_ASCII && + cache->loaded == IMG_FLAG_LOADED && + cache->ascii_loaded != IMG_FLAG_LOADED) { + all_complete = 0; + } + } + } + + /* Keep image_loaded FALSE until everything is complete */ + if (!all_complete && buf) { + buf->image_loaded = FALSE; + } + + /* Continue loading if we have pending images or active processes */ + if (pending_loads > 0 || active_downloads > 0 || active_conversions > 0 || !all_complete) { + /* This will cause loadImage to be called again from main loop */ + draw = TRUE; + /* Also ensure we keep trying to load */ + if (buf) + buf->image_loaded = FALSE; + } + } + if (draw && image_buffer) { if (!enable_inline_image) { drawImage(); } else if (enable_inline_image == INLINE_IMG_ASCII) { - /* ASCII art: refresh display only when all downloads complete */ - int all_done = 1; - for (i = 0; i < n_load_image; i++) { - if (image_cache[i] && image_cache[i]->pid > 0) { - all_done = 0; - break; - } - } - if (all_done) { + /* ASCII art: only refresh display ONCE when ALL conversions are complete */ + if (all_complete) { displayBuffer(image_buffer, B_REDRAW_IMAGE); + /* Mark as complete so we don't redraw again */ + image_buffer->image_loaded = TRUE; } + /* Don't refresh display until everything is ready */ } showImageProgress(image_buffer); } image_buffer = buf; + /* Handle image loading with worker pool for ASCII mode */ + if (enable_inline_image == INLINE_IMG_ASCII) { + /* First, ensure all images are queued */ + if (buf && buf->img && !image_list) { + /* Re-scan for any unloaded images that need to be queued */ + AnchorList *al = buf->img; + Anchor *a; + int j; + int pending_count = 0; + for (j = 0, a = al->anchors; j < al->nanchor; j++, a++) { + if (a->image && a->image->cache) { + cache = a->image->cache; + if (cache->loaded == IMG_FLAG_UNLOADED && cache->pid == 0) { + /* Found an unstarted image, need to queue it */ + if (!image_list) + image_list = newGeneralList(); + pushValue(image_list, cache); + pending_count++; + if (!image_file) + image_file = newHash_sv(100); + putHash_sv(image_file, cache->file, (void *)cache); + } + } + } + + /* If we have fewer images than workers, reduce active workers */ + if (pending_count > 0 && pending_count < n_load_image) { + n_load_image = pending_count; + } + } + + /* Now fill any empty slots from the queue (worker pool pattern) */ + if (image_list) { + for (i = 0; i < n_load_image; i++) { + /* Skip occupied slots */ + if (image_cache[i]) + continue; + + /* Get next image from queue */ + cache = (ImageCache *) popValue(image_list); + if (!cache) + break; /* No more images in queue */ + + /* Skip if already loaded or being processed */ + if (cache->loaded != IMG_FLAG_UNLOADED || cache->pid > 0) { + continue; + } + if (!cache->touch) { + continue; + } + + /* Assign to this slot */ + image_cache[i] = cache; + + /* Start download process immediately */ + flush_tty(); +#ifdef DONT_CALL_GC_AFTER_FORK + loadargs[0] = MyProgramName; + loadargs[1] = "-$$getimage"; + loadargs[2] = conv_to_system(cache->url); + loadargs[3] = conv_to_system(parsedURL2Str(cache->current)->ptr); + loadargs[4] = cache->file; + loadargs[5] = cache->touch; + loadargs[6] = NULL; + if ((cache->pid = fork()) == 0) { + setup_child(FALSE, 0, -1); + execvp(MyProgramName, loadargs); + exit(1); + } + else if (cache->pid < 0) { + cache->pid = 0; + } +#else /* !DONT_CALL_GC_AFTER_FORK */ + /* Prepare ASCII file path before forking */ + if (enable_inline_image == INLINE_IMG_ASCII) { + cache->ascii_file = tmpfname(TMPF_DFL, ".txt")->ptr; + } + + if ((cache->pid = fork()) == 0) { + /* Child process - download only, keep it simple */ + setup_child(FALSE, 0, -1); + image_source = cache->file; + loadGeneralFile(cache->url, cache->current, NULL, 0, NULL); +#if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT) + symlink(cache->file, cache->touch); +#else + { + FILE *f = fopen(cache->touch, "w"); + if (f) + fclose(f); + } +#endif + exit(0); + } + else if (cache->pid < 0) { + cache->pid = 0; + } +#endif /* !DONT_CALL_GC_AFTER_FORK */ + } + } + if (!image_list || !image_list->nitem) { + image_list = NULL; + image_file = NULL; + } + return; + } + if (!image_list) return; + + /* Original limited parallel download for non-ASCII modes */ for (i = 0; i < n_load_image; i++) { if (image_cache[i]) continue; @@ -592,10 +845,6 @@ loadImage(Buffer *buf, int flag) setup_child(FALSE, 0, -1); image_source = cache->file; loadGeneralFile(cache->url, cache->current, NULL, 0, NULL); - /* TODO make sure removing this didn't break anything - if (!b || !b->real_type || strncasecmp(b->real_type, "image/", 6)) - unlink(cache->file); - */ #if defined(HAVE_SYMLINK) && defined(HAVE_LSTAT) symlink(cache->file, cache->touch); #else @@ -649,6 +898,9 @@ getImage(Image * image, ParsedURL *current, int flag) cache->pid = 0; cache->index = 0; cache->loaded = IMG_FLAG_UNLOADED; + /* Initialize ASCII art cache fields */ + cache->ascii_file = NULL; + cache->ascii_loaded = IMG_FLAG_UNLOADED; if (enable_inline_image == INLINE_IMG_OSC5379) { if (image->width > 0 && image->width % pixel_per_char_i > 0) image->width += (pixel_per_char_i - image->width % pixel_per_char_i); diff --git a/terms.c b/terms.c index 2cbc452..db18810 100644 --- a/terms.c +++ b/terms.c @@ -860,9 +860,15 @@ put_image_sixel(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i void calculate_ascii_dimensions(int w, int h, int *full_w, int *full_h) { + /* Just use the original simple logic that worked */ /* Scale images to fit within terminal while preserving aspect ratio */ - int max_width = COLS; - int max_height = LINES; + int max_width = COLS * 3; /* Original allowed 3x width */ + int max_height = LINES * 10; /* Original allowed 10x height */ + + /* But we changed it to terminal size only */ + max_width = COLS; + max_height = LINES; + if (w > max_width || h > max_height) { double scale_w = (double)max_width / w; double scale_h = (double)max_height / h; @@ -1031,7 +1037,7 @@ extract_visible_substring(const char *s, int start_char, int max_chars, char *bu } void -put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh) +put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, void *cache_ptr) { FILE *fp; char *cmd = NULL; @@ -1043,6 +1049,7 @@ put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i int skip_lines, start_col; int lines_to_display, visible_cols; int buffer_size = 8192; + ImageCache *cache = (ImageCache *)cache_ptr; /* Calculate scaled dimensions preserving aspect ratio */ calculate_ascii_dimensions(w, h, &full_w, &full_h); @@ -1079,15 +1086,21 @@ put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i goto cleanup; } - /* Generate full-size image using configured ASCII art program */ - snprintf(base_cmd, buffer_size / 2, AsciiartDisplay, full_w, full_h, url); + /* Check if we have cached ASCII art */ + if (cache && cache->ascii_loaded == IMG_FLAG_LOADED && cache->ascii_file) { + /* Use cached ASCII art */ + fp = fopen(cache->ascii_file, "r"); + } else { + /* Generate full-size image using configured ASCII art program */ + snprintf(base_cmd, buffer_size / 2, AsciiartDisplay, full_w, full_h, url); - /* Filter out cursor control and positioning sequences */ - snprintf(cmd, buffer_size, - "%s | sed -e 's/\\x1b\\[?[0-9]*[hlc]//g' -e 's/\\x1b\\[[0-9;]*[HfABCDJK]//g' -e 's/\\x1b\\[s//g' -e 's/\\x1b\\[u//g'", - base_cmd); + /* Filter out cursor control and positioning sequences */ + snprintf(cmd, buffer_size, + "%s | sed -e 's/\\x1b\\[?[0-9]*[hlc]//g' -e 's/\\x1b\\[[0-9;]*[HfABCDJK]//g' -e 's/\\x1b\\[s//g' -e 's/\\x1b\\[u//g'", + base_cmd); - fp = popen(cmd, "r"); + fp = popen(cmd, "r"); + } if (!fp) { MOVE(y, x); writestr("[ERR]"); @@ -1121,7 +1134,12 @@ put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i line_num++; } - pclose(fp); + /* Close file handle appropriately */ + if (cache && cache->ascii_loaded == IMG_FLAG_LOADED && cache->ascii_file) { + fclose(fp); + } else { + pclose(fp); + } /* Restore cursor visibility and position */ writestr("\033[?25h"); diff --git a/terms.h b/terms.h index 5fea7e3..b143640 100644 --- a/terms.h +++ b/terms.h @@ -35,7 +35,7 @@ extern void put_image_osc5379(char *url, int x, int y, int w, int h, int sx, int extern void put_image_sixel(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, int n_terminal_image); extern void put_image_iterm2(char *url, int x, int y, int w, int h); extern void put_image_kitty(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, int c, int r); -extern void put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh); +extern void put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, void *cache); extern void calculate_ascii_dimensions(int w, int h, int *full_w, int *full_h); extern int get_pixel_per_cell(int *ppc, int *ppl); #endif -- 2.51.2 From abed4f52bf018b7108a0333231b52c30ed677b3a Mon Sep 17 00:00:00 2001 From: byakuren Date: Thu, 25 Sep 2025 18:44:18 +0100 Subject: [PATCH 3/3] Fix ASCII art buffer truncation for large images Increase buffer size from 8KB to 64KB to handle fullscreen images with long lines containing dense ANSI color sequences. Add missing ANSI color code filtering (sequences ending with 'm') to prevent raw escape codes from appearing as visible text. Resolves line truncation and escape sequence display issues with large ASCII art images. --- terms.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/terms.c b/terms.c index db18810..c6941ed 100644 --- a/terms.c +++ b/terms.c @@ -1048,7 +1048,8 @@ put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i int line_num = 0; int skip_lines, start_col; int lines_to_display, visible_cols; - int buffer_size = 8192; + /* Increase buffer size for large images with ANSI color sequences */ + int buffer_size = 65536; /* 64KB should handle most fullscreen images */ ImageCache *cache = (ImageCache *)cache_ptr; /* Calculate scaled dimensions preserving aspect ratio */ @@ -1094,9 +1095,9 @@ put_image_ascii(char *url, int x, int y, int w, int h, int sx, int sy, int sw, i /* Generate full-size image using configured ASCII art program */ snprintf(base_cmd, buffer_size / 2, AsciiartDisplay, full_w, full_h, url); - /* Filter out cursor control and positioning sequences */ + /* Filter out ANSI color codes and cursor control sequences */ snprintf(cmd, buffer_size, - "%s | sed -e 's/\\x1b\\[?[0-9]*[hlc]//g' -e 's/\\x1b\\[[0-9;]*[HfABCDJK]//g' -e 's/\\x1b\\[s//g' -e 's/\\x1b\\[u//g'", + "%s | sed -e 's/\\x1b\\[[0-9;]*m//g' -e 's/\\x1b\\[?[0-9]*[hlc]//g' -e 's/\\x1b\\[[0-9;]*[HfABCDJK]//g' -e 's/\\x1b\\[s//g' -e 's/\\x1b\\[u//g'", base_cmd); fp = popen(cmd, "r"); -- 2.51.2