aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-11-07 10:14:14 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-11-07 10:14:14 +0000
commitef2088f9af16d3a19f5f094da160dd8ba52231a9 (patch)
tree5f65842763a83c81c4a9c07e7a27d033543ea30e
parent5929e36cac16a366d5ffeb4b09287e864a10ea8b (diff)
downloadqemu-arm-ef2088f9af16d3a19f5f094da160dd8ba52231a9.tar.gz
ui/cocoa.m: Send ctrl-alt key combos to guest if QEMU isn't using thempull-cocoa-20171107cocoa.nextcocoa.for-upstream
Send those ctrl-alt key combos that QEMU doesn't treat specially to the guest rather than ignoring them. All the case where we do special handling of ctrl-alt-X exit the event handling using a "return" statement, so we can simply allow the rest to fall through into the normal key handling by deleting the now-spurious "else". We take the opportunity to clean up some oddly-formatted and now rather uninformative comments by removing them. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--ui/cocoa.m6
1 files changed, 2 insertions, 4 deletions
diff --git a/ui/cocoa.m b/ui/cocoa.m
index f39c792..330cceb 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -704,12 +704,10 @@ QemuCocoaView *cocoaView;
return;
}
}
+ }
- // handle keys for graphic console
- } else if (qemu_console_is_graphic(NULL)) {
+ if (qemu_console_is_graphic(NULL)) {
qemu_input_event_send_key_qcode(dcl->con, keycode, true);
-
- // handlekeys for Monitor
} else {
[self handleMonitorInput: event];
}