aboutsummarylogtreecommitdiffstats
path: root/x.c
AgeCommit message (Collapse)Author
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 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-25Remove 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-25Inline 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-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-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>
2017-12-26Fix color with FAINT attributeBenno Fünfstück
The alpha value needs to be initialized as well.
2017-12-26Apply ATTR_REVERSE after ATTR_FAINTBenno Fünfstück
An example where the new behaviour makes more sense: Suppose some text is formatted with ATTR_FAINT for red for the foreground, so it is rendered in a dark red. In that case, when selected with the mouse, the intended behaviour is that foreground and background color are swapped: so the selection should be rendered in dark red and the text in the default background color. Before this patch, what happened was that the selection would be in normal red and the text in the darkened background color, making it almost unreadable. For an example application that uses the FAINT attribute, try dmesg from util-linux with color support, it uses FAINT for segfault messages.
2017-09-15Add an error for XftFontOpenPattern failure.Gary Allen Vollink
2017-09-02Revert "make clipboard patch obsolete"Hiltjo Posthuma
This reverts commit 77c51c5a6b16387f1792e23acbcf2080f790aa25. Having multiple clipboards are useful, for example for plumber scripts. I've discussed this on IRC and it is useful to have.
2017-09-01make clipboard patch obsoleteAnselm R Garbe
2017-04-04Simplify how we keep ATTRs under cursorQuentin Rameau
Thanks to tarug0 for the suggestion/patch.
2017-03-29keep some glyph modes for the cursorNils Reuße
st currently does not keep any mode for the cursor that was active in the underlying glyph (e.g. italic text), the mode is always ATTR_NULL [1]. At [2] you can find a screenshot that shows the implications. Other terminals (at least vte-based, such as XFCE-terminal) keep some modes for the cursor. I find the current behaviour very disruptive, so here is a patch that keeps a few (arbitrarily chosen) modes for the cursor. [1] http://git.suckless.org/st/tree/st.c#n3963 [2] http://i.imgur.com/R2yCEaC.png
2017-03-19Support xterm Ms feature to set clipboardosandov@osandov.com
This is used by, e.g., tmux.
2017-01-20Split X-specific code into x.cMichael Forney