Bug#349203: xserver-xorg: Keyboard scancode translation for Hurd
Hi,
Here is the updated 809_keyboard.diff patch, combination of the old one
and th proposed patch.
Regards,
Samuel
Index: xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile
===================================================================
--- xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile 2006-01-08 19:20:33.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile 2006-01-18 11:07:59.000000000 +0100
@@ -7,13 +7,15 @@
MOUSESRC = hurd_mouse.c
MOUSEOBJ = hurd_mouse.o
-SRCS = hurd_init.c hurd_video.c hurd_io.c libc_wrapper.c $(BIOS_MOD).c \
- VTsw_noop.c posix_tty.c $(MOUSESRC) \
- stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c agp_noop.c
+SRCS = hurd_init.c hurd_video.c hurd_io.c hurd_kbd.c libc_wrapper.c \
+ $(BIOS_MOD).c VTsw_noop.c posix_tty.c $(MOUSESRC) \
+ stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c agp_noop.c \
+ at_scancode.c
-OBJS = hurd_init.o hurd_video.o hurd_io.o libc_wrapper.o $(BIOS_MOD).o \
- VTsw_noop.o posix_tty.o $(MOUSEOBJ) \
- stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o agp_noop.o
+OBJS = hurd_init.o hurd_video.o hurd_io.o hurd_kbd.o libc_wrapper.o \
+ $(BIOS_MOD).o VTsw_noop.o posix_tty.o $(MOUSEOBJ) \
+ stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o agp_noop.o \
+ at_scancode.o
INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
-I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi
@@ -35,6 +37,7 @@
LinkSourceFile(pm_noop.c,../shared)
LinkSourceFile(kmod_noop.c,../shared)
LinkSourceFile(agp_noop.c,../shared)
+LinkSourceFile(at_scancode.c,../shared)
DependTarget()
unchanged:
Index: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c
===================================================================
--- xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c.orig 2006-01-08 19:20:20.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c 2006-01-08 19:20:33.000000000 -0500
@@ -129,11 +129,3 @@
while( read(xf86Info.consoleFd, &ke, sizeof(ke)) == sizeof(ke) )
xf86PostKbdEvent(ke.value.sc);
}
-
-#include "xf86OSKbd.h"
-
-Bool
-xf86OSKbdPreInit(InputInfoPtr pInfo)
-{
- return FALSE;
-}
Index: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_kbd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_kbd.c 2006-01-08 19:20:33.000000000 -0500
@@ -0,0 +1,172 @@
+/*
+ * Copyright 1997,1998 by UCHIYAMA Yasushi
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of UCHIYAMA Yasushi not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. UCHIYAMA Yasushi makes no representations
+ * about the suitability of this software for any purpose. It is provided
+ * "as is" without express or implied warranty.
+ *
+ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c,v 1.8 2002/10/11 01:40:35 dawes Exp $ */
+
+#include "X.h"
+#include "input.h"
+
+#include "compiler.h"
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+#include "xf86Xinput.h"
+#include "xf86OSKbd.h"
+#include "atKeynames.h"
+#include "xf86Keymap.h"
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/file.h>
+#include <assert.h>
+#include <mach.h>
+#include <sys/ioctl.h>
+
+typedef unsigned short kev_type; /* kd event type */
+typedef unsigned char Scancode;
+
+struct mouse_motion {
+ short mm_deltaX; /* units? */
+ short mm_deltaY;
+};
+
+typedef struct {
+ kev_type type; /* see below */
+ struct timeval time; /* timestamp */
+ union { /* value associated with event */
+ boolean_t up; /* MOUSE_LEFT .. MOUSE_RIGHT */
+ Scancode sc; /* KEYBD_EVENT */
+ struct mouse_motion mmotion; /* MOUSE_MOTION */
+ } value;
+} kd_event;
+
+/*
+ * kd_event ID's.
+ */
+#define MOUSE_LEFT 1 /* mouse left button up/down */
+#define MOUSE_MIDDLE 2
+#define MOUSE_RIGHT 3
+#define MOUSE_MOTION 4 /* mouse motion */
+#define KEYBD_EVENT 5 /* key up/down */
+
+/***********************************************************************
+ * Keyboard
+ **********************************************************************/
+static void
+SoundKbdBell(InputInfoPtr pInfo, int loudness,int pitch,int duration)
+{
+ return;
+}
+
+static void
+SetKbdLeds(InputInfoPtr pInfo, int leds)
+{
+ return;
+}
+
+static int
+GetKbdLeds(InputInfoPtr pInfo)
+{
+ return 0;
+}
+
+static void
+SetKbdRepeat(InputInfoPtr pInfo, char rad)
+{
+ return;
+}
+
+static void
+KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
+{
+ pKeySyms->map = map;
+ pKeySyms->mapWidth = GLYPHS_PER_KEY;
+ pKeySyms->minKeyCode = MIN_KEYCODE;
+ pKeySyms->maxKeyCode = MAX_KEYCODE;
+ return;
+}
+
+static int
+KbdOn(InputInfoPtr pInfo, int what)
+{
+ int data = 1;
+ if( ioctl( pInfo->fd, _IOW('k', 1, int),&data) < 0)
+ FatalError("Cannot set event mode on keyboard (%s)\n",strerror(errno));
+ return Success;
+}
+static int
+KbdOff(InputInfoPtr pInfo, int what)
+{
+ int data = 2;
+ if( ioctl( pInfo->fd, _IOW('k', 1, int),&data) < 0)
+ FatalError("can't reset keyboard mode (%s)\n",strerror(errno));
+ return Success;
+}
+
+static int
+KbdInit(InputInfoPtr pInfo, int what)
+{
+ return Success;
+}
+
+static void
+ReadInput(InputInfoPtr pInfo)
+{
+ KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
+ kd_event ke;
+ while( read(pInfo->fd, &ke, sizeof(ke)) == sizeof(ke) )
+ pKbd->PostEvent(pInfo, ke.value.sc & 0x7f, ke.value.sc & 0x80 ? FALSE : TRUE);
+}
+
+static Bool
+OpenKeyboard(InputInfoPtr pInfo)
+{
+ pInfo->fd = xf86Info.consoleFd;
+ return TRUE;
+}
+
+Bool
+xf86OSKbdPreInit(InputInfoPtr pInfo)
+{
+ KbdDevPtr pKbd = pInfo->private;
+
+ pKbd->KbdInit = KbdInit;
+ pKbd->KbdOn = KbdOn;
+ pKbd->KbdOff = KbdOff;
+ pKbd->Bell = SoundKbdBell;
+ pKbd->SetLeds = SetKbdLeds;
+ pKbd->GetLeds = GetKbdLeds;
+ pKbd->SetKbdRepeat = SetKbdRepeat;
+ pKbd->KbdGetMapping = KbdGetMapping;
+ pKbd->SpecialKey = NULL;
+ pKbd->RemapScanCode = ATScancode;
+ pKbd->GetSpecialKey = NULL;
+ pKbd->OpenKeyboard = OpenKeyboard;
+ pKbd->vtSwitchSupported = FALSE;
+ pKbd->CustomKeycodes = FALSE;
+ pKbd->private = NULL;
+ pInfo->read_input = ReadInput;
+ return TRUE;
+}
Reply to: