GUACAMOLE-1538: Only the core functionality of the terminal lib shoul…

…d be public.

doc/libguac-terminal/Doxyfile.in

@@ -51,8 +51,7 @@ SHOW_INCLUDE_FILES    = NO
 CASE_SENSE_NAMES     = YES
 FILE_PATTERNS        = *.h
 STRIP_FROM_PATH      = ../../src/terminal
-INPUT                = ../../src/terminal/terminal/
-EXCLUDE              = ../../src/terminal/terminal/terminal_priv.h
+INPUT                = ../../src/terminal/terminal/terminal.h
 JAVADOC_AUTOBRIEF    = YES
 TAB_SIZE             = 4
 TYPEDEF_HIDES_STRUCT = YES

src/protocols/ssh/argv.c

@@ -27,6 +27,7 @@
 #include <guacamole/user.h>
 
 #include <pthread.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

src/protocols/ssh/ssh.c

@@ -36,6 +36,8 @@
 #include <libssh2.h>
 #include <libssh2_sftp.h>
 #include <guacamole/client.h>
+#include <guacamole/socket.h>
+#include <guacamole/timestamp.h>
 #include <guacamole/wol.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -98,7 +100,7 @@ static guac_common_ssh_user* guac_ssh_get_user(guac_client* client) {
             guac_client_log(client, GUAC_LOG_DEBUG,
                     "Initial import failed: %s",
                     guac_common_ssh_key_error());
-  
+
             guac_client_log(client, GUAC_LOG_DEBUG,
                     "Re-attempting private key import (WITH passphrase)");
 
@@ -148,23 +150,23 @@ static guac_common_ssh_user* guac_ssh_get_user(guac_client* client) {
  * A function used to generate a terminal prompt to gather additional
  * credentials from the guac_client during a connection, and using
  * the specified string to generate the prompt for the user.
- * 
+ *
  * @param client
  *     The guac_client object associated with the current connection
  *     where additional credentials are required.
- * 
+ *
  * @param cred_name
  *     The prompt text to display to the screen when prompting for the
  *     additional credentials.
- * 
- * @return 
+ *
+ * @return
  *     The string of credentials gathered from the user.
  */
 static char* guac_ssh_get_credential(guac_client *client, char* cred_name) {
 
     guac_ssh_client* ssh_client = (guac_ssh_client*) client->data;
     return guac_terminal_prompt(ssh_client->term, cred_name, false);
-    
+
 }
 
 void* ssh_input_thread(void* data) {
@@ -206,17 +208,17 @@ void* ssh_client_thread(void* data) {
     if (settings->wol_send_packet) {
         guac_client_log(client, GUAC_LOG_DEBUG, "Sending Wake-on-LAN packet, "
                 "and pausing for %d seconds.", settings->wol_wait_time);
-        
+
         /* Send the Wake-on-LAN request. */
         if (guac_wol_wake(settings->wol_mac_addr, settings->wol_broadcast_addr,
                 settings->wol_udp_port))
             return NULL;
-        
+
         /* If wait time is specified, sleep for that amount of time. */
         if (settings->wol_wait_time > 0)
             guac_timestamp_msleep(settings->wol_wait_time * 1000);
     }
-    
+
     /* Init SSH base libraries */
     if (guac_common_ssh_init(client)) {
         guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
@@ -360,7 +362,7 @@ void* ssh_client_thread(void* data) {
         if (!settings->sftp_disable_upload)
             guac_terminal_set_upload_path_handler(ssh_client->term,
                     guac_sftp_set_upload_path);
-        
+
         if (!settings->sftp_disable_download)
             guac_terminal_set_file_download_handler(ssh_client->term,
                     guac_sftp_download_file);

src/protocols/telnet/argv.c

@@ -26,6 +26,7 @@
 #include <guacamole/socket.h>
 #include <guacamole/user.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

src/protocols/telnet/client.c

@@ -30,6 +30,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <guacamole/argv.h>
 #include <guacamole/client.h>

src/protocols/telnet/telnet.c

@@ -26,6 +26,7 @@
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>
+#include <guacamole/timestamp.h>
 #include <guacamole/wol.h>
 #include <libtelnet.h>
 
@@ -559,17 +560,17 @@ void* guac_telnet_client_thread(void* data) {
     pthread_t input_thread;
     char buffer[8192];
     int wait_result;
-    
+
     /* If Wake-on-LAN is enabled, attempt to wake. */
     if (settings->wol_send_packet) {
         guac_client_log(client, GUAC_LOG_DEBUG, "Sending Wake-on-LAN packet, "
                 "and pausing for %d seconds.", settings->wol_wait_time);
-        
+
         /* Send the Wake-on-LAN request. */
         if (guac_wol_wake(settings->wol_mac_addr, settings->wol_broadcast_addr,
                 settings->wol_udp_port))
             return NULL;
-        
+
         /* If wait time is specified, sleep for that amount of time. */
         if (settings->wol_wait_time > 0)
             guac_timestamp_msleep(settings->wol_wait_time * 1000);

src/terminal/Makefile.am

@@ -23,17 +23,14 @@
 # to you by the ASF under the Apache License, Version 2.0, as described above.
 #
 
-AUTOMAKE_OPTIONS = foreign 
+AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
 lib_LTLIBRARIES = libguac-terminal.la
 
 libguac_terminalincdir = $(includedir)/guacamole/terminal
 
-noinst_HEADERS =             \
-    terminal/terminal-priv.h
-
-libguac_terminalinc_HEADERS =    \
+noinst_HEADERS =                 \
     terminal/buffer.h            \
     terminal/char-mappings.h     \
     terminal/common.h            \
@@ -43,12 +40,15 @@ libguac_terminalinc_HEADERS =    \
     terminal/palette.h           \
     terminal/scrollbar.h         \
     terminal/select.h            \
-    terminal/terminal.h          \
+    terminal/terminal-priv.h     \
     terminal/terminal-handlers.h \
     terminal/types.h             \
     terminal/typescript.h        \
     terminal/xparsecolor.h
 
+libguac_terminalinc_HEADERS =    \
+    terminal/terminal.h
+
 libguac_terminal_la_SOURCES =   \
     buffer.c                    \
     char-mappings.c             \

src/terminal/buffer.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 
 #include "terminal/buffer.h"
 #include "terminal/common.h"

src/terminal/char-mappings.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 
 const int vt100_map[] = {
     ' ',    '!',    '"',    '#',    '$',    '%',    '&',    '\'',   '(',    ')',    '*',    '+',    ',',    '-',    '.',    '/',

src/terminal/color-scheme.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 
 #include "terminal/color-scheme.h"
 #include "terminal/palette.h"

src/terminal/common.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 #include "terminal/types.h"
 
 #include <stdbool.h>

src/terminal/display.c

@@ -17,12 +17,13 @@
  * under the License.
  */
 
-#include "config.h"
 
 #include "common/surface.h"
 #include "terminal/common.h"
 #include "terminal/display.h"
 #include "terminal/palette.h"
+#include "terminal/terminal.h"
+#include "terminal/terminal-priv.h"
 #include "terminal/types.h"
 
 #include <math.h>

src/terminal/named-colors.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 #include "terminal/palette.h"
 
 #include <ctype.h>

src/terminal/palette.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 #include "terminal/palette.h"
 
 const guac_terminal_color GUAC_TERMINAL_INITIAL_PALETTE[256] = {

src/terminal/scrollbar.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 #include "terminal/scrollbar.h"
 
 #include <guacamole/client.h>

src/terminal/select.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 
 #include "common/clipboard.h"
 #include "terminal/buffer.h"

src/terminal/terminal-stdin-stream.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 #include "terminal/common.h"
 #include "terminal/terminal.h"
 #include "terminal/terminal-priv.h"

src/terminal/terminal.c

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "config.h"
 
 #include "common/clipboard.h"
 #include "common/cursor.h"

src/terminal/terminal/buffer.h

@@ -28,7 +28,6 @@
  */
 
 
-#include "config.h"
 
 #include "types.h"
 

src/terminal/terminal/char-mappings.h

@@ -27,7 +27,6 @@
  * @file char-mappings.h
  */
 
-#include "config.h"
 
 /**
  * VT100 graphics mapping. Each entry is the corresponding Unicode codepoint

src/terminal/terminal/color-scheme.h

@@ -17,18 +17,17 @@
  * under the License.
  */
 
-#ifndef GUAC_TERMINAL_GET_COLOR_SCHEME_H
-#define GUAC_TERMINAL_GET_COLOR_SCHEME_H
+#ifndef GUAC_TERMINAL_COLOR_SCHEME_H
+#define GUAC_TERMINAL_COLOR_SCHEME_H
 
 /**
  * Definitions and functions related to color scheme handling.
  *
  * @file color-scheme.h
  */
 
-#include "config.h"
 
-#include "terminal/palette.h"
+#include "palette.h"
 
 #include <guacamole/client.h>
 

src/terminal/terminal/common.h

@@ -27,7 +27,6 @@
  * @file common.h
  */
 
-#include "config.h"
 #include "types.h"
 
 #include <stdbool.h>

src/terminal/terminal/display.h

@@ -27,7 +27,6 @@
  * @file display.h
  */
 
-#include "config.h"
 
 #include "common/surface.h"
 #include "palette.h"

src/terminal/terminal/named-colors.h

@@ -26,8 +26,7 @@
  * @file named-colors.h
  */
 
-#include "config.h"
-#include "terminal/palette.h"
+#include "palette.h"
 
 /**
  * Searches for the color having the given name, storing that color within the

src/terminal/terminal/palette.h

@@ -26,7 +26,6 @@
  * @file palette.h
  */
 
-#include "config.h"
 
 #include <stdint.h>
 

src/terminal/terminal/scrollbar.h

@@ -26,7 +26,6 @@
  * @file scrollbar.h
  */
 
-#include "config.h"
 
 #include <guacamole/client.h>
 #include <guacamole/layer.h>

src/terminal/terminal/select.h

@@ -27,7 +27,6 @@
  * @file select.h
  */
 
-#include "config.h"
 #include "terminal.h"
 
 #include <stdbool.h>

src/terminal/terminal/terminal-handlers.h

@@ -29,6 +29,7 @@
 
 #include "config.h"
 
+#include "display.h"
 #include "terminal.h"
 
 /**