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

@@ -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.c                                   \
-    keyboard/keyboard.c                          \
+    keymap.c                                     \
-    keyboard/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.h                                   \
-    keyboard/keyboard.h                          \
+    keymap.h                                     \
-    keyboard/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 =                                      \
+rdp_keymaps =                             \
-    $(srcdir)/keyboard/keymaps/base.keymap         \
+    $(srcdir)/keymaps/base.keymap         \
-    $(srcdir)/keyboard/keymaps/failsafe.keymap     \
+    $(srcdir)/keymaps/failsafe.keymap     \
-    $(srcdir)/keyboard/keymaps/de_de_qwertz.keymap \
+    $(srcdir)/keymaps/de_de_qwertz.keymap \
-    $(srcdir)/keyboard/keymaps/de_ch_qwertz.keymap \
+    $(srcdir)/keymaps/de_ch_qwertz.keymap \
-    $(srcdir)/keyboard/keymaps/en_gb_qwerty.keymap \
+    $(srcdir)/keymaps/en_gb_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/en_us_qwerty.keymap \
+    $(srcdir)/keymaps/en_us_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/es_es_qwerty.keymap \
+    $(srcdir)/keymaps/es_es_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/fr_fr_azerty.keymap \
+    $(srcdir)/keymaps/fr_fr_azerty.keymap \
-    $(srcdir)/keyboard/keymaps/fr_ch_qwertz.keymap \
+    $(srcdir)/keymaps/fr_ch_qwertz.keymap \
-    $(srcdir)/keyboard/keymaps/it_it_qwerty.keymap \
+    $(srcdir)/keymaps/it_it_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/ja_jp_qwerty.keymap \
+    $(srcdir)/keymaps/ja_jp_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/pt_br_qwerty.keymap \
+    $(srcdir)/keymaps/pt_br_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/sv_se_qwerty.keymap \
+    $(srcdir)/keymaps/sv_se_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/da_dk_qwerty.keymap \
+    $(srcdir)/keymaps/da_dk_qwerty.keymap \
-    $(srcdir)/keyboard/keymaps/tr_tr_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 \
+    keymaps/generate.pl                \
-    keyboard/keymaps/generate.pl
+    plugins/generate-entry-wrappers.pl
 

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 (`).

src/protocols/rdp/decompose.h

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_KEYBOARD_DECOMPOSE_H
+#ifndef GUAC_RDP_DECOMPOSE_H
-#define GUAC_RDP_KEYBOARD_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

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 <freerdp/freerdp.h>

src/protocols/rdp/keyboard.c

@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include "client.h"
-#include "keyboard/decompose.h"
+#include "decompose.h"
-#include "keyboard/keyboard.h"
+#include "keyboard.h"
-#include "keyboard/keymap.h"
+#include "keymap.h"
 #include "rdp.h"
 
 #include <freerdp/freerdp.h>

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 <guacamole/client.h>
 

src/protocols/rdp/keymap.c

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

src/protocols/rdp/keymap.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef GUAC_RDP_KEYBOARD_KEYMAP_H
+#ifndef GUAC_RDP_KEYMAP_H
-#define GUAC_RDP_KEYBOARD_KEYMAP_H
+#define GUAC_RDP_KEYMAP_H
 
 #include "config.h"
 

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 <freerdp/input.h>'                         . "\n"
      . '#include <freerdp/locale/keyboard.h>'               . "\n"
      .                                                        "\n"

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"

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"
 

src/protocols/rdp/settings.h

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "keyboard/keymap.h"
+#include "keymap.h"
 
 #include <freerdp/freerdp.h>
 #include <guacamole/user.h>