aboutsummaryrefslogtreecommitdiff
path: root/selection.c (follow)
Commit message (Collapse)AuthorAgeLines
* selection: use appropriate check for PRIMARY pasteSergey Nazaryev2020-10-11-2/+2
| | | | | | Assume it could be a copy-paste typo. We should check PRIMARY, not CLIPBOARD. Without this fix, we can't use PRIMARY until we copy anything to CLIPBOARD.
* selection: reset clipboard/primary->text after free:ing itDaniel Eklöf2020-09-17-0/+2
|
* selection: primary unset: don’t free text twiceDaniel Eklöf2020-09-17-1/+0
|
* selection: add selection_<type>_has_data()Daniel Eklöf2020-09-09-0/+12
| | | | | Returns true when there is data available for paste in the clipboard/primary selection.
* selection: add selection_<type>_unset()Daniel Eklöf2020-09-09-0/+41
| | | | These functions clear the current selection.
* codespell: selection: faild -> failedDaniel Eklöf2020-08-27-1/+1
|
* selection: don't initiate a paste when we're already pastingDaniel Eklöf2020-08-25-0/+10
|
* selection: must use term_paste_data_to_slave() for paste dataDaniel Eklöf2020-08-25-1/+1
|
* selection: clipboard callback: assert we're in sending-paste-data modeDaniel Eklöf2020-08-25-0/+1
|
* selection: block non-paste data from being sent to client while pastingDaniel Eklöf2020-08-25-3/+12
| | | | | | | | | | While pasting data from the clipboard, block *all* other data from being sent to the client. This includes keyboard and mouse events, but also replies for VT queries. This is particularly important when bracketed paste has been enabled, since then the client will interpret *everything* between the bracketed paste start and end as paste data.
* selection: add a 2 second timeout when receiving clipboard dataDaniel Eklöf2020-08-25-11/+78
| | | | | | | | When reading clipboard data, a malicious clipboard provider could stall us forever, by not sending any data, and not closing the pipe. This commit adds a timer_fd based timeout of 2 seconds. If the timer triggers, we abort the clipboard receive.
* selection: don't do "return function_returning_void()" in functions returning voidDaniel Eklöf2020-08-23-11/+22
|
* don't use empty struct initializersDaniel Eklöf2020-08-23-3/+3
|
* selection: don't highlight trailing empty cells in a selectionDaniel Eklöf2020-08-18-11/+55
| | | | | This makes it clear which cells contain spaces (that will be copied) or are empty (will *not* be copied).
* selection: extend: set ongoing to trueDaniel Eklöf2020-08-14-0/+2
|
* selection: finalize: clear ongoing selectionDaniel Eklöf2020-08-14-3/+3
| | | | | | | | | | Check for ongoing selection, and *clear* it before bailing out due to the selection not having an end-point. This fixes an issue where a selection was kept as ongoing, even though the button had been released. Typically triggered by clicking without moving the mouse; this started a new selection, then (tried to) finalize it, but failed since the selection didn't have an end-point.
* selection: update: don't update if there's no ongoing selectionDaniel Eklöf2020-08-14-0/+3
|
* config: add mouse specific bind actionsDaniel Eklöf2020-08-14-0/+7
| | | | | | | | | | | | | | | | | | | | This extends the "normal" bind action enum with mouse specific actions. When parsing key bindings, we only check up to the last valid keyboard binding, while mouse bindings support *both* key actions and mouse actions. The new actions are: * select-begin: starts an interactive selection * select-extend: interactively extend an existing selection * select-word: select word under cursor * select-word-whitespace: select word under cursor, where the only word separating characters are whitespace characters. The old hard-coded selection "bindings" have been converted to instead use these actions, via default bindings added to the configuration.
* selection: improve handling of multi-column charactersDaniel Eklöf2020-08-13-13/+14
| | | | | * Don't assume multi-column characters are exactly *two* columns * Check for CELL_MULT_COL_SPACER values instead of using wcwidth()
* selection: handle multi-column characters when reversing selection directionDaniel Eklöf2020-08-13-16/+30
|
* selection: adjust start point when the selection changes directionDaniel Eklöf2020-08-12-0/+37
| | | | | | | | | Without this, the initial cell will always be selected, regardless of how the selection is moved to the left or right. With this patch, the initial cell will only be selected while the selection is being made in the original direction. Changing direction of the selection moves the start point to next/previous character.
* Convert most dynamic allocations to use functions from xmalloc.hCraig Barnes2020-08-08-5/+6
|
* config: add 'pipe-selected' key bindingDaniel Eklöf2020-07-31-4/+7
| | | | | | | This works just like pipe-visible and pipe-scrollback, but pipes the user-selected text, if any, to the external tool. Closes #51
* Merge branch 'master' into scrollback-position-indicatorDaniel Eklöf2020-07-27-8/+8
|\
| * selection: extending a selection is now interactiveDaniel Eklöf2020-07-27-8/+8
| | | | | | | | | | That is, a selection extension can be resized just like an ordinary extension.
* | input: margins are not selectableDaniel Eklöf2020-07-26-3/+4
|/ | | | | | | | | | | | | * Fix col/row calculation in pointer-enter event; we did not take the margins into account. * seat->mouse.col,row are now set to -1 if the cursor is inside the margins. That is, col/row are only ever valid when the mouse is actually over the grid, and not in the margins. * Use regular 'left-ptr' mouse cursor when mouse is inside the margins, to not make the user think he/she can start a selection. Besides making things clearer, this also fixes a crash that occurred if you started a selection in e.g. the right margin.
* selection: provide a const-wrapper for extract_one()Daniel Eklöf2020-07-15-1/+9
| | | | | extract_one() takes const pointers, while the callback argument to foreach() expects non-const.
* selection: refactor: break out text extraction to a separate fileDaniel Eklöf2020-07-15-170/+22
|
* selection: don't skip SPACER cells in the generic foreach()Daniel Eklöf2020-07-15-4/+3
| | | | | | | | As that breaks e.g. selection marking (SPACER cells didn't get inverted when rendered). Instead, skip them in extract_one() only. I.e. when copying text from the grid.
* selection: row->dirty is a booleanDaniel Eklöf2020-07-15-2/+3
|
* selection: no need to try to detect multi-column chars at the end of the lineDaniel Eklöf2020-07-14-16/+1
| | | | | This is handled by the generic foreach() functions, which now simply skips spacer cells.
* term: print: write special value CELL_MULT_COL_SPACER to extra cellsDaniel Eklöf2020-07-14-4/+4
| | | | | | When printing a multi-column character, write CELL_MULT_COL_SPACER instead of '0' to both padding cells (when character doesn't fit at the end of the line), and to the cells following the actual character.
* term: rename COMB_CHARS_LO,HI -> CELL_COMB_CHARS_LO,HIDaniel Eklöf2020-07-14-2/+3
|
* selection: recognize empty padding cells in a forced linewrapDaniel Eklöf2020-07-14-9/+35
| | | | | | | | | | | | | | When printing a multi-column character at the end of the line, and it doesn't fit, we currently insert a forced line-wrap. This means the last character(s) on the previous line will be empty, followed by a multi-column character in the first cell on the next line. Without special code to handle this, the selection text extraction code will insert a hard newline, since this is normally the correct thing to do. Add a TODO, to consider writing a special place holder value to these padding cells.
* selection: foreach: don't call callback for trailing multi-character cellsDaniel Eklöf2020-07-14-1/+6
|
* seat: use separate 'enter' serials for keyboard and mouseDaniel Eklöf2020-07-09-2/+2
|
* multi-seat: improve handling of multiple (mouse) pointersDaniel Eklöf2020-07-09-2/+2
| | | | | | | | * xcursor always set for all pointers * xcursor sometimes not updated when it should be * mouse grabbed state wasn't per seat, but global (i.e. "does at least one seat enable mouse grabbing") * selection enabled state wasn't per seat
* multi-seat: re-enable selection support (excluding OSC 52)Daniel Eklöf2020-07-08-82/+57
|
* wip: multi-seat supportDaniel Eklöf2020-07-08-7/+36
| | | | | Compiles and runs, but mouse, clipboard and other things have been disabled.
* selection: fix typo when extending selection to cover double-width characterDaniel Eklöf2020-06-03-1/+1
|
* selection: don't allow only half of double-width characters to be selectedDaniel Eklöf2020-06-02-1/+28
|
* selection: performance: check for < 0 or >= 0 instead of == -1Daniel Eklöf2020-05-19-9/+9
|
* selection: handle viewport wrap around correctlyDaniel Eklöf2020-05-19-0/+28
| | | | | When the viewport wraps around, the selection points may be "incorrect".
* term: scrolling: hopefully fix all selection/scrolling related crashesDaniel Eklöf2020-05-17-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scrolling, there are a couple of cases where an existing selection must be canceled because we cannot meaningfully represent it after scrolling. These are when the selection is (partly) inside: * The top scrolling region * The bottom scrolling region * The new lines scrolled in. I.e. re-used lines For the scrolling regions, the real problem is when the selection crosses the scrolling region boundary; a selection that is completely inside a scrolling regions _might_ be possible to keep, but we would need to translate the selection coordinates to the new scrolling region lines. For simplicity, we cancel the selection if it touches the scrolling region. Period. The last item, newly scrolled in lines is when the selection covers very old lines and we're now wrapping around the scrollback history. Then there's a fourth problem case: when the user has started a selection, but hasn't yet moved the cursor. In this case, we have no end point. What's more problematic is that when the user (after scrolling) moves the cursor, we try to create a huge selection that covers mostly empty (NULL) rows, causing us to crash. This can happen e.g. when reverse scrolling in such a way that we wrap around the scrollback history. The actual viewport in this case is something like `-n - m`. But the selection we'll end up trying to create will be `m - (rows - n)`. This range may very well contain NULL rows. To deal with this, we simply cancel the selection.
* selection: on_rows_in_view: fix range checkDaniel Eklöf2020-05-17-7/+5
|
* selection: copy: insert line break if either cell is emptyDaniel Eklöf2020-05-16-1/+2
|
* selection/render: sync cells' 'selected' bit before renderingDaniel Eklöf2020-05-16-0/+10
| | | | | | | | | | | | | | | | | | | | | | | For performance reasons, we track whether a cell is selected or not using a bit in a cell's attributes. This makes it easy for the renderer to determine if the cells should be rendered as selected or not - it just have to look at the 'selected' bit instead of doing a complex range check against the current selection. This works nicely in most cases. But, if the cell is updated, the 'selected' bit is cleared. This results in the renderer rendering the cell normally, i.e. _not_ selected. Checking for this, and re-setting the 'selected' bit when the cell is updated (printed to) is way too expensive as it is in the hot path. Instead, sync the 'selected' bits just before rendering. This isn't so bad as it may sound; if there is no selection this is a no-op. Even if there is a selection, only those cells whose 'selected' bit have been cleared are dirtied (and thus re-rendered) - these cells would have been re-rendered anyway.
* selection: update: don't assert on 'start' being setDaniel Eklöf2020-05-16-0/+1
|
* selection: don't automatically no-op operations if selection isn't enabledDaniel Eklöf2020-05-16-15/+0
| | | | | | | | | | | | | | | | | | When the client is capturing the mouse, selection can only be done by holding done shift. This is why a lot of selection functions are no-ops if selection isn't currently enabled. However, there are many cases where we actually need to modify the selection. In particular, selection_cancel(). Thus, only check for enabled selection when we're dealing with user input. Bonus: this also fixes a bug where an ongoing selection were finalized as soon as the user released shift, even if he was still holding down the mouse button.
* selection: on_row_in_view() -> on_rows_in_view(), and now takes a rangeDaniel Eklöf2020-05-16-4/+24
| | | | | This allows us to check the selection once when scrolling, instead of once for each scrolled in line.
* unicode-combining: store seen combining chains "globally" in the term structDaniel Eklöf2020-05-03-14/+10
| | | | | | | | | | | | | | | | | | | | Instead of storing combining data per cell, realize that most combinations are re-occurring and that there's lots of available space left in the unicode range, and store seen base+combining combinations chains in a per-terminal array. When we encounter a combining character, we first try to pre-compose, like before. If that fails, we then search for the current base+combining combo in the list of previously seen combinations. If not found there either, we allocate a new combo and add it to the list. Regardless, the result is an index into this array. We store this index, offsetted by COMB_CHARS_LO=0x40000000ul in the cell. When rendering, we need to check if the cell character is a plain character, or if it's a composed character (identified by checking if the cell character is >= COMB_CHARS_LO). Then we render the grapheme pretty much like before.
* unicode-combine: remove utf8proc dependencyDaniel Eklöf2020-05-02-2/+2
| | | | | | | | | | | | We only used utf8proc to try to pre-compose a glyph from a base and combining character. We can do this ourselves by using a pre-compiled table of valid pre-compositions. This table isn't _that_ big, and binary searching it is fast. That is, for a very small amount of code, and not too much extra RO data, we can get rid of the utf8proc dependency.
* unicode-combining: completely remove unicode combining characters when feature is disabledDaniel Eklöf2020-05-01-2/+8
|
* selection: extract text: also copy combining charactersDaniel Eklöf2020-05-01-14/+23
|
* util.h: new header file defining commonly used macrosDaniel Eklöf2020-05-01-3/+1
|
* selection: extend: new row must be offsetted with the current view offsetDaniel Eklöf2020-04-04-0/+2
|
* selection: add selection_extend()Daniel Eklöf2020-04-04-14/+171
| | | | | | | | | | | | | | This function extends an existing selection in the following way: If the extension point is *before* the upper boundary of the current selection, extend the selection upwards. If the extension point is *after* the bottom boundary of the current selection, extend the selection downwards. If the extension point is *inside* the current selection, shrink the selection such that the new size is maximized. This means we move the *closest* start/end point from in the current selection.
* term: convert cell 'linefeed' attribute to a row 'linebreak' propertyDaniel Eklöf2020-02-14-1/+1
| | | | | | | | | | | | | | | | To do text reflow, we only need to know if a line has been explicitly linebreaked or not. If not, that means it wrapped, and that we should *not* insert a linebreak when reflowing text. When reflowing text, when reaching the end of a row in the old grid, only insert a linebreak in the new grid if the old row had been explicitly linebreaked. Furthermore, when reflowing text and wrapping a row in the new grid, mark the previous row as linebreaked if either the last cell was (the last column in the last row) empty, or the current cell (the first column in the new row) is empty. If both are non-empty, then we assume a linewrap.
* selection: handle line break at last column correctlyDaniel Eklöf2020-02-11-1/+2
| | | | | Insert a newline into the selection even if the last column contained a printable character, *if* that column also has linefeed=1.
* Revert "selection: use edge-triggered FDM handlers"Daniel Eklöf2020-01-10-3/+3
| | | | This reverts commit 5bac3cfa2cb6a1e7b6eb0012c134bd2e844fcf61.
* selection: use edge-triggered FDM handlersDaniel Eklöf2020-01-10-3/+3
|
* selection: finalize: ignore whether selections are 'enabled' or notDaniel Eklöf2020-01-06-3/+0
| | | | | | This fixes an issue where a "forced" selection (shift being pressed while slave is tracking mouse events) would not finalize if the user released shift *before* releasing the mouse button.
* selection: update: don't dirty cells that don't change stateDaniel Eklöf2020-01-06-18/+47
| | | | | | | | | | | | | | | | Previously when updating a selection, we would unmark *all* cells in the old selection, and then mark all cells in the new selection. This caused *all* cells to be dirtied and thus re-rendered. Avoid this, by adding a temporary state to the cells' selected state. Before unmarking the old selection, pre-mark the new selection using a temporary state. When unmarking the old selection, ignore cells in this temporary state. When marking the new selection, ignore cells in this temporary state (except clearing the temporary state).
* selection: foreach_selection_*: must wrap row numberDaniel Eklöf2020-01-05-2/+6
| | | | | Fixes occasional crashes when we're at the end of the grid and selection wraps around.
* selection: min_bufsize_for_extraction: add one extra column for *all* rowsDaniel Eklöf2020-01-04-7/+4
|
* selection: rename selection_cell_count -> min_bufsize_for_extractionDaniel Eklöf2020-01-04-2/+2
|
* selection: cell count now adds one extra column per row, for \nDaniel Eklöf2020-01-04-3/+11
| | | | | | | | When we extract text, we may insert '\n' at the end of each line (or last column of selection, for block selections). These newlines doesn't occupy any physical cells, and thus we must **make** room for them in the extraction buffer.
* selection: fix bug where first column on all rows but the first was lostDaniel Eklöf2020-01-04-10/+12
| | | | | | | | | | When extracting text from the selection, we lost the first column on all rows but the first. This is because the algorithm changed slightly when we moved to foreach_selection(); the end-of-line detection is now done on the first column of the new line, instead of the last column on the previous line.
* selection: simplify extraction by converting to UTF-8 at the endDaniel Eklöf2020-01-04-21/+25
| | | | | Instead of converting a cell at a time to UTF-8, copy the wide characters as is, and then convert everything at once at the end.
* selection: extract_selection now uses foreach_selected()Daniel Eklöf2020-01-04-57/+105
| | | | | This "automagically" adds support for block selections, since foreach_selected already handles block selections.
* selection: selection_cancel() now sets 'kind' to SELECTION_NONEDaniel Eklöf2020-01-04-0/+5
|
* selection: store cell 'selected' state in the cells' attributesDaniel Eklöf2020-01-04-24/+119
| | | | | | | | | Instead of having the renderer calculate, for each cell, whether that cell is currently selected or not, make selection_update() mark/unmark the selected cells. The renderer now only has to look at the cells' 'selected' attribute. This makes the renderer both smaller and faster.
* selection: track selection type; normal or block selectionDaniel Eklöf2020-01-03-4/+9
|
* selection: remove unneeded wayland display roundtripsDaniel Eklöf2020-01-03-2/+0
|
* selection: optimize \r\n -> \n when receiving clipboard dataDaniel Eklöf2019-12-15-6/+14
| | | | | | Instead of first memmoving, possibly lots of data lots of times, the received buffer, and _then_ calling the callback, simply call the callback multiple times, and just skip the \r character(s).
* selection: break out isword() to a new fileDaniel Eklöf2019-12-03-21/+1
|
* term: add term_mouse_grabbed()Daniel Eklöf2019-11-30-12/+1
| | | | | | When this returns true, it means we have keyboard focus and are grabbing the mouse (for e.g. selections), regardless of whether the client has enabled mouse tracking or not.
* selection: forced selection requires keyboard focusDaniel Eklöf2019-11-30-1/+12
| | | | | | | | | | Up the requirements for enabling "forced" selection (that is, allowing selections even though mouse tracking has been disabled). * Require keyboard focus (if we don't have it, then the shift-key isn't is for us) * Don't just require shift being pressed, but that all other modifiers are *not* pressed.
* async: first synchronous write may succeed partiallyDaniel Eklöf2019-11-28-4/+6
| | | | | | | | | When trying to write (to e.g. the slave, or to a clipboard receiver), we first try to send the data synchronously, and only if that fails do we switch to asynchronous mode. However, the first synchronous may (in fact, is likely to) succeed partially.
* selection: text_to_clipboard: assert the clipboard serial is not 0Daniel Eklöf2019-11-22-0/+1
|
* selection: selection_to_clipboard: exit early on no-selectionDaniel Eklöf2019-11-22-0/+3
| | | | | When there's no selection, exit early to avoid trying to get grid data from row -1.
* selection: we already have a direct pointer to the clipboard structDaniel Eklöf2019-11-22-1/+1
|
* selection: buffer may be empty if only empty cells where selectedDaniel Eklöf2019-11-16-0/+6
|
* scan-build: fix a couple of minor warnings from a scan-build runDaniel Eklöf2019-11-05-0/+1
|
* selection: make text_from_{clipboard,primary} asyncDaniel Eklöf2019-11-05-61/+84
|
* selection: initialize 'ctx' before jumping into its scopeDaniel Eklöf2019-11-05-2/+2
|
* selection: text_from_{clipboard,primary}: add 'done' callbackDaniel Eklöf2019-11-05-18/+33
| | | | | | | | This callback is *always* called, including when there has been an error. This is in preparation for making text_from_{clipboard,primary} asynchronous.
* selection: async send: handle POLLHUPDaniel Eklöf2019-11-05-1/+4
|
* selection: free strdup:ed clipboard data on fdm failureDaniel Eklöf2019-11-05-0/+4
|
* selection: remove debug assertDaniel Eklöf2019-11-05-1/+0
|
* selection: typedef not needed here (copy-paste from fdm.h)Daniel Eklöf2019-11-05-2/+0
|
* selection: we don't set user data on primary/clipboard data sourcesDaniel Eklöf2019-11-04-4/+4
|
* selection: try to write selection data synchronously firstDaniel Eklöf2019-11-04-35/+70
| | | | Only if we fail to write everything do we switch to asynchronous mode.
* selection: send primary/clipboard data asynchronouslyDaniel Eklöf2019-11-04-36/+82
| | | | TODO: try writing synchronously first
* Rename: vt_to_slave() -> term_to_slave()Daniel Eklöf2019-11-02-5/+5
|
* term: wayland struct is now not a part of the terminal structDaniel Eklöf2019-10-27-21/+21
| | | | | | We do however need access to it, so provide a pointer. The difference is that now we can have a *single* wayland instance, but multiple terminal instances.
* wayland: change all wayland callbacks to take a wayland pointerDaniel Eklöf2019-10-27-4/+4
| | | | | Instead of passing the terminal to the wayland callbacks, pass a 'struct wayland' pointer.
* kbd: move into waylandDaniel Eklöf2019-10-27-1/+1
|
* wayland: move clipboard/primary structs into the wayland structDaniel Eklöf2019-10-27-19/+16
| | | | These are application global and very wayland specific
* selection: replace \r\n with \n in pasted textDaniel Eklöf2019-10-16-0/+16
|