Commit Graph

508 Commits

Author SHA1 Message Date
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
Mark Edgar
4245ba0d12 Correctly initialize altscreen when defaultbg is not 0.
The alternate screen is not properly initialized when st starts. To see
this, set defaultbg in config.h to anything other than 0 (for example, swap
defaultfg and defaultbg), and run:

./st -e sh -c 'tput smcup; read'

You should see that the top-left 80x24 rectangle is black (or whatever
colorname[0] is), while the rest of the screen (if any) has the desired
colorname[defaultbg] color.

The attached patch fixes this by initializing term.c.attr in tnew() before
calling tresize(). It also removes the unnecessary xcalloc() calls, which
misled me on this bug hunt since it is really tclearregion() which
initializes term.lines and term.alt in tresize().
2013-09-04 18:33:02 +02:00
Eon S. Jeon
f3d438b101 Regarding commit 7e3cff3
Hello.

I reviewed and tested commit 7e3cff3, and made a patch that fixes some
problems in it.

1. There's a semicolon after an if statement, which is obviously a
typo.

2. The current way of calculating text position in "xdraws" yields
inconsistent results in some cases. This is due to the use of
"font->width", which varies. Instead, "xw.cw" has to be used as the
character width.

Sincerely,
Eon
2013-08-30 07:50:05 +02:00
Christoph Lohmann
8d21ced085 Correcting the bitmask value check. 2013-08-20 18:18:48 +02:00
Eon S. Jeon
347a45c352 Fix signess of tdefcolor
tdefcolor() returns -1 on error, while its return type is
unsigned long. At the same time, line 1724 and 1731 are checking the
positivity of its unsigned return value.
2013-08-06 08:32:11 +02:00
Alexander Sedov
22eeda56b7 Fixed memory leak in xsettitle(). 2013-08-05 11:45:53 +02:00
Michael Forney
86c03ddc82 Fix blink mode check
ATTR_BLINK is an attribute for a Glyph and will not be set in term.mode.
2013-08-05 11:45:52 +02:00
Eric Pruitt
7e3cff33ff Use character size scaling factors
The bounding boxes for characters can be scaled using "cwscale" and "chscale"
to scale the width and height respectively.
2013-08-05 11:44:18 +02:00
Roberto E. Vargas Caballero
aaee0e8b28 Reload colors in reset
Colors definition can be changed using a OSC sequence, so
we have to reload them if we want be sure all the colors
are the correct.

Could be desirable free the colors allocated due to rgb
colors and inverse colors (XftColorAllocValues in xdraws),
but it is impossible due we use the same structure for all
of them.
2013-07-20 23:25:46 +02:00
Roberto E. Vargas Caballero
8dde8cde41 Add RGB color definition
This patch uses the bit 24 in the color descriptor as an indicator
of RGB color, so we can take the values and generating the XftColour
directly in xdraws.
2013-07-20 23:25:38 +02:00
Eon S. Jeon
33ad83d492 Improved font caching
I made a patch that improves the performance of font caching mechanism.
This is based on a funny behaviour of FontConfig: it was handling
FcCharSet in a somewhat unexpected way.

So, we are currently adding "a character" to a new FcCharSet, and then
add it to a FcPattern. However, if we toss the FcPattern to FontConfig,
it loads the entire language(charset) that contains the character we
gave. That is, we don't always have to load a new font for each unknown
character. Instead, we can reused cached fonts, and this significantly
reduces the number of calls to extremely slow FontConfig matching
functions.

One more thing. I found that, in libXft, there's a function called
XftCharExists. XftCharIndex internally calls this function, and
does more stuffs if the character does exist. Since the returned index
is never used in st, we should call XftCharExists instead of
XftCharIndex. Please note that I already made this change in the patch.
2013-07-19 08:38:10 +02:00
Markus Teich
40e4d76d22 fix: whitespace 2013-07-04 09:58:14 +02:00
Alexander Sedov
fbc589d506 Remove long text being cropped/wrapped to standard 80x24 on launch.
To be more specific, now tty creation is delayed until X window is
actually mapped; last ConfigureNotify before mapping determines
initial tty size.
Please report problems if there are any.
2013-07-04 09:36:22 +02:00
Markus Teich
6fc471ccc6 fix: consistent usage of bitmask operations on unicode functions 2013-07-04 09:28:19 +02:00
Markus Teich
8b602a37a6 fix: do not need an extra variable for a single read 2013-07-04 09:26:18 +02:00
Roberto E. Vargas Caballero
6e1c7c8afc Fix match function bugs
There were two problems with match denfinition.

1) There was a forward declaration in the form:

	static inline bool match(uint, uint);

but later the function was defined as:

	inline bool
	match(uint mask, uint state) {

This causes that there were two different functions in the code, one local
and inline, and other inline but extern. All was working without problems
due to we were using -Os, and the compiler was using the extern definition
and it was no expanding the static declaration. If you removed the -Os flag,
then you got linker errors due it was no able to find the static definition
of the static declaration.

2) The mask checking was incorrect because we were doing the test:

	(state & mask) != state

and this test only was saying that at least all the enabled bits of state
were enabled also in mask, but no all the possible bits in mask. This was
the origin of the bug reported by Xavier Cartron, where he said it was
possible activated some shortcuts with some of the modifiers defined in the
config.h file.
2013-07-04 09:21:57 +02:00
Roberto E. Vargas Caballero
90c6f055b6 Remove unneded call to draw
draw is the function which update the Xwindow with the information st has,
and it is designed in a way that it must be called once in the main loop
(run function), and calling it in other places it is a waste of time.
2013-07-04 09:14:50 +02:00
Roberto E. Vargas Caballero
ebbac77d74 Fix selection clearing
The way st knows if there is a selection activated is checking if sel.ob.x
is equal to -1. In some parts of the code the way of disabling the selection
was only setting it to -1, but after it you can't be sure if the selection
is clearing from the terminal representation, because it is necessary mark
all the lines affected by the selection as dirty. Already there is a functon
which perform this task, selclear.
2013-07-04 09:14:50 +02:00
Christoph Lohmann
5d3318c0c7 Fixing title setting with the title argument. 2013-06-09 15:52:35 +02:00
Christoph Lohmann
369734c80c Adding xterm behaviour to setting the title.
Thanks Airwave!
2013-06-06 19:09:18 +02:00
Christoph Lohmann
7530694987 Adding true mouse motion support. 2013-06-01 14:37:30 +02:00
Christoph Lohmann
d743b93fda This is a shorter bit handling in MODE_MOUSE. 2013-06-01 13:17:20 +02:00
Christoph Lohmann
317b785921 Add some comments about the other mouse reporting modes. 2013-06-01 13:13:01 +02:00
Christoph Lohmann
405fd89ac1 Implementing mouse focus and all events. 2013-06-01 13:06:53 +02:00
Christoph Lohmann
8315dc4179 Fixing bad highlighting on first SNAP_WORD multiline select. 2013-06-01 12:23:55 +02:00
Christoph Lohmann
b5144100a5 Fixing the selection in a single line again.
Thanks p37sitdu@lavabit.com!
2013-05-26 16:10:22 +02:00
Christoph Lohmann
8f1bef0502 Fixing the selection scrolling and the selection naming.
Thanks p37sitdu@lavabit.com!
2013-05-26 13:07:26 +02:00
Christoph Lohmann
8f47c4a4de Lazy font unloading too. 2013-05-11 21:59:55 +02:00
Christoph Lohmann
62502a88e9 Lazy fontset loading.
Thanks Johannes Hofmann <Johannes.Hofmann@gmx.de>!
2013-05-11 08:54:26 +02:00
Christoph Lohmann
678eff6e18 Removing an old select() regression. 2013-05-06 19:50:14 +02:00
Christoph Lohmann
8e968739c3 Allow more complex delimiters for word selections.
Thanks Alexander Rezinsky <alexrez@gmail.com>!
2013-05-04 19:04:20 +02:00
Christoph Lohmann
0c2b513d01 Expand the last line with '\n' in case of overselection.
Thanks Alexander Rezinsky <alexrez@gmail.com>!
2013-05-04 19:00:32 +02:00
Christoph Lohmann
634c247fa7 Select to the end of row if end of line is reached.
Thanks Alexander Rezinsky <alexrez@gmail.com>!
2013-05-04 08:05:11 +02:00
Christoph Lohmann
5938fa9d32 Better comments for the snapping code. 2013-05-04 08:01:17 +02:00
Christoph Lohmann
8618386de9 More stable blinking. 2013-05-01 13:14:46 +02:00
Christoph Lohmann
911ba5674b Selection snapping is now considering wrapping.
Thanks Alexander Rezinsky <alexrez@gmail.com> for mentioning this!
2013-04-28 18:14:15 +02:00
Christoph Lohmann
a53017c8b4 Add a possibility to modify the string sent by mouse buttons.
Thanks Alexander Rezinsky <alexrez@gmail.com> for the suggestion!
2013-04-28 17:42:30 +02:00
Christoph Lohmann
a77b01176a Be more efficient in blinking. 2013-04-26 18:55:40 +02:00
Christoph Lohmann
1e09726518 Enable blinking in st. 2013-04-26 18:41:54 +02:00
Christoph Lohmann
1b2751f5c2 Fixing the selection handling to allow one char selection.
Thanks Alexander Sedov <alex0player@gmail.com> for suggesting the fix!
2013-04-25 06:28:11 +02:00
Christoph Lohmann
0851f2be2a Fixing the selection issue in altscreens. 2013-04-24 21:30:59 +02:00
Alexander Sedov
011c0f9e5b Removed redundant check in draw code.
We're now clearing empty areas with spaces, so there is no point to check
if character contains non-empty string.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-24 21:27:56 +02:00
Roberto E. Vargas Caballero
048c54fd5b Fix selecting clearing and BCE
The commit b78c5085f7 changed the st behaviour enabling BCE capability,
that means erase regions using background color. Problem comes when you
clear a region with a selection, because in this case the real mode of the
Glyph is not the value of term.line[y][x], due in drawregion we had enabled
the ATTR_REVERSE bit.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-23 20:36:30 +02:00
Christoph Lohmann
6b03bb769a Now clipping is more clear. 2013-04-23 19:37:28 +02:00
Christoph Lohmann
db6f796ecf Removing the overdrawing of some fonts. 2013-04-23 19:17:50 +02:00
Christoph Lohmann
2bd6afd1c9 Implementing 8 bit mode for meta. 2013-04-23 15:22:14 +02:00
Christoph Lohmann
b596d6ba3c Adding wrap handling in selection. 2013-04-21 13:01:16 +02:00
Alexander Sedov
872a7f18ea Added support for double/triple click+dragging.
Now double-click+dragging automatically snaps both ends to word boundaries
(unless on series of spaces), and triple-click selects whole lines.
As a side effect, snapping now occurs on button press, not button release
like it previously was, but I hope that won't be inconvenient for anyone.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-20 15:54:19 +02:00
Alexander Sedov
e5ff746430 Selection now handles empty lines less counter-intuitively.
Now, when you are selecting a region, you will get all empty lines that happen
to be in it, including trailing ones. Last line terminator is omitted as it previously
was, though.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-18 16:51:52 +02:00
Christoph Lohmann
da182612b7 Removing trailing whitespace. 2013-04-18 06:51:18 +02:00
Alexander Sedov
b7e6a5c825 Got rid of redundant Glyph state.
Now, newly allocated Glyphs are set to spaces and current cursor colors
with tclearregion() routine.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-18 06:48:06 +02:00
Christoph Lohmann
3ae0299064 Removing unneeded comments. 2013-04-18 06:41:54 +02:00
Alexander Sedov
fed9968ba5 Got rid of code duplication in tnew() and tresize().
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-18 06:39:43 +02:00
Alexander Sedov
0ca0dd8b11 Strip trailing spaces from lines when copying selection.
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-14 21:32:53 +02:00
Christoph Lohmann
c371fe58a3 Enable BCE everywhere. 2013-04-14 18:30:10 +02:00
Christoph Lohmann
44db38a5f8 Fix the geometry handling. 2013-04-13 15:24:26 +02:00
Christoph Lohmann
de4cd2f6af Resize now uses xclear(). 2013-04-13 09:49:11 +02:00
Christoph Lohmann
1e7816c202 Drawing a more visible rectangle as cursor on unfocus.
To have a more visible cursor on unfocused windows this patch makes st draw a
rectangle around the terminal cell.

Thanks Mark Hills <mark@xwax.org> for the suggestion!
2013-04-13 09:44:00 +02:00
Christoph Lohmann
5dc48af29e Patching while not really woken up. 2013-04-13 08:51:30 +02:00
Christoph Lohmann
5984657c00 Minor naming issue fixed. 2013-04-13 08:50:38 +02:00
Christoph Lohmann
4018b2c507 Making the copy and pasting consistent.
The copying and pasting in the terminald and GUI world is flawed. Due to the
discussion on the mailinglist it seems that sending '\n' is what GUIs expect
and '\r' what terminal applications want. St now implements that behaviour.
2013-04-13 08:48:17 +02:00
Christoph Lohmann
684cf55a0d Make st work with a plain -e command. 2013-04-10 17:48:32 +02:00
Christoph Lohmann
b1813b14d9 Adopting arg.h with more flexible cmd handling. 2013-04-03 21:00:38 +02:00
Christoph Lohmann
580c8bbd46 Add an option to disable alternative screens. 2013-04-03 20:42:27 +02:00
Christoph Lohmann
7e7760c2ed Add the possibility to have default highlight colors.
Thanks to stargrave@stargrave.org for the suggestion!
2013-03-29 19:01:24 +01:00
Christoph Lohmann
a1e3b94b37 Removing an undefined case. just do regular selections. 2013-03-29 18:39:01 +01:00
Christoph Lohmann
4b17dddb10 Making rectangular selection work again.
People sending me patches against strange revisions and basing on their own
revisions make me having to reapply them. Then such errors appear.

Thanks Alexander Sedov <alex0player@gmail.com> for noticing this.
2013-03-20 21:19:28 +01:00
Christoph Lohmann
55adf0aad1 Pange seems to use ascent + descent instead of height.
Thanks Bobby Powers <bobbypowers@gmail.com> for noticing this!
2013-03-10 21:16:51 +01:00
Christoph Lohmann
c6b89f23e7 Using strsep and fixing null termination in csiparse.
Thanks for the hint from Alexander Sedov <alex0player@gmail.com>!
2013-02-26 21:43:40 +01:00
Christoph Lohmann
1c1621da69 Changing the way how paste is handled, just for the nano people. 2013-02-26 19:08:51 +01:00
Christoph Lohmann
1aa26b4ecd Fixing a bug while parsing empty arguments in csiparse. 2013-02-26 19:07:23 +01:00
Christoph Lohmann
7d32471eff Fixing bugs in the strtol and strtok_r replacements.
Thanks "Roberto E. Vargas Caballero" <k0ga@shike2.com> for the comments!
2013-02-26 18:19:44 +01:00
Christoph Lohmann
7cb0d95509 Using strtok_r for the string parsing. 2013-02-25 13:36:40 +01:00
Christoph Lohmann
37863356b0 Using strtol with overflow checking. 2013-02-25 13:23:56 +01:00
Christoph Lohmann
be7c6d7fb0 Add insert for the primary clipboard to MOD + Shift + Ins.
Thanks Mantas Mikulėnas <grawity@gmail.com> for the patch!
2013-02-23 21:50:13 +01:00
Christoph Lohmann
e40d8da194 Removing dbe and introducing umlauts to titles.
Thanks Alexander Sedov <alex0player@gmail.com> for the title patch!
2013-02-23 21:44:06 +01:00
Christoph Lohmann
efaf1c2a94 Add umlaut support for title change.
Thanks Alexander Sedov <alex0player@gmail.com>!
2013-02-23 21:20:21 +01:00
Christoph Lohmann
1b6c6535c1 Replace parse_int with atoi(). 2013-02-23 21:17:25 +01:00