Moved non-printable keys into base keymap.
This commit is contained in:
Michael Jumper
parent
f5b4b0ca00
commit
02bd90e4fb
@ -43,6 +43,7 @@ lib_LTLIBRARIES = libguac-client-rdp.la
|
|||||||
|
|
||||||
libguac_client_rdp_la_SOURCES = src/client.c src/rdp_bitmap.c src/rdp_glyph.c src/rdp_pointer.c src/rdp_gdi.c src/guac_handlers.c \
|
libguac_client_rdp_la_SOURCES = src/client.c src/rdp_bitmap.c src/rdp_glyph.c src/rdp_pointer.c src/rdp_gdi.c src/guac_handlers.c \
|
||||||
src/rdp_keymap.c \
|
src/rdp_keymap.c \
|
||||||
|
src/rdp_keymap_base.c \
|
||||||
src/rdp_keymap_en_us.c
|
src/rdp_keymap_en_us.c
|
||||||
|
|
||||||
libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0
|
libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0
|
||||||
|
|||||||
@ -113,6 +113,11 @@ typedef int guac_rdp_keysym_state_map[256][256];
|
|||||||
*/
|
*/
|
||||||
extern const guac_rdp_keymap guac_rdp_keymap_en_us;
|
extern const guac_rdp_keymap guac_rdp_keymap_en_us;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Map of X11 keysyms to RDP scancodes (common non-printable keys).
|
||||||
|
*/
|
||||||
|
extern const guac_rdp_keymap guac_rdp_keymap_base;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Simple macro for referencing the mapped value of an altcode or scancode for a given keysym.
|
* Simple macro for referencing the mapped value of an altcode or scancode for a given keysym.
|
||||||
*/
|
*/
|
||||||
|
|||||||
146
protocols/rdp/src/rdp_keymap_base.c
Normal file
146
protocols/rdp/src/rdp_keymap_base.c
Normal file
@ -0,0 +1,146 @@
|
|||||||
|
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is libguac-client-rdp.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* Michael Jumper.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Matt Hortman
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
#include <freerdp/input.h>
|
||||||
|
|
||||||
|
#include "rdp_keymap.h"
|
||||||
|
|
||||||
|
static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
||||||
|
|
||||||
|
/* BackSpace */
|
||||||
|
{ .keysym = 0xff08, .scancode = 0x0E },
|
||||||
|
|
||||||
|
/* Tab */
|
||||||
|
{ .keysym = 0xff09, .scancode = 0x0F },
|
||||||
|
|
||||||
|
/* Return */
|
||||||
|
{ .keysym = 0xff0d, .scancode = 0x1C },
|
||||||
|
|
||||||
|
/* Left */
|
||||||
|
{ .keysym = 0xff51, .scancode = 0x4B,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
/* Up */
|
||||||
|
{ .keysym = 0xff52, .scancode = 0x48,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
/* Right */
|
||||||
|
{ .keysym = 0xff53, .scancode = 0x4D,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
/* Down */
|
||||||
|
{ .keysym = 0xff54, .scancode = 0x50,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
/* Menu */
|
||||||
|
{ .keysym = 0xff67, .scancode = 0x5D,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
/* KP_0 */
|
||||||
|
{ .keysym = 0xffb0, .scancode = 0x52 },
|
||||||
|
|
||||||
|
/* KP_1 */
|
||||||
|
{ .keysym = 0xffb1, .scancode = 0x4F },
|
||||||
|
|
||||||
|
/* KP_2 */
|
||||||
|
{ .keysym = 0xffb2, .scancode = 0x50 },
|
||||||
|
|
||||||
|
/* KP_3 */
|
||||||
|
{ .keysym = 0xffb3, .scancode = 0x51 },
|
||||||
|
|
||||||
|
/* KP_4 */
|
||||||
|
{ .keysym = 0xffb4, .scancode = 0x4B },
|
||||||
|
|
||||||
|
/* KP_5 */
|
||||||
|
{ .keysym = 0xffb5, .scancode = 0x4C },
|
||||||
|
|
||||||
|
/* KP_6 */
|
||||||
|
{ .keysym = 0xffb6, .scancode = 0x4D },
|
||||||
|
|
||||||
|
/* KP_7 */
|
||||||
|
{ .keysym = 0xffb7, .scancode = 0x47 },
|
||||||
|
|
||||||
|
/* KP_8 */
|
||||||
|
{ .keysym = 0xffb8, .scancode = 0x48 },
|
||||||
|
|
||||||
|
/* KP_9 */
|
||||||
|
{ .keysym = 0xffb9, .scancode = 0x49 },
|
||||||
|
|
||||||
|
/* Shift_L */
|
||||||
|
{ .keysym = 0xffe1, .scancode = 0x2A },
|
||||||
|
|
||||||
|
/* Shift_R */
|
||||||
|
{ .keysym = 0xffe2, .scancode = 0x36 },
|
||||||
|
|
||||||
|
/* Control_L */
|
||||||
|
{ .keysym = 0xffe3, .scancode = 0x1D },
|
||||||
|
|
||||||
|
/* Control_R */
|
||||||
|
{ .keysym = 0xffe4, .scancode = 0x1D },
|
||||||
|
|
||||||
|
/* Alt_L */
|
||||||
|
{ .keysym = 0xffe9, .scancode = 0x38 },
|
||||||
|
|
||||||
|
/* Alt_R */
|
||||||
|
{ .keysym = 0xffea, .scancode = 0x38 },
|
||||||
|
|
||||||
|
/* Super_L */
|
||||||
|
{ .keysym = 0xffeb, .scancode = 0x5B,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
/* Super_R */
|
||||||
|
{ .keysym = 0xffec, .scancode = 0x5C,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
/* Delete */
|
||||||
|
{ .keysym = 0xffff, .scancode = 0x53,
|
||||||
|
.flags = KBD_FLAGS_EXTENDED },
|
||||||
|
|
||||||
|
{0}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
const guac_rdp_keymap guac_rdp_keymap_base = {
|
||||||
|
|
||||||
|
.name = "base",
|
||||||
|
|
||||||
|
.parent = NULL,
|
||||||
|
.mapping = __guac_rdp_keymap_mapping
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
@ -374,95 +374,6 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
{ .keysym = 0x007e, .scancode = 0x29,
|
{ .keysym = 0x007e, .scancode = 0x29,
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* BackSpace */
|
|
||||||
{ .keysym = 0xff08, .scancode = 0x0E },
|
|
||||||
|
|
||||||
/* Tab */
|
|
||||||
{ .keysym = 0xff09, .scancode = 0x0F },
|
|
||||||
|
|
||||||
/* Return */
|
|
||||||
{ .keysym = 0xff0d, .scancode = 0x1C },
|
|
||||||
|
|
||||||
/* Left */
|
|
||||||
{ .keysym = 0xff51, .scancode = 0x4B,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
/* Up */
|
|
||||||
{ .keysym = 0xff52, .scancode = 0x48,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
/* Right */
|
|
||||||
{ .keysym = 0xff53, .scancode = 0x4D,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
/* Down */
|
|
||||||
{ .keysym = 0xff54, .scancode = 0x50,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
/* Menu */
|
|
||||||
{ .keysym = 0xff67, .scancode = 0x5D,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
/* KP_0 */
|
|
||||||
{ .keysym = 0xffb0, .scancode = 0x52 },
|
|
||||||
|
|
||||||
/* KP_1 */
|
|
||||||
{ .keysym = 0xffb1, .scancode = 0x4F },
|
|
||||||
|
|
||||||
/* KP_2 */
|
|
||||||
{ .keysym = 0xffb2, .scancode = 0x50 },
|
|
||||||
|
|
||||||
/* KP_3 */
|
|
||||||
{ .keysym = 0xffb3, .scancode = 0x51 },
|
|
||||||
|
|
||||||
/* KP_4 */
|
|
||||||
{ .keysym = 0xffb4, .scancode = 0x4B },
|
|
||||||
|
|
||||||
/* KP_5 */
|
|
||||||
{ .keysym = 0xffb5, .scancode = 0x4C },
|
|
||||||
|
|
||||||
/* KP_6 */
|
|
||||||
{ .keysym = 0xffb6, .scancode = 0x4D },
|
|
||||||
|
|
||||||
/* KP_7 */
|
|
||||||
{ .keysym = 0xffb7, .scancode = 0x47 },
|
|
||||||
|
|
||||||
/* KP_8 */
|
|
||||||
{ .keysym = 0xffb8, .scancode = 0x48 },
|
|
||||||
|
|
||||||
/* KP_9 */
|
|
||||||
{ .keysym = 0xffb9, .scancode = 0x49 },
|
|
||||||
|
|
||||||
/* Shift_L */
|
|
||||||
{ .keysym = 0xffe1, .scancode = 0x2A },
|
|
||||||
|
|
||||||
/* Shift_R */
|
|
||||||
{ .keysym = 0xffe2, .scancode = 0x36 },
|
|
||||||
|
|
||||||
/* Control_L */
|
|
||||||
{ .keysym = 0xffe3, .scancode = 0x1D },
|
|
||||||
|
|
||||||
/* Control_R */
|
|
||||||
{ .keysym = 0xffe4, .scancode = 0x1D },
|
|
||||||
|
|
||||||
/* Alt_L */
|
|
||||||
{ .keysym = 0xffe9, .scancode = 0x38 },
|
|
||||||
|
|
||||||
/* Alt_R */
|
|
||||||
{ .keysym = 0xffea, .scancode = 0x38 },
|
|
||||||
|
|
||||||
/* Super_L */
|
|
||||||
{ .keysym = 0xffeb, .scancode = 0x5B,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
/* Super_R */
|
|
||||||
{ .keysym = 0xffec, .scancode = 0x5C,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
/* Delete */
|
|
||||||
{ .keysym = 0xffff, .scancode = 0x53,
|
|
||||||
.flags = KBD_FLAGS_EXTENDED },
|
|
||||||
|
|
||||||
{0}
|
{0}
|
||||||
|
|
||||||
};
|
};
|
||||||
@ -471,7 +382,7 @@ const guac_rdp_keymap guac_rdp_keymap_en_us = {
|
|||||||
|
|
||||||
.name = "en-us-qwerty",
|
.name = "en-us-qwerty",
|
||||||
|
|
||||||
.parent = NULL,
|
.parent = &guac_rdp_keymap_base,
|
||||||
.mapping = __guac_rdp_keymap_mapping
|
.mapping = __guac_rdp_keymap_mapping
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user