GUACAMOLE-169: Move terminal headers to namespaced directory.

src/protocols/ssh/client.c

@@ -22,7 +22,7 @@
 #include "client.h"
 #include "common-ssh/sftp.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "user.h"
 
 #include <langinfo.h>

src/protocols/ssh/clipboard.c

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "clipboard.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/stream.h>

src/protocols/ssh/input.c

@@ -22,7 +22,7 @@
 #include "common/cursor.h"
 #include "common/display.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/user.h>

src/protocols/ssh/ssh.c

@@ -25,7 +25,7 @@
 #include "settings.h"
 #include "sftp.h"
 #include "ssh.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #ifdef ENABLE_SSH_AGENT
 #include "ssh_agent.h"

src/protocols/ssh/ssh.h

@@ -26,7 +26,7 @@
 #include "common-ssh/ssh.h"
 #include "common-ssh/user.h"
 #include "settings.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #ifdef ENABLE_SSH_AGENT
 #include "ssh_agent.h"

src/protocols/telnet/client.c

@@ -21,7 +21,7 @@
 #include "client.h"
 #include "settings.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "user.h"
 
 #include <langinfo.h>

src/protocols/telnet/client.h

@@ -21,7 +21,7 @@
 #define GUAC_TELNET__CLIENT_H
 
 #include "config.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <pthread.h>
 #include <regex.h>

src/protocols/telnet/clipboard.c

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "clipboard.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/stream.h>

src/protocols/telnet/input.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "input.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "telnet.h"
 
 #include <guacamole/client.h>

src/protocols/telnet/telnet.c

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "common/recording.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>

src/protocols/telnet/telnet.h

@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "settings.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 
 #include <libtelnet.h>
 

src/protocols/telnet/user.c

@@ -23,7 +23,7 @@
 #include "input.h"
 #include "settings.h"
 #include "telnet.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
 #include "user.h"
 
 #include <guacamole/client.h>

src/terminal/Makefile.am

@@ -23,15 +23,15 @@ ACLOCAL_AMFLAGS = -I m4
 noinst_LTLIBRARIES = libguac_terminal.la
 
 noinst_HEADERS =                 \
-    buffer.h                    \
+    terminal/buffer.h            \
-    char_mappings.h             \
+    terminal/char_mappings.h     \
-    common.h                    \
+    terminal/common.h            \
-    display.h                   \
+    terminal/display.h           \
-    scrollbar.h                 \
+    terminal/scrollbar.h         \
-    terminal.h                  \
+    terminal/terminal.h          \
-    terminal_handlers.h         \
+    terminal/terminal_handlers.h \
-    types.h                     \
+    terminal/types.h             \
-    typescript.h
+    terminal/typescript.h
 
 libguac_terminal_la_SOURCES =   \
     buffer.c                    \

src/terminal/buffer.c

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include "buffer.h"
+#include "terminal/buffer.h"
-#include "common.h"
+#include "terminal/common.h"
 
 #include <stdlib.h>
 #include <string.h>

src/terminal/common.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "types.h"
+#include "terminal/types.h"
 
 #include <stdbool.h>
 #include <unistd.h>

src/terminal/display.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "common.h"
 #include "common/surface.h"
-#include "display.h"
+#include "terminal/common.h"
-#include "types.h"
+#include "terminal/display.h"
+#include "terminal/types.h"
 
 #include <math.h>
 #include <stdlib.h>

src/terminal/scrollbar.c

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "scrollbar.h"
+#include "terminal/scrollbar.h"
 
 #include <guacamole/client.h>
 #include <guacamole/layer.h>

src/terminal/terminal.c

@@ -19,15 +19,15 @@
 
 #include "config.h"
 
-#include "buffer.h"
-#include "common.h"
 #include "common/clipboard.h"
 #include "common/cursor.h"
-#include "display.h"
+#include "terminal/buffer.h"
-#include "terminal.h"
+#include "terminal/common.h"
-#include "terminal_handlers.h"
+#include "terminal/display.h"
-#include "types.h"
+#include "terminal/terminal.h"
-#include "typescript.h"
+#include "terminal/terminal_handlers.h"
+#include "terminal/types.h"
+#include "terminal/typescript.h"
 
 #include <errno.h>
 #include <pthread.h>

src/terminal/terminal_handlers.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "char_mappings.h"
+#include "terminal/char_mappings.h"
-#include "terminal.h"
+#include "terminal/terminal.h"
-#include "terminal_handlers.h"
+#include "terminal/terminal_handlers.h"
-#include "types.h"
+#include "terminal/types.h"
 
 #include <guacamole/client.h>
 #include <guacamole/protocol.h>

src/terminal/typescript.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "common/io.h"
-#include "typescript.h"
+#include "terminal/typescript.h"
 
 #include <guacamole/timestamp.h>