Attachment 6625 Details for Bug 5613 – missing parts

[patch] missing parts

patch-xorg-hurd-7.1-2 (text/plain), 9.81 KB, created by Samuel Thibault on 2006-08-20 12:50:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samuel Thibault

Created: 2006-08-20 12:50:18 UTC

Size: 9.81 KB

patch

obsolete

>diff -ur /usr/src/xorg-git/xserver/hw/xfree86/os-support/hurd/Makefile.am xserver/hw/xfree86/os-support/hurd/Makefile.am
>--- /usr/src/xorg-git/xserver/hw/xfree86/os-support/hurd/Makefile.am	2006-08-19 14:25:20.000000000 +0200
>+++ xserver/hw/xfree86/os-support/hurd/Makefile.am	2006-08-20 23:28:33.000000000 +0200
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libhurd.la
> 
>-libhurd_la_SOURCES = hurd_init.c hurd_mmap.c \
>+libhurd_la_SOURCES = hurd_init.c hurd_io.c hurd_mmap.c hurd_kbd.c \
> 		hurd_mouse.c hurd_video.c \
> 		$(srcdir)/../shared/VTsw_noop.c \
> 		$(srcdir)/../shared/posix_tty.c \
>@@ -10,8 +10,9 @@
> 		$(srcdir)/../shared/sigiostubs.c \
> 		$(srcdir)/../shared/pm_noop.c \
> 		$(srcdir)/../shared/kmod_noop.c \
>-		$(srcdir)/../shared/agp_noop.c
>+		$(srcdir)/../shared/agp_noop.c \
>+		$(srcdir)/../shared/at_scancode.c
> 
>-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
> 
> INCLUDES = $(XORG_INCS)
>diff -urN xorg-server-X11R7.0-1.0.1-orig/hw/xfree86/os-support/hurd/hurd_io.c xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/hurd/hurd_io.c
>--- xorg-server-X11R7.0-1.0.1-orig/hw/xfree86/os-support/hurd/hurd_io.c	1970-01-01 01:00:00.000000000 +0100
>+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/hurd/hurd_io.c	2006-01-14 04:56:22.000000000 +0100
>@@ -0,0 +1,131 @@
>+/*
>+ * 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 $ */
>+
>+#define NEED_EVENTS
>+#ifdef HAVE_XORG_CONFIG_H
>+#include <xorg-config.h>
>+#endif
>+
>+#include <X11/X.h>
>+#include <X11/Xproto.h>
>+#include "inputstr.h"
>+#include "scrnintstr.h"
>+#include "mipointer.h"
>+
>+#include "compiler.h"
>+
>+#include "xf86.h"
>+#include "xf86Priv.h"
>+#include "xf86_OSlib.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
>+ **********************************************************************/
>+void 
>+xf86SoundKbdBell(int loudness,int pitch,int duration)
>+{
>+    return;
>+}
>+
>+void 
>+xf86SetKbdLeds(int leds)
>+{
>+    return;
>+}
>+
>+int 
>+xf86GetKbdLeds()
>+{
>+    return 0;
>+}
>+
>+void 
>+xf86SetKbdRepeat(char rad)
>+{
>+    return;
>+}
>+
>+void 
>+xf86KbdInit()
>+{
>+    return;
>+}
>+int
>+xf86KbdOn()
>+{
>+    int data = 1;
>+    if( ioctl( xf86Info.consoleFd, _IOW('k', 1, int),&data) < 0)
>+	FatalError("Cannot set event mode on keyboard (%s)\n",strerror(errno));
>+    return xf86Info.consoleFd;
>+}
>+int
>+xf86KbdOff()
>+{
>+    int data = 2;
>+    if( ioctl( xf86Info.consoleFd, _IOW('k', 1, int),&data) < 0)
>+	FatalError("can't reset keyboard mode (%s)\n",strerror(errno));
>+}
>+
>+void
>+xf86KbdEvents()
>+{
>+    kd_event ke;
>+    while( read(xf86Info.consoleFd, &ke, sizeof(ke)) == sizeof(ke) )
>+	xf86PostKbdEvent(ke.value.sc);
>+}
>diff -urN xorg-server-X11R7.0-1.0.1-orig/hw/xfree86/os-support/hurd/hurd_kbd.c xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/hurd/hurd_kbd.c
>--- xorg-server-X11R7.0-1.0.1-orig/hw/xfree86/os-support/hurd/hurd_kbd.c	1970-01-01 01:00:00.000000000 +0100
>+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/hurd/hurd_kbd.c	2006-01-16 00:47:31.000000000 +0100
>@@ -0,0 +1,176 @@
>+/*
>+ * 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 $ */
>+
>+#define NEED_EVENTS
>+#ifdef HAVE_XORG_CONFIG_H
>+#include <xorg-config.h>
>+#endif
>+
>+#include <X11/X.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;
>+}

Actions: View | Splinter Review

Attachments on bug 5613: 4360 | 4895 | 4896 | 6622 | 6625 | 6707 | 7643 | 8150

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.