From nobody Tue Feb 10 23:54:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1619743760; cv=none; d=zohomail.com; s=zohoarc; b=bvSmmJP4ZY1Ua4N3GE57kWdDCVyuSRaBrbAcODYpWU/xLFp5hsa0HTx8Dw3mWqGTGgk6FRfPcVeRt5ezlnXSfWdI7whNUFOSSb4HxrF00u23CYZdQ9A5R1ymOFs82JE1Sp1nts/BGjaJX0mPU58SghKqNleWtzZcEq/gqx+9GNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619743760; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TnvD4gWTUvLiU6hHTbYCZ9unVM2ZluFbYX0IDEPSfxo=; b=hCK3Ghi/1I5wxjZPHTGcOiGiHDDgNN49vQMjynu6bIFKL8srXTLaRFTCZDayqItdQWwEkQt7V8a+7/8LEdB2o3iCjcPrKH3kzjp8aU41A3meGnyGR1MbLNRbnBrkzrSptsNmnUQgFjboaeTn/kGUY8WmmZaMwUrAAL36U32+FSw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1619743759936201.1704277639676; Thu, 29 Apr 2021 17:49:19 -0700 (PDT) Received: from localhost ([::1]:47006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcHLK-0004bF-Hl for importer@patchew.org; Thu, 29 Apr 2021 20:49:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcGNs-0003aN-EW for qemu-devel@nongnu.org; Thu, 29 Apr 2021 19:47:52 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:40371) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcGNn-0007e7-DK for qemu-devel@nongnu.org; Thu, 29 Apr 2021 19:47:52 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id E3DAA5C00CE; Thu, 29 Apr 2021 19:47:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 29 Apr 2021 19:47:46 -0400 Received: from Gustavos-Mini.box (unknown [201.80.1.6]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 19:47:45 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=noronha.eti.br; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=TnvD4gWTUv LiU6hHTbYCZ9unVM2ZluFbYX0IDEPSfxo=; b=Xz/bv4pH/03hrQ9vhCe6t3meLG 9dU1UxHfv27XV30jiSnTh9TCE+kUY4M1YGaMVaf/9v7ZcbwJ2DebHdlnx/DlWS9s XMWQED6hEI1dHKL6KYIGKMyHjiyy60qt2BEoWXLip7sOdoEmgvfRLbQygj18iVqd zvvQg15qoxkKYP0qs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=TnvD4gWTUvLiU6hHTbYCZ9unVM2ZluFbYX0IDEPSfxo=; b=MWpdtj8s /LvjScZ2Lt66D9QYBzhA4A+FuQiYX4jZ8y2Ke89tRgG0pHJCuL7dAD6Dh9S41ndX sMHxnYvdDU78P+GToHvcu2o8P0f0sQy40TwFZSRnCiuSZ6BlN2pET/vY+7/KEBLx uT6E3UkLO3ZPgIQ//rmY+QWdsaJqzHbr++lAqp37A33U8q40Tl/N6zf/CSUI7DKa HrXl+QMGTSgwGaQikB1tD6gSJ8SkTmOD+7ecINUtg8IV0I/0aXM9DVQyw9VjjyKA QUjkEI1vruGBe01B/T5v1ANVU/Nbwd0K5SCeA7WEE00gxJuf2Jf1uwSEHY+HKOgm mx305z0Pqgh+5Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvhedgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpehguhhsthgr vhhosehnohhrohhnhhgrrdgvthhirdgsrhenucggtffrrghtthgvrhhnpeevhfdvjeelve etiedutdfhleegleffkeffjefgtdeggfekheehledttdffvdelleenucffohhmrghinhep rghpphhlvgdrtghomhenucfkphepvddtuddrkedtrddurdeinecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhushhtrghvohesnhhorhhonhhh rgdrvghtihdrsghr X-ME-Proxy: From: gustavo@noronha.eti.br To: qemu-devel@nongnu.org Subject: [PATCH 2/2] ui/cocoa: add option to swap Option and Command, enable by default Date: Thu, 29 Apr 2021 20:47:05 -0300 Message-Id: <20210429234705.83206-3-gustavo@noronha.eti.br> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210429234705.83206-1-gustavo@noronha.eti.br> References: <20210429234705.83206-1-gustavo@noronha.eti.br> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.26; envelope-from=gustavo@noronha.eti.br; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 29 Apr 2021 20:48:06 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 'Peter Maydell ' , 'Markus Armbruster ' , Gustavo Noronha Silva , 'Gerd Hoffmann ' Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Gustavo Noronha Silva On Mac OS X the Option key maps to Alt and Command to Super/Meta. This chan= ge swaps them around so that Alt is the key closer to the space bar and Meta/S= uper is between Control and Alt, like on non-Mac keyboards. It is a cocoa display option, enabled by default. Signed-off-by: Gustavo Noronha Silva Acked-by: Markus Armbruster --- qapi/ui.json | 7 +++++- qemu-options.hx | 1 + ui/cocoa.m | 66 +++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 63 insertions(+), 11 deletions(-) diff --git a/qapi/ui.json b/qapi/ui.json index 77bc00fd0d..02db684251 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1098,9 +1098,14 @@ # a global grab on key events. (default: off) # See https://support.apple.com/en-in/guide/mac-help/mh3= 2356/mac # +# @swap-option-command: Swaps the Option and Command keys so that their ke= y codes +# match their position on non-Mac keyboards and you = can use +# Meta/Super and Alt where you expect them. (default= : on) +# ## { 'struct' : 'DisplayCocoa', - 'data' : { '*full-grab' : 'bool' } } + 'data' : { '*full-grab' : 'bool', + '*swap-option-command' : 'bool' } } =20 ## # @DisplayType: diff --git a/qemu-options.hx b/qemu-options.hx index a77505241f..d6137eedac 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1785,6 +1785,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_COCOA) "-display cocoa[,full_grab=3Don|off]\n" + " [,swap_option_command=3Don|off]\n" #endif #if defined(CONFIG_OPENGL) "-display egl-headless[,rendernode=3D]\n" diff --git a/ui/cocoa.m b/ui/cocoa.m index f1e4449082..879e568a9d 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -73,6 +73,7 @@ int width; int height; bool full_grab; + bool swap_option_command; } QEMUScreen; =20 static void cocoa_update(DisplayChangeListener *dcl, @@ -327,6 +328,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled; - (BOOL) isMouseGrabbed; - (BOOL) isAbsoluteEnabled; - (BOOL) isFullGrabEnabled; +- (BOOL) isSwapOptionCommandEnabled; - (float) cdx; - (float) cdy; - (QEMUScreen) gscreen; @@ -648,6 +650,13 @@ - (void) setFullGrab:(id)sender to:(BOOL)value screen.full_grab =3D value; } =20 +- (void) setSwapOptionCommand:(id)sender +{ + COCOA_DEBUG("QemuCocoaView: setSwapOptionCommand\n"); + + screen.swap_option_command =3D true; +} + - (void) toggleKey: (int)keycode { qkbd_state_key_event(kbd, keycode, !qkbd_state_key_get(kbd, keycode)); } @@ -797,12 +806,22 @@ - (bool) handleEventLocked:(NSEvent *)event qkbd_state_key_event(kbd, Q_KEY_CODE_CTRL_R, false); } if (!(modifiers & NSEventModifierFlagOption)) { - qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false); - qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false); + if ([self isSwapOptionCommandEnabled]) { + qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false); + qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false); + } else { + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false); + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false); + } } if (!(modifiers & NSEventModifierFlagCommand)) { - qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false); - qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false); + if ([self isSwapOptionCommandEnabled]) { + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT, false); + qkbd_state_key_event(kbd, Q_KEY_CODE_ALT_R, false); + } else { + qkbd_state_key_event(kbd, Q_KEY_CODE_META_L, false); + qkbd_state_key_event(kbd, Q_KEY_CODE_META_R, false); + } } =20 switch ([event type]) { @@ -834,13 +853,21 @@ - (bool) handleEventLocked:(NSEvent *)event =20 case kVK_Option: if (!!(modifiers & NSEventModifierFlagOption)) { - [self toggleKey:Q_KEY_CODE_ALT]; + if ([self isSwapOptionCommandEnabled]) { + [self toggleKey:Q_KEY_CODE_META_L]; + } else { + [self toggleKey:Q_KEY_CODE_ALT]; + } } break; =20 case kVK_RightOption: if (!!(modifiers & NSEventModifierFlagOption)) { - [self toggleKey:Q_KEY_CODE_ALT_R]; + if ([self isSwapOptionCommandEnabled]) { + [self toggleKey:Q_KEY_CODE_META_R]; + } else { + [self toggleKey:Q_KEY_CODE_ALT_R]; + } } break; =20 @@ -848,15 +875,21 @@ - (bool) handleEventLocked:(NSEvent *)event case kVK_Command: if (isMouseGrabbed && !!(modifiers & NSEventModifierFlagCommand)) { - [self toggleKey:Q_KEY_CODE_META_L]; - } + if ([self isSwapOptionCommandEnabled]) { + [self toggleKey:Q_KEY_CODE_ALT]; + } else { + [self toggleKey:Q_KEY_CODE_META_L]; + } } break; =20 case kVK_RightCommand: if (isMouseGrabbed && !!(modifiers & NSEventModifierFlagCommand)) { - [self toggleKey:Q_KEY_CODE_META_R]; - } + if ([self isSwapOptionCommandEnabled]) { + [self toggleKey:Q_KEY_CODE_ALT_R]; + } else { + [self toggleKey:Q_KEY_CODE_META_R]; + } } break; } break; @@ -1085,6 +1118,7 @@ - (void) setAbsoluteEnabled:(BOOL)tIsAbsoluteEnabled { - (BOOL) isMouseGrabbed {return isMouseGrabbed;} - (BOOL) isAbsoluteEnabled {return isAbsoluteEnabled;} - (BOOL) isFullGrabEnabled {return screen.full_grab;} +- (BOOL) isSwapOptionCommandEnabled {return screen.swap_option_command;} - (float) cdx {return cdx;} - (float) cdy {return cdy;} - (QEMUScreen) gscreen {return screen;} @@ -1271,6 +1305,13 @@ - (void) setFullGrab:(id)sender to:(BOOL)value [cocoaView setFullGrab:sender to:value]; } =20 +- (void) setSwapOptionCommand:(id)sender +{ + COCOA_DEBUG("QemuCocoaAppController: setSwapOptionCommand\n"); + + [cocoaView setSwapOptionCommand:sender]; +} + /* Tries to find then open the specified filename */ - (void) openDocumentation: (NSString *) filename { @@ -1953,6 +1994,11 @@ static void cocoa_display_init(DisplayState *ds, Dis= playOptions *opts) [[controller delegate] setFullGrab: nil to:opts->u.cocoa.full_= grab]; }); } + if (!opts->u.cocoa.has_swap_option_command || opts->u.cocoa.swap_optio= n_command) { + dispatch_async(dispatch_get_main_queue(), ^{ + [[controller delegate] setSwapOptionCommand: nil]; + }); + } if (opts->has_show_cursor && opts->show_cursor) { cursor_hide =3D 0; }; --=20 2.24.3 (Apple Git-128)