Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Implemented double click support in the USB HID driver - in the future, this

Browse Source 
should really be moved into the input_server, though (BeOS does it in the
  driver, too).
* Fixed warnings.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22301 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-09-25 12:43:34 +00:00
parent e0a627c141
commit eabbb1b365
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/add-ons/kernel/drivers/input/usb_hid/hid.c
View File

@ -346,6 +346,12 @@ create_device(const usb_device *dev, const usb_interface_info *ii,
device->rbuf = create_ring_buffer(384);
device->is_keyboard = isKeyboard;
// double click handling
device->click_count = 1;
device->click_speed = 250000;
device->last_click_time = 0;
device->last_buttons = 0;
// default values taken from the PS/2 driver
device->repeat_rate = 35000;
device->repeat_delay = 300000;
@ -549,8 +555,7 @@ interpret_mouse_buffer(hid_device_info *device)
if (insn->usage_page == USAGE_PAGE_BUTTON) {
if ((insn->usage_id - 1) < MAX_BUTTONS) {
info.buttons |= (value & 1) << (insn->usage_id - 1);
info.clicks = 1;
}
}
} else if (insn->usage_page == USAGE_PAGE_GENERIC_DESKTOP) {
if (insn->is_phy_signed)
value = sign_extend(value, insn->num_bits);
@ -569,6 +574,20 @@ interpret_mouse_buffer(hid_device_info *device)
}
}
if (info.buttons != 0) {
if (device->last_buttons == 0) {
if (device->last_click_time + device->click_speed > device->timestamp)
device->click_count++;
else
device->click_count = 1;
}
device->last_click_time = device->timestamp;
info.clicks = device->click_count;
}
device->last_buttons = info.buttons;
info.timestamp = device->timestamp;
ring_buffer_write(device->rbuf, (const uint8*)&info, sizeof(info));
release_sem_etc(device->sem_cb, 1, B_DO_NOT_RESCHEDULE);
@ -579,8 +598,8 @@ interpret_mouse_buffer(hid_device_info *device)
callback: got a report, issue next request
*/
static void
usb_callback(void *cookie, uint32 busStatus,
void *data, uint32 actualLength)
usb_callback(void *cookie, status_t busStatus,
void *data, size_t actualLength)
{
hid_device_info *device = cookie;
status_t status;
@ -615,7 +634,7 @@ usb_callback(void *cookie, uint32 busStatus,
sprintf (&linbuf[i*3], "%02X ", buffer [i]);
DPRINTF_INFO ((MY_ID "input report: %s\n", linbuf));
#endif
device->timestamp = system_time ();
device->timestamp = system_time();
if (device->is_keyboard) {
interpret_kb_buffer(device);
@ -650,7 +669,7 @@ hid_device_added(const usb_device *dev, void **cookie)
status_t status;
usb_hid_descriptor *hid_desc;
uint8 *rep_desc = NULL;
size_t desc_len, actual;
size_t desc_len;
decomp_item *items;
size_t num_items;
int fd, report_id;
@ -962,6 +981,14 @@ hid_device_control(driver_cookie *cookie, uint32 op,
return count;
break;
}
case MS_SET_CLICKSPEED:
#ifdef __HAIKU__
return user_memcpy(&device->click_speed, arg, sizeof(bigtime_t));
#else
device->click_speed = *(bigtime_t *)arg;
return B_OK;
#endif
default:
/* not implemented */
break;

8
src/add-ons/kernel/drivers/input/usb_hid/hid.h
View File

@ -19,6 +19,7 @@
#include <USB.h>
#include <usb/USB_hid.h>
#define DEBUG 1
#if DEBUG
#define DPRINTF_INFO(x) dprintf x
#define DPRINTF_ERR(x) dprintf x
@ -85,6 +86,13 @@ typedef struct hid_device_info {
uint flags;
bool is_keyboard;
// double click (please move this into the input_server one day)
uint32 last_buttons;
uint32 click_count;
bigtime_t click_speed;
bigtime_t last_click_time;
// key repeats
struct hid_repeat_timer repeat_timer;
bigtime_t repeat_delay;
bigtime_t repeat_rate;