Dominik wrote:

New revision of the patch. I separated the code into a new file osk_gui.cpp. I also added a couple of strings for the keyboard window caption.

A note concerning keyboard layouts: I strongly suggest that several keyboard layouts should be included in OpenTTD when this patch goes live. The majority of the player-base doesn't speak English as their native language and they will want a keyboard layout that suits their language (just like with town names and currencies).
From a design-perspective it is probably not the best thing to tie the keyboard to a language. But the language maintainers are probably the best people to decide what special characters people playing in that specific language will need. It's the same with most operating systems: Depending on your system language a keyboard layout is chosen.

Attachments

• Unnamed, 28th Jan 1950.png (52.39 KiB)
• osk2.diff (43.63 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3713

Rubidium wrote:

Could you add a patch (diff + changed pcx file) for /branches/ottd_grf so we can keep that up-to-date and generate the grf from there?

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3747

Dominik wrote:

I didn't even know that branch existed. Found it now. :) Where should I put the new sprites? In openttdgui.pcx, chars.pcx or in a new file osk.pcx? I'd say openttdgui.

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3748

yorick wrote:

I guess you should put them at openttdgui.pcx

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3749

Dominik wrote:

Ok, here's the diff and a modified pcx. I hope it's correct, because I couldn't get the makefile to work on my system.

Attachments

• oskgrf.diff (0.82 KiB)
• openttdgui.pcx (64.66 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3750

Rubidium wrote:

I've commited some stuff from your diff and changed a few things to make it a little better (IMO):
- buttons that should not be pressed like the special button, unassigned buttons and characters that cannot be used due to a filter will be shown disabled.
- added the { and } to the english one.
- added a proper upper bound for _keyboard_opt and friends.
- some coding style.

The following issues remain:
- the warning message in GetKeyboardLayout can cause nasty things to happen: out of bound reads for the first and last character, reading uninitialized data for each character (the next character is not yet read when showing the warning). This needs to be made more robust in some way, though I couldn't think of an easy way to do so.
- where to define the keyboard layout and how? The current way is the easiest way that allows some configuration. However, I could think of people who want to change the location of buttons and the like. If that is 'needed' then we would need to make a language-type file for each of the keyboard layouts. So the real question is: how much configurability do we want to give people? In my opinion the current way looks ok.

Anyway, I've added the updated diffs.

Attachments

• osk.diff (39.23 KiB)
• oskgrf.diff (1.07 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3754

Dominik wrote:

In this version I only did a few minor tweaks:
- fixed a error in GetKeyboardLayout which could cause problems when loading from config file
- moved DisabledState stuff to an own function
- for the warning message in GetKeyboardLayout I came up with the idea to show a litte ^ in the line below the keyboard to indicate an invalid character. No more out-of-bounds reads. But I'm not sure if some systems might output characters which are two columns wide in which case the ^ wouldn't be aligned properly any more.

Attachments

• osk4.diff (24.96 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3763

Rubidium wrote:

I'm missing the most interesting part (osk_gui.cpp) in the last diff.

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3764

Dominik wrote:

lol, you're right of course.

Attachments

• osk4a.diff (39.08 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846#comment3765

Rubidium closed the ticket.

Reason for closing: Implemented

In r12425.

This comment was imported from FlySpray: https://bugs.openttd.org/task/1846