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

This fixes the crash when Debug is active (at least over here; Korli, can you check?)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8809 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2004-09-03 07:12:02 +00:00
parent 600f089e43
commit 145a357d37
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
View File

@ -142,9 +142,15 @@ MouseInputDevice::InitCheck()
{ {
InitFromSettings(); InitFromSettings();
input_device_ref **devices = NULL;
devices = (input_device_ref **)malloc(sizeof(input_device_ref *) * 2);
if (!devices)
return B_NO_MEMORY;
input_device_ref mouse1 = { "Mouse 1", B_POINTING_DEVICE, (void *)this }; input_device_ref mouse1 = { "Mouse 1", B_POINTING_DEVICE, (void *)this };
input_device_ref *devices[2] = { &mouse1, NULL }; devices[0] = &mouse1;
devices[1] = NULL;
if (fFd >= 0 && fThread >= 0) { if (fFd >= 0 && fThread >= 0) {
RegisterDevices(devices); RegisterDevices(devices);
@ -215,7 +221,8 @@ MouseInputDevice::DeviceWatcher(void *arg)
BMessage *message; BMessage *message;
char log[128]; char log[128];
while (!dev->fQuit) { while (!dev->fQuit) {
ioctl(dev->fFd, kGetMouseMovements, &movements); if (ioctl(dev->fFd, kGetMouseMovements, &movements) < B_OK)
continue;
// TODO: send B_MOUSE_UP/B_MOUSE_DOWN messages // TODO: send B_MOUSE_UP/B_MOUSE_DOWN messages
uint32 buttons = dev->fButtons ^ movements.buttons; uint32 buttons = dev->fButtons ^ movements.buttons;