aboutsummaryrefslogtreecommitdiffstats
path: root/x.c
AgeCommit message (Collapse)Author
2019-10-13mouse shortcuts: allow same functions as kb shortcutsAvi Halachmi (:avih)
Previously mouse shortcuts supported only ttywrite. This required adding an "Arg" function ttysend - which does what the original mouse shortcuts did.
2019-03-03simplify (greedy) font caching allocating a bitHiltjo Posthuma
POSIX says: "If ptr is a null pointer, realloc() shall be equivalent to malloc() for the specified size."
2019-03-03style: remove double empty newlinesHiltjo Posthuma
2019-03-03fix use after free in font caching algorithmmagras
Current font caching algorithm contains a use after free error. A font removed from `frc` might be still listed in `wx.specbuf`. It will lead to a crash inside `XftDrawGlyphFontSpec()`. Steps to reproduce: $ st -f 'Misc Tamsyn:scalable=false' $ curl https://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt Of course, result depends on fonts installed on a system and fontconfig. In my case, I'm getting consistent segfaults with different fonts. I replaced a fixed array with a simple unbounded buffer with a constant growth rate. Cache starts with a capacity of 0, gets increments by 16, and never shrinks. On my machine after `cat UTF-8-demo.txt` buffer reaches a capacity of 192. During casual use capacity stays at 0.
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-11-04fix memory leak in xloadcols()Hiltjo Posthuma
reported by Avi Halachmi (:avih)" <avihpit@yahoo.com> patch slightly changed by me.
2018-07-17Revert "Simplify cursor color handling"Hiltjo Posthuma
This reverts commit 1911c9274d9b03f3d7999c6ce26e2d5169642d26.
2018-07-17Revert "Make cursor follow text color"Hiltjo Posthuma
This reverts commit b51bcd5553af3db394014efbd78acf7828fa48ff.
2018-07-17Revert "Fix crash when cursor color is truecolor"Hiltjo Posthuma
This reverts commit 5535c1f04c665c05faff2a65d5558246b7748d49.
2018-07-15Fix crash when cursor color is truecolorJules Maselbas
Reported-by: Ivan Tham <pickfire@riseup.net>
2018-07-14Make cursor follow text colorJules Maselbas
2018-07-14Simplify cursor color handlingJules Maselbas
2018-06-30Fix crash on resizeJules Maselbas
Prevent to realloc xw.specbuc with a negative number of col. Add proper hints for the minimal size, for one character.
2018-03-29error message style and use strerror in a few placesHiltjo Posthuma
2018-03-29st -v: remove years and copyright textHiltjo Posthuma
2018-03-20fix regression by selecting clipboard textHiltjo Posthuma
"restore the old behaviour that the primary doesn't get deleted by a simple left click" Patch by Daniel Tameling <tamelingdaniel@gmail.com>, thanks!
2018-03-17clipcopy: no need to check for free(NULL), set to NULL after freeHiltjo Posthuma
2018-03-16Fix title initializationQuentin Rameau
2018-03-16Fix regression from 69e32a6 when setting title.Quentin Rameau
2018-03-09use math.h for ceilfHiltjo Posthuma
2018-03-09xhints: no need to initialize sizehHiltjo Posthuma
2018-02-26General 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-26Clean up #includesDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-26Reduce 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-26Limit 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-26Remove 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-26Pull 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-26Move 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-26Split 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-26Move 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-26Move 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-26Move 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-26Move 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-26Move 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-26Have selected() check whether selection existsDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-26Rely 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-26Remove 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-26Remove 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-26Make 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-26Move X-related config.h types into x.cDevin J. Pohly
No need to expose Shortcut, MouseShortcut, and Key anymore. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-26Remove unneeded array-length variablesDevin J. Pohly
These were only used in x.c, which now has direct visibility of the config.h arrays. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-26Inline clipboard functionsDevin J. Pohly
No need to keep a function that only calls another function in the same file. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-26Move 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-26Move 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-26Move 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-26Pass 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-26Move 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-26Move font/fontspec variables into x.c and XWindowDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-26Move 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-26Move 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>