circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,200 Commits
1 Branch
35 Tags
64 MiB
Commit Graph

232 Commits (master)

Author SHA1 Message Date
Thomas Adam 3c3643f580 Merge branch 'obsd-master' 2024-03-21 14:01:10 +00:00
nicm 89c1c43ef9 Write padding character into the right position. 2024-03-21 12:10:57 +00:00
Nicholas Marriott aa17f0e0c1 Fix crash if SIXEL colour register is invalid and remove SIXEL images before 
reflow to avoid a different crash, from Anindya Mukherjee.
 2024-03-21 11:37:09 +00:00
Thomas Adam 381c00a74e Merge branch 'obsd-master' 2023-11-02 22:58:45 +00:00
nicm fdf465925e Do not allow combined UTF-8 characters that are too long, GitHub issue 
3729.
 2023-10-30 16:05:30 +00:00
nicm 36e1ac6556 Unzoom window at start of destroy so it doesn't happen later (when 
destroying panes) after the layout has been freed, GitHub issue 3717.
 2023-10-23 08:12:00 +00:00
Nicholas Marriott 789a98982e Reply to SMGRAPHICS. 2023-09-19 09:27:59 +01:00
Thomas Adam b202a2f1b5 Merge branch 'obsd-master' 2023-09-17 21:03:06 +01:00
nicm f09cde2542 Change UTF-8 combining to inspect the previous character at the cursor 
position rather than keeping the last character from the input stream,
this is how most terminals work and fixes problems with displaying these
characters in vim. GitHub issue 3600.
 2023-09-15 15:49:05 +00:00
Thomas Adam c57a09269b Merge branch 'obsd-master' 2023-09-14 16:01:10 +01:00
nicm 8191c58737 Reset combine flag only if text is actually processed. 2023-09-14 13:01:35 +00:00
Nicholas Marriott 1a1290f30b Only remove images if reverse index actually scrolls. 2023-09-07 22:02:11 +01:00
Thomas Adam cf1ed67fcc Merge branch 'obsd-master' 2023-09-01 17:09:41 +01:00
Thomas Adam 1aec420465 Merge branch 'obsd-master' 2023-09-01 17:06:27 +01:00
nicm 16e4b39359 Clear combine flag when a non-UTF-8 set of characters is encountered. 2023-09-01 16:01:54 +00:00
nicm 9456258ccc Rewrite combined character handling to be more consistent and to support 
newer Unicode combined characters (which we have to "know" are combined
since they are not width zero). GitHub issue 3600.
 2023-09-01 14:29:11 +00:00
Nicholas Marriott dfbc6b1888 Merge SIXEL branch. 
Squashed commit of the following:

commit 6ebc3feb46
Author: topcat001 <anindya49@hotmail.com>
Date:   Sun Aug 20 16:09:51 2023 -0700

    Remove redundant {}.

commit 6f013fce39
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 commit 0a15bbf3f1.

commit e6322b4196
Author: topcat001 <anindya49@hotmail.com>
Date:   Sun Aug 20 15:46:59 2023 -0700

    Fix placeholder label and clean up.

commit 5896ac52a1
Merge: ad982330 e3a8b843
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Fri Aug 18 17:00:03 2023 +0100

    Merge branch 'master' into sixel

commit ad98233066
Author: topcat001 <anindya49@hotmail.com>
Date:   Tue Aug 15 13:57:08 2023 -0700

    Better text placeholder.

commit 312d83252c
Merge: 14b8b524 3d93b0c5
Author: topcat001 <anindya49@hotmail.com>
Date:   Tue Aug 15 13:39:22 2023 -0700

    Merge remote-tracking branch 'origin/master' into sixel

commit 14b8b52452
Merge: 4baf7642 fda39377
Author: topcat001 <anindya49@hotmail.com>
Date:   Sat Jul 22 17:29:10 2023 -0700

    Merge branch 'master' into sixel

commit 4baf76422f
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Wed Jun 21 07:43:53 2023 +0100

    Both files can go on one line.

commit 4c92acf6ff
Author: topcat001 <anindya49@hotmail.com>
Date:   Sat Jun 17 17:53:01 2023 -0700

    Merge topcat001/tmux/sixel.

commit 6794facc82
Merge: 7b85f5ad f41c536f
Author: topcat001 <anindya49@hotmail.com>
Date:   Sat Jun 17 17:21:02 2023 -0700

    Merge remote-tracking branch 'origin/master' into sixel

commit 7b85f5adf9
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Jun 8 12:55:03 2023 +0100

    Do not require passthrough for SIXEL.

commit a6ee55e092
Merge: 6da391f4 fe385b18
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Jun 8 12:19:55 2023 +0100

    Merge branch 'master' into sixel

commit 6da391f460
Merge: 0d71e585 0eb5d254
Author: topcat001 <anindya49@hotmail.com>
Date:   Sat May 20 17:05:55 2023 -0700

    Merge branch 'master' into sixel

commit 0d71e5853f
Merge: 64368a1a fbe6fe7f
Author: topcat001 <anindya49@hotmail.com>
Date:   Sat Apr 29 17:32:07 2023 -0700

    Merge branch 'master' into sixel

commit 64368a1a63
Merge: c630a56a 22eb0334
Author: topcat001 <anindya49@hotmail.com>
Date:   Thu Mar 30 14:21:09 2023 -0700

    Merge branch 'master' into sixel

commit c630a56a62
Merge: 34c96c4c aaa043a2
Author: topcat001 <anindya49@hotmail.com>
Date:   Thu Nov 10 18:53:01 2022 -0800

    Merge branch 'master' into sixel

commit 34c96c4c4a
Merge: 2a1e16a2 50f4e0fa
Author: topcat001 <anindya49@hotmail.com>
Date:   Sat Nov 5 18:05:36 2022 -0700

    Merge branch 'master' into sixel

commit 2a1e16a24d
Merge: a82f14c7 d001a94d
Author: topcat001 <anindya49@hotmail.com>
Date:   Thu Oct 27 16:01:35 2022 -0700

    Merge branch 'master' into sixel

commit a82f14c7b2
Merge: 742c0634 f7b30ed3
Author: topcat001 <anindya49@hotmail.com>
Date:   Sun Aug 28 13:43:07 2022 -0700

    Merge branch 'master' into sixel

commit 742c063473
Merge: 906c92a5 87b248f3
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Fri Apr 1 10:14:15 2022 +0100

    Merge branch 'master' into sixel

commit 906c92a5f4
Merge: 6680a024 138ffc7c
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Wed Dec 8 10:37:33 2021 +0000

    Merge branch 'master' into sixel

commit 6680a024be
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Oct 7 13:59:08 2021 +0100

    Fix build.

commit ebd2c58593
Merge: 90dc0519 fed7b29c
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Oct 7 13:19:48 2021 +0100

    Merge branch 'master' into sixel

commit 90dc05191c
Merge: a282439f 4694afbe
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Feb 20 20:37:32 2020 +0000

    Merge branch 'master' into sixel

commit a282439fcb
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Jan 30 09:12:53 2020 +0000

    Add missing declarations.

commit 3a741aacd1
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

commit 339832b92c
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Jan 30 09:04:51 2020 +0000

    Bad merge.

commit 92ed9fc0b2
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

commit 40ad01073d
Merge: dd3c72f1 61b075a2
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Sun Jan 12 20:03:41 2020 +0000

    Merge branch 'master' into sixel

commit 5bb075487f
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

commit dd3c72f132
Merge: 1a0e5fe9 54efe337
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Wed Dec 18 20:24:26 2019 +0000

    Merge branch 'master' into sixel

commit 1a0e5fe933
Merge: cf071ffe 15d7e564
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Tue Dec 10 16:34:11 2019 +0000

    Merge branch 'master' into sixel

commit cf071ffecd
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Mon Dec 9 15:41:56 2019 +0000

    Remove images when reflow happens.

commit 2006b7a563
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Dec 5 09:27:15 2019 +0000

    More invalidation of images.

commit b642eac450
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.

commit 7566e37a46
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.

commit 62c0280b23
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Dec 5 08:48:58 2019 +0000

    Correctly remove when not visible.

commit 86c5098a88
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.

commit 49f2f0a8f1
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Dec 5 00:02:55 2019 +0000

    Store images, currently at most 10.

commit 3aebcc6709
Merge: 146ee3f6 92ecd611
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Wed Dec 4 19:27:16 2019 +0000

    Merge branch 'master' into sixel

commit 7c033a74e2
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

commit 146ee3f6f8
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Sat Nov 30 09:47:53 2019 +0000

    Don't write image as text yet.

commit 0a15bbf3f1
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).

commit a5b1e20941
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).

commit 968382aa6a
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.

commit b1904c9b8d
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Sat Nov 30 09:17:18 2019 +0000

    Store SIXELs as a box for the moment.

commit 5d8dbcdf3d
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).

commit 0c999a402e
Merge: 28961dd5 866b053f
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Fri Nov 29 18:54:09 2019 +0000

    Merge branch 'master' into sixel

commit 28961dd5a3
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Nov 28 14:24:57 2019 +0000

    Add an image.

commit d2e3f3c1cc
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).

commit e01df67ca1
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.

commit e24acc0b5c
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   Thu Nov 28 12:38:02 2019 +0000

    Simple SIXEL parse and modify API.

commit b34111b3da
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.
 2023-08-22 08:43:35 +01:00
nicm b770a429c6 Add an option menu-selected-style to configure the currently selected 
menu item, from Alexis Hildebrandt.
 2023-08-15 07:01:47 +00:00
nicm dee72ed41f Add options and flags for menu styles similar to those existing for 
popups, from Alexis Hildebrandt. GitHub issue 3650.
 2023-08-08 08:08:47 +00:00
nicm 1071ef8fc5 Extend the menu drawing function to support custom characters and 
styles, from Alexis Hildebrandt.
 2023-08-08 07:41:04 +00:00
nicm 2f74e811f1 Set extended keys flag again after reset, from Eric T Johnson. 2023-07-14 19:32:59 +00:00
nicm d73078838d For passthrough, don't write to clients attached to different sessions, 
based on a fix from Sergei Grechanik.
 2023-03-27 08:31:32 +00:00
nicm 907f58cc3c Fix cursor position after zero width space, GitHub issue 3469. 2023-02-10 14:01:43 +00:00
nicm 8bd17bff49 Make U+FE0F VARIATION SELECTOR-16 change the width from 1 to 2. GitHub 
issue 3409.
 2022-12-16 08:19:58 +00:00
nicm c2580cfe24 Initialize context before testing it. 2022-10-25 17:53:31 +00:00
nicm 0fc961b22e Do not fire redraw callback if NULL. 2022-10-25 09:04:49 +00:00
nicm 42ba6c1b22 Add a third state "all" to allow-passthrough to work even in invisible 
panes, from Sergei Grechanik in GitHub issue 3274.
 2022-08-02 11:09:26 +00:00
nicm ccc9dc3bb4 If an application gives the first parameter to OSC 52, validate and pass 
on to outside terminal. GitHub issue 3192.
 2022-06-09 09:12:55 +00:00
nicm 6a1706a62f Check scroll-on-clear for ED also. 2022-03-17 13:39:13 +00:00
nicm 10d689e735 Add an option (scroll-on-clear) to control if tmux scrolls into history 
on clear, from Robert Lange in GitHub issue 3121.
 2022-03-17 11:35:37 +00:00
nicm 5745bd27fd Do not allow inline styles to replace mode-style for the selected item, 
from Alexis Hildebrandt in GitHub issue 2946.
 2021-10-26 12:22:23 +00:00
nicm ef46eb91a5 Add -s and -S to display-popup to set popup and border style, from 
Alexis Hildebrandt in GitHub issue 2931.
 2021-10-25 09:38:36 +00:00
nicm 0cca695d6e Instead of setting the popup default colours in the draw callback, set 
it up in popup_display and follow the same routine as panes in the draw
and init_ctx callbacks - use the palette if the option value is default.
Allows application-set fg and bg to work in panes again.
 2021-10-25 09:22:17 +00:00
nicm 8a9bfd0cdd Add -T to set a popup title, from Alexis Hildebrandt in GitHub issue 2941. 2021-10-20 09:50:40 +00:00
nicm add20637f2 Add popup-border-lines option to set popup line style, from Alexis 
Hildebrandt, GitHub issue 2930.
 2021-10-14 13:19:01 +00:00
nicm 837ca176d1 Add popup-style and popup-border-style options, from Alexis Hildebrandt 
in GitHub issue 2927.
 2021-10-13 09:28:36 +00:00
nicm 41ababdf6c Be more sophisticated about enabling synchronized updates when there is 
an overlay and treat it like the active pane (use for commands which
move the cursor only). When there is an overlay also use it for all
panes and not just the active pane. GitHub issue 2826.
 2021-08-17 08:44:52 +00:00
nicm 5d451551b6 Restore saved cursor position after a ZWJ rather than recalculating it. 2021-08-12 11:35:53 +00:00
nicm 7eea3d7ab8 Break the colour palette into a struct rather than just a single array 
and use that to support the OSC palette-setting sequences in popups.
Also add a pane-colours array option to specify the defaults. GitHub
issue 2815.
 2021-08-11 20:49:55 +00:00
nicm 24cd6851f6 Add basic support for zero width joiners, GitHub issues 1605 and 2784. 2021-08-06 09:34:09 +00:00
nicm ef5602a590 Another minor fix - do not draw positions that are under the popup with 
spaces, from Anindya Mukherjee. Also a typo fix from Linus Arver.
 2021-08-06 07:32:21 +00:00
nicm 02a6b39db7 Improve logging of screen mode changes. 2021-06-10 07:43:44 +00:00
nicm 255802d8d7 Trim output overwritten by later text or clears completely rather than 
only in a few cases. This means we can better track when a line should
wrap. GitHub issue 2537.
 2021-01-29 09:48:43 +00:00
nicm 8156d9ba41 Flush pending output before entering or exiting alternate screen rather 
than leaking it, oss-fuzz issue 29959.
 2021-01-27 10:42:52 +00:00
nicm 9fcf413d87 Revert clear changes to writing as they don't work properly, better 
change to come.
 2021-01-22 11:28:33 +00:00
nicm 91d112bf12 There is no need to clear every line entirely before drawing to it, this 
means moving the cursor and messes up wrapping. Better to just clear the
sections that aren't written over. GitHub issue 2537.
 2021-01-18 10:27:54 +00:00
nicm ed786309cc Do not clear the wrapped flag on linefeeds if it is already set - this 
does not appear to be what applications want. GitHub issue 2478 and 2414.
 2020-12-07 09:23:57 +00:00
nicm 1326529f99 Remove some old debug logging. 2020-11-09 08:42:43 +00:00
nicm 743ab5728d Fix show-buffer when run from inside tmux, GitHub issue 2314. 2020-07-21 05:24:33 +00:00
nicm 2aa177d102 Do not eliminate redundant clears, the code is wrong and doing it 
correctly wouldn't be worth it. GitHub issue 2298.
 2020-07-06 10:07:02 +00:00