From patchwork Fri Apr 29 11:46:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 93417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AC79BB6F6B for ; Fri, 29 Apr 2011 21:46:35 +1000 (EST) Received: from localhost ([::1]:38982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFm9X-00076P-Sy for incoming@patchwork.ozlabs.org; Fri, 29 Apr 2011 07:46:31 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFm9Q-000768-BW for qemu-devel@nongnu.org; Fri, 29 Apr 2011 07:46:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFm9P-0005Xo-6F for qemu-devel@nongnu.org; Fri, 29 Apr 2011 07:46:24 -0400 Received: from ipmail06.adl6.internode.on.net ([150.101.137.145]:21078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFm9O-0005XB-Rn for qemu-devel@nongnu.org; Fri, 29 Apr 2011 07:46:23 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AlMFABGiuk2WZXPNgWdsb2JhbACYSY1QAQEWJiWnMZ4ghX4EnRQ Received: from ppp115-205.static.internode.on.net (HELO incana.localnet) ([150.101.115.205]) by ipmail06.adl6.internode.on.net with ESMTP; 29 Apr 2011 21:16:14 +0930 From: Brad Hards To: qemu-devel@nongnu.org Date: Fri, 29 Apr 2011 21:46:12 +1000 User-Agent: KMail/1.13.5 (Linux/2.6.35-28-generic; KDE/4.5.5; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201104292146.12572.bradh@frogmouth.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 150.101.137.145 Subject: [Qemu-devel] [PATCH] doc: Add explanation that -alt-grab and -ctrl-grab affect special keys X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Phillip Merensky reported that the special keys (e.g. Ctrl-Alt-f for full screen) did not work correctly if -alt-grab is used. BUG: 696530 Review of ui/sdl.c:sdl_refresh indicates that this is the intended behaviour, so we should update the documentation to match the actual behaviour, as suggested by Phillip in the bug report. Signed-off-by: Brad Hards --- qemu-doc.texi | 6 +++++- qemu-options.hx | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 86e017c..d96a6ab 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -278,7 +278,11 @@ targets do not need a disk image. @c man begin OPTIONS -During the graphical emulation, you can use the following keys: +During the graphical emulation, you can use special key combinations to change +modes. The default key mappings are shown below, but if you use @code{-alt-grab} +then the modifier is Ctrl-Alt-Shift (instead of Ctrl-Alt) and if you use +@code{-ctrl-grab} then the modifier is the right Ctrl key (instead of Ctrl-Alt): + @table @key @item Ctrl-Alt-f @kindex Ctrl-Alt-f diff --git a/qemu-options.hx b/qemu-options.hx index 489df10..8d83aa1 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -662,7 +662,8 @@ DEF("alt-grab", 0, QEMU_OPTION_alt_grab, STEXI @item -alt-grab @findex -alt-grab -Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). +Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). Note that this also +affects the special keys (for fullscreen, monitor-mode switching, etc). ETEXI DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, @@ -671,7 +672,8 @@ DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, STEXI @item -ctrl-grab @findex -ctrl-grab -Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). +Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). Note that this also +affects the special keys (for fullscreen, monitor-mode switching, etc). ETEXI DEF("no-quit", 0, QEMU_OPTION_no_quit,