ports/71937: x11-servers/XFree86-4-Server has keyboard problem on pc98

[Dejan Lesjak]

The following reply was made to PR ports/71937; it has been noted by GNATS.

From: Dejan Lesjak <dejan.lesjak at ijs.si>
To: freebsd-gnats-submit at freebsd.org, nakaji at jp.freebsd.org
Cc:  
Subject: Re: ports/71937: x11-servers/XFree86-4-Server has keyboard problem on pc98
Date: Tue, 21 Sep 2004 16:46:54 +0200

 --Boundary-00=_f7DUB0wgCsCC0pH
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 The patch by Satoshi Kimura has already been commited to XFree86 CVS, so I've 
 taken diffs from there (also for other patches he sent). Since there is a 
 slight modification, could you please confirm that this one also works as 
 expected.
 
 --Boundary-00=_f7DUB0wgCsCC0pH
 Content-Type: text/x-csrc;
   charset="us-ascii";
   name="patch-programs::Xserver::hw::xfree86::common::xf86Events.c"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="patch-programs::Xserver::hw::xfree86::common::xf86Events.c"
 
 Index: programs/Xserver/hw/xfree86/common/xf86Events.c
 ===================================================================
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v
 retrieving revision 3.162
 retrieving revision 3.163
 diff -u -r3.162 -r3.163
 --- programs/Xserver/hw/xfree86/common/xf86Events.c	3 Apr 2004 22:31:23 -0000	3.162
 +++ programs/Xserver/hw/xfree86/common/xf86Events.c	8 Jun 2004 01:28:56 -0000	3.163
 @@ -1,4 +1,4 @@
 -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.162 2004/04/03 22:31:23 dawes Exp $ */
 +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.163 2004/06/08 01:28:56 dawes Exp $ */
  /*
   * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
   *
 @@ -543,7 +543,7 @@
        }
      } else
  #endif /* i386 && SVR4 */
 -    {
 +    if (!xf86IsPc98()) {
        switch (scanCode) {
        case 0x59:        scanCode = KEY_0x59; break;
        case 0x5a:        scanCode = KEY_0x5A; break;
 @@ -655,10 +655,12 @@
     * they need to get the same key code as the base key on the same
     * physical keyboard key.
     */
 -  if (scanCode == KEY_SysReqest)
 -    scanCode = KEY_Print;
 -  else if (scanCode == KEY_Break)
 -    scanCode = KEY_Pause;
 +  if (xf86IsPc98()) {
 +    if (scanCode == KEY_SysReqest)
 +      scanCode = KEY_Print;
 +    else if (scanCode == KEY_Break)
 +      scanCode = KEY_Pause;
 +  }
  #endif
    
    /*
 
 --Boundary-00=_f7DUB0wgCsCC0pH--