Commit Graph

11281 Commits

Author SHA1 Message Date
Nicholas Marriott
a6986864db Merge branch 'master' into floating_panes 2026-05-24 10:05:56 +01:00
Nicholas Marriott
eb330a6df6 Restore SIXEL bit. 2026-05-24 10:05:41 +01:00
Thomas Adam
b498979d4d Merge branch 'obsd-master' 2026-05-24 10:00:06 +01:00
Michael Grant
30866d06d5 Add visible range checks to screen_write.c functions and remove checks from tty.c. 2026-05-24 09:58:30 +01:00
nicm
f047b3f8e7 Do not crash when freeing layout cell, reported by Jere Viikari. 2026-05-24 08:40:43 +00:00
Thomas Adam
c67787536b Merge branch 'obsd-master' 2026-05-23 18:00:06 +01:00
nicm
3cfc96d4de Add missing argument to %unlinked-window-renamed, reported by Andrew
Grangaard.
2026-05-23 16:43:04 +00:00
Thomas Adam
91a8c66537 Merge branch 'obsd-master' 2026-05-23 08:45:06 +01:00
nicm
5c3a4746b7 Some code tidying up. 2026-05-23 07:22:50 +00:00
Michael Grant
8b474429b7 Merge branch 'floating_panes' of github.com:tmux/tmux into floating_panes 2026-05-23 06:16:15 +01:00
Michael Grant
91b4e02805 Fix merge messup where i is no longer x, use px and ri->px instead here. 2026-05-23 06:15:12 +01:00
Nicholas Marriott
e65e653ea5 Merge branch 'master' into floating_panes 2026-05-22 21:31:28 +01:00
Nicholas Marriott
b8e0004ff2 Fix missing arguments. 2026-05-22 18:33:04 +01:00
Nicholas Marriott
29a1a1f8b0 Check overlay/BCE first to avoid walking panes unless needed. 2026-05-22 18:03:01 +01:00
Nicholas Marriott
71de737ee8 Merge branch 'master' into floating_panes 2026-05-22 17:10:08 +01:00
Thomas Adam
4e0aabd8a7 Merge branch 'obsd-master' 2026-05-22 16:54:06 +01:00
nicm
143a177055 Tighten up read-only checks on attach-session, detach-client and
switch-client so that a user should be able to only detach their own
client. Reported by John Walker.
2026-05-22 15:22:43 +00:00
Nicholas Marriott
55fbacb469 Fix merge error. 2026-05-22 13:07:54 +01:00
nicm
d45a9cad8c Work out if a pane is obscured by another one when drawing. 2026-05-22 11:55:43 +00:00
Nicholas Marriott
2a6aac4c14 Merge branch 'master' into floating_panes 2026-05-22 12:44:49 +01:00
Nicholas Marriott
285a3b7522 Fix up SIXEL with recent changes. 2026-05-22 12:44:08 +01:00
Nicholas Marriott
4fd8431ad0 Merge branch 'master' into floating_panes 2026-05-22 12:39:09 +01:00
Thomas Adam
d4255818c4 Merge branch 'obsd-master' 2026-05-22 12:01:06 +01:00
Nicholas Marriott
d3e8dd3623 Use a flags bit for obscured rather than an int. 2026-05-22 10:58:37 +01:00
Nicholas Marriott
1fa6ebacf4 Merge branch 'master' into floating_panes 2026-05-22 10:40:29 +01:00
Thomas Adam
f714f3ee78 Merge branch 'obsd-master' 2026-05-22 10:28:51 +01:00
nicm
36bc351557 Use a union for the data passed around in tty_ctx instead of void *. 2026-05-22 09:21:32 +00:00
nicm
d5ee330d20 Tidy up a load of different flags and special values in the tty_ctx into
a single bitmask.
2026-05-22 09:05:16 +00:00
Nicholas Marriott
8fa822207d Cache obscure flag in screen_write_ctx. 2026-05-22 09:07:38 +01:00
Nicholas Marriott
52ad3c8425 Change pane_is_obscured to take the context since it always uses its pane. 2026-05-22 09:03:51 +01:00
Nicholas Marriott
e5abcd217c Start at the current pane in the zindex list for working out if a pane is
obscured.
2026-05-22 08:58:48 +01:00
Nicholas Marriott
4a0118aea1 Merge branch 'master' into floating_panes 2026-05-21 12:07:17 +01:00
Thomas Adam
634e9d6213 Merge branch 'obsd-master' 2026-05-21 12:01:06 +01:00
nicm
9aa9a92f72 Pane resizing code for floating panes, mostly by Michael Grant. 2026-05-21 07:28:51 +00:00
Dane Jensen
90a748f7fb Added logic to prevent hidden panes from being selected as the window's active pane.
Additional logic added to find any valid pane if the best fit checks fail.
2026-05-20 19:33:30 +00:00
Dane Jensen
2434653867 fix: added conditionals and more finding logic to avoid displaying hidden panes. 2026-05-20 12:19:56 -07:00
Nicholas Marriott
1def587884 Remove code that was already applied. 2026-05-20 13:47:11 +01:00
Nicholas Marriott
c56bc9ed05 Store pane ID for mouse last pane instead of a pointer to the pane. 2026-05-20 13:41:13 +01:00
Nicholas Marriott
8c51c0fdbd Merge tag '3.6b'
3.6b
2026-05-20 12:53:07 +01:00
Thomas Adam
24e4a545a2 Merge branch 'obsd-master' 2026-05-20 12:19:23 +01:00
Nicholas Marriott
c5fb5e8bb0 Update CHANGES. 2026-05-20 12:17:30 +01:00
Nicholas Marriott
b8434182c9 Track which list (images or saved_images) each image is on so they can be
removed from the correct list when the total image count is reached. Fixes
crash reported by xlabai at tencent dot com.
2026-05-20 12:15:34 +01:00
Nicholas Marriott
e1f942f26a Add a define for max images and bump to 20 for the moment. 2026-05-20 12:14:22 +01:00
Nicholas Marriott
2a9ba51907 Merge branch 'master' into floating_panes 2026-05-20 12:06:49 +01:00
Thomas Adam
91b85efabb Merge branch 'obsd-master' 2026-05-20 12:01:06 +01:00
nicm
0057905ca0 Increase escape delay if the buffer contains a partial paste end, fixes
issues with at least Windows Terminal. From jing dot empty at gmail.com
GitHub issue 5088.
2026-05-20 10:56:46 +00:00
nicm
572e26deb8 Some more trivial floating panes bits. 2026-05-20 08:54:40 +00:00
Nicholas Marriott
406ae3d8a6 Remove some trivial differences. 2026-05-20 09:46:38 +01:00
Nicholas Marriott
8a674265f3 Merge branch 'master' into floating_panes 2026-05-20 09:35:03 +01:00
Thomas Adam
caff9a135f Merge branch 'obsd-master' 2026-05-20 08:47:44 +01:00