From 2bbc4bfbffffddcb3351b939973f7080d0fd730b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 4 Jan 2020 11:43:32 -0800 Subject: [PATCH] GUACAMOLE-249: Move keyboard-related source back to root of RDP (ease merge). Not truly needed as much as the rest of the restructure. --- src/protocols/rdp/Makefile.am | 50 +++++++++---------- src/protocols/rdp/{keyboard => }/decompose.c | 2 +- src/protocols/rdp/{keyboard => }/decompose.h | 6 +-- src/protocols/rdp/input.c | 2 +- src/protocols/rdp/{keyboard => }/keyboard.c | 6 +-- src/protocols/rdp/{keyboard => }/keyboard.h | 2 +- src/protocols/rdp/{keyboard => }/keymap.c | 2 +- src/protocols/rdp/{keyboard => }/keymap.h | 4 +- .../rdp/{keyboard => }/keymaps/base.keymap | 0 .../keymaps/da_dk_qwerty.keymap | 0 .../keymaps/de_ch_qwertz.keymap | 0 .../keymaps/de_de_qwertz.keymap | 0 .../keymaps/en_gb_qwerty.keymap | 0 .../keymaps/en_us_qwerty.keymap | 0 .../keymaps/es_es_qwerty.keymap | 0 .../{keyboard => }/keymaps/failsafe.keymap | 0 .../keymaps/fr_ch_qwertz.keymap | 0 .../keymaps/fr_fr_azerty.keymap | 0 .../rdp/{keyboard => }/keymaps/generate.pl | 2 +- .../keymaps/it_it_qwerty.keymap | 0 .../keymaps/ja_jp_qwerty.keymap | 0 .../keymaps/pt_br_qwerty.keymap | 0 .../keymaps/sv_se_qwerty.keymap | 0 .../keymaps/tr_tr_qwerty.keymap | 0 src/protocols/rdp/rdp.c | 2 +- src/protocols/rdp/rdp.h | 2 +- src/protocols/rdp/settings.h | 2 +- 27 files changed, 41 insertions(+), 41 deletions(-) rename src/protocols/rdp/{keyboard => }/decompose.c (99%) rename src/protocols/rdp/{keyboard => }/decompose.h (94%) rename src/protocols/rdp/{keyboard => }/keyboard.c (99%) rename src/protocols/rdp/{keyboard => }/keyboard.h (99%) rename src/protocols/rdp/{keyboard => }/keymap.c (98%) rename src/protocols/rdp/{keyboard => }/keymap.h (98%) rename src/protocols/rdp/{keyboard => }/keymaps/base.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/da_dk_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/de_ch_qwertz.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/de_de_qwertz.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/en_gb_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/en_us_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/es_es_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/failsafe.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/fr_ch_qwertz.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/fr_fr_azerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/generate.pl (99%) rename src/protocols/rdp/{keyboard => }/keymaps/it_it_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/ja_jp_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/pt_br_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/sv_se_qwerty.keymap (100%) rename src/protocols/rdp/{keyboard => }/keymaps/tr_tr_qwerty.keymap (100%) diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 3d9d5a50..8766b76a 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -57,15 +57,15 @@ libguac_client_rdp_la_SOURCES = \ channels/rdpsnd/rdpsnd.c \ client.c \ color.c \ + decompose.c \ download.c \ error.c \ fs.c \ gdi.c \ glyph.c \ input.c \ - keyboard/decompose.c \ - keyboard/keyboard.c \ - keyboard/keymap.c \ + keyboard.c \ + keymap.c \ log.c \ ls.c \ plugins/channels.c \ @@ -99,15 +99,15 @@ noinst_HEADERS = \ channels/rdpsnd/rdpsnd.h \ client.h \ color.h \ + decompose.h \ download.h \ error.h \ fs.h \ gdi.h \ glyph.h \ input.h \ - keyboard/decompose.h \ - keyboard/keyboard.h \ - keyboard/keymap.h \ + keyboard.h \ + keymap.h \ log.h \ ls.h \ plugins/channels.h \ @@ -217,31 +217,31 @@ BUILT_SOURCES = \ _generated_channel_entry_wrappers.c \ _generated_keymaps.c -rdp_keymaps = \ - $(srcdir)/keyboard/keymaps/base.keymap \ - $(srcdir)/keyboard/keymaps/failsafe.keymap \ - $(srcdir)/keyboard/keymaps/de_de_qwertz.keymap \ - $(srcdir)/keyboard/keymaps/de_ch_qwertz.keymap \ - $(srcdir)/keyboard/keymaps/en_gb_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/en_us_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/es_es_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/fr_fr_azerty.keymap \ - $(srcdir)/keyboard/keymaps/fr_ch_qwertz.keymap \ - $(srcdir)/keyboard/keymaps/it_it_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/ja_jp_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/pt_br_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/sv_se_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/da_dk_qwerty.keymap \ - $(srcdir)/keyboard/keymaps/tr_tr_qwerty.keymap +rdp_keymaps = \ + $(srcdir)/keymaps/base.keymap \ + $(srcdir)/keymaps/failsafe.keymap \ + $(srcdir)/keymaps/de_de_qwertz.keymap \ + $(srcdir)/keymaps/de_ch_qwertz.keymap \ + $(srcdir)/keymaps/en_gb_qwerty.keymap \ + $(srcdir)/keymaps/en_us_qwerty.keymap \ + $(srcdir)/keymaps/es_es_qwerty.keymap \ + $(srcdir)/keymaps/fr_fr_azerty.keymap \ + $(srcdir)/keymaps/fr_ch_qwertz.keymap \ + $(srcdir)/keymaps/it_it_qwerty.keymap \ + $(srcdir)/keymaps/ja_jp_qwerty.keymap \ + $(srcdir)/keymaps/pt_br_qwerty.keymap \ + $(srcdir)/keymaps/sv_se_qwerty.keymap \ + $(srcdir)/keymaps/da_dk_qwerty.keymap \ + $(srcdir)/keymaps/tr_tr_qwerty.keymap _generated_keymaps.c: $(rdp_keymaps) - $(AM_V_GEN) $(srcdir)/keyboard/keymaps/generate.pl $(rdp_keymaps) + $(AM_V_GEN) $(srcdir)/keymaps/generate.pl $(rdp_keymaps) _generated_channel_entry_wrappers.c: $(srcdir)/plugins/channels.h $(srcdir)/plugins/generate-entry-wrappers.pl $(AM_V_GEN) $(srcdir)/plugins/generate-entry-wrappers.pl $(srcdir)/plugins/channels.h EXTRA_DIST = \ $(rdp_keymaps) \ - plugins/generate-entry-wrappers.pl \ - keyboard/keymaps/generate.pl + keymaps/generate.pl \ + plugins/generate-entry-wrappers.pl diff --git a/src/protocols/rdp/keyboard/decompose.c b/src/protocols/rdp/decompose.c similarity index 99% rename from src/protocols/rdp/keyboard/decompose.c rename to src/protocols/rdp/decompose.c index 1495f51c..5f559d99 100644 --- a/src/protocols/rdp/keyboard/decompose.c +++ b/src/protocols/rdp/decompose.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "keyboard/keyboard.h" +#include "keyboard.h" /** * The X11 keysym for the dead key which types a grave (`). diff --git a/src/protocols/rdp/keyboard/decompose.h b/src/protocols/rdp/decompose.h similarity index 94% rename from src/protocols/rdp/keyboard/decompose.h rename to src/protocols/rdp/decompose.h index 0c3765ed..a7ab1465 100644 --- a/src/protocols/rdp/keyboard/decompose.h +++ b/src/protocols/rdp/decompose.h @@ -17,11 +17,11 @@ * under the License. */ -#ifndef GUAC_RDP_KEYBOARD_DECOMPOSE_H -#define GUAC_RDP_KEYBOARD_DECOMPOSE_H +#ifndef GUAC_RDP_DECOMPOSE_H +#define GUAC_RDP_DECOMPOSE_H #include "config.h" -#include "keyboard/keyboard.h" +#include "keyboard.h" /** * Attempts to type the given keysym by decomposing the associated character diff --git a/src/protocols/rdp/input.c b/src/protocols/rdp/input.c index 44a46998..5e08dd6e 100644 --- a/src/protocols/rdp/input.c +++ b/src/protocols/rdp/input.c @@ -22,7 +22,7 @@ #include "client.h" #include "common/recording.h" #include "input.h" -#include "keyboard/keyboard.h" +#include "keyboard.h" #include "rdp.h" #include diff --git a/src/protocols/rdp/keyboard/keyboard.c b/src/protocols/rdp/keyboard.c similarity index 99% rename from src/protocols/rdp/keyboard/keyboard.c rename to src/protocols/rdp/keyboard.c index 7b1414c8..71aba14f 100644 --- a/src/protocols/rdp/keyboard/keyboard.c +++ b/src/protocols/rdp/keyboard.c @@ -19,9 +19,9 @@ #include "config.h" #include "client.h" -#include "keyboard/decompose.h" -#include "keyboard/keyboard.h" -#include "keyboard/keymap.h" +#include "decompose.h" +#include "keyboard.h" +#include "keymap.h" #include "rdp.h" #include diff --git a/src/protocols/rdp/keyboard/keyboard.h b/src/protocols/rdp/keyboard.h similarity index 99% rename from src/protocols/rdp/keyboard/keyboard.h rename to src/protocols/rdp/keyboard.h index d280fa41..19f46d2b 100644 --- a/src/protocols/rdp/keyboard/keyboard.h +++ b/src/protocols/rdp/keyboard.h @@ -20,7 +20,7 @@ #ifndef GUAC_RDP_KEYBOARD_H #define GUAC_RDP_KEYBOARD_H -#include "keyboard/keymap.h" +#include "keymap.h" #include diff --git a/src/protocols/rdp/keyboard/keymap.c b/src/protocols/rdp/keymap.c similarity index 98% rename from src/protocols/rdp/keyboard/keymap.c rename to src/protocols/rdp/keymap.c index b6ea7579..04b1409e 100644 --- a/src/protocols/rdp/keyboard/keymap.c +++ b/src/protocols/rdp/keymap.c @@ -19,7 +19,7 @@ #include "config.h" -#include "keyboard/keymap.h" +#include "keymap.h" #include diff --git a/src/protocols/rdp/keyboard/keymap.h b/src/protocols/rdp/keymap.h similarity index 98% rename from src/protocols/rdp/keyboard/keymap.h rename to src/protocols/rdp/keymap.h index d0074e52..9e4958cf 100644 --- a/src/protocols/rdp/keyboard/keymap.h +++ b/src/protocols/rdp/keymap.h @@ -17,8 +17,8 @@ * under the License. */ -#ifndef GUAC_RDP_KEYBOARD_KEYMAP_H -#define GUAC_RDP_KEYBOARD_KEYMAP_H +#ifndef GUAC_RDP_KEYMAP_H +#define GUAC_RDP_KEYMAP_H #include "config.h" diff --git a/src/protocols/rdp/keyboard/keymaps/base.keymap b/src/protocols/rdp/keymaps/base.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/base.keymap rename to src/protocols/rdp/keymaps/base.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/da_dk_qwerty.keymap b/src/protocols/rdp/keymaps/da_dk_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/da_dk_qwerty.keymap rename to src/protocols/rdp/keymaps/da_dk_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/de_ch_qwertz.keymap b/src/protocols/rdp/keymaps/de_ch_qwertz.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/de_ch_qwertz.keymap rename to src/protocols/rdp/keymaps/de_ch_qwertz.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/de_de_qwertz.keymap b/src/protocols/rdp/keymaps/de_de_qwertz.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/de_de_qwertz.keymap rename to src/protocols/rdp/keymaps/de_de_qwertz.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/en_gb_qwerty.keymap b/src/protocols/rdp/keymaps/en_gb_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/en_gb_qwerty.keymap rename to src/protocols/rdp/keymaps/en_gb_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/en_us_qwerty.keymap b/src/protocols/rdp/keymaps/en_us_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/en_us_qwerty.keymap rename to src/protocols/rdp/keymaps/en_us_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/es_es_qwerty.keymap b/src/protocols/rdp/keymaps/es_es_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/es_es_qwerty.keymap rename to src/protocols/rdp/keymaps/es_es_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/failsafe.keymap b/src/protocols/rdp/keymaps/failsafe.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/failsafe.keymap rename to src/protocols/rdp/keymaps/failsafe.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/fr_ch_qwertz.keymap rename to src/protocols/rdp/keymaps/fr_ch_qwertz.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/fr_fr_azerty.keymap b/src/protocols/rdp/keymaps/fr_fr_azerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/fr_fr_azerty.keymap rename to src/protocols/rdp/keymaps/fr_fr_azerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/generate.pl b/src/protocols/rdp/keymaps/generate.pl similarity index 99% rename from src/protocols/rdp/keyboard/keymaps/generate.pl rename to src/protocols/rdp/keymaps/generate.pl index 2aa360f6..f1059a75 100755 --- a/src/protocols/rdp/keyboard/keymaps/generate.pl +++ b/src/protocols/rdp/keymaps/generate.pl @@ -43,7 +43,7 @@ my @keymaps = (); open OUTPUT, ">", "_generated_keymaps.c"; print OUTPUT '#include "config.h"' . "\n" - . '#include "keyboard/keymap.h"' . "\n" + . '#include "keymap.h"' . "\n" . '#include ' . "\n" . '#include ' . "\n" . "\n" diff --git a/src/protocols/rdp/keyboard/keymaps/it_it_qwerty.keymap b/src/protocols/rdp/keymaps/it_it_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/it_it_qwerty.keymap rename to src/protocols/rdp/keymaps/it_it_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/ja_jp_qwerty.keymap b/src/protocols/rdp/keymaps/ja_jp_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/ja_jp_qwerty.keymap rename to src/protocols/rdp/keymaps/ja_jp_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/pt_br_qwerty.keymap b/src/protocols/rdp/keymaps/pt_br_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/pt_br_qwerty.keymap rename to src/protocols/rdp/keymaps/pt_br_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/sv_se_qwerty.keymap b/src/protocols/rdp/keymaps/sv_se_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/sv_se_qwerty.keymap rename to src/protocols/rdp/keymaps/sv_se_qwerty.keymap diff --git a/src/protocols/rdp/keyboard/keymaps/tr_tr_qwerty.keymap b/src/protocols/rdp/keymaps/tr_tr_qwerty.keymap similarity index 100% rename from src/protocols/rdp/keyboard/keymaps/tr_tr_qwerty.keymap rename to src/protocols/rdp/keymaps/tr_tr_qwerty.keymap diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c index bf60b7c4..1bcedb1f 100644 --- a/src/protocols/rdp/rdp.c +++ b/src/protocols/rdp/rdp.c @@ -35,7 +35,7 @@ #include "fs.h" #include "gdi.h" #include "glyph.h" -#include "keyboard/keyboard.h" +#include "keyboard.h" #include "plugins/channels.h" #include "pointer.h" #include "print-job.h" diff --git a/src/protocols/rdp/rdp.h b/src/protocols/rdp/rdp.h index 41f99a2b..d50b8d26 100644 --- a/src/protocols/rdp/rdp.h +++ b/src/protocols/rdp/rdp.h @@ -30,7 +30,7 @@ #include "common/recording.h" #include "common/surface.h" #include "fs.h" -#include "keyboard/keyboard.h" +#include "keyboard.h" #include "print-job.h" #include "settings.h" diff --git a/src/protocols/rdp/settings.h b/src/protocols/rdp/settings.h index bd1daf01..6d72bbb2 100644 --- a/src/protocols/rdp/settings.h +++ b/src/protocols/rdp/settings.h @@ -22,7 +22,7 @@ #include "config.h" -#include "keyboard/keymap.h" +#include "keymap.h" #include #include