frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual page X(7) does not reference Xprt(1x), xplsprinters(1x), etc. 

xc/config/cf/Imake.rules Correct comment to match rule name for
    InstallDriverSDKObjectModule
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c Log results of
    ioctls to probe keyboard type & layout
This commit is contained in:
Alan Coopersmith 2004-06-13 04:50:21 +00:00
parent 4ffde8a6b3
commit 95d65cf6bb
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xfree86/os-support/solaris/sun_kbd.c
View File

@ -23,7 +23,9 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XdotOrg:$ */
#include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
@ -55,6 +57,7 @@ void
xf86KbdInit() xf86KbdInit()
{ {
int klayout; int klayout;
const char *ktype_name;
if (xf86Info.kbdFd < 0) { if (xf86Info.kbdFd < 0) {
xf86Info.kbdFd = open("/dev/kbd", O_RDWR|O_NONBLOCK); xf86Info.kbdFd = open("/dev/kbd", O_RDWR|O_NONBLOCK);
@ -63,7 +66,7 @@ xf86KbdInit()
} }
/* /*
* None of the followin should ever fail. If it does, something is * None of the following should ever fail. If it does, something is
* broken (IMO) - DWH 8/21/99 * broken (IMO) - DWH 8/21/99
*/ */
@ -78,6 +81,21 @@ xf86KbdInit()
if (ioctl(xf86Info.kbdFd, KIOCGDIRECT, &sun_odirect) < 0) if (ioctl(xf86Info.kbdFd, KIOCGDIRECT, &sun_odirect) < 0)
FatalError("Unable to determine keyboard direct setting\n"); FatalError("Unable to determine keyboard direct setting\n");
switch (sun_ktype) {
case KB_SUN3:
ktype_name = "Sun Type 3"; break;
case KB_SUN4:
ktype_name = "Sun Type 4/5/6"; break;
case KB_USB:
ktype_name = "USB"; break;
case KB_PC:
ktype_name = "PC"; break;
default:
ktype_name = "Unknown"; break;
}
xf86Msg(X_PROBED, "Keyboard type: %s (%d)\n", ktype_name, sun_ktype);
xf86Msg(X_PROBED, "Keyboard layout: %d\n", klayout);
} }
int int