Commit Graph

750 Commits

Author SHA1 Message Date
Jan Christoph Ebersbach
3ba9c8fc3f Expose cursor shape in config.def.h
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2015-09-08 16:29:05 +02:00
Roberto E. Vargas Caballero
1f087aa8b7 Add key to send a break to the serial line 2015-09-08 12:10:11 +02:00
Christoph Lohmann
aa5d4c3b34 Making st.1 more descriptive about -l and fix -l in st.c. 2015-09-07 22:59:05 +02:00
Christoph Lohmann
9eeb4e1ea2 Reordering and adding control codes.
For completeness and documentation add all C1 control codes.
2015-08-31 15:26:21 +02:00
Christoph Lohmann
0c94f8621b Merge branch 'master' of ssh://suckless.org/gitrepos/st 2015-08-30 11:29:23 +02:00
Christoph Lohmann
0d838b7243 Don't read if we chunked the input data. 2015-08-30 11:28:35 +02:00
Roberto E. Vargas Caballero
7e61f5e4c5 Do not mark as invalid UTF8 control codes
wcwidth() returns -1 for all the non visible characters, but it doesn't
necessarilly mean that they are incorrect. It only means that they are not
printable.
2015-08-18 08:31:51 +02:00
Alex Kozadaev
ee5cad439b Adding mouse colour/shape settings 2015-07-28 12:21:11 +02:00
Christoph Lohmann
dc33d1d66e Adding -T to the usage too. 2015-07-24 18:25:33 +02:00
Christoph Lohmann
b5e29cce52 Add -T, as recommended by Dmitrij D. Czarkoff 2015-07-24 18:24:10 +02:00
Quentin Rameau
4a193b9686 Fix type for write(2) return variable.
A little fix in xwrite().

>From 3727d2e3344b57128ab51c7839795204f1f839ff Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Fri, 24 Jul 2015 11:40:46 +0200
Subject: [PATCH] Fix type for write(2) return variable.

The allocated lengh of s fits into an integer so we can safely use
ssize_t here.
2015-07-24 12:01:56 +02:00
Roberto E. Vargas Caballero
62756fdb49 Fix style in execsh 2015-07-24 07:44:34 +02:00
Christoph Lohmann
d032b61597 Make the comment for the IM XFilter more understandable. 2015-07-10 14:31:40 +02:00
Christoph Lohmann
684c72d05e Return style unification. 2015-07-10 14:30:37 +02:00
Christoph Lohmann
b823f57fa0 Aligning the macros. 2015-07-10 14:21:52 +02:00
Christoph Lohmann
684f0a0729 Unix end of file. 2015-07-10 14:19:52 +02:00
Christoph Lohmann
d3c7b6fb73 No inline declarations please. 2015-07-10 14:19:31 +02:00
Christoph Lohmann
41f70a1cff Typo and the missing incr atom from the patches. 2015-07-10 14:17:51 +02:00
Christoph Lohmann
261ea4b7e0 Implement chunked write to the cmdfd.
This is needed so big input like a paste of several megabyte does not clog our
I/O.
2015-07-10 14:15:39 +02:00
Christoph Lohmann
f8c6e7d041 Implement INCR transfers in the clipboard. 2015-07-10 14:10:17 +02:00
FRIGN
f1307d91e2 Don't treat clauses like functions
and add a space between the keyword and the parentheses.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2015-07-10 13:58:31 +02:00
FRIGN
13233574ed Use BSD-style function notation
Put the opening brace on a new line. This was already used for some
functions inside st.c.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2015-07-10 13:58:09 +02:00
FRIGN
9de853a98d Unboolify st
This practice proved itself in sbase, ubase and a couple of other
projects.
Also remove the True and False defined in X11 and FcTrue and FcFalse
defined in Fontconfig.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2015-07-09 18:34:46 +02:00
FRIGN
abfad4c4fc Remove insane *_FILENO and EXIT_* usage
Any system having different assignments than the usual 0, 1, 2 for
the standard file numbers and 0, 1 for the exit-statuses is broken
beyond repair.
Let's keep it simple and just use the numbers, no reason to fall
out of the window here and bend down for POSIX.
In one occasion, the ret-variable was not necessary. The check was
rewritten.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2015-07-09 18:34:41 +02:00
Weng Xuetian
5f48e89716 Revert "Remove unnecessary XFilterEvent call."
This reverts commit d2937b05ae.
2015-07-02 11:11:55 +02:00
Quentin Rameau
bdd649a102 do not truncate font size when zooming 2015-06-19 11:49:13 +02:00
Roberto E. Vargas Caballero
71fa10f613 Revert "Optimize memory footprint of line buffers"
This reverts commit 7ab6c92e18.
We need 32 bits for real color support.
2015-06-03 08:07:55 +02:00
Jan Christoph Ebersbach
caa97cc781 Support UTF-8 characters as word delimiters
For a higher usefulness of the utf8strchr function, the index of the
UTF-8 character could be returned in addition with a Rune instead of a
char*.  Since utf8strchr is currently only used by ISDELIM I didn't
bother to increase the complexity.
2015-05-25 08:35:32 +02:00
Roberto E. Vargas Caballero
c03548750b Merge branch 'master' of ssh://suckless.org/gitrepos/st 2015-05-15 07:51:58 +02:00
v4hn
8e15887de9 set selection to IDLE on clear
Otherwise a tangling bmotion event will consider
the selection still valid and selnormalize segfaults
because of an invalid sel.ob.y index.
2015-05-15 07:42:40 +02:00
suigin
89cf0fc597 Small bugfix for makeglyphfontspecs call in drawregion
Here's a patch that fixes a bug when calling `makedrawglyphfontspecs'
in `drawregion'. Wasn't offseting the pointer into the input glyphs
array by `x1'. The bug isn't causing any problems currently, because
`drawregion' is always called with `x1' and `y1' values of 0, but if
this ever changes in the future, the bug would certainly cause some
problems.
2015-05-12 07:37:13 +02:00
Christoph Lohmann
980991fa6e Fix the new -e handling. An empty cmd has to work for backwards compatibility. 2015-05-10 15:19:48 +02:00
suigin
ae1923d275 Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.

This patch is a pretty big change to xdraws so your scrutiny is
appreciated.

First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:

Before Patch
============

1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
   cwscale: 1.0, chscale: 1.0
   For 273x83 100 frames.
   Elapsed time :     1.553
   Frames/second:    64.352
   Chars /second: 1,458,159

2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
   cwscale: 1.001, chscale: 1.001
   For 239x73 100 frames.
   Elapsed time :   159.286
   Frames/second:     0.627
   Chars /second:    10,953

After Patch
===========

3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
   cwscale: 1.0, chscale: 1.0
   For 273x83 100 frames.
   Elapsed time :     1.544
   Frames/second:    64.728
   Chars /second: 1,466,690

4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
   cwscale: 1.001, chscale: 1.001
   For 239x73 100 frames.
   Elapsed time :     1.955
   Frames/second:    51.146
   Chars /second:   892,361

As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.

So what does the patch do?

The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.

I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.

The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.

There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.

This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.

I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.

Anyway, if you see any problems, please let me know and I can fix them.
2015-05-07 12:03:44 +02:00
suigin
38af006b5e Changed type for UTF-32 codepoints from long to uint_least32_t 2015-05-06 08:15:41 +02:00
noname
c990abfedf Fix empty selection highlighting bug.
When user clicks LMB, one character is selected, but will not be copied
to selection until the user moves cursor a bit. Therefore, the character
should not be highlighted as selected yet.

Before the patch, the trick was not to mark line as dirty to avoid
highlighting it. However, if user has already selected something and
clicks in line that contains selection, selclear sets the line as dirty
and one character is highlighted when it should not.

This patch replaces dirty trick with explicit check for sel.mode inside
selected().
2015-05-04 12:06:43 +02:00
noname
3cb7f27afe Fix indentation. 2015-05-04 12:00:10 +02:00
noname
1811b6030c Add enumeration for sel.mode
This patch also prevents sel.mode from increasing beyond 2. It is almost
impossible, but sel.mode may overflow if mouse is moved around for too
long while selecting.
2015-05-04 11:57:17 +02:00
noname
22571ea4e8 selnormalize: make special case explicit
Special case is when regular selection spans multiple lines.
Otherwise, just sort sel.ob.x and sel.ob.y.
2015-05-04 11:47:53 +02:00
noname
8751809aff selsnap: simplify SNAP_LINE case
Also make sure y never exceeds term.row-1 even if ATTR_WRAP is set for
some reason.
2015-05-04 11:41:55 +02:00
noname
765bb0fd14 Remove first argument of selsnap. 2015-05-04 11:16:08 +02:00
Jochen Sprickerhof
07ce96a3a0 Fix sigchld
Only wait for termination of the shell.
2015-05-04 10:57:40 +02:00
mvdan@mvdan.cc
190b94c7a2 len assignment is never used
Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
2015-04-27 10:10:30 +02:00
mvdan@mvdan.cc
4f21c41a1c Clarify calculation precedence for '&' and '?'
Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
2015-04-27 10:09:49 +02:00
mvdan@mvdan.cc
3a5053f6c1 Use %u for uint
Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
2015-04-27 10:09:15 +02:00
suigin
7ab6c92e18 Optimize memory footprint of line buffers 2015-04-27 10:05:14 +02:00
noname@inventati.org
0622ad9bad Make tputc, tsetchar and techo accept unicode 2015-04-27 09:50:40 +02:00
noname@inventati.org
21f765426c Change internal character representation. 2015-04-27 09:50:01 +02:00
noname@inventati.org
753fe862b1 Remove last parameter of utf8encode
This parameter was always UTF_SIZ, so it is better remove it and
use directly UTF_SIZ in it.
2015-04-27 08:59:45 +02:00
noname@inventati.org
61c35cd246 Use utf8len instead of utf8decode. 2015-04-27 08:58:37 +02:00
alp@alexpilon.ca
742a41d655 Make build shut up about system() without return value check.
st.c:1321:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result]
            system(cmd);
            ^~~~~~ ~~~

Debatable whether an error here should case exit(EXIT_FAILURE). Just
preserving the existing behaviour for now.
2015-04-27 08:57:51 +02:00
Roberto E. Vargas Caballero
f36dd277a2 Merge remote-tracking branch 'origin/master' 2015-04-23 17:59:39 +02:00
Roberto E. Vargas Caballero
0d7448dabc Fix segmentation fault in strhandle()
We cannot pass strescseq.args[0] to atoi when nargs is zero,
because in this case it will be null.
2015-04-23 17:59:10 +02:00
Roberto E. Vargas Caballero
b17aa18f7c Uses a &[] pointer loop instead of + pointer loop 2015-04-23 17:59:10 +02:00
noname@inventati.org
736685d641 Do not set terminal title based on stty arguments. 2015-04-23 17:59:10 +02:00
noname@inventati.org
89807ed453 Move common code to xloadcolor 2015-04-21 09:48:33 +02:00
noname@inventati.org
84c756b97e Use LEN(dc.col) instead of LEN(colorname).
LEN(colorname) may be below 256 for some configurations.
2015-04-21 08:13:46 +02:00
noname@inventati.org
2fdcc5e5f6 Remove WIN_REDRAW flag.
WIN_REDRAW flag was not used since introduction of Xdbe
in commit 94771d0588
2015-04-21 07:49:07 +02:00
noname@inventati.org
ab69ea89b7 Place memset arguments in the correct order. 2015-04-20 09:29:24 +02:00
noname@inventati.org
5528280fae Remove explicit 'return' from 'void' functions. 2015-04-20 09:28:14 +02:00
noname@inventati.org
6dc2b546ec Increment accuaracy in drawtime calculation
This way is a bit more accurate.
2015-04-20 09:20:35 +02:00
noname@inventati.org
c27c731b9f Monotonic clock cannot jump backwards.
The check was introduced back when st used gettimeofday.
The condition is also modified to increment the accuaracy of the
calculation.
2015-04-20 09:18:40 +02:00
noname@inventati.org
6ee56d6590 Place tlinelen type on separate line. 2015-04-20 08:30:49 +02:00
Roberto E. Vargas Caballero
215bdb2da3 Add tty line support
Not always is desirable to create a pseudo terminal, and some times
we want to open a terminal emulator over a tty line. With this new
patch is possible to do someting like:

	$ st -l /dev/ttyS0 115200

Without this option was needed to launch another terminal emulator
over st (for example minicom, picocom, cu, ...).
2015-04-15 10:52:44 +02:00
sin
56abffb4b6 Fix memmove() invocation with src/dst being NULL
This fixes a segmentation fault on some systems.
2015-04-15 10:51:00 +02:00
noname@inventati.org
aff35af275 Use as command arguments the remaining parameters
This change allows execute st as 'st mutt' while it keeps the
compability with xterm and urxt.
2015-04-14 09:55:15 +02:00
Roberto E. Vargas Caballero
83e73c6242 Merge branch 'master' of ssh://suckless.org/gitrepos/st 2015-04-14 09:47:19 +02:00
Markus Wichmann
42fa1f5ce4 Implement most ICCCM rules for selection handling.
ICCCM mandates the use of real timestamps to interact with the
selection, to rule out race conditions if the clients are run at
different speeds. I have implemented the low hanging fruit, putting the
timestamps into text selection. Also, ICCCM mandates a check for whether
XSetSelectionOwner() worked. Not sure my version is correct, though.
2015-04-13 22:18:45 +02:00
Roberto E. Vargas Caballero
23ed12857f Merge branch 'master' of ssh://suckless.org/gitrepos/st 2015-04-13 22:01:40 +02:00
noname@inventati.org
9eb70a2d3e Do not use tmoveto in tputtab.
tmoveto resets CURSOR_WRAPNEXT.

Simple testcase:

for i in $(seq 1 200); do
	printf '\t.';
	usleep 100000;
	printf '\t@';
	usleep 100000;
done

In st executing this script causes @ and . to overwrite each other in
the last column.
2015-04-13 21:33:36 +02:00
noname@inventati.org
9619760e12 tresize: remove unnecessary if 2015-04-13 17:12:49 +02:00
noname@inventati.org
b94ad75e5d Remove 'titles' variable.
We do not free it until exit anyway.
2015-04-13 17:00:08 +02:00
noname@inventati.org
e6dd0f825d Remove useless if in tstrsequence. 2015-04-13 15:17:24 +02:00
noname@inventati.org
b0310fba5d Simplify tmoveto.
LIMIT returns value. This fact is already used in x2col and y2row.
2015-04-13 15:15:47 +02:00
noname@inventati.org
9d1495f9ee Fix typo.
It seems that LICENSE files are more common than LICENCE files.
At least this patch makes spelling consistent.
2015-04-13 14:26:01 +02:00
noname@inventati.org
c569e3146e Remove 'slide' variable in tresize. 2015-04-13 10:18:08 +02:00
noname@inventati.org
39ae1a4de5 Move tresize comments around. 2015-04-13 09:26:03 +02:00
noname@inventati.org
6352502d64 tresize: move for loop outside if
There is no need to check that slide > 0 before executing loop.
If slide <= 0, loop stops immediately.
2015-04-13 09:21:03 +02:00
noname@inventati.org
b9390a5496 Simplify loop condition. 2015-04-13 09:20:00 +02:00
noname@inventati.org
d2937b05ae Remove unnecessary XFilterEvent call.
XFilterEvent usually filters KeyPress events according to input method.
At this point the window is not mapped. The only events that we process
are ConfigureNotify and MapNotify. They should not be filtered by input
method.
2015-04-13 09:17:06 +02:00
noname@inventati.org
d3e0f3444b Use do..while in window mapping loop. 2015-04-13 09:15:42 +02:00
Omar Sandoval
ecac5ee35e Make DECSCUSR thickness configurable 2015-04-10 23:43:05 +02:00
noname
93b54cfcc4 Use MAX macro where possible. 2015-04-10 23:34:06 +02:00
noname
6f5f770186 Remove 'xloadfontset' function.
It was used only once and its return value was ignored.
2015-04-10 23:31:53 +02:00
noname
6524f022f7 Remove keywords from function definitions. 2015-04-10 23:28:21 +02:00
noname
9305f3c184 Remove variable names from function declarations. 2015-04-10 23:28:16 +02:00
Roberto E. Vargas Caballero
5bb90125c8 Remove redundant control check
control was set, but it was not ever used because it was set
again some lines later.
2015-04-06 10:55:00 +02:00
noname
69d1fe06a9 Fixed STR sequence termination condition
ascii code may only be checked for characters that have length equal to
1, not width equal to 1
2015-04-06 10:52:47 +02:00
Roberto E. Vargas Caballero
288f80cb06 Remove strsep() call
strsep() is not a POSIX function, and it means that every system
needs different defines to expose it. If the prototype of strsep
is not exposed then an ugly int/pointer is done and it might mean
a crash. The best solution?, to remove the strsep and make a custom
loop. If C programmers cannot do this kind of loops without calling
a library function, then maybe we should move all the suckless
software to Java.
2015-03-20 07:29:28 +00:00
Roberto E. Vargas Caballero
c9357a8edf Merge remote-tracking branch 'origin/master' 2015-03-19 08:36:50 +00:00
LemonBoy
580302f317 Support the DECSCUSR CSI escape sequence 2015-03-19 05:36:54 +00:00
Alex Pilon
b341e51351 Handle pasting of empty selection.
Otherwise, pasting the X11 primary selection when empty results an
error and Xlib forcibly exits.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2015-03-16 20:31:15 +01:00
Roberto E. Vargas Caballero
86d1e432a8 Support XA_STRING in notify request
Some programs can only deal with XA_STRING, and it makes impossible st
be able of copying to them. This patch makes st answer also to XA_STRING,
althought it sends utf8 strings. It is not a problem because moderm
applications must support utf8.
2015-03-15 18:07:46 +00:00
Christoph Lohmann
2fcfea1bf1 Add Mod + Shift + c/v and no selclear.
Thanks to Alex Pilon <alp@alexpilon.ca>!

Now there is a distinction between the primary and clipboard selection. With
Mod + Shift + c/v the clipboard is handled. The old Insert behavious does
reside.
2015-03-14 07:41:59 +01:00
Christoph Lohmann
28259f5750 St now does only set PRIMARY on selection.
http://standards.freedesktop.org/clipboards-spec/clipboards-latest.txt
2015-03-10 21:58:32 +01:00
Christoph Lohmann
9494362d0b Fixing the C reading test.
This was a test to see if anyone actually reads what is submitted. The list of
people not contributing will be valuable in the future.
2015-03-10 21:11:04 +01:00
Christoph Lohmann
b0bddc694a Add a hack to handle unknown chars in fontconfig.
The unicode long is added to the cache. So when fontconfig does fall back to
the default font (where there is no easy way to find this out from the
pattern) it isn't reloaded.
2015-03-09 23:16:03 +01:00
Ivan Delalande
1b514048b2 Let curses do the dirty work for flash
Use the terminfo delay syntax ($<x>) in our flash capability to avoid
hardcoding a fixed delay in redraw() when called from tsetmode() with
DECSCNM.
We need to turn on the npc capability so that delays are made with
xon/xoff instead of padding characters.
2015-02-22 11:53:34 +00:00
Nils Reuße
c5f1d74fd8 Update year in usage() 2015-02-15 17:46:15 +01:00
Nils Reuße
7dd24bfb4c Fix crash on font resize resize
if you keep downsizing your fontsize until either xw.ch or xw.cw gets 0,
st crashes, because there is an unchecked division in cresize.
2015-02-15 17:12:36 +01:00
Rian Hunter
aba6c292af Correct shift amount on MODE_INSERT in tputc()
When MODE_INSERT is set we'd shift characters on the same
line forward before inserting our character in tputc().
This did not account for wide characters where width != 1.
This patch makes it so we shift the correct amount.
2015-02-05 20:28:00 +01:00