OpenBSD CVS

CVS log for src/usr.bin/tmux/cmd-join-pane.c


[BACK] Up to [local] / src / usr.bin / tmux

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.51 / (download) - annotate - [select for diffs], Tue Jan 17 06:50:55 2023 UTC (16 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, HEAD
Changes since 1.50: +2 -1 lines
Diff to previous 1.50 (colored)

Update palette when moving a pane, GitHub issue 3437.

Revision 1.50 / (download) - annotate - [select for diffs], Tue Jun 7 10:02:19 2022 UTC (23 months, 1 week ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2
Changes since 1.49: +23 -15 lines
Diff to previous 1.49 (colored)

Expand arguments to some commands where it makes sense, GitHub issue
3204 from Anindya Mukherjee.

Revision 1.49 / (download) - annotate - [select for diffs], Sat Aug 21 10:22:39 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.48: +3 -3 lines
Diff to previous 1.48 (colored)

Add args parsing callback for some future work, currently unused.

Revision 1.48 / (download) - annotate - [select for diffs], Thu Mar 11 06:31:05 2021 UTC (3 years, 2 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.47: +2 -2 lines
Diff to previous 1.47 (colored)

Add split-window -Z to start the pane zoomed, GitHub issue 2591.

Revision 1.47 / (download) - annotate - [select for diffs], Wed Jan 6 07:32:23 2021 UTC (3 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.46: +5 -2 lines
Diff to previous 1.46 (colored)

Insert joined pane before the target pane with -b, like for split. From
Takeshi Banse.

Revision 1.46 / (download) - annotate - [select for diffs], Sat Jul 4 14:24:02 2020 UTC (3 years, 10 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored)

kill-window -a cannot just walk the list of windows because if
renumber-windows is on, the window it wants to keep could be moved.
Change to renumber afterwards and also behave better if the window is
linked into the session twice. GitHub issue 2287.

Revision 1.45 / (download) - annotate - [select for diffs], Sat May 16 16:20:59 2020 UTC (4 years ago) by nicm
Branch: MAIN
Changes since 1.44: +2 -1 lines
Diff to previous 1.44 (colored)

Add a client flag 'active-pane' which stores the active pane in the
client and allows it to be changed independently from the real active
pane stored in the window. This is can be used with session groups which
allow an independent current window (although it would be nice to have a
flag for this too and remove session groups). The client active pane is
only really useful interactively, many things (hooks, window-style,
zooming) still use the window active pane.

Revision 1.44 / (download) - annotate - [select for diffs], Wed Apr 22 21:15:33 2020 UTC (4 years ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.43: +5 -14 lines
Diff to previous 1.43 (colored)

Improve join-pane, move-pane and break-pane:

- There is no need for join-pane and move-pane to be different.
- break-pane can just behave like move-window if the source has only one
  pane, instead of failing.
- Add -a to break-pane like move-window.

Also add missing man page bits for previous window-tree.c changes.

GitHub issue 2176.

Revision 1.43 / (download) - annotate - [select for diffs], Mon Apr 13 14:46:04 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.42: +2 -3 lines
Diff to previous 1.42 (colored)

Move cmdq_state into cmd-queue.c.

Revision 1.42 / (download) - annotate - [select for diffs], Mon Apr 13 14:04:25 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)

Rename cmdq_shared to cmdq_state which will better reflect what it is
(going to be) used for.

Revision 1.41 / (download) - annotate - [select for diffs], Mon Apr 13 10:59:58 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.40: +10 -7 lines
Diff to previous 1.40 (colored)

Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its
use more clearly defined and preparation for some future work).

Revision 1.40 / (download) - annotate - [select for diffs], Mon Apr 13 08:26:27 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.39: +3 -3 lines
Diff to previous 1.39 (colored)

Make struct cmd local to cmd.c and move it out of tmux.h.

Revision 1.39 / (download) - annotate - [select for diffs], Sat Mar 21 13:16:15 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.38: +19 -34 lines
Diff to previous 1.38 (colored)

Break code to convert an argument as a percentage into a common function.

Revision 1.38 / (download) - annotate - [select for diffs], Thu Jan 2 13:44:17 2020 UTC (4 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.37: +2 -2 lines
Diff to previous 1.37 (colored)

Add CMD_FIND_DEFAULT_MARKED to join-pane like move-pane, from
davidegirardi in GitHub issue 2046.

Revision 1.37 / (download) - annotate - [select for diffs], Mon Nov 18 09:43:31 2019 UTC (4 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.36: +9 -6 lines
Diff to previous 1.36 (colored)

Add -f for full size to join-pane (like split-window), from Theo Buehler.

Revision 1.36 / (download) - annotate - [select for diffs], Tue Oct 15 08:25:37 2019 UTC (4 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.35: +30 -11 lines
Diff to previous 1.35 (colored)

Add support for percentage sizes for resize-pane ("-x 10%"). Also change
split-window and join-pane -l to accept similar percentages and
deprecate -p. From Anindya Mukherjee.

Revision 1.35 / (download) - annotate - [select for diffs], Thu Jun 20 11:59:59 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.34: +3 -1 lines
Diff to previous 1.34 (colored)

Add a per-pane option set. Pane options inherit from window options (so
there should be no change to existing behaviour) and are set and shown
with set-option -p and show-options -p.

Change remain-on-exit and window-style/window-active-style to be pane
options (some others will be changed later).

This makes select-pane -P and -g unnecessary so no longer document them
(they still work) and no longer document set-window-option and
show-window-options in favour of set-option -w and show-options -w.

Revision 1.34 / (download) - annotate - [select for diffs], Wed Apr 17 14:37:48 2019 UTC (5 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.33: +8 -4 lines
Diff to previous 1.33 (colored)

Break new window and pane creation common code from various commands and
window.c into a separate file spawn.c.

Revision 1.33 / (download) - annotate - [select for diffs], Wed Aug 30 10:33:57 2017 UTC (6 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)

Pass flags into cmd_find_from_* to fix prefer-unattached, reported by
Thomas Sattler.

Revision 1.32 / (download) - annotate - [select for diffs], Sat Apr 22 10:22:39 2017 UTC (7 years ago) by nicm
Branch: MAIN
Changes since 1.31: +10 -10 lines
Diff to previous 1.31 (colored)

Get rid of the extra layer of flags and cmd_prepare() and just store the
CMD_FIND_* flags in the cmd_entry and call it for the command. Commands
with special requirements call it themselves and update the target for
hooks to use.

Revision 1.31 / (download) - annotate - [select for diffs], Sat Apr 22 08:56:24 2017 UTC (7 years ago) by nicm
Branch: MAIN
Changes since 1.30: +3 -1 lines
Diff to previous 1.30 (colored)

Mouse bindings and hooks set up an initial current state when running a
command. This is used for the session, window and pane for all commands
in the command sequence if there is no -t or -s.

However, using it for all commands in the command sequence means that if
the active pane or current session is changed, subsequent commands still
use the previous state. So make commands which explicitly change the
current state (such as neww and selectp) update it themselves for later
commands. Commands which may invalidate the state (like killp) are
already OK because an invalid state will be ignored.

Also fill in the current state for all key bindings rather than just the
mouse, so that any omissions are easier to spot.

Revision 1.30 / (download) - annotate - [select for diffs], Sun Oct 16 22:06:40 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.29: +3 -3 lines
Diff to previous 1.29 (colored)

Use the notify name string instead of going via an enum and change
existing hooks to use notifys instead.

Revision 1.29 / (download) - annotate - [select for diffs], Sun Oct 16 19:04:05 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.28: +13 -13 lines
Diff to previous 1.28 (colored)

Mass rename struct cmd_q to struct cmdq_item and related.

Revision 1.28 / (download) - annotate - [select for diffs], Thu Oct 13 22:48:51 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.27: +1 -8 lines
Diff to previous 1.27 (colored)

Trying to do hooks generically is way too complicated and unreliable and
confusing, particularly trying to automatically figure out what target
hooks should be using. So simplify it:

- drop before hooks entirely, they don't seem to be very useful;

- commands with special requirements now fire their own after hook (for
  example, if they change session or window, or if they have -t and -s
  and need to choose which one the hook uses as current target);

- commands with no special requirements can have the CMD_AFTERHOOK flag
  added and they will use the -t state.

At the moment new-session, new-window, split-window fire their own hook,
and display-message uses the flag. The remaining commands still need to
be looked at.

Revision 1.27 / (download) - annotate - [select for diffs], Thu Oct 13 10:01:49 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.26: +8 -1 lines
Diff to previous 1.26 (colored)

Some improvements and bug fixes for hooks:

- Prepare the state again before the "after" hooks are run, because the
  command may have killed or moved windows.

- Use the hooks list from the newly prepared target, not the old hooks
  list (only matters for new-session really).

- Correctly detect an invalid current state and ignore it in
  cmd_find_target ("killw; swapw").

- Change neww, new, killp, killw, splitw, swapp, swapw to update the
  current state (used if no explicit target is given) to something more
  useful after they have finished. For example, neww changes it to the
  newly created window.

Hooks are still relatively new and primitive so there are likely to be
more changes to come.

Parts based on bug reports from Uwe Werler and Iblis Lin.

Revision 1.26 / (download) - annotate - [select for diffs], Mon Oct 10 21:51:39 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.25: +9 -11 lines
Diff to previous 1.25 (colored)

Add static in cmd-* and fix a few other nits.

Revision 1.25 / (download) - annotate - [select for diffs], Sun Sep 4 17:37:06 2016 UTC (7 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)

Add support for performing a full width split (with splitw -f), rather
than splitting the current cell. From Stephen Kent.

Revision 1.24 / (download) - annotate - [select for diffs], Sat Aug 27 23:35:00 2016 UTC (7 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.23: +6 -6 lines
Diff to previous 1.23 (colored)

Kill empty window after moving pane and updating current window, so that
index is still valid before renumber-windows happens. Fixes issue
reported by Eric Pruitt.

Revision 1.23 / (download) - annotate - [select for diffs], Tue Jan 19 15:59:12 2016 UTC (8 years, 4 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)

I no longer use my SourceForge address so replace it.

Revision 1.22 / (download) - annotate - [select for diffs], Mon Dec 14 00:31:54 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.21: +9 -3 lines
Diff to previous 1.21 (colored)

Instead of combined flags for -c, -s, -t, split into different sets
using an enum and simplify the parsing code.

Revision 1.21 / (download) - annotate - [select for diffs], Sun Dec 13 21:53:57 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.20: +17 -11 lines
Diff to previous 1.20 (colored)

Use member names in cmd_entry definitions so I stop getting confused
about the order.

Revision 1.20 / (download) - annotate - [select for diffs], Sun Dec 13 14:32:38 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.19: +8 -9 lines
Diff to previous 1.19 (colored)

Instead of every command resolving the target (-t or -s) itself, prepare
the state (client, session, winlink, pane) for it it before entering the
command. Each command provides some flags that tell the prepare step
what it is expecting.

This is a requirement for having hooks on commands (for example, if you
hook "select-window -t1:2", the hook command should to operate on window
1:2 not whatever it thinks is the current window), and should allow some
other target improvements.

The old cmd_find_* functions remain for the moment but that layer will
be dropped later.

Joint work with Thomas Adam.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Jun 18 23:56:01 2015 UTC (8 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.18: +3 -3 lines
Diff to previous 1.18 (colored)

Use the SRCDST define for usage.

Revision 1.18 / (download) - annotate - [select for diffs], Thu Jun 4 11:43:51 2015 UTC (8 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored)

Add support for a single "marked pane". There is one marked pane in the
server at a time; it may be toggled or cleared with select-pane -m and
-M (the border is highlighted). A new target '~' or '{marked}' specifies
the marked pane to commands and it is the default target for the
swap-pane and join-pane -s flag (this makes them much simpler to use -
mark the source pane and then change to the target pane to run swapp or
joinp).

Revision 1.17 / (download) - annotate - [select for diffs], Mon Oct 20 22:29:25 2014 UTC (9 years, 7 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.16: +1 -18 lines
Diff to previous 1.16 (colored)

Instead of setting up the default keys by building the key struct
directly with a helper function in the cmd_entry, include a table of
bind-key commands and pass them through the command parser and a
temporary cmd_q.

As well as being smaller, this will allow default bindings to be command
sequences which will probably be needed soon.

Revision 1.16 / (download) - annotate - [select for diffs], Thu Apr 17 09:13:13 2014 UTC (10 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.15: +2 -6 lines
Diff to previous 1.15 (colored)

Correct the dance to fix the active pane in join-pane by pulling the
(right) code from break-pane and window_remove_pane into a helper
function.

Revision 1.15 / (download) - annotate - [select for diffs], Thu Oct 10 12:00:19 2013 UTC (10 years, 7 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.14: +1 -3 lines
Diff to previous 1.14 (colored)

Remove the barely-used and unnecessary command check() function.

Revision 1.14 / (download) - annotate - [select for diffs], Sun Mar 24 09:57:59 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.13: +3 -1 lines
Diff to previous 1.13 (colored)

Add resize-pane -Z to temporary zoom the active pane to occupy the full
window or unzoom (restored to the normal layout) if it already zoomed,
bound to C-b z by default. The pane is unzoomed on pretty much any
excuse whatsoever.

We considered making this a new layout but the requirements are quite
different from layouts so decided it is better as a special case. Each
current layout cell is saved, a temporary one-cell layout generated and
all except the active pane set to NULL.

Prompted by suggestions and scripts from several. Thanks to Aaron Jensen
and Thiago Padilha for testing an earlier version.

Revision 1.13 / (download) - annotate - [select for diffs], Sun Mar 24 09:54:10 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.12: +13 -13 lines
Diff to previous 1.12 (colored)

Add a command queue to standardize and simplify commands that call other
commands and allow a command to block execution of subsequent
commands. This allows run-shell and if-shell to be synchronous which has
been much requested.

Each client has a default command queue and commands are consumed one at
a time from it. A command may suspend execution from the queue by
returning CMD_RETURN_WAIT and then resume it by calling cmd_continue() -
for example run-shell does this from the callback that is fired after
the job is freed.

When the command queue becomes empty, command clients are automatically
exited (unless attaching). A callback is also fired - this is used for
nested commands in, for example, if-shell which can block execution of
the client's cmdq until a new cmdq becomes empty.

Also merge all the old error/info/print functions together and lose the
old curclient/cmdclient distinction - a cmdq is bound to one client (or
none if in the configuration file), this is a command client if
c->session is NULL otherwise an attached client.

Revision 1.12 / (download) - annotate - [select for diffs], Wed Jul 11 07:10:15 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.11: +14 -14 lines
Diff to previous 1.11 (colored)

Make command exec functions return an enum rather than -1/0/1 values and
add a new value to mean "leave client running but don't attach" to fix
problems with using some commands in a command sequence. Most of the
work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.

Revision 1.11 / (download) - annotate - [select for diffs], Tue Jul 10 11:53:01 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

xfree is not particularly helpful, remove it. From Thomas Adam.

Revision 1.10 / (download) - annotate - [select for diffs], Sun Apr 1 20:53:47 2012 UTC (12 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

Minor style nits - return ().

Revision 1.9 / (download) - annotate - [select for diffs], Sat Mar 17 22:35:09 2012 UTC (12 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.8: +4 -1 lines
Diff to previous 1.8 (colored)

Add notify hooks for various events, the functions are currently empty
stubs but will be filled in for control mode later. From George Nachman.

Revision 1.8 / (download) - annotate - [select for diffs], Sat Mar 3 08:31:18 2012 UTC (12 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.7: +30 -7 lines
Diff to previous 1.7 (colored)

Add move-pane command (like join-pane but allows the same window). Also
-b flag to join-pane and move-pane to place the pane to the left or
above. From George Nachman.

Revision 1.7 / (download) - annotate - [select for diffs], Sun Jan 23 15:49:10 2011 UTC (13 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

While here, maximum percentage is 100 not INT_MAX. Oops.

Revision 1.6 / (download) - annotate - [select for diffs], Sun Jan 23 15:46:49 2011 UTC (13 years, 3 months ago) by nicm
Branch: MAIN
Changes since 1.5: +3 -3 lines
Diff to previous 1.5 (colored)

Size is -l not -s.

Revision 1.5 / (download) - annotate - [select for diffs], Tue Jan 4 00:42:46 2011 UTC (13 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.4: +43 -155 lines
Diff to previous 1.4 (colored)

Clean up and simplify tmux command argument parsing.

Originally, tmux commands were parsed in the client process into a
struct with the command data which was then serialised and sent to the
server to be executed. The parsing was later moved into the server (an
argv was sent from the client), but the parse step and intermediate
struct was kept.

This change removes that struct and the separate parse step. Argument
parsing and printing is now common to all commands (in arguments.c) with
each command left with just an optional check function (to validate the
arguments at parse time), the exec function and a function to set up any
key bindings (renamed from the old init function).

This is overall more simple and consistent.

There should be no changes to any commands behaviour or syntax although
as this touches every command please watch for any unexpected changes.

Revision 1.4 / (download) - annotate - [select for diffs], Wed Aug 11 07:38:00 2010 UTC (13 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)

Usage string fixes from Ben Boeckel.

Revision 1.3 / (download) - annotate - [select for diffs], Sat Apr 17 23:14:17 2010 UTC (14 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.2: +4 -3 lines
Diff to previous 1.2 (colored)

Fix use-after-free of the window link when it is part of a grouped
session (and hence could have been recreated), from Micah Cowan.

Revision 1.2 / (download) - annotate - [select for diffs], Sun Apr 4 19:12:20 2010 UTC (14 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)

Should be -s for src pane.

Revision 1.1 / (download) - annotate - [select for diffs], Thu Jan 7 20:52:18 2010 UTC (14 years, 4 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7

New command, join-pane, to split and move an existing pane into the space (like
splitw then movep, or the reverse of breakp).

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.