maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-1622: Restructured code to resolve scrollbar resizing bug where the scrollbar would clip off the side of the terminal. This fix also resolves the issue where the text would blur at certain intervals of resizing the window.

Browse Source
This commit is contained in:
Alex Leitner 2022-07-07 15:24:14 +00:00
parent 51c640fdbd
commit 5bb56ed5ba
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/terminal/terminal.c
View File

@ -377,15 +377,13 @@ static void calculate_rows_and_columns(guac_terminal* term,
*columns = available_width / char_width; *columns = available_width / char_width;
/* Keep height within predefined maximum */ /* Keep height within predefined maximum */
if (*rows > GUAC_TERMINAL_MAX_ROWS) { if (*rows > GUAC_TERMINAL_MAX_ROWS)
*rows = GUAC_TERMINAL_MAX_ROWS; *rows = GUAC_TERMINAL_MAX_ROWS;
}
/* Keep width within predefined maximum */ /* Keep width within predefined maximum */
if (*columns > GUAC_TERMINAL_MAX_COLUMNS) { if (*columns > GUAC_TERMINAL_MAX_COLUMNS)
*columns = GUAC_TERMINAL_MAX_COLUMNS; *columns = GUAC_TERMINAL_MAX_COLUMNS;
} }
}
/** /**
* Calculate the available height and width in pixels of the terminal for text * Calculate the available height and width in pixels of the terminal for text
@ -415,8 +413,17 @@ static void calculate_height_and_width(guac_terminal* term,
int char_width = term->display->char_width; int char_width = term->display->char_width;
int char_height = term->display->char_height; int char_height = term->display->char_height;
*height = rows * char_height + 2 * margin; /* Recalculate height if max rows reached */
*width = columns * char_width + GUAC_TERMINAL_SCROLLBAR_WIDTH + 2 * margin; if (rows == GUAC_TERMINAL_MAX_ROWS) {
int available_height = GUAC_TERMINAL_MAX_ROWS * char_height;
*height = available_height + 2 * margin;
}
/* Recalculate width if max columns reached */
if (columns == GUAC_TERMINAL_MAX_COLUMNS) {
int available_width = GUAC_TERMINAL_MAX_COLUMNS * char_width;
*width = available_width + GUAC_TERMINAL_SCROLLBAR_WIDTH + 2 * margin;
}
} }
guac_terminal* guac_terminal_create(guac_client* client, guac_terminal* guac_terminal_create(guac_client* client,
@ -504,10 +511,11 @@ guac_terminal* guac_terminal_create(guac_client* client,
int rows, columns; int rows, columns;
calculate_rows_and_columns(term, height, width, &rows, &columns); calculate_rows_and_columns(term, height, width, &rows, &columns);
/* Calculate available text display area in pixels */ /* Calculate available display area in pixels */
int available_height, available_width; int adjusted_height = height;
int adjusted_width = width;
calculate_height_and_width(term, rows, columns, calculate_height_and_width(term, rows, columns,
&available_height, &available_width); &adjusted_height, &adjusted_width);
/* Set size of available screen area */ /* Set size of available screen area */
term->outer_height = height; term->outer_height = height;
@ -518,8 +526,8 @@ guac_terminal* guac_terminal_create(guac_client* client,
term->term_width = columns; term->term_width = columns;
/* Set pixel size */ /* Set pixel size */
term->height = available_height; term->height = adjusted_height;
term->width = available_width; term->width = adjusted_width;
/* Open STDIN pipe */ /* Open STDIN pipe */
if (pipe(term->stdin_pipe_fd)) { if (pipe(term->stdin_pipe_fd)) {
@ -1462,18 +1470,19 @@ int guac_terminal_resize(guac_terminal* terminal, int width, int height) {
int rows, columns; int rows, columns;
calculate_rows_and_columns(terminal, height, width, &rows, &columns); calculate_rows_and_columns(terminal, height, width, &rows, &columns);
/* Calculate available text display area in pixels */ /* Calculate available display area in pixels */
int available_height, available_width; int adjusted_height = height;
int adjusted_width = width;
calculate_height_and_width(terminal, rows, columns, calculate_height_and_width(terminal, rows, columns,
&available_height, &available_width); &adjusted_height, &adjusted_width);
/* Set size of available screen area */ /* Set size of available screen area */
terminal->outer_height = height; terminal->outer_height = height;
terminal->outer_width = width; terminal->outer_width = width;
/* Set pixel size */ /* Set pixel size */
terminal->height = available_height; terminal->height = adjusted_height;
terminal->width = available_width; terminal->width = adjusted_width;
/* Resize default layer to given pixel dimensions */ /* Resize default layer to given pixel dimensions */
guac_terminal_repaint_default_layer(terminal, client->socket); guac_terminal_repaint_default_layer(terminal, client->socket);