Re: [hatari-devel] Enhanced keymap support

[Eero Tamminen <oak@xxxxxxxxxxxxxx>]

Hi,

On 15.10.2024 12.52, Yves Le Berre wrote:
> Since modifications in keymap.c made by Thomas on 2024-10-12 18:33:21 (GMT)
> (commit a22de5759741eaf8c6bf95ff7a0e128d516a11e5), I cannot find a way to
> apply enhanced keymap patch series as these modifications are slightly 
> different from
> those in 0001-Keymap_LoadRemapFile-refactor-rewrite.patch and impact 
> other in series.
>
> I could revert Thomas patch before applying enhanced keymap patch series 
> but I'm not
> sure if any other changes are planned on keymap.c in a near future and 
> I'm not familiar
> with git.

Attached is my original series rebased on top of the current master HEAD.

strlcpy() change is included to them (your patch was broken as 
Str_Copy() returns negative error code when copy does not fit).

While the changes in your 0012-0014 patches look useful, I did not apply 
them yet because:
* They had some indentation problems
* I need to check them a bit more carefully before using them [1]
* They were not in "git format-patch <base commit>" format so that one 
could just apply them with "git am 00*.patch" :-)

[1] For example, isn't this:
-------------------------------------
+            if (((matchmod & KMOD_SHIFT) == KMOD_SHIFT) && (mods & 
KMOD_SHIFT))
+                matchmod = (matchmod & (~KMOD_SHIFT)) | (mods & 
KMOD_SHIFT);
+            if (((matchmod & KMOD_CTRL) == KMOD_CTRL) && (mods & 
KMOD_CTRL))
+                matchmod = (matchmod & (~KMOD_CTRL)) | (mods & KMOD_CTRL);
+            if (((matchmod & KMOD_ALT) == KMOD_ALT) && (mods & KMOD_ALT))
+                matchmod = (matchmod & (~KMOD_ALT)) | (mods & KMOD_ALT);
+            if (((matchmod & KMOD_GUI) == KMOD_GUI) && (mods & KMOD_GUI))
+                matchmod = (matchmod & (~KMOD_GUI)) | (mods & KMOD_GUI);
-------------------------------------

Basically identical to "matchmod = matchmod;"?


> Could you tell if enhanced keymap patch series should be abandoned ?

I think it's still useful.

Changes Brad and Thomas are doing cannot map host key presses to 
multiple ST key presses (my changes), or release Shift when needed (your 
addition), so I think it's still very much needed if one wants to map 
all relevant keyboard keys to emulated Atari.

(The issues remaining with the code are it hitting occasionally some 
asserts when invoking Hatari GUI or shortcuts, and some doubts about 
using SDL scancodes for indexing.)


	- Eero

Attachment: multi-key-mapping-update.tar.gz
Description: application/gzip