Re: [hatari-devel] Enhanced keymap support

[Yves Le Berre <yves.le_berre@xxxxxxxxx>]

Hi Eero,

Your earlier patch series was :

0001-Keymap_LoadRemapFile-refactor-rewrite.patch
0002-Switch-to-using-KeyMapping-struct-and-KeysDown-array.patch
0003-Clear-KeysDown-key-mapping-state-on-reset.patch
0004-Add-defines-for-some-of-the-ST-scancode-values.patch
0005-Support-for-specifying-ST-key-modifiers-in-the-mappi.patch
0006-Add-ALT-XXX-sequence-insert-support-for-keymaps.patch
0007-Add-trace-output-for-ST-key-modifiers.patch
0008-Support-for-specifying-PC-SDL-key-modifiers-in-the-m.patch
0009-Keymap-accept-also-0x-prefixed-hex-values-for-scanco.patch
0010-Fix-improve-keymap-file-SDL-key-name-parsing.patch
0011-Fix-ALT_XXX-scancode-handling.patch

I added :

0012-Fix-Single-Mod-Host-Parsing.patch
     to authorize several Host (PC) modifiers together.
0013-Remap-mod.patch
     to match multiple Host (PC) modifiers as explained in keymap_fr_pc.cfg
     posted on hatari-devel list on october 5 2022.
0014-Add-NO-XXX-mod.patch
     to add NO_XXX Guest (ST) modifiers and use them.

All these patches have been renumbered (+1 added to index) giving 0002-xxx,
0003-xxx,...,0015-xxx and added to file enhanced_keymap_patches.tar.gz
posted on hatari-devel list on october 5 2022 with 2 more patches :

0001-Master-changes-before-applying-0002-to-0015.patch
     to add screen.h include in keymap.c as this include was deleted
     (Thomas on october 1 2022) and i did not want than patches
     0002-xxx, 0003-xxx,..,0015-xxx report bad offset when applied to 
master.
0016-Master-changes-after-applying-0002-to-0015.patch
     to delete screen.h and change strlcpy added in your earlier patch
     series to Str_Copy (change initiated by Thomas on october 1 2022)


Then all the patches may be applied to master in order 0001-xxx to 0016-xxx.

Yves

Le 06/10/2022 à 10:52, Eero Tamminen a écrit :
> Hi Yves,
>
> Are there any other changes on top of my earlier patch series, than:
> * rebasing it on latest Hatari sources
> * updated french keymap file
> ?
>
>
>     - Eero
>
> On 5.10.2022 17.27, Yves Le Berre wrote:
> > Hello,
> >
> > I apologize for the big patch 'keymap.c.patch'. To return to enhanced 
> > keymap patches series :
> >
> > - I Added a first patch (0001) adding screen.h include in keymap.c
> >    to eliminate offset lines in following patches,
> > - Then, I added the ordered patches in the series
> >    (renumbered from 0001 - 0014 to 0002 - 0015),
> > - Then, I added a patch (0016) deleting screen.h include in keymap.c
> >    (and incidentally change strlcpy inserted in patches 0006 and 0009 
> > to Str_Copy).
> >
> > In attachment, you'll find the files :
> >
> > 1) enhanced_keymap_patches.tar.gz which contains the patches to apply 
> > to master :
> >
> > 0001-Master-changes-before-applying-0002-to-0015.patch
> > 0002-Keymap_LoadRemapFile-refactor-rewrite.patch
> > 0003-Switch-to-using-KeyMapping-struct-and-KeysDown-array.patch
> > 0004-Clear-KeysDown-key-mapping-state-on-reset.patch
> > 0005-Add-defines-for-some-of-the-ST-scancode-values.patch
> > 0006-Support-for-specifying-ST-key-modifiers-in-the-mappi.patch
> > 0007-Add-ALT-XXX-sequence-insert-support-for-keymaps.patch
> > 0008-Add-trace-output-for-ST-key-modifiers.patch
> > 0009-Support-for-specifying-PC-SDL-key-modifiers-in-the-m.patch
> > 0010-Keymap-accept-also-0x-prefixed-hex-values-for-scanco.patch
> > 0011-Fix-improve-keymap-file-SDL-key-name-parsing.patch
> > 0012-Fix-ALT_XXX-scancode-handling.patch
> > 0013-Fix-Single-Mod-Host-Parsing.patch
> > 0014-Remap-mod.patch
> > 0015-Add-NO-XXX-mod.patch
> > 0016-Master-changes-after-applying-0002-to-0015.patch
> >
> > 2) keymap_fr_pc.cfg which contains the mapping.
> >
> > Yves
> >
> > Le 03/10/2022 à 17:53, Thomas Huth a écrit :
> > > Am Sun, 2 Oct 2022 15:57:18 +0200
> > > schrieb Yves Le Berre <yves.le_berre@xxxxxxxxx>:
> > >
> > > > Hello,
> > > >
> > > > Due to Thomas recent changes :
> > > >
> > > > - Reduce our dependencies to screen.h,
> > > > - Replace strlcpy() with a better implementation.
> > > >
> > > > I adapted enhanced_keymap patches by rebasing and grouping the patches
> > > > by filenames rather by added/modified function.
> > > Please don't squash patches together in such a big patch. That makes 
> > > the
> > > changes very hard to review.
> > >
> > > Eero, you once started looking into this problem, do you still plan to
> > > take care of this? Or don't you have time for this anymore?
> > >
> > >   Thomas