[gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/files/

[Sam James]

commit:     0bf7b7a0e6a7ec274beadfea9b10a8243f942276
Author:     Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Sat Jan 15 23:26:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23819
Signed-off-by: Sam James <sam <AT> 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 <COORDINATE>\n");
+   printf("       -completeregionlow <COORDINATE>\n");
+   printf("       -struts\n");
++  printf("       -keymap <FROM-KEYSYM> <TO-KEYSYM>\n");
+ #ifdef WIN_2_X
+   printf("       -offset [-]<pixel offset of \"to\">\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