Commit Graph

11325 Commits

Author SHA1 Message Date
Nicholas Marriott
7c517fc958 Some more bits remove from staging; SIXEL etc. 2026-05-25 15:58:33 +01:00
Nicholas Marriott
46ddb6e294 Remove bits not in staging branch. 2026-05-25 15:54:21 +01:00
Nicholas Marriott
cc46872e06 Merge branch 'floating_panes' into floating_panes_staging 2026-05-25 15:50:38 +01:00
Nicholas Marriott
6513808720 And a bad merge. 2026-05-25 15:50:25 +01:00
Nicholas Marriott
a11ad0103e Merge branch 'floating_panes' into floating_panes_staging 2026-05-25 15:49:39 +01:00
Nicholas Marriott
6c1773542d Some trivial bits from master. 2026-05-25 15:49:22 +01:00
Nicholas Marriott
e2e92fa3ff Merge branch 'floating_panes' into floating_panes_staging 2026-05-25 09:22:25 +01:00
Nicholas Marriott
c60422241b Merge branch 'master' into floating_panes 2026-05-25 09:21:36 +01:00
Thomas Adam
cca1e77f95 Merge branch 'obsd-master' 2026-05-25 09:15:07 +01:00
nicm
cc81287665 More of floating panes redraw path, still mostly using flags which are never set. 2026-05-25 08:07:48 +00:00
Nicholas Marriott
dc00d234e6 Merge branch 'floating_panes' into floating_panes_staging 2026-05-25 08:57:33 +01:00
nicm
ca95153b45 Preserve flags when creating new cells, from Brian Youngs. 2026-05-25 07:55:46 +00:00
Michael Grant
92dcb22e92 Clean up in screen_redraw_draw_pane and fix an offset bug. 2026-05-25 08:17:57 +01:00
Nicholas Marriott
f75b1e5f07 Do not check overlays in tty_draw_line_clear, the caller should be doing it. 2026-05-24 12:25:51 +01:00
Nicholas Marriott
fb9e47d8c9 Some chanegs I made in the wrong branch. 2026-05-24 12:10:46 +01:00
Nicholas Marriott
43ae6e0a6b tty_clear_area should not work out popup ranges because tty_clear_line is going
to do it anyway.
2026-05-24 12:07:42 +01:00
Nicholas Marriott
724d6d7c95 Change to fall into redraw for alignment test. 2026-05-24 11:43:35 +01:00
Michael Grant
95c20aef20 Fix the alignmenttest. 2026-05-24 11:22:44 +01:00
Nicholas Marriott
791f77b879 Some missing calls to tty_check_overlay_range. 2026-05-24 10:18:28 +01:00
Nicholas Marriott
9aea80f5d3 Merge branch 'floating_panes' into floating_panes_staging 2026-05-24 10:06:33 +01:00
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
Nicholas Marriott
cb611efedf Remove pane overlap check from tty_clear_area and add a couple of missing
TTY_CTX_PANE_OBSCURED.
2026-05-23 08:31:27 +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
8746ecc25a Merge branch 'floating_panes' into floating_panes_staging 2026-05-22 21:31:39 +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
3c27a1ce8f Merge branch 'floating_panes' into floating_panes_staging 2026-05-22 18:03:28 +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
b40359ba7f Remove some debug logging. 2026-05-22 17:29:23 +01:00
Nicholas Marriott
42fd51f59a Merge branch 'floating_panes' into floating_panes_staging 2026-05-22 17:10:23 +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
a7eb470b6f Merge branch 'floating_panes' into floating_panes_staging 2026-05-22 13:08:13 +01: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
7f3aae1e3e Merge branch 'floating_panes' into floating_panes_staging 2026-05-22 12:45:07 +01: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
7c62d3ab2b Merge branch 'floating_panes' into floating_panes_staging 2026-05-22 12:39:38 +01:00
Nicholas Marriott
4fd8431ad0 Merge branch 'master' into floating_panes 2026-05-22 12:39:09 +01:00