From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 923E0158087 for ; Sun, 16 Jan 2022 01:34:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 040A0E0823; Sun, 16 Jan 2022 01:34:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D1192BC017 for ; Sun, 16 Jan 2022 01:34:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C38B342F88 for ; Sun, 16 Jan 2022 01:34:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FD2E2A0 for ; Sun, 16 Jan 2022 01:34:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642296814.0bf7b7a0e6a7ec274beadfea9b10a8243f942276.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/x2x/files/x2x_1.30-10-keymap.patch X-VCS-Directories: x11-misc/x2x/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0bf7b7a0e6a7ec274beadfea9b10a8243f942276 X-VCS-Branch: master Date: Sun, 16 Jan 2022 01:34:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31005f59-3bbb-4b1c-b0a4-946b59e017cc X-Archives-Hash: 623ea638b64777e561a95349aaee1d80 commit: 0bf7b7a0e6a7ec274beadfea9b10a8243f942276 Author: Philipp Rösner protonmail com> AuthorDate: Sat Jan 15 23:26:16 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 16 01:33:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf7b7a0 x11-misc/x2x: added documentation for keymap option The patch that implemented custom keysym bindings lacked documentation in the usage output and in the man page, so we added this accordingly. Closes: https://bugs.gentoo.org/484482 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Philipp Roesner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/23819 Signed-off-by: Sam James gentoo.org> x11-misc/x2x/files/x2x_1.30-10-keymap.patch | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/x11-misc/x2x/files/x2x_1.30-10-keymap.patch b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch index f1d7f543fcf5..b9bb1f9b9623 100644 --- a/x11-misc/x2x/files/x2x_1.30-10-keymap.patch +++ b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch @@ -54,6 +54,14 @@ } else if (!strcasecmp(argv[arg], "-buttonmap")) { if (++arg >= argc) Usage(); button = atoi(argv[arg]); +@@ -842,6 +842,7 @@ static void Usage() + printf(" -completeregionup \n"); + printf(" -completeregionlow \n"); + printf(" -struts\n"); ++ printf(" -keymap \n"); + #ifdef WIN_2_X + printf(" -offset [-]\n"); + printf("WIN_2_X build allows Windows or X as -from display\n"); @@ -2200,6 +2224,7 @@ XKeyEvent *pEv; PSHADOW pShadow; Bool bPress; @@ -78,3 +86,30 @@ /* If CapsLock is on, we need to do some funny business to make sure the */ /* "to" display does the right thing */ if(doCapsLkHack && (pEv->state & 0x2)) + +--- a./x2x.1 ++++ b./x2x.1 +@@ -309,6 +309,12 @@ Describes uppermost coordinate of complete rectangle region in from-display. + .B \-completeregionlow + .IP + Describes lowermost coordinate of complete rectangle region in from-display. ++.TP ++.B \-keymap \fIfrom-keysym\fP \fIto-keysym\fP ++.IP ++Translates the \fIfrom-keysym\fP keysym of the first X to \fIto-keysym\fP of the second X. ++See X11/keysymdef.h for available keysyms. ++Alternatively you can use setxkbmap, as described in the BUGS section. + .SH EXAMPLES + Calling the system whose keyboard is to be used "primary" and the + other system "secondary", you need to specify either \-from +@@ -329,6 +333,10 @@ secondary $ ssh \-X primary x2x \-from :0 \-west + run directly indirectly on primary: + .IP + primary $ ssh \-A secondary env DISPLAY=:0.0 ssh \-X primary x2x \-from :0 \-east ++.TP ++set a custom keymap binding: ++.IP ++x2x -keymap ISO_Level3_Shift Mode_switch + + .RE + If your primary display is configured with several monitors having different