diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/curses.c | 9 | ||||
| -rw-r--r-- | ui/curses_keys.h | 1 | ||||
| -rw-r--r-- | ui/spice-display.c | 3 | ||||
| -rw-r--r-- | ui/vnc.c | 8 |
4 files changed, 16 insertions, 5 deletions
diff --git a/ui/curses.c b/ui/curses.c index ed3165e45e..82bc614040 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -238,9 +238,12 @@ static void curses_refresh(DisplayState *ds) keysym = curses2keysym[chr]; if (keysym == -1) { - if (chr < ' ') - keysym = (chr + '@' - 'A' + 'a') | KEYSYM_CNTRL; - else + if (chr < ' ') { + keysym = chr + '@'; + if (keysym >= 'A' && keysym <= 'Z') + keysym += 'a' - 'A'; + keysym |= KEYSYM_CNTRL; + } else keysym = chr; } diff --git a/ui/curses_keys.h b/ui/curses_keys.h index 1decd1119d..c0d5eb452f 100644 --- a/ui/curses_keys.h +++ b/ui/curses_keys.h @@ -55,6 +55,7 @@ static const int curses2keysym[CURSES_KEYS] = { [0x7f] = KEY_BACKSPACE, ['\r'] = KEY_ENTER, ['\n'] = KEY_ENTER, + [27] = 27, [KEY_BTAB] = '\t' | KEYSYM_SHIFT, }; diff --git a/ui/spice-display.c b/ui/spice-display.c index 6702dfd7ea..7b4f5c1bc9 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -29,8 +29,7 @@ static int debug = 0; -static void __attribute__((format(printf,2,3))) -dprint(int level, const char *fmt, ...) +static void GCC_FMT_ATTR(2, 3) dprint(int level, const char *fmt, ...) { va_list args; @@ -214,13 +214,17 @@ static int vnc_server_info_put(QDict *qdict) static void vnc_client_cache_auth(VncState *client) { +#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL) QDict *qdict; +#endif if (!client->info) { return; } +#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL) qdict = qobject_to_qdict(client->info); +#endif #ifdef CONFIG_VNC_TLS if (client->tls.session && @@ -2523,7 +2527,9 @@ int vnc_display_open(DisplayState *ds, const char *display) int sasl = 0; int saslErr; #endif +#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL) int acl = 0; +#endif int lock_key_sync = 1; if (!vnc_display) @@ -2581,8 +2587,10 @@ int vnc_display_open(DisplayState *ds, const char *display) return -1; } #endif +#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL) } else if (strncmp(options, "acl", 3) == 0) { acl = 1; +#endif } else if (strncmp(options, "lossy", 5) == 0) { vs->lossy = true; } |