circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 01:18:52 +00:00
Code Issues Projects Releases Wiki Activity
4,811 Commits 3 Branches 37 Tags 31 MiB
953c3ef47a
Commit Graph

185 Commits

Author SHA1 Message Date
Tiago Cunha
09c6432854 Sync OpenBSD patchset 207: 
Plug some memory leaks.
 2009-07-30 21:14:04 +00:00
Nicholas Marriott
97f105cde2 Plug some memory leaks. 2009-07-30 20:41:48 +00:00
Tiago Cunha
7562781c9d Sync OpenBSD patchset 186: 
Draw UTF-8 characters under the selection correctly.
 2009-07-28 22:41:38 +00:00
Nicholas Marriott
fc65da1eed Draw UTF-8 characters under the selection correctly. 2009-07-27 11:33:21 +00:00
Tiago Cunha
b72f9bea43 Sync OpenBSD patchset 162: 
More tty code tidying: move the saved cursor/region position (from before the
screen was updated) out of struct screen and into struct tty_ctx.
 2009-07-23 12:48:18 +00:00
Tiago Cunha
9c6fa90857 Sync OpenBSD patchset 160: 
enum tty_cmd is only used as an index into the array of command function
pointers, so remove it and use the function pointers directly to represent
themselves.
 2009-07-23 12:38:01 +00:00
Nicholas Marriott
ddad0be5f7 More tty code tidying: move the saved cursor/region position (from before the 
screen was updated) out of struct screen and into struct tty_ctx.
 2009-07-22 20:53:38 +00:00
Tiago Cunha
b6afa30c39 Sync OpenBSD patchset 159: 
There are relatively few arguments to tty_cmd_* functions now, so tidy them up
by using a struct rather than hiding everything with varargs.
 2009-07-22 18:08:56 +00:00
Nicholas Marriott
2ec2837daa enum tty_cmd is only used as an index into the array of command function 
pointers, so remove it and use the function pointers directly to represent
themselves.
 2009-07-22 18:02:23 +00:00
Tiago Cunha
75a44d856e Sync OpenBSD patchset 158: 
tty_cmd_raw is only used once, for raw UTF-8 output, so rename it to
tty_cmd_utf8character and eliminate the size argument.
 2009-07-22 17:58:42 +00:00
Nicholas Marriott
6a309c53a8 There are relatively few arguments to tty_cmd_* functions now, so tidy them up 
by using a struct rather than hiding everything with varargs.
 2009-07-22 16:45:31 +00:00
Nicholas Marriott
5bd72ec629 tty_cmd_raw is only used once, for raw UTF-8 output, so rename it to 
tty_cmd_utf8character and eliminate the size argument.
 2009-07-22 15:55:32 +00:00
Nicholas Marriott
82b45b460e The scroll region cannot be one line only, ignore attempts to make it so. 2009-07-15 17:43:02 +00:00
Nicholas Marriott
975f516f51 The scroll region cannot be one line only, ignore attempts to make it so. 2009-07-14 14:47:32 +00:00
Nicholas Marriott
664a0bd559 Cursor up and down should be limited by the scroll region (cuu should stop at 
the scroll region top if starting from below it and cud stop at the bottom if
starting from above). Fixes another vttest test.
 2009-07-09 18:08:13 +00:00
Nicholas Marriott
295879cced Change inserting and deleting lines inside the scroll region to properly clear 
lines that should be inserted/deleted but not moved. Fixes problems with mutt
reported by Brian Lewis, thanks.
 2009-07-09 18:04:53 +00:00
Nicholas Marriott
e073441c36 Tidy by removing unused argument from grid_view_{insert,delete}_line_region 
functions (currently don't fully work, this is to make fix easier).
 2009-07-09 18:04:17 +00:00
Nicholas Marriott
5f2f07ed8a Cursor up and down should be limited by the scroll region (cuu should stop at 
the scroll region top if starting from below it and cud stop at the bottom if
starting from above). Fixes another vttest test.
 2009-07-09 17:57:11 +00:00
Nicholas Marriott
86c93c6e34 Change inserting and deleting lines inside the scroll region to properly clear 
lines that should be inserted/deleted but not moved. Fixes problems with mutt
reported by Brian Lewis, thanks.
 2009-07-09 07:58:14 +00:00
Nicholas Marriott
643c219d18 Tidy by removing unused argument from grid_view_{insert,delete}_line_region 
functions (currently don't fully work, this is to make fix easier).
 2009-07-09 00:29:32 +00:00
Nicholas Marriott
35092835b0 Fix two errors with character/line insertion and deletion: the maximum number 
of characters which may be inserted or deleted is the screen width, not one
less (and similarly for lines and height); and if characters or lines are
deleted by moving the ones that follow, the space at the end needs to be
cleared.

This appears to solve long-standing redraw issues most visible when using the
force-width option then scrolling in view(1) or unwrapping lines in emacs.
 2009-07-01 19:14:33 +00:00
Nicholas Marriott
68e06fb6b7 Fix two errors with character/line insertion and deletion: the maximum number 
of characters which may be inserted or deleted is the screen width, not one
less (and similarly for lines and height); and if characters or lines are
deleted by moving the ones that follow, the space at the end needs to be
cleared.

This appears to solve long-standing redraw issues most visible when using the
force-width option then scrolling in view(1) or unwrapping lines in emacs.
 2009-06-29 21:30:50 +00:00
Nicholas Marriott
1fb3948ff1 Whoops, revert. 2009-06-26 22:18:36 +00:00
Nicholas Marriott
1496aa5dbc Remove some unused function declarations; no binary change. 2009-06-26 22:18:03 +00:00
Nicholas Marriott
de2ea2d178 Status line fixes: don't truncate status-right now the length calculation is 
done for UTF-8, limit to the maximum length correctly when printing, and always
print a space even if the left string is longer than the width available.
 2009-06-26 15:34:12 +00:00
Nicholas Marriott
1ec736a3dc Status line fixes: don't truncate status-right now the length calculation is 
done for UTF-8, limit to the maximum length correctly when printing, and always
print a space even if the left string is longer than the width available.
 2009-06-26 15:13:39 +00:00
Nicholas Marriott
bb459beb03 Whitespace and more syncing. 2009-06-25 16:34:50 +00:00
Nicholas Marriott
a5830b9603 Restore $Id$ and add script to do so. 2009-06-25 16:21:32 +00:00
Nicholas Marriott
b8ec0c713f Support insert mode by using insert character to shift the cells before writing 
as normal.
 2009-06-25 15:52:12 +00:00
Nicholas Marriott
93631b3ca7 Implement the DEC alignment test. With the last change this is enough for the 
first cursor test in vttest (in ports) to pass; it still shops a few more
problems though.
 2009-06-25 15:51:54 +00:00
Nicholas Marriott
49477de55c Fix some miscalculations when clearing to start of screen: the number of lines 
to the cursor is cy not cy - 1, and the current cursor cell should be included.
 2009-06-25 15:50:48 +00:00
Nicholas Marriott
28bcf774e5 New session option, status-utf8, to control the interpretation of top-bit-set 
characters in status-left and status-right (if on, they are treated as UTF-8;
otherwise passed through).
 2009-06-25 15:48:25 +00:00
Nicholas Marriott
1e06ec41dc Add a UTF-8 aware string length function and make UTF-8 in 
status-left/status-right work properly. At the moment any top-bit-set
characters are assumed to be UTF-8: a status-utf8 option to configure this will
come shortly.
 2009-06-25 15:47:07 +00:00
Ray Lai
74749e8705 Remove trailing newlines, spaces, and tabs. 
No binary change.
 2009-06-05 03:13:16 +00:00
Nicholas Marriott
c1a4c0186a Support insert mode by using insert character to shift the cells before writing 
as normal.
 2009-06-03 23:37:30 +00:00
Nicholas Marriott
52ec9b9ec4 Implement the DEC alignment test. With the last change this is enough for the 
first cursor test in vttest (in ports) to pass; it still shops a few more
problems though.
 2009-06-03 23:30:40 +00:00
Nicholas Marriott
ebe07c2726 Fix some miscalculations when clearing to start of screen: the number of lines 
to the cursor is cy not cy - 1, and the current cursor cell should be included.
 2009-06-03 23:26:56 +00:00
Nicholas Marriott
6521427a45 New session option, status-utf8, to control the interpretation of top-bit-set 
characters in status-left and status-right (if on, they are treated as UTF-8;
otherwise passed through).
 2009-06-03 16:54:26 +00:00
Nicholas Marriott
7d45e29683 Add a UTF-8 aware string length function and make UTF-8 in 
status-left/status-right work properly. At the moment any top-bit-set
characters are assumed to be UTF-8: a status-utf8 option to configure this will
come shortly.
 2009-06-03 16:05:46 +00:00
Nicholas Marriott
35876eaab9 Import tmux, a terminal multiplexor allowing (among other things) a single 
terminal to be switched between several different windows and programs
displayed on one terminal be detached from one terminal and moved to another.

ok deraadt pirofti
 2009-06-01 22:58:49 +00:00
Nicholas Marriott
143aa718e5 Space trimmage mega-diff. 2009-05-04 17:58:27 +00:00
Nicholas Marriott
a6f2d82335 Use a (pre)randomised binary tree for UTF-8 character widths. Probably overkill 
but meh.
 2009-04-30 20:54:53 +00:00
Nicholas Marriott
8a160f2d58 - Unbreak selection colouring. 
- Get UTF-8 check the right way round...
 2009-03-30 20:14:50 +00:00
Nicholas Marriott
23fef99009 8 -> UTF8_SIZE. 2009-03-29 11:18:28 +00:00
Nicholas Marriott
4cbf7d489e - Ignore padding when writing so copying the screen for copy-mode doesn't include extra characters. 
- Handle combined characters properly when the previous character is not UTF-8.
 2009-03-29 11:06:22 +00:00
Nicholas Marriott
cf7b384c43 Better UTF-8 support, including combined characters. Unicode data is now stored 
as UTF-8 in a separate array, the code does a lookup into this every time it
gets to a UTF-8 cell. Zero width characters are just appended onto the UTF-8
data for the previous cell. This also means that almost no bytes extra are
wasted non-Unicode data (yay).

Still some oddities, such as copy mode skips over wide characters in a strange
way, and the code could do with some tidying.
 2009-03-28 20:17:29 +00:00
Nicholas Marriott
6c0728fe07 Step 2 of the Grand Plan To Make UTF-8 Better. 
Split grid into two arrays, one containing grid attributes/flags/colours (keeps
the name grid_cell for now) and a separate with the character data (called
text). The text is stored as a u_short but is treated as a uint64_t elsewhere;
eventually the grid will have two arrays.

I'm not happy with the naming so that might change.

Still need to decide where to go from here. I'm not sure whether to combine
the peek/set functions together, and also whether to continue to treat the
text as a uint64_t (and convert to/from Unicode) or make it a char array
(of size one when UTF-8 disabled, eight when enabled) and keep everything
as UTF-8.

Also since UTF-8 will eventually become an attribute of the grid itself it
might be nice to move all the padding crap into grid.c.
 2009-03-28 16:30:05 +00:00
Nicholas Marriott
989d67ccd7 struct grid_data -> struct grid. Stage 1 of the Grand Plan To Make UTF-8 Better. 2009-03-28 15:43:41 +00:00
Nicholas Marriott
8a6a7e74da CSR resets the cursor to the top-left. Reported by merdely. 2009-03-05 20:27:51 +00:00
Nicholas Marriott
eae026f2f7 Redraw selection properly. 2009-02-25 21:56:46 +00:00
Nicholas Marriott
c45eb2713b Check the right variable. Doh. 2009-02-24 21:49:05 +00:00
Nicholas Marriott
3969b59ae5 Don't turn cursor off unless actually drawing something. 2009-02-21 19:25:58 +00:00
Nicholas Marriott
514fe11727 We are going to need the updated screen data for emulating the scroll region, 
which may involve changing the cursor position; however, the old (before
redraw) cursor position is necessary for writing to the tty. So, save it before
doing the redraw then update the internal screen then update the tty.

Not sure I like this solution but it does the job for now.
 2009-02-11 17:04:39 +00:00
Nicholas Marriott
c6be7d3ee6 Simplify screen/tty write code to eliminate function pointer which is now 
unnecessary (it always does the same thing).
 2009-02-11 06:31:09 +00:00
Nicholas Marriott
4428987e95 * Better support for at least the most common variant of mouse input: parse it and adjust for different panes. Also support mouse in window/session choice mode. 
* Bring back the fancy window titles with session/window names: it is easy to work around problems with elinks (see FAQ).
 2009-01-28 19:52:21 +00:00
Nicholas Marriott
c1726281c9 Handle cursor on/off better. 2009-01-27 21:39:15 +00:00
Nicholas Marriott
4d7e555a48 Don't screw up UTF-8 combined characters. 2009-01-26 20:57:45 +00:00
Nicholas Marriott
95323a6a36 Leftover label. 2009-01-19 17:15:19 +00:00
Nicholas Marriott
4cdc228353 Unbreak UTF-8. 2009-01-18 21:46:30 +00:00
Nicholas Marriott
1fa36b2419 Use the right size. 2009-01-18 21:21:53 +00:00
Nicholas Marriott
0e197b417a Tidy a few warnings. 2009-01-17 18:47:37 +00:00
Nicholas Marriott
162bacdcd9 Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit). 2009-01-11 23:31:46 +00:00
Nicholas Marriott
a1b43faa43 Trim spaces. 2009-01-10 01:51:22 +00:00
Nicholas Marriott
3ed5aa3e72 Build array of codes, stop using ncurses global variables and push ncurses crap into tty-term.c. 2009-01-09 23:57:42 +00:00
Nicholas Marriott
cd8f85c2bd When I wrote this I somehow forgot that the cursor could helpfully sit at sx 
(one character off the right of the screen), so there are several out-of-bounds issues. Add some additional checking.
 2009-01-08 21:55:12 +00:00
Nicholas Marriott
4ebb85aae8 Don't return NULL when retrieving a string that is too long. 2009-01-08 21:22:01 +00:00
Nicholas Marriott
d7e0ea5cc6 Don't die when backspacing off the edge of the screen, reported by David Chisnall.. 2009-01-06 18:07:57 +00:00
Nicholas Marriott
ac3fe6512f Some tweaks found by LLVM courtesy of IcePic. 2009-01-05 11:04:06 +00:00
Nicholas Marriott
7a82e86827 Make window options work the same was as session options, add mode-fg/mode-bg options, force -g for global on set/show/setw/showw/ 2008-12-08 16:19:51 +00:00
Nicholas Marriott
7be7706f4d Ooops. Check the right value. 2008-11-12 23:38:40 +00:00
Nicholas Marriott
62457bce0b Trim. 2008-09-26 06:45:28 +00:00
Nicholas Marriott
efe557313a Internal screen data rewrite for better 256 colour/UTF-8 support. 2008-09-25 20:08:57 +00:00
Nicholas Marriott
19a2c87f04 Initial UTF-8 support. 2008-09-09 22:16:37 +00:00
Nicholas Marriott
6674197e85 Fix bold/non-bold mismatch in 256 colour mode by adding an extra 8 bits (ick) onto the attributes and using two of them to mark the fg and bg as 256 colours when necessary. If only it was 255 colours we would have one value for default and wouln't need this :-/. 2008-09-08 22:03:56 +00:00
Nicholas Marriott
4235ddb4e8 Initial 256 colour support, lightly tested. 2008-09-08 17:40:51 +00:00
Nicholas Marriott
3337dfcae5 Support keypad mode, and get rid of SCREEN_DEF*. Meant to commit these separately but forgot :-/. 2008-07-24 21:42:40 +00:00
Nicholas Marriott
97212771b5 Support keypad. Change cursor key output. 2008-07-23 23:44:50 +00:00
Nicholas Marriott
8873c79cbc Set window title to current session. New options set-titles to disable. 2008-06-18 18:52:44 +00:00
Nicholas Marriott
7842d29673 Revert attempt to fix stray updates, turns out it was clock :-/. 2008-06-04 19:20:10 +00:00
Nicholas Marriott
39be570b20 vi keys from Will Maier. 2008-06-04 18:50:35 +00:00
Nicholas Marriott
91d790411f Use the right function... 2007-12-06 19:57:01 +00:00
Nicholas Marriott
85c087ad4e Another redraw bugs. 2007-12-06 10:44:37 +00:00
Nicholas Marriott
8ec9b07c83 Screen debugging. 2007-12-06 10:36:01 +00:00
Nicholas Marriott
4f44b09195 Redraw buglets. 2007-12-06 10:16:36 +00:00
Nicholas Marriott
103748d6ad Major reorganisation of screen handling. 2007-12-06 09:46:23 +00:00