Commit Graph

144 Commits

Author SHA1 Message Date
Nicholas Marriott
514a723f74 Solaris fixes, mostly from Dagobert Michelsen. 2017-03-09 15:39:13 +00:00
Thomas Adam
11e7915195 Reflect OBSD Makefile changes in Makefile.am 2017-02-21 09:24:53 +00:00
Nicholas Marriott
36734afdd8 Hide or fix some warnings. 2017-02-15 08:54:21 +00:00
Nicholas Marriott
0f9354eec2 Bad merge. 2017-01-25 16:38:13 +00:00
Thomas Adam
b3a724f30c Merge branch 'obsd-master'
Conflicts:
	Makefile
	tmux.c
2017-01-23 12:20:43 +00:00
Nicholas Marriott
acf331f7f1 Add b64_pton as well. 2017-01-22 19:12:15 +00:00
Nicholas Marriott
b951f0621c Put AM_* back, but this time do a dance in configure.ac so that we can keep
using CFLAGS for the tests.
2016-10-19 15:20:21 +01:00
Nicholas Marriott
3742f66abb Revert the AM_* change, I can't find a way to make AC_CHECK_HEADER use
LIBEVENT_CFLAGS.
2016-10-18 23:19:08 +01:00
Nicholas Marriott
ec47907772 I don't remember why we have make clean in dist-hook; remove it. 2016-10-18 20:41:31 +01:00
Nicholas Marriott
bd1dc89a5d *.h can go in dist_tmux_SOURCES, from Dilyan Palauzov. 2016-10-18 20:34:18 +01:00
Nicholas Marriott
ba9f47c544 Rename found_debug to enable_debug. 2016-10-18 20:19:24 +01:00
Nicholas Marriott
7d5fd5fcd0 Preserve existing AM_CPPFLAGS and AM_LDFLAGS values. 2016-10-17 21:51:21 +01:00
Nicholas Marriott
7ba845297f CFLAGS/CPPFLAGS/LDFLAGS -> AM_*, requested by Dilyan Palauzov. 2016-10-17 19:14:56 +01:00
Nicholas Marriott
e6f7180af1 tmux no longer uses openat() so we can remove the compatibilty function. 2016-10-13 22:17:29 +01:00
Nicholas Marriott
76a9e6f27b NetBSD needs _OPENBSD_SOURCE for reallocarray. 2016-10-12 10:52:04 +01:00
Nicholas Marriott
6c94774b70 Add support for using utf8proc with --enable-utf8proc, useful for platforms
(like OS X) where the system implementation is crap. From Joshua Rubin.
2016-09-01 20:40:03 +01:00
Nicholas Marriott
25e128d398 Remove duplicate daemon.c and time.h. 2016-06-27 10:57:02 +01:00
Nicholas Marriott
762fa58ce8 Merge branch 'master' of github.com:tmux/tmux 2016-05-27 18:04:45 +01:00
Nicholas Marriott
cfef0c6658 getprogname() and setproctitle() on Linux. 2016-05-27 18:04:25 +01:00
Nicholas Marriott
f2ec81cf21 Add flag for -pg. 2016-05-27 10:37:06 +01:00
Nicholas Marriott
447ead940e No more array.h. 2016-04-26 12:06:35 +01:00
Nicholas Marriott
3dfc79fb09 Tweak a comment. 2016-03-17 15:11:40 +00:00
Thomas Adam
ba97ae1737 EXTRA_DIST: add example_tmux.conf / xmalloc.h 2016-02-06 19:04:21 +00:00
Thomas Adam
5862f59ed7 Conflicts:
Makefile
2015-12-08 07:11:09 +00:00
Nicholas Marriott
f8a1f8843c Add -Wno-attributes. 2015-11-18 14:10:48 +00:00
Nicholas Marriott
a77960c540 Add reallocarray to compat. 2015-11-18 12:54:29 +00:00
Thomas Adam
3df4959f51 Merge branch 'obsd-master'
Conflicts:
	Makefile
2015-11-13 10:42:45 +00:00
Thomas Adam
da1f6fc2c8 Merge branch 'obsd-master'
Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h
2015-10-27 23:27:26 +00:00
Nicholas Marriott
166aa97f75 No more $Id$. 2015-09-14 15:59:21 +01:00
Thomas Adam
74b958ecbe Merge branch 'obsd-master'
Conflicts:
	Makefile
2015-09-14 12:42:19 +01:00
Nicholas Marriott
ef35c9f765 Add --enable-coverage for gcov. 2015-09-11 13:16:35 +01:00
Thomas Adam
cb89f2f2a1 Merge branch 'obsd-master'
Conflicts:
	Makefile
	format.c
2015-08-30 21:44:01 +01:00
Nicholas Marriott
bed3069fd7 Add _LINUX_SOURCE_COMPAT on AIX. 2015-07-14 08:14:35 +01:00
Nicholas Marriott
f7598b8a26 Only need *.ch in compat. 2015-06-05 12:44:15 +01:00
Nicholas Marriott
75061cb45d I no longer need to care about GCC 3. 2015-06-04 08:50:20 +01:00
Nicholas Marriott
32bc8f4dd4 HTML bits are now elsewhere. 2015-06-04 01:21:41 +01:00
Nicholas Marriott
8794562a85 Add tmux4.png. 2015-04-28 16:04:07 +01:00
Nicholas Marriott
bc9198072b Upload all the files. 2015-04-28 13:58:17 +01:00
Thomas Adam
94a8ef1cae Merge branch 'obsd-master'
Conflicts:
	Makefile
	tmux.1
2015-04-27 21:21:55 +01:00
Thomas Adam
be6dc83277 Revert "Add -Wno-format-nonliteral to Makefile.am"
Oh well.  This will hide legitimate programming errors, which I knew, so I'll
just have to accept that when looking through the compiler output.

This reverts commit c2bbaab2ac.
2015-02-15 21:19:51 +00:00
Thomas Adam
c2bbaab2ac Add -Wno-format-nonliteral to Makefile.am
Shut GCC up about non-literal arguments to functions which make use of
placeholder expansions (printf, strftime, etc.)
2015-02-15 20:07:48 +00:00
Thomas Adam
ffb83d23e1 Merge branch 'obsd-master'
Conflicts:
	Makefile
2015-02-14 23:54:07 +00:00
Nicholas Marriott
a9644c1f8b We do not need to add /usr/local to CPPFLAGS; if configure managed to pass then
the dependencies must already be in the search path. Reported by Romain Naour.
2015-01-12 22:46:06 +00:00
Thomas Adam
35ffd093d7 Merge branch 'obsd-master'
Conflicts:
	Makefile
	cmd-link-window.c
	cmd-unlink-window.c
2014-10-29 12:51:21 +00:00
Thomas Adam
562af864bd Merge branch 'obsd-master'
Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c
2014-10-21 07:11:44 +01:00
Nicholas Marriott
938d91d2c3 Tweak www and add RELEASE variable for current release version so we don't need
to turn it back and forth when updating.
2014-09-16 04:33:34 +01:00
Thomas Adam
92997b781a Add compat/fparseln() for non-BSD systems
Linux and friends don't natively have fparseln() so add it to compat/ and
ensure autotools can pick it up.
2014-08-09 20:31:48 +01:00
Nicholas Marriott
19cb0a1a92 Might as well still allow autoconf 2.59. 2014-06-19 23:15:06 +01:00
Nicholas Marriott
f5973b7776 Build DEBUG with -O2 as well. 2014-06-18 08:21:08 +01:00
Thomas Adam
afb4dbd465 Typo in previous: $(srcdir) 2014-04-29 23:13:51 +01:00
Thomas Adam
b096ad9f22 Makefile.am: Honour $srcdir for mdoc2man.awk
Honour out-of-tree srcdir installs when generating the man page.  Noticed by
Jon Tibble.
2014-04-29 23:10:22 +01:00
Thomas Adam
953c3ef47a Merge branch 'obsd-master'
Conflicts:
	Makefile
	tmux.1
	window.c
2014-04-23 11:26:11 +01:00
Nicholas Marriott
582c2671dd Having three *clock* files is ridiculous, remove clock.c. 2014-02-26 21:59:33 +00:00
Thomas Adam
9120df33ef dist: Call clean target before any other action
In case 'make dist' is invoked from a dirty tree which hasn't had its object
files cleaned up, clean out the tree first before tarring up the files for a
release.
2014-02-20 23:20:17 +00:00
Thomas Adam
44737b06db Fixup BSD specific things from last merge
There's entries for header files we don't use, and the cvsimport doesn't
like removing files automatically, etc., and it won't have known to have
done this from autoconf's POV, so define that in the correct place, hence
the removal of the previously committed Makefile.
2014-01-31 21:47:54 +00:00
Nicholas Marriott
e588ddb5d6 Add openat() to compat. 2013-10-10 10:27:23 +01:00
Nicholas Marriott
097a046e4a Use _XPG6 on Solaris with GCC because the headers are insane and don't like GCC
with -std=gnu99 and _XPG4_2. We should not really be using _XPG* at all but
there doesn't seem to be a magic define that says "give me the latest
standard", and things are further confused by the CMSG_DATA check in
configure.ac which sets _XOPEN_SOURCE _XOPEN_SOURCE_EXTENDED.

While here add COPYING to EXTRA_DIST.
2013-06-25 09:35:42 +01:00
Nicholas Marriott
907ad00300 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
	Makefile.am
2013-05-15 16:50:15 +01:00
Nicholas Marriott
5b1cf02f2e Rename tmux.1.in back to tmux.1 and generate tmux.1.{mdoc,man} instead. 2013-05-15 16:27:30 +01:00
Nicholas Marriott
fce095665c Use $(srcdir) for generating tmux.1, reported by fasta_ on IRC. 2013-04-28 15:37:02 +01:00
Nicholas Marriott
4f3c31a6b6 Use sysconfdir for the location of global tmux.conf (but default it to /etc),
based on changes from Dagobert Michelsen.
2013-04-24 10:57:03 +01:00
Nicholas Marriott
11b90bc959 Pass tmux.1.in to awk on stdin rather than as an argument. 2013-04-22 14:04:40 +01:00
Nicholas Marriott
792e2856c9 Add compat for cfmakeraw, from Dagobert Michelsen. 2013-04-22 09:44:15 +01:00
Nicholas Marriott
c24b58e2ee Generate tmux.1 using mdoc2man.awk on Solaris, issue brought up and changes
tested by Dagobert Michelsen.
2013-04-16 11:33:53 +01:00
Nicholas Marriott
a09d8e88fc Use -std=gnu99 not c99 with GCC. 2013-03-25 12:16:03 +00:00
Nicholas Marriott
7fd4d49d56 Add a wait-for command which blocks a client on a named channel until it is
wokrn up again (with wait-for -S). From Thiago Padilha.
2013-03-06 09:57:26 +00:00
Nicholas Marriott
3964309c67 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.
2013-02-23 22:25:58 +00:00
Nicholas Marriott
357da035b9 Merge send-prefix into send-keys. 2013-02-23 14:41:07 +00:00
Nicholas Marriott
42735d446e Merge show-buffer into save-buffer. 2013-02-23 14:23:35 +00:00
Nicholas Marriott
1ed37385c6 Use -O2 without debugging. 2013-02-22 23:37:55 +00:00
Nicholas Marriott
3108d80b7e Move NOTES->README, move Vim syntax file documentation to the file itself and
otherwise tweak some bits.
2013-02-19 23:31:04 +00:00
Nicholas Marriott
c4c98df4f2 Add -Wdeclaration-after-statement. 2013-01-30 16:35:00 +00:00
Thomas Adam
a3f4eb7b24 Merge branch 'obsd-master'
Conflicts:
	Makefile
	grid-utf8.c
2013-01-30 15:27:19 +00:00
Thomas Adam
248cd423a1 Fixup Makefile.am
Since this is just Makefile in the OpenBSD directory, pull in those trivial
changes to the templated one for use in autotools.
2012-09-04 22:50:16 +01:00
Tiago Cunha
45a2e2d6c6 Update list of sources to reflect the recent changes introduced by the
choose-tree command.
2012-07-11 17:15:23 +00:00
Tiago Cunha
dfc845e7f9 Add control.c to the list of sources. 2012-06-18 15:24:17 +00:00
Tiago Cunha
0f9f30de2e Add notify.c to the list of sources. 2012-03-18 02:24:33 +00:00
Tiago Cunha
39628e8280 Add format.c to the list of sources. 2011-09-21 16:32:31 +00:00
Nicholas Marriott
ee5e97926d Fix --enable-static and add a different check for b64_ntop that might work on
OS X.
2011-07-27 09:31:08 +00:00
Nicholas Marriott
20134fa9f4 Compatibility for b64_ntop, missing from some alternative libc. 2011-07-22 10:49:33 +00:00
Tiago Cunha
df69ee07e2 Delete subversion directories before the actual tarball is created. 2011-07-09 13:45:24 +00:00
Tiago Cunha
391f1f08c0 Expand the Id keyword. 2011-07-09 09:42:33 +00:00
Nicholas Marriott
f513898e92 PatchSet 924
Date: 2011/06/05 12:19:03
Author: nicm
Branch: HEAD
Tag: (none)
Log:
Add a respawn-pane command, from Marcel Partap.
2011-06-23 19:23:12 +00:00
Nicholas Marriott
7407459ed1 Removed file. 2011-06-23 19:22:01 +00:00
Nicholas Marriott
d37650dc4f Spacing. 2011-02-14 20:39:40 +00:00
Nicholas Marriott
38f169113e Support for HP-UX. 2011-01-21 20:35:20 +00:00
Tiago Cunha
1cb579d0fd Bring the last remaining bits of dist.mk. 2011-01-07 15:09:04 +00:00
Tiago Cunha
0fc4353fb3 Remove dead files entries. 2011-01-07 15:04:24 +00:00
Tiago Cunha
ecec113b63 cmd-generic.c isn't needed anymore due to OpenBSD patchset 829. 2011-01-07 14:50:54 +00:00
Tiago Cunha
9301eeb4dd More _SOURCES. 2011-01-07 14:46:13 +00:00
Nicholas Marriott
11dcbd7556 Support --enable-static. 2011-01-04 09:43:14 +00:00
Tiago Cunha
3689640b4e Update _SOURCES. 2011-01-03 23:54:51 +00:00
Nicholas Marriott
69f6b23945 Include all osdep-*.c in dist. 2011-01-03 23:40:21 +00:00
Nicholas Marriott
f71b3054cd Switch tmux to use autoconf and automake.
Although they suck, they suck less than the alternatives.
2010-12-31 22:12:33 +00:00