aboutsummaryrefslogtreecommitdiffstats
path: root/x.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove explicit XNFocusWindowIvan Tham2020-02-191-1/+0
| | | | | | | | | | | | | | | | | XCreateIC ICValues default XNFocusWindow to XNClientWindow if not specified, it can be omitted since it is the same. From the documentation https://www.x.org/releases/current/doc/libX11/libX11/libX11.html > Focus Window > > The XNFocusWindow argument specifies the focus window. The primary > purpose of the XNFocusWindow is to identify the window that will receive > the key event when input is composed. > > When this XIC value is left unspecified, the input method will use the > client window as the default focus window.
* x: fix XIM handlingQuentin Rameau2020-02-021-24/+44
| | | | | | | | | | | Do not try to set specific IM method, let the user specify it with XMODIFIERS. If the requested method is not available or opening fails, fallback to the default input handler and register a handler on the new IM server availability signal. Do the same when the input server is closed and (re)started.
* x: check we still have an XIC context before accessing itQuentin Rameau2020-02-021-2/+5
|
* x: do not instantiate a new nested list on each cursor moveQuentin Rameau2020-02-021-4/+12
|
* x: move IME variables into XWindow ime embedded structQuentin Rameau2020-02-021-12/+14
|
* Increase XmbLookupString bufferIvan Tham2020-01-181-1/+1
| | | | | | | | | | | | Current buffer is too short to input medium to long sentences from IME. Input with longer text will show the wrong input, taking 64 instead of 32 bytes should be enough for most of the cases. Broken cases before, Chinese (taken from song 也可以) 可不可以轻轻的松开自己 Japanese (taken from bootleggers rom quote) あなたは家のように感じる
* apply hints before initial mapping (ICCCM)Ingo Lohmar2019-10-261-1/+1
| | | | | | | | | For WM_CLASS this is mentioned in the ICCCM docs https://tronche.com/gui/x/icccm/sec-4.html#s-4.1.2.5 (third sentence). When changing the WM_CLASS from the command line, this is necessary for window managers to pick it up before applying class-based rules.
* mouse shortcuts: allow using forcemousemod (e.g. shift)Avi Halachmi (:avih)2019-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent mouse shurtcuts commits allow customization, but ignore forcemousemod mask (default: shift) as a modifier, for no good reason other than following the behavior of the KB shortcuts. Allow using forcemousemod too, which now can be used to invoke different shortcuts, though the automatic effect of forcemousemod will be lost for buttons which use mask with forcemousemod. E.g. the default is: static uint forcemousemod = ShiftMask; ... { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, ... where ttysend will be invoked for button4 with any mod when not in mouse mode, and with shift when in mouse mode. Now it's possible to do this: { ShiftMask, Button4, ttysend, {.s = "foo"} }, { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, Which will invoke ttysend("foo") while shift is held and ttysend("\031") otherwise. Shift still overrides mouse mode, but will now send "foo". Previously with this setup the second binding was always invoked because the forceousemod mask was always removed from the event. Buttons which don't use forcemousemod behave the same as before. This is useful e.g. for the scrollback mouse patch, which wants to configure shift+wheel for scrollback, while keeping the normal behavior without shift.
* mouse shortcuts: don't hardcode selpasteAvi Halachmi (:avih)2019-10-131-11/+24
| | | | | | | | Because selpaste is activated on release, a release flag was added to mouse shortcuts which controls whether activation is on press/release, and selpaste binding to button2 was moved to config.h . button1 remains the only hardcoded mouse button - for selection + copy.
* mouse shortcuts: allow override for all shortcutsAvi Halachmi (:avih)2019-10-131-6/+6
| | | | | | | | | | | | | | | Allow forceselmod to override all mouse shortcuts rather than only selection, and rename it to forcemousemod as it's now more appropriate. This will affect mouse shortcuts which use mask other than XK_ANY_MOD. This does not affect the default behavior because the default mouse shortcuts (wheel) use XK_ANY_MOD, where forceselmod already activated the override also before this change. Previously, if a mouse shortcut was configured with a specific mod and forceselmod was held, then the shortcut did not execute unless the configured mod included forceselmod.
* mouse shortcuts: allow same functions as kb shortcutsAvi Halachmi (:avih)2019-10-131-6/+14
| | | | | | | Previously mouse shortcuts supported only ttywrite. This required adding an "Arg" function ttysend - which does what the original mouse shortcuts did.
* simplify (greedy) font caching allocating a bitHiltjo Posthuma2019-03-031-7/+2
| | | | | | POSIX says: "If ptr is a null pointer, realloc() shall be equivalent to malloc() for the specified size."
* style: remove double empty newlinesHiltjo Posthuma2019-03-031-2/+0
|
* fix use after free in font caching algorithmmagras2019-03-031-6/+9
| | | | | | | | | | | | | | | | | | 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.
* 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>
remember that computers suck.