valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

keep old key-flags for buggy layout files that redefine/extend already defined keys (fixes caps-lock behaviour of key E for us-layout with codepage 858)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3681
This commit is contained in:
Sebastian Strohhäcker 2011-03-06 10:38:48 +00:00
parent 83b41ea628
commit e1ccef0bad
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dos/dos_keyboard_layout.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002-2010 The DOSBox Team
* Copyright (C) 2002-2011 The DOSBox Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -443,7 +443,14 @@ Bitu keyboard_layout::read_keyboard_file(const char* keyboard_file_name, Bit32s
}
}
current_layout[scan*layout_pages+layout_pages-1]=read_buf[read_buf_pos-2]; // flags
// calculate max length of entries, taking into account old number of entries
Bit8u new_flags=current_layout[scan*layout_pages+layout_pages-1]&0x7;
if ((read_buf[read_buf_pos-2]&0x7) > new_flags) new_flags = read_buf[read_buf_pos-2]&0x7;
// merge flag bits in as well
new_flags |= (read_buf[read_buf_pos-2] | current_layout[scan*layout_pages+layout_pages-1]) & 0xf0;
current_layout[scan*layout_pages+layout_pages-1]=new_flags;
if (read_buf[read_buf_pos-2]&0x80) scan_length*=2; // granularity flag (S)
}
i+=scan_length; // advance pointer