BUG: cannot enable iso_layout with apple keyboard

Commit Message

Julian Weigt July 8, 2021, 2:19 p.m. UTC

Hi,

I have an apple keyboard model A1644 EMC 2815 with Finnish/Swedish ISO layout. When I connect it via cable it works fine. But when I connect it via bluetooth, then the buttons >/< and §/° are swapped. It seems to make no difference if I set iso_layout to 0 or to 1. I checked and it turns out that hid->country below equals 0, and removing the check


makes the buttons act correctly. Please let me know how I can help fixing this.

Best regards,
Julian Weigt

Comments

José Expósito July 14, 2021, 7:57 a.m. UTC | #1

> Hi,
> 
> I have an apple keyboard model A1644 EMC 2815 with Finnish/Swedish ISO layout. When I connect it via 
> cable it works fine. But when I connect it via bluetooth, then the buttons >/< and §/° are swapped.
> It seems to make no difference if I set iso_layout to 0 or to 1. I checked and it turns out that
> hid->country below equals 0, and removing the check
> 
> diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
> index 6b8f0d004d34..8a764ce4e518 100644
> --- a/drivers/hid/hid-apple.c
> +++ b/drivers/hid/hid-apple.c
> @@ -267,13 +267,11 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
>         }
> 
>         if (iso_layout) {
> -               if (hid->country == HID_COUNTRY_INTERNATIONAL_ISO) {
>                         trans = apple_find_translation(apple_iso_keyboard, usage->code);
>                         if (trans) {
>                                 input_event(input, usage->type, trans->to, value);
>                                 return 1;
>                         }
> -               }
>         }
> 
>         if (swap_opt_cmd) {
> 
> makes the buttons act correctly. Please let me know how I can help fixing this.
> 
> Best regards,
> Julian Weigt

Hi Julian,

I can confirm I can reproduce the issue with a Spanish/Spain keyboard.

The problem seems to be that the field "bCountryCode" is not present when the keyboard is connected over bluetooth.

CCing Alex Henrie, hopefully he can add useful information about the issue.

Best wishes,
Jose

Alex Henrie July 27, 2021, 9:58 p.m. UTC | #2

On Wed, Jul 14, 2021 at 1:57 AM José Expósito <[e-mail]> wrote:
>
> > Hi,
> >
> > I have an apple keyboard model A1644 EMC 2815 with Finnish/Swedish ISO layout. When I connect it via
> > cable it works fine. But when I connect it via bluetooth, then the buttons >/< and §/° are swapped.
> > It seems to make no difference if I set iso_layout to 0 or to 1. I checked and it turns out that
> > hid->country below equals 0, and removing the check
> >
> > diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
> > index 6b8f0d004d34..8a764ce4e518 100644
> > --- a/drivers/hid/hid-apple.c
> > +++ b/drivers/hid/hid-apple.c
> > @@ -267,13 +267,11 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
> >         }
> >
> >         if (iso_layout) {
> > -               if (hid->country == HID_COUNTRY_INTERNATIONAL_ISO) {
> >                         trans = apple_find_translation(apple_iso_keyboard, usage->code);
> >                         if (trans) {
> >                                 input_event(input, usage->type, trans->to, value);
> >                                 return 1;
> >                         }
> > -               }
> >         }
> >
> >         if (swap_opt_cmd) {
> >
> > makes the buttons act correctly. Please let me know how I can help fixing this.
> >
> > Best regards,
> > Julian Weigt
>
> Hi Julian,
>
> I can confirm I can reproduce the issue with a Spanish/Spain keyboard.
>
> The problem seems to be that the field "bCountryCode" is not present when the keyboard is connected over bluetooth.
>
> CCing Alex Henrie, hopefully he can add useful information about the issue.
>
> Best wishes,
> Jose

Thanks Julian and José for bringing this to my attention. I also found
an Ubuntu bug report [1] which suggests that some of Apple's USB ISO
keyboards do not set the country code either. I have ordered a variety
of Apple keyboards from eBay for testing and I will send a fix as soon
as I am able.

-Alex

[1] https://bugs.launchpad.net/ubuntu/+source/xkeyboard-config/+bug/1886215

Patch

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 6b8f0d004d34..8a764ce4e518 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -267,13 +267,11 @@  static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
        }

        if (iso_layout) {
-               if (hid->country == HID_COUNTRY_INTERNATIONAL_ISO) {
                        trans = apple_find_translation(apple_iso_keyboard, usage->code);
                        if (trans) {
                                input_event(input, usage->type, trans->to, value);
                                return 1;
                        }
-               }
        }

        if (swap_opt_cmd) {