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
a27ba6e380
Add xreallocarray and remove nmemb argument from xrealloc.
2014-10-08 17:35:58 +00:00
nicm
77efcf8bdd
Use xrealloc(NULL, n, m) instead of xmalloc(n * m) to get overflow
...
check.
2014-10-08 17:14:04 +00:00
Thomas Adam
2874a431c0
Merge branch 'obsd-master'
2014-09-25 11:29:54 +01:00
nicm
21062d74d5
Fix some comments (c -> colour) and join unnecessary line splits.
2014-09-17 15:31:38 +00:00
nicm
4e956d545a
Various minor style and spacing nits.
2014-09-01 21:50:18 +00:00
Thomas Adam
953c3ef47a
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.1
window.c
2014-04-23 11:26:11 +01:00
nicm
5acee1c04e
Memory leak in error path and unnecessary assignment, from clang.
2014-04-16 23:05:38 +00:00
nicm
7bdb675469
GRID_DEBUG is no longer needed.
2014-03-31 21:42:27 +00:00
Nicholas Marriott
c5a30513ed
GRID_DEBUG is no longer needed.
2014-03-07 15:51:27 +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
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
nicm
3368b602a8
Couple of fixes from cppcheck via Tiago Cunha.
2014-01-15 11:44:18 +00:00
nicm
994cb872cf
Style and comment fixes from Tiago Cunha.
2014-01-09 13:58:06 +00:00
nicm
1b7c2dd056
Trivial style and spacing nits.
2013-10-10 12:01:14 +00:00
nicm
7839993fe7
Only include actual trailing spaces not unused cells with capturep -J,
...
from George Nachman.
2013-10-10 11:49:29 +00:00
Nicholas Marriott
f2675cdf04
Trivial style and spacing nits.
2013-08-21 18:35:01 +01:00
Nicholas Marriott
2dfd3fbd71
Only include actual trailing spaces not unused cells with capturep -J, from
...
George Nachman.
2013-08-01 23:47:45 +01:00
Nicholas Marriott
b5fda7ad2a
Spacing, warning nits.
2013-03-25 12:00:30 +00:00
Nicholas Marriott
304336a591
Allow lastgc to be NULL in grid_string_cells so find-window doesn't
...
crash, problem reported by eugene everson.
2013-03-25 10:07:40 +00:00
Nicholas Marriott
295d86911e
Add -C and -J to capture pane to escape control sequences and to join
...
wrapped line, based on a diff from George Nachman.
2013-03-22 15:56:11 +00:00
Nicholas Marriott
9b7e18f166
Rework reflow code so it does not do so much allocation which should be
...
faster with large histories.
2013-03-21 16:12:10 +00:00
Nicholas Marriott
ec75f9d1a3
Allow lastgc to be NULL in grid_string_cells so find-window doesn't crash,
...
problem reported by eugene everson.
2013-03-06 09:56:31 +00:00
Nicholas Marriott
aaeee34c32
Preserve trailing spaces with capture-pane -J, from George Nachman.
2013-03-04 11:03:03 +00:00
Nicholas Marriott
234f6d27c1
Use \\ not \ for escaping \.
2013-02-24 07:49:54 +00:00
Nicholas Marriott
b8b5631d9d
Add -C and -J to capture pane to escape control sequences and to join wrapped
...
line, based on a diff from George Nachman.
2013-02-21 09:35:01 +00:00
Nicholas Marriott
e487b87f6f
Clear last attributes after reset in string_cells, from George Nachman.
2013-02-20 09:34:21 +00:00
Nicholas Marriott
4d1d4d6e8e
Add -e flag to capture-pane to include embedded ANSI SGR escape sequences, from
...
George Nachman.
2013-02-19 09:55:02 +00:00
Nicholas Marriott
99cc0015f8
Rework reflow code so it does not do so much allocation which should be faster
...
with large histories.
2013-02-10 18:15:30 +00:00
Thomas Adam
64da762c15
Merge branch 'obsd-master'
2013-02-07 12:08:55 +00:00
Nicholas Marriott
8903c1f167
Automatically reflow wrapped lines when a pane is resized, requested by
...
many over the years and finally implemented by Richard Woodbury.
2013-02-05 11:08:59 +00:00
Thomas Adam
a3f4eb7b24
Merge branch 'obsd-master'
...
Conflicts:
Makefile
grid-utf8.c
2013-01-30 15:27:19 +00:00
Nicholas Marriott
fdbfc7e349
Rather than having two grids for each pane, one for ASCII and one for
...
UTF-8, collapse the two together. Simplifies the code at the expense of
more memory (which can probably be reduced again later).
2013-01-18 02:16:21 +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
Nicholas Marriott
df912e3540
xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-10 11:53:01 +00:00
Tiago Cunha
c6fc8771a9
Sync OpenBSD patchset 1122:
...
Use a predefined structure for not-space cells used to set attributes.
2012-05-30 13:41:58 +00:00
Nicholas Marriott
1f23f6d686
Use a predefined structure for not-space cells used to set attributes.
2012-05-23 19:19:40 +00:00
Tiago Cunha
391f1f08c0
Expand the Id keyword.
2011-07-09 09:42:33 +00:00
Nicholas Marriott
ac9daf92d7
Merge copy mode and output mode, dropping the latter. Idea and code from
...
Micah Cowan.
2010-04-06 21:35:44 +00:00
Micah Cowan
2d74ce1d3a
Merge output (more) and copy modes into one single mode (called copy).
2010-04-05 05:11:44 +00:00
Tiago Cunha
cc094fdfe6
Sync OpenBSD patchset 581:
...
Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last
time now I've configured emacs to make them displayed in really annoying
colours...
2009-12-04 22:14:47 +00:00
Nicholas Marriott
15a64b805e
Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last
...
time now I've configured emacs to make them displayed in really annoying
colours...
2009-12-03 22:50:09 +00:00
Tiago Cunha
a0b2b8e875
Sync OpenBSD patchset 547:
...
Cleanup by moving various (mostly horrible) little bits handling UTF-8 grid
data into functions in a new file, grid-utf8.c, and use sizeof intead of
UTF8_DATA.
Also nuke trailing whitespace from tmux.1, reminded by jmc.
2009-11-19 22:23:27 +00:00
Nicholas Marriott
a78cc98c8b
Cleanup by moving various (mostly horrible) little bits handling UTF-8 grid
...
data into functions in a new file, grid-utf8.c, and use sizeof intead of
UTF8_DATA.
Also nuke trailing whitespace from tmux.1, reminded by jmc.
2009-11-18 17:02:17 +00:00
Tiago Cunha
3d88da7b2a
Sync OpenBSD patchset 409:
...
Move lines into the history when scrolling even if the scroll region is not
the entire screen.
Allows ircII users to see history, prompted by naddy.
2009-10-15 01:55:12 +00:00
Nicholas Marriott
ad566a86de
Move lines into the history when scrolling even if the scroll region is not
...
the entire screen.
Allows ircII users to see history, prompted by naddy.
2009-10-13 15:38:37 +00:00
Tiago Cunha
c507bf25de
Sync OpenBSD patchset 328:
...
Stick line length to what is actually used (removing an optimization that
allowed it to be bigger), and use clear line/EOL sequences rather than spaces
in copy/scroll mode.
This fixes xterm copy/paste from tmux which treats trailing spaces differently
from clearing a line with the escape sequences. Reported by martynas@.
2009-09-15 23:54:57 +00:00
Nicholas Marriott
4278199101
Stick line length to what is actually used (removing an optimization that
...
allowed it to be bigger), and use clear line/EOL sequences rather than spaces
in copy/scroll mode.
This fixes xterm copy/paste from tmux which treats trailing spaces differently
from clearing a line with the escape sequences. Reported by martynas@.
2009-09-15 15:14:09 +00:00