From 45072121708585da1594366de86e92eae2d5212a Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sun, 14 Jan 2024 19:36:40 -0800 Subject: [PATCH] GUACAMOLE-1907: Removed the double line breaks in the terminal sub-folder. --- src/terminal/buffer.c | 1 - src/terminal/char-mappings.c | 1 - src/terminal/color-scheme.c | 1 - src/terminal/display.c | 2 -- src/terminal/select.c | 1 - src/terminal/terminal-handlers.c | 1 - src/terminal/terminal.c | 2 -- src/terminal/terminal/buffer.h | 3 --- src/terminal/terminal/char-mappings.h | 2 -- src/terminal/terminal/color-scheme.h | 1 - src/terminal/terminal/common.h | 1 - src/terminal/terminal/display.h | 2 -- src/terminal/terminal/palette.h | 1 - src/terminal/terminal/scrollbar.h | 1 - src/terminal/terminal/select.h | 1 - src/terminal/terminal/terminal-handlers.h | 1 - src/terminal/terminal/terminal-priv.h | 1 - src/terminal/terminal/terminal.h | 1 - src/terminal/terminal/types.h | 1 - src/terminal/terminal/typescript.h | 2 -- src/terminal/terminal/xparsecolor.h | 1 - src/terminal/xparsecolor.c | 1 - 22 files changed, 29 deletions(-) diff --git a/src/terminal/buffer.c b/src/terminal/buffer.c index a8cc87ce..59c10209 100644 --- a/src/terminal/buffer.c +++ b/src/terminal/buffer.c @@ -17,7 +17,6 @@ * under the License. */ - #include "terminal/buffer.h" #include "terminal/common.h" diff --git a/src/terminal/char-mappings.c b/src/terminal/char-mappings.c index 421bc388..dc47c093 100644 --- a/src/terminal/char-mappings.c +++ b/src/terminal/char-mappings.c @@ -17,7 +17,6 @@ * under the License. */ - const int vt100_map[] = { ' ', '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', diff --git a/src/terminal/color-scheme.c b/src/terminal/color-scheme.c index c1a9e3ff..1070ada6 100644 --- a/src/terminal/color-scheme.c +++ b/src/terminal/color-scheme.c @@ -17,7 +17,6 @@ * under the License. */ - #include "terminal/color-scheme.h" #include "terminal/palette.h" #include "terminal/xparsecolor.h" diff --git a/src/terminal/display.c b/src/terminal/display.c index a89b2693..ad0ec48e 100644 --- a/src/terminal/display.c +++ b/src/terminal/display.c @@ -17,7 +17,6 @@ * under the License. */ - #include "common/surface.h" #include "terminal/common.h" #include "terminal/display.h" @@ -768,7 +767,6 @@ void __guac_terminal_display_flush_clear(guac_terminal_display* display) { } - void __guac_terminal_display_flush_set(guac_terminal_display* display) { guac_terminal_operation* current = display->operations; diff --git a/src/terminal/select.c b/src/terminal/select.c index c70b1959..fdb5a7cf 100644 --- a/src/terminal/select.c +++ b/src/terminal/select.c @@ -17,7 +17,6 @@ * under the License. */ - #include "common/clipboard.h" #include "terminal/buffer.h" #include "terminal/display.h" diff --git a/src/terminal/terminal-handlers.c b/src/terminal/terminal-handlers.c index bba2c38c..1cff2d8d 100644 --- a/src/terminal/terminal-handlers.c +++ b/src/terminal/terminal-handlers.c @@ -1242,7 +1242,6 @@ int guac_terminal_set_scrollback(guac_terminal* term, unsigned char c) { } - int guac_terminal_window_title(guac_terminal* term, unsigned char c) { static int position = 0; diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index 9369db1f..60dff20f 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -17,7 +17,6 @@ * under the License. */ - #include "common/clipboard.h" #include "common/cursor.h" #include "terminal/buffer.h" @@ -1439,7 +1438,6 @@ int guac_terminal_resize(guac_terminal* terminal, int width, int height) { guac_terminal_scrollbar_set_bounds(terminal->scrollbar, -guac_terminal_get_available_scroll(terminal), 0); - /* Release terminal */ guac_terminal_unlock(terminal); diff --git a/src/terminal/terminal/buffer.h b/src/terminal/terminal/buffer.h index 00277cb9..7c7f29c5 100644 --- a/src/terminal/terminal/buffer.h +++ b/src/terminal/terminal/buffer.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef _GUAC_TERMINAL_BUFFER_H #define _GUAC_TERMINAL_BUFFER_H @@ -27,8 +26,6 @@ * @file buffer.h */ - - #include "types.h" /** diff --git a/src/terminal/terminal/char-mappings.h b/src/terminal/terminal/char-mappings.h index 6d1dab0b..2e889712 100644 --- a/src/terminal/terminal/char-mappings.h +++ b/src/terminal/terminal/char-mappings.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef _GUAC_TERMINAL_CHAR_MAPPINGS_H #define _GUAC_TERMINAL_CHAR_MAPPINGS_H @@ -27,7 +26,6 @@ * @file char-mappings.h */ - /** * VT100 graphics mapping. Each entry is the corresponding Unicode codepoint * for the character N+32, where N is the index of the element in the array. diff --git a/src/terminal/terminal/color-scheme.h b/src/terminal/terminal/color-scheme.h index 02e24046..55665d48 100644 --- a/src/terminal/terminal/color-scheme.h +++ b/src/terminal/terminal/color-scheme.h @@ -26,7 +26,6 @@ * @file color-scheme.h */ - #include "palette.h" #include diff --git a/src/terminal/terminal/common.h b/src/terminal/terminal/common.h index e50b702e..d5b358c5 100644 --- a/src/terminal/terminal/common.h +++ b/src/terminal/terminal/common.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef _GUAC_TERMINAL_COMMON_H #define _GUAC_TERMINAL_COMMON_H diff --git a/src/terminal/terminal/display.h b/src/terminal/terminal/display.h index 4c84dc56..9fe489f6 100644 --- a/src/terminal/terminal/display.h +++ b/src/terminal/terminal/display.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef _GUAC_TERMINAL_DISPLAY_H #define _GUAC_TERMINAL_DISPLAY_H @@ -27,7 +26,6 @@ * @file display.h */ - #include "common/surface.h" #include "palette.h" #include "types.h" diff --git a/src/terminal/terminal/palette.h b/src/terminal/terminal/palette.h index a032692e..2cc4b085 100644 --- a/src/terminal/terminal/palette.h +++ b/src/terminal/terminal/palette.h @@ -26,7 +26,6 @@ * @file palette.h */ - #include /** diff --git a/src/terminal/terminal/scrollbar.h b/src/terminal/terminal/scrollbar.h index 5ffdf9f9..d29e459c 100644 --- a/src/terminal/terminal/scrollbar.h +++ b/src/terminal/terminal/scrollbar.h @@ -26,7 +26,6 @@ * @file scrollbar.h */ - #include #include diff --git a/src/terminal/terminal/select.h b/src/terminal/terminal/select.h index f85eef3a..8a2d9650 100644 --- a/src/terminal/terminal/select.h +++ b/src/terminal/terminal/select.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef GUAC_TERMINAL_SELECT_H #define GUAC_TERMINAL_SELECT_H diff --git a/src/terminal/terminal/terminal-handlers.h b/src/terminal/terminal/terminal-handlers.h index d983ae3e..b67ffcbd 100644 --- a/src/terminal/terminal/terminal-handlers.h +++ b/src/terminal/terminal/terminal-handlers.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef _GUAC_TERMINAL_HANDLERS #define _GUAC_TERMINAL_HANDLERS diff --git a/src/terminal/terminal/terminal-priv.h b/src/terminal/terminal/terminal-priv.h index c937c1a7..08e2baea 100644 --- a/src/terminal/terminal/terminal-priv.h +++ b/src/terminal/terminal/terminal-priv.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef GUAC_TERMINAL_PRIV_H #define GUAC_TERMINAL_PRIV_H diff --git a/src/terminal/terminal/terminal.h b/src/terminal/terminal/terminal.h index cb3ed248..e71b8c56 100644 --- a/src/terminal/terminal/terminal.h +++ b/src/terminal/terminal/terminal.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef _GUAC_TERMINAL_H #define _GUAC_TERMINAL_H diff --git a/src/terminal/terminal/types.h b/src/terminal/terminal/types.h index 24cf7723..15333ea0 100644 --- a/src/terminal/terminal/types.h +++ b/src/terminal/terminal/types.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef _GUAC_TERMINAL_TYPES_H #define _GUAC_TERMINAL_TYPES_H diff --git a/src/terminal/terminal/typescript.h b/src/terminal/terminal/typescript.h index 941dd99f..bbd8fe12 100644 --- a/src/terminal/terminal/typescript.h +++ b/src/terminal/terminal/typescript.h @@ -17,7 +17,6 @@ * under the License. */ - #ifndef GUAC_TERMINAL_TYPESCRIPT_H #define GUAC_TERMINAL_TYPESCRIPT_H @@ -28,7 +27,6 @@ * @file typescript.h */ - #include /** diff --git a/src/terminal/terminal/xparsecolor.h b/src/terminal/terminal/xparsecolor.h index 4550ac3c..40178710 100644 --- a/src/terminal/terminal/xparsecolor.h +++ b/src/terminal/terminal/xparsecolor.h @@ -26,7 +26,6 @@ * @file xparsecolor.h */ - #include "palette.h" /** diff --git a/src/terminal/xparsecolor.c b/src/terminal/xparsecolor.c index cb589f23..ada7c086 100644 --- a/src/terminal/xparsecolor.c +++ b/src/terminal/xparsecolor.c @@ -17,7 +17,6 @@ * under the License. */ - #include "terminal/named-colors.h" #include "terminal/palette.h"