Keymaps: Difference between revisions

From vice-emu
Jump to navigation Jump to search
Line 138: Line 138:
'''TODO:''' fix menus in following ports: amiga, beos, dos, os/2, osx (meaning minimal update to restore functionality)
'''TODO:''' fix menus in following ports: amiga, beos, dos, os/2, osx (meaning minimal update to restore functionality)


'''TODO:''' update menus in following ports: amiga, beos, dos, os/2, osx, win32, SDL (meaning full featured, as described above)
'''TODO:''' update menus in following ports: amiga, beos, dos, os/2, osx, win32 (meaning full featured, as described above)


=== rename keymaps ===
=== rename keymaps ===

Revision as of 18:16, 2 May 2015

Reason for this page: handling auf keymaps was a bit messy in some places in the past, unnecessary complex to maintain (eg hardcoded filenames in archdep code dont make updating a lot easier). It has been reworked to handle everything at one central place, with a minimum set of resources which are valid for all emulators. This will make both adding new keyboard types and updating the respective ports easier in the future. At the same time a somewhat more sane default behaviour that always works "as expected" automatically will be achived, based on the general assumption that the casual user never even wants to be bothered with setting up keymaps at all :)

considerations

  • host (pc) keyboards have a "machine" and "locale" type. the "machine" type is defined by the port (windows, x11, sdl etc) and the "locale" type by what type of keyboard the user has connected (we currently have different maps for US, DE, UK, FI, NO, DA etc... keyboards)
  • emulated keyboards have a "positional" and a "symbolic" type. the former referring to the actual hardware (keyboard matrix and key positions) and the later referring to what is actually written on the keycaps. (for example the localized c128 keyboards would all have the same "positional" type, but different "symbolic" types. fortunately the total combinations of these is small, so we can define one type per such combination.
  • we support two fundamentally different type of keyboard mappings, "symbolic" and "positional".

implementation

resources

  • "KeymapIndex" - (integer) selects active keymap (default:0) (0: symbolic, 1: positional, 2: user defined symbolic, 3: user defined positional)
  • "KeymapSymFile" - (string) name of the keymap to use for symbolic mapping (default:automatically set, see below)
  • "KeymapPosFile" - (string) name of the keymap to use for positional mapping (default:automatically set, see below)
  • "KeymapUserSymFile" - (string) name of user defined symbolic keymap (default: "<port>_sym.vkm")
  • "KeymapUserPosFile" - (string) name of user defined positional keymap (default: "<port>_pos.vkm")
  • "KeyboardType" - (Integer) emulated keyboard type. (default:0)
    • C128 0: International, 1: Finnish,French, 3: German, 4: Italian, 5: Norwegian, 6: Swedish (not used by x128 yet)
    • PET: (pet-resources.h) 0 "buus" 1: "buuk" 2: "bude" 3: "bujp" 4: "grus"
    • others: always 0
This resource will get updated when the machine model changes, and can be individually updated in the user interface.

NOTE: more info on local keyboard variants wanted, what about CBM2, C64... some VIC20 info here

  • "KeyboardMapping" - (integer) host keyboard layout type (default:0)
    • 0 American (us) suffix: ""
    • 1 British "uk"
    • 2 German "de"
    • 3 Danish "da"
    • 4 Norwegian "no"
    • 5 Finnish "fi"
    • 6 Italian "it"
this list may be expanded as needed

NOTE: suggestions for more languages that we should add as a default here wanted...

command line options

  • "-keymap" - sets "KeymapIndex" (and loads keymap indirectly)
  • "-keyboardtype" - sets "KeyboardType" (and loads keymap indirectly)
  • "-keyboardmapping" - sets "KeyboardMapping" (and loads keymap indirectly)
  • "-symkeymap" sets "KeymapUserSymFile" directly
  • "-poskeymap" sets "KeymapUserPosFile" directly

defaults

  • when the emulator starts and finds "KeymapSymFile" and "KeymapPosFile" empty,
    • an archdep function is called which returns the type of keyboard connected -> src/arch/<port>/archdep*: kbd_arch_get_host_mapping()
    • "KeyboardMapping" is initialized with that value, and the resulting keymap loaded (done)

The goal is to automatically configure and load the right keyboard map for a given combination of host OS/language/layout and emulated system.

loading the keymap

a central function which is called if any of "KeymapIndex", "KeyboardType", "KeyboardMapping" changed handles loading the new keymap. -> keyboard.c:switch_keymap_file()

  • if "KeymapIndex" is not 0 or 1, then load the respective user keymap and skip any further automatic actions
  • else try loading a keymap with the filename constructed as below.
  • if that fails, find a proper fallback:
    • if a positional map is not available, not much can be done other than switching to symbolic mapping instead, so do that...
    • remove the <mapping> part from the filename, ie try to load <port>_<type>_sym.vkm (for ports that have more than one emulated keyboard type, this MUST exist)
    • as last resort, always use <port>_sym.vkm (which MUST exist)
  • generally after loading update "KeymapIndex", "KeyboardType", "KeyboardMapping" and "KeymapSymFile"/"KeymapPosFile" to reflect the keymap that was actually loaded

constructing the filename

-> keyboard.c:try_set_keymap_file()

generally the filename of a keymap will be constructed according to this scheme:

<port>_<type>_<idx>_<mapping>.vkm

where:

  • <port> is a string constant defined in archdep code (eg "x11", "sdl", "win" etc) -> KBD_PORT_PREFIX in src/arch/<port>/kbd.h
  • <type> is a string returned by a machine specific function. this function should return NULL if the type string would be empty (the machine has no keyboard types) else eg "bkuk", "gkuk", "bkde" etc. (the returned string should be no more than 4 characters) -> machine_get_keyboard_type_name()
  • <idx> is a string derived from "KeymapIndex", where 0 is "sym" and 1 is "pos"
  • <mapping> is a string derived from "KeyboardMapping", where 0 is an empty string and 1 is "de" (... 2: "fi" 3: "se" etc if needed)

(this should in many cases not even require renaming any .vkm files)

  • a solution must be found for targets that only support 8.3 filenames, sth like
    • if "<type><idx><mapping>" is 4 characters (or less), use <port>_<type><idx><mapping>.vkm
      • else:
        • get short <port> string from constant defined in archdep code (max 2 characters, eg "md" for msdos)
        • get short <type> string from a machine specific function. this function should return an empty string if "KeyboardType" is 0 (else eg "buk", "guk", "bde" etc) (the returned string should be no more than 3 characters)
        • <idx> is a string derived from "KeymapIndex", where 0 is "s" and 1 is "p"
        • use <port><type><idx><mapping>.vkm

TODO: fix 8.3 filename generation (keyboard.c:try_set_keymap_file()), needed for DOS port


migrating the code

change

  • option -symkeymap <name> - set "KeymapUserSymFile" to <name> (done)
  • option -poskeymap <name> - set "KeymapUserPosFile" to <name> (done)

add

  • option -keyboardtype - set "KeyboardType" (machine specific) (done)
  • option -keyboardmapping - set "KeyboardMapping" (host specific) (done)

TODO: generate description for command line options at runtime (query available options in a similar way as the UIs)

  • archdep function "int kbd_arch_get_host_mapping(void)" (query host keyboard mapping and return one of the KBD_MAPPING_xx constants defined in keyboard.h. If for whatever reason determining the layout is not possibly, always return KBD_MAPPING_US)

TODO: update following ports: amiga, beos, dos, os/2, osx

TODO: update arch/sdl/archdep_<port> for following ports: amiga, beos, dos, os/2

update menus

after the change, all user interfaces should have the following options:

  • "set keymapping" - select between "symbolic", "positional", "symbolic (user)", "positional (user) and change "KeymapIndex" accordingly (see keyboard.h)
  • "set keyboard layout" - available keyboard layouts can be queried by using keyboard.h:keyboard_get_num_mappings() and keyboard_get_info_list(). generate menu dynamically and set up "KeyboardMapping" accordingly (see keyboard.h)
  • "define user-defined symbolic keymap" - set up "KeymapUserSymFile"
  • "define user-defined positional keymap" - set up "KeymapUserPosFile"

additionally for machines which have more than one type of keyboard (this should go into model selection somewhere):

  • "set keyboard type" - available keyboard types can be queried using machine.h:machine_get_num_keyboard_types() and machine_get_keyboard_info_list(). generate menu dynamically set up "KeyboardType" accordingly. (this is currently only used by PET but may be used by others (C128, or even C64) later.)

To clearify: "KeymapSymFile" and "KeymapPosFile" should NOT get modified directly by the menu anymore, this is replaced by "KeymapIndex", "KeyboardMapping" and "KeyboardType" respectivly.

TODO: fix menus in following ports: amiga, beos, dos, os/2, osx (meaning minimal update to restore functionality)

TODO: update menus in following ports: amiga, beos, dos, os/2, osx, win32 (meaning full featured, as described above)

rename keymaps

all keymaps should get renamed according to the above mentioned naming scheme. make sure that <port>_sym.vkm exists, and xxx_us.vkm is renamed to xxx.vkm (us is the default)

TODO: fix names of keymaps for following ports: beos, dos, os/2

remove

  • resources: KeymapSymDeFile, KeymapBusinessUKSymFile, KeymapBusinessUKPosFile, KeymapGraphicsSymFile, KeymapGraphicsPosFile, KeymapBusinessDESymFile, KeymapBusinessDEPosFile (done)
  • options: -symdekeymap, -buksymkeymap, -bukposkeymap, -grsymkeymap, -grposkeymap, -bdesymkeymap, -bdeposkeymap (done)
  • KBD_xxx constants in kbd.h

TODO: fix/update following ports: beos, os/2

NON COMMON_KBD

All of the above (and perhaps more) still needs to be fixed in ports not using COMMON_KBD, namely BEOS and OS/2. While doing it the keyboard handling should perhaps get rewritten in a way that the above naming scheme, resource usage etc matches, and as much common functions from keyboard.h are used as possible (to avoid code duplication).

TODO: fix/update following ports: beos, os/2

misc

  • in data/VIC20 there is win_sym.vkm and also win_sym_US.vkm - why is that? what is what? these should be renamed accordingly and perhaps one of the two removed
  • data/C64/win_pos.vkm needs to be fixed for us layout
  • perhaps not strictly related: the UI language of the win32 port should also get selected automatically from system language/locale (there is even -commented out- code for this in src/arch/win32/intl.c - but enabling it makes vice crash at startup)

TODO: fix/update following ports: win32

  • more keymaps should use !INCLUDE - eg probably all maps for C64DTV and SCPU64 can be blank files that simply include the respective C64 maps. also non US maps could include the US maps and then add/patch the few keys that are different. that way things should get more consistent and easier to maintain.
  • the virtual keyboard handling of the SDL port must be updated/fixed to support all PET keyboards