mirror of
https://github.com/tmux/tmux.git
synced 2024-11-14 16:18:48 +00:00
dfbc6b1888
Squashed commit of the following: commit 6ebc3feb4671d9b25b3db99d3c16b2323b8e3d02 Author: topcat001 <anindya49@hotmail.com> Date: Sun Aug 20 16:09:51 2023 -0700 Remove redundant {}. commit 6f013fce39602c259a5be2d690d548c73e51cccc Author: topcat001 <anindya49@hotmail.com> Date: Sun Aug 20 16:02:15 2023 -0700 Revert "Do not defer redraw if it is just the status line (will need to do more here I" This reverts commit0a15bbf3f1
. commit e6322b4196d73c975ba2e73633e6de9c46779059 Author: topcat001 <anindya49@hotmail.com> Date: Sun Aug 20 15:46:59 2023 -0700 Fix placeholder label and clean up. commit 5896ac52a1f72056a75480b3e1ada328f239df9b Merge: ad982330e3a8b843
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Fri Aug 18 17:00:03 2023 +0100 Merge branch 'master' into sixel commit ad98233066b72547aee7fa0c87838847ee7f1ece Author: topcat001 <anindya49@hotmail.com> Date: Tue Aug 15 13:57:08 2023 -0700 Better text placeholder. commit 312d83252c27fc4d09d09d121bf7573336e3cdca Merge: 14b8b5243d93b0c5
Author: topcat001 <anindya49@hotmail.com> Date: Tue Aug 15 13:39:22 2023 -0700 Merge remote-tracking branch 'origin/master' into sixel commit 14b8b524523a7d5a4e42f7dfa346905c604c91e2 Merge: 4baf7642fda39377
Author: topcat001 <anindya49@hotmail.com> Date: Sat Jul 22 17:29:10 2023 -0700 Merge branch 'master' into sixel commit 4baf76422fadb216bf27b47645b52da3379e7dea Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Wed Jun 21 07:43:53 2023 +0100 Both files can go on one line. commit4c92acf6ff
Author: topcat001 <anindya49@hotmail.com> Date: Sat Jun 17 17:53:01 2023 -0700 Merge topcat001/tmux/sixel. commit6794facc82
Merge: 7b85f5adf41c536f
Author: topcat001 <anindya49@hotmail.com> Date: Sat Jun 17 17:21:02 2023 -0700 Merge remote-tracking branch 'origin/master' into sixel commit 7b85f5adf9a5094db580ca98e4d2231d8d5b5a4f Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Jun 8 12:55:03 2023 +0100 Do not require passthrough for SIXEL. commit a6ee55e0925cac35d011c188db2da0421fc09be1 Merge: 6da391f4fe385b18
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Jun 8 12:19:55 2023 +0100 Merge branch 'master' into sixel commit 6da391f460414ed3dde23e5ab6ca3fe8e988ce51 Merge: 0d71e5850eb5d254
Author: topcat001 <anindya49@hotmail.com> Date: Sat May 20 17:05:55 2023 -0700 Merge branch 'master' into sixel commit 0d71e5853ffe797f90b815ac3af25ac0ad92ab07 Merge:64368a1a
fbe6fe7f
Author: topcat001 <anindya49@hotmail.com> Date: Sat Apr 29 17:32:07 2023 -0700 Merge branch 'master' into sixel commit64368a1a63
Merge:c630a56a
22eb0334
Author: topcat001 <anindya49@hotmail.com> Date: Thu Mar 30 14:21:09 2023 -0700 Merge branch 'master' into sixel commitc630a56a62
Merge:34c96c4c
aaa043a2
Author: topcat001 <anindya49@hotmail.com> Date: Thu Nov 10 18:53:01 2022 -0800 Merge branch 'master' into sixel commit34c96c4c4a
Merge:2a1e16a2
50f4e0fa
Author: topcat001 <anindya49@hotmail.com> Date: Sat Nov 5 18:05:36 2022 -0700 Merge branch 'master' into sixel commit2a1e16a24d
Merge:a82f14c7
d001a94d
Author: topcat001 <anindya49@hotmail.com> Date: Thu Oct 27 16:01:35 2022 -0700 Merge branch 'master' into sixel commita82f14c7b2
Merge:742c0634
f7b30ed3
Author: topcat001 <anindya49@hotmail.com> Date: Sun Aug 28 13:43:07 2022 -0700 Merge branch 'master' into sixel commit742c063473
Merge:906c92a5
87b248f3
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Fri Apr 1 10:14:15 2022 +0100 Merge branch 'master' into sixel commit906c92a5f4
Merge:6680a024
138ffc7c
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Wed Dec 8 10:37:33 2021 +0000 Merge branch 'master' into sixel commit6680a024be
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Oct 7 13:59:08 2021 +0100 Fix build. commitebd2c58593
Merge:90dc0519
fed7b29c
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Oct 7 13:19:48 2021 +0100 Merge branch 'master' into sixel commit90dc05191c
Merge:a282439f
4694afbe
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Feb 20 20:37:32 2020 +0000 Merge branch 'master' into sixel commita282439fcb
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Jan 30 09:12:53 2020 +0000 Add missing declarations. commit3a741aacd1
Merge:40ad0107
339832b9
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Jan 30 09:11:01 2020 +0000 Merge branch 'sixel-passthrough' into sixel commit339832b92c
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Jan 30 09:04:51 2020 +0000 Bad merge. commit92ed9fc0b2
Merge:5bb07548
32be954b
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Jan 30 09:03:38 2020 +0000 Merge branch 'master' into sixel-passthrough commit40ad01073d
Merge:dd3c72f1
61b075a2
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Sun Jan 12 20:03:41 2020 +0000 Merge branch 'master' into sixel commit5bb075487f
Merge:7c033a74
54efe337
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Wed Dec 18 20:24:42 2019 +0000 Merge branch 'master' into sixel-passthrough commitdd3c72f132
Merge:1a0e5fe9
54efe337
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Wed Dec 18 20:24:26 2019 +0000 Merge branch 'master' into sixel commit1a0e5fe933
Merge:cf071ffe
15d7e564
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Tue Dec 10 16:34:11 2019 +0000 Merge branch 'master' into sixel commitcf071ffecd
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Mon Dec 9 15:41:56 2019 +0000 Remove images when reflow happens. commit2006b7a563
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Dec 5 09:27:15 2019 +0000 More invalidation of images. commitb642eac450
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Dec 5 09:11:24 2019 +0000 Redraw and scroll images and part of invalidating them. commit7566e37a46
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Dec 5 08:51:24 2019 +0000 Call sixel_scale with the right number of arguments. commit62c0280b23
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Dec 5 08:48:58 2019 +0000 Correctly remove when not visible. commit86c5098a88
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Dec 5 08:32:25 2019 +0000 Add helpers to scroll image up and a flag to copy the colours. commit49f2f0a8f1
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Dec 5 00:02:55 2019 +0000 Store images, currently at most 10. commit3aebcc6709
Merge:146ee3f6
92ecd611
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Wed Dec 4 19:27:16 2019 +0000 Merge branch 'master' into sixel commit7c033a74e2
Merge:0a15bbf3
92ecd611
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Wed Dec 4 12:41:09 2019 +0000 Merge branch 'master' into sixel-passthrough commit146ee3f6f8
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Sat Nov 30 09:47:53 2019 +0000 Don't write image as text yet. commit0a15bbf3f1
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Sat Nov 30 09:15:35 2019 +0000 Do not defer redraw if it is just the status line (will need to do more here I think). commita5b1e20941
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Nov 28 14:20:22 2019 +0000 Add a flag to disable blocking while sending a SIXEL image (turned off when the buffer hits 0 size). commit968382aa6a
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Nov 28 12:35:18 2019 +0000 Pass through SIXEL DCS sequences (treat similarly to the passthrough escape sequence) if it appears the terminal outside supports them. commitb1904c9b8d
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Sat Nov 30 09:17:18 2019 +0000 Store SIXELs as a box for the moment. commit5d8dbcdf3d
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Sat Nov 30 09:15:35 2019 +0000 Do not defer redraw if it is just the status line (will need to do more here I think). commit0c999a402e
Merge:28961dd5
866b053f
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Fri Nov 29 18:54:09 2019 +0000 Merge branch 'master' into sixel commit28961dd5a3
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Nov 28 14:24:57 2019 +0000 Add an image. commitd2e3f3c1cc
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Nov 28 14:20:22 2019 +0000 Add a flag to disable blocking while sending a SIXEL image (turned off when the buffer hits 0 size). commite01df67ca1
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Nov 28 13:21:40 2019 +0000 Crop and scale images as needed when drawing them. commite24acc0b5c
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Nov 28 12:38:02 2019 +0000 Simple SIXEL parse and modify API. commitb34111b3da
Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu Nov 28 12:35:18 2019 +0000 Pass through SIXEL DCS sequences (treat similarly to the passthrough escape sequence) if it appears the terminal outside supports them.
187 lines
4.0 KiB
C
187 lines
4.0 KiB
C
/* $OpenBSD$ */
|
|
|
|
/*
|
|
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
|
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "tmux.h"
|
|
|
|
static struct images all_images = TAILQ_HEAD_INITIALIZER(all_images);
|
|
static u_int all_images_count;
|
|
|
|
static void
|
|
image_free(struct image *im)
|
|
{
|
|
struct screen *s = im->s;
|
|
|
|
TAILQ_REMOVE(&all_images, im, all_entry);
|
|
all_images_count--;
|
|
|
|
TAILQ_REMOVE(&s->images, im, entry);
|
|
sixel_free(im->data);
|
|
free(im->fallback);
|
|
free(im);
|
|
}
|
|
|
|
int
|
|
image_free_all(struct screen *s)
|
|
{
|
|
struct image *im, *im1;
|
|
int redraw = !TAILQ_EMPTY(&s->images);
|
|
|
|
TAILQ_FOREACH_SAFE(im, &s->images, entry, im1)
|
|
image_free(im);
|
|
return (redraw);
|
|
}
|
|
|
|
/* Create text placeholder for an image. */
|
|
static void
|
|
image_fallback(char **ret, u_int sx, u_int sy)
|
|
{
|
|
char *buf, *label;
|
|
u_int py, size, lsize;
|
|
|
|
/* Allocate first line. */
|
|
lsize = xasprintf(&label, "SIXEL IMAGE (%ux%u)\r\n", sx, sy) + 1;
|
|
if (sx < lsize - 3)
|
|
size = lsize - 1;
|
|
else
|
|
size = sx + 2;
|
|
|
|
/* Remaining lines. Every placeholder line has \r\n at the end. */
|
|
size += (sx + 2) * (sy - 1) + 1;
|
|
*ret = buf = xmalloc(size);
|
|
|
|
/* Render first line. */
|
|
if (sx < lsize - 3) {
|
|
memcpy(buf, label, lsize);
|
|
buf += lsize - 1;
|
|
} else {
|
|
memcpy(buf, label, lsize - 3);
|
|
buf += lsize - 3;
|
|
memset(buf, '+', sx - lsize + 3);
|
|
buf += sx - lsize + 3;
|
|
snprintf(buf, 3, "\r\n");
|
|
buf += 2;
|
|
}
|
|
|
|
/* Remaining lines. */
|
|
for (py = 1; py < sy; py++) {
|
|
memset(buf, '+', sx);
|
|
buf += sx;
|
|
snprintf(buf, 3, "\r\n");
|
|
buf += 2;
|
|
}
|
|
|
|
free(label);
|
|
}
|
|
|
|
struct image*
|
|
image_store(struct screen *s, struct sixel_image *si)
|
|
{
|
|
struct image *im;
|
|
|
|
im = xcalloc(1, sizeof *im);
|
|
im->s = s;
|
|
im->data = si;
|
|
|
|
im->px = s->cx;
|
|
im->py = s->cy;
|
|
sixel_size_in_cells(si, &im->sx, &im->sy);
|
|
|
|
image_fallback(&im->fallback, im->sx, im->sy);
|
|
|
|
TAILQ_INSERT_TAIL(&s->images, im, entry);
|
|
|
|
TAILQ_INSERT_TAIL(&all_images, im, all_entry);
|
|
if (++all_images_count == 10/*XXX*/)
|
|
image_free(TAILQ_FIRST(&all_images));
|
|
|
|
return (im);
|
|
}
|
|
|
|
int
|
|
image_check_line(struct screen *s, u_int py, u_int ny)
|
|
{
|
|
struct image *im, *im1;
|
|
int redraw = 0;
|
|
|
|
TAILQ_FOREACH_SAFE(im, &s->images, entry, im1) {
|
|
if (py + ny > im->py && py < im->py + im->sy) {
|
|
image_free(im);
|
|
redraw = 1;
|
|
}
|
|
}
|
|
return (redraw);
|
|
}
|
|
|
|
int
|
|
image_check_area(struct screen *s, u_int px, u_int py, u_int nx, u_int ny)
|
|
{
|
|
struct image *im, *im1;
|
|
int redraw = 0;
|
|
|
|
TAILQ_FOREACH_SAFE(im, &s->images, entry, im1) {
|
|
if (py + ny <= im->py || py >= im->py + im->sy)
|
|
continue;
|
|
if (px + nx <= im->px || px >= im->px + im->sx)
|
|
continue;
|
|
image_free(im);
|
|
redraw = 1;
|
|
}
|
|
return (redraw);
|
|
}
|
|
|
|
int
|
|
image_scroll_up(struct screen *s, u_int lines)
|
|
{
|
|
struct image *im, *im1;
|
|
int redraw = 0;
|
|
u_int sx, sy;
|
|
struct sixel_image *new;
|
|
|
|
TAILQ_FOREACH_SAFE(im, &s->images, entry, im1) {
|
|
if (im->py >= lines) {
|
|
im->py -= lines;
|
|
redraw = 1;
|
|
continue;
|
|
}
|
|
if (im->py + im->sy <= lines) {
|
|
image_free(im);
|
|
redraw = 1;
|
|
continue;
|
|
}
|
|
sx = im->sx;
|
|
sy = (im->py + im->sy) - lines;
|
|
|
|
new = sixel_scale(im->data, 0, 0, 0, im->sy - sy, sx, sy, 1);
|
|
sixel_free(im->data);
|
|
im->data = new;
|
|
|
|
im->py = 0;
|
|
sixel_size_in_cells(im->data, &im->sx, &im->sy);
|
|
|
|
free(im->fallback);
|
|
image_fallback(&im->fallback, im->sx, im->sy);
|
|
redraw = 1;
|
|
}
|
|
return (redraw);
|
|
}
|