caribou/trunk/3.patch

   1 From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001
   2 From: Michael Webster <miketwebster@gmail.com>
   3 Date: Tue, 12 Jan 2021 18:01:47 +0000
   4 Subject: [PATCH] xadapter.vala: Remove XkbKeyTypesMask and fields from
   5  XKbChangeMap call.
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This was originally a workaround for xFree86 4.3 - see:
  11 https://bugzilla.gnome.org/show_bug.cgi?id=673547
  12
  13 As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this
  14 causes a BadLength error when attempting to use shifted characters.
  15
  16 Ref:
  17 https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server
  18 ---
  19  libcaribou/xadapter.vala | 9 ++-------
  20  1 file changed, 2 insertions(+), 7 deletions(-)
  21
  22 diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala
  23 index 22858b7..1da5a78 100644
  24 --- a/libcaribou/xadapter.vala
  25 +++ b/libcaribou/xadapter.vala
  26 @@ -195,15 +195,10 @@ namespace Caribou {
  27
  28              Xkb.MapChanges changes = Xkb.MapChanges ();
  29
  30 -            // We don't touch key types here but include the
  31 -            // information in XkbSetMap request to the server, because
  32 -            // some X servers need the information to check the sanity
  33 -            // of the keysyms change.
  34 -            changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask);
  35 +            changes.changed = (ushort) Xkb.KeySymsMask;
  36              changes.first_key_sym = (char) this.reserved_keycode;
  37              changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width;
  38 -            changes.first_type = 0;
  39 -            changes.num_types = this.xkbdesc.map.num_types;
  40 +
  41              Xkb.change_map (this.xdisplay, this.xkbdesc, changes);
  42
  43              this.xdisplay.flush ();
  44 --
  45 GitLab
  46