aboutsummaryrefslogtreecommitdiff
path: root/cmd-join-pane.c
Commit message (Collapse)AuthorAge
* Merge branch 'obsd-master'Thomas Adam2017-04-22
|\
| * Get rid of the extra layer of flags and cmd_prepare() and just store thenicm2017-04-22
| | | | | | | | | | | | 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.
| * Mouse bindings and hooks set up an initial current state when running anicm2017-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'obsd-master'Thomas Adam2016-10-17
|\|
| * Use the notify name string instead of going via an enum and changenicm2016-10-16
| | | | | | | | existing hooks to use notifys instead.
* | Merge branch 'obsd-master'Thomas Adam2016-10-16
|\|
| * Mass rename struct cmd_q to struct cmdq_item and related.nicm2016-10-16
| |
* | Merge branch 'obsd-master'Thomas Adam2016-10-14
|\|
| * Trying to do hooks generically is way too complicated and unreliable andnicm2016-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'obsd-master'Thomas Adam2016-10-13
|\|
| * Some improvements and bug fixes for hooks:nicm2016-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | Merge branch 'obsd-master'Thomas Adam2016-10-12
|\| | | | | | | | | | | Conflicts: format.c osdep-openbsd.c
| * Add static in cmd-* and fix a few other nits.nicm2016-10-10
| |
* | Merge branch 'obsd-master'Thomas Adam2016-09-04
|\|
| * Add support for performing a full width split (with splitw -f), rathernicm2016-09-04
| | | | | | | | than splitting the current cell. From Stephen Kent.
* | Merge branch 'obsd-master'Thomas Adam2016-08-28
|\|
| * Kill empty window after moving pane and updating current window, so thatnicm2016-08-27
| | | | | | | | | | index is still valid before renumber-windows happens. Fixes issue reported by Eric Pruitt.
* | Merge branch 'obsd-master'Thomas Adam2016-01-19
|\|
| * I no longer use my SourceForge address so replace it.nicm2016-01-19
| |
* | Merge branch 'obsd-master'Thomas Adam2015-12-14
|\|
| * Instead of combined flags for -c, -s, -t, split into different setsnicm2015-12-14
| | | | | | | | using an enum and simplify the parsing code.
* | Merge branch 'obsd-master'Thomas Adam2015-12-13
|\|
| * Use member names in cmd_entry definitions so I stop getting confusednicm2015-12-13
| | | | | | | | about the order.
* | Merge branch 'obsd-master'Thomas Adam2015-12-13
|\|
| * Instead of every command resolving the target (-t or -s) itself, preparenicm2015-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'obsd-master'Thomas Adam2015-06-19
|\|
| * Use the SRCDST define for usage.nicm2015-06-18
| |
* | Merge branch 'obsd-master'Thomas Adam2015-06-04
|\|
| * Add support for a single "marked pane". There is one marked pane in thenicm2015-06-04
| | | | | | | | | | | | | | | | | | 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).
* | No need for $Id$ now.Nicholas Marriott2014-11-08
| |
* | Merge branch 'obsd-master'Thomas Adam2014-10-21
|\| | | | | | | | | | | | | | | | | | | Conflicts: Makefile cmd-list-commands.c cmd-suspend-client.c job.c tmux.h xmalloc.c
| * Instead of setting up the default keys by building the key structnicm2014-10-20
| | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'obsd-master'Thomas Adam2014-04-23
|\| | | | | | | | | | | | | Conflicts: Makefile tmux.1 window.c
| * Correct the dance to fix the active pane in join-pane by pulling thenicm2014-04-17
| | | | | | | | | | (right) code from break-pane and window_remove_pane into a helper function.
| * Remove the barely-used and unnecessary command check() function.nicm2013-10-10
| |
| * Add resize-pane -Z to temporary zoom the active pane to occupy the fullNicholas Marriott2013-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Add a command queue to standardize and simplify commands that call otherNicholas Marriott2013-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Make command exec functions return an enum rather than -1/0/1 values andNicholas Marriott2012-07-11
| | | | | | | | | | | | 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.
| * xfree is not particularly helpful, remove it. From Thomas Adam.Nicholas Marriott2012-07-10
| |
| * Minor style nits - return ().Nicholas Marriott2012-04-01
| |
| * Add notify hooks for various events, the functions are currently emptyNicholas Marriott2012-03-17
| | | | | | | | stubs but will be filled in for control mode later. From George Nachman.
| * Add move-pane command (like join-pane but allows the same window). AlsoNicholas Marriott2012-03-03
| | | | | | | | | | -b flag to join-pane and move-pane to place the pane to the left or above. From George Nachman.
| * While here, maximum percentage is 100 not INT_MAX. Oops.Nicholas Marriott2011-01-23
| |
| * Size is -l not -s.Nicholas Marriott2011-01-23
| |
| * Clean up and simplify tmux command argument parsing.Nicholas Marriott2011-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Usage string fixes from Ben Boeckel.Nicholas Marriott2010-08-11
| |
| * Fix use-after-free of the window link when it is part of a groupedNicholas Marriott2010-04-17
| | | | | | | | session (and hence could have been recreated), from Micah Cowan.
| * Should be -s for src pane.Nicholas Marriott2010-04-04
| |
| * New command, join-pane, to split and move an existing pane into the space (likeNicholas Marriott2010-01-07
| | | | splitw then movep, or the reverse of breakp).
* Remove the barely-used and unnecessary command check() function.Nicholas Marriott2013-08-21
|