Commit graph

585 commits

Author SHA1 Message Date
Hiltjo Posthuma
cf890e5bf0 Allow mouse selection override using ShiftMask
Similar to xterm or urxvt holding shift before selecting text with the mouse
allows to override copying text. For example in tmux with "mode-mouse on" or
vim (compiled with --with-x), mc, htop, etc.

forceselmod in config.h sets the modifier to use this mode, by default
ShiftMask.

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
2014-05-14 07:48:25 +02:00
Christoph Lohmann
bdb850a16a Redraw needs all dirty lines to have flash etc. work. 2014-05-09 17:12:58 +02:00
Colona
e31829f659 End a sequence only on CAN, SUB, \a and C1s. 2014-05-09 10:25:29 +02:00
Colona
5e917ab287 Also clears ESC_START on interrupt characters during sequences.
Otherwise, the rest of the input is interpreted as a new escape
sequence.
For the ESC character, ESC_START is re-set in tcontrolcode.
2014-05-09 08:26:37 +02:00
noname
99fb365aa3 Consistent FALLTHROUGH comments. 2014-05-02 21:49:52 +02:00
Roberto E. Vargas Caballero
870f961c49 Fix displaying control code
Control code are never displayed. It is not important if graphic
charset is displayed or not.
2014-04-30 08:35:53 +02:00
Roberto E. Vargas Caballero
1629363f2d Remove ATTR_GFX and tselcs
ATTR_GFX was used long time ago to detect when terminal was in
graphic mode. Today graphic mode is implemented using a charset
pointer, so ATTR_GFX is not needed anymore because graphic
condition can be detected directly checking if current charset
is GRAPHICS C0.
2014-04-29 15:17:51 +02:00
noname
6b315558f8 Do not save cursor in tresize.
This patch fixes the bug introduced in
8f11e1cd03

To reproduce the bug:
1. Save cursor: printf '\e[s'
2. Load cursor: printf '\e[u'
3. Resize st window.
4. Load cursor again: printf '\e[u'
2014-04-29 15:17:50 +02:00
noname
5f91983541 Simplify selected(). 2014-04-28 18:49:45 +02:00
noname
0e439e5624 Simplify xunloadfonts. 2014-04-28 18:48:09 +02:00
noname
74962bf566 Remove one indentation level in getsel(). 2014-04-28 18:38:07 +02:00
noname
6681af165b Remove unused dump() function. 2014-04-28 18:38:07 +02:00
noname
1ae2745fd1 Add missing function prototypes. 2014-04-28 18:38:06 +02:00
noname
a48f2be7f5 Use MODBIT in xseturgency. 2014-04-28 18:38:06 +02:00
noname
17fa1493ee Compute ena_sel as one expression. 2014-04-28 18:38:06 +02:00
Roberto E. Vargas Caballero
a8a9e66a7d Simplify expressions in tputc() 2014-04-28 18:38:05 +02:00
Roberto E. Vargas Caballero
17290f493b Fix misplaced break
This misplaced break was causing an incorrect fall through
from DSR to DECSTBM.
2014-04-28 18:38:05 +02:00
Roberto E. Vargas Caballero
43d74ef362 Create a function for DEC test
Almost of the sequences execute their action in a separate function,
which is good because helps to read the full set of sequences
faster.
2014-04-28 18:38:05 +02:00
Roberto E. Vargas Caballero
3764f38fc8 Fix tputc control code handling
The patch 53105cf modified how control codes were detected, because
it tried to handle also C1 control codes (0x80-0x9f), that have
upper bit to 1, so they are multi byte character in utf8.
Code was checking the value of width in order to known that after
decoding the unicode point had a width of 1 byte, but it as incorrect
because this width is the columnb width.
2014-04-28 18:32:09 +02:00
Roberto E. Vargas Caballero
53105cf74f Remove repeated initialisation of term.esc
Once a sequence is completed term.esc must return to 0, so
instead of repeating this expression in all the cases is
better put it at the end of the block.
2014-04-27 11:30:21 +02:00
Roberto E. Vargas Caballero
aa35bbd7a1 Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:

	*The VT510 ignores all following characters until it receives a
	 SUB, ST, or any other C1 control character.

So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:

	Cancel  CAN
	1/8     Immediately cancels an escape sequence, control sequence,
		or device control string in progress. In this case, the
		VT510 does not display any error character.

	Escape  ESC
	1/11    Introduces an escape sequence. ESC also cancels any escape
		sequence, control sequence, or device control string in
		progress.
2014-04-27 11:30:13 +02:00
Markus Teich
704d12442e add break;s for last cases in switch statements 2014-04-27 10:34:57 +02:00
noname
02d2df5790 Do not eat ESC character if control string is not properly terminated.
Currently tputc handles the case of too long control string waiting for
the end of control string.

Another case is when there is ESC character is encountered but is not
followed by '\\'.  In this case st stops processing control string,
but ESC character is ignored.

After this patch st processes ESC characters in control strings properly.

Test case:
printf '\e]0;abc\e[1mBOLD\e[0m'

Also ^[\ is actually processed in the code that handles ST.
According to ECMA-048 ST stands for STRING TERMINATOR and is used to
close control strings.
2014-04-26 00:14:42 +02:00
noname
c4b79b055d Fix for multibyte characters in techo.
Works for both signed and unsigned char.
2014-04-26 00:03:09 +02:00
noname
7f1e02e4db s/DSC/DCS/ DCS stands for DEVICE CONTROL STRING 2014-04-26 00:03:09 +02:00
noname
84f6dbffa5 Use xwrite instead of write. 2014-04-26 00:03:08 +02:00
noname
2d67f99d28 Remove unnecessary break 2014-04-26 00:03:08 +02:00
noname
4a8574b439 Comment fix. 2014-04-25 23:57:44 +02:00
Colona
8f11e1cd03 On terminal resize, clear the alt screen with its own cursor.
Currently the alternate screen get messed up on resize if it has
different colors or mode.
2014-04-25 23:57:44 +02:00
noname
844c503c80 Optimize tputtab.
Before this patch executing
	printf '\e[10000000000I'
or
	printf '\e[10000000000Z'
resulted in long delay.
2014-04-25 23:57:44 +02:00
noname
1b0b9759dc Use != instead of ^ for logical values.
sel.alt is only changed by
	sel.alt = IS_SET(MODE_ALTSCREEN);
2014-04-25 23:57:43 +02:00
noname
99d2d6007a Use BETWEEN macro in xsetcolorname and fix style. 2014-04-25 23:57:43 +02:00
Christoph Lohmann
fe31a3f634 Conformity in the -g geometry handling.
Thanks to Yuri Karaban for suggesting this!

These changes make -g correspond to <cols>x<rows> and honor it so non-tiling
window managers can work with the size hints afterwards. It also adds a -i
flag to force the window size. This is needed so -g keeps being useful in dwm.
2014-04-25 22:34:24 +02:00
Roberto E. Vargas Caballero
6b7f63bac5 Simplify a bit more tdeletechar and tinsertblank
The large and repeated expression used in memmove to indirect
the line can be simplified using a pointer, that makes more
clear where begins and where ends the movement.
2014-04-25 17:25:59 +02:00
noname
80b32af794 Simplify tdeletechar and tinsertblank and fix memory corruption.
Current CSI parsing code uses strtol to parse arguments and allows them
to be negative. Negative argument is not properly handled in tdeletechar
and tinsertblank and results in memory corruption in memmove.

Reproduce with printf '\e[-500@'

Patch also removes special handling for corner case and simplifies
the code.

Removed
	term.dirty[term.c.y] = 1
because tclearregion sets dirty flag.
2014-04-25 17:17:48 +02:00
noname
16ac85bf54 Style fixes in tscrollup. 2014-04-23 20:38:04 +02:00
noname
fe527aa508 Do not set dirty flag twice in tscrollup and tscrolldown. 2014-04-23 20:37:59 +02:00
noname
3afdb4ff04 Use tsetdirt in tscrollup and tscrolldown.
tscrollup and tscrolldown do not use tsetdirt, but their code is
equivalent to

        tsetdirt(orig, term.bot-n);
        tsetdirt(orig+n, term.bot);

tclearregion also marks cleared lines as dirty.
In tscrolldown it sets lines from term.bot-n+1 to term.bot dirty, and in
tscrollup it sets lines from orig to orig+n-1 dirty.

In both functions all lines from orig to term.bot are effectively set
dirty, but in tscrolldown lines from orig+n to term.bot are set dirty
twice, and in tscrollup lines from orig to term.bot-n are set dirty
twice.

These patches make it clear which lines are set dirty and sets them
dirty once in each funciton.
2014-04-23 20:35:16 +02:00
noname
f9dc374ea0 Fix techo handling of control and multibyte characters.
techo compares signed char to '\x20'. Any character with code less then
'\x20' is treated as control character.  This way characters with MSB
set to 1 are considered control characters too.

Also this patch makes techo display DEL character as ^?.

To reprocuce the bug, enable echo mode using printf '\e[12l',
then type DEL character or any non-ASCII character.
2014-04-23 20:31:45 +02:00
noname
fa19f241a3 Make xrealloc and xstrdup style consistent. 2014-04-23 15:39:04 +02:00
noname
df1810dd8f Use BETWEEN in tsetchar. 2014-04-23 15:39:03 +02:00
noname
ed855ea432 Use uint and uchar instead of unsigned int and unsigned char. 2014-04-23 15:39:03 +02:00
noname
68d97457ec Remove argument names from function prototypes. 2014-04-23 15:39:03 +02:00
noname
49672dac7b Style fix in tdumpsel. 2014-04-23 15:39:02 +02:00
noname
f21e47f44a Use BETWEEN in tinsertblankline and tdeleteline. 2014-04-23 15:39:02 +02:00
Christoph Lohmann
87abc7cd59 It's 2014 now. 2014-04-22 19:22:58 +02:00
noname@inventati.org
1388870331 move MODBIT to Macros section
Patch moves MODBIT to macros section and uses it in tselcs.
2014-04-20 21:13:37 +02:00
noname@inventati.org
6b56cbf9cc misplaced parenthesis in LEN macro 2014-04-20 21:07:04 +02:00
Markus Teich
3269bf213d remove confusing SERRNO macro
I found the SERRNO Macro slightly confusing, since you have to look
it up, if you don't know it already. A web search showed it does
not seem to be any kind of standard. Also there was no reason in
the commit log when it was introduced in 2009. As you can see it
also leads to new patches, which don't use this macro (probably the
author did not know about it).
2014-04-20 21:00:46 +02:00
noname@inventati.org
4ad2fc7f18 Simplify techo
Remove special case for \e because it is handled well by "control code"
case.
2014-04-15 08:16:39 +02:00
noname@inventati.org
dc74c4f729 typedefs instead of #defines
Replaced #defines with typedefs where possible, patch attached.
2014-04-15 08:14:46 +02:00
q@c9x.me
b8d6171cb0 fix cursor handling when alt screen is disabled
I don't like this alt screen thing, but when
allowaltscreen == 0, the cursor is still saved
and restored after calling 'less' (or 'man').

This patch makes allowaltscreen == 0 usable.
2014-04-15 08:13:41 +02:00
Roberto E. Vargas Caballero
ebb6e03201 Merge remote-tracking branch 'origin/master' into omaster 2014-04-15 08:11:47 +02:00
Christoph Lohmann
f27b44b7c2 Removing two unnecessary gettimeofday(). 2014-04-11 18:11:25 +02:00
Toaster Toaster
3cb80840db Increment XSync consistency
This patch cleans up a style inconsistency.
2014-04-11 16:29:13 +02:00
Christoph Lohmann
a495fce128 There is no need for a full dirt redraw. 2014-04-05 20:34:57 +02:00
Christoph Lohmann
6f4cfa5136 Fixing a compiler warning with the assignment. 2014-04-02 09:26:28 +02:00
Rafa Garcia Gallego
672e4e4b03 Fix segfault when pressing PrintScr without a selection 2014-03-27 07:48:32 +01:00
Damian Okrasa
45b808b88e new utf decoder
This patch replaces current utf decoder with a new one, which is ~50
lines shorter and should be easier to understand. Parsing 5 and 6
sequences, if necessary, requires trivial modification of UTF_SIZ
constant and utfbyte, utfmask, utfmin, utfmax arrays.
2014-03-27 07:19:37 +01:00
Roberto E. Vargas Caballero
71328cbcdc Merge branch 'master' of ssh://suckless.org/gitrepos/st 2014-03-10 15:16:26 +01:00
Roberto E. Vargas Caballero
78f8843bc7 Add sequence for printing the current selection
This is very usefull in order to can select what is sent
to the plumber.
2014-03-06 07:55:07 +01:00
Roberto E. Vargas Caballero
96c230e476 Add key definition for printer sequences
These new combinations generate the same behaviour (basically) of
vt102. It is a good way of communicating st with other programs.

[0] http://www.vt100.net/docs/vt102-ug/chapter2.html
2014-03-06 07:53:15 +01:00
Roberto E. Vargas Caballero
6166a1afc8 Add MC for the full screen
This sequence is very useful because allows comunicate the content
of the terminal to another program.
2014-03-06 07:51:58 +01:00
Roberto E. Vargas Caballero
cf332a325d Add MC for a single line
This sequence print the current line. It is different to the
'printer on' sequence, where all the characters that arrive to the
terminal are printer. Here only the ascii characters are printed.
2014-03-06 07:50:34 +01:00
Christoph Lohmann
1584956a60 Style cleanup.
Add some note about the main reason why st is still that big.
2014-03-01 11:04:03 +01:00
Christoph Lohmann
d2ec39f0ef Style matters. 2014-03-01 09:22:57 +01:00
Roberto E. Vargas Caballero
1f0d981bd7 Add MC sequence
This sequence control when the printer is enabled or disabled. This
sequence control the behaviour of the -o option.
2014-02-22 11:54:30 +01:00
Roberto E. Vargas Caballero
cdb3b1892a Add xstrdup function
Since we are using xmalloc, xrealloc ..., then it is not logical
call directly to strdup.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-02-08 19:58:37 +01:00
Roberto E. Vargas Caballero
315b7ee9ce Merge remote-tracking branch 'origin/master' 2014-02-04 11:46:45 +01:00
Christoph Lohmann
c2026a4950 Removing the w3img support.
The patch to add w3img support destroys our way to handle fps and so stop
wasting resources on fast scrolling. Due to w3img being a hack to display
images in an ugly way, is there no need to support this. Use some real way to
display images.
2014-02-03 20:54:25 +01:00
Roberto E. Vargas Caballero
6521b5dc32 Remove non defined behaviour in selcopy
It is not defined when lateral effects of expressions are
calculated, so an expression as:

	--last >= gp && !(selected(last - gp, y)

is non portable.
2014-02-02 19:42:01 +01:00
Roberto E. Vargas Caballero
a8d5870073 Remove duplicated code in strhandle
The error condition was duplicated in two different switches.
This new version centralized the error handling in only one place.
2014-02-02 19:42:01 +01:00
Eric Pruitt
9559100130 Use character scaling in XCopyArea 2014-01-21 19:20:17 +01:00
Amadeusz Sławiński
c0a56ef4be Make w3mimgdisplay work with st
Before this patch draw() calls drawregion which calls xdraws and then
updates whole window in one call thus overdrawing anything drawn by
w3mimgdisplay. After moving XCopyArea to xdraws it only updates the
regions which are being updated by XftDraw* functions. It may do a few
more calls to XCopyArea with this patch.

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
2014-01-16 10:20:20 +01:00
Amadeusz Sławiński
9df9a4723d Fix truecolor escapes, when both bg and fg are set
for example
echo -e "\e[48;2;255;0;0m\e[38;2;0;0;255m test "
should render on red bg with blue fg

also now elinks works correctly when using 'truecolor' option
in preferences

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
2014-01-03 15:28:16 +01:00
Eon S. Jeon
e8dba89164 query pixel size from matched font
Sorry for another duplicated mail. I found the patch is malformed
significantly. I've been away from my laptop for a while, so I'm quite
unfamiliar with the settings on this system...
2014-01-03 15:26:25 +01:00
Eon S. Jeon
d60ee7337b Prevent resizing stdin
This fixes a bug that the parent tty gets resized whenever you launch
st through command line.

The problem was that ioctl was resizing cmdfd before it gets
initialized in ttynew. Since cmdfd is a global variable, its initial
value is 0, and consequently stdin was being resized.
2013-12-18 08:11:22 +01:00
Eric Pruitt
39f28b18b7 Set _NET_WM_PID attribute 2013-12-11 21:33:52 +01:00
René Rietz
08a3eea571 Add stdint include
Since st is using now int32_t and uint32_t the inclusion of
stdint or inttype is mandatory, because in other case the
definition of these new types will not be known by the
compiler.
2013-11-25 16:08:01 +01:00
Roberto E. Vargas Caballero
53474391bc Fix stupid bug in tdefcolor returning -1 in unsigned function
k0ga misktook applying patch of others. Sorry guys!!!!
2013-11-25 14:09:53 +01:00
Johannes Hofmann
1fe0a5f39a Use int instead of long for color
This patch replaces long by int32_t. It saves
some memory on 64bit systems.
2013-11-24 10:43:35 +01:00
Carlos J. Torres
4435e0ee67 add _NET_WM_NAME 2013-11-23 10:54:57 +01:00
Mark Edgar
7263820759 Simplify logic in kmap(). 2013-10-28 19:28:52 +01:00
Mark Edgar
1fa27b93f9 Simplify logic in match(). 2013-10-28 19:28:35 +01:00
Roberto E. Vargas Caballero
3d3c37bc70 Merge remote-tracking branch 'origin/master' into omaster 2013-10-28 19:18:24 +01:00
Rob Pilling
489982d4b8 Fixed lock up when system time jumps backwards
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-10-27 13:17:11 +01:00
Mark Edgar
297c886b72 Ignore numlock (Mod2Mask) for button events too.
Conflicts:
	config.def.h
	st.c
2013-10-20 09:53:34 +02:00
Mark Edgar
0f6942cdf6 Avoid buffer overrun in bpress()
Use correct type for Mousekey.b (XButtonEvent.button).
2013-10-15 17:46:17 +02:00
Mark Edgar
8e577322a3 New ttysend() function calls ttywrite() and techo(). Honor MODE_ECHO when pasting in selnotify(). 2013-10-07 21:05:21 +02:00
Mark Edgar
939e149544 Avoid buffer overrun in kpress() and remove limit on shortcut strings. 2013-10-07 21:03:51 +02:00
Mark Edgar
02ae3ce6fd Simplify Mod1 logic in kpress(), eliminating locals and a memcpy. 2013-10-07 20:56:51 +02:00
Roberto E. Vargas Caballero
7a4eefe87c Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.

st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.

This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.

This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-02 21:22:15 +02:00
Christoph Lohmann
c5c2365ab7 People, learn to keep to styles. Thanks. 2013-10-02 21:06:50 +02:00
Mihail Zenkov
62ab938965 Fix save/restore cursor
st was assuming that save/restore cursor position was independent
of the screen that was shown in each moment, but it is not true,
because each screen has a different save/restore buffer. This
patch fixes it.
2013-10-02 20:47:19 +02:00
Mihail Zenkov
2b1bc8087f Add DSR cursor position sequence 2013-10-02 20:45:19 +02:00
Maurice Quennet
eeae9b0cee Fix core in multi-line selection on OpenBSD
OpenBSD 5.3 amd64 release version with the most current st
version from git, crash and dump core when selecting multiple
lines whith the cursor.  This happens, because on line 964
of st.c (gp-1)->mode is accessed, although gp is still
pointing at the beginning of the array term.line[y] (see
line 939 for initialization of gp).
2013-09-23 19:26:24 +02:00
Egmont Koblinger
8ac0a5f872 Add bracketed paste mode
This patch enables bracketed paste mode (
http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#Bracketed%20Paste%20Mode
).

It's mainly useful for text editors to disable line wrapping and auto
indentation when text is being pasted, rather than typed from keyboard.

On the emulator side, it is supported by at least xterm, urxvt,
gnome-terminal, putty, iterm2; and I have a patch for konsole.

On the application side, vim can be configured easily to handle this, and
I have pending patches for mcedit and joe. Probably many others also
support it.
2013-09-23 09:27:55 +02:00
Michael Forney
eae31a532e Fix some bugs in mouse tracking logic
* Button number in X10 mode:

  I believe the button - 1 came from "C b is button - 1" from [0].
  However, above this section, it states

    "Normally, parameters (such as pointer poisition and button number)
     for all mouse tracking escape sequences generated by xterm encode
     numeric parameters in a single character as value+32. For example, !
     specifies the value 1."

  Also, from the description of SGR,

    "The encoded button value in this case does not add 32 since that
     was useful only in the X10 scheme for ensuring that the byte
     containing the button value is a printable code."

  This suggests that we should still add 32 to the button value when in
  MODE_MOUSEX10.

* No button release reporting in X10 mode:

    "X10 compatibility mode sends an escape sequence only on button press,
     encoding the location and the mouse button pressed."

* Fix MODE_MOUSEMOTION:

  Currently, motion reporting is skipped when oldbutton == 3
  (corresponding to no button being pressed). However, oldbutton is
  only set on a button press, which will never be 3.

[0]: http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
2013-09-13 19:49:25 +02:00
Roberto E. Vargas Caballero
bef599bb27 Add audible bell
\a is the character for bell, and st is only marking the window as urgent
if it is not active. This patch adds an audible bell which can be disable
with bellvolume variable.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-09-12 20:47:41 +02:00
Christoph Lohmann
210dda9570 Wide character support.
Thanks "Eon S. Jeon" <esjeon@hyunmu.am>!
2013-09-07 12:41:36 +02:00