circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 17:39:09 +00:00
Code Issues Projects Releases Wiki Activity
4,924 Commits 3 Branches 37 Tags 31 MiB
218b181985
Commit Graph

308 Commits

Author SHA1 Message Date
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
nicm
0a1a88d63c Better format for printf format attributes. 2014-10-20 23:57:13 +00:00
nicm
a27ba6e380 Add xreallocarray and remove nmemb argument from xrealloc. 2014-10-08 17:35:58 +00:00
nicm
d306bbe11e Take account of window-status-separator when checking window position, 
based on diff from Balazs Kezes.
 2014-10-02 10:39:43 +00:00
Thomas Adam
3f54c9292f Merge branch 'obsd-master' 2014-04-24 12:59:00 +01:00
nicm
bec6c807cd There is no longer a need for a paste_stack struct or for global_buffers 
to be global. Move to paste.c.
 2014-04-24 09:14:43 +00:00
Thomas Adam
953c3ef47a Merge branch 'obsd-master' 
Conflicts:
	Makefile
	tmux.1
	window.c
 2014-04-23 11:26:11 +01:00
nicm
992ef70fb6 Remove the monitor-content option and associated bits and bobs. It's 
never worked very well. If there is a big demand for it to return, will
consider better ways to do it.
 2014-04-17 07:36:45 +00:00
Thomas Adam
0c99c7dbff Merge branch 'obsd-master' 
Conflicts:
	Makefile
	tty-keys.c
 2014-04-05 12:36:14 +01:00
nicm
8880bdb67c Do not replace ## with # in status_replace1 because it'll be done later 
by the format code.
 2014-04-02 17:08:23 +00:00
nicm
dca7d1c0fd Make message-limit a server option. 2014-03-31 21:41:35 +00:00
Nicholas Marriott
683ca270d4 Make message-limit a server option. 2014-03-07 15:37:01 +00:00
Thomas Adam
b3de4a3dec Merge branch 'obsd-master' 
Conflicts:
	tmux.1
	tmux.c
 2014-02-16 23:02:07 +00:00
nicm
f835be4bb2 Style nit - no space between function name and bracket. 2014-02-14 13:59:01 +00:00
nicm
d0accdba88 Check for NULL session and whatnot in status_replace, from Thomas Adam. 2014-02-14 12:37:54 +00:00
Thomas Adam
d50e47fc4a Merge branch 'obsd-master' 
Conflicts:
	Makefile
	cmd-server-info.c
	cmd-start-server.c
 2014-01-31 21:39:56 +00:00
nicm
945339b443 Allow replacing each of the many sets of separate foo-{fg,bg,attr} 
options with a single foo-style option. For example:

    set -g status-fg yellow
    set -g status-bg red
    set -g status-attr blink

Becomes:

    set -g status-style fg=yellow,bg=red,blink

The -a flag to set can be used to add to rather than replace a style. So:

    set -g status-bg red

Becomes:

    set -ag status-style bg=red

Currently this is fully backwards compatible (all *-{fg,bg,attr} options
remain) but the plan is to deprecate them over time.

From Tiago Cunha.
 2014-01-28 23:07:09 +00:00
Thomas Adam
bdea2f9eda Merge branch 'obsd-master' 2013-07-06 11:18:49 +01:00
Nicholas Marriott
7af5fec038 Whitespace nits, from Ben Boeckel. 2013-07-05 14:44:06 +00:00
Thomas Adam
399d7380a5 Merge branch 'obsd-master' 2013-05-31 21:44:42 +01:00
Nicholas Marriott
c231381aa3 Demote the old single-character replacement variables (#S and friends) 
to aliases of formats. From Tiago Cunha.
 2013-05-31 19:56:05 +00:00
Nicholas Marriott
d28a39d01d Extend jobs to support writing and use that for copy-pipe instead of 
popen, from Chris Johnsen.
 2013-03-25 11:43:01 +00:00
Nicholas Marriott
c519f9a84c evbuffer_readline returns allocated storage, don't leak it. 2013-03-22 15:55:22 +00:00
Nicholas Marriott
8d59b189cc No more lint means no more ARGSUSED. 2013-03-22 10:31:22 +00:00
Nicholas Marriott
dd46c95e23 Aargh. Spaces -> tabs. 2013-03-21 16:25:08 +00:00
Nicholas Marriott
6ddb06d372 Extend jobs to support writing and use that for copy-pipe instead of popen, 
from Chris Johnsen.
 2013-03-21 14:24:33 +00:00
Nicholas Marriott
cb6f36655e evbuffer_readline returns allocated storage, don't leak it. 2013-02-20 23:15:21 +00:00
Nicholas Marriott
c3859d1df1 Add copy-pipe mode command to copy selection and also pipe to a command. 2013-02-19 17:49:53 +00:00
Nicholas Marriott
9d165df18a No more lint means no more ARGSUSED. 2013-02-17 23:15:38 +00:00
Nicholas Marriott
755d4863c8 Spaces -> tabs. 2013-02-14 12:22:14 +00:00
Nicholas Marriott
28544391f5 Do not leak formats in status_replace. 2013-02-14 12:20:17 +00:00
Nicholas Marriott
06ac4b628d Add a format client_prefix which is 1 if prefix key has been pressed, used for 
example #{?client_prefix,X,Y}. Also a few extra server_client_status needed.
 2013-02-10 18:58:05 +00:00
Nicholas Marriott
6c53a1ed68 Allow formats in status options. 2013-02-10 18:53:25 +00:00
Thomas Adam
39631edb98 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-27 18:12:04 +00:00
Nicholas Marriott
93224260ae Add window-status-last-* options, from Boris Faure. 2012-11-27 13:52:23 +00:00
Tiago Cunha
a432fcd306 Sync OpenBSD patchset 1150: 
xfree is not particularly helpful, remove it. From Thomas Adam.
 2012-07-11 19:34:16 +00:00
Tiago Cunha
06d27e94b2 Sync OpenBSD patchset 1149: 
Move a NULL check inside a function, from Tiago Cunha.
 2012-07-11 19:30:01 +00:00
Nicholas Marriott
df912e3540 xfree is not particularly helpful, remove it. From Thomas Adam. 2012-07-10 11:53:01 +00:00
Nicholas Marriott
a3391692ad Move a NULL check inside a function, from Tiago Cunha. 2012-07-09 09:55:57 +00:00
Tiago Cunha
e45dc6ae59 Sync OpenBSD patchset 1103: 
Use int not u_char for colours from options since they may have bit 8
set to mark them as 256-colour. Reported by Chris Johnson.
 2012-05-03 17:12:38 +00:00
Nicholas Marriott
e60f48ab09 Use int not u_char for colours from options since they may have bit 8 
set to mark them as 256-colour. Reported by Chris Johnson.
 2012-04-29 07:33:41 +00:00
Tiago Cunha
6df8953f4f Sync OpenBSD patchset 1097: 
Add window-status-separator option, from Thomas Adam.
 2012-04-24 16:20:18 +00:00
Nicholas Marriott
e02d1bce98 Add window-status-separator option, from Thomas Adam. 2012-04-23 22:23:14 +00:00
Tiago Cunha
0987d55231 Sync OpenBSD patchset 1057: 
Check event_initialized before event_del if event may not have been set
up; libevent2 complains about this. Reported by Moriyoshi Koizumi.
 2012-03-18 01:59:34 +00:00
Nicholas Marriott
d3c842d367 Check event_initialized before event_del if event may not have been set 
up; libevent2 complains about this. Reported by Moriyoshi Koizumi.
 2012-03-17 18:24:07 +00:00
Tiago Cunha
32a6092f71 Sync OpenBSD patchset 1039: 
Add A and I keys for vi status line editing.
 2012-03-07 13:37:44 +00:00
Tiago Cunha
9d79a56402 Sync OpenBSD patchset 1036: 
The wlmouse offset should be part of the client, not the server. From
Ailin Nemui.
 2012-03-07 13:35:03 +00:00
Nicholas Marriott
30f4c30ca3 Add A and I keys for vi status line editing. 2012-03-04 07:38:11 +00:00
Nicholas Marriott
4b8bb7770f The wlmouse offset should be part of the client, not the server. From 
Ailin Nemui.
 2012-03-03 08:55:56 +00:00
Tiago Cunha
e4a7cefe0c Sync OpenBSD patchset 1015: 
Add an option to move the status line to the top of the screen,
requested by many.
 2012-01-29 12:57:01 +00:00