i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This fixes scroll wheel support, as reported in bug #1625.

Browse Source 
PS/2 supports vertical scrolling only for now.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25230 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2008-04-28 21:23:41 +00:00
parent 6c07a21e12
commit b90d663d10
1 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ps2/ps2_mouse.c
+38 -21
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2007 Haiku, Inc. * Copyright 2001-2008 Haiku, Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* PS/2 mouse device driver * PS/2 mouse device driver
@@ -64,6 +64,10 @@
#define MOUSE_HISTORY_SIZE 256 #define MOUSE_HISTORY_SIZE 256
// we record that many mouse packets before we start to drop them // we record that many mouse packets before we start to drop them
#define F_MOUSE_TYPE_STANDARD 0x1
#define F_MOUSE_TYPE_INTELLIMOUSE 0x2
#define F_MOUSE_TYPE_MASK 0xf
typedef struct typedef struct
{ {
ps2_dev * dev; ps2_dev * dev;
@@ -74,7 +78,7 @@ typedef struct
bigtime_t click_speed; bigtime_t click_speed;
int click_count; int click_count;
int buttons_state; int buttons_state;
int flags;
size_t packet_size; size_t packet_size;
size_t packet_index; size_t packet_index;
uint8 packet_buffer[PS2_MAX_PACKET_SIZE]; uint8 packet_buffer[PS2_MAX_PACKET_SIZE];
@@ -120,11 +124,11 @@ static void
ps2_packet_to_movement(mouse_cookie *cookie, uint8 packet[], mouse_movement *pos) ps2_packet_to_movement(mouse_cookie *cookie, uint8 packet[], mouse_movement *pos)
{ {
int buttons = packet[0] & 7; int buttons = packet[0] & 7;
int xDelta = ((packet[0] & 0x10) ? 0xFFFFFF00 : 0) | packet[1]; int xDelta = ((packet[0] & 0x10) ? ~0xff : 0) | packet[1];
int yDelta = ((packet[0] & 0x20) ? 0xFFFFFF00 : 0) | packet[2]; int yDelta = ((packet[0] & 0x20) ? ~0xff : 0) | packet[2];
int xDeltaWheel = 0;
int yDeltaWheel = 0;
bigtime_t currentTime = system_time(); bigtime_t currentTime = system_time();
int8 wheel_ydelta = 0;
int8 wheel_xdelta = 0;
if (buttons != 0 && cookie->buttons_state == 0) { if (buttons != 0 && cookie->buttons_state == 0) {
if (cookie->click_last_time + cookie->click_speed > currentTime) if (cookie->click_last_time + cookie->click_speed > currentTime)
@@ -137,18 +141,25 @@ ps2_packet_to_movement(mouse_cookie *cookie, uint8 packet[], mouse_movement *pos
cookie->buttons_state = buttons; cookie->buttons_state = buttons;
if (cookie->packet_size == PS2_PACKET_INTELLIMOUSE) { if (cookie->flags & F_MOUSE_TYPE_INTELLIMOUSE) {
yDeltaWheel = packet[3] & 0x07;
if (packet[3] & 0x08)
yDeltaWheel |= ~0x07;
}
/*
if (cookie->flags & F_MOUSE_TYPE_2WHEELS) {
switch (packet[3] & 0x0F) { switch (packet[3] & 0x0F) {
case 0x01: wheel_ydelta = +1; break; // wheel 1 down case 0x01: yDeltaWheel = +1; break; // wheel 1 down
case 0x0F: wheel_ydelta = -1; break; // wheel 1 up case 0x0F: yDeltaWheel = -1; break; // wheel 1 up
case 0x02: wheel_xdelta = +1; break; // wheel 2 down case 0x02: xDeltaWheel = +1; break; // wheel 2 down
case 0x0E: wheel_xdelta = -1; break; // wheel 2 up case 0x0E: xDeltaWheel = -1; break; // wheel 2 up
} }
} }
*/
// TRACE("packet: %02x %02x %02x %02x: xd %d, yd %d, 0x%x (%d), w-xd %d, w-yd %d\n", // TRACE("packet: %02x %02x %02x %02x: xd %d, yd %d, 0x%x (%d), w-xd %d, w-yd %d\n",
// packet[0], packet[1], packet[2], packet[3], // packet[0], packet[1], packet[2], packet[3],
// xDelta, yDelta, buttons, cookie->click_count, wheel_xdelta, wheel_ydelta); // xDelta, yDelta, buttons, cookie->click_count, xDeltaWheel, yDeltaWheel);
if (pos) { if (pos) {
pos->xdelta = xDelta; pos->xdelta = xDelta;
@@ -157,8 +168,8 @@ ps2_packet_to_movement(mouse_cookie *cookie, uint8 packet[], mouse_movement *pos
pos->clicks = cookie->click_count; pos->clicks = cookie->click_count;
pos->modifiers = 0; pos->modifiers = 0;
pos->timestamp = currentTime; pos->timestamp = currentTime;
pos->wheel_ydelta = (int)wheel_ydelta; pos->wheel_ydelta = yDeltaWheel;
pos->wheel_xdelta = (int)wheel_xdelta; pos->wheel_xdelta = xDeltaWheel;
TRACE("ps2: ps2_packet_to_movement xdelta: %d, ydelta: %d, buttons %x, clicks: %d, timestamp %Ld\n", TRACE("ps2: ps2_packet_to_movement xdelta: %d, ydelta: %d, buttons %x, clicks: %d, timestamp %Ld\n",
xDelta, yDelta, buttons, cookie->click_count, currentTime); xDelta, yDelta, buttons, cookie->click_count, currentTime);
@@ -272,10 +283,12 @@ mouse_handle_int(ps2_dev *dev)
static status_t static status_t
probe_mouse(mouse_cookie *cookie, size_t *probed_packet_size) probe_mouse(mouse_cookie *cookie)
{ {
status_t status; status_t status;
uint8 deviceId = 0; uint8 deviceId = 0;
cookie->flags = 0;
status = ps2_reset_mouse(cookie); status = ps2_reset_mouse(cookie);
if (status != B_OK) { if (status != B_OK) {
@@ -307,14 +320,12 @@ probe_mouse(mouse_cookie *cookie, size_t *probed_packet_size)
if (deviceId == PS2_DEV_ID_STANDARD) { if (deviceId == PS2_DEV_ID_STANDARD) {
INFO("ps2: probe_mouse Standard PS/2 mouse found\n"); INFO("ps2: probe_mouse Standard PS/2 mouse found\n");
if (probed_packet_size) cookie->flags |= F_MOUSE_TYPE_STANDARD;
*probed_packet_size = PS2_PACKET_STANDARD;
} else if (deviceId == PS2_DEV_ID_INTELLIMOUSE) { } else if (deviceId == PS2_DEV_ID_INTELLIMOUSE) {
INFO("ps2: probe_mouse Extended PS/2 mouse found\n"); INFO("ps2: probe_mouse Extended PS/2 mouse found\n");
if (probed_packet_size) cookie->flags |= F_MOUSE_TYPE_INTELLIMOUSE;
*probed_packet_size = PS2_PACKET_INTELLIMOUSE;
} else { } else {
INFO("ps2: probe_mouse Something's wrong.\n"); INFO("ps2: probe_mouse Error unknown device id.\n");
return B_ERROR; return B_ERROR;
} }
@@ -363,13 +374,19 @@ mouse_open(const char *name, uint32 flags, void **_cookie)
dev->disconnect = &ps2_mouse_disconnect; dev->disconnect = &ps2_mouse_disconnect;
dev->handle_int = &mouse_handle_int; dev->handle_int = &mouse_handle_int;
status = probe_mouse(cookie, &cookie->packet_size); // probe mouse also sets cookie->flags
status = probe_mouse(cookie);
if (status != B_OK) { if (status != B_OK) {
INFO("ps2: probing mouse %s failed\n", name); INFO("ps2: probing mouse %s failed\n", name);
ps2_service_notify_device_removed(dev); ps2_service_notify_device_removed(dev);
goto err1; goto err1;
} }
if (cookie->flags & F_MOUSE_TYPE_INTELLIMOUSE)
cookie->packet_size = PS2_PACKET_INTELLIMOUSE;
else
cookie->packet_size = PS2_PACKET_STANDARD;
cookie->mouse_buffer = create_packet_buffer(MOUSE_HISTORY_SIZE * cookie->packet_size); cookie->mouse_buffer = create_packet_buffer(MOUSE_HISTORY_SIZE * cookie->packet_size);
if (cookie->mouse_buffer == NULL) { if (cookie->mouse_buffer == NULL) {
TRACE("ps2: can't allocate mouse actions buffer\n"); TRACE("ps2: can't allocate mouse actions buffer\n");