summaryrefslogtreecommitdiff
path: root/st.c
AgeCommit message (Collapse)Author
2019-11-10base64dec: don't read out of boundsAvi Halachmi (:avih)
Previously, base64dec checked terminating input '\0' every 4 calls to base64dec_getc, where the latter progressed one or more chars on each call, and could read past '\0' in the way it was used. The input to base64dec currently comes only from OSC 52 escape seq (copy to clipboard), and reading past '\0' or even past the buffer boundary was easy to trigger. Also, even if we could trust external input to be valid base64, there are different base64 standards, and not all of them require padding to 4 bytes blocks (using trailing '=' chars). It didn't affect short OSC 52 strings because the buffer is initialized to 0's, so typically it did stop within the buffer, but if the string was trimmed to fit (the buffer is 512 bytes) then it did also read past the end of the buffer, and the decoded suffix ended up arbitrary. This patch makes base64dec_getc not progress past '\0', and instead produce fake trailing padding of '='. Additionally, at base64dec, if padding is detected at the first or second byte of a quartet, then we identify it as invalid and abort (a valid quartet has at least two leading non-padding bytes).
2019-04-14selection: fix view to match actual selection on first cellAvi Halachmi (:avih)
2019-03-15revert part of commit add0211522737b79dad990ccd65c8af63b5cc1ddHiltjo Posthuma
"use iswspace()/iswpunct() to find word delimiters this inverts the configuration logic: you no longer provide a list of delimiters -- all space and punctuation characters are considered delimiters, unless listed in extrawordchars." Feedback from IRC and personal preference.
2019-03-15dont print color warning on color reset OSC 104 without parameterHiltjo Posthuma
also print explicitly "(null)" when printf "%s" p=NULL. noticed when exiting mutt: printf '\x1b]104\x07'
2019-03-15minor code-style, initialize var at the top of functionHiltjo Posthuma
2019-03-15use iswspace()/iswpunct() to find word delimitersLauri Tirkkonen
this inverts the configuration logic: you no longer provide a list of delimiters -- all space and punctuation characters are considered delimiters, unless listed in extrawordchars.
2019-03-15replace utf8strchr with wcschrLauri Tirkkonen
2019-03-13be silent about explicitly unhandled mouse modesLauri Tirkkonen
2019-03-03style: remove double empty newlinesHiltjo Posthuma
2019-02-12better Input Method Editor (IME) supportIvan Tham
Features: - Allow input methods swap with hotkey (E.g. left ctrl + left shift). - Over-the-spot pre-editing style, pre-edit data placed over insertion point. - Restart IME without segmentation fault. TODO: - Automatically pickup IME if st started before IME
2018-12-11output child WEXITSTATUS/WTERMSIG on abnormal terminationLauri Tirkkonen
2018-11-04st: small typofix in commentHiltjo Posthuma
2018-09-11small code-style fixHiltjo Posthuma
2018-09-11Remove the ISO 14755 featureQuentin Rameau
And move it to the patches section. Keeping it would force to add an exec pledge on OpenBSD, and some people think it's bloated, so bye!
2018-05-25code-style for pledge(2)Hiltjo Posthuma
feedback from Klemens, thanks
2018-05-25Pledge on OpenBSDHiltjo Posthuma
2018-03-29error message style and use strerror in a few placesHiltjo Posthuma
2018-03-29set sel.alt in selstart instead of selextendDaniel Tameling
2018-03-17selextend: clarify: !sel.mode == SEL_IDLEHiltjo Posthuma
2018-03-16minor code-style: whitespace fixesHiltjo Posthuma
2018-03-09regression: include termios.h for tcsendbreak etcHiltjo Posthuma
2018-02-25General cleanupDevin J. Pohly
Simplifies logic in a couple places and removes a redundant function call. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Clean up #includesDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Reduce visibility wherever possibleDevin J. Pohly
When possible, declare functions/variables static and move struct definitions out of headers. In order to allow utf8decode to become internal, use codepoint for DECSCUSR extension directly. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Limit usage of extern to config.h globalsDevin J. Pohly
Prefer passing arguments to declaring external global variables. The only remaining usage of extern is for config.h variables which are needed in st.c instead of x.c (where it is now included). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Remove x.c dependency on termDevin J. Pohly
The xinit function only needs to the rows/cols, so pass those in rather than accessing term directly. With a bit of arithmetic, we are able to avoid the need for term.row and term.col in x2col, y2row, and xdrawglyphfontspecs as well, completing the removal. Term is now fully internal to st.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Pull term references out of xdrawcursorDevin J. Pohly
Gradually reducing x.c dependency on Term object. Old and new cursor glyph/position are passed to xdrawcursor. (There may be an opportunity to refactor further if we can unify "clear old cursor" and "draw new cursor" functionality.) Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move win-agnostic parts of draw/drawregion to st.cDevin J. Pohly
Introduces three functions to encapsulate X-specific behavior: * xdrawline: draws a portion of a single line (used by drawregion) * xbegindraw: called to prepare for drawing (will be useful for e.g. Wayland) and returns true if drawing should happen * xfinishdraw: called to finish drawing (used by draw) Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Split mode bits between Term and TermWindowDevin J. Pohly
Moves the mode bits used by x.c from Term to TermWindow, absorbing UI/input-related mode bits (visible/focused/numlock) along the way. This is gradually reducing external references to Term. Since TermWindow is already internal to x.c, we add xsetmode() to allow st to modify window bits in accordance with escape sequences. IS_SET() is redefined accordingly (term.mode in st.c, win.mode in x.c). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move CRLF input processing into ttywriteDevin J. Pohly
This also allows us to remove the crlf field from the Key struct, since the only difference it made was converting "\r" to "\r\n" (which is now done automatically in ttywrite). In addition, MODE_CRLF is no longer referenced from x.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move terminal echo logic into st.cDevin J. Pohly
The only thing differentiating ttywrite and ttysend was the potential for echo; make this a parameter and remove ttysend. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move remaining selection mode logic into selextendDevin J. Pohly
The "done" parameter indicates a change which finalizes the selection (e.g. a mouse button release as opposed to motion). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move terminal-related selection logic into st.cDevin J. Pohly
The front-end determines information about mouse clicks and motion, and the terminal handles the actual selection start/extend/dirty logic by row and column. While we're in the neighborhood, we'll also rename getbuttoninfo() to mousesel() which is, at least, less wrong. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move X-specific selection info into XSelectionDevin J. Pohly
Data about PRIMARY/CLIPBOARD and clicks are part of the front-end, not the terminal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Have selected() check whether selection existsDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Rely on ttyresize to set tty sizeDevin J. Pohly
This removes ttynew's dependency on cresize being called first, and then allows us to absorb the ttyresize call into cresize (which always precedes it). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Remove X and fontconfig from st.cDevin J. Pohly
None of the X-related includes are needed any longer. In addition, move the X modifier defines into x.c, as they are not used outside. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Remove Time argument from xsetselDevin J. Pohly
This is an X type and should be internal to x.c. The selcopy() function was a single line and only used in one place, so it was inlined to reduce LOC. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Make win variable internal to x.cDevin J. Pohly
There was only a single reference to the `win` variable in st.c, so exporting that to x.c allows us to rid ourselves of another extern. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move config.h include from st.c to x.cDevin J. Pohly
config.h includes references to KeySyms and other X stuff. Until we come up with a cleaner way to separate configuration, it is simpler (leads to more code removal) to have this here. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Factor out equivalent code from ttyread/ttysendDevin J. Pohly
The echo-to-terminal portions of ttyread and ttysend were actually doing the same thing. New function twrite() now handles this. The parameter show_ctrl determines whether control characters are shown as "^A". This was the only difference between tputc and techo, and techo is now unused and removed. (This commit should not change st's behaviour.) Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move opt_* into same file as main()/run()Devin J. Pohly
This commit is purely about reducing externs and LOC. If the main and run functions ever move elsewhere (which will probably make sense eventually), these should come along with them. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move key-matching functions into x.cDevin J. Pohly
Modifiers and keysyms are specific to X, and the functions match and kmap are only used in x.c. Needed to global-ize the key arrays and lengths from config.h (for now). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Pass new dimensions into ttyresizeDevin J. Pohly
This removes another reference to TermWindow from st.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move window-manipulating functions into x.cDevin J. Pohly
xresize is now internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move font/fontspec variables into x.c and XWindowDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move window urgency handling entirely into x.cDevin J. Pohly
This allows us to make xseturgency internal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move zoom functions into x.cDevin J. Pohly
This makes x(un)loadfonts internal to x.c. Needed to reorder includes and move a typedef to keep the compiler happy. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move usage() to be with run() in x.cDevin J. Pohly
run/usage/xinit are now all internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Call xsetenv() in main process instead of childDevin J. Pohly
This makes xsetenv internal to x.c, and allows iso14755's external command to use $WINDOWID instead of having to snprintf it again. (The same benefit will apply to the externalpipe patch.) The xwinid function is no longer needed. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-10 03:33:59 +0000