summaryrefslogtreecommitdiff
path: root/st.c
AgeCommit message (Collapse)Author
2014-06-01Fixing color and refactor xsetcolorname.Christoph Lohmann
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-01Revert "Refactor xsetcolorname()"Christoph Lohmann
This reverts commit a32c5f5726f514b49bd396f27aab0e78c40126d3.
2014-06-01Refactor xsetcolorname()FRIGN
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-01Don't report release events for mouse wheelBalazs Kezes
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-06-01Fixing italic bold.Christoph Lohmann
Thanks Felipe Spychalski <spychalski@gmail.com> for the patch!
2014-05-27Fixed copying empty lines inside selection.Alexander
The code was assuming that empty lines have implicit wrap-around attribute. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-05-24Fixing trailing whitespaces.Christoph Lohmann
2014-05-24Fix colour-model and simplify xloadcols()FRIGN
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-05-14Allow mouse selection override using ShiftMaskHiltjo Posthuma
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-09Redraw needs all dirty lines to have flash etc. work.Christoph Lohmann
2014-05-09End a sequence only on CAN, SUB, \a and C1s.Colona
2014-05-09Also clears ESC_START on interrupt characters during sequences.Colona
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-02Consistent FALLTHROUGH comments.noname
2014-04-30Fix displaying control codeRoberto E. Vargas Caballero
Control code are never displayed. It is not important if graphic charset is displayed or not.
2014-04-29Remove ATTR_GFX and tselcsRoberto E. Vargas Caballero
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-29Do not save cursor in tresize.noname
This patch fixes the bug introduced in 8f11e1cd034ff28ca47bb4955505db7fa8016ba8 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-28Simplify selected().noname
2014-04-28Simplify xunloadfonts.noname
2014-04-28Remove one indentation level in getsel().noname
2014-04-28Remove unused dump() function.noname
2014-04-28Add missing function prototypes.noname
2014-04-28Use MODBIT in xseturgency.noname
2014-04-28Compute ena_sel as one expression.noname
2014-04-28Simplify expressions in tputc()Roberto E. Vargas Caballero
2014-04-28Fix misplaced breakRoberto E. Vargas Caballero
This misplaced break was causing an incorrect fall through from DSR to DECSTBM.
2014-04-28Create a function for DEC testRoberto E. Vargas Caballero
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-28Fix tputc control code handlingRoberto E. Vargas Caballero
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-27Remove repeated initialisation of term.escRoberto E. Vargas Caballero
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-27Cancel DCS with SUB, CAN, ESC or any CC1 codeRoberto E. Vargas Caballero
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-27add break;s for last cases in switch statementsMarkus Teich
2014-04-26Do not eat ESC character if control string is not properly terminated.noname
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-26Fix for multibyte characters in techo.noname
Works for both signed and unsigned char.
2014-04-26s/DSC/DCS/ DCS stands for DEVICE CONTROL STRINGnoname
2014-04-26Use xwrite instead of write.noname
2014-04-26Remove unnecessary breaknoname
2014-04-25Comment fix.noname
2014-04-25On terminal resize, clear the alt screen with its own cursor.Colona
Currently the alternate screen get messed up on resize if it has different colors or mode.
2014-04-25Optimize tputtab.noname
Before this patch executing printf '\e[10000000000I' or printf '\e[10000000000Z' resulted in long delay.
2014-04-25Use != instead of ^ for logical values.noname
sel.alt is only changed by sel.alt = IS_SET(MODE_ALTSCREEN);
2014-04-25Use BETWEEN macro in xsetcolorname and fix style.noname
2014-04-25Conformity in the -g geometry handling.Christoph Lohmann
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-25Simplify a bit more tdeletechar and tinsertblankRoberto E. Vargas Caballero
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-25Simplify tdeletechar and tinsertblank and fix memory corruption.noname
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-23Style fixes in tscrollup.noname
2014-04-23Do not set dirty flag twice in tscrollup and tscrolldown.noname
2014-04-23Use tsetdirt in tscrollup and tscrolldown.noname
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-23Fix techo handling of control and multibyte characters.noname
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-23Make xrealloc and xstrdup style consistent.noname
2014-04-23Use BETWEEN in tsetchar.noname
2014-04-23Use uint and uchar instead of unsigned int and unsigned char.noname