--- np2/macos9/mackbd.cpp 2003/12/04 16:48:15 1.7 +++ np2/macos9/mackbd.cpp 2004/01/22 01:10:04 1.10 @@ -69,10 +69,10 @@ static const BYTE keymac[128] = { 0x0f,0x34, NC,0x0e, NC,0x00, NC, NC, // sft, cps, alt, ctl, , , , ; 0x38 0x70,0x79,0x73,0x74, NC, NC, NC, NC, - // , [.], , [*], , , [+], ; 0x40 - NC,0x50, NC,0x45, NC, NC,0x49, NC, - // , , , , ret, , [-], clr ; 0x48 - NC, NC, NC, NC,0x1c, NC,0x40,0x3e, + // , [.], , [*], , [+], , ; 0x40 + NC,0x50, NC,0x45, NC,0x49, NC, NC, + // , , , [/], ret, , [-], clr ; 0x48 + NC, NC, NC,0x41,0x1c, NC,0x40,0x3e, // , [=], [0], [1], [2], [3], [4], [5] ; 0x50 NC,0x4d,0x4e,0x4a,0x4b,0x4c,0x46,0x47, // [6], [7], , [8], [9], ¡ï, ¡², [,] ; 0x58 @@ -167,17 +167,17 @@ BOOL mackbd_keydown(int keycode, BOOL cm data = NC; if (keycode == 0x67) { - if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE)) { + if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE))) { data = bindtbl.f11[np2oscfg.F11KEY]; } } else if (keycode == 0x6f) { - if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE)) { + if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE))) { data = bindtbl.f12[np2oscfg.F12KEY]; } } if (data != NC) { - keystat_senddata(NC); + keystat_senddata(data); return(TRUE); } (void)cmd; @@ -190,17 +190,17 @@ BOOL mackbd_keyup(int keycode) { data = NC; if (keycode == 0x67) { - if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE)) { + if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE))) { data = bindtbl.f11[np2oscfg.F11KEY]; } } else if (keycode == 0x6f) { - if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE)) { + if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE))) { data = bindtbl.f12[np2oscfg.F12KEY]; } } if (data != NC) { - keystat_senddata(NC | 0x80); + keystat_senddata(data | 0x80); return(TRUE); } return(FALSE); @@ -258,10 +258,10 @@ static const BYTE keymac[128] = { 0x0f,0x34, NC,0x0e, NC,0x00, NC, NC, // sft, cps, alt, ctl, , , , ; 0x38 NC, NC, NC, NC, NC, NC, NC, NC, - // , [.], , [*], , , [+], ; 0x40 - NC,0x50, NC,0x45, NC, NC,0x49, NC, - // , , , , ret, , [-], clr ; 0x48 - NC, NC, NC, NC,0x1c, NC,0x40,0x3e, + // , [.], , [*], , [+], , ; 0x40 + NC,0x50, NC,0x45, NC,0x49, NC, NC, + // , , , [/], ret, , [-], clr ; 0x48 + NC, NC, NC,0x41,0x1c, NC,0x40,0x3e, // , [=], [0], [1], [2], [3], [4], [5] ; 0x50 NC,0x4d,0x4e,0x4a,0x4b,0x4c,0x46,0x47, // [6], [7], , [8], [9], ¡ï, ¡², [,] ; 0x58 @@ -293,7 +293,7 @@ static const BYTE keymac2[128] = { NC, NC, NC, NC, NC, NC, NC, NC, // sft, cps, alt, ctl, , , , ; 0x38 NC, NC, NC, NC, NC, NC, NC, NC, - // , [.], , [*], , , [+], ; 0x40 + // , [.], , [*], , [+], , ; 0x40 NC, NC, NC, NC, NC, NC, NC, NC, // , , , , ret, , [-], clr ; 0x48 NC, NC, NC, NC, NC, NC, NC, NC, @@ -362,12 +362,12 @@ BOOL mackbd_keydown(int keycode, BOOL cm data = NC; if (keycode == 0x67) { - if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE)) { + if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE))) { data = bindtbl.f11[np2oscfg.F11KEY]; } } else if (keycode == 0x6f) { - if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE)) { + if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE))) { data = bindtbl.f12[np2oscfg.F12KEY]; } } @@ -396,12 +396,12 @@ BOOL mackbd_keyup(int keycode) { data = NC; ret = FALSE; if (keycode == 0x67) { - if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE)) { + if (np2oscfg.F11KEY < (sizeof(bindtbl.f11)/sizeof(BYTE))) { data = bindtbl.f11[np2oscfg.F11KEY]; } } else if (keycode == 0x6f) { - if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE)) { + if (np2oscfg.F12KEY < (sizeof(bindtbl.f12)/sizeof(BYTE))) { data = bindtbl.f12[np2oscfg.F12KEY]; } }