GUACAMOLE-249: Rename and restructure RDP source files more sensibly.

This commit is contained in:
Michael Jumper 2019-12-23 12:48:22 -08:00
parent 827951dcf6
commit a63dcb46b2
90 changed files with 254 additions and 254 deletions

View File

@ -37,85 +37,85 @@ nodist_libguac_client_rdp_la_SOURCES = \
_generated_channel_entry_wrappers.c \ _generated_channel_entry_wrappers.c \
_generated_keymaps.c _generated_keymaps.c
libguac_client_rdp_la_SOURCES = \ libguac_client_rdp_la_SOURCES = \
audio_input.c \ bitmap.c \
channels.c \ channels/audio-input.c \
client.c \ channels/cliprdr.c \
clipboard.c \ channels/common-svc.c \
common-svc.c \ channels/disp.c \
decompose.c \ channels/pipe-svc.c \
disp.c \ channels/rail.c \
error.c \ channels/rdpdr/rdpdr-fs-messages-dir-info.c \
input.c \ channels/rdpdr/rdpdr-fs-messages-file-info.c \
keyboard.c \ channels/rdpdr/rdpdr-fs-messages-vol-info.c \
pipe-svc.c \ channels/rdpdr/rdpdr-fs-messages.c \
ptr_string.c \ channels/rdpdr/rdpdr-fs.c \
rail.c \ channels/rdpdr/rdpdr-messages.c \
rdp.c \ channels/rdpdr/rdpdr-printer.c \
rdp_bitmap.c \ channels/rdpdr/rdpdr.c \
rdp_color.c \ channels/rdpsnd/rdpsnd-messages.c \
rdp_fs.c \ channels/rdpsnd/rdpsnd.c \
rdp_gdi.c \ client.c \
rdp_glyph.c \ color.c \
rdp_keymap.c \ error.c \
rdp_print_job.c \ fs.c \
rdp_pointer.c \ gdi.c \
rdp_settings.c \ glyph.c \
rdp_stream.c \ input.c \
rdpdr.c \ keyboard/decompose.c \
rdpdr_fs_messages.c \ keyboard/keyboard.c \
rdpdr_fs_messages_dir_info.c \ keyboard/keymap.c \
rdpdr_fs_messages_file_info.c \ plugins/channels.c \
rdpdr_fs_messages_vol_info.c \ plugins/ptr-string.c \
rdpdr_fs_service.c \ pointer.c \
rdpdr_messages.c \ print-job.c \
rdpdr_printer.c \ rdp.c \
rdpsnd.c \ resolution.c \
rdpsnd_messages.c \ settings.c \
resolution.c \ stream.c \
unicode.c \ unicode.c \
user.c user.c
noinst_HEADERS = \ noinst_HEADERS = \
guac_ai/ai_messages.h \ bitmap.h \
guac_ai/ai_service.h \ channels/audio-input.h \
audio_input.h \ channels/cliprdr.h \
client.h \ channels/common-svc.h \
clipboard.h \ channels/disp.h \
channels.h \ channels/pipe-svc.h \
common-svc.h \ channels/rail.h \
decompose.h \ channels/rdpdr/rdpdr-fs-messages-dir-info.h \
disp.h \ channels/rdpdr/rdpdr-fs-messages-file-info.h \
error.h \ channels/rdpdr/rdpdr-fs-messages-vol-info.h \
input.h \ channels/rdpdr/rdpdr-fs-messages.h \
keyboard.h \ channels/rdpdr/rdpdr-fs.h \
pipe-svc.h \ channels/rdpdr/rdpdr-messages.h \
ptr_string.h \ channels/rdpdr/rdpdr-printer.h \
rail.h \ channels/rdpdr/rdpdr.h \
rdp.h \ channels/rdpsnd/rdpsnd-messages.h \
rdp_bitmap.h \ channels/rdpsnd/rdpsnd.h \
rdp_color.h \ client.h \
rdp_fs.h \ color.h \
rdp_gdi.h \ error.h \
rdp_glyph.h \ fs.h \
rdp_keymap.h \ gdi.h \
rdp_pointer.h \ glyph.h \
rdp_print_job.h \ input.h \
rdp_settings.h \ keyboard/decompose.h \
rdp_status.h \ keyboard/keyboard.h \
rdp_stream.h \ keyboard/keymap.h \
rdpdr.h \ plugins/channels.h \
rdpdr_fs_messages.h \ plugins/guacai/guacai-messages.h \
rdpdr_fs_messages_dir_info.h \ plugins/guacai/guacai.h \
rdpdr_fs_messages_file_info.h \ plugins/ptr-string.h \
rdpdr_fs_messages_vol_info.h \ pointer.h \
rdpdr_fs_service.h \ print-job.h \
rdpdr_messages.h \ rdp.h \
rdpdr_printer.h \ resolution.h \
rdpsnd.h \ settings.h \
rdpsnd_messages.h \ status.h \
resolution.h \ stream.h \
unicode.h \ unicode.h \
user.h user.h
libguac_client_rdp_la_CFLAGS = \ libguac_client_rdp_la_CFLAGS = \
@ -131,8 +131,8 @@ libguac_client_rdp_la_LDFLAGS = \
@PTHREAD_LIBS@ \ @PTHREAD_LIBS@ \
@RDP_LIBS@ @RDP_LIBS@
libguac_client_rdp_la_LIBADD = \ libguac_client_rdp_la_LIBADD = \
@COMMON_LTLIB@ \ @COMMON_LTLIB@ \
@LIBGUAC_LTLIB@ @LIBGUAC_LTLIB@
# #
@ -149,8 +149,8 @@ freerdpdir = ${libdir}/freerdp2
# Common SVC plugin (shared by RDPDR, RDPSND, etc.) # Common SVC plugin (shared by RDPDR, RDPSND, etc.)
# #
libguac_common_svc_client_la_SOURCES = \ libguac_common_svc_client_la_SOURCES = \
guac-common-svc/common-svc-main.c plugins/guac-common-svc/guac-common-svc.c
libguac_common_svc_client_la_CFLAGS = \ libguac_common_svc_client_la_CFLAGS = \
-Werror -Wall -Iinclude \ -Werror -Wall -Iinclude \
@ -168,17 +168,17 @@ libguac_common_svc_client_la_LIBADD = \
# Audio Input # Audio Input
# #
libguacai_client_la_SOURCES = \ libguacai_client_la_SOURCES = \
audio_input.c \ channels/audio-input.c \
guac_ai/ai_messages.c \ plugins/guacai/guacai-messages.c \
guac_ai/ai_service.c \ plugins/guacai/guacai.c \
ptr_string.c plugins/ptr-string.c
libguacai_client_la_CFLAGS = \ libguacai_client_la_CFLAGS = \
-Werror -Wall -Iinclude \ -Werror -Wall -Iinclude \
@COMMON_INCLUDE@ \ @COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \ @COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ \ @LIBGUAC_INCLUDE@ \
@RDP_CFLAGS@ @RDP_CFLAGS@
libguacai_client_la_LDFLAGS = \ libguacai_client_la_LDFLAGS = \
@ -212,31 +212,31 @@ BUILT_SOURCES = \
_generated_channel_entry_wrappers.c \ _generated_channel_entry_wrappers.c \
_generated_keymaps.c _generated_keymaps.c
rdp_keymaps = \ rdp_keymaps = \
$(srcdir)/keymaps/base.keymap \ $(srcdir)/keyboard/keymaps/base.keymap \
$(srcdir)/keymaps/failsafe.keymap \ $(srcdir)/keyboard/keymaps/failsafe.keymap \
$(srcdir)/keymaps/de_de_qwertz.keymap \ $(srcdir)/keyboard/keymaps/de_de_qwertz.keymap \
$(srcdir)/keymaps/de_ch_qwertz.keymap \ $(srcdir)/keyboard/keymaps/de_ch_qwertz.keymap \
$(srcdir)/keymaps/en_gb_qwerty.keymap \ $(srcdir)/keyboard/keymaps/en_gb_qwerty.keymap \
$(srcdir)/keymaps/en_us_qwerty.keymap \ $(srcdir)/keyboard/keymaps/en_us_qwerty.keymap \
$(srcdir)/keymaps/es_es_qwerty.keymap \ $(srcdir)/keyboard/keymaps/es_es_qwerty.keymap \
$(srcdir)/keymaps/fr_fr_azerty.keymap \ $(srcdir)/keyboard/keymaps/fr_fr_azerty.keymap \
$(srcdir)/keymaps/fr_ch_qwertz.keymap \ $(srcdir)/keyboard/keymaps/fr_ch_qwertz.keymap \
$(srcdir)/keymaps/it_it_qwerty.keymap \ $(srcdir)/keyboard/keymaps/it_it_qwerty.keymap \
$(srcdir)/keymaps/ja_jp_qwerty.keymap \ $(srcdir)/keyboard/keymaps/ja_jp_qwerty.keymap \
$(srcdir)/keymaps/pt_br_qwerty.keymap \ $(srcdir)/keyboard/keymaps/pt_br_qwerty.keymap \
$(srcdir)/keymaps/sv_se_qwerty.keymap \ $(srcdir)/keyboard/keymaps/sv_se_qwerty.keymap \
$(srcdir)/keymaps/da_dk_qwerty.keymap \ $(srcdir)/keyboard/keymaps/da_dk_qwerty.keymap \
$(srcdir)/keymaps/tr_tr_qwerty.keymap $(srcdir)/keyboard/keymaps/tr_tr_qwerty.keymap
_generated_keymaps.c: $(rdp_keymaps) _generated_keymaps.c: $(rdp_keymaps)
$(AM_V_GEN) $(srcdir)/keymaps/generate.pl $(rdp_keymaps) $(AM_V_GEN) $(srcdir)/keyboard/keymaps/generate.pl $(rdp_keymaps)
_generated_channel_entry_wrappers.c: $(srcdir)/channels.h $(srcdir)/generate-entry-wrappers.pl _generated_channel_entry_wrappers.c: $(srcdir)/plugins/channels.h $(srcdir)/plugins/generate-entry-wrappers.pl
$(AM_V_GEN) $(srcdir)/generate-entry-wrappers.pl $(srcdir)/channels.h $(AM_V_GEN) $(srcdir)/plugins/generate-entry-wrappers.pl $(srcdir)/plugins/channels.h
EXTRA_DIST = \ EXTRA_DIST = \
$(rdp_keymaps) \ $(rdp_keymaps) \
generate-entry-wrappers.pl \ plugins/generate-entry-wrappers.pl \
keymaps/generate.pl keyboard/keymaps/generate.pl

View File

@ -23,8 +23,8 @@
#include "common/display.h" #include "common/display.h"
#include "common/surface.h" #include "common/surface.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_bitmap.h" #include "bitmap.h"
#include "rdp_settings.h" #include "settings.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <freerdp/codec/bitmap.h> #include <freerdp/codec/bitmap.h>

View File

@ -18,9 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "audio_input.h" #include "channels/audio-input.h"
#include "channels.h" #include "plugins/channels.h"
#include "ptr_string.h" #include "plugins/ptr-string.h"
#include "rdp.h" #include "rdp.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -19,9 +19,9 @@
#include "config.h" #include "config.h"
#include "channels.h" #include "plugins/channels.h"
#include "client.h" #include "client.h"
#include "clipboard.h" #include "channels/cliprdr.h"
#include "common/clipboard.h" #include "common/clipboard.h"
#include "common/iconv.h" #include "common/iconv.h"
#include "rdp.h" #include "rdp.h"

View File

@ -18,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "channels.h" #include "plugins/channels.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include "rdp.h" #include "rdp.h"
#include <freerdp/svc.h> #include <freerdp/svc.h>

View File

@ -18,11 +18,11 @@
*/ */
#include "config.h" #include "config.h"
#include "channels.h" #include "plugins/channels.h"
#include "client.h" #include "client.h"
#include "disp.h" #include "channels/disp.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_settings.h" #include "settings.h"
#include <freerdp/client/disp.h> #include <freerdp/client/disp.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -20,7 +20,7 @@
#ifndef GUAC_RDP_DISP_H #ifndef GUAC_RDP_DISP_H
#define GUAC_RDP_DISP_H #define GUAC_RDP_DISP_H
#include "rdp_settings.h" #include "settings.h"
#include <freerdp/client/disp.h> #include <freerdp/client/disp.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -19,11 +19,11 @@
#include "config.h" #include "config.h"
#include "channels.h" #include "plugins/channels.h"
#include "client.h" #include "client.h"
#include "common/list.h" #include "common/list.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include "pipe-svc.h" #include "channels/pipe-svc.h"
#include "rdp.h" #include "rdp.h"
#include <freerdp/svc.h> #include <freerdp/svc.h>

View File

@ -21,7 +21,7 @@
#define GUAC_RDP_PIPE_SVC_H #define GUAC_RDP_PIPE_SVC_H
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include <freerdp/svc.h> #include <freerdp/svc.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -19,11 +19,11 @@
#include "config.h" #include "config.h"
#include "channels.h" #include "plugins/channels.h"
#include "client.h" #include "client.h"
#include "rail.h" #include "channels/rail.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_settings.h" #include "settings.h"
#include <freerdp/client/rail.h> #include <freerdp/client/rail.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -18,9 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_status.h" #include "status.h"
#include "unicode.h" #include "unicode.h"
#include <guacamole/unicode.h> #include <guacamole/unicode.h>

View File

@ -30,8 +30,8 @@
*/ */
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -18,9 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_status.h" #include "status.h"
#include "unicode.h" #include "unicode.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -29,8 +29,8 @@
*/ */
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -18,10 +18,10 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdpdr_messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_status.h" #include "status.h"
#include <guacamole/unicode.h> #include <guacamole/unicode.h>
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -30,7 +30,7 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -18,14 +18,14 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdpdr_fs_messages_dir_info.h" #include "channels/rdpdr/rdpdr-fs-messages-dir-info.h"
#include "rdpdr_fs_messages_file_info.h" #include "channels/rdpdr/rdpdr-fs-messages-file-info.h"
#include "rdpdr_fs_messages.h" #include "channels/rdpdr/rdpdr-fs-messages.h"
#include "rdpdr_fs_messages_vol_info.h" #include "channels/rdpdr/rdpdr-fs-messages-vol-info.h"
#include "rdpdr_messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_status.h" #include "status.h"
#include "unicode.h" #include "unicode.h"
#include <freerdp/channels/rdpdr.h> #include <freerdp/channels/rdpdr.h>

View File

@ -30,7 +30,7 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -20,9 +20,9 @@
#include "config.h" #include "config.h"
#include "rdp.h" #include "rdp.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdpdr_fs_messages.h" #include "channels/rdpdr/rdpdr-fs-messages.h"
#include "rdpdr_messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include <freerdp/channels/rdpdr.h> #include <freerdp/channels/rdpdr.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -33,7 +33,7 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include <guacamole/pool.h> #include <guacamole/pool.h>

View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "rdp.h" #include "rdp.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdpdr_messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include "unicode.h" #include "unicode.h"
#include <freerdp/channels/rdpdr.h> #include <freerdp/channels/rdpdr.h>

View File

@ -22,7 +22,7 @@
#define GUAC_RDPDR_MESSAGES_H #define GUAC_RDPDR_MESSAGES_H
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -18,12 +18,12 @@
*/ */
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdpdr_messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include "rdpdr_printer.h" #include "channels/rdpdr/rdpdr-printer.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_print_job.h" #include "print-job.h"
#include "rdp_status.h" #include "status.h"
#include "unicode.h" #include "unicode.h"
#include <freerdp/channels/rdpdr.h> #include <freerdp/channels/rdpdr.h>

View File

@ -22,7 +22,7 @@
#define GUAC_RDPDR_PRINTER_H #define GUAC_RDPDR_PRINTER_H
#include "config.h" #include "config.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -18,15 +18,15 @@
*/ */
#include "config.h" #include "config.h"
#include "channels.h" #include "plugins/channels.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_settings.h" #include "settings.h"
#include "rdp_stream.h" #include "stream.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdpdr_fs_service.h" #include "channels/rdpdr/rdpdr-fs.h"
#include "rdpdr_messages.h" #include "channels/rdpdr/rdpdr-messages.h"
#include "rdpdr_printer.h" #include "channels/rdpdr/rdpdr-printer.h"
#include <freerdp/channels/rdpdr.h> #include <freerdp/channels/rdpdr.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -21,7 +21,7 @@
#define GUAC_RDP_RDPDR_H #define GUAC_RDP_RDPDR_H
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "rdp.h" #include "rdp.h"
#include "rdpsnd.h" #include "channels/rdpsnd/rdpsnd.h"
#include "rdpsnd_messages.h" #include "channels/rdpsnd/rdpsnd-messages.h"
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -22,7 +22,7 @@
#define GUAC_RDPSND_MESSAGES_H #define GUAC_RDPSND_MESSAGES_H
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include <winpr/stream.h> #include <winpr/stream.h>

View File

@ -18,10 +18,10 @@
*/ */
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include "rdp.h" #include "rdp.h"
#include "rdpsnd.h" #include "channels/rdpsnd/rdpsnd.h"
#include "rdpsnd_messages.h" #include "channels/rdpsnd/rdpsnd-messages.h"
#include <freerdp/codec/audio.h> #include <freerdp/codec/audio.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -21,7 +21,7 @@
#define GUAC_RDP_RDPSND_H #define GUAC_RDP_RDPSND_H
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -19,12 +19,12 @@
#include "config.h" #include "config.h"
#include "audio_input.h" #include "channels/audio-input.h"
#include "common/recording.h" #include "common/recording.h"
#include "client.h" #include "client.h"
#include "disp.h" #include "channels/disp.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_fs.h" #include "fs.h"
#include "user.h" #include "user.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH

View File

@ -21,7 +21,7 @@
#include "client.h" #include "client.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_settings.h" #include "settings.h"
#include <freerdp/codec/color.h> #include <freerdp/codec/color.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -19,9 +19,9 @@
#include "config.h" #include "config.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_status.h" #include "status.h"
#include "rdp_stream.h" #include "stream.h"
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>

View File

@ -22,9 +22,9 @@
#include "client.h" #include "client.h"
#include "common/surface.h" #include "common/surface.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_bitmap.h" #include "bitmap.h"
#include "rdp_color.h" #include "color.h"
#include "rdp_settings.h" #include "settings.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -22,9 +22,9 @@
#include "client.h" #include "client.h"
#include "common/surface.h" #include "common/surface.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_color.h" #include "color.h"
#include "rdp_glyph.h" #include "glyph.h"
#include "rdp_settings.h" #include "settings.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -21,9 +21,9 @@
#include "client.h" #include "client.h"
#include "common/recording.h" #include "common/recording.h"
#include "disp.h" #include "channels/disp.h"
#include "input.h" #include "input.h"
#include "keyboard.h" #include "keyboard/keyboard.h"
#include "rdp.h" #include "rdp.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "keyboard.h" #include "keyboard/keyboard.h"
/** /**
* The X11 keysym for the dead key which types a grave (`). * The X11 keysym for the dead key which types a grave (`).

View File

@ -21,7 +21,7 @@
#define GUAC_RDP_DECOMPOSE_H #define GUAC_RDP_DECOMPOSE_H
#include "config.h" #include "config.h"
#include "keyboard.h" #include "keyboard/keyboard.h"
/** /**
* Attempts to type the given keysym by decomposing the associated character * Attempts to type the given keysym by decomposing the associated character

View File

@ -20,10 +20,10 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "decompose.h" #include "keyboard/decompose.h"
#include "keyboard.h" #include "keyboard/keyboard.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_keymap.h" #include "keyboard/keymap.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/input.h> #include <freerdp/input.h>

View File

@ -20,7 +20,7 @@
#ifndef GUAC_RDP_KEYBOARD_H #ifndef GUAC_RDP_KEYBOARD_H
#define GUAC_RDP_KEYBOARD_H #define GUAC_RDP_KEYBOARD_H
#include "rdp_keymap.h" #include "keyboard/keymap.h"
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "rdp_keymap.h" #include "keyboard/keymap.h"
#include <string.h> #include <string.h>

View File

@ -43,7 +43,7 @@ my @keymaps = ();
open OUTPUT, ">", "_generated_keymaps.c"; open OUTPUT, ">", "_generated_keymaps.c";
print OUTPUT print OUTPUT
'#include "config.h"' . "\n" '#include "config.h"' . "\n"
. '#include "rdp_keymap.h"' . "\n" . '#include "keyboard/keymap.h"' . "\n"
. '#include <freerdp/input.h>' . "\n" . '#include <freerdp/input.h>' . "\n"
. '#include <freerdp/locale/keyboard.h>' . "\n" . '#include <freerdp/locale/keyboard.h>' . "\n"
. "\n" . "\n"

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "channels.h" #include "plugins/channels.h"
#include "rdp.h" #include "rdp.h"
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>

View File

@ -46,7 +46,7 @@ open OUTPUT, ">", "_generated_channel_entry_wrappers.c";
# Generate required headers # Generate required headers
print OUTPUT <<"EOF"; print OUTPUT <<"EOF";
#include "channels.h" #include "plugins/channels.h"
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
EOF EOF

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "common-svc.h" #include "channels/common-svc.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "ai_messages.h" #include "plugins/guacai/guacai-messages.h"
#include "audio_input.h" #include "channels/audio-input.h"
#include "rdp.h" #include "rdp.h"
#include <stdlib.h> #include <stdlib.h>

View File

@ -19,10 +19,10 @@
#include "config.h" #include "config.h"
#include "ai_messages.h" #include "plugins/guacai/guacai-messages.h"
#include "ai_service.h" #include "plugins/guacai/guacai.h"
#include "audio_input.h" #include "channels/audio-input.h"
#include "ptr_string.h" #include "plugins/ptr-string.h"
#include "rdp.h" #include "rdp.h"
#include <stdlib.h> #include <stdlib.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "ptr_string.h" #include "plugins/ptr-string.h"
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -23,7 +23,7 @@
#include "common/cursor.h" #include "common/cursor.h"
#include "common/display.h" #include "common/display.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_pointer.h" #include "pointer.h"
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "rdp_print_job.h" #include "print-job.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>

View File

@ -19,28 +19,28 @@
#include "config.h" #include "config.h"
#include "audio_input.h" #include "channels/audio-input.h"
#include "channels.h" #include "plugins/channels.h"
#include "client.h" #include "client.h"
#include "clipboard.h" #include "channels/cliprdr.h"
#include "common/cursor.h" #include "common/cursor.h"
#include "common/display.h" #include "common/display.h"
#include "common/recording.h" #include "common/recording.h"
#include "disp.h" #include "channels/disp.h"
#include "error.h" #include "error.h"
#include "keyboard.h" #include "keyboard/keyboard.h"
#include "pipe-svc.h" #include "channels/pipe-svc.h"
#include "rail.h" #include "channels/rail.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_bitmap.h" #include "bitmap.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_print_job.h" #include "print-job.h"
#include "rdp_gdi.h" #include "gdi.h"
#include "rdp_glyph.h" #include "glyph.h"
#include "rdp_pointer.h" #include "pointer.h"
#include "rdp_stream.h" #include "stream.h"
#include "rdpdr.h" #include "channels/rdpdr/rdpdr.h"
#include "rdpsnd.h" #include "channels/rdpsnd/rdpsnd.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "common-ssh/sftp.h" #include "common-ssh/sftp.h"

View File

@ -22,18 +22,18 @@
#include "config.h" #include "config.h"
#include "audio_input.h" #include "channels/audio-input.h"
#include "clipboard.h" #include "channels/cliprdr.h"
#include "common/clipboard.h" #include "common/clipboard.h"
#include "common/display.h" #include "common/display.h"
#include "common/list.h" #include "common/list.h"
#include "common/recording.h" #include "common/recording.h"
#include "common/surface.h" #include "common/surface.h"
#include "disp.h" #include "channels/disp.h"
#include "keyboard.h" #include "keyboard/keyboard.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_print_job.h" #include "print-job.h"
#include "rdp_settings.h" #include "settings.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/codec/color.h> #include <freerdp/codec/color.h>

View File

@ -22,7 +22,7 @@
#include "client.h" #include "client.h"
#include "common/string.h" #include "common/string.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_settings.h" #include "settings.h"
#include "resolution.h" #include "resolution.h"
#include <freerdp/constants.h> #include <freerdp/constants.h>

View File

@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#include "rdp_keymap.h" #include "keyboard/keymap.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>

View File

@ -21,8 +21,8 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_fs.h" #include "fs.h"
#include "rdp_stream.h" #include "stream.h"
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>

View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
#include "rdp_fs.h" #include "fs.h"
#include <CUnit/CUnit.h> #include <CUnit/CUnit.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -19,14 +19,14 @@
#include "config.h" #include "config.h"
#include "audio_input.h" #include "channels/audio-input.h"
#include "common/display.h" #include "common/display.h"
#include "input.h" #include "input.h"
#include "user.h" #include "user.h"
#include "pipe-svc.h" #include "channels/pipe-svc.h"
#include "rdp.h" #include "rdp.h"
#include "rdp_settings.h" #include "settings.h"
#include "rdp_stream.h" #include "stream.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "sftp.h" #include "sftp.h"