OpenBSD CVS

CVS log for src/usr.bin/tmux/cmd-if-shell.c


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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.84 / (download) - annotate - [select for diffs], Mon Oct 11 10:55:30 2021 UTC (2 years, 7 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, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, HEAD
Changes since 1.83: +2 -2 lines
Diff to previous 1.83 (colored)

Add -e flag to set environment for popup, from Alexis Hildebrandt in
GitHub issue 2924.

Revision 1.83 / (download) - annotate - [select for diffs], Wed Sep 15 07:38:30 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.82: +32 -24 lines
Diff to previous 1.82 (colored)

For the moment, restore if-shell and run-shell to parsing at the last
moment (when the shell command completes) rather than when first
invoked, GitHub issue 2872.

Revision 1.82 / (download) - annotate - [select for diffs], Thu Sep 9 13:38:32 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.81: +5 -5 lines
Diff to previous 1.81 (colored)

Expand argument to run-shell again.

Revision 1.81 / (download) - annotate - [select for diffs], Wed Aug 25 08:51:55 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.80: +15 -3 lines
Diff to previous 1.80 (colored)

Validate command argument types (string or command list) and give more
useful error messages.

Revision 1.80 / (download) - annotate - [select for diffs], Mon Aug 23 12:33:55 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.79: +39 -75 lines
Diff to previous 1.79 (colored)

Move command argument parsing common functions and don't bother to parse
again if given a command rather than a string.

Revision 1.79 / (download) - annotate - [select for diffs], Sat Aug 21 17:25:32 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.78: +1 -3 lines
Diff to previous 1.78 (colored)

Stop caring about empty commands, just treat as a null command.

Revision 1.78 / (download) - annotate - [select for diffs], Sat Aug 21 10:22:39 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.77: +2 -2 lines
Diff to previous 1.77 (colored)

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

Revision 1.77 / (download) - annotate - [select for diffs], Fri Aug 20 19:50:16 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.76: +11 -12 lines
Diff to previous 1.76 (colored)

Hide struct args behind a couple of accessor functions.

Revision 1.76 / (download) - annotate - [select for diffs], Fri Aug 13 06:50:42 2021 UTC (2 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.75: +1 -6 lines
Diff to previous 1.75 (colored)

Set return code for confirm-before and make command-prompt also block,
GitHub issue 2822.

Revision 1.75 / (download) - annotate - [select for diffs], Tue Mar 2 10:56:45 2021 UTC (3 years, 2 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.74: +2 -2 lines
Diff to previous 1.74 (colored)

Drop support for popups where the content is provided directly to tmux
(which does not have many practical uses) and only support running a
program in the popup. display-popup is now simpler and can accept
multiple arguments to avoid escaping problems (like the other commands).

Revision 1.74 / (download) - annotate - [select for diffs], Mon Apr 13 20:51:57 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.73: +6 -6 lines
Diff to previous 1.73 (colored)

Make client -c and -t handling common in cmd-queue.c and try to be
clearer about whether the client is the target client (must have a
session) or not.

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

Add helpers for the simple case of parse string and add to command queue.

Revision 1.72 / (download) - annotate - [select for diffs], Mon Apr 13 15:55:51 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.71: +11 -8 lines
Diff to previous 1.71 (colored)

When adding a list of commands to the queue, instead of automatically
creating a new state for each group of commands, require the caller to
create one and use it for all the commands in the list. This means the
current target works even with list with multiple groups (which can
happen if they are defined with newlines).

Revision 1.71 / (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.70: +8 -8 lines
Diff to previous 1.70 (colored)

Move cmdq_state into cmd-queue.c.

Revision 1.70 / (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.69: +3 -3 lines
Diff to previous 1.69 (colored)

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

Revision 1.69 / (download) - annotate - [select for diffs], Mon Apr 13 13:42:35 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.68: +2 -2 lines
Diff to previous 1.68 (colored)

Store a key event not a mouse event in the shared data.

Revision 1.68 / (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.67: +12 -12 lines
Diff to previous 1.67 (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.67 / (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.66: +7 -9 lines
Diff to previous 1.66 (colored)

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

Revision 1.66 / (download) - annotate - [select for diffs], Thu Mar 19 13:43:18 2020 UTC (4 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.65: +3 -2 lines
Diff to previous 1.65 (colored)

Add a flag to run a background process in a pty as well, not used for
anything yet.

Revision 1.65 / (download) - annotate - [select for diffs], Wed Jul 17 17:49:23 2019 UTC (4 years, 10 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.64: +5 -2 lines
Diff to previous 1.64 (colored)

Use the right client for if -b.

Revision 1.64 / (download) - annotate - [select for diffs], Tue Jun 18 11:08:42 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.63: +2 -2 lines
Diff to previous 1.63 (colored)

Add a cmdq_continue function rather than twiddling the flag directly.

Revision 1.63 / (download) - annotate - [select for diffs], Wed Jun 12 08:47:07 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.62: +8 -7 lines
Diff to previous 1.62 (colored)

Pass target on to new commands with if -F.

Revision 1.62 / (download) - annotate - [select for diffs], Sat May 25 07:15:53 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.61: +4 -4 lines
Diff to previous 1.61 (colored)

Fix error handling in if-shell.

Revision 1.61 / (download) - annotate - [select for diffs], Thu May 23 11:13:30 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.60: +59 -34 lines
Diff to previous 1.60 (colored)

Replace the split parser code (cfg.c and cmd-string.c) with a single
parser using yacc(1). This is a major change but is clearer and simpler
and allows some edge cases to be made more consistent, as well as
tidying up how aliases are handled. It will also allow some further
improvements later.

Entirely the same parser is now used for parsing the configuration file
and for string commands. This means that constructs previously only
available in .tmux.conf, such as %if, can now be used in string commands
(for example, those given to if-shell - not commands invoked from the
shell, they are still parsed by the shell itself).

The only syntax change I am aware of is that #{} outside quotes or a
comment is now considered a format and not a comment, so #{ is now a
syntax error (notably, if it is at the start of a line).

This also adds two new sections to the man page documenting the syntax
and outlining how parsing and command execution works.

Thanks to everyone who sent me test configs (they still all parse
without errors - but this doesn't mean they still work as intended!).

Thanks to Avi Halachmi for testing and man page improvements, also to
jmc@ for reviewing the man page changes.

Revision 1.60 / (download) - annotate - [select for diffs], Mon Aug 27 11:03:34 2018 UTC (5 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.59: +8 -3 lines
Diff to previous 1.59 (colored)

Memory leaks, from Gang Fan in GitHub issue 1453.

Revision 1.59 / (download) - annotate - [select for diffs], Thu Aug 23 15:45:05 2018 UTC (5 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.58: +5 -3 lines
Diff to previous 1.58 (colored)

Move job struct into job.c.

Revision 1.58 / (download) - annotate - [select for diffs], Thu May 24 09:42:49 2018 UTC (5 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.57: +3 -11 lines
Diff to previous 1.57 (colored)

Make server_client_get_cwd used (almost) everywhere we need to work out
the cwd, and do not fall back to "." as it is pretty useless. GitHub
issue 1331.

Revision 1.57 / (download) - annotate - [select for diffs], Thu Mar 8 08:09:10 2018 UTC (6 years, 2 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.56: +2 -2 lines
Diff to previous 1.56 (colored)

Add a missing client-detached hook when the server shuts down, and do
not exit until jobs started from run-shell/if-shell have finished (add a
job flags member and a flag to indicate other jobs). GitHub issue 1245.

Revision 1.56 / (download) - annotate - [select for diffs], Tue Apr 25 11:49:35 2017 UTC (7 years ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.55: +5 -17 lines
Diff to previous 1.55 (colored)

if-shell doesn't need to queue its error message into a callback, and in
fact it can't do so because the item it was working with will have been
freed. Reported by Daniel Hahler.

Revision 1.55 / (download) - annotate - [select for diffs], Sat Apr 22 10:22:39 2017 UTC (7 years ago) by nicm
Branch: MAIN
Changes since 1.54: +6 -6 lines
Diff to previous 1.54 (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.54 / (download) - annotate - [select for diffs], Sat Apr 22 06:27:15 2017 UTC (7 years ago) by nicm
Branch: MAIN
Changes since 1.53: +5 -3 lines
Diff to previous 1.53 (colored)

Fix if-shell without a client (so in the config file). Reported by Theo
Buehler.

Revision 1.53 / (download) - annotate - [select for diffs], Fri Apr 21 14:01:19 2017 UTC (7 years ago) by nicm
Branch: MAIN
Changes since 1.52: +4 -3 lines
Diff to previous 1.52 (colored)

Store state shared between multiple commands in the queue in a shared
structure.

Revision 1.52 / (download) - annotate - [select for diffs], Thu Apr 20 09:20:22 2017 UTC (7 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.51: +3 -3 lines
Diff to previous 1.51 (colored)

If a #() command doesn't exit, use its most recent line of output (it
must be a full line). Don't let it redraw the status line more than once
a second.

Requested by someone about 10 years ago...

Revision 1.51 / (download) - annotate - [select for diffs], Wed Mar 8 13:36:12 2017 UTC (7 years, 2 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.50: +3 -7 lines
Diff to previous 1.50 (colored)

Add a helper function for the most common format_create/defaults/expand
pattern.

Revision 1.50 / (download) - annotate - [select for diffs], Fri Feb 3 11:57:27 2017 UTC (7 years, 3 months ago) by nicm
Branch: MAIN
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)

Add a window or pane id "tag" to each format tree and use it to separate
jobs, this means that if the same job is used for different windows or
panes (for example in pane-border-format), it will be run separately for
each pane.

Revision 1.49 / (download) - annotate - [select for diffs], Sun Jan 15 22:00:56 2017 UTC (7 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.48: +5 -3 lines
Diff to previous 1.48 (colored)

It is silly for cmd_list_parse to return an integer error when it could
just return NULL.

Revision 1.48 / (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.47: +34 -34 lines
Diff to previous 1.47 (colored)

Mass rename struct cmd_q to struct cmdq_item and related.

Revision 1.47 / (download) - annotate - [select for diffs], Sun Oct 16 17:55:14 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.46: +50 -62 lines
Diff to previous 1.46 (colored)

Rewrite command queue handling. Each client still has a command queue,
but there is also now a global command queue. Instead of command queues
being dispatched on demand from wherever the command happens to be
added, they are now all dispatched from the top level server
loop. Command queues may now also include callbacks as well as commands,
and items may be inserted after the current command as well as at the end.

This all makes command queues significantly more predictable and easier
to use, and avoids the complex multiple nested command queues used by
source-file, if-shell and friends.

A mass rename of struct cmdq to a better name (cmdq_item probably) is
coming.

Revision 1.46 / (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.45: +1 -2 lines
Diff to previous 1.45 (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.45 / (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.44: +9 -9 lines
Diff to previous 1.44 (colored)

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

Revision 1.44 / (download) - annotate - [select for diffs], Sun Oct 9 08:06:51 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.43: +15 -3 lines
Diff to previous 1.43 (colored)

Pass file/line to new command for if-shell so that errors appear
sensibly.

Revision 1.43 / (download) - annotate - [select for diffs], Fri Apr 29 17:12:12 2016 UTC (8 years ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.42: +2 -2 lines
Diff to previous 1.42 (colored)

Expand client formats (like run-shell), from Stephen M Coakley.

Revision 1.42 / (download) - annotate - [select for diffs], Fri Apr 29 14:05:24 2016 UTC (8 years ago) by nicm
Branch: MAIN
Changes since 1.41: +2 -1 lines
Diff to previous 1.41 (colored)

Final parts of command hooks, add before- and after- hooks to each command.

Revision 1.41 / (download) - annotate - [select for diffs], Tue Mar 1 12:06:07 2016 UTC (8 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.40: +2 -3 lines
Diff to previous 1.40 (colored)

Remove some more unused variables, and use RB_FOREACH_SAFE in
key_bindings_unref_table.

Revision 1.40 / (download) - annotate - [select for diffs], Mon Dec 14 00:31:54 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.39: +4 -2 lines
Diff to previous 1.39 (colored)

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

Revision 1.39 / (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.38: +10 -6 lines
Diff to previous 1.38 (colored)

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

Revision 1.38 / (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.37: +12 -23 lines
Diff to previous 1.37 (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.37 / (download) - annotate - [select for diffs], Fri Dec 11 12:27:36 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.36: +2 -2 lines
Diff to previous 1.36 (colored)

Add cmdq as an argument to format_create and add a format for the
command name (will also be used for more later).

Revision 1.36 / (download) - annotate - [select for diffs], Tue Dec 8 08:34:18 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)

Remove format_create_flags and just pass flags to format_create.

Revision 1.35 / (download) - annotate - [select for diffs], Fri Nov 20 22:02:54 2015 UTC (8 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.34: +2 -1 lines
Diff to previous 1.34 (colored)

Memory leaks and an uninitialized part of utf8_data, from Patrick Palka.

Revision 1.34 / (download) - annotate - [select for diffs], Sat Oct 31 08:13:58 2015 UTC (8 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 (colored)

Because pledge(2) does not allow us to pass directory file descriptors
around, we can't use file descriptors for the working directory because
we will be unable to pass it to a privileged process to tell it where to
read or write files or spawn children. So move tmux back to using
strings for the current working directory. We try to check it exists
with access() when it is set but ultimately fall back to ~ if it fails
at time of use (or / if that fails too).

Revision 1.33 / (download) - annotate - [select for diffs], Wed Sep 16 22:24:54 2015 UTC (8 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)

Rename cmd_q dead flag to a general flags bitmask (will be more flags later).

Revision 1.32 / (download) - annotate - [select for diffs], Fri Apr 24 22:19:36 2015 UTC (9 years ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.31: +13 -4 lines
Diff to previous 1.31 (colored)

Set working directory for run-shell and if-shell.

Revision 1.31 / (download) - annotate - [select for diffs], Tue Apr 21 21:31:02 2015 UTC (9 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.30: +9 -8 lines
Diff to previous 1.30 (colored)

The free callback could end up being fired before the done callback
(happens on Cygwin), so use a reference count instead of a single
flag. SF bug 188 reported by "iceboy".

Revision 1.30 / (download) - annotate - [select for diffs], Tue Apr 21 15:18:06 2015 UTC (9 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.29: +14 -8 lines
Diff to previous 1.29 (colored)

Pass mouse events through to commands for if-shell.

Revision 1.29 / (download) - annotate - [select for diffs], Sun Apr 19 21:34:21 2015 UTC (9 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

Rewrite of tmux mouse support which was a mess. Instead of having
options for "mouse-this" and "mouse-that", mouse events may be bound as
keys and there is one option "mouse" that turns on mouse support
entirely (set -g mouse on).

See the new MOUSE SUPPORT section of the man page for description of the
key names and new flags (-t= to specify the pane or window under mouse
as a target, and send-keys -M to pass through a mouse event).

The default builtin bindings for the mouse are:

    bind -n   MouseDown1Pane select-pane -t=; send-keys -M
    bind -n MouseDown1Status select-window -t=
    bind -n   MouseDrag1Pane copy-mode -M
    bind -n MouseDrag1Border resize-pane -M

To get the effect of turning mode-mouse off, do:

    unbind -n MouseDrag1Pane
    unbind -temacs-copy MouseDrag1Pane

The old mouse options are now gone, set-option -q may be used to
suppress warnings if mixing configuration files.

Revision 1.28 / (download) - annotate - [select for diffs], Thu Feb 5 10:29:43 2015 UTC (9 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.27: +2 -7 lines
Diff to previous 1.27 (colored)

Wrap all the individual format_* calls in a single format_defaults
functions.

Revision 1.27 / (download) - annotate - [select for diffs], Tue Dec 2 23:39:02 2014 UTC (9 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.26: +25 -4 lines
Diff to previous 1.26 (colored)

Add -F to if-shell to allow it to be used to check for format or option
values rather than executing a command.

Revision 1.26 / (download) - annotate - [select for diffs], Mon Oct 20 22:29:25 2014 UTC (9 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.25: +1 -2 lines
Diff to previous 1.25 (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.25 / (download) - annotate - [select for diffs], Thu Oct 10 12:04:38 2013 UTC (10 years, 7 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.24: +4 -1 lines
Diff to previous 1.24 (colored)

Make cmdq->client_exit a tristate (-1 means "not set") so that if
explicitly set it can be copied from child to parent cmdq by if-shell
and source-file. This fixes using attach or new. From Chris Johnsen.

Revision 1.24 / (download) - annotate - [select for diffs], Thu Oct 10 12:00:19 2013 UTC (10 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.23: +1 -2 lines
Diff to previous 1.23 (colored)

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

Revision 1.23 / (download) - annotate - [select for diffs], Mon Mar 25 16:04:07 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.22: +10 -1 lines
Diff to previous 1.22 (colored)

Try to establish client for run-shell and if-shell if no -t.

Revision 1.22 / (download) - annotate - [select for diffs], Mon Mar 25 11:43:01 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)

Extend jobs to support writing and use that for copy-pipe instead of
popen, from Chris Johnsen.

Revision 1.21 / (download) - annotate - [select for diffs], Mon Mar 25 11:36:42 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.20: +12 -10 lines
Diff to previous 1.20 (colored)

Fix if-shell and run-shell if there are no sessions. Batted around
through several people, finished off by Chris Johnsen.

Revision 1.20 / (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.19: +57 -22 lines
Diff to previous 1.19 (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.19 / (download) - annotate - [select for diffs], Sun Mar 24 09:33:35 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.18: +20 -4 lines
Diff to previous 1.18 (colored)

Expand format variables in the run-shell and if-shell shell commands,
from Thiago Padilha.

Revision 1.18 / (download) - annotate - [select for diffs], Fri Mar 22 15:49:55 2013 UTC (11 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.17: +8 -14 lines
Diff to previous 1.17 (colored)

Add functions to allocate and free command contexts rather than doing it
all on the stack.

Revision 1.17 / (download) - annotate - [select for diffs], Sat Aug 11 07:32:16 2012 UTC (11 years, 9 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.16: +1 -3 lines
Diff to previous 1.16 (colored)

Remove dead code, from Sean Estabrooks.

Revision 1.16 / (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_2_BASE, OPENBSD_5_2
Changes since 1.15: +4 -4 lines
Diff to previous 1.15 (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.15 / (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.14: +6 -6 lines
Diff to previous 1.14 (colored)

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

Revision 1.14 / (download) - annotate - [select for diffs], Thu Oct 27 22:40:15 2011 UTC (12 years, 6 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.13: +8 -20 lines
Diff to previous 1.13 (colored)

Didn't really think the else behaviour through - requiring argv to
contain "else" is silly so just omit that, also some manpage
tweaks. From Tiago Cunha.

Revision 1.13 / (download) - annotate - [select for diffs], Tue Oct 18 08:57:01 2011 UTC (12 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.12: +33 -11 lines
Diff to previous 1.12 (colored)

Add an else clause for if-shell, from "arno-" on SourceForge.

Revision 1.12 / (download) - annotate - [select for diffs], Wed May 25 17:50:52 2011 UTC (12 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.11: +2 -6 lines
Diff to previous 1.11 (colored)

Nuke a redundant if statement, from Tiago Cunha.

Revision 1.11 / (download) - annotate - [select for diffs], Wed Jan 26 01:54:56 2011 UTC (13 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.10: +3 -5 lines
Diff to previous 1.10 (colored)

Simplify the way jobs work and drop the persist type, so all jobs are
fire-and-forget.

Status jobs now managed with two trees of output (new and old), rather
than storing the output in the jobs themselves. When the status line is
processed any jobs which don't appear in the new tree are started and
the output from the old tree displayed. When a job finishes it updates
the new tree with its output and that is used for any subsequent
redraws. When the status interval expires, the new tree is moved to the
old so that all jobs are run again.

This fixes the "#(echo %H:%M:%S)" problem which would lead to thousands
of identical persistent jobs and high memory use (this can still be
achieved by adding "sleep 30" but that is much less likely to happen by
accident).

Revision 1.10 / (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.9: +9 -10 lines
Diff to previous 1.9 (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.9 / (download) - annotate - [select for diffs], Sat Jul 24 20:11:59 2010 UTC (13 years, 9 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.8: +2 -3 lines
Diff to previous 1.8 (colored)

When changing so that the client passes its stdout and stderr as well as
stdin up to the server, I forgot one essential point - the tmux server
could now be both the producer and consumer. This happens when tmux is
run inside tmux, as well as when piping tmux commands together.

So, using stdio(3) was a bad idea - if sufficient data was written, this
could block in write(2). When that happened and the server was both
producer and consumer, it deadlocks.

Change to use libevent bufferevents for the client stdin, stdout and
stderr instead. This is trivial enough for output but requires a
callback mechanism to trigger when stdin is finished.

This relies on the underlying polling mechanism for libevent to work
with whatever devices to which the user could redirect stdin, stdout or
stderr, hence the change to use poll(2) over kqueue(2) for tmux.

Revision 1.8 / (download) - annotate - [select for diffs], Sun Jul 11 17:06:45 2010 UTC (13 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.7: +5 -2 lines
Diff to previous 1.7 (colored)

Return the command client return code with MSG_EXIT now that MSG_ERROR and
MSG_PRINT are unused.

New clients should be compatible with old tmux servers but vice versa may print
an error.

Revision 1.7 / (download) - annotate - [select for diffs], Fri Nov 13 19:53:29 2009 UTC (14 years, 6 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

Get rid of the ugly CMD_CHFLAG macro and use a const string (eg "dDU") in the
command entry structs and a couple of functions to check/set the flags.

Revision 1.6 / (download) - annotate - [select for diffs], Sun Nov 1 23:20:37 2009 UTC (14 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.5: +3 -5 lines
Diff to previous 1.5 (colored)

Add a flag for jobs that shouldn't be freed after they've died and use it for
status jobs, then only kill those jobs when status-left, status-right or
set-titles-string is changed.

Fixes problems with changing options from inside #().

Revision 1.5 / (download) - annotate - [select for diffs], Sun Oct 11 09:10:57 2009 UTC (14 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.4: +54 -86 lines
Diff to previous 1.4 (colored)

Convert if-shell over to the background job framework as well.

Revision 1.4 / (download) - annotate - [select for diffs], Mon Sep 21 15:32:06 2009 UTC (14 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)

Use KEYC_NONE constant instead of 0 on init.

Revision 1.3 / (download) - annotate - [select for diffs], Sun Jul 26 12:58:44 2009 UTC (14 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.2: +1 -26 lines
Diff to previous 1.2 (colored)

Make all messages sent between the client and server fixed size.

This is the first of two changes to make the protocol more resilient and less
sensitive to other changes in the code, particularly with commands. The client
now packs argv into a buffer and sends it to the server for parsing, rather
than doing it itself and sending the parsed command data.

As a side-effect this also removes a lot of now-unused command marshalling
code.

Mixing a server without this change and a client with or vice versa will cause
tmux to hang or crash, please ensure that tmux is entirely killed before
upgrading.

Revision 1.2 / (download) - annotate - [select for diffs], Mon Jul 13 23:11:35 2009 UTC (14 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)

Having fixed flags for single-character getopt options is a bit hard to
maintain and is only going to get worse as more are used. So instead, add a new
uint64_t member to cmd_entry which is a bitmask of upper and lowercase options
accepted by the command.

This means new single character options can be used without the need to add it
explicitly to the list.

Revision 1.1 / (download) - annotate - [select for diffs], Thu Jul 9 15:47:49 2009 UTC (14 years, 10 months ago) by nicm
Branch: MAIN

New command, if-shell (alias if). Executes the tmux command in the second
argument if the shell command in the first succeeds, for example:

       if "[ -e ~/.tmux.conf.alt ]" "source .tmux.conf.alt"

Written by Tiago Cunha, many thanks.

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.