Clean up includes, clean up build.

This commit is contained in:
Michael Jumper 2014-01-01 14:44:28 -08:00
parent 0303c4e24b
commit 442ed427a0
156 changed files with 827 additions and 642 deletions

3
.gitignore vendored
View File

@ -30,6 +30,8 @@ autom4te.cache/
m4/* m4/*
!README !README
config.guess config.guess
config.h
config.h.in
config.log config.log
config.status config.status
config.sub config.sub
@ -39,6 +41,7 @@ install-sh
libtool libtool
ltmain.sh ltmain.sh
missing missing
stamp-h1
# Test binaries # Test binaries
tests/test_* tests/test_*

View File

@ -23,10 +23,12 @@
AC_PREREQ([2.61]) AC_PREREQ([2.61])
AC_INIT([guacamole-server], [0.8.3]) AC_INIT([guacamole-server], [0.8.3])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_SILENT_RULES([yes])
LT_PREREQ([2.2]) LT_PREREQ([2.2])
LT_INIT([dlopen]) LT_INIT([dlopen])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
# Programs # Programs
@ -55,7 +57,8 @@ AC_CHECK_LIB([cairo], [cairo_create], [CAIRO_LIBS=-lcairo],
# libpthread # libpthread
AC_CHECK_LIB([pthread], [pthread_create], [PTHREAD_LIBS=-lpthread AC_CHECK_LIB([pthread], [pthread_create], [PTHREAD_LIBS=-lpthread
AC_DEFINE([HAVE_LIBPTHREAD])]) AC_DEFINE([HAVE_LIBPTHREAD],,
[Whether libpthread was found])])
# cunit # cunit
AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit]) AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit])
@ -73,11 +76,13 @@ AC_SUBST(CUNIT_LIBS)
AC_CHECK_FUNCS([clock_gettime gettimeofday memmove memset select strdup nanosleep]) AC_CHECK_FUNCS([clock_gettime gettimeofday memmove memset select strdup nanosleep])
AC_CHECK_DECL([png_get_io_ptr], AC_CHECK_DECL([png_get_io_ptr],
[AC_DEFINE([HAVE_PNG_GET_IO_PTR])],, [AC_DEFINE([HAVE_PNG_GET_IO_PTR],,
[Whether png_get_io_ptr() is defined])],,
[#include <png.h>]) [#include <png.h>])
AC_CHECK_DECL([cairo_format_stride_for_width], AC_CHECK_DECL([cairo_format_stride_for_width],
[AC_DEFINE([HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH])],, [AC_DEFINE([HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH],,
[Whether cairo_format_stride_for_width() is defined])],,
[#include <cairo/cairo.h>]) [#include <cairo/cairo.h>])
# Typedefs # Typedefs
@ -120,7 +125,7 @@ then
guacd will not support SSL connections. guacd will not support SSL connections.
--------------------------------------------]) --------------------------------------------])
else else
AC_DEFINE([ENABLE_SSL]) AC_DEFINE([ENABLE_SSL],, [Whether SSL-related support is enabled])
fi fi
AC_SUBST(SSL_LIBS) AC_SUBST(SSL_LIBS)
@ -147,7 +152,8 @@ then
Sound will not be encoded with Ogg Vorbis. Sound will not be encoded with Ogg Vorbis.
--------------------------------------------]) --------------------------------------------])
else else
AC_DEFINE([ENABLE_OGG]) AC_DEFINE([ENABLE_OGG],,
[Whether support for Ogg Vorbis is enabled])
fi fi
AC_SUBST(VORBIS_LIBS) AC_SUBST(VORBIS_LIBS)
@ -170,7 +176,7 @@ then
Sound support for VNC will be disabled Sound support for VNC will be disabled
--------------------------------------------]) --------------------------------------------])
else else
AC_DEFINE([ENABLE_PULSE]) AC_DEFINE([ENABLE_PULSE],, [Whether PulseAudio support is enabled])
fi fi
AC_SUBST(PULSE_LIBS) AC_SUBST(PULSE_LIBS)
@ -215,7 +221,8 @@ then
Support for VNC repeaters will not be built. Support for VNC repeaters will not be built.
--------------------------------------------]) --------------------------------------------])
else else
AC_DEFINE([ENABLE_VNC_REPEATER]) AC_DEFINE([ENABLE_VNC_REPEATER],,
[Whether support for VNC repeaters is enabled.])
fi fi
fi fi
@ -240,7 +247,8 @@ then
Support for listen-mode connections will not be built. Support for listen-mode connections will not be built.
--------------------------------------------]) --------------------------------------------])
else else
AC_DEFINE([ENABLE_VNC_LISTEN]) AC_DEFINE([ENABLE_VNC_LISTEN],,
[Whether support for listen-mode VNC connections is enabled.])
fi fi
fi fi
@ -342,7 +350,8 @@ AC_CHECK_HEADERS([freerdp/client/cliprdr.h],,
#include <winpr/collections.h>]) #include <winpr/collections.h>])
AC_CHECK_DECL([freerdp_register_addin_provider], AC_CHECK_DECL([freerdp_register_addin_provider],
[AC_DEFINE([HAVE_FREERDP_REGISTER_ADDIN_PROVIDER])],, [AC_DEFINE([HAVE_FREERDP_REGISTER_ADDIN_PROVIDER],,
[Whether freerdp_register_addin_provider() is defined])],,
[#include <freerdp/addin.h>]) [#include <freerdp/addin.h>])
# #
@ -374,7 +383,8 @@ AC_CHECK_HEADER(winpr/wtypes.h,,
if test "x${have_winpr}" = "xyes" if test "x${have_winpr}" = "xyes"
then then
AC_DEFINE([ENABLE_WINPR]) AC_DEFINE([ENABLE_WINPR],,
[Whether library support for WinPR types was found])
fi fi
# #
@ -396,7 +406,8 @@ fi
# Set defines based on interface type, warn if unknown # Set defines based on interface type, warn if unknown
if test "x${freerdp_interface}" = "xlegacy"; then if test "x${freerdp_interface}" = "xlegacy"; then
AC_DEFINE([LEGACY_FREERDP]) AC_DEFINE([LEGACY_FREERDP],,
[Whether the older version of the FreeRDP API was found])
elif test "x${freerdp_interface}" = "xunknown"; then elif test "x${freerdp_interface}" = "xunknown"; then
AC_MSG_WARN([ AC_MSG_WARN([
-------------------------------------------- --------------------------------------------
@ -431,7 +442,8 @@ fi
# Set defines based on interface type, warn if unknown # Set defines based on interface type, warn if unknown
if test "x${rdpsettings_interface}" = "xlegacy"; then if test "x${rdpsettings_interface}" = "xlegacy"; then
AC_DEFINE([LEGACY_RDPSETTINGS]) AC_DEFINE([LEGACY_RDPSETTINGS],,
[Whether the legacy version of the rdpSettings API was found])
# Legacy interface may not have FastPath settings # Legacy interface may not have FastPath settings
AC_CHECK_MEMBERS([rdpSettings.fast_path_input, AC_CHECK_MEMBERS([rdpSettings.fast_path_input,
@ -450,7 +462,8 @@ fi
# Activate FastPath settings if present # Activate FastPath settings if present
if test "x${rdpsettings_fastpath}" = "xyes"; then if test "x${rdpsettings_fastpath}" = "xyes"; then
AC_DEFINE([HAVE_RDPSETTINGS_FASTPATH]) AC_DEFINE([HAVE_RDPSETTINGS_FASTPATH],,
[Whether the rdpSettings structure has FastPath settings])
fi fi
# #
@ -472,7 +485,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <winpr/wtypes.h>
rdpBitmap b = { .Decompress = __decompress };]])], rdpBitmap b = { .Decompress = __decompress };]])],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_DEFINE([LEGACY_RDPBITMAP])]) AC_DEFINE([LEGACY_RDPBITMAP],,
[Whether the legacy rdpBitmap API was found])])
# #
# FreeRDP: rdpPalette # FreeRDP: rdpPalette
@ -484,7 +498,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <freerdp/update.h>
PALETTE_ENTRY* foo = p.entries;]])], PALETTE_ENTRY* foo = p.entries;]])],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_DEFINE([LEGACY_RDPPALETTE])]) AC_DEFINE([LEGACY_RDPPALETTE],,
[Whether the legacy rdpPalette API was found])])
# #
# FreeRDP: rdpPointer # FreeRDP: rdpPointer
@ -515,7 +530,8 @@ fi
# Set defines based on interface type, warn if unknown # Set defines based on interface type, warn if unknown
if test "x${event_interface}" = "xlegacy"; then if test "x${event_interface}" = "xlegacy"; then
AC_DEFINE([LEGACY_EVENT]) AC_DEFINE([LEGACY_EVENT],,
[Whether the legacy RDP_EVENT API was found])
elif test "x${event_interface}" = "xunknown"; then elif test "x${event_interface}" = "xunknown"; then
AC_MSG_WARN([ AC_MSG_WARN([
-------------------------------------------- --------------------------------------------
@ -574,7 +590,8 @@ then
in libssh2. in libssh2.
--------------------------------------------]) --------------------------------------------])
else else
AC_DEFINE([ENABLE_SSH_AGENT]) AC_DEFINE([ENABLE_SSH_AGENT],,
[Whether agent forwarding support for SSH is enabled])
fi fi
fi fi

View File

@ -20,20 +20,21 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdlib.h>
#include <time.h>
#include <pthread.h>
#include <guacamole/socket.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
#include <guacamole/protocol.h>
#include <guacamole/timestamp.h>
#include "client.h" #include "client.h"
#include "log.h" #include "log.h"
#include <pthread.h>
#include <stdlib.h>
#include <time.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
#include <guacamole/protocol.h>
#include <guacamole/socket.h>
#include <guacamole/timestamp.h>
/** /**
* Sleep for the given number of milliseconds. * Sleep for the given number of milliseconds.
* *

View File

@ -24,6 +24,10 @@
#ifndef _GUACD_CLIENT_H #ifndef _GUACD_CLIENT_H
#define _GUACD_CLIENT_H #define _GUACD_CLIENT_H
#include "config.h"
#include <guacamole/client.h>
/** /**
* The time to allow between sync responses in milliseconds. If a sync * The time to allow between sync responses in milliseconds. If a sync
* instruction is sent to the client and no response is received within this * instruction is sent to the client and no response is received within this

View File

@ -20,29 +20,26 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "log.h"
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h>
#include <sys/socket.h> #include <fcntl.h>
#include <libgen.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <signal.h>
#include <errno.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h> #include <syslog.h>
#include <libgen.h> #include <sys/socket.h>
#include <sys/stat.h>
#ifdef ENABLE_SSL #include <sys/types.h>
#include <openssl/ssl.h> #include <unistd.h>
#include "socket-ssl.h"
#endif
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/error.h> #include <guacamole/error.h>
@ -50,8 +47,10 @@
#include <guacamole/plugin.h> #include <guacamole/plugin.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>
#include "client.h" #ifdef ENABLE_SSL
#include "log.h" #include <openssl/ssl.h>
#include "socket-ssl.h"
#endif
#define GUACD_DEV_NULL "/dev/null" #define GUACD_DEV_NULL "/dev/null"
#define GUACD_ROOT "/" #define GUACD_ROOT "/"

View File

@ -20,11 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <errno.h> #include <errno.h>
#include <syslog.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <syslog.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>

View File

@ -24,6 +24,8 @@
#ifndef __GUACD_LOG_H #ifndef __GUACD_LOG_H
#define __GUACD_LOG_H #define __GUACD_LOG_H
#include "config.h"
#include <guacamole/client.h> #include <guacamole/client.h>
extern char log_prefix[64]; extern char log_prefix[64];

View File

@ -20,16 +20,16 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "socket-ssl.h"
#include <stdlib.h> #include <stdlib.h>
#include <sys/select.h> #include <sys/select.h>
#include <openssl/ssl.h>
#include <guacamole/socket.h>
#include <guacamole/error.h> #include <guacamole/error.h>
#include <guacamole/socket.h>
#include "socket-ssl.h" #include <openssl/ssl.h>
static ssize_t __guac_socket_ssl_read_handler(guac_socket* socket, static ssize_t __guac_socket_ssl_read_handler(guac_socket* socket,
void* buf, size_t count) { void* buf, size_t count) {

View File

@ -24,8 +24,10 @@
#ifndef __GUACD_SOCKET_SSL_H #ifndef __GUACD_SOCKET_SSL_H
#define __GUACD_SOCKET_SSL_H #define __GUACD_SOCKET_SSL_H
#include <openssl/ssl.h> #include "config.h"
#include <guacamole/socket.h> #include <guacamole/socket.h>
#include <openssl/ssl.h>
/** /**
* SSL socket-specific data. * SSL socket-specific data.

View File

@ -20,21 +20,23 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "wav_encoder.h"
#include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h>
#include <guacamole/protocol.h>
#include <guacamole/client.h>
#include <guacamole/stream.h>
#include <guacamole/audio.h> #include <guacamole/audio.h>
#include <guacamole/client.h>
#include <guacamole/protocol.h>
#include <guacamole/stream.h>
#ifdef ENABLE_OGG #ifdef ENABLE_OGG
#include "ogg_encoder.h" #include "ogg_encoder.h"
#endif #endif
#include "wav_encoder.h"
guac_audio_stream* guac_audio_stream_alloc(guac_client* client, guac_audio_encoder* encoder) { guac_audio_stream* guac_audio_stream_alloc(guac_client* client, guac_audio_encoder* encoder) {
guac_audio_stream* audio; guac_audio_stream* audio;

View File

@ -20,13 +20,14 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include "client.h" #include "client.h"
#include "protocol.h"
#include "client-handlers.h" #include "client-handlers.h"
#include "protocol.h"
#include <stdio.h>
#include <stdlib.h>
/* Guacamole instruction handler map */ /* Guacamole instruction handler map */

View File

@ -24,9 +24,6 @@
#ifndef _GUAC_CLIENT_HANDLERS__H #ifndef _GUAC_CLIENT_HANDLERS__H
#define _GUAC_CLIENT_HANDLERS__H #define _GUAC_CLIENT_HANDLERS__H
#include "client.h"
#include "instruction.h"
/** /**
* Provides initial handler functions and a lookup structure for automatically * Provides initial handler functions and a lookup structure for automatically
* handling client instructions. This is used only internally within libguac, * handling client instructions. This is used only internally within libguac,
@ -35,6 +32,11 @@
* @file client-handlers.h * @file client-handlers.h
*/ */
#include "config.h"
#include "client.h"
#include "instruction.h"
/** /**
* Internal handler for Guacamole instructions. * Internal handler for Guacamole instructions.
*/ */

View File

@ -20,10 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "client.h" #include "client.h"
#include "client-handlers.h" #include "client-handlers.h"
@ -35,6 +32,10 @@
#include "socket.h" #include "socket.h"
#include "time.h" #include "time.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
guac_layer __GUAC_DEFAULT_LAYER = { guac_layer __GUAC_DEFAULT_LAYER = {
.index = 0 .index = 0
}; };

View File

@ -20,17 +20,18 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "error.h"
#include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_LIBPTHREAD #ifdef HAVE_LIBPTHREAD
#include <pthread.h> #include <pthread.h>
#endif #endif
#include "error.h"
/* Error strings */ /* Error strings */
const char* __GUAC_STATUS_SUCCESS_STR = "Success"; const char* __GUAC_STATUS_SUCCESS_STR = "Success";

View File

@ -24,15 +24,15 @@
#ifndef __GUAC_AUDIO_H #ifndef __GUAC_AUDIO_H
#define __GUAC_AUDIO_H #define __GUAC_AUDIO_H
#include <guacamole/client.h>
#include <guacamole/stream.h>
/** /**
* Provides functions and structures used for providing simple streaming audio. * Provides functions and structures used for providing simple streaming audio.
* *
* @file audio.h * @file audio.h
*/ */
#include <guacamole/client.h>
#include <guacamole/stream.h>
typedef struct guac_audio_stream guac_audio_stream; typedef struct guac_audio_stream guac_audio_stream;
/** /**

View File

@ -24,7 +24,11 @@
#ifndef _GUAC_CLIENT_H #ifndef _GUAC_CLIENT_H
#define _GUAC_CLIENT_H #define _GUAC_CLIENT_H
#include <stdarg.h> /**
* Provides functions and structures required for defining (and handling) a proxy client.
*
* @file client.h
*/
#include "instruction.h" #include "instruction.h"
#include "layer.h" #include "layer.h"
@ -34,11 +38,7 @@
#include "stream.h" #include "stream.h"
#include "timestamp.h" #include "timestamp.h"
/** #include <stdarg.h>
* Provides functions and structures required for defining (and handling) a proxy client.
*
* @file client.h
*/
/** /**
* The maximum number of inbound streams supported by any one guac_client. * The maximum number of inbound streams supported by any one guac_client.

View File

@ -24,8 +24,6 @@
#ifndef _GUAC_HASH_H #ifndef _GUAC_HASH_H
#define _GUAC_HASH_H #define _GUAC_HASH_H
#include <cairo/cairo.h>
/** /**
* Provides functions and structures for producing likely-to-be-unique hash * Provides functions and structures for producing likely-to-be-unique hash
* values for images. * values for images.
@ -33,6 +31,8 @@
* @file hash.h * @file hash.h
*/ */
#include <cairo/cairo.h>
/** /**
* Produces a 24-bit hash value from all pixels of the given surface. The * Produces a 24-bit hash value from all pixels of the given surface. The
* surface provided must be RGB or ARGB with each pixel stored in 32 bits. * surface provided must be RGB or ARGB with each pixel stored in 32 bits.

View File

@ -24,8 +24,6 @@
#ifndef _GUAC_INSTRUCTION_H #ifndef _GUAC_INSTRUCTION_H
#define _GUAC_INSTRUCTION_H #define _GUAC_INSTRUCTION_H
#include "socket.h"
/** /**
* Provides functions and structures for reading, writing, and manipulating * Provides functions and structures for reading, writing, and manipulating
* Guacamole instructions. * Guacamole instructions.
@ -33,6 +31,8 @@
* @file instruction.h * @file instruction.h
*/ */
#include "socket.h"
/** /**
* The maximum number of characters per instruction. * The maximum number of characters per instruction.
*/ */

View File

@ -24,13 +24,6 @@
#ifndef _GUAC_PROTOCOL_H #ifndef _GUAC_PROTOCOL_H
#define _GUAC_PROTOCOL_H #define _GUAC_PROTOCOL_H
#include <cairo/cairo.h>
#include "layer.h"
#include "socket.h"
#include "stream.h"
#include "timestamp.h"
/** /**
* Provides functions and structures required for communicating using the * Provides functions and structures required for communicating using the
* Guacamole protocol over a guac_socket connection, such as that provided by * Guacamole protocol over a guac_socket connection, such as that provided by
@ -39,6 +32,13 @@
* @file protocol.h * @file protocol.h
*/ */
#include "layer.h"
#include "socket.h"
#include "stream.h"
#include "timestamp.h"
#include <cairo/cairo.h>
/** /**
* Set of all possible status codes returned by protocol operations. These * Set of all possible status codes returned by protocol operations. These
* codes relate to Guacamole server/client communication, and not to internal * codes relate to Guacamole server/client communication, and not to internal

View File

@ -24,18 +24,18 @@
#ifndef _GUAC_SOCKET_H #ifndef _GUAC_SOCKET_H
#define _GUAC_SOCKET_H #define _GUAC_SOCKET_H
#include <pthread.h>
#include <stdint.h>
#include <unistd.h>
#include "timestamp.h"
/** /**
* Defines the guac_socket object and functionss for using and manipulating it. * Defines the guac_socket object and functionss for using and manipulating it.
* *
* @file socket.h * @file socket.h
*/ */
#include "timestamp.h"
#include <pthread.h>
#include <stdint.h>
#include <unistd.h>
/** /**
* The number of bytes to buffer within each socket before flushing. * The number of bytes to buffer within each socket before flushing.
*/ */

View File

@ -24,14 +24,14 @@
#ifndef _GUAC_TIME_H #ifndef _GUAC_TIME_H
#define _GUAC_TIME_H #define _GUAC_TIME_H
#include <stdint.h>
/** /**
* Provides functions and structures for creating timestamps. * Provides functions and structures for creating timestamps.
* *
* @file timestamp.h * @file timestamp.h
*/ */
#include <stdint.h>
/** /**
* An arbitrary timestamp denoting a relative time value in milliseconds. * An arbitrary timestamp denoting a relative time value in milliseconds.
*/ */

View File

@ -24,14 +24,14 @@
#ifndef _GUAC_UNICODE_H #ifndef _GUAC_UNICODE_H
#define _GUAC_UNICODE_H #define _GUAC_UNICODE_H
#include <stddef.h>
/** /**
* Provides functions for manipulating Unicode strings. * Provides functions for manipulating Unicode strings.
* *
* @file unicode.h * @file unicode.h
*/ */
#include <stddef.h>
/** /**
* Given the initial byte of a single UTF-8 character, returns the overall * Given the initial byte of a single UTF-8 character, returns the overall
* byte size of the entire character. * byte size of the entire character.

View File

@ -20,9 +20,11 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
/* /*

View File

@ -20,10 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "error.h" #include "error.h"
#include "instruction.h" #include "instruction.h"
@ -31,6 +28,10 @@
#include "socket.h" #include "socket.h"
#include "unicode.h" #include "unicode.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
guac_instruction* guac_instruction_alloc() { guac_instruction* guac_instruction_alloc() {
/* Allocate space for instruction */ /* Allocate space for instruction */

View File

@ -20,17 +20,17 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "ogg_encoder.h"
#include <stdlib.h> #include <stdlib.h>
#include <guacamole/audio.h> #include <guacamole/audio.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>
#include <vorbis/vorbisenc.h> #include <vorbis/vorbisenc.h>
#include "ogg_encoder.h"
void ogg_encoder_begin_handler(guac_audio_stream* audio) { void ogg_encoder_begin_handler(guac_audio_stream* audio) {
/* Allocate stream state */ /* Allocate stream state */

View File

@ -24,8 +24,9 @@
#ifndef __GUAC_OGG_ENCODER_H #ifndef __GUAC_OGG_ENCODER_H
#define __GUAC_OGG_ENCODER_H #define __GUAC_OGG_ENCODER_H
#include <guacamole/audio.h> #include "config.h"
#include <guacamole/audio.h>
#include <vorbis/vorbisenc.h> #include <vorbis/vorbisenc.h>
typedef struct ogg_encoder_state { typedef struct ogg_encoder_state {

View File

@ -20,19 +20,19 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <inttypes.h>
#include <cairo/cairo.h>
#include <sys/types.h>
#include "palette.h" #include "palette.h"
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cairo/cairo.h>
#include <sys/types.h>
guac_palette* guac_palette_alloc(cairo_surface_t* surface) { guac_palette* guac_palette_alloc(cairo_surface_t* surface) {
int x, y; int x, y;

View File

@ -24,8 +24,8 @@
#ifndef __GUAC_PALETTE_H #ifndef __GUAC_PALETTE_H
#define __GUAC_PALETTE_H #define __GUAC_PALETTE_H
#include <png.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <png.h>
typedef struct guac_palette_entry { typedef struct guac_palette_entry {

View File

@ -20,11 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "client.h" #include "client.h"
#include "client-handlers.h" #include "client-handlers.h"
@ -34,6 +30,11 @@
#include "socket.h" #include "socket.h"
#include "time.h" #include "time.h"
#include <dlfcn.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
guac_client_plugin* guac_client_plugin_open(const char* protocol) { guac_client_plugin* guac_client_plugin_open(const char* protocol) {
guac_client_plugin* plugin; guac_client_plugin* plugin;

View File

@ -20,12 +20,13 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "pool.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "pool.h"
guac_pool* guac_pool_alloc(int size) { guac_pool* guac_pool_alloc(int size) {
guac_pool* pool = malloc(sizeof(guac_pool)); guac_pool* pool = malloc(sizeof(guac_pool));

View File

@ -20,23 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <inttypes.h>
#include <string.h>
#include <errno.h>
#ifdef HAVE_PNGSTRUCT_H
#include <pngstruct.h>
#endif
#include <png.h>
#include <cairo/cairo.h>
#include <sys/types.h>
#include "error.h" #include "error.h"
#include "layer.h" #include "layer.h"
@ -45,6 +29,21 @@
#include "socket.h" #include "socket.h"
#include "unicode.h" #include "unicode.h"
#include <errno.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <png.h>
#include <cairo/cairo.h>
#ifdef HAVE_PNGSTRUCT_H
#include <pngstruct.h>
#endif
/* Output formatting functions */ /* Output formatting functions */
ssize_t __guac_socket_write_length_string(guac_socket* socket, const char* str) { ssize_t __guac_socket_write_length_string(guac_socket* socket, const char* str) {

View File

@ -20,14 +20,20 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "error.h"
#include "socket.h"
#include <fcntl.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdint.h>
#include <inttypes.h>
#ifdef __MINGW32__ #ifdef __MINGW32__
#include <winsock2.h> #include <winsock2.h>
@ -35,12 +41,6 @@
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#include <time.h>
#include <sys/time.h>
#include "socket.h"
#include "error.h"
typedef struct __guac_socket_fd_data { typedef struct __guac_socket_fd_data {
int fd; int fd;

View File

@ -20,14 +20,22 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "error.h"
#include "protocol.h"
#include "socket.h"
#include "unicode.h"
#include <fcntl.h>
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdint.h>
#include <inttypes.h>
#ifdef __MINGW32__ #ifdef __MINGW32__
#include <winsock2.h> #include <winsock2.h>
@ -35,14 +43,6 @@
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#include <time.h>
#include <sys/time.h>
#include "socket.h"
#include "protocol.h"
#include "error.h"
#include "unicode.h"
#define GUAC_SOCKET_NEST_BUFFER_SIZE 8192 #define GUAC_SOCKET_NEST_BUFFER_SIZE 8192
typedef struct __guac_socket_nest_data { typedef struct __guac_socket_nest_data {

View File

@ -20,6 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "error.h"
#include "protocol.h"
#include "socket.h"
#include "timestamp.h"
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <inttypes.h>
@ -28,6 +34,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef __MINGW32__ #ifdef __MINGW32__
@ -36,14 +44,6 @@
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#include <time.h>
#include <sys/time.h>
#include "socket.h"
#include "protocol.h"
#include "timestamp.h"
#include "error.h"
char __guac_socket_BASE64_CHARACTERS[64] = { char __guac_socket_BASE64_CHARACTERS[64] = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',

View File

@ -20,16 +20,17 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_NANOSLEEP) #include "timestamp.h"
#include <time.h>
#endif
#ifndef HAVE_CLOCK_GETTIME #ifndef HAVE_CLOCK_GETTIME
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "timestamp.h" #if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_NANOSLEEP)
#include <time.h>
#endif
guac_timestamp guac_timestamp_current() { guac_timestamp guac_timestamp_current() {

View File

@ -20,11 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stddef.h>
#include "unicode.h" #include "unicode.h"
#include <stddef.h>
size_t guac_utf8_charsize(unsigned char c) { size_t guac_utf8_charsize(unsigned char c) {
/* Determine size in bytes of character */ /* Determine size in bytes of character */

View File

@ -20,8 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#define WAV_BUFFER_SIZE 0x4000 #include "wav_encoder.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -30,7 +31,7 @@
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>
#include "wav_encoder.h" #define WAV_BUFFER_SIZE 0x4000
void wav_encoder_begin_handler(guac_audio_stream* audio) { void wav_encoder_begin_handler(guac_audio_stream* audio) {

View File

@ -24,6 +24,8 @@
#ifndef __GUAC_WAV_ENCODER_H #ifndef __GUAC_WAV_ENCODER_H
#define __GUAC_WAV_ENCODER_H #define __GUAC_WAV_ENCODER_H
#include "config.h"
#include <guacamole/audio.h> #include <guacamole/audio.h>
typedef struct wav_encoder_riff_header { typedef struct wav_encoder_riff_header {

View File

@ -75,7 +75,6 @@ noinst_HEADERS = \
guac_rdpsnd/rdpsnd_messages.h \ guac_rdpsnd/rdpsnd_messages.h \
guac_rdpsnd/rdpsnd_service.h \ guac_rdpsnd/rdpsnd_service.h \
client.h \ client.h \
config.h \
debug.h \ debug.h \
default_pointer.h \ default_pointer.h \
guac_handlers.h \ guac_handlers.h \

View File

@ -20,34 +20,40 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#include "config.h"
#include "client.h"
#include "default_pointer.h"
#include "guac_handlers.h"
#include "rdp_bitmap.h"
#include "rdp_gdi.h"
#include "rdp_glyph.h"
#include "rdp_keymap.h"
#include "rdp_pointer.h"
#include <errno.h>
#include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h>
#include <sys/select.h> #include <sys/select.h>
#include <errno.h>
#include <freerdp/freerdp.h>
#include <freerdp/cache/bitmap.h> #include <freerdp/cache/bitmap.h>
#include <freerdp/cache/brush.h> #include <freerdp/cache/brush.h>
#include <freerdp/cache/glyph.h> #include <freerdp/cache/glyph.h>
#include <freerdp/cache/offscreen.h>
#include <freerdp/cache/palette.h> #include <freerdp/cache/palette.h>
#include <freerdp/cache/pointer.h> #include <freerdp/cache/pointer.h>
#include <freerdp/cache/offscreen.h>
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>
#include <freerdp/input.h>
#include <freerdp/constants.h> #include <freerdp/constants.h>
#include <freerdp/freerdp.h>
#ifdef HAVE_FREERDP_CLIENT_CHANNELS_H #include <freerdp/input.h>
#include <freerdp/client/channels.h> #include <guacamole/audio.h>
#endif #include <guacamole/client.h>
#include <guacamole/error.h>
#ifdef HAVE_FREERDP_ADDIN_H #include <guacamole/protocol.h>
#include <freerdp/addin.h> #include <guacamole/socket.h>
#endif
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -55,20 +61,13 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/socket.h> #ifdef HAVE_FREERDP_ADDIN_H
#include <guacamole/protocol.h> #include <freerdp/addin.h>
#include <guacamole/client.h> #endif
#include <guacamole/audio.h>
#include <guacamole/error.h>
#include "client.h" #ifdef HAVE_FREERDP_CLIENT_CHANNELS_H
#include "guac_handlers.h" #include <freerdp/client/channels.h>
#include "rdp_keymap.h" #endif
#include "rdp_bitmap.h"
#include "rdp_glyph.h"
#include "rdp_pointer.h"
#include "rdp_gdi.h"
#include "default_pointer.h"
/* Client plugin arguments */ /* Client plugin arguments */
const char* GUAC_CLIENT_ARGS[] = { const char* GUAC_CLIENT_ARGS[] = {

View File

@ -24,20 +24,20 @@
#ifndef _GUAC_RDP_CLIENT_H #ifndef _GUAC_RDP_CLIENT_H
#define _GUAC_RDP_CLIENT_H #define _GUAC_RDP_CLIENT_H
#include <pthread.h> #include "config.h"
#include <cairo/cairo.h>
#include <freerdp/freerdp.h>
#include <freerdp/codec/color.h>
#include <guacamole/client.h>
#include <guacamole/audio.h>
#include "rdp_fs.h" #include "rdp_fs.h"
#include "rdp_keymap.h" #include "rdp_keymap.h"
#include "rdp_settings.h" #include "rdp_settings.h"
#include <pthread.h>
#include <cairo/cairo.h>
#include <freerdp/freerdp.h>
#include <freerdp/codec/color.h>
#include <guacamole/audio.h>
#include <guacamole/client.h>
/** /**
* The maximum duration of a frame in milliseconds. * The maximum duration of a frame in milliseconds.
*/ */

View File

@ -24,6 +24,8 @@
#ifndef __GUAC_CLIENT_CLIPRDR_COMPAT_H #ifndef __GUAC_CLIENT_CLIPRDR_COMPAT_H
#define __GUAC_CLIENT_CLIPRDR_COMPAT_H #define __GUAC_CLIENT_CLIPRDR_COMPAT_H
#include "config.h"
#include <freerdp/plugins/cliprdr.h> #include <freerdp/plugins/cliprdr.h>
#define CliprdrChannel_Class RDP_EVENT_CLASS_CLIPRDR #define CliprdrChannel_Class RDP_EVENT_CLASS_CLIPRDR

View File

@ -20,6 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "winpr-stream.h" #include "winpr-stream.h"

View File

@ -24,9 +24,12 @@
#ifndef __GUAC_WINPR_STREAM_COMPAT_H #ifndef __GUAC_WINPR_STREAM_COMPAT_H
#define __GUAC_WINPR_STREAM_COMPAT_H #define __GUAC_WINPR_STREAM_COMPAT_H
#include <freerdp/utils/stream.h> #include "config.h"
#include "winpr-wtypes.h" #include "winpr-wtypes.h"
#include <freerdp/utils/stream.h>
/* FreeRDP 1.0 streams */ /* FreeRDP 1.0 streams */
#define Stream_Write stream_write #define Stream_Write stream_write

View File

@ -24,6 +24,8 @@
#ifndef __GUAC_WINPR_WTYPES_COMPAT_H #ifndef __GUAC_WINPR_WTYPES_COMPAT_H
#define __GUAC_WINPR_WTYPES_COMPAT_H #define __GUAC_WINPR_WTYPES_COMPAT_H
#include "config.h"
#include <freerdp/types.h> #include <freerdp/types.h>
typedef uint8 BYTE; typedef uint8 BYTE;

View File

@ -1,22 +0,0 @@
/*
* Copyright (C) 2013 Glyptodon LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

View File

@ -24,6 +24,8 @@
#ifndef __GUAC_RDP_DEBUG_H #ifndef __GUAC_RDP_DEBUG_H
#define __GUAC_RDP_DEBUG_H #define __GUAC_RDP_DEBUG_H
#include "config.h"
#include <stdio.h> #include <stdio.h>
/* Ensure GUAC_RDP_DEBUG_LEVEL is defined to a constant */ /* Ensure GUAC_RDP_DEBUG_LEVEL is defined to a constant */

View File

@ -20,6 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -24,6 +24,8 @@
#ifndef _GUAC_RDP_DEFAULT_POINTER_H #ifndef _GUAC_RDP_DEFAULT_POINTER_H
#define _GUAC_RDP_DEFAULT_POINTER_H #define _GUAC_RDP_DEFAULT_POINTER_H
#include "config.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -20,26 +20,29 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "guac_handlers.h"
#include "rdp_cliprdr.h"
#include "rdp_keymap.h"
#include <errno.h>
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/select.h> #include <sys/select.h>
#include <errno.h>
#include <freerdp/freerdp.h>
#include <freerdp/channels/channels.h>
#include <freerdp/input.h>
#include <freerdp/codec/color.h>
#include <freerdp/cache/cache.h> #include <freerdp/cache/cache.h>
#include <freerdp/channels/channels.h>
#include <freerdp/codec/color.h>
#include <freerdp/freerdp.h>
#include <freerdp/input.h>
#include <freerdp/utils/event.h> #include <freerdp/utils/event.h>
#include <guacamole/client.h>
#ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H #include <guacamole/error.h>
#include <freerdp/client/cliprdr.h> #include <guacamole/protocol.h>
#else #include <guacamole/socket.h>
#include "compat/client-cliprdr.h"
#endif
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -47,15 +50,11 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/socket.h> #ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
#include <guacamole/protocol.h> #include <freerdp/client/cliprdr.h>
#include <guacamole/client.h> #else
#include <guacamole/error.h> #include "compat/client-cliprdr.h"
#endif
#include "client.h"
#include "rdp_keymap.h"
#include "rdp_cliprdr.h"
#include "guac_handlers.h"
void __guac_rdp_update_keysyms(guac_client* client, const int* keysym_string, int from, int to); void __guac_rdp_update_keysyms(guac_client* client, const int* keysym_string, int from, int to);
int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed); int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed);

View File

@ -24,6 +24,8 @@
#ifndef _GUAC_RDP_GUAC_HANDLERS_H #ifndef _GUAC_RDP_GUAC_HANDLERS_H
#define _GUAC_RDP_GUAC_HANDLERS_H #define _GUAC_RDP_GUAC_HANDLERS_H
#include "config.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/stream.h> #include <guacamole/stream.h>

View File

@ -20,6 +20,25 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "debug.h"
#include "rdpdr_fs_messages_dir_info.h"
#include "rdpdr_fs_messages_file_info.h"
#include "rdpdr_fs_messages.h"
#include "rdpdr_fs_messages_vol_info.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
#include "rdp_fs.h"
#include "rdp_status.h"
#include "unicode.h"
#include <inttypes.h>
#include <errno.h>
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/pool.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -27,24 +46,6 @@
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <inttypes.h>
#include <guacamole/pool.h>
#include <errno.h>
#include "rdp_fs.h"
#include "rdp_status.h"
#include "rdpdr_fs_messages.h"
#include "rdpdr_fs_messages_vol_info.h"
#include "rdpdr_fs_messages_file_info.h"
#include "rdpdr_fs_messages_dir_info.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
#include "client.h"
#include "debug.h"
#include "unicode.h"
#include <freerdp/utils/svc_plugin.h>
void guac_rdpdr_fs_process_create(guac_rdpdr_device* device, void guac_rdpdr_fs_process_create(guac_rdpdr_device* device,
wStream* input_stream, int completion_id) { wStream* input_stream, int completion_id) {

View File

@ -32,16 +32,18 @@
* @file rdpdr_fs_messages.h * @file rdpdr_fs_messages.h
*/ */
#include "config.h"
#include "rdpdr_service.h"
#include <guacamole/pool.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <guacamole/pool.h>
#include "rdpdr_service.h"
/** /**
* Handles a Server Create Drive Request. Despite its name, this request opens * Handles a Server Create Drive Request. Despite its name, this request opens
* a file. * a file.

View File

@ -20,6 +20,16 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "debug.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
#include "rdp_fs.h"
#include "rdp_status.h"
#include "unicode.h"
#include <guacamole/unicode.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -27,15 +37,6 @@
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <guacamole/unicode.h>
#include "rdpdr_service.h"
#include "rdpdr_messages.h"
#include "rdp_fs.h"
#include "rdp_status.h"
#include "debug.h"
#include "unicode.h"
void guac_rdpdr_fs_process_query_directory_info(guac_rdpdr_device* device, void guac_rdpdr_fs_process_query_directory_info(guac_rdpdr_device* device,
const char* entry_name, int file_id, int completion_id) { const char* entry_name, int file_id, int completion_id) {

View File

@ -32,14 +32,16 @@
* @file rdpdr_fs_messages_dir_info.h * @file rdpdr_fs_messages_dir_info.h
*/ */
#include "config.h"
#include "rdpdr_service.h"
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include "rdpdr_service.h"
/** /**
* Processes a query request for FileDirectoryInformation. From the * Processes a query request for FileDirectoryInformation. From the
* documentation this is "defined as the file's name, time stamp, and size, or its * documentation this is "defined as the file's name, time stamp, and size, or its

View File

@ -20,6 +20,20 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "debug.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
#include "rdp_fs.h"
#include "rdp_status.h"
#include "unicode.h"
#include <inttypes.h>
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/pool.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -27,19 +41,6 @@
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <inttypes.h>
#include <guacamole/pool.h>
#include "rdpdr_messages.h"
#include "rdp_fs.h"
#include "rdp_status.h"
#include "rdpdr_service.h"
#include "client.h"
#include "debug.h"
#include "unicode.h"
#include <freerdp/utils/svc_plugin.h>
void guac_rdpdr_fs_process_query_basic_info(guac_rdpdr_device* device, wStream* input_stream, void guac_rdpdr_fs_process_query_basic_info(guac_rdpdr_device* device, wStream* input_stream,
int file_id, int completion_id) { int file_id, int completion_id) {

View File

@ -31,14 +31,16 @@
* @file rdpdr_fs_messages_file_info.h * @file rdpdr_fs_messages_file_info.h
*/ */
#include "config.h"
#include "rdpdr_service.h"
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include "rdpdr_service.h"
/** /**
* Processes a query for FileBasicInformation. From the documentation, this is * Processes a query for FileBasicInformation. From the documentation, this is
* "used to query a file for the times of creation, last access, last write, * "used to query a file for the times of creation, last access, last write,

View File

@ -20,6 +20,18 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "debug.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
#include "rdp_fs.h"
#include "rdp_status.h"
#include "unicode.h"
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/pool.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -27,18 +39,6 @@
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <guacamole/pool.h>
#include "rdpdr_messages.h"
#include "rdp_fs.h"
#include "rdp_status.h"
#include "rdpdr_service.h"
#include "client.h"
#include "debug.h"
#include "unicode.h"
#include <freerdp/utils/svc_plugin.h>
void guac_rdpdr_fs_process_query_volume_info(guac_rdpdr_device* device, void guac_rdpdr_fs_process_query_volume_info(guac_rdpdr_device* device,
wStream* input_stream, int file_id, int completion_id) { wStream* input_stream, int file_id, int completion_id) {

View File

@ -32,14 +32,16 @@
* @file rdpdr_fs_messages_vol_info.h * @file rdpdr_fs_messages_vol_info.h
*/ */
#include "config.h"
#include "rdpdr_service.h"
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include "rdpdr_service.h"
/** /**
* Processes a query request for FileFsVolumeInformation. According to the * Processes a query request for FileFsVolumeInformation. According to the
* documentation, this is "used to query information for a volume on which a * documentation, this is "used to query information for a volume on which a

View File

@ -21,23 +21,24 @@
*/ */
#include "config.h"
#include "client.h"
#include "rdpdr_fs_messages.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
#include "rdp_fs.h"
#include "unicode.h"
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/pool.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <guacamole/pool.h>
#include "rdp_fs.h"
#include "rdpdr_fs_messages.h"
#include "rdpdr_messages.h"
#include "rdpdr_service.h"
#include "client.h"
#include "unicode.h"
#include <freerdp/utils/svc_plugin.h>
static void guac_rdpdr_device_fs_announce_handler(guac_rdpdr_device* device, static void guac_rdpdr_device_fs_announce_handler(guac_rdpdr_device* device,
wStream* output_stream, int device_id) { wStream* output_stream, int device_id) {

View File

@ -35,10 +35,12 @@
* @file rdpdr_fs.h * @file rdpdr_fs.h
*/ */
#include <guacamole/pool.h> #include "config.h"
#include "rdpdr_service.h" #include "rdpdr_service.h"
#include <guacamole/pool.h>
/** /**
* Registers a new filesystem device within the RDPDR plugin. This must be done * Registers a new filesystem device within the RDPDR plugin. This must be done
* before RDPDR connection finishes. * before RDPDR connection finishes.

View File

@ -20,12 +20,20 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "rdpdr_messages.h"
#include "rdpdr_printer.h"
#include "rdpdr_service.h"
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <freerdp/constants.h> #include <freerdp/constants.h>
#include <freerdp/utils/svc_plugin.h> #include <freerdp/utils/svc_plugin.h>
#include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -35,13 +43,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/client.h>
#include "rdpdr_service.h"
#include "rdpdr_messages.h"
#include "rdpdr_printer.h"
#include "client.h"
static void guac_rdpdr_send_client_announce_reply(guac_rdpdrPlugin* rdpdr, static void guac_rdpdr_send_client_announce_reply(guac_rdpdrPlugin* rdpdr,
unsigned int major, unsigned int minor, unsigned int client_id) { unsigned int major, unsigned int minor, unsigned int client_id) {

View File

@ -24,14 +24,16 @@
#ifndef __GUAC_RDPDR_MESSAGES_H #ifndef __GUAC_RDPDR_MESSAGES_H
#define __GUAC_RDPDR_MESSAGES_H #define __GUAC_RDPDR_MESSAGES_H
#include "config.h"
#include "rdpdr_service.h"
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include "rdpdr_service.h"
/** /**
* Identifies the "core" component of RDPDR as the destination of the received * Identifies the "core" component of RDPDR as the destination of the received
* packet. * packet.

View File

@ -20,24 +20,25 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "rdpdr_messages.h"
#include "rdpdr_printer.h"
#include "rdpdr_service.h"
#include "rdp_status.h"
#include <errno.h> #include <errno.h>
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/protocol.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/protocol.h>
#include "rdp_status.h"
#include "rdpdr_messages.h"
#include "rdpdr_printer.h"
#include "rdpdr_service.h"
#include "client.h"
/* Command to run GhostScript safely as a filter writing PDF */ /* Command to run GhostScript safely as a filter writing PDF */
char* const guac_rdpdr_pdf_filter_command[] = { char* const guac_rdpdr_pdf_filter_command[] = {
"gs", "gs",

View File

@ -24,14 +24,16 @@
#ifndef __GUAC_RDPDR_PRINTER_H #ifndef __GUAC_RDPDR_PRINTER_H
#define __GUAC_RDPDR_PRINTER_H #define __GUAC_RDPDR_PRINTER_H
#include "config.h"
#include <freerdp/utils/svc_plugin.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <freerdp/utils/svc_plugin.h>
/** /**
* Data specific to an instance of the printer device. * Data specific to an instance of the printer device.
*/ */

View File

@ -20,12 +20,21 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "debug.h"
#include "rdpdr_fs_service.h"
#include "rdpdr_messages.h"
#include "rdpdr_printer.h"
#include "rdpdr_service.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <freerdp/constants.h> #include <freerdp/constants.h>
#include <freerdp/utils/svc_plugin.h> #include <freerdp/utils/svc_plugin.h>
#include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -35,16 +44,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/client.h>
#include "rdpdr_service.h"
#include "rdpdr_messages.h"
#include "rdpdr_printer.h"
#include "rdpdr_fs_service.h"
#include "client.h"
#include "debug.h"
/** /**
* Entry point for RDPDR virtual channel. * Entry point for RDPDR virtual channel.
*/ */

View File

@ -24,17 +24,19 @@
#ifndef __GUAC_RDPDR_SERVICE_H #ifndef __GUAC_RDPDR_SERVICE_H
#define __GUAC_RDPDR_SERVICE_H #define __GUAC_RDPDR_SERVICE_H
#include "config.h"
#include <pthread.h> #include <pthread.h>
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <guacamole/client.h>
#include <freerdp/utils/svc_plugin.h>
/** /**
* The maximum number of bytes to allow for a device read. * The maximum number of bytes to allow for a device read.
*/ */

View File

@ -20,12 +20,20 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "rdpsnd_messages.h"
#include "rdpsnd_service.h"
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <freerdp/constants.h> #include <freerdp/constants.h>
#include <freerdp/utils/svc_plugin.h> #include <freerdp/utils/svc_plugin.h>
#include <guacamole/audio.h>
#include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -35,13 +43,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/audio.h>
#include <guacamole/client.h>
#include "rdpsnd_service.h"
#include "rdpsnd_messages.h"
#include "client.h"
/* MESSAGE HANDLERS */ /* MESSAGE HANDLERS */
void guac_rdpsnd_formats_handler(guac_rdpsndPlugin* rdpsnd, void guac_rdpsnd_formats_handler(guac_rdpsndPlugin* rdpsnd,

View File

@ -24,6 +24,10 @@
#ifndef __GUAC_RDPSND_MESSAGES_H #ifndef __GUAC_RDPSND_MESSAGES_H
#define __GUAC_RDPSND_MESSAGES_H #define __GUAC_RDPSND_MESSAGES_H
#include "config.h"
#include "rdpsnd_service.h"
#include <guacamole/audio.h> #include <guacamole/audio.h>
/* /*

View File

@ -20,6 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "rdpsnd_service.h"
#include "rdpsnd_messages.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -27,6 +31,8 @@
#include <freerdp/constants.h> #include <freerdp/constants.h>
#include <freerdp/types.h> #include <freerdp/types.h>
#include <freerdp/utils/svc_plugin.h> #include <freerdp/utils/svc_plugin.h>
#include <guacamole/audio.h>
#include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
@ -36,12 +42,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/client.h>
#include <guacamole/audio.h>
#include "rdpsnd_service.h"
#include "rdpsnd_messages.h"
/** /**
* Entry point for RDPSND virtual channel. * Entry point for RDPSND virtual channel.
*/ */

View File

@ -24,8 +24,17 @@
#ifndef __GUAC_RDPSND_SERVICE_H #ifndef __GUAC_RDPSND_SERVICE_H
#define __GUAC_RDPSND_SERVICE_H #define __GUAC_RDPSND_SERVICE_H
#include "config.h"
#include <freerdp/utils/svc_plugin.h>
#include <guacamole/audio.h> #include <guacamole/audio.h>
#ifdef ENABLE_WINPR
#include <winpr/stream.h>
#else
#include "compat/winpr-stream.h"
#endif
/** /**
* The maximum number of PCM formats to accept during the initial RDPSND * The maximum number of PCM formats to accept during the initial RDPSND
* handshake with the RDP server. * handshake with the RDP server.

View File

@ -20,20 +20,22 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "rdp_bitmap.h"
#include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <pthread.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <freerdp/codec/bitmap.h>
#include <guacamole/socket.h> #include <freerdp/codec/color.h>
#include <freerdp/freerdp.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>
#include <guacamole/socket.h>
#include <freerdp/freerdp.h>
#include <freerdp/codec/color.h>
#include <freerdp/codec/bitmap.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -41,9 +43,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include "client.h"
#include "rdp_bitmap.h"
void guac_rdp_cache_bitmap(rdpContext* context, rdpBitmap* bitmap) { void guac_rdp_cache_bitmap(rdpContext* context, rdpBitmap* bitmap) {
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;

View File

@ -24,7 +24,10 @@
#ifndef _GUAC_RDP_RDP_BITMAP_H #ifndef _GUAC_RDP_RDP_BITMAP_H
#define _GUAC_RDP_RDP_BITMAP_H #define _GUAC_RDP_RDP_BITMAP_H
#include "config.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/protocol.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -32,8 +35,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/protocol.h>
typedef struct guac_rdp_bitmap { typedef struct guac_rdp_bitmap {
/** /**

View File

@ -20,16 +20,16 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "rdp_cliprdr.h"
#include <freerdp/freerdp.h>
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>
#include <freerdp/freerdp.h>
#include <freerdp/utils/event.h> #include <freerdp/utils/event.h>
#include <guacamole/client.h>
#ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H #include <guacamole/protocol.h>
#include <freerdp/client/cliprdr.h>
#else
#include "compat/client-cliprdr.h"
#endif
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -37,11 +37,11 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/client.h> #ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
#include <guacamole/protocol.h> #include <freerdp/client/cliprdr.h>
#else
#include "client.h" #include "compat/client-cliprdr.h"
#include "rdp_cliprdr.h" #endif
void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event) { void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event) {

View File

@ -24,13 +24,21 @@
#ifndef __GUAC_RDP_RDP_CLIPRDR_H #ifndef __GUAC_RDP_RDP_CLIPRDR_H
#define __GUAC_RDP_RDP_CLIPRDR_H #define __GUAC_RDP_RDP_CLIPRDR_H
#include "config.h"
#include <freerdp/freerdp.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/stream.h> #include <winpr/stream.h>
#else #else
#include "compat/winpr-stream.h" #include "compat/winpr-stream.h"
#endif #endif
#include <freerdp/freerdp.h> #ifdef HAVE_FREERDP_CLIENT_CLIPRDR_H
#include <freerdp/client/cliprdr.h>
#else
#include "compat/client-cliprdr.h"
#endif
void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event); void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event);
void guac_rdp_process_cb_monitor_ready(guac_client* client, wMessage* event); void guac_rdp_process_cb_monitor_ready(guac_client* client, wMessage* event);

View File

@ -20,25 +20,26 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdlib.h> #include "debug.h"
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <dirent.h>
#include <fcntl.h>
#include <fnmatch.h>
#include <errno.h>
#include <guacamole/pool.h>
#include "rdp_fs.h" #include "rdp_fs.h"
#include "rdp_status.h" #include "rdp_status.h"
#include "debug.h"
#include "unicode.h" #include "unicode.h"
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <sys/types.h>
#include <unistd.h>
#include <guacamole/pool.h>
guac_rdp_fs* guac_rdp_fs_alloc(const char* drive_path) { guac_rdp_fs* guac_rdp_fs_alloc(const char* drive_path) {
guac_rdp_fs* fs = malloc(sizeof(guac_rdp_fs)); guac_rdp_fs* fs = malloc(sizeof(guac_rdp_fs));

View File

@ -35,9 +35,11 @@
* @file rdp_fs.h * @file rdp_fs.h
*/ */
#include <sys/types.h> #include "config.h"
#include <stdint.h>
#include <dirent.h> #include <dirent.h>
#include <stdint.h>
#include <sys/types.h>
#include <guacamole/pool.h> #include <guacamole/pool.h>

View File

@ -20,9 +20,14 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "rdp_bitmap.h"
#include <pthread.h> #include <pthread.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/client.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -30,11 +35,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/client.h>
#include "client.h"
#include "rdp_bitmap.h"
guac_transfer_function guac_rdp_rop3_transfer_function(guac_client* client, guac_transfer_function guac_rdp_rop3_transfer_function(guac_client* client,
int rop3) { int rop3) {

View File

@ -24,8 +24,10 @@
#ifndef _GUAC_RDP_RDP_GDI_H #ifndef _GUAC_RDP_RDP_GDI_H
#define _GUAC_RDP_RDP_GDI_H #define _GUAC_RDP_RDP_GDI_H
#include <guacamole/protocol.h> #include "config.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/protocol.h>
guac_composite_mode guac_rdp_rop3_transfer_function(guac_client* client, guac_composite_mode guac_rdp_rop3_transfer_function(guac_client* client,
int rop3); int rop3);

View File

@ -20,9 +20,16 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "client.h"
#include "rdp_glyph.h"
#include <pthread.h> #include <pthread.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/client.h>
#include <guacamole/error.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -30,12 +37,6 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#include <guacamole/client.h>
#include <guacamole/error.h>
#include "client.h"
#include "rdp_glyph.h"
/* Define cairo_format_stride_for_width() if missing */ /* Define cairo_format_stride_for_width() if missing */
#ifndef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH #ifndef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH
#define cairo_format_stride_for_width(format, width) (width*4) #define cairo_format_stride_for_width(format, width) (width*4)

View File

@ -24,6 +24,8 @@
#ifndef _GUAC_RDP_RDP_GLYPH_H #ifndef _GUAC_RDP_RDP_GLYPH_H
#define _GUAC_RDP_RDP_GLYPH_H #define _GUAC_RDP_RDP_GLYPH_H
#include "config.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR

View File

@ -20,6 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "rdp_keymap.h" #include "rdp_keymap.h"

View File

@ -24,11 +24,7 @@
#ifndef _GUAC_RDP_RDP_KEYMAP_H #ifndef _GUAC_RDP_RDP_KEYMAP_H
#define _GUAC_RDP_RDP_KEYMAP_H #define _GUAC_RDP_RDP_KEYMAP_H
#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H #include "config.h"
#include <freerdp/locale/keyboard.h>
#else
#include <freerdp/kbd/layouts.h>
#endif
#ifdef ENABLE_WINPR #ifdef ENABLE_WINPR
#include <winpr/wtypes.h> #include <winpr/wtypes.h>
@ -36,6 +32,12 @@
#include "compat/winpr-wtypes.h" #include "compat/winpr-wtypes.h"
#endif #endif
#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
#include <freerdp/locale/keyboard.h>
#else
#include <freerdp/kbd/layouts.h>
#endif
/** /**
* Represents a keysym-to-scancode mapping for RDP, with extra information * Represents a keysym-to-scancode mapping for RDP, with extra information
* about the state of prerequisite keysyms. * about the state of prerequisite keysyms.

View File

@ -20,11 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <freerdp/input.h>
#include "rdp_keymap.h" #include "rdp_keymap.h"
#include <freerdp/input.h>
static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = { static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
/* BackSpace */ /* BackSpace */

View File

@ -21,6 +21,10 @@
*/ */
#include "config.h"
#include "rdp_keymap.h"
#include <freerdp/input.h> #include <freerdp/input.h>
#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H #ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
@ -29,8 +33,6 @@
#include <freerdp/kbd/layouts.h> #include <freerdp/kbd/layouts.h>
#endif #endif
#include "rdp_keymap.h"
static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = { static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
/* space */ /* space */

View File

@ -20,6 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "rdp_keymap.h"
#include <freerdp/input.h> #include <freerdp/input.h>
@ -29,8 +32,6 @@
#include <freerdp/kbd/layouts.h> #include <freerdp/kbd/layouts.h>
#endif #endif
#include "rdp_keymap.h"
static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = { static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
/* space */ /* space */

View File

@ -20,6 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "rdp_keymap.h"
#include <freerdp/input.h> #include <freerdp/input.h>
@ -29,8 +32,6 @@
#include <freerdp/kbd/layouts.h> #include <freerdp/kbd/layouts.h>
#endif #endif
#include "rdp_keymap.h"
static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = { static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
{0} {0}

View File

@ -36,6 +36,10 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#include "config.h"
#include "rdp_keymap.h"
#include <freerdp/input.h> #include <freerdp/input.h>
#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H #ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
@ -44,9 +48,6 @@
#include <freerdp/kbd/layouts.h> #include <freerdp/kbd/layouts.h>
#endif #endif
#include "rdp_keymap.h"
static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = { static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
/* space */ /* space */

View File

@ -20,15 +20,16 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <pthread.h>
#include <freerdp/freerdp.h>
#include <guacamole/client.h>
#include "client.h" #include "client.h"
#include "rdp_pointer.h"
#include "default_pointer.h" #include "default_pointer.h"
#include "rdp_pointer.h"
#include <pthread.h>
#include <freerdp/freerdp.h>
#include <guacamole/client.h>
void guac_rdp_pointer_new(rdpContext* context, rdpPointer* pointer) { void guac_rdp_pointer_new(rdpContext* context, rdpPointer* pointer) {

View File

@ -24,6 +24,8 @@
#ifndef _GUAC_RDP_RDP_POINTER_H #ifndef _GUAC_RDP_RDP_POINTER_H
#define _GUAC_RDP_RDP_POINTER_H #define _GUAC_RDP_RDP_POINTER_H
#include "config.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>

View File

@ -20,9 +20,11 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "rdp_settings.h"
#include <freerdp/constants.h> #include <freerdp/constants.h>
#include "rdp_settings.h"
void guac_rdp_pull_settings(freerdp* rdp, guac_rdp_settings* guac_settings) { void guac_rdp_pull_settings(freerdp* rdp, guac_rdp_settings* guac_settings) {

View File

@ -24,11 +24,13 @@
#ifndef __GUAC_RDP_SETTINGS_H #ifndef __GUAC_RDP_SETTINGS_H
#define __GUAC_RDP_SETTINGS_H #define __GUAC_RDP_SETTINGS_H
#include <freerdp/freerdp.h> #include "config.h"
#include <guacamole/client.h>
#include "rdp_keymap.h" #include "rdp_keymap.h"
#include <freerdp/freerdp.h>
#include <guacamole/client.h>
/** /**
* The default RDP port. * The default RDP port.
*/ */

View File

@ -30,6 +30,8 @@
* @file rdp_status.h * @file rdp_status.h
*/ */
#include "config.h"
#define STATUS_SUCCESS 0x00000000 #define STATUS_SUCCESS 0x00000000
#define STATUS_NO_MORE_FILES 0x80000006 #define STATUS_NO_MORE_FILES 0x80000006
#define STATUS_DEVICE_OFF_LINE 0x80000010 #define STATUS_DEVICE_OFF_LINE 0x80000010

View File

@ -20,6 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdint.h> #include <stdint.h>

View File

@ -21,6 +21,8 @@
*/ */
#include "config.h"
/** /**
* Convert the given number of UTF-16 characters to UTF-8 characters. * Convert the given number of UTF-16 characters to UTF-8 characters.
*/ */

View File

@ -20,14 +20,15 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include "cursor.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>
#include <guacamole/socket.h> #include <guacamole/socket.h>
#include "cursor.h"
guac_ssh_cursor* guac_ssh_create_blank(guac_client* client) { guac_ssh_cursor* guac_ssh_create_blank(guac_client* client) {
guac_socket* socket = client->socket; guac_socket* socket = client->socket;

View File

@ -24,6 +24,10 @@
#ifndef _GUAC_SSH_BLANK_H #ifndef _GUAC_SSH_BLANK_H
#define _GUAC_SSH_BLANK_H #define _GUAC_SSH_BLANK_H
#include "config.h"
#include "cursor.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -20,13 +20,14 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include "buffer.h" #include "buffer.h"
#include "common.h" #include "common.h"
#include <stdlib.h>
#include <string.h>
guac_terminal_buffer* guac_terminal_buffer_alloc(int rows, guac_terminal_char* default_character) { guac_terminal_buffer* guac_terminal_buffer_alloc(int rows, guac_terminal_char* default_character) {
/* Allocate scrollback */ /* Allocate scrollback */

View File

@ -24,6 +24,8 @@
#ifndef _SSH_GUAC_BUFFER_H #ifndef _SSH_GUAC_BUFFER_H
#define _SSH_GUAC_BUFFER_H #define _SSH_GUAC_BUFFER_H
#include "config.h"
#include "types.h" #include "types.h"
/** /**

View File

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

Some files were not shown because too many files have changed in this diff Show More