mirror of
https://github.com/mintycube/st.git
synced 2024-10-22 14:05:49 +02:00
Compare commits
No commits in common. "404c7d975ad552bc6e1b322498a7138736a7d6ee" and "9b7c9fe90730f36da17d64d85492dca97b6f2ade" have entirely different histories.
404c7d975a
...
9b7c9fe907
@ -378,8 +378,8 @@ static MouseShortcut mshortcuts[] = {
|
|||||||
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
||||||
#endif // SCROLLBACK_MOUSE_PATCH
|
#endif // SCROLLBACK_MOUSE_PATCH
|
||||||
#if SCROLLBACK_MOUSE_ALTSCREEN_PATCH || REFLOW_PATCH
|
#if SCROLLBACK_MOUSE_ALTSCREEN_PATCH || REFLOW_PATCH
|
||||||
{ XK_ANY_MOD, Button4, kscrollup, {.i = 1}, 0, S_PRI },
|
{ XK_NO_MOD, Button4, kscrollup, {.i = 1}, 0, S_PRI },
|
||||||
{ XK_ANY_MOD, Button5, kscrolldown, {.i = 1}, 0, S_PRI },
|
{ XK_NO_MOD, Button5, kscrolldown, {.i = 1}, 0, S_PRI },
|
||||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"}, 0, S_ALT },
|
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"}, 0, S_ALT },
|
||||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"}, 0, S_ALT },
|
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"}, 0, S_ALT },
|
||||||
#else
|
#else
|
||||||
@ -467,10 +467,6 @@ static Shortcut shortcuts[] = {
|
|||||||
#if INVERT_PATCH
|
#if INVERT_PATCH
|
||||||
{ TERMMOD, XK_X, invert, { 0 } },
|
{ TERMMOD, XK_X, invert, { 0 } },
|
||||||
#endif // INVERT_PATCH
|
#endif // INVERT_PATCH
|
||||||
#if OSC133_PATCH
|
|
||||||
{ ControlMask, XK_Page_Up, scrolltoprompt, {.i = -1}, S_PRI },
|
|
||||||
{ ControlMask, XK_Page_Down, scrolltoprompt, {.i = 1}, S_PRI },
|
|
||||||
#endif // OSC133_PATCH
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
void
|
|
||||||
scrolltoprompt(const Arg *arg)
|
|
||||||
{
|
|
||||||
int x, y;
|
|
||||||
#if REFLOW_PATCH
|
|
||||||
int top = term.scr - term.histf;
|
|
||||||
#else
|
|
||||||
int top = term.scr - term.histn;
|
|
||||||
#endif // REFLOW_PATCH
|
|
||||||
int bot = term.scr + term.row-1;
|
|
||||||
int dy = arg->i;
|
|
||||||
Line line;
|
|
||||||
|
|
||||||
if (!dy || tisaltscr())
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (y = dy; y >= top && y <= bot; y += dy) {
|
|
||||||
for (line = TLINE(y), x = 0; x < term.col; x++) {
|
|
||||||
if (line[x].mode & ATTR_FTCS_PROMPT)
|
|
||||||
goto scroll;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
scroll:
|
|
||||||
if (dy < 0)
|
|
||||||
kscrollup(&((Arg){ .i = -y }));
|
|
||||||
else
|
|
||||||
kscrolldown(&((Arg){ .i = y }));
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
static void scrolltoprompt(const Arg *);
|
|
@ -47,6 +47,3 @@
|
|||||||
#if XRESOURCES_PATCH
|
#if XRESOURCES_PATCH
|
||||||
#include "xresources.c"
|
#include "xresources.c"
|
||||||
#endif
|
#endif
|
||||||
#if OSC133_PATCH
|
|
||||||
#include "osc133.c"
|
|
||||||
#endif
|
|
||||||
|
@ -41,6 +41,3 @@
|
|||||||
#if XRESOURCES_PATCH
|
#if XRESOURCES_PATCH
|
||||||
#include "xresources.h"
|
#include "xresources.h"
|
||||||
#endif
|
#endif
|
||||||
#if OSC133_PATCH
|
|
||||||
#include "osc133.h"
|
|
||||||
#endif
|
|
||||||
|
@ -301,13 +301,6 @@
|
|||||||
*/
|
*/
|
||||||
#define OPENURLONCLICK_PATCH 0
|
#define OPENURLONCLICK_PATCH 0
|
||||||
|
|
||||||
/* This patch allows jumping between prompts by utilizing the OSC 133 escape sequence
|
|
||||||
* emitted by shells. Must be used with either reflow or scrollback patch.
|
|
||||||
*
|
|
||||||
* https://codeberg.org/dnkl/foot#jumping-between-prompts
|
|
||||||
*/
|
|
||||||
#define OSC133_PATCH 0
|
|
||||||
|
|
||||||
/* Reflow.
|
/* Reflow.
|
||||||
* Allows st to be resized without cutting off text when the terminal window is made larger again.
|
* Allows st to be resized without cutting off text when the terminal window is made larger again.
|
||||||
* Text wraps when the terminal window is made smaller.
|
* Text wraps when the terminal window is made smaller.
|
||||||
|
15
sixel.c
15
sixel.c
@ -261,10 +261,10 @@ sixel_parser_finalize(sixel_state_t *st, ImageList **newimages, int cx, int cy,
|
|||||||
sixel_image_t *image = &st->image;
|
sixel_image_t *image = &st->image;
|
||||||
int x, y;
|
int x, y;
|
||||||
sixel_color_no_t *src;
|
sixel_color_no_t *src;
|
||||||
sixel_color_t *dst, color;
|
sixel_color_t *dst;
|
||||||
|
int color;
|
||||||
int w, h;
|
int w, h;
|
||||||
int i, j, cols, numimages;
|
int i, j, cols, numimages;
|
||||||
char trans;
|
|
||||||
ImageList *im, *next, *tail;
|
ImageList *im, *next, *tail;
|
||||||
|
|
||||||
if (!image->data)
|
if (!image->data)
|
||||||
@ -311,6 +311,7 @@ sixel_parser_finalize(sixel_state_t *st, ImageList **newimages, int cx, int cy,
|
|||||||
im->clipmask = NULL;
|
im->clipmask = NULL;
|
||||||
im->cw = cw;
|
im->cw = cw;
|
||||||
im->ch = ch;
|
im->ch = ch;
|
||||||
|
im->transparent = st->transparent;
|
||||||
}
|
}
|
||||||
if (!im || !im->pixels) {
|
if (!im || !im->pixels) {
|
||||||
for (im = *newimages; im; im = next) {
|
for (im = *newimages; im; im = next) {
|
||||||
@ -323,16 +324,12 @@ sixel_parser_finalize(sixel_state_t *st, ImageList **newimages, int cx, int cy,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
dst = (sixel_color_t *)im->pixels;
|
dst = (sixel_color_t *)im->pixels;
|
||||||
for (trans = 0, j = 0; j < im->height && y < h; j++, y++) {
|
for (j = 0; j < im->height && y < h; j++, y++) {
|
||||||
src = st->image.data + image->width * y;
|
src = st->image.data + image->width * y;
|
||||||
for (x = 0; x < w; x++) {
|
for (x = 0; x < w; x++)
|
||||||
color = st->image.palette[*src++];
|
*dst++ = st->image.palette[*src++];
|
||||||
trans |= (color == 0);
|
|
||||||
*dst++ = color;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
im->transparent = (st->transparent && trans);
|
|
||||||
}
|
|
||||||
|
|
||||||
return numimages;
|
return numimages;
|
||||||
}
|
}
|
||||||
|
56
st.c
56
st.c
@ -2603,8 +2603,8 @@ strhandle(void)
|
|||||||
{ defaultcs, "cursor" }
|
{ defaultcs, "cursor" }
|
||||||
};
|
};
|
||||||
#if SIXEL_PATCH
|
#if SIXEL_PATCH
|
||||||
ImageList *im, *newimages, *next, *tail = NULL;
|
ImageList *im, *newimages, *next, *tail;
|
||||||
int i, x1, y1, x2, y2, y, numimages;
|
int i, x1, y1, x2, y2, numimages;
|
||||||
int cx, cy;
|
int cx, cy;
|
||||||
Line line;
|
Line line;
|
||||||
#if SCROLLBACK_PATCH || REFLOW_PATCH
|
#if SCROLLBACK_PATCH || REFLOW_PATCH
|
||||||
@ -2699,25 +2699,6 @@ strhandle(void)
|
|||||||
tfulldirt();
|
tfulldirt();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
#if OSC133_PATCH
|
|
||||||
case 133:
|
|
||||||
if (narg < 2)
|
|
||||||
break;
|
|
||||||
switch (*strescseq.args[1]) {
|
|
||||||
case 'A':
|
|
||||||
term.c.attr.mode |= ATTR_FTCS_PROMPT;
|
|
||||||
break;
|
|
||||||
/* We don't handle these arguments yet */
|
|
||||||
case 'B':
|
|
||||||
case 'C':
|
|
||||||
case 'D':
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
fprintf(stderr, "erresc: unknown OSC 133 argument: %c\n", *strescseq.args[1]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
#endif // OSC133_PATCH
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'k': /* old title set compatibility */
|
case 'k': /* old title set compatibility */
|
||||||
@ -2748,34 +2729,16 @@ strhandle(void)
|
|||||||
y1 = newimages->y;
|
y1 = newimages->y;
|
||||||
x2 = x1 + newimages->cols;
|
x2 = x1 + newimages->cols;
|
||||||
y2 = y1 + numimages;
|
y2 = y1 + numimages;
|
||||||
/* Delete the old images that are covered by the new image(s). We also need
|
if (newimages->transparent) {
|
||||||
* to check if they have already been deleted before adding the new ones. */
|
for (tail = term.images; tail && tail->next; tail = tail->next);
|
||||||
if (term.images) {
|
} else {
|
||||||
char transparent[numimages];
|
for (tail = NULL, im = term.images; im; im = next) {
|
||||||
for (i = 0, im = newimages; im; im = im->next, i++) {
|
|
||||||
transparent[i] = im->transparent;
|
|
||||||
}
|
|
||||||
for (im = term.images; im; im = next) {
|
|
||||||
next = im->next;
|
next = im->next;
|
||||||
if (im->y >= y1 && im->y < y2) {
|
if (im->x >= x1 && im->x + im->cols <= x2 &&
|
||||||
y = im->y - scr;
|
im->y >= y1 && im->y <= y2) {
|
||||||
if (y >= 0 && y < term.row && term.dirty[y]) {
|
|
||||||
line = term.line[y];
|
|
||||||
j = MIN(im->x + im->cols, term.col);
|
|
||||||
for (i = im->x; i < j; i++) {
|
|
||||||
if (line[i].mode & ATTR_SIXEL)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (i == j) {
|
|
||||||
delete_image(im);
|
delete_image(im);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (im->x >= x1 && im->x + im->cols <= x2 && !transparent[im->y - y1]) {
|
|
||||||
delete_image(im);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tail = im;
|
tail = im;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3468,9 +3431,6 @@ check_control_code:
|
|||||||
}
|
}
|
||||||
|
|
||||||
tsetchar(u, &term.c.attr, term.c.x, term.c.y);
|
tsetchar(u, &term.c.attr, term.c.x, term.c.y);
|
||||||
#if OSC133_PATCH
|
|
||||||
term.c.attr.mode &= ~ATTR_FTCS_PROMPT;
|
|
||||||
#endif // OSC133_PATCH
|
|
||||||
term.lastc = u;
|
term.lastc = u;
|
||||||
|
|
||||||
if (width == 2) {
|
if (width == 2) {
|
||||||
|
3
st.h
3
st.h
@ -70,9 +70,6 @@ enum glyph_attribute {
|
|||||||
ATTR_HIGHLIGHT = 1 << 17,
|
ATTR_HIGHLIGHT = 1 << 17,
|
||||||
#endif // KEYBOARDSELECT_PATCH
|
#endif // KEYBOARDSELECT_PATCH
|
||||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||||
#if OSC133_PATCH
|
|
||||||
ATTR_FTCS_PROMPT = 1 << 18, /* OSC 133 ; A ST */
|
|
||||||
#endif // OSC133_PATCH
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#if SIXEL_PATCH
|
#if SIXEL_PATCH
|
||||||
|
Loading…
Reference in New Issue
Block a user