fix debug build
on Stop(), close the device, then wait for our service thread to quit git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27309 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -175,6 +175,9 @@ MouseDevice::Start()
|
|||||||
void
|
void
|
||||||
MouseDevice::Stop()
|
MouseDevice::Stop()
|
||||||
{
|
{
|
||||||
|
close(fDevice);
|
||||||
|
fDevice = -1;
|
||||||
|
|
||||||
fActive = false;
|
fActive = false;
|
||||||
// this will stop the thread as soon as it reads the next packet
|
// this will stop the thread as soon as it reads the next packet
|
||||||
|
|
||||||
@@ -186,8 +189,6 @@ MouseDevice::Stop()
|
|||||||
status_t dummy;
|
status_t dummy;
|
||||||
wait_for_thread(fThread, &dummy);
|
wait_for_thread(fThread, &dummy);
|
||||||
}
|
}
|
||||||
|
|
||||||
close(fDevice);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -251,9 +252,9 @@ MouseDevice::_Run()
|
|||||||
_ComputeAcceleration(movements, deltaX, deltaY);
|
_ComputeAcceleration(movements, deltaX, deltaY);
|
||||||
|
|
||||||
LOG("%s: buttons: 0x%lx, x: %ld, y: %ld, clicks:%ld, wheel_x:%ld, wheel_y:%ld\n",
|
LOG("%s: buttons: 0x%lx, x: %ld, y: %ld, clicks:%ld, wheel_x:%ld, wheel_y:%ld\n",
|
||||||
device->device_ref.name, movements.buttons, movements.xdelta, movements.ydelta,
|
fDeviceRef.name, movements.buttons, movements.xdelta, movements.ydelta,
|
||||||
movements.clicks, movements.wheel_xdelta, movements.wheel_ydelta);
|
movements.clicks, movements.wheel_xdelta, movements.wheel_ydelta);
|
||||||
LOG("%s: x: %ld, y: %ld\n", device->device_ref.name, deltaX, deltaY);
|
LOG("%s: x: %ld, y: %ld\n", fDeviceRef.name, deltaX, deltaY);
|
||||||
|
|
||||||
BMessage *message = NULL;
|
BMessage *message = NULL;
|
||||||
|
|
||||||
|
|||||||
@@ -13,13 +13,15 @@
|
|||||||
#include <InterfaceDefs.h>
|
#include <InterfaceDefs.h>
|
||||||
#include <List.h>
|
#include <List.h>
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
|
||||||
class MouseDevice;
|
class MouseDevice;
|
||||||
|
|
||||||
class MouseInputDevice : public BInputServerDevice {
|
class MouseInputDevice : public BInputServerDevice {
|
||||||
public:
|
public:
|
||||||
MouseInputDevice();
|
MouseInputDevice();
|
||||||
~MouseInputDevice();
|
virtual ~MouseInputDevice();
|
||||||
|
|
||||||
virtual status_t InitCheck();
|
virtual status_t InitCheck();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user