summaryrefslogtreecommitdiffstats
path: root/cfg.c
AgeCommit message (Collapse)Author
2015-05-09Merge branch 'obsd-master'Thomas Adam
Conflicts: tmux.h
2015-05-07Style spacing nits.nicm
2015-04-28Merge branch 'obsd-master'Thomas Adam
2015-04-27Reset cfg_ncauses to 0 as well or we could allocate the wrong size ifnicm
called again.
2015-04-27Merge branch 'obsd-master'Thomas Adam
Conflicts: Makefile tmux.1
2015-04-25Merge branch 'obsd-master'Thomas Adam
2015-04-25Fix some char* -> char *.nicm
2015-04-25Use a char **,u_int pair for cfg_causes.nicm
2015-04-20Merge branch 'obsd-master'Thomas Adam
2015-04-19Rewrite of tmux mouse support which was a mess. Instead of havingnicm
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.
2014-11-08No need for $Id$ now.Nicholas Marriott
2014-10-29Merge branch 'obsd-master'Thomas Adam
Conflicts: Makefile cmd-link-window.c cmd-unlink-window.c
2014-10-27Move cfg_causes local into cfg.c and remove struct causelist.nicm
2014-08-09Add compat/fparseln() for non-BSD systemsThomas Adam
Linux and friends don't natively have fparseln() so add it to compat/ and ensure autotools can pick it up.
2014-08-09Merge branch 'obsd-master'Thomas Adam
Conflicts: client.c
2014-06-25Handle escaped back slashes and missing new lines at end of line by usingtobias
fparseln instead of reimplementing it on our own. with input by and ok nicm@
2014-04-23Merge branch 'obsd-master'Thomas Adam
Conflicts: Makefile tmux.1 window.c
2014-04-17Remove some unnecessary includes and fix a typo.nicm
2013-11-14Merge branch 'obsd-master'Thomas Adam
2013-10-20Do not run any command line command from the client which starts thenicm
server until after the configuration file completes. This prevents it racing against run-shell or if-shell in .tmux.conf that run in the background.
2013-03-25Add some additional debug logging.Nicholas Marriott
2013-03-24Add a command queue to standardize and simplify commands that call otherNicholas Marriott
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.
2013-03-22Need to set clients in context before changing their reference count.Nicholas Marriott
2013-03-22load_cfg can actually use the same context now they are reference counted.Nicholas Marriott
2013-03-22Don't try to print unterminated strings when loading configuration file.Nicholas Marriott
2013-03-22No more lint means no more ARGSUSED.Nicholas Marriott
2013-03-21Fix a couple of memory leaks, from Romain Francoise.Nicholas Marriott
2013-03-05Add some additional debug logging.Nicholas Marriott
2013-02-23Add a command queue to standardize and simplify commands that call otherNicholas Marriott
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.
2013-02-20Need to set clients in context before changing their reference count.Nicholas Marriott
2013-02-19Don't try to print unterminated strings when loading configuration file.Nicholas Marriott
2013-02-18load_cfg can actually use the same context now they are reference counted.Nicholas Marriott
2013-02-18Add functions to allocate and free command contexts rather than doing it all onNicholas Marriott
the stack.
2013-02-17No more lint means no more ARGSUSED.Nicholas Marriott
2013-02-16Fix a couple of memory leaks, from Romain Francoise.Nicholas Marriott
2012-12-31Merge branch 'obsd-master'Thomas Adam
Sync from OpenBSD.
2012-12-13Change load_cfg to fix a crash reported by jasper.Nicholas Marriott
2012-12-08Merge branch 'obsd-master'Thomas Adam
Sync from OpenBSD.
2012-12-06Use strlcat not strncat in load_cfg and some other trivial tidying fromNicholas Marriott
Tiago Cunha.
2012-11-27Fix return value of load_cfg, from Thomas Adam.Nicholas Marriott
2012-11-27Merge branch 'obsd-master'Thomas Adam
Sync from OpenBSD.
2012-11-27Correctly aggregate together errors from nested config files (withNicholas Marriott
source-file). Fix by Thomas Adam, reported by Sam Livingstone-Gray
2012-11-22Merge branch 'obsd-master'Thomas Adam
Sync from OpenBSD. * obsd-master: Add halfpage commands to mode command string table (missed by accident), from Thomas Adam. Clarify some points about config files, notably that they are only read at server start. From Thomas Adam. Use a utility function for common code to show errors in config file, from Thomas Adam.
2012-11-19Use a utility function for common code to show errors in config file,Nicholas Marriott
from Thomas Adam.
2012-07-11Sync OpenBSD patchset 1151:Tiago Cunha
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.
2012-07-11Sync OpenBSD patchset 1150:Tiago Cunha
xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-11Make command exec functions return an enum rather than -1/0/1 values andNicholas Marriott
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.
2012-07-10xfree is not particularly helpful, remove it. From Thomas Adam.Nicholas Marriott
2012-05-22Sync OpenBSD patchset 1113:Tiago Cunha
Ignore line continuation when escaped as \\, from Simon Nicolussi.
2012-05-17Ignore line continuation when escaped as \\, from Simon Nicolussi.Nicholas Marriott