Группа :: Система/X11
Пакет: xorg-x11
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: xorg-x11-6.8.2-cvs-evdev.patch
Скачать
Скачать
diff -Naur xorg-x11-6.8.2/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c xorg-x11-6.8.x.99/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c
--- xorg-x11-6.8.2/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 1970-01-01 03:00:00 +0300
+++ xorg-x11-6.8.x.99/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c 2005-07-25 21:08:33 +0400
@@ -0,0 +1,732 @@
+/*
+ * Copyright б╘ 2004 Red Hat, Inc.
+ *
+ * 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 Red Hat
+ * not be used in advertising or publicity pertaining to distribution
+ * of the software without specific, written prior permission. Red
+ * Hat makes no representations about the suitability of this software
+ * for any purpose. It is provided "as is" without express or implied
+ * warranty.
+ *
+ * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL RED HAT 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.
+ *
+ * Author: Kristian Hц╦gsberg (krh@redhat.com)
+ */
+
+
+
+
+
+#include <X11/keysym.h>
+#include <X11/XF86keysym.h>
+#include <X11/extensions/XIproto.h>
+
+/* The libc wrapper just blows... linux/input.h must be included
+ * before xf86_ansic.h and xf86_libc.h so we avoid defining ioctl
+ * twice. */
+
+#include <linux/input.h>
+
+#include <misc.h>
+#include <xf86.h>
+#include <xf86str.h>
+#include <xf86_OSproc.h>
+#include <xf86_ansic.h>
+#include <xf86_libc.h>
+#include <xf86Xinput.h>
+#include <exevents.h>
+#include <mipointer.h>
+
+#include <xf86Module.h>
+
+/* 2.4 compatibility */
+#ifndef EVIOCGRAB
+#define EVIOCGRAB _IOW('E', 0x90, int)+#endif
+
+#ifndef EV_SYN
+#define EV_SYN EV_RST
+#endif
+/* end compat */
+
+#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
+
+#define MIN_KEYCODE 8
+#define GLYPHS_PER_KEY 2
+#define AltMask Mod1Mask
+#define NumLockMask Mod2Mask
+#define AltLangMask Mod3Mask
+#define KanaMask Mod4Mask
+#define ScrollLockMask Mod5Mask
+
+#define CAPSFLAG 1
+#define NUMFLAG 2
+#define SCROLLFLAG 4
+#define MODEFLAG 8
+#define COMPOSEFLAG 16
+
+typedef struct {+ int kernel24;
+} EvdevRec, *EvdevPtr;
+
+static int wheel_up_button = 4;
+static int wheel_down_button = 5;
+static int wheel_left_button = 6;
+static int wheel_right_button = 7;
+
+static void
+PostButtonClicks(InputInfoPtr pInfo, int button, int count)
+{+ int i;
+
+ for (i = 0; i < count; i++) {+ xf86PostButtonEvent(pInfo->dev, 0, button, 1, 0, 0);
+ xf86PostButtonEvent(pInfo->dev, 0, button, 0, 0, 0);
+ }
+}
+
+static void
+EvdevReadInput(InputInfoPtr pInfo)
+{+ struct input_event ev;
+ int len, value;
+ int dx, dy;
+
+ dx = 0;
+ dy = 0;
+
+ while (xf86WaitForInput (pInfo->fd, 0) > 0) {+ len = read(pInfo->fd, &ev, sizeof ev);
+ if (len != sizeof ev) {+ /* The kernel promises that we always only read a complete
+ * event, so len != sizeof ev is an error. */
+ xf86Msg(X_ERROR, "Read error: %s\n", strerror(errno));
+ break;
+ }
+
+ /* Get the signed value, earlier kernels had this as unsigned */
+ value = ev.value;
+
+ switch (ev.type) {+ case EV_REL:
+ switch (ev.code) {+ case REL_X:
+ dx += value;
+ break;
+
+ case REL_Y:
+ dy += value;
+ break;
+
+ case REL_WHEEL:
+ if (value > 0)
+ PostButtonClicks(pInfo, wheel_up_button, value);
+ if (value < 0)
+ PostButtonClicks(pInfo, wheel_down_button, -value);
+ break;
+
+ case REL_HWHEEL:
+ if (value > 0)
+ PostButtonClicks(pInfo, wheel_right_button, value);
+ if (value < 0)
+ PostButtonClicks(pInfo, wheel_left_button, -value);
+ break;
+ }
+ break;
+
+ case EV_ABS:
+ break;
+
+ case EV_KEY:
+ switch (ev.code) {+ case BTN_LEFT:
+ case BTN_RIGHT:
+ case BTN_MIDDLE:
+ xf86PostButtonEvent(pInfo->dev, 0, ev.code - BTN_LEFT + 1,
+ value, 0, 0);
+ break;
+
+ case BTN_SIDE:
+ case BTN_EXTRA:
+ case BTN_FORWARD:
+ case BTN_BACK:
+ case BTN_TASK:
+ xf86PostButtonEvent(pInfo->dev, 0, ev.code - BTN_LEFT + 5,
+ value, 0, 0);
+ break;
+
+ default:
+ xf86PostKeyboardEvent(pInfo->dev,
+ ev.code + MIN_KEYCODE, value);
+ }
+ break;
+
+ case EV_SYN:
+ break;
+ }
+ }
+
+ if (dx != 0 || dy != 0)
+ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
+}
+
+#define TestBit(bit, array) (array[(bit) / 8] & (1 << ((bit) % 8)))
+
+static void
+EvdevPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
+{+ /* Nothing to do, dix handles all settings */
+}
+
+/* FIXME: this map works with evdev keyboards, but all the xkb maps
+ * probably don't. The easiest is to remap the event keycodes. */
+
+static KeySym map[] = {+ /* 0x00 */ NoSymbol, NoSymbol,
+ /* 0x01 */ XK_Escape, NoSymbol,
+ /* 0x02 */ XK_1, XK_exclam,
+ /* 0x03 */ XK_2, XK_at,
+ /* 0x04 */ XK_3, XK_numbersign,
+ /* 0x05 */ XK_4, XK_dollar,
+ /* 0x06 */ XK_5, XK_percent,
+ /* 0x07 */ XK_6, XK_asciicircum,
+ /* 0x08 */ XK_7, XK_ampersand,
+ /* 0x09 */ XK_8, XK_asterisk,
+ /* 0x0a */ XK_9, XK_parenleft,
+ /* 0x0b */ XK_0, XK_parenright,
+ /* 0x0c */ XK_minus, XK_underscore,
+ /* 0x0d */ XK_equal, XK_plus,
+ /* 0x0e */ XK_BackSpace, NoSymbol,
+ /* 0x0f */ XK_Tab, XK_ISO_Left_Tab,
+ /* 0x10 */ XK_Q, NoSymbol,
+ /* 0x11 */ XK_W, NoSymbol,
+ /* 0x12 */ XK_E, NoSymbol,
+ /* 0x13 */ XK_R, NoSymbol,
+ /* 0x14 */ XK_T, NoSymbol,
+ /* 0x15 */ XK_Y, NoSymbol,
+ /* 0x16 */ XK_U, NoSymbol,
+ /* 0x17 */ XK_I, NoSymbol,
+ /* 0x18 */ XK_O, NoSymbol,
+ /* 0x19 */ XK_P, NoSymbol,
+ /* 0x1a */ XK_bracketleft, XK_braceleft,
+ /* 0x1b */ XK_bracketright,XK_braceright,
+ /* 0x1c */ XK_Return, NoSymbol,
+ /* 0x1d */ XK_Control_L, NoSymbol,
+ /* 0x1e */ XK_A, NoSymbol,
+ /* 0x1f */ XK_S, NoSymbol,
+ /* 0x20 */ XK_D, NoSymbol,
+ /* 0x21 */ XK_F, NoSymbol,
+ /* 0x22 */ XK_G, NoSymbol,
+ /* 0x23 */ XK_H, NoSymbol,
+ /* 0x24 */ XK_J, NoSymbol,
+ /* 0x25 */ XK_K, NoSymbol,
+ /* 0x26 */ XK_L, NoSymbol,
+ /* 0x27 */ XK_semicolon, XK_colon,
+ /* 0x28 */ XK_quoteright, XK_quotedbl,
+ /* 0x29 */ XK_quoteleft, XK_asciitilde,
+ /* 0x2a */ XK_Shift_L, NoSymbol,
+ /* 0x2b */ XK_backslash, XK_bar,
+ /* 0x2c */ XK_Z, NoSymbol,
+ /* 0x2d */ XK_X, NoSymbol,
+ /* 0x2e */ XK_C, NoSymbol,
+ /* 0x2f */ XK_V, NoSymbol,
+ /* 0x30 */ XK_B, NoSymbol,
+ /* 0x31 */ XK_N, NoSymbol,
+ /* 0x32 */ XK_M, NoSymbol,
+ /* 0x33 */ XK_comma, XK_less,
+ /* 0x34 */ XK_period, XK_greater,
+ /* 0x35 */ XK_slash, XK_question,
+ /* 0x36 */ XK_Shift_R, NoSymbol,
+ /* 0x37 */ XK_KP_Multiply, NoSymbol,
+ /* 0x38 */ XK_Alt_L, XK_Meta_L,
+ /* 0x39 */ XK_space, NoSymbol,
+ /* 0x3a */ XK_Caps_Lock, NoSymbol,
+ /* 0x3b */ XK_F1, NoSymbol,
+ /* 0x3c */ XK_F2, NoSymbol,
+ /* 0x3d */ XK_F3, NoSymbol,
+ /* 0x3e */ XK_F4, NoSymbol,
+ /* 0x3f */ XK_F5, NoSymbol,
+ /* 0x40 */ XK_F6, NoSymbol,
+ /* 0x41 */ XK_F7, NoSymbol,
+ /* 0x42 */ XK_F8, NoSymbol,
+ /* 0x43 */ XK_F9, NoSymbol,
+ /* 0x44 */ XK_F10, NoSymbol,
+ /* 0x45 */ XK_Num_Lock, NoSymbol,
+ /* 0x46 */ XK_Scroll_Lock, NoSymbol,
+ /* These KP keys should have the KP_7 keysyms in the numlock
+ * modifer... ? */
+ /* 0x47 */ XK_KP_Home, XK_KP_7,
+ /* 0x48 */ XK_KP_Up, XK_KP_8,
+ /* 0x49 */ XK_KP_Prior, XK_KP_9,
+ /* 0x4a */ XK_KP_Subtract, NoSymbol,
+ /* 0x4b */ XK_KP_Left, XK_KP_4,
+ /* 0x4c */ XK_KP_Begin, XK_KP_5,
+ /* 0x4d */ XK_KP_Right, XK_KP_6,
+ /* 0x4e */ XK_KP_Add, NoSymbol,
+ /* 0x4f */ XK_KP_End, XK_KP_1,
+ /* 0x50 */ XK_KP_Down, XK_KP_2,
+ /* 0x51 */ XK_KP_Next, XK_KP_3,
+ /* 0x52 */ XK_KP_Insert, XK_KP_0,
+ /* 0x53 */ XK_KP_Delete, XK_KP_Decimal,
+ /* 0x54 */ NoSymbol, NoSymbol,
+ /* 0x55 */ XK_F13, NoSymbol,
+ /* 0x56 */ XK_less, XK_greater,
+ /* 0x57 */ XK_F11, NoSymbol,
+ /* 0x58 */ XK_F12, NoSymbol,
+ /* 0x59 */ XK_F14, NoSymbol,
+ /* 0x5a */ XK_F15, NoSymbol,
+ /* 0x5b */ XK_F16, NoSymbol,
+ /* 0x5c */ XK_F17, NoSymbol,
+ /* 0x5d */ XK_F18, NoSymbol,
+ /* 0x5e */ XK_F19, NoSymbol,
+ /* 0x5f */ XK_F20, NoSymbol,
+ /* 0x60 */ XK_KP_Enter, NoSymbol,
+ /* 0x61 */ XK_Control_R, NoSymbol,
+ /* 0x62 */ XK_KP_Divide, NoSymbol,
+ /* 0x63 */ XK_Print, XK_Sys_Req,
+ /* 0x64 */ XK_Alt_R, XK_Meta_R,
+ /* 0x65 */ NoSymbol, NoSymbol, /* KEY_LINEFEED */
+ /* 0x66 */ XK_Home, NoSymbol,
+ /* 0x67 */ XK_Up, NoSymbol,
+ /* 0x68 */ XK_Prior, NoSymbol,
+ /* 0x69 */ XK_Left, NoSymbol,
+ /* 0x6a */ XK_Right, NoSymbol,
+ /* 0x6b */ XK_End, NoSymbol,
+ /* 0x6c */ XK_Down, NoSymbol,
+ /* 0x6d */ XK_Next, NoSymbol,
+ /* 0x6e */ XK_Insert, NoSymbol,
+ /* 0x6f */ XK_Delete, NoSymbol,
+ /* 0x6f */ NoSymbol, NoSymbol, /* KEY_MACRO */
+ /* 0x70 */ NoSymbol, NoSymbol,
+ /* 0x71 */ NoSymbol, NoSymbol,
+ /* 0x72 */ NoSymbol, NoSymbol,
+ /* 0x73 */ NoSymbol, NoSymbol,
+ /* 0x74 */ NoSymbol, NoSymbol,
+ /* 0x75 */ XK_KP_Equal, NoSymbol,
+ /* 0x76 */ NoSymbol, NoSymbol,
+ /* 0x77 */ NoSymbol, NoSymbol,
+ /* 0x78 */ XK_F21, NoSymbol,
+ /* 0x79 */ XK_F22, NoSymbol,
+ /* 0x7a */ XK_F23, NoSymbol,
+ /* 0x7b */ XK_F24, NoSymbol,
+ /* 0x7c */ XK_KP_Separator, NoSymbol,
+ /* 0x7d */ XK_Meta_L, NoSymbol,
+ /* 0x7e */ XK_Meta_R, NoSymbol,
+ /* 0x7f */ XK_Multi_key, NoSymbol,
+};
+
+static void
+EvdevKbdBell(int percent, DeviceIntPtr dev, pointer ctrl, int unused)
+{+ /* hat */
+}
+
+static void
+EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl)
+{+ static struct { int xbit, code; } bits[] = {+ { CAPSFLAG, LED_CAPSL },+ { NUMFLAG, LED_NUML },+ { SCROLLFLAG, LED_SCROLLL },+ { MODEFLAG, LED_KANA },+ { COMPOSEFLAG, LED_COMPOSE }+ };
+
+ InputInfoPtr pInfo;
+ struct input_event ev[ArrayLength(bits)];
+ int i;
+
+ pInfo = device->public.devicePrivate;
+ for (i = 0; i < ArrayLength(bits); i++) {+ ev[i].type = EV_LED;
+ ev[i].code = bits[i].code;
+ ev[i].value = (ctrl->leds & bits[i].xbit) > 0;
+ }
+
+ write(pInfo->fd, ev, sizeof ev);
+}
+
+static int
+EvdevAddKeyClass(DeviceIntPtr device)
+{+ InputInfoPtr pInfo;
+ KeySymsRec keySyms;
+ CARD8 modMap[MAP_LENGTH];
+ KeySym sym;
+ int i, j;
+
+ static struct { KeySym keysym; CARD8 mask; } modifiers[] = {+ { XK_Shift_L, ShiftMask },+ { XK_Shift_R, ShiftMask },+ { XK_Control_L, ControlMask },+ { XK_Control_R, ControlMask },+ { XK_Caps_Lock, LockMask },+ { XK_Alt_L, AltMask },+ { XK_Alt_R, AltMask },+ { XK_Num_Lock, NumLockMask },+ { XK_Scroll_Lock, ScrollLockMask },+ { XK_Mode_switch, AltLangMask }+ };
+
+ /* TODO:
+ * Ctrl-Alt-Backspace and other Ctrl-Alt-stuff should work
+ * XKB, let's try without the #ifdef nightmare
+ * Get keyboard repeat under control (right now caps lock repeats!)
+ */
+
+ pInfo = device->public.devicePrivate;
+
+ /* Compute the modifier map */
+ memset(modMap, 0, sizeof modMap);
+
+ for (i = 0; i < ArrayLength(map) / GLYPHS_PER_KEY; i++) {+ sym = map[i * GLYPHS_PER_KEY];
+ for (j = 0; j < ArrayLength(modifiers); j++) {+ if (modifiers[j].keysym == sym)
+ modMap[i + MIN_KEYCODE] = modifiers[j].mask;
+ }
+ }
+
+ keySyms.map = map;
+ keySyms.mapWidth = GLYPHS_PER_KEY;
+ keySyms.minKeyCode = MIN_KEYCODE;
+ keySyms.maxKeyCode = MIN_KEYCODE + ArrayLength(map) / GLYPHS_PER_KEY - 1;
+
+ if (!InitKeyClassDeviceStruct(device, &keySyms, modMap))
+ return !Success;
+
+ if (!InitFocusClassDeviceStruct(device))
+ return !Success;
+
+ if (!InitKbdFeedbackClassDeviceStruct(device, EvdevKbdBell, EvdevKbdCtrl))
+ return !Success;
+
+ pInfo->flags |= XI86_KEYBOARD_CAPABLE;
+
+ return Success;
+}
+
+static int
+EvdevAddRelClass(DeviceIntPtr device)
+{+ InputInfoPtr pInfo;
+
+ pInfo = device->public.devicePrivate;
+
+ if (!InitValuatorClassDeviceStruct(device, 2,
+ miPointerGetMotionEvents,
+ miPointerGetMotionBufferSize(), 0))
+ return !Success;
+
+ /* X valuator */
+ xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+ xf86InitValuatorDefaults(device, 0);
+
+ /* Y valuator */
+ xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+ xf86InitValuatorDefaults(device, 1);
+ xf86MotionHistoryAllocate(pInfo);
+
+ if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+ return !Success;
+
+ return Success;
+}
+
+static int
+EvdevAddButtonClass(DeviceIntPtr device)
+{+ CARD8 map[32];
+ InputInfoPtr pInfo;
+ int i;
+
+ pInfo = device->public.devicePrivate;
+
+ /* FIXME: count number of actual buttons */
+
+ for (i = 0; i < ArrayLength(map); i++)
+ map[i] = i;
+
+ /* Linux reports BTN_LEFT, BTN_RIGHT, BTN_MIDDLE, which should map
+ * to buttons 1, 2 and 3, so swap 2 and 3 in the map */
+ map[2] = 3;
+ map[3] = 2;
+
+ if (!InitButtonClassDeviceStruct(device, ArrayLength(map), map))
+ return !Success;
+
+ pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
+
+ return Success;
+}
+
+static int
+EvdevInit(DeviceIntPtr device)
+{+ InputInfoPtr pInfo;
+
+ pInfo = device->public.devicePrivate;
+
+ /* FIXME: This doesn't add buttons for keyboards with
+ * scrollwheels. */
+
+ if (pInfo->flags & XI86_KEYBOARD_CAPABLE) {+ EvdevAddKeyClass(device);
+ }
+
+ if (pInfo->flags & XI86_POINTER_CAPABLE) {+ EvdevAddButtonClass(device);
+ EvdevAddRelClass(device);
+ }
+
+ return Success;
+}
+
+static int
+EvdevProc(DeviceIntPtr device, int what)
+{+ InputInfoPtr pInfo;
+ EvdevPtr pEvdev;
+
+ pInfo = device->public.devicePrivate;
+ pEvdev = pInfo->private;
+
+ switch (what)
+ {+ case DEVICE_INIT:
+ return EvdevInit(device);
+
+ case DEVICE_ON:
+ if (!pEvdev->kernel24 && ioctl(pInfo->fd, EVIOCGRAB, (void *)1))
+ xf86Msg(X_WARNING, "%s: Grab failed (%s)\n", pInfo->name,
+ strerror(errno));
+ xf86AddEnabledDevice(pInfo);
+ device->public.on = TRUE;
+ break;
+
+ case DEVICE_OFF:
+ if (!pEvdev->kernel24 && ioctl(pInfo->fd, EVIOCGRAB, (void *)0))
+ xf86Msg(X_WARNING, "%s: Release failed (%s)\n", pInfo->name,
+ strerror(errno));
+ xf86RemoveEnabledDevice(pInfo);
+ device->public.on = FALSE;
+ break;
+
+ case DEVICE_CLOSE:
+ xf86Msg(X_INFO, "%s: Close\n", pInfo->name);
+ break;
+ }
+
+ return Success;
+}
+
+static Bool
+EvdevConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
+ int v3, int v4, int v5, int *x, int *y)
+{+ if (first == 0 && num == 2) {+ *x = v0;
+ *y = v1;
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+static int
+EvdevProbe(InputInfoPtr pInfo)
+{+ char key_bitmask[(KEY_MAX + 7) / 8];
+ char rel_bitmask[(REL_MAX + 7) / 8];
+ int i, has_axes, has_buttons, has_keys;
+ EvdevPtr pEvdev = pInfo->private;
+
+ if (ioctl(pInfo->fd, EVIOCGRAB, (void *)1) && errno == EINVAL) {+ /* keyboards are unsafe in 2.4 */
+ pEvdev->kernel24 = 1;
+ } else {+ ioctl(pInfo->fd, EVIOCGRAB, (void *)0);
+ }
+
+ if (ioctl(pInfo->fd,
+ EVIOCGBIT(EV_REL, sizeof(rel_bitmask)), rel_bitmask) < 0) {+ xf86Msg(X_ERROR, "ioctl EVIOCGBIT failed: %s\n", strerror(errno));
+ return 1;
+ }
+
+ if (ioctl(pInfo->fd,
+ EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), key_bitmask) < 0) {+ xf86Msg(X_ERROR, "ioctl EVIOCGBIT failed: %s\n", strerror(errno));
+ return 1;
+ }
+
+ has_axes = FALSE;
+ has_buttons = FALSE;
+ has_keys = FALSE;
+
+ if (TestBit(REL_X, rel_bitmask) && TestBit(REL_Y, rel_bitmask)) {+ xf86Msg(X_INFO, "%s: Found x and y relative axes\n", pInfo->name);
+ has_axes = TRUE;
+ }
+
+
+ if (TestBit(BTN_LEFT, key_bitmask)) {+ xf86Msg(X_INFO, "%s: Found mouse buttons\n", pInfo->name);
+ has_buttons = TRUE;
+ }
+
+ for (i = 0; i < BTN_MISC; i++)
+ if (TestBit(i, key_bitmask))
+ break;
+
+ if (i < BTN_MISC) {+ xf86Msg(X_INFO, "%s: Found keys\n", pInfo->name);
+ has_keys = TRUE;
+ }
+
+ if (has_axes && has_buttons) {+ xf86Msg(X_INFO, "%s: Configuring as mouse\n", pInfo->name);
+ pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS |
+ XI86_CONFIGURED;
+ pInfo->type_name = XI_MOUSE;
+ }
+
+ if (has_keys) {+ if (pEvdev->kernel24) {+ xf86Msg(X_INFO, "%s: Kernel < 2.6 is too old, ignoring keyboard\n",
+ pInfo->name);
+ } else {+ xf86Msg(X_INFO, "%s: Configuring as keyboard\n", pInfo->name);
+ pInfo->flags |= XI86_KEYBOARD_CAPABLE | XI86_CONFIGURED;
+ pInfo->type_name = XI_KEYBOARD;
+ }
+ }
+
+ if ((pInfo->flags & XI86_CONFIGURED) == 0) {+ xf86Msg(X_WARNING, "%s: Don't know how to use device\n",
+ pInfo->name);
+ return 1;
+ }
+
+ return 0;
+}
+
+static InputInfoPtr
+EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+{+ InputInfoPtr pInfo;
+ MessageType deviceFrom = X_CONFIG;
+ const char *device;
+ EvdevPtr pEvdev;
+
+ if (!(pInfo = xf86AllocateInput(drv, 0)))
+ return NULL;
+
+ /* Initialise the InputInfoRec. */
+ pInfo->name = dev->identifier;
+ pInfo->flags = 0;
+ pInfo->type_name = "UNKNOWN";
+ pInfo->device_control = EvdevProc;
+ pInfo->read_input = EvdevReadInput;
+ pInfo->motion_history_proc = xf86GetMotionEvents;
+ pInfo->history_size = 0;
+ pInfo->control_proc = NULL;
+ pInfo->close_proc = NULL;
+ pInfo->switch_mode = NULL;
+ pInfo->conversion_proc = EvdevConvert;
+ pInfo->reverse_conversion_proc = NULL;
+ pInfo->dev = NULL;
+ pInfo->private_flags = 0;
+ pInfo->always_core_feedback = 0;
+ pInfo->conf_idev = dev;
+
+ if (!(pEvdev = xcalloc(sizeof(*pEvdev), 1)))
+ return pInfo;
+ pInfo->private = pEvdev;
+
+ xf86CollectInputOptions(pInfo, NULL, NULL);
+ xf86ProcessCommonOptions(pInfo, pInfo->options);
+
+ device = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
+ if (!device) {+ xf86Msg(X_ERROR, "%s: No device specified.\n", pInfo->name);
+ xfree(pEvdev);
+ return pInfo;
+ }
+
+ xf86Msg(deviceFrom, "%s: Device: \"%s\"\n", pInfo->name, device);
+ do {+ pInfo->fd = open(device, O_RDWR, 0);
+ }
+ while (pInfo->fd < 0 && errno == EINTR);
+
+ if (pInfo->fd < 0) {+ xf86Msg(X_ERROR, "Unable to open evdev device \"%s\".\n", device);
+ xfree(pEvdev);
+ return pInfo;
+ }
+
+ if (EvdevProbe(pInfo))
+ xfree(pEvdev);
+
+ return pInfo;
+}
+
+InputDriverRec EVDEV = {+ 1,
+ "evdev",
+ NULL,
+ EvdevPreInit,
+ NULL,
+ NULL,
+ 0
+};
+
+#ifdef XFree86LOADER
+
+static void
+EvdevUnplug(pointer p)
+{+}
+
+static pointer
+EvdevPlug(pointer module,
+ pointer options,
+ int *errmaj,
+ int *errmin)
+{+ xf86AddInputDriver(&EVDEV, module, 0);
+ return module;
+}
+
+static XF86ModuleVersionInfo EvdevVersionRec =
+{+ "evdev",
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+ 0, /* Missing from SDK: XORG_VERSION_CURRENT, */
+ 1, 0, 0,
+ ABI_CLASS_XINPUT,
+ ABI_XINPUT_VERSION,
+ MOD_CLASS_XINPUT,
+ {0, 0, 0, 0}+};
+
+XF86ModuleData evdevModuleData =
+{+ &EvdevVersionRec,
+ EvdevPlug,
+ EvdevUnplug
+};
+#endif /* XFree86LOADER */
diff -Naur xorg-x11-6.8.2/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile xorg-x11-6.8.x.99/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile
--- xorg-x11-6.8.2/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 1970-01-01 03:00:00 +0300
+++ xorg-x11-6.8.x.99/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 2005-03-11 10:48:32 +0300
@@ -0,0 +1,24 @@
+#define IHaveModules
+#include <Server.tmpl>
+
+SRCS = evdev.c
+OBJS = evdev.o
+
+DRIVER = evdev
+
+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \
+ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+#if MakeHasPosixVariableSubstitutions
+SubdirLibraryRule($(OBJS))
+#endif
+
+ModuleObjectRule()
+
+ObjectModuleTarget($(DRIVER),$(OBJS))
+
+InstallObjectModule($(DRIVER),$(MODULEDIR),input)
+
+DependTarget()
+
+InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input)