aboutsummaryrefslogtreecommitdiffstats
path: root/x.c
Commit message (Collapse)AuthorAgeFilesLines
* better Input Method Editor (IME) supportIvan Tham2019-02-121-17/+52
| | | | | | | | | | | | 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
* fix memory leak in xloadcols()Hiltjo Posthuma2018-11-041-3/+3
| | | | | | reported by Avi Halachmi (:avih)" <avihpit@yahoo.com> patch slightly changed by me.
* Revert "Simplify cursor color handling"Hiltjo Posthuma2018-07-171-12/+18
| | | | This reverts commit 1911c9274d9b03f3d7999c6ce26e2d5169642d26.
* Revert "Make cursor follow text color"Hiltjo Posthuma2018-07-171-7/+5
| | | | This reverts commit b51bcd5553af3db394014efbd78acf7828fa48ff.
* Revert "Fix crash when cursor color is truecolor"Hiltjo Posthuma2018-07-171-13/+4
| | | | This reverts commit 5535c1f04c665c05faff2a65d5558246b7748d49.
* Fix crash when cursor color is truecolorJules Maselbas2018-07-151-4/+13
| | | | Reported-by: Ivan Tham <pickfire@riseup.net>
* Make cursor follow text colorJules Maselbas2018-07-141-5/+7
|
* Simplify cursor color handlingJules Maselbas2018-07-141-18/+12
|
* Fix crash on resizeJules Maselbas2018-06-301-4/+8
| | | | | Prevent to realloc xw.specbuc with a negative number of col. Add proper hints for the minimal size, for one character.
* error message style and use strerror in a few placesHiltjo Posthuma2018-03-291-14/+13
|
* st -v: remove years and copyright textHiltjo Posthuma2018-03-291-1/+1
|
* fix regression by selecting clipboard textHiltjo Posthuma2018-03-201-0/+3
| | | | | | | "restore the old behaviour that the primary doesn't get deleted by a simple left click" Patch by Daniel Tameling <tamelingdaniel@gmail.com>, thanks!
* clipcopy: no need to check for free(NULL), set to NULL after freeHiltjo Posthuma2018-03-171-2/+2
|
* Fix title initializationQuentin Rameau2018-03-161-5/+5
|
* Fix regression from 69e32a6 when setting title.Quentin Rameau2018-03-161-1/+1
|
* use math.h for ceilfHiltjo Posthuma2018-03-091-1/+1
|
* xhints: no need to initialize sizehHiltjo Posthuma2018-03-091-1/+1
|
* General cleanupDevin J. Pohly2018-02-251-25/+21
| | | | | | | Simplifies logic in a couple places and removes a redundant function call. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Clean up #includesDevin J. Pohly2018-02-251-2/+1
| | | | Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Reduce visibility wherever possibleDevin J. Pohly2018-02-251-2/+13
| | | | | | | | 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>
* Limit usage of extern to config.h globalsDevin J. Pohly2018-02-251-7/+9
| | | | | | | | 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>
* Remove x.c dependency on termDevin J. Pohly2018-02-251-17/+18
| | | | | | | | | | | 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>
* Pull term references out of xdrawcursorDevin J. Pohly2018-02-251-39/+22
| | | | | | | | | 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>
* Move win-agnostic parts of draw/drawregion to st.cDevin J. Pohly2018-02-251-44/+35
| | | | | | | | | | 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>
* Split mode bits between Term and TermWindowDevin J. Pohly2018-02-251-19/+31
| | | | | | | | | | | | | 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>
* Move CRLF input processing into ttywriteDevin J. Pohly2018-02-251-5/+1
| | | | | | | | | 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>
* Move terminal echo logic into st.cDevin J. Pohly2018-02-251-9/+9
| | | | | | | 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>
* Move remaining selection mode logic into selextendDevin J. Pohly2018-02-251-18/+9
| | | | | | | 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>
* Move terminal-related selection logic into st.cDevin J. Pohly2018-02-251-40/+15
| | | | | | | | | | | 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>
* Move X-specific selection info into XSelectionDevin J. Pohly2018-02-251-12/+19
| | | | | | | Data about PRIMARY/CLIPBOARD and clicks are part of the front-end, not the terminal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Have selected() check whether selection existsDevin J. Pohly2018-02-251-6/+4
| | | | Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Rely on ttyresize to set tty sizeDevin J. Pohly2018-02-251-4/+2
| | | | | | | | 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>
* Remove X and fontconfig from st.cDevin J. Pohly2018-02-251-0/+5
| | | | | | | 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>
* Remove Time argument from xsetselDevin J. Pohly2018-02-251-9/+9
| | | | | | | | | 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>
* Make win variable internal to x.cDevin J. Pohly2018-02-251-0/+11
| | | | | | | 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>
* Move X-related config.h types into x.cDevin J. Pohly2018-02-251-0/+24
| | | | | | No need to expose Shortcut, MouseShortcut, and Key anymore. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Remove unneeded array-length variablesDevin J. Pohly2018-02-251-15/+7
| | | | | | | 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>
* Inline clipboard functionsDevin J. Pohly2018-02-251-31/+19
| | | | | | | No need to keep a function that only calls another function in the same file. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move config.h include from st.c to x.cDevin J. Pohly2018-02-251-0/+37
| | | | | | | | 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>
* Move opt_* into same file as main()/run()Devin J. Pohly2018-02-251-1/+11
| | | | | | | | 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>
* Move key-matching functions into x.cDevin J. Pohly2018-02-251-0/+48
| | | | | | | | 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>
* Pass new dimensions into ttyresizeDevin J. Pohly2018-02-251-3/+3
| | | | | | This removes another reference to TermWindow from st.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move window-manipulating functions into x.cDevin J. Pohly2018-02-251-1/+44
| | | | | | xresize is now internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move font/fontspec variables into x.c and XWindowDevin J. Pohly2018-02-251-5/+13
| | | | Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move window urgency handling entirely into x.cDevin J. Pohly2018-02-251-2/+6
| | | | | | This allows us to make xseturgency internal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move zoom functions into x.cDevin J. Pohly2018-02-251-1/+34
| | | | | | | 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>
* Move usage() to be with run() in x.cDevin J. Pohly2018-02-251-0/+18
| | | | | | run/usage/xinit are now all internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Call xsetenv() in main process instead of childDevin J. Pohly2018-02-251-6/+2
| | | | | | | | | 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>
* Fix color with FAINT attributeBenno Fünfstück2017-12-261-0/+1
| | | | The alpha value needs to be initialized as well.
* Apply ATTR_REVERSE after ATTR_FAINTBenno Fünfstück2017-12-261-6/+7
| | | | | | | | | | | | | | | | 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.
remember that computers suck.