Commit Graph

833 Commits (2c5edf28ec851907305d73c6218ce75d39f1767f)

Author SHA1 Message Date
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
Rian Hunter 4d14d97547 Fix crash due to wide characters
In tputc(), when a character wasn't large enough to fit
on the current line, we would call tnewline() to place it on
the next line. Unfortunately, we weren't resetting our glyph
pointer and this caused memory corruption when a
wide character (width == 2) was being written. This patch
resets our glyph pointer after calls to tnewline().
2015-02-05 20:28:00 +01:00
Ivan Delalande 708b697ed7 Fix crash due to invalid timespec given to pselect
If blinktimeout is set to a value greater than 1000, pselect will
receive a timeout argument with tv_nsec greater than 1E9 (1 sec), and
fail, making st crash. This patch just ensures that the timespec
structure is correctly filled with a value properly decomposed between
tv_sec and tv_nsec.

Reported by JasonWoof on IRC. Thanks!
2014-12-23 16:20:59 +01:00
Ivan Delalande 09f5d98251 Trim trailing whitespaces in every selection case
Trailing whitespaces are trimmed when copying from normal selection and
rectangular selection on lines that have their last character included
or on the left of the selection. It leads to inconsistent behaviors when
copying the exact same text from the left and right window in
applications with vertical splits.
This patch solves this issue by always trimming the selection.
2014-11-19 18:53:17 +01:00
sin 4418939dd9 Call _exit() instead of exit() if exec*() fails
exit() will also unwind the atexit() functions.  This is bad
because if exec*() fails the process is in an inconsistent state.
2014-11-19 18:52:42 +01:00
Eric Pruitt bafbba56cd Check for presence of SHELL environment variable
- POSIX states the SHELL environment variable "... shall represent a
  pathname of the user's preferred command language interpreter." As
  such, st should check for its presence when deciding what shell to
  use; just as HOME can be defined to override one's passwd-defined home
  directory, a user should also be able to override their passwd-defined
  shell using the SHELL environment variable.
2014-11-11 19:20:56 +01:00
czarkoff@gmail.com 11625c7166 Replace character with U+FFFD if wcwidth() is -1
Helpful when new Unicode codepoints are not recognized by libc.
2014-11-03 22:52:58 +01:00
Quentin Rameau 008aae541b Avoid failing when embedding with a Window id of 0
I'd like to let st run with its own window when trying to embed it to a window with id 0 instead of exiting with an error.
2014-10-21 18:18:26 +02:00
Roberto E. Vargas Caballero f9fb620914 Do not set SHELL to utmp ever
SHELL must be set to the SHELL of the user, but it was possible set
it to utmp.
2014-10-15 19:42:20 +02:00
CustaiCo 86633ada91 patch for bell in st
The XBell() call currently used when a bell is recieved sends a message
to the X server, but if the X server doesn't know how to sound it,
it just gets ignored and I have not been able to find anywhere in x.org's
code a way to configure the action that the server does.

However, if you use XkbBell() then you can have a process listening for
the XkbBellNotifyEvent that is produced and either alert you visually or
play an audio file or whatever you want as your notification. You have
to include one more header file but the function seems to be compiled as
part of Xlib, at least on my installation.

CustaiCo
2014-10-13 19:15:52 +02:00
Roberto E. Vargas Caballero 88429cdcbf Add LS2 and LS3
These sequences are the equivalents of LS0 and LS1, but for G2 and
G3.
2014-10-08 11:33:36 +02:00
Roberto E. Vargas Caballero 0c8feecbf7 Fix SI and SO
SI (0x0F or ^O) means Shift In, and it selects G1 charset definition,
and SO (0x0E or ^N) means Shift Out, and it selects G0 charset
definition, but st was doing just the inverse.
2014-10-08 11:28:54 +02:00
Christoph Lohmann 63a07eb19c Minor style changes for the last patch. 2014-09-29 15:40:37 +02:00
Christoph Lohmann dc8c5c82aa Implementing xzoomreset.
Thanks mvdan@mvdan.cc for proposing this.
2014-09-29 15:38:21 +02:00
Roberto E. Vargas Caballero c7a945c408 Add missed names of charset sequences 2014-09-23 07:16:58 +02:00
Roberto E. Vargas Caballero 5afb3862ba Add support for utmp in st
St runs an interactive shell and not a login shell, and it means
that profile is not loaded. The default terminal configuration
in some system is not the correct for st, but since profile is
not loaded there is no way of getting a script configures the
correct values.

St doesn't update the utmp files, this is the job of another
suckless tool, utmp. Utmp also opens a login shell (it is the
logical behaviour when you create a new user record) it is a
good option execute utmp and then get a correct input in
utmp, wtmp and lastlog file, and execute the content of the
profile.
2014-09-23 07:12:41 +02:00
Roberto E. Vargas Caballero 0392d165d0 Remove indentation level in xdrawcursor 2014-09-09 05:51:36 +02:00
Ben Hendrickson 98a1085d0e Removing wrapping newlines from selection
When getting selected text, lines that were wrapped because of length
ought not include the wrapping newline in the selection.

This comes up, for example, when copying a bash command that is long
enough to wrap from the console and pasting it back into the console.
The extra newline breaks it.

Similiarly, changes behavior when trimming whitespace from the end of a
physical line to only do so if the line does not wrap. Otherwise we are
trimming whitespace from the middle of a logical line, which may change
its meaning.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-23 09:52:18 +02:00
Ivan Delalande 51466e019a Change the behavior of word snapping on delimiters
This makes any sequence of identical delimiters be considered a single
word in word-snapping mode. This seems more coherent for this mode and
is similar to what xterm does.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-21 17:50:31 +02:00
Ivan Delalande c490a60b80 Move calls to selsnap into selnormalize
This simplifies getbuttoninfo() and bpress(), and fixes a bug which made word
snapping behave incorrectly when a delimiter was at the beginning or end of
line.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-21 17:50:31 +02:00
Alexander Huemer 83dea7fd7b Improve readability of enum members
The 'left shift from one' notation of power of two integers is more
expressive than the result.

Signed-off-by: Alexander Huemer <alexander.huemer@xx.vu>
Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-20 21:52:33 +02:00
Roberto E. Vargas Caballero e5f6736ee0 Add eschandle()
We already have a csihandle() function, where is located code about
CSI sequences, so it is logical do the same with ESC sequences.
This change helps to simplify tcontrol(), which has a complex flow
and should be rewritten.
2014-08-20 21:52:33 +02:00
Roberto E. Vargas Caballero a3549c2eec Improve execsh() and don't allow anonymous shells
This patch improves the shell selection on execsh and forbid
shell with users don't registered in the passwd file.
2014-08-20 09:03:44 +02:00
Roberto E. Vargas Caballero 8342036f98 Fix definition of CONTROLC0
DEL character is not thecnically talking a C0 control character,
although it has some common properties with them, so it is useful
for us consider it as C0. Before this patch DEL (\177), was not
ignored as it ought to be.
2014-08-19 12:57:44 +02:00
Quentin Carbonneaux 177d888dff reset the alt screen in treset
Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-19 12:57:43 +02:00
Quentin Carbonneaux fa04911c91 simplify loop in tresize
Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-19 12:57:43 +02:00
Roberto E. Vargas Caballero 8f3e6a577d Fix man page and usage()
Man page was repeating -f option, the second time instead of -i,
and this option was lost in usage() message. This patch also indent
the output of usage().
2014-08-17 20:49:33 +02:00
Roberto E. Vargas Caballero f8b4998b32 Convert VT102ID to a config variable
VT102ID is the sequence that the terminal returns when it is inquired
to identify itself. This value should be configurable in the same
way that another st parameters.
2014-08-15 15:00:48 +02:00
Roberto E. Vargas Caballero 6530025bca Fix portability problem in techo()
ISCONTROL chechks if a value is between 0 and 0x1f or
between 0x80 and 0x9f. Char signess depends of architecture
and compiler, so in some environment the second case is
always false (and wrong), Techo() calls ISCONTROL with a
char variable, whose type cannot be changed because tpuc()
expects a pointer to char, so the solution is to insert a
cast in the call to ISCONTROL.
2014-08-15 14:48:16 +02:00
noname d4a17316d3 Don't set dirty all lines because tswapcreen do it
Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-10 22:22:42 +02:00
noname 20c4f12254 tresize return value is not used
Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-08-10 22:16:21 +02:00
Roberto E. Vargas Caballero 8de8ae3923 Unset mode when clearing regions
tclearregion() was clearing regions using spaces and the current
attributes of the terminal. It was correct with all the modes excepct
underline, because they didn't affect the space character, but in
the case of underline it was a problem. A easy way of seeing this
problem is writing this in the last line of the terminal:

	tput smul ; echo first; tput rmul; echo second; echo third

Fist was underlined, and second and third were not underlined, but
the spaces at the right of second was underlined becuause in the
previous scrool underline mode was set.
2014-08-07 10:11:38 +02:00
Roberto E. Vargas Caballero ec3268961d Add error message when child exits whit error
Master proccess was not showing any error message when the child
died with an error, and it was very confusing for the user (for
example with incorrect -e command).
2014-08-04 22:07:04 +02:00
Roberto E. Vargas Caballero 769d481807 Remove difference between fast and slow blinking
One blinking mode is good enough, and two is too much. The best aproach
is emulate the fast blinking with the slow blinking, that it is more
used.
It is removed the flag ATTR_FASTBLINK because it has not a different
meaning of ATTR_BLINK, so it is not needed.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-07-31 19:40:37 +02:00
Michael Forney b4dfa18124 Fix disabling of bold and fastblink
According to ECMA-48¹ 8.3.117, an attribute value of 21 is "doubly
underlined", while 22 is "normal colour or normal intensity (neither
bold nor faint)".

Additionally, 25 is "steady (not blinking)", which likely means neither
slow blink nor fast blink.

¹: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-048.pdf

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-07-26 10:13:11 +02:00
Weng Xuetian 84ceefe089 Fix st with input method.
XFilterEvent need to be called against every event, otherwise it would
missing some message in the xim protocol and misbehave on some im server.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-07-19 19:46:31 +02:00
Eric Pruitt b5d0a13c10 Changed inconsistent indent
- A line was indented using spaces despite the rest of the code using
  tabs.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-07-15 19:30:48 +02:00
Roberto E. Vargas Caballero 984c12d2a6 Add 8 bit version of DCS, APC, PM, OSC
DCS, APC, PM, OSC version for 7 bits environments already was implemented
in st.  This patch adds the 8 bit version of it.
2014-07-08 23:32:28 +02:00
Roberto E. Vargas Caballero da78629cf5 Add 8 bit version of HTS
HTS version for 7 bits environments already was implemented in st.
This patch adds the 8 bit version of it.
2014-07-08 23:32:28 +02:00
Roberto E. Vargas Caballero f5356d0185 Add 8 bit version of NEL
NEL version for 7 bits environments already was implemented in st.
This patch adds the 8 bit version of it.
2014-07-08 23:32:25 +02:00
Roberto E. Vargas Caballero bcbaf5d9be Add 8 bit version of DECID
DECID version for 7 bits environments already was implemented in st.
This patch adds the 8 bit version of it.
2014-07-08 23:28:10 +02:00
Anders Eurenius f796533b1b Render faint attribute
Faint text is implemented by allocating a new color at one-half
intensity of each of the r, g, b components, or if the text bold at the
same time, it is not made lighter.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-07-08 22:46:55 +02:00
Ivan Delalande 955923b38b Remove all strcmp and strlen calls on Glyph.c[]
There were a few occurrences of strcmp and strlen being called on Glyph.c[],
which is not always null-terminated (this actually depends on the last values in
the buffer s in ttyread()). This patch replace all the calls to strcmp with a
test on c[0] directly or a call to tlinelen, and the one to strlen with utf8len.
I also took the opportunity to refactor getsel and tdumpline.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-07-08 09:21:48 +02:00
Anders Eurenius 1fc4afd1e6 Render struck-out attribute
Implement crossed-out text with an XftDrawRect call, similar to how
underline is implemented. The line is drawn at 2/3 of the font ascent,
which seems to work nicely in practice.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-27 14:07:22 +02:00
Anders Eurenius 21bd4f4f9d Render invisible attribute
Implement invisible mode by setting the foreground color to be the same
as the background color. Not rendering anything would also be an
alternative, but this seems less likely to cause surprises in
conjunction with any hacks.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-27 14:06:21 +02:00
Anders Eurenius 50e6355e0d Reorder and extend glyph attributes
Faint, invisible, struck and fast blink are added as glyph attributes.
Since there's an edit here, let's take the opportunity to reorder them
so that they correspond to the two's power of the corresponding escape
code. (just for neatness, let's hope that property never gets used for
anything.)

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-27 14:04:47 +02:00
Roberto E. Vargas Caballero 77569526c0 Remove CEIL macro
This macro was not correct in some cases, and it was used only in
one place, where we did'nt get any benefit in performance of in size,
so the macro is removed and ceilf is used instead of it. The only
function needed from math.h is ceilf, so this patch defines the
prototype of it instead of including math.h.
2014-06-26 12:37:06 +02:00
Ivan Delalande 19d095717f Fixed wrong nanosecond factor 10E6.
Commit 5edeec1 introduced a wrong factor for nanosecond computation, the correct
value is 1E6. Time and timeout values are 10 times less than they should be and
this cause high CPU usage.

Reported by pyroh on IRC. Thanks!

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-26 12:33:55 +02:00
FRIGN 5edeec1b20 Use monotonic clock to prevent timing issues
This patch replaces the gettimeofday()/timeval-system with
uses of clock_gettime() with a monolithic clock and timespec-structs.
gettimeofday() is not accurate and prone to jumps and POSIX.1-2008
marks it as obsolete. Read more here [0].

The patch should speak for itself and decreases the binary
size for me by almost 200K(!).

[0]: http://blog.habets.pp.se/2010/09/gettimeofday-should-never-be-used-to-measure-time

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-24 21:45:36 +02:00
Troy Sankey 58eaa998b3 update size hints on zoom
On font zooming (i.e. xzoom()), window size hints are not updated.  This
patch does that.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-21 10:03:41 +02:00
Silvan Jegen c2fd2754eb Refactor the innermost loop of the xdraws function
Signed-off-by: Silvan Jegen <s.jegen@gmail.com>
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-06-15 12:12:23 +02:00
Christoph Lohmann 587b443592 Style police. 2014-06-07 13:49:04 +02:00
Roberto E. Vargas Caballero 93661042a2 Simplify tdeftrans 2014-06-07 13:23:45 +02:00
FRIGN 18a05fdf43 Remove unnecessary typedef
This should also fix compiling-errors on OpenBSD,
as reported by Nils R. Thanks!

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-06 15:23:22 +02:00
Colona 5159d55c63 Refactor selsnap SNAP_WORD.
Refactor the SNAP_WORD part in selsnap, and fix a bug that caused the word
delimiters to be ignored if it was at the very beginning or end of a wrapped
line.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-05 21:14:45 +02:00
Colona 6fd887077e Fix rectangular selection.
selsort computes the wrong normalized coordinates when rectangular
selection is enabled, causing rectangular selection to only work
when going toward either the top left corner, or the bottom right
one.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-04 21:10:25 +02:00
Hiltjo Posthuma bb6dc33206 tiny cleanup
Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-04 21:09:07 +02:00
Colona 2323e962e6 Make selection consistent over line breaks.
Currently, selection is expanded to the end of the line over line breaks only in
regular selection mode, when the line in not empty and when going down and/or
right. This covers all the cases including word selection mode, with the
exception of rectangular selection because it would make this mode too rigid.
This adjustment is made in selsort so I renamed it to selnormalize to better
reflect what it does now.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-06-04 21:09:07 +02:00
Christoph Lohmann c6fcb78b3a Fixing color and refactor xsetcolorname.
By  the recommendation of FRIGN I refactored xsetcolorname to remove the
unnecessary r, g, b variables when allocating a new  color.  Colors  are
now freed and set to the new color. A die() should not happen here. Oth‐
erwise it is easy for applications to kill st. St should be resilent  to
malicious input.

Second  this  patch  standardises  the  naming  of  »color«. There is no
»colour« here. Maybe in some parts of the world.
2014-06-01 17:08:16 +02:00
Christoph Lohmann 8b4cfcea73 Revert "Refactor xsetcolorname()"
This reverts commit a32c5f5726.
2014-06-01 16:52:19 +02:00
FRIGN a32c5f5726 Refactor xsetcolorname()
I mainly improved the slightly off algorithm used to load colours in the 256-colour-space and
removed unnecessary local values (r,g,b,colour).
"colour" is not necessary as a punchbag for XftColorAlloc[Value,Name], as they don't mess with
the result-adress until they are absolutely sure everything worked out[0].

Being at it, I changed the error-returns for AllocValue to dies (just like in xloadcols()), as
a failure is most likely an OOM-situation you better catch early.
In case of an invalid name everything stays the same.

[0]: http://www.opensource.apple.com/source/X11libs/X11libs-40/libXft/libXft-2.1.13/src/xftcolor.c

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-06-01 16:20:22 +02:00
Balazs Kezes ba36d1394b Don't report release events for mouse wheel
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-06-01 15:57:03 +02:00
Christoph Lohmann ede83bd08b Fixing italic bold.
Thanks Felipe Spychalski <spychalski@gmail.com> for the patch!
2014-06-01 15:54:28 +02:00
Alexander 2411308bd2 Fixed copying empty lines inside selection.
The code was assuming that empty lines have implicit wrap-around attribute.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-05-27 08:37:12 +02:00
Christoph Lohmann f4ebb3180f Fixing trailing whitespaces. 2014-05-24 13:48:44 +02:00
FRIGN 3544e354b2 Fix colour-model and simplify xloadcols()
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-05-24 13:47:00 +02:00
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
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