GUACAMOLE-1586: Wrapped lines now clipped into 1. #402
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When an extra long wrapped line is selected, no more \n added to clipboard.
mike-jumper
requested changes
Nov 22, 2022
|
|
||
| /* Store all middle rows */ | ||
| for (int row = start_row + 1; row < end_row; row++) { | ||
| guac_common_clipboard_append(terminal->clipboard, "\n", 1); | ||
| guac_terminal_clipboard_append_row(terminal, row, 0, -1); | ||
| guac_terminal_buffer_row* buffer_row = guac_terminal_buffer_get_row(terminal->buffer, start_row, 0); |
There was a problem hiding this comment.
Won't this repeatedly retrieve the same row?
src/terminal/select.c
Outdated
| guac_terminal_clipboard_append_row(terminal, row, 0, -1); | ||
| guac_terminal_buffer_row* buffer_row = guac_terminal_buffer_get_row(terminal->buffer, start_row, 0); | ||
| guac_terminal_clipboard_append_row(terminal, row, 0, buffer_row->length - 2); | ||
| if(!(buffer_row->characters[buffer_row->length - 1].value == 0 && buffer_row->characters[buffer_row->length - 2].value > 0)) |
There was a problem hiding this comment.
To match the style of established code, please include a space between if and the opening paren.
src/terminal/select.c
Outdated
| @@ -360,16 +360,19 @@ void guac_terminal_select_end(guac_terminal* terminal) { | |||
| else { | |||
|
|
|||
| /* Store first row */ | |||
| guac_terminal_clipboard_append_row(terminal, start_row, start_col, -1); | |||
| guac_terminal_buffer_row* buffer_row = guac_terminal_buffer_get_row(terminal->buffer, start_row, 0); | |||
| guac_terminal_clipboard_append_row(terminal, start_row, start_col, buffer_row->length - 2); | |||
There was a problem hiding this comment.
buffer_row->lengthis not guaranteed to be at least 2 here unless the call toguac_terminal_buffer_get_row()requests this.- Why are we universally skipping the last two characters?
There was a problem hiding this comment.
My purpose it to omit the line break when an extra long line of text is separated because of insufficient length of the terminal simulator. I managed to use buffer_row->length - 1 with server version 1.3.0, but have to cut down another character with 1.4.0. Currently, the horizontal index of bound is length - 2, I'll figure it out with annotations in next commit.
The end param should be length - 1. This logic doesn't clip repeatedly cuz first and end lines are handled separately. Maybe guaca doesn't recognize these long lines when they are broken into different lines in terminal simulator.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When an extra long wrapped line is selected, no more \n added to clipboard.