r44510 | compyx | 2023-09-13 12:30:25 +0000 (Wed, 13 Sep 2023) | 2 lines
Fix -Wshorten-64-to-32 warning
------------------------------------------------------------------------
r44509 | compyx | 2023-09-13 12:21:29 +0000 (Wed, 13 Sep 2023) | 25 lines
Merge branch compyx/hotkeys-conditionals into trunk
* Further generalize the hotkeys system and its files with support for
conditionals: allow mapping hotkeys based on UI, OS and machine.
All gtk3, sdl2 and MacOS-specific .vhk files are gone, only 11 .vhk files
remain vs 47 before this commit. The hotkeys files now reside in a `hotkeys`
directory in the VICE data directory (e.g. `/usr/share/vice/hotkeys/`.
* Clearly define priority of hotkeys source: `-hotkeyfile` command line option
(and thus the "HotkeyFile" resource) has the highest priority, followed by
a custom hotkeys file "$UI-hotkeys-$MACHINE.vhk" in the user's VICE
configuration directory. In the absense of both, or when the `-default`
command line option is used, the hotkeys provided by VICE are used.
* Simplify UI and specify the source of the currently used hotkeys (Gtk3):
- The current source of the hotkeys is shown: path and a short description.
- (Re)load simply reloads the last loaded hotkeys.
- Any reference to "exporting" hotkeys is changed to "saving".
- Saving hotkeys (using "Save") without specifying a path results in hotkeys
being written to the user's VICE configuration directory as
"$UI-hotkeys-$MACHINE.vhk": no saving of settings is required, the hotkeys
are loaded from the user's VICE configuration directory on subsequent
emulator runs.
Note: make sure to run `make install` to install the new hotkeys files in their
proper location and delete any old .vhk files in `~/.config/vice/`.
------------------------------------------------------------------------
r44508 | pottendo | 2023-09-13 09:12:06 +0000 (Wed, 13 Sep 2023) | 2 lines
truncate too long replies to avoid crash.
------------------------------------------------------------------------
r44490 | compyx | 2023-09-06 11:07:50 +0000 (Wed, 06 Sep 2023) | 5 lines
Buildsystem: update MacOS make-bindist to copy *.vhk files for SDL
Should fix bug #1942, again ignore this change on merging the branch
`compyx/hotkeys-conditionals` back into trunk.
------------------------------------------------------------------------
r44489 | compyx | 2023-09-06 10:56:18 +0000 (Wed, 06 Sep 2023) | 6 lines
Buildsystem: create common/ dir and copy SDL .vhk files into it
Should fix bug #1942. Note to self: this will lead to a merge conflict with
the `compyx/hotkeys-conditionals` branch: ignore this change and take the
version in the branch when merging branch into trunk in the near future.
------------------------------------------------------------------------
