system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-30 21:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't confuse cursor keys with numpad keys when composing a char code.

Browse source 
PR: kern/10988
This commit is contained in:
Kazutaka YOKOTA 1999-05-09 05:00:19 +00:00
parent 57600c2385
commit 194da42d48
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=46765
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/atkbdc/atkbd.c
View file

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: atkbd.c,v 1.6 1999/04/16 21:21:55 peter Exp $ * $Id: atkbd.c,v 1.7 1999/05/09 04:59:24 yokota Exp $
*/ */
#include "atkbd.h" #include "atkbd.h"
@ -826,23 +826,23 @@ atkbd_read_char(keyboard_t *kbd, int wait)
/* compose a character code */ /* compose a character code */
if (state->ks_flags & COMPOSE) { if (state->ks_flags & COMPOSE) {
switch (scancode) { switch (keycode) {
/* key pressed, process it */ /* key pressed, process it */
case 0x47: case 0x48: case 0x49: /* keypad 7,8,9 */ case 0x47: case 0x48: case 0x49: /* keypad 7,8,9 */
state->ks_composed_char *= 10; state->ks_composed_char *= 10;
state->ks_composed_char += scancode - 0x40; state->ks_composed_char += keycode - 0x40;
if (state->ks_composed_char > UCHAR_MAX) if (state->ks_composed_char > UCHAR_MAX)
return ERRKEY; return ERRKEY;
goto next_code; goto next_code;
case 0x4B: case 0x4C: case 0x4D: /* keypad 4,5,6 */ case 0x4B: case 0x4C: case 0x4D: /* keypad 4,5,6 */
state->ks_composed_char *= 10; state->ks_composed_char *= 10;
state->ks_composed_char += scancode - 0x47; state->ks_composed_char += keycode - 0x47;
if (state->ks_composed_char > UCHAR_MAX) if (state->ks_composed_char > UCHAR_MAX)
return ERRKEY; return ERRKEY;
goto next_code; goto next_code;
case 0x4F: case 0x50: case 0x51: /* keypad 1,2,3 */ case 0x4F: case 0x50: case 0x51: /* keypad 1,2,3 */
state->ks_composed_char *= 10; state->ks_composed_char *= 10;
state->ks_composed_char += scancode - 0x4E; state->ks_composed_char += keycode - 0x4E;
if (state->ks_composed_char > UCHAR_MAX) if (state->ks_composed_char > UCHAR_MAX)
return ERRKEY; return ERRKEY;
goto next_code; goto next_code;

10
sys/dev/kbd/atkbd.c
View file

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: atkbd.c,v 1.6 1999/04/16 21:21:55 peter Exp $ * $Id: atkbd.c,v 1.7 1999/05/09 04:59:24 yokota Exp $
*/ */
#include "atkbd.h" #include "atkbd.h"
@ -826,23 +826,23 @@ atkbd_read_char(keyboard_t *kbd, int wait)
/* compose a character code */ /* compose a character code */
if (state->ks_flags & COMPOSE) { if (state->ks_flags & COMPOSE) {
switch (scancode) { switch (keycode) {
/* key pressed, process it */ /* key pressed, process it */
case 0x47: case 0x48: case 0x49: /* keypad 7,8,9 */ case 0x47: case 0x48: case 0x49: /* keypad 7,8,9 */
state->ks_composed_char *= 10; state->ks_composed_char *= 10;
state->ks_composed_char += scancode - 0x40; state->ks_composed_char += keycode - 0x40;
if (state->ks_composed_char > UCHAR_MAX) if (state->ks_composed_char > UCHAR_MAX)
return ERRKEY; return ERRKEY;
goto next_code; goto next_code;
case 0x4B: case 0x4C: case 0x4D: /* keypad 4,5,6 */ case 0x4B: case 0x4C: case 0x4D: /* keypad 4,5,6 */
state->ks_composed_char *= 10; state->ks_composed_char *= 10;
state->ks_composed_char += scancode - 0x47; state->ks_composed_char += keycode - 0x47;
if (state->ks_composed_char > UCHAR_MAX) if (state->ks_composed_char > UCHAR_MAX)
return ERRKEY; return ERRKEY;
goto next_code; goto next_code;
case 0x4F: case 0x50: case 0x51: /* keypad 1,2,3 */ case 0x4F: case 0x50: case 0x51: /* keypad 1,2,3 */
state->ks_composed_char *= 10; state->ks_composed_char *= 10;
state->ks_composed_char += scancode - 0x4E; state->ks_composed_char += keycode - 0x4E;
if (state->ks_composed_char > UCHAR_MAX) if (state->ks_composed_char > UCHAR_MAX)
return ERRKEY; return ERRKEY;
goto next_code; goto next_code;