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

Initial screen resize support.

Browse Source
This commit is contained in:
Michael Jumper 2013-05-01 16:54:29 -07:00
parent ca17560328
commit 8c81cae871
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protocols/ssh/include/ssh_handlers.h
View File

@ -45,6 +45,7 @@ int ssh_guac_client_handle_messages(guac_client* client);
int ssh_guac_client_key_handler(guac_client* client, int keysym, int pressed); int ssh_guac_client_key_handler(guac_client* client, int keysym, int pressed);
int ssh_guac_client_mouse_handler(guac_client* client, int x, int y, int mask); int ssh_guac_client_mouse_handler(guac_client* client, int x, int y, int mask);
int ssh_guac_client_clipboard_handler(guac_client* client, char* data); int ssh_guac_client_clipboard_handler(guac_client* client, char* data);
int ssh_guac_client_size_handler(guac_client* client, int width, int height);
int ssh_guac_client_free_handler(guac_client* client); int ssh_guac_client_free_handler(guac_client* client);
#endif #endif

1
protocols/ssh/src/ssh_client.c
View File

@ -228,6 +228,7 @@ int ssh_guac_client_auth(guac_client* client, const char* password) {
client->mouse_handler = ssh_guac_client_mouse_handler; client->mouse_handler = ssh_guac_client_mouse_handler;
client->key_handler = ssh_guac_client_key_handler; client->key_handler = ssh_guac_client_key_handler;
client->clipboard_handler = ssh_guac_client_clipboard_handler; client->clipboard_handler = ssh_guac_client_clipboard_handler;
client->size_handler = ssh_guac_client_size_handler;
/* Success */ /* Success */

30
protocols/ssh/src/ssh_handlers.c
View File

@ -296,6 +296,36 @@ int ssh_guac_client_key_handler(guac_client* client, int keysym, int pressed) {
} }
int ssh_guac_client_size_handler(guac_client* client, int width, int height) {
/* Get terminal */
ssh_guac_client_data* guac_client_data = (ssh_guac_client_data*) client->data;
guac_terminal* terminal = guac_client_data->term;
/* Calculate dimensions */
int rows = height / terminal->display->char_height;
int columns = width / terminal->display->char_width;
pthread_mutex_lock(&(terminal->lock));
/* If size has changed */
if (columns != terminal->term_width || rows != terminal->term_height) {
/* Resize terminal */
guac_terminal_resize(terminal, columns, rows);
channel_change_pty_size(guac_client_data->term_channel,
terminal->term_width, terminal->term_height);
/* Reset scroll region */
terminal->scroll_end = rows - 1;
}
pthread_mutex_unlock(&(terminal->lock));
return 0;
}
int ssh_guac_client_free_handler(guac_client* client) { int ssh_guac_client_free_handler(guac_client* client) {
ssh_guac_client_data* guac_client_data = (ssh_guac_client_data*) client->data; ssh_guac_client_data* guac_client_data = (ssh_guac_client_data*) client->data;

12
protocols/ssh/src/terminal.c
View File

@ -417,3 +417,15 @@ void guac_terminal_set_columns(guac_terminal* terminal, int row,
} }
void guac_terminal_resize(guac_terminal* term, int width, int height) {
/* Resize display */
guac_terminal_display_flush(term->display);
guac_terminal_display_resize(term->display, width, height);
/* Commit new dimensions */
term->term_width = width;
term->term_height = height;
}