Branch: refs/heads/master
Home: https://github.com/tmux/tmux
Commit: dfbc6b1888c110cf0ade66f20188c57757ee1298
https://github.com/tmux/tmux/commit/dfbc6b1888c110cf0ade66f20188c57757ee1298
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: 2023-08-22 (Tue, 22 Aug 2023)
Changed paths:
M Makefile.am
M configure.ac
A image-sixel.c
A image.c
M input.c
M screen-redraw.c
M screen-write.c
M screen.c
M tmux.h
A tools/image.sixel
M tty.c
Log Message:
-----------
Merge SIXEL branch.
Squashed commit of the following:
commit 6ebc3feb4671d9b25b3db99d3c16b2323b8e3d02
Author: topcat001 <anindy...@hotmail.com>
Date: Sun Aug 20 16:09:51 2023 -0700
Remove redundant {}.
commit 6f013fce39602c259a5be2d690d548c73e51cccc
Author: topcat001 <anindy...@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 commit 0a15bbf3f1972dc84c5c84d5128024c1bc4c0074.
commit e6322b4196d73c975ba2e73633e6de9c46779059
Author: topcat001 <anindy...@hotmail.com>
Date: Sun Aug 20 15:46:59 2023 -0700
Fix placeholder label and clean up.
commit 5896ac52a1f72056a75480b3e1ada328f239df9b
Merge: ad982330 e3a8b843
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Fri Aug 18 17:00:03 2023 +0100
Merge branch 'master' into sixel
commit ad98233066b72547aee7fa0c87838847ee7f1ece
Author: topcat001 <anindy...@hotmail.com>
Date: Tue Aug 15 13:57:08 2023 -0700
Better text placeholder.
commit 312d83252c27fc4d09d09d121bf7573336e3cdca
Merge: 14b8b524 3d93b0c5
Author: topcat001 <anindy...@hotmail.com>
Date: Tue Aug 15 13:39:22 2023 -0700
Merge remote-tracking branch 'origin/master' into sixel
commit 14b8b524523a7d5a4e42f7dfa346905c604c91e2
Merge: 4baf7642 fda39377
Author: topcat001 <anindy...@hotmail.com>
Date: Sat Jul 22 17:29:10 2023 -0700
Merge branch 'master' into sixel
commit 4baf76422fadb216bf27b47645b52da3379e7dea
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Wed Jun 21 07:43:53 2023 +0100
Both files can go on one line.
commit 4c92acf6ff24dde37ad41cd168ea2d3bcefb8567
Author: topcat001 <anindy...@hotmail.com>
Date: Sat Jun 17 17:53:01 2023 -0700
Merge topcat001/tmux/sixel.
commit 6794facc82e98f8448c192913cf62fe6e10fde63
Merge: 7b85f5ad f41c536f
Author: topcat001 <anindy...@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.marri...@gmail.com>
Date: Thu Jun 8 12:55:03 2023 +0100
Do not require passthrough for SIXEL.
commit a6ee55e0925cac35d011c188db2da0421fc09be1
Merge: 6da391f4 fe385b18
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Jun 8 12:19:55 2023 +0100
Merge branch 'master' into sixel
commit 6da391f460414ed3dde23e5ab6ca3fe8e988ce51
Merge: 0d71e585 0eb5d254
Author: topcat001 <anindy...@hotmail.com>
Date: Sat May 20 17:05:55 2023 -0700
Merge branch 'master' into sixel
commit 0d71e5853ffe797f90b815ac3af25ac0ad92ab07
Merge: 64368a1a fbe6fe7f
Author: topcat001 <anindy...@hotmail.com>
Date: Sat Apr 29 17:32:07 2023 -0700
Merge branch 'master' into sixel
commit 64368a1a63f04fb877b57e4286c9a2e1efe966c9
Merge: c630a56a 22eb0334
Author: topcat001 <anindy...@hotmail.com>
Date: Thu Mar 30 14:21:09 2023 -0700
Merge branch 'master' into sixel
commit c630a56a621b9761eed558cbd566a36cb09adf8f
Merge: 34c96c4c aaa043a2
Author: topcat001 <anindy...@hotmail.com>
Date: Thu Nov 10 18:53:01 2022 -0800
Merge branch 'master' into sixel
commit 34c96c4c4a33f86b49c8a53dc48b2b817db24e95
Merge: 2a1e16a2 50f4e0fa
Author: topcat001 <anindy...@hotmail.com>
Date: Sat Nov 5 18:05:36 2022 -0700
Merge branch 'master' into sixel
commit 2a1e16a24dc75741c66f5d72fa5bf26b73507993
Merge: a82f14c7 d001a94d
Author: topcat001 <anindy...@hotmail.com>
Date: Thu Oct 27 16:01:35 2022 -0700
Merge branch 'master' into sixel
commit a82f14c7b23a239a2114c756ef73bba8609ebe33
Merge: 742c0634 f7b30ed3
Author: topcat001 <anindy...@hotmail.com>
Date: Sun Aug 28 13:43:07 2022 -0700
Merge branch 'master' into sixel
commit 742c0634734e6b2840762e58b0bf27626b5ac24b
Merge: 906c92a5 87b248f3
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Fri Apr 1 10:14:15 2022 +0100
Merge branch 'master' into sixel
commit 906c92a5f458b8843e7abd1d6f419dc091f8063c
Merge: 6680a024 138ffc7c
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Wed Dec 8 10:37:33 2021 +0000
Merge branch 'master' into sixel
commit 6680a024be5e173a27c10e9a0be6c9072576086d
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Oct 7 13:59:08 2021 +0100
Fix build.
commit ebd2c585937f18045d334226d4a0cc788fe14353
Merge: 90dc0519 fed7b29c
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Oct 7 13:19:48 2021 +0100
Merge branch 'master' into sixel
commit 90dc05191cbba8de6d9d77ee7f9726325abe844e
Merge: a282439f 4694afbe
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Feb 20 20:37:32 2020 +0000
Merge branch 'master' into sixel
commit a282439fcb2f597927a5ba33d2c378c90eec8b42
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Jan 30 09:12:53 2020 +0000
Add missing declarations.
commit 3a741aacd108538f99239c68bfa2cd416bf0eb46
Merge: 40ad0107 339832b9
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Jan 30 09:11:01 2020 +0000
Merge branch 'sixel-passthrough' into sixel
commit 339832b92c298538f398754f6d3fc21d15d13326
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Jan 30 09:04:51 2020 +0000
Bad merge.
commit 92ed9fc0b20440f2bc553757e6bfe3126fe84be4
Merge: 5bb07548 32be954b
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Jan 30 09:03:38 2020 +0000
Merge branch 'master' into sixel-passthrough
commit 40ad01073d73a531b4e85b0138f78bf0b472b354
Merge: dd3c72f1 61b075a2
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Sun Jan 12 20:03:41 2020 +0000
Merge branch 'master' into sixel
commit 5bb075487f5897d7402adb880e678043c0f7f3e0
Merge: 7c033a74 54efe337
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Wed Dec 18 20:24:42 2019 +0000
Merge branch 'master' into sixel-passthrough
commit dd3c72f132c911b0ba61b56a56f46510704d3392
Merge: 1a0e5fe9 54efe337
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Wed Dec 18 20:24:26 2019 +0000
Merge branch 'master' into sixel
commit 1a0e5fe933e89932f2f658936c52eb50644fbef4
Merge: cf071ffe 15d7e564
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Tue Dec 10 16:34:11 2019 +0000
Merge branch 'master' into sixel
commit cf071ffecd5a0d33008fd0a8b66a22f6855c7a8d
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Mon Dec 9 15:41:56 2019 +0000
Remove images when reflow happens.
commit 2006b7a5631787a7086c6bae364e62d0a0b5948a
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Dec 5 09:27:15 2019 +0000
More invalidation of images.
commit b642eac4503cc89cde01103f7bacca57cc9c1a2b
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Dec 5 09:11:24 2019 +0000
Redraw and scroll images and part of invalidating them.
commit 7566e37a461bf245bd2e54e1d522e919071e9c44
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Dec 5 08:51:24 2019 +0000
Call sixel_scale with the right number of arguments.
commit 62c0280b23cf67fc43f691392a8eca5cd7ff0727
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Dec 5 08:48:58 2019 +0000
Correctly remove when not visible.
commit 86c5098a887f2cd09b828e051ccf0fab21bf4f6a
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Dec 5 08:32:25 2019 +0000
Add helpers to scroll image up and a flag to copy the colours.
commit 49f2f0a8f1e72389f4128aa38119ed124cdc31c5
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Dec 5 00:02:55 2019 +0000
Store images, currently at most 10.
commit 3aebcc67099ccbc5964c744fc1435931c1a78583
Merge: 146ee3f6 92ecd611
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Wed Dec 4 19:27:16 2019 +0000
Merge branch 'master' into sixel
commit 7c033a74e25957d333217cb71a7658b860583501
Merge: 0a15bbf3 92ecd611
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Wed Dec 4 12:41:09 2019 +0000
Merge branch 'master' into sixel-passthrough
commit 146ee3f6f8ee2629c6a88b6900a71f3e6fd14e4d
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Sat Nov 30 09:47:53 2019 +0000
Don't write image as text yet.
commit 0a15bbf3f1972dc84c5c84d5128024c1bc4c0074
Author: Nicholas Marriott <nicholas.marri...@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).
commit a5b1e209417b7d3f5b0099642dd317c312f79377
Author: Nicholas Marriott <nicholas.marri...@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).
commit 968382aa6a4b9c71fbc221aa4f0e899f6a83a260
Author: Nicholas Marriott <nicholas.marri...@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.
commit b1904c9b8db514133d3372aac13b2ff0b2093cc3
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Sat Nov 30 09:17:18 2019 +0000
Store SIXELs as a box for the moment.
commit 5d8dbcdf3d76d0e69b8f2d21eff48f819dcec199
Author: Nicholas Marriott <nicholas.marri...@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).
commit 0c999a402ece7b40e6ae84547893421b52d508ff
Merge: 28961dd5 866b053f
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Fri Nov 29 18:54:09 2019 +0000
Merge branch 'master' into sixel
commit 28961dd5a38dd5a7b703ed0e6625fa9a65556d35
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Nov 28 14:24:57 2019 +0000
Add an image.
commit d2e3f3c1cca5410570c5392340d14e96ae7a354c
Author: Nicholas Marriott <nicholas.marri...@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).
commit e01df67ca106e57f5c689e75f313f8cda6f8b805
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Nov 28 13:21:40 2019 +0000
Crop and scale images as needed when drawing them.
commit e24acc0b5c3ac19dcacebdea243dcc7784215ffa
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Date: Thu Nov 28 12:38:02 2019 +0000
Simple SIXEL parse and modify API.
commit b34111b3da1e4b1769a976cd40486144f7b4f5a2
Author: Nicholas Marriott <nicholas.marri...@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.
--
You received this message because you are subscribed to the Google Groups
"tmux-git" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to tmux-git+unsubscr...@googlegroups.com.
To view this discussion on the web, visit
https://groups.google.com/d/msgid/tmux-git/tmux/tmux/push/refs/heads/master/e3a8b8-dfbc6b%40github.com.
