Keyboard now uses raw input. Should fix international keyboard. Based on patch from Battler.
This commit is contained in:
TomW
parent
b89e792f8f
commit
c7ce01085c
6 changed files with 239 additions and 130 deletions
|
|
@ -10,7 +10,8 @@ typedef struct
|
||||||
int scancodes_break[8];
|
int scancodes_break[8];
|
||||||
} scancode;
|
} scancode;
|
||||||
|
|
||||||
static scancode scancode_set1[256] =
|
/*272 = 256 + 16 fake interim scancodes for disambiguation purposes.*/
|
||||||
|
static scancode scancode_set1[272] =
|
||||||
{
|
{
|
||||||
{ {-1}, {-1} }, { {0x01, -1}, {0x81, -1} }, { {0x02, -1}, {0x82, -1} }, { {0x03, -1}, {0x83, -1} },
|
{ {-1}, {-1} }, { {0x01, -1}, {0x81, -1} }, { {0x02, -1}, {0x82, -1} }, { {0x03, -1}, {0x83, -1} },
|
||||||
{ {0x04, -1}, {0x84, -1} }, { {0x05, -1}, {0x85, -1} }, { {0x06, -1}, {0x86, -1} }, { {0x07, -1}, {0x87, -1} },
|
{ {0x04, -1}, {0x84, -1} }, { {0x05, -1}, {0x85, -1} }, { {0x06, -1}, {0x86, -1} }, { {0x07, -1}, {0x87, -1} },
|
||||||
|
|
@ -45,42 +46,46 @@ static scancode scancode_set1[256] =
|
||||||
{ {0x78, -1}, {0xf8, -1} }, { {0x79, -1}, {0xf9, -1} }, { {0x7a, -1}, {0xfa, -1} }, { {0x7b, -1}, {0xfb, -1} },
|
{ {0x78, -1}, {0xf8, -1} }, { {0x79, -1}, {0xf9, -1} }, { {0x7a, -1}, {0xfa, -1} }, { {0x7b, -1}, {0xfb, -1} },
|
||||||
{ {0x7c, -1}, {0xfc, -1} }, { {0x7d, -1}, {0xfd, -1} }, { {0x7e, -1}, {0xfe, -1} }, { {0x7f, -1}, {0xff, -1} },
|
{ {0x7c, -1}, {0xfc, -1} }, { {0x7d, -1}, {0xfd, -1} }, { {0x7e, -1}, {0xfe, -1} }, { {0x7f, -1}, {0xff, -1} },
|
||||||
|
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*80*/
|
{ {0x80, -1}, {-1} }, { {0x81, -1}, {-1} }, { {0x82, -1}, {-1} }, { {0xe0, 0x03, -1}, {0xe0, 0x83, -1} }, /*80*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*84*/
|
{ {0xe0, 0x04, -1}, {0xe0, 0x84, -1} }, { {0x85, -1}, {-1} }, { {0x86, -1}, {-1} }, { {0x87, -1}, {-1} }, /*84*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*88*/
|
{ {0xe0, 0x08, -1}, {0xe0, 0x88, -1} }, { {0xe0, 0x09, -1}, {0xe0, 0x89, -1} }, { {0xe0, 0x0a, -1}, {0xe0, 0x8a, -1} }, { {0xe0, 0x0b, -1}, {0xe0, 0x8b, -1} }, /*88*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*8c*/
|
{ {0xe0, 0x0c, -1}, {0xe0, 0x8c, -1} }, { {-1}, {-1} }, { {0xe0, 0x0e, -1}, {0xe0, 0x8e, -1} }, { {0xe0, 0x0f, -1}, {0xe0, 0x8f, -1} }, /*8c*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*90*/
|
{ {0xe0, 0x10, -1}, {0xe0, 0x90, -1} }, { {0xe0, 0x11, -1}, {0xe0, 0x91, -1} }, { {0xe0, 0x12, -1}, {0xe0, 0x92, -1} }, { {0xe0, 0x13, -1}, {0xe0, 0x93, -1} }, /*90*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*94*/
|
{ {0xe0, 0x14, -1}, {0xe0, 0x94, -1} }, { {0xe0, 0x15, -1}, {0xe0, 0x95, -1} }, { {0xe0, 0x16, -1}, {0xe0, 0x96, -1} }, { {0xe0, 0x17, -1}, {0xe0, 0x97, -1} }, /*94*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*98*/
|
{ {0xe0, 0x18, -1}, {0xe0, 0x98, -1} }, { {0xe0, 0x19, -1}, {0xe0, 0x99, -1} }, { {0xe0, 0x1a, -1}, {0xe0, 0x9a, -1} }, { {0xe0, 0x1b, -1}, {0xe0, 0x9b, -1} }, /*98*/
|
||||||
{ {0xe0, 0x1c, -1}, {0xe0, 0x9c, -1} }, { {0xe0, 0x1d, -1}, {0xe0, 0x9d, -1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*9c*/
|
{ {0xe0, 0x1c, -1}, {0xe0, 0x9c, -1} }, { {0xe0, 0x1d, -1}, {0xe0, 0x9d, -1} }, { {0xe0, 0x1e, -1}, {0xe0, 0x9e, -1} }, { {0xe0, 0x1f, -1}, {0xe0, 0x9f, -1} }, /*9c*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a0*/
|
{ {0xe0, 0x20, -1}, {0xe0, 0xa0, -1} }, { {0xe0, 0x21, -1}, {0xe0, 0xa1, -1} }, { {0xe0, 0x22, -1}, {0xe0, 0xa2, -1} }, { {0xe0, 0x23, -1}, {0xe0, 0xa3, -1} }, /*a0*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a4*/
|
{ {0xe0, 0x24, -1}, {0xe0, 0xa4, -1} }, { {0xe0, 0x25, -1}, {0xe0, 0xa5, -1} }, { {0xe0, 0x26, -1}, {0xe0, 0xa6, -1} }, { {-1}, {-1} }, /*a4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {0xe0, 0x2a, -1}, {0xe0, 0x8a, -1} }, { {-1}, {-1} }, /*a8*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {0xe0, 0x2a, -1}, {0xe0, 0xaa, -1} }, { {-1}, {-1} }, /*a8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*ac*/
|
{ {0xe0, 0x2c, -1}, {0xe0, 0xac, -1} }, { {0xe0, 0x2d, -1}, {0xe0, 0xad, -1} }, { {0xe0, 0x2e, -1}, {0xe0, 0xae, -1} }, { {0xe0, 0x2f, -1}, {0xe0, 0xaf, -1} }, /*ac*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*b0*/
|
{ {0xe0, 0x30, -1}, {0xe0, 0xb0, -1} }, { {0xe0, 0x31, -1}, {0xe0, 0xb1, -1} }, { {0xe0, 0x32, -1}, {0xe0, 0xb2, -1} }, { {-1}, {-1} }, /*b0*/
|
||||||
{ {-1}, {-1} }, { {0xe0, 0x35, -1}, {0xe0, 0xb5, -1} }, { {0xe0, 0x36, -1}, {0xe0, 0xb6, -1} }, { {0xe0, 0x37, -1}, {0xe0, 0xb7, -1} }, /*b4*/
|
{ {0xe0, 0x34, -1}, {0xe0, 0xb4, -1} }, { {0xe0, 0x35, -1}, {0xe0, 0xb5, -1} }, { {0xe0, 0x36, -1}, {0xe0, 0xb6, -1} }, { {0xe0, 0x37, -1}, {0xe0, 0xb7, -1} }, /*b4*/
|
||||||
{ {0xe0, 0x38, -1}, {0xe0, 0xb8, -1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*b8*/
|
{ {0xe0, 0x38, -1}, {0xe0, 0xb8, -1} }, { {-1}, {-1} }, { {0xe0, 0x3a, -1}, {0xe0, 0xba, -1} }, { {0xe0, 0x3b, -1}, {0xe0, 0xbb, -1} }, /*b8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*bc*/
|
{ {0xe0, 0x3c, -1}, {0xe0, 0xbc, -1} }, { {0xe0, 0x3d, -1}, {0xe0, 0xbd, -1} }, { {0xe0, 0x3e, -1}, {0xe0, 0xbe, -1} }, { {0xe0, 0x3f, -1}, {0xe0, 0xbf, -1} }, /*bc*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*c0*/
|
{ {0xe0, 0x40, -1}, {0xe0, 0xc0, -1} }, { {0xe0, 0x41, -1}, {0xe0, 0xc1, -1} }, { {0xe0, 0x42, -1}, {0xe0, 0xc2, -1} }, { {0xe0, 0x43, -1}, {0xe0, 0xc3, -1} }, /*c0*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {0xe0, 0x46, -1}, {0xe0, 0xc6, -1} }, { {0xe0, 0x47, -1}, {0xe0, 0xc7, -1} }, /*c4*/
|
{ {0xe0, 0x44, -1}, {0xe0, 0xc4, -1} }, { {-1}, {-1} }, { {0xe0, 0x46, -1}, {0xe0, 0xc6, -1} }, { {0xe0, 0x47, -1}, {0xe0, 0xc7, -1} }, /*c4*/
|
||||||
{ {0xe0, 0x48, -1}, {0xe0, 0xc8, -1} }, { {0xe0, 0x49, -1}, {0xe0, 0xc9, -1} }, { {-1}, {-1} }, { {0xe0, 0x4b, -1}, {0xe0, 0xcb, -1} }, /*c8*/
|
{ {0xe0, 0x48, -1}, {0xe0, 0xc8, -1} }, { {0xe0, 0x49, -1}, {0xe0, 0xc9, -1} }, { {-1}, {-1} }, { {0xe0, 0x4b, -1}, {0xe0, 0xcb, -1} }, /*c8*/
|
||||||
{ {-1}, {-1} }, { {0xe0, 0x4d, -1}, {0xe0, 0xcd, -1} }, { {-1}, {-1} }, { {0xe0, 0x4f, -1}, {0xe0, 0xcf, -1} }, /*cc*/
|
{ {0xe0, 0x4c, -1}, {0xe0, 0xcc, -1} }, { {0xe0, 0x4d, -1}, {0xe0, 0xcd, -1} }, { {0xe0, 0x4e, -1}, {0xe0, 0xce, -1} }, { {0xe0, 0x4f, -1}, {0xe0, 0xcf, -1} }, /*cc*/
|
||||||
{ {0xe0, 0x50, -1}, {0xe0, 0xd0, -1} }, { {0xe0, 0x51, -1}, {0xe0, 0xd1, -1} }, { {0xe0, 0x52, -1}, {0xe0, 0xd2, -1} }, { {0xe0, 0x53, -1}, {0xe0, 0xd3, -1} }, /*d0*/
|
{ {0xe0, 0x50, -1}, {0xe0, 0xd0, -1} }, { {0xe0, 0x51, -1}, {0xe0, 0xd1, -1} }, { {0xe0, 0x52, -1}, {0xe0, 0xd2, -1} }, { {0xe0, 0x53, -1}, {0xe0, 0xd3, -1} }, /*d0*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*d4*/
|
{ {0xd4, -1}, {-1} }, { {0xe0, 0x55, -1}, {0xe0, 0xd5, -1} }, { {-1}, {-1} }, { {0xe0, 0x57, -1}, {0xe0, 0xd7, -1} }, /*d4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*d8*/
|
{ {0xe0, 0x58, -1}, {0xe0, 0xd8, -1} }, { {0xe0, 0x59, -1}, {0xe0, 0xd9, -1} }, { {0xe0, 0x5a, -1}, {0xe0, 0xaa, -1} }, { {0xe0, 0x5b, -1}, {0xe0, 0xdb, -1} }, /*d8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*dc*/
|
{ {0xe0, 0x5c, -1}, {0xe0, 0xdc, -1} }, { {0xe0, 0x5d, -1}, {0xe0, 0xdd, -1} }, { {0xe0, 0x5e, -1}, {0xe0, 0xee, -1} }, { {0xe0, 0x5f, -1}, {0xe0, 0xdf, -1} }, /*dc*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*e0*/
|
{ {-1}, {-1} }, { {0xe0, 0x61, -1}, {0xe0, 0xe1, -1} }, { {0xe0, 0x62, -1}, {0xe0, 0xe2, -1} }, { {0xe0, 0x63, -1}, {0xe0, 0xe3, -1} }, /*e0*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*e4*/
|
{ {0xe0, 0x64, -1}, {0xe0, 0xe4, -1} }, { {0xe0, 0x65, -1}, {0xe0, 0xe5, -1} }, { {0xe0, 0x66, -1}, {0xe0, 0xe6, -1} }, { {0xe0, 0x67, -1}, {0xe0, 0xe7, -1} }, /*e4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*e8*/
|
{ {0xe0, 0x68, -1}, {0xe0, 0xe8, -1} }, { {0xe0, 0x69, -1}, {0xe0, 0xe9, -1} }, { {0xe0, 0x6a, -1}, {0xe0, 0xea, -1} }, { {0xe0, 0x6b, -1}, {0xe0, 0xeb, -1} }, /*e8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*ec*/
|
{ {0xe0, 0x6c, -1}, {0xe0, 0xec, -1} }, { {0xe0, 0x6d, -1}, {0xe0, 0xed, -1} }, { {0xe0, 0x6e, -1}, {0xe0, 0xee, -1} }, { {-1}, {-1} }, /*ec*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f0*/
|
{ {0xe0, 0x70, -1}, {0xe0, 0xf0, -1} }, { {0xf1, -1}, {-1} }, { {0xf2, -1}, {-1} }, { {0xe0, 0x73, -1}, {0xe0, 0xf3, -1} }, /*f0*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f4*/
|
{ {0xe0, 0x74, -1}, {0xe0, 0xf4, -1} }, { {0xe0, 0x75, -1}, {0xe0, 0xf5, -1} }, { {-1}, {-1} }, { {0xe0, 0x77, -1}, {0xe0, 0xf7, -1} }, /*f4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f8*/
|
{ {0xe0, 0x78, -1}, {0xe0, 0xf8, -1} }, { {0xe0, 0x79, -1}, {0xe0, 0xf9, -1} }, { {0xe0, 0x7a, -1}, {0xe0, 0xfa, -1} }, { {0xe0, 0x7b, -1}, {0xe0, 0xfb, -1} }, /*f8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {0xe1, 0x1d, 0x45, 0xe1, 0x9d, 0xc5, -1}, {-1} } /*fc*/
|
{ {0xe0, 0x7c, -1}, {0xe0, 0xfc, -1} }, { {0xe0, 0x7d, -1}, {0xe0, 0xfd, -1} }, { {0xe0, 0x7e, -1}, {0xe0, 0xfe, -1} }, { {0xe1, 0x1d, 0x45, 0xe1, 0x9d, 0xc5, -1}, {-1} }, /*fc*/
|
||||||
|
{ {-1}, {-1} }, { {0xe0, 0x01, -1}, {0xe0, 0x81, -1} }, { {0xe0, 0x02, -1}, {0xe0, 0x82, -1} }, { {-1}, {-1} }, /*100*/
|
||||||
|
{ {-1}, {-1} }, { {0xe0, 0x05, -1}, {0xe0, 0x85, -1} }, { {0xe0, 0x06, -1}, {0xe0, 0x86, -1} }, { {0xe0, 0x07, -1}, {0xe0, 0x87, -1} }, /*104*/
|
||||||
|
{ {0xe0, 0x71, -1}, {0xe0, 0xf1, -1} }, { {0xe0, 0x72, -1}, {0xe0, 0xf2, -1} }, { {0xe0, 0x7f, -1}, {0xe0, 0xff, -1} }, { {0xe0, 0xe1, -1}, {-1} }, /*108*/
|
||||||
|
{ {0xe0, 0xee, -1}, {-1} }, { {0xe0, 0xf1, -1}, {-1} }, { {0xe0, 0xfe, -1}, {-1} }, { {0xe0, 0xff, -1}, {-1} } /*10c*/
|
||||||
};
|
};
|
||||||
|
|
||||||
/*XT keyboard has no escape scancodes, and no scancodes beyond 53*/
|
/*XT keyboard has no escape scancodes, and no scancodes beyond 53*/
|
||||||
static scancode scancode_xt[256] =
|
static scancode scancode_xt[272] =
|
||||||
{
|
{
|
||||||
{ {-1}, {-1} }, { {0x01, -1}, {0x81, -1} }, { {0x02, -1}, {0x82, -1} }, { {0x03, -1}, {0x83, -1} },
|
{ {-1}, {-1} }, { {0x01, -1}, {0x81, -1} }, { {0x02, -1}, {0x82, -1} }, { {0x03, -1}, {0x83, -1} },
|
||||||
{ {0x04, -1}, {0x84, -1} }, { {0x05, -1}, {0x85, -1} }, { {0x06, -1}, {0x86, -1} }, { {0x07, -1}, {0x87, -1} },
|
{ {0x04, -1}, {0x84, -1} }, { {0x05, -1}, {0x85, -1} }, { {0x06, -1}, {0x86, -1} }, { {0x07, -1}, {0x87, -1} },
|
||||||
|
|
@ -125,7 +130,7 @@ static scancode scancode_xt[256] =
|
||||||
{ {0x1c, -1}, {0x9c, -1} }, { {0x1d, -1}, {0x9d, -1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*9c*/
|
{ {0x1c, -1}, {0x9c, -1} }, { {0x1d, -1}, {0x9d, -1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*9c*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a0*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a0*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a4*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {0x2a, -1}, {0x8a, -1} }, { {-1}, {-1} }, /*a8*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {0x2a, -1}, {0xaa, -1} }, { {-1}, {-1} }, /*a8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*ac*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*ac*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*b0*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*b0*/
|
||||||
{ {-1}, {-1} }, { {0x35, -1}, {0xb5, -1} }, { {0x36, -1}, {0xb6, -1} }, { {0x37, -1}, {0xb7, -1} }, /*b4*/
|
{ {-1}, {-1} }, { {0x35, -1}, {0xb5, -1} }, { {0x36, -1}, {0xb6, -1} }, { {0x37, -1}, {0xb7, -1} }, /*b4*/
|
||||||
|
|
@ -147,10 +152,14 @@ static scancode scancode_xt[256] =
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f4*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f8*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*fc*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*fc*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*100*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*104*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*108*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*10c*/
|
||||||
};
|
};
|
||||||
|
|
||||||
/*Tandy keyboard has slightly different scancodes to XT*/
|
/*Tandy keyboard has slightly different scancodes to XT*/
|
||||||
static scancode scancode_tandy[256] =
|
static scancode scancode_tandy[272] =
|
||||||
{
|
{
|
||||||
{ {-1}, {-1} }, { {0x01, -1}, {0x81, -1} }, { {0x02, -1}, {0x82, -1} }, { {0x03, -1}, {0x83, -1} },
|
{ {-1}, {-1} }, { {0x01, -1}, {0x81, -1} }, { {0x02, -1}, {0x82, -1} }, { {0x03, -1}, {0x83, -1} },
|
||||||
{ {0x04, -1}, {0x84, -1} }, { {0x05, -1}, {0x85, -1} }, { {0x06, -1}, {0x86, -1} }, { {0x07, -1}, {0x87, -1} },
|
{ {0x04, -1}, {0x84, -1} }, { {0x05, -1}, {0x85, -1} }, { {0x06, -1}, {0x86, -1} }, { {0x07, -1}, {0x87, -1} },
|
||||||
|
|
@ -195,7 +204,7 @@ static scancode scancode_tandy[256] =
|
||||||
{ {0x57, -1}, {0xd7, -1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*9c*/
|
{ {0x57, -1}, {0xd7, -1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*9c*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a0*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a0*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a4*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*a4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {0x2a, -1}, {0x8a, -1} }, { {-1}, {-1} }, /*a8*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {0x2a, -1}, {0xaa, -1} }, { {-1}, {-1} }, /*a8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*ac*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*ac*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*b0*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*b0*/
|
||||||
{ {-1}, {-1} }, { {0x35, -1}, {0xb5, -1} }, { {0x36, -1}, {0xb6, -1} }, { {0x37, -1}, {0xb7, -1} }, /*b4*/
|
{ {-1}, {-1} }, { {0x35, -1}, {0xb5, -1} }, { {0x36, -1}, {0xb6, -1} }, { {0x37, -1}, {0xb7, -1} }, /*b4*/
|
||||||
|
|
@ -217,9 +226,13 @@ static scancode scancode_tandy[256] =
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f4*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f4*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f8*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*f8*/
|
||||||
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*fc*/
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*fc*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*100*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*104*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*108*/
|
||||||
|
{ {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, { {-1}, {-1} }, /*10c*/
|
||||||
};
|
};
|
||||||
static int oldkey[256];
|
static int oldkey[272];
|
||||||
static int keydelay[256];
|
static int keydelay[272];
|
||||||
|
|
||||||
void (*keyboard_send)(uint8_t val);
|
void (*keyboard_send)(uint8_t val);
|
||||||
void (*keyboard_poll)();
|
void (*keyboard_poll)();
|
||||||
|
|
@ -233,13 +246,13 @@ void keyboard_process()
|
||||||
if (!keyboard_scan) return;
|
if (!keyboard_scan) return;
|
||||||
if (TANDY) scancodes = scancode_tandy;
|
if (TANDY) scancodes = scancode_tandy;
|
||||||
|
|
||||||
for (c = 0; c < 256; c++)
|
for (c = 0; c < 272; c++)
|
||||||
{
|
{
|
||||||
if (key[c]) keydelay[c]++;
|
if (key[c]) keydelay[c]++;
|
||||||
else keydelay[c] = 0;
|
else keydelay[c] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (c = 0; c < 256; c++)
|
for (c = 0; c < 272; c++)
|
||||||
{
|
{
|
||||||
if (key[c] != oldkey[c])
|
if (key[c] != oldkey[c])
|
||||||
{
|
{
|
||||||
|
|
@ -263,7 +276,7 @@ void keyboard_process()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (c = 0; c < 256; c++)
|
for (c = 0; c < 272; c++)
|
||||||
{
|
{
|
||||||
if (keydelay[c] >= 30)
|
if (keydelay[c] >= 30)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,9 @@ extern "C" {
|
||||||
void keyboard_init();
|
void keyboard_init();
|
||||||
void keyboard_close();
|
void keyboard_close();
|
||||||
void keyboard_poll_host();
|
void keyboard_poll_host();
|
||||||
int key[256];
|
int key[272];
|
||||||
|
int rawinputkey[272];
|
||||||
|
|
||||||
#define KEY_LCONTROL 0x1d
|
#define KEY_LCONTROL 0x1d
|
||||||
#define KEY_RCONTROL (0x1d | 0x80)
|
#define KEY_RCONTROL (0x1d | 0x80)
|
||||||
#define KEY_END (0x4f | 0x80)
|
#define KEY_END (0x4f | 0x80)
|
||||||
|
|
@ -13,3 +14,4 @@ extern "C" {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#define DIRECTINPUT_VERSION 0x0700
|
#define DIRECTINPUT_VERSION 0x0700
|
||||||
#include <dinput.h>
|
#include <dinput.h>
|
||||||
#include "plat-joystick.h"
|
#include "plat-joystick.h"
|
||||||
#include "plat-dinput.h"
|
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
||||||
extern "C" int video_fullscreen;
|
extern "C" int video_fullscreen;
|
||||||
|
|
@ -15,6 +14,7 @@ extern "C" void poll_joystick();
|
||||||
|
|
||||||
joystick_t joystick_state[2];
|
joystick_t joystick_state[2];
|
||||||
|
|
||||||
|
static LPDIRECTINPUT lpdi;
|
||||||
static LPDIRECTINPUTDEVICE2 lpdi_joystick[2] = {NULL, NULL};
|
static LPDIRECTINPUTDEVICE2 lpdi_joystick[2] = {NULL, NULL};
|
||||||
|
|
||||||
int joysticks_present = 0;
|
int joysticks_present = 0;
|
||||||
|
|
@ -43,6 +43,9 @@ void joystick_init()
|
||||||
|
|
||||||
joysticks_present = 0;
|
joysticks_present = 0;
|
||||||
|
|
||||||
|
if (FAILED(DirectInputCreate(hinstance, DIRECTINPUT_VERSION, &lpdi, NULL)))
|
||||||
|
fatal("joystick_init : DirectInputCreate failed\n");
|
||||||
|
|
||||||
if (FAILED(lpdi->EnumDevices(DIDEVTYPE_JOYSTICK, joystick_enum_callback, NULL, DIEDFL_ATTACHEDONLY)))
|
if (FAILED(lpdi->EnumDevices(DIDEVTYPE_JOYSTICK, joystick_enum_callback, NULL, DIEDFL_ATTACHEDONLY)))
|
||||||
fatal("joystick_init : EnumDevices failed\n");
|
fatal("joystick_init : EnumDevices failed\n");
|
||||||
|
|
||||||
|
|
@ -125,7 +128,7 @@ void poll_joystick()
|
||||||
joystick_state[c].b[2] = joystate.rgbButtons[2] & 0x80;
|
joystick_state[c].b[2] = joystate.rgbButtons[2] & 0x80;
|
||||||
joystick_state[c].b[3] = joystate.rgbButtons[3] & 0x80;
|
joystick_state[c].b[3] = joystate.rgbButtons[3] & 0x80;
|
||||||
|
|
||||||
pclog("joystick %i - x=%i y=%i b[0]=%i b[1]=%i %i\n", c, joystick_state[c].x, joystick_state[c].y, joystick_state[c].b[0], joystick_state[c].b[1], joysticks_present);
|
// pclog("joystick %i - x=%i y=%i b[0]=%i b[1]=%i %i\n", c, joystick_state[c].x, joystick_state[c].y, joystick_state[c].b[0], joystick_state[c].b[1], joysticks_present);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,15 @@
|
||||||
|
#define UNICODE
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#define DIRECTINPUT_VERSION 0x0700
|
|
||||||
#define BITMAP WINDOWS_BITMAP
|
#define BITMAP WINDOWS_BITMAP
|
||||||
#include <dinput.h>
|
#include <windows.h>
|
||||||
#undef BITMAP
|
#undef BITMAP
|
||||||
#include "plat-keyboard.h"
|
#include "plat-keyboard.h"
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
#include "video.h"
|
#include "video.h"
|
||||||
|
|
||||||
extern "C" int key[256];
|
extern "C" int key[272];
|
||||||
uint8_t dinput_key[256];
|
|
||||||
|
|
||||||
extern "C" void fatal(const char *format, ...);
|
extern "C" void fatal(const char *format, ...);
|
||||||
extern "C" void pclog(const char *format, ...);
|
extern "C" void pclog(const char *format, ...);
|
||||||
|
|
@ -19,99 +18,28 @@ extern "C" void keyboard_init();
|
||||||
extern "C" void keyboard_close();
|
extern "C" void keyboard_close();
|
||||||
extern "C" void keyboard_poll();
|
extern "C" void keyboard_poll();
|
||||||
|
|
||||||
LPDIRECTINPUT lpdi = NULL;
|
|
||||||
LPDIRECTINPUTDEVICE lpdi_key = NULL;
|
|
||||||
|
|
||||||
static int keyboard_lookup[256] =
|
|
||||||
{
|
|
||||||
-1, DIK_ESCAPE, DIK_1, DIK_2, DIK_3, DIK_4, DIK_5, DIK_6, /*00*/
|
|
||||||
DIK_7, DIK_8, DIK_9, DIK_0, DIK_MINUS, DIK_EQUALS, DIK_BACKSPACE, DIK_TAB, /*08*/
|
|
||||||
DIK_Q, DIK_W, DIK_E, DIK_R, DIK_T, DIK_Y, DIK_U, DIK_I, /*10*/
|
|
||||||
DIK_O, DIK_P, DIK_LBRACKET, DIK_RBRACKET, DIK_RETURN, DIK_LCONTROL, DIK_A, DIK_S, /*18*/
|
|
||||||
DIK_D, DIK_F, DIK_G, DIK_H, DIK_J, DIK_K, DIK_L, DIK_SEMICOLON,/*20*/
|
|
||||||
DIK_APOSTROPHE, DIK_GRAVE, DIK_LSHIFT, DIK_BACKSLASH, DIK_Z, DIK_X, DIK_C, DIK_V, /*28*/
|
|
||||||
DIK_B, DIK_N, DIK_M, DIK_COMMA, DIK_PERIOD, DIK_SLASH, DIK_RSHIFT, DIK_MULTIPLY, /*30*/
|
|
||||||
DIK_LMENU, DIK_SPACE, DIK_CAPSLOCK, DIK_F1, DIK_F2, DIK_F3, DIK_F4, DIK_F5, /*38*/
|
|
||||||
DIK_F6, DIK_F7, DIK_F8, DIK_F9, DIK_F10, DIK_NUMLOCK, DIK_SCROLL, DIK_NUMPAD7, /*40*/
|
|
||||||
DIK_NUMPAD8, DIK_NUMPAD9, DIK_NUMPADMINUS, DIK_NUMPAD4, DIK_NUMPAD5, DIK_NUMPAD6, DIK_NUMPADPLUS, DIK_NUMPAD1, /*48*/
|
|
||||||
DIK_NUMPAD2, DIK_NUMPAD3, DIK_NUMPAD0, DIK_DECIMAL, DIK_SYSRQ, -1, DIK_OEM_102, DIK_F11, /*50*/
|
|
||||||
DIK_F12, -1, -1, DIK_LWIN, DIK_RWIN, DIK_LMENU, -1, -1, /*58*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*60*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*68*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*70*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*78*/
|
|
||||||
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*80*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*88*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*90*/
|
|
||||||
-1, -1, -1, -1, DIK_NUMPADENTER, DIK_RCONTROL, -1, -1, /*98*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*a0*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*a8*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*b0*/
|
|
||||||
DIK_RMENU, -1, -1, -1, -1, -1, -1, -1, /*b8*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, DIK_HOME, /*c0*/
|
|
||||||
DIK_UP, DIK_PRIOR, -1, DIK_LEFT, -1, DIK_RIGHT, -1, DIK_END, /*c8*/
|
|
||||||
DIK_DOWN, DIK_NEXT, DIK_INSERT, DIK_DELETE, -1, -1, -1, -1, /*d0*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*d8*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*e0*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*e8*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, -1, /*f0*/
|
|
||||||
-1, -1, -1, -1, -1, -1, -1, DIK_PAUSE, /*f8*/
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
void keyboard_init()
|
void keyboard_init()
|
||||||
{
|
{
|
||||||
atexit(keyboard_close);
|
atexit(keyboard_close);
|
||||||
|
|
||||||
if (FAILED(DirectInputCreate(hinstance, DIRECTINPUT_VERSION, &lpdi, NULL)))
|
|
||||||
fatal("install_keyboard : DirectInputCreate failed\n");
|
|
||||||
if (FAILED(lpdi->CreateDevice(GUID_SysKeyboard, &lpdi_key, NULL)))
|
|
||||||
fatal("install_keyboard : CreateDevice failed\n");
|
|
||||||
if (FAILED(lpdi_key->SetCooperativeLevel(ghwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE)))
|
|
||||||
fatal("install_keyboard : SetCooperativeLevel failed\n");
|
|
||||||
if (FAILED(lpdi_key->SetDataFormat(&c_dfDIKeyboard)))
|
|
||||||
fatal("install_keyboard : SetDataFormat failed\n");
|
|
||||||
if (FAILED(lpdi_key->Acquire()))
|
|
||||||
fatal("install_keyboard : Acquire failed\n");
|
|
||||||
|
|
||||||
memset(key, 0, sizeof(key));
|
memset(key, 0, sizeof(key));
|
||||||
|
pclog("Keyboard initialized!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
void keyboard_close()
|
void keyboard_close()
|
||||||
{
|
{
|
||||||
if (lpdi_key)
|
|
||||||
{
|
|
||||||
lpdi_key->Release();
|
|
||||||
lpdi_key = NULL;
|
|
||||||
}
|
|
||||||
if (lpdi)
|
|
||||||
{
|
|
||||||
lpdi->Release();
|
|
||||||
lpdi = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void keyboard_poll_host()
|
void keyboard_poll_host()
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
if (FAILED(lpdi_key->GetDeviceState(256, (LPVOID)dinput_key)))
|
|
||||||
{
|
for (c = 0; c < 272; c++)
|
||||||
lpdi_key->Acquire();
|
key[c] = rawinputkey[c];
|
||||||
lpdi_key->GetDeviceState(256, (LPVOID)dinput_key);
|
|
||||||
}
|
if ((rawinputkey[0x1D] || rawinputkey[0x9D]) &&
|
||||||
for (c = 0; c < 256; c++)
|
(rawinputkey[0x38] || rawinputkey[0xB8]) &&
|
||||||
{
|
(rawinputkey[0x51] || rawinputkey[0xD1]) &&
|
||||||
// if (dinput_key[c] & 0x80) pclog("Dinput key down %i %02X\n", c, c);
|
video_fullscreen)
|
||||||
if (keyboard_lookup[c] != -1)
|
leave_fullscreen();
|
||||||
{
|
|
||||||
key[c] = dinput_key[keyboard_lookup[c]] & 0x80;
|
|
||||||
// if (key[c]) pclog("Key down %i %02X %i %02X\n", c, c, keyboard_lookup[c], keyboard_lookup[c]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (((dinput_key[DIK_LCONTROL] | dinput_key[DIK_RCONTROL]) & 0x80) &&
|
|
||||||
((dinput_key[DIK_LMENU] | dinput_key[DIK_RMENU]) & 0x80) &&
|
|
||||||
(dinput_key[DIK_NEXT] & 0x80) &&
|
|
||||||
video_fullscreen)
|
|
||||||
leave_fullscreen();
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
|
#define DIRECTINPUT_VERSION 0x0700
|
||||||
#include <dinput.h>
|
#include <dinput.h>
|
||||||
#include "plat-mouse.h"
|
#include "plat-mouse.h"
|
||||||
#include "plat-dinput.h"
|
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
||||||
extern "C" int video_fullscreen;
|
extern "C" int video_fullscreen;
|
||||||
|
|
@ -14,6 +14,7 @@ extern "C" void poll_mouse();
|
||||||
extern "C" void position_mouse(int x, int y);
|
extern "C" void position_mouse(int x, int y);
|
||||||
extern "C" void get_mouse_mickeys(int *x, int *y);
|
extern "C" void get_mouse_mickeys(int *x, int *y);
|
||||||
|
|
||||||
|
static LPDIRECTINPUT lpdi;
|
||||||
static LPDIRECTINPUTDEVICE lpdi_mouse = NULL;
|
static LPDIRECTINPUTDEVICE lpdi_mouse = NULL;
|
||||||
static DIMOUSESTATE mousestate;
|
static DIMOUSESTATE mousestate;
|
||||||
static int mouse_x = 0, mouse_y = 0;
|
static int mouse_x = 0, mouse_y = 0;
|
||||||
|
|
@ -23,6 +24,8 @@ void mouse_init()
|
||||||
{
|
{
|
||||||
atexit(mouse_close);
|
atexit(mouse_close);
|
||||||
|
|
||||||
|
if (FAILED(DirectInputCreate(hinstance, DIRECTINPUT_VERSION, &lpdi, NULL)))
|
||||||
|
fatal("mouse_init : DirectInputCreate failed\n");
|
||||||
if (FAILED(lpdi->CreateDevice(GUID_SysMouse, &lpdi_mouse, NULL)))
|
if (FAILED(lpdi->CreateDevice(GUID_SysMouse, &lpdi_mouse, NULL)))
|
||||||
fatal("mouse_init : CreateDevice failed\n");
|
fatal("mouse_init : CreateDevice failed\n");
|
||||||
if (FAILED(lpdi_mouse->SetCooperativeLevel(ghwnd, DISCL_FOREGROUND | (video_fullscreen ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE))))
|
if (FAILED(lpdi_mouse->SetCooperativeLevel(ghwnd, DISCL_FOREGROUND | (video_fullscreen ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE))))
|
||||||
|
|
|
||||||
160
src/win.c
160
src/win.c
|
|
@ -1,3 +1,4 @@
|
||||||
|
#define _WIN32_WINNT 0x0501
|
||||||
#define BITMAP WINDOWS_BITMAP
|
#define BITMAP WINDOWS_BITMAP
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <windowsx.h>
|
#include <windowsx.h>
|
||||||
|
|
@ -31,8 +32,15 @@
|
||||||
#include "win-d3d-fs.h"
|
#include "win-d3d-fs.h"
|
||||||
//#include "win-opengl.h"
|
//#include "win-opengl.h"
|
||||||
|
|
||||||
|
#ifndef MAPVK_VK_TO_VSC
|
||||||
|
#define MAPVK_VK_TO_VSC 0
|
||||||
|
#endif
|
||||||
|
|
||||||
uint64_t timer_freq;
|
uint64_t timer_freq;
|
||||||
|
|
||||||
|
static RAWINPUTDEVICE device;
|
||||||
|
static uint16_t scancode_map[65536];
|
||||||
|
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
void (*init)(HWND h);
|
void (*init)(HWND h);
|
||||||
|
|
@ -215,6 +223,95 @@ uint64_t timer_read()
|
||||||
return qpc_time.QuadPart;
|
return qpc_time.QuadPart;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This is so we can disambiguate scan codes that would otherwise conflict and get
|
||||||
|
passed on incorrectly. */
|
||||||
|
UINT16 convert_scan_code(UINT16 scan_code)
|
||||||
|
{
|
||||||
|
switch (scan_code)
|
||||||
|
{
|
||||||
|
case 0xE001:
|
||||||
|
return 0xF001;
|
||||||
|
case 0xE002:
|
||||||
|
return 0xF002;
|
||||||
|
case 0xE005:
|
||||||
|
return 0xF005;
|
||||||
|
case 0xE006:
|
||||||
|
return 0xF006;
|
||||||
|
case 0xE007:
|
||||||
|
return 0xF007;
|
||||||
|
case 0xE071:
|
||||||
|
return 0xF008;
|
||||||
|
case 0xE072:
|
||||||
|
return 0xF009;
|
||||||
|
case 0xE07F:
|
||||||
|
return 0xF00A;
|
||||||
|
case 0xE0E1:
|
||||||
|
return 0xF00B;
|
||||||
|
case 0xE0EE:
|
||||||
|
return 0xF00C;
|
||||||
|
case 0xE0F1:
|
||||||
|
return 0xF00D;
|
||||||
|
case 0xE0FE:
|
||||||
|
return 0xF00E;
|
||||||
|
case 0xE0EF:
|
||||||
|
return 0xF00F;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return scan_code;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void get_registry_key_map()
|
||||||
|
{
|
||||||
|
char *keyName = "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout";
|
||||||
|
char *valueName = "Scancode Map";
|
||||||
|
char buf[32768];
|
||||||
|
DWORD bufSize;
|
||||||
|
HKEY hKey;
|
||||||
|
int j;
|
||||||
|
|
||||||
|
/* First, prepare the default scan code map list which is 1:1.
|
||||||
|
Remappings will be inserted directly into it.
|
||||||
|
65536 bytes so scan codes fit in easily and it's easy to find what each maps too,
|
||||||
|
since each array element is a scan code and provides for E0, etc. ones too. */
|
||||||
|
for (j = 0; j < 65536; j++)
|
||||||
|
scancode_map[j] = convert_scan_code(j);
|
||||||
|
|
||||||
|
bufSize = 32768;
|
||||||
|
pclog("Preparing scan code map list...\n");
|
||||||
|
/* Get the scan code remappings from:
|
||||||
|
HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout */
|
||||||
|
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, 1, &hKey) == ERROR_SUCCESS)
|
||||||
|
{
|
||||||
|
if(RegQueryValueEx(hKey, valueName, NULL, NULL, buf, &bufSize) == ERROR_SUCCESS)
|
||||||
|
{
|
||||||
|
UINT32 *bufEx2 = (UINT32 *) buf;
|
||||||
|
int scMapCount = bufEx2[2];
|
||||||
|
pclog("%lu scan code mappings found!\n", scMapCount);
|
||||||
|
if ((bufSize != 0) && (scMapCount != 0))
|
||||||
|
{
|
||||||
|
UINT16 *bufEx = (UINT16 *) (buf + 12);
|
||||||
|
pclog("More than zero scan code mappings found, processing...\n");
|
||||||
|
for (j = 0; j < scMapCount*2; j += 2)
|
||||||
|
{
|
||||||
|
/* Each scan code is 32-bit: 16 bits of remapped scan code,
|
||||||
|
and 16 bits of original scan code. */
|
||||||
|
int scancode_unmapped = bufEx[j + 1];
|
||||||
|
int scancode_mapped = bufEx[j];
|
||||||
|
|
||||||
|
scancode_mapped = convert_scan_code(scancode_mapped);
|
||||||
|
|
||||||
|
scancode_map[scancode_unmapped] = scancode_mapped;
|
||||||
|
pclog("Scan code mapping %u detected: %X -> %X\n", scancode_unmapped, scancode_mapped, scancode_map[scancode_unmapped]);
|
||||||
|
}
|
||||||
|
pclog("Done processing!\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RegCloseKey(hKey);
|
||||||
|
}
|
||||||
|
pclog("Done preparing!\n");
|
||||||
|
}
|
||||||
|
|
||||||
int WINAPI WinMain (HINSTANCE hThisInstance,
|
int WINAPI WinMain (HINSTANCE hThisInstance,
|
||||||
HINSTANCE hPrevInstance,
|
HINSTANCE hPrevInstance,
|
||||||
LPSTR lpszArgument,
|
LPSTR lpszArgument,
|
||||||
|
|
@ -279,6 +376,19 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
|
||||||
|
|
||||||
// win_set_window(hwnd);
|
// win_set_window(hwnd);
|
||||||
|
|
||||||
|
memset(rawinputkey, 0, sizeof(rawinputkey));
|
||||||
|
device.usUsagePage = 0x01;
|
||||||
|
device.usUsage = 0x06;
|
||||||
|
device.dwFlags = RIDEV_NOLEGACY;
|
||||||
|
device.hwndTarget = hwnd;
|
||||||
|
|
||||||
|
if (RegisterRawInputDevices(&device, 1, sizeof(device)))
|
||||||
|
pclog("Raw input registered!\n");
|
||||||
|
else
|
||||||
|
pclog("Raw input registration failed!\n");
|
||||||
|
|
||||||
|
get_registry_key_map();
|
||||||
|
|
||||||
ghwnd=hwnd;
|
ghwnd=hwnd;
|
||||||
|
|
||||||
midi_init();
|
midi_init();
|
||||||
|
|
@ -729,6 +839,56 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
case WM_INPUT:
|
||||||
|
{
|
||||||
|
UINT size;
|
||||||
|
RAWINPUT *raw;
|
||||||
|
|
||||||
|
GetRawInputData((HRAWINPUT)lParam, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER));
|
||||||
|
|
||||||
|
raw = malloc(size);
|
||||||
|
|
||||||
|
/* Here we read the raw input data for the keyboard */
|
||||||
|
GetRawInputData((HRAWINPUT)(lParam), RID_INPUT, raw, &size, sizeof(RAWINPUTHEADER));
|
||||||
|
|
||||||
|
/* If the input is keyboard, we process it */
|
||||||
|
if (raw->header.dwType == RIM_TYPEKEYBOARD)
|
||||||
|
{
|
||||||
|
const RAWKEYBOARD rawKB = raw->data.keyboard;
|
||||||
|
USHORT scancode = rawKB.MakeCode;
|
||||||
|
|
||||||
|
// pclog("Keyboard input received: S:%X VK:%X F:%X\n", c, d, e);
|
||||||
|
|
||||||
|
if (rawKB.VKey == VK_NUMLOCK)
|
||||||
|
{
|
||||||
|
/* This is for proper handling of Pause/Break and Num Lock */
|
||||||
|
scancode = (MapVirtualKey(rawKB.VKey, MAPVK_VK_TO_VSC) | 0x100);
|
||||||
|
}
|
||||||
|
/* If it's not a scan code that starts with 0xE1 */
|
||||||
|
if (!(rawKB.Flags & RI_KEY_E1))
|
||||||
|
{
|
||||||
|
if (rawKB.Flags & RI_KEY_E0)
|
||||||
|
scancode |= (0xE0 << 8);
|
||||||
|
|
||||||
|
/* Remap it according to the list from the Registry */
|
||||||
|
scancode = scancode_map[scancode];
|
||||||
|
|
||||||
|
if ((scancode >> 8) == 0xF0)
|
||||||
|
scancode |= 0x100; /* Extended key code in disambiguated format */
|
||||||
|
else if ((scancode >> 8) == 0xE0)
|
||||||
|
scancode |= 0x80; /* Normal extended key code */
|
||||||
|
|
||||||
|
/* If it's not 0 (therefore not 0xE1, 0xE2, etc),
|
||||||
|
then pass it on to the rawinputkey array */
|
||||||
|
if (!(scancode & 0xf00))
|
||||||
|
rawinputkey[scancode & 0x1ff] = !(rawKB.Flags & RI_KEY_BREAK);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(raw);
|
||||||
|
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case WM_SETFOCUS:
|
case WM_SETFOCUS:
|
||||||
infocus=1;
|
infocus=1;
|
||||||
// QueryPerformanceCounter(&counter_posold);
|
// QueryPerformanceCounter(&counter_posold);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue