branch version-1.3.0 updated: gnu: kmscon: Fix layout setup.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch version-1.3.0
in repository guix.

The following commit(s) were added to refs/heads/version-1.3.0 by this push:
     new 68110f7  gnu: kmscon: Fix layout setup.
68110f7 is described below

commit 68110f72880a5b57fad34a7868f1f0722d52842a
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Thu Apr 29 11:11:32 2021 +0200

    gnu: kmscon: Fix layout setup.
    
    Kmscon may discover multiple inputs, corresponding to multiple devices. This
    means that the uxkb_dev_keymap_update function may be called multiple times,
    and the FIFO is registered on each input poll loop.
    
    When a new layout is written on the FIFO by the installer, the first input
    picking up the message, will apply the new layout. However, that input may 
not
    be the input that the user is currently using.
    
    To fix it, register the FIFO on the first input poll loop, but apply the new
    layout on all the inputs in the uxkb_keymap_update_handler function.
    
    * gnu/packages/patches/kmscon-runtime-keymap-switch.patch
    (uxkb_keymap_update_handler): Apply the new layout to all the inputs.
    (input_new_dev): Register the FIFO fd only on the first input poll loop.
---
 .../patches/kmscon-runtime-keymap-switch.patch     | 31 +++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/patches/kmscon-runtime-keymap-switch.patch 
b/gnu/packages/patches/kmscon-runtime-keymap-switch.patch
index 480aaec..6692e76 100644
--- a/gnu/packages/patches/kmscon-runtime-keymap-switch.patch
+++ b/gnu/packages/patches/kmscon-runtime-keymap-switch.patch
@@ -79,11 +79,13 @@ diff --git a/src/uterm_input.c b/src/uterm_input.c
 index 6fcbc4b..990a09d 100644
 --- a/src/uterm_input.c
 +++ b/src/uterm_input.c
-@@ -178,6 +178,8 @@ static void input_new_dev(struct uterm_input *input,
+@@ -178,6 +178,10 @@ static void input_new_dev(struct uterm_input *input,
        if (ret)
                goto err_rcodepoints;
  
-+      uxkb_dev_keymap_update(dev);
++       /* Add the FIFO fd only to the first input poll loop. */
++       if (shl_dlist_empty(&input->devices))
++              uxkb_dev_keymap_update(dev);
 +
        if (input->awake > 0) {
                ret = input_wake_up_dev(dev);
@@ -132,7 +134,7 @@ index 925c755..8fe08f8 100644
  #include <xkbcommon/xkbcommon.h>
  #include "shl_hook.h"
  #include "shl_llog.h"
-@@ -178,6 +181,95 @@ static void timer_event(struct ev_timer *timer, uint64_t 
num, void *data)
+@@ -178,6 +181,106 @@ static void timer_event(struct ev_timer *timer, uint64_t 
num, void *data)
        shl_hook_call(dev->input->hook, dev->input, &dev->repeat_event);
  }
  
@@ -171,7 +173,23 @@ index 925c755..8fe08f8 100644
 +
 +      llog_info(dev->input, "HANDLER CALLED %s|%s|%s\n",
 +                model, layout, variant);
-+      uxkb_desc_init(dev->input, model, layout, variant, options, NULL);
++
++      struct uterm_input *input = dev->input;
++      struct shl_dlist *iter;
++
++       /* Apply the new layout to all the inputs. */
++       shl_dlist_for_each(iter, &input->devices) {
++              struct uterm_input_dev *dev;
++              dev = shl_dlist_entry(iter,
++                                      struct uterm_input_dev,
++                                      list);
++              uxkb_desc_init(dev->input, model, layout, variant, options, 
NULL);
++               dev->state = xkb_state_new(dev->input->keymap);
++               if (!dev->state) {
++                      llog_error(dev->input, "cannot create XKB state");
++                              return;
++                }
++       }
 +
 +      /* The client will now close the FIFO.  Close it too, and re-create a
 +       * FIFO so other clients can eventually connect.  */
@@ -180,11 +198,6 @@ index 925c755..8fe08f8 100644
 +      dev->rupdate_fd = -1;
 +      uxkb_dev_keymap_update(dev);
 +
-+      dev->state = xkb_state_new(dev->input->keymap);
-+      if (!dev->state) {
-+              llog_error(dev->input, "cannot create XKB state");
-+              return;
-+      }
 +}
 +
 +int uxkb_dev_keymap_update(struct uterm_input_dev *dev)