Commit Graph

11258 Commits

Author SHA1 Message Date
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
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
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
Dane Jensen
ed43033c39 Changed the semantics from un/minimise-pane to hide/show-pane
Several functions and flags were semantically changed. No logic was altered.
2026-05-20 04:14:59 +00:00
Dane Jensen
0a7b008b21 Changed minimised semantics to hide semantics 2026-05-19 21:09:53 -07:00
nicm
ce24b92758 Floating panes full redraw code, by Michael Grant. 2026-05-19 13:12:45 +00:00
Nicholas Marriott
f8e908b89c More trivial merge errors. 2026-05-19 13:26:27 +01:00
Nicholas Marriott
2695c5305e More merge fixes. 2026-05-19 13:23:21 +01:00
Nicholas Marriott
55fdfef9d1 Merge fixes. 2026-05-19 13:19:21 +01:00
nicm
f5a086ac98 Some more easy floating panes bits. 2026-05-19 12:16:25 +00:00
Nicholas Marriott
2f6da393e2 Merge branch 'master' into floating_panes 2026-05-19 13:05:14 +01:00
Thomas Adam
cb1025e0e8 Merge branch 'obsd-master' 2026-05-19 12:25:31 +01:00
nicm
a46cdb8bbc More (currently disabled) bits for creating floating panes, from Michael
Grant and Dane Jensen.
2026-05-19 10:26:03 +00:00
Nicholas Marriott
57b17bbb70 window_pane_move is not used. 2026-05-19 10:54:35 +01:00
nicm
34e2035bad More bits for pane Z index tracking from floating panes, mostly by
Michael Grant.
2026-05-19 09:48:14 +00:00
Dane Jensen
7c23da598d Fixed null dereference in window.c:window_pane_float_geometry when there is no target wp.
Conditions for the bug: start tmux, run `minimise-pane; new-pane`. Now fixed.
2026-05-19 00:21:48 +00:00
Dane Jensen
b7cc218a03 Fixed null dereference. 2026-05-18 17:14:19 -07:00
Dane Jensen
0ae8019e7f Better api design and abstraction for new-pane and split-window.
While working on #5043, feedback was given by @mgrant0 regarding api design that also required addressing in `new-pane` and `split-window`. This MR addresses that feedback (no subflags, flag restriction for semantic reasons, unified 'float' and 'tile' flags across commands).
2026-05-18 22:46:53 +00:00
Dane Jensen
c3fc0229e5 style fixes 2026-05-18 15:41:28 -07:00
Dane Jensen
76196b8ffa Moved new-pane into split-window. 2026-05-18 13:48:50 -07:00
Nicholas Marriott
fd4e683151 Merge branch 'master' into floating_panes 2026-05-18 11:10:09 +01:00
Thomas Adam
a9ba7b8ecb Merge branch 'obsd-master' 2026-05-18 09:38:02 +01:00
nicm
962d647993 Remove some leftover debug code. 2026-05-17 16:02:33 +00:00
nicm
a8520ba59e Bring over some of layout and positioning code for floating panes, by
Michael Grant.
2026-05-17 16:01:42 +00:00
Nicholas Marriott
2b05d8531d Merge branch 'master' into floating_panes 2026-05-17 15:55:09 +01:00
Nicholas Marriott
8e966688a7 If outside floating pane, do not carry on to check as if tiled pane. 2026-05-17 15:49:21 +01:00