Have to not clear both CTRL_ALT as that would prohibit CTRL+ combinations (and ALT+).
This commit is contained in:
parent
6241ebcbb2
commit
9557ca05ab
@ -52,12 +52,10 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* exclam */
|
/* exclam */
|
||||||
{ .keysym = 0x0021, .scancode = 0x02,
|
{ .keysym = 0x0021, .scancode = 0x02,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* quotedbl */
|
/* quotedbl */
|
||||||
{ .keysym = 0x0022, .scancode = 0x03,
|
{ .keysym = 0x0022, .scancode = 0x03,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* numbersign */
|
/* numbersign */
|
||||||
@ -66,37 +64,30 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* dollar */
|
/* dollar */
|
||||||
{ .keysym = 0x0024, .scancode = 0x05,
|
{ .keysym = 0x0024, .scancode = 0x05,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* percent */
|
/* percent */
|
||||||
{ .keysym = 0x0025, .scancode = 0x06,
|
{ .keysym = 0x0025, .scancode = 0x06,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* ampersand */
|
/* ampersand */
|
||||||
{ .keysym = 0x0026, .scancode = 0x07,
|
{ .keysym = 0x0026, .scancode = 0x07,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* quoteright */
|
/* quoteright */
|
||||||
{ .keysym = 0x0027, .scancode = 0x2b,
|
{ .keysym = 0x0027, .scancode = 0x2b,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* parenleft */
|
/* parenleft */
|
||||||
{ .keysym = 0x0028, .scancode = 0x09,
|
{ .keysym = 0x0028, .scancode = 0x09,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* parenright */
|
/* parenright */
|
||||||
{ .keysym = 0x0029, .scancode = 0x0A,
|
{ .keysym = 0x0029, .scancode = 0x0A,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* asterisk */
|
/* asterisk */
|
||||||
{ .keysym = 0x002a, .scancode = 0x1b,
|
{ .keysym = 0x002a, .scancode = 0x1b,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* plus */
|
/* plus */
|
||||||
@ -117,7 +108,6 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* slash */
|
/* slash */
|
||||||
{ .keysym = 0x002f, .scancode = 0x08,
|
{ .keysym = 0x002f, .scancode = 0x08,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* 0 */
|
/* 0 */
|
||||||
@ -162,12 +152,10 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* colon */
|
/* colon */
|
||||||
{ .keysym = 0x003a, .scancode = 0x34,
|
{ .keysym = 0x003a, .scancode = 0x34,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* semicolon */
|
/* semicolon */
|
||||||
{ .keysym = 0x003b, .scancode = 0x33,
|
{ .keysym = 0x003b, .scancode = 0x33,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* less */
|
/* less */
|
||||||
@ -176,17 +164,14 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* equal */
|
/* equal */
|
||||||
{ .keysym = 0x003d, .scancode = 0x0B,
|
{ .keysym = 0x003d, .scancode = 0x0B,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* greater */
|
/* greater */
|
||||||
{ .keysym = 0x003e, .scancode = 0x56,
|
{ .keysym = 0x003e, .scancode = 0x56,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* question */
|
/* question */
|
||||||
{ .keysym = 0x003f, .scancode = 0x0c,
|
{ .keysym = 0x003f, .scancode = 0x0c,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* at */
|
/* at */
|
||||||
@ -315,7 +300,6 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* underscore */
|
/* underscore */
|
||||||
{ .keysym = 0x005f, .scancode = 0x35,
|
{ .keysym = 0x005f, .scancode = 0x35,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* dead grave (WRONG) */
|
/* dead grave (WRONG) */
|
||||||
@ -444,7 +428,6 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* Ä */
|
/* Ä */
|
||||||
{ .keysym = 0x00c4, .scancode = 0x28,
|
{ .keysym = 0x00c4, .scancode = 0x28,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* ö */
|
/* ö */
|
||||||
@ -453,7 +436,6 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* Ö */
|
/* Ö */
|
||||||
{ .keysym = 0x00d6, .scancode = 0x27,
|
{ .keysym = 0x00d6, .scancode = 0x27,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* ü */
|
/* ü */
|
||||||
@ -462,7 +444,6 @@ static guac_rdp_keysym_desc __guac_rdp_keymap_mapping[] = {
|
|||||||
|
|
||||||
/* Ü */
|
/* Ü */
|
||||||
{ .keysym = 0x00dc, .scancode = 0x1a,
|
{ .keysym = 0x00dc, .scancode = 0x1a,
|
||||||
.clear_keysyms = GUAC_KEYSYMS_CTRL_ALT,
|
|
||||||
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
.set_keysyms = GUAC_KEYSYMS_SHIFT },
|
||||||
|
|
||||||
/* ß */
|
/* ß */
|
||||||
|
Loading…
Reference in New Issue
Block a user