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

Added filtering. Commented now former unused addon code.

Browse Source 
We now load and manage device and filter addons successfully.
Tested with nervous and InputRecorder devices and InputRecorder filter.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8626 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2004-08-23 21:50:09 +00:00
parent 15206e7b40
commit e6c0b53ddc
6 changed files with 349 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/input/InputServerDevice.cpp
+50 -32
View File
@@ -31,7 +31,7 @@
// DEALINGS IN THE SOFTWARE.
/*****************************************************************************/
#include <Autolock.h>
#include <InputServerDevice.h>
#include "InputServer.h"
@@ -50,6 +50,29 @@ BInputServerDevice::BInputServerDevice()
*/
BInputServerDevice::~BInputServerDevice()
{
CALLED();
// Lock this section of code so that access to the device list
// is serialized. Be sure to release the lock before exitting.
//
InputServer::gInputDeviceListLocker.Lock();
for (int i = InputServer::gInputDeviceList.CountItems() - 1;
i >= 0 && i < InputServer::gInputDeviceList.CountItems(); i--) {
PRINT(("%s Device #%d\n", __PRETTY_FUNCTION__, i));
InputDeviceListItem* item = (InputDeviceListItem*) InputServer::gInputDeviceList.ItemAt(i);
if (NULL != item && this == item->mIsd) {
if (item->mStarted) {
input_device_ref dev = item->mDev;
PRINT((" Stopping: %s\n", dev.name));
Stop(dev.name, dev.cookie);
}
InputServer::gInputDeviceList.RemoveItem(i++);
delete item;
}
}
InputServer::gInputDeviceListLocker.Unlock();
}
@@ -120,32 +143,32 @@ BInputServerDevice::Control(const char *device,
status_t
BInputServerDevice::RegisterDevices(input_device_ref **devices)
{
/*
CALLED();
// Lock this section of code so that access to the device list
// is serialized. Be sure to release the lock before exitting.
//
InputServer::gInputDeviceListLocker.Lock();
bool has_pointing_device = false;
bool has_keyboard_device = false;
BAutolock lock(InputServer::gInputDeviceListLocker);
//bool has_pointing_device = false;
//bool has_keyboard_device = false;
input_device_ref *device = NULL;
for (int i = 0; NULL != (device = devices[i]); i++)
{
for (int i = 0; NULL != (device = devices[i]); i++) {
// :TODO: Check to make sure that each device is valid and
// that it is not already registered.
// getDeviceIndex()
InputServer::gInputDeviceList.AddItem(new InputDeviceListItem(this, device) );
InputServer::gInputDeviceList.AddItem(new InputDeviceListItem(this, *device) );
has_pointing_device = has_pointing_device || (device->type == B_POINTING_DEVICE);
has_keyboard_device = has_keyboard_device || (device->type == B_KEYBOARD_DEVICE);
//has_pointing_device = has_pointing_device || (device->type == B_POINTING_DEVICE);
//has_keyboard_device = has_keyboard_device || (device->type == B_KEYBOARD_DEVICE);
}
// If the InputServer event loop is running, signal the InputServer
// to start all devices of the type managed by this InputServerDevice.
//
if (InputServer::EventLoopRunning() )
/*if (InputServer::EventLoopRunning() )
{
if (has_pointing_device)
{
@@ -155,10 +178,10 @@ BInputServerDevice::RegisterDevices(input_device_ref **devices)
{
InputServer::StartStopDevices(NULL, B_KEYBOARD_DEVICE, true);
}
}
}*/
InputServer::StartStopDevices(this, true);
InputServer::gInputDeviceListLocker.Unlock();
*/
return B_OK;
}
@@ -170,9 +193,19 @@ BInputServerDevice::RegisterDevices(input_device_ref **devices)
status_t
BInputServerDevice::UnregisterDevices(input_device_ref **devices)
{
status_t dummy;
CALLED();
// Lock this section of code so that access to the device list
// is serialized. Be sure to release the lock before exitting.
//
BAutolock lock(InputServer::gInputDeviceListLocker);
return dummy;
input_device_ref *device = NULL;
for (int i = 0; NULL != (device = devices[i]); i++) {
}
return B_OK;
}
@@ -183,21 +216,6 @@ BInputServerDevice::UnregisterDevices(input_device_ref **devices)
status_t
BInputServerDevice::EnqueueMessage(BMessage *message)
{
/* status_t err;
ssize_t length = message->FlattenedSize();
char* buffer = new char[length];
if ((err = message->Flatten(buffer,length)) < 0) {
} else {
if((write_port(mEventPort, 0, buffer, length)) < 0) {
}else {
free(buffer);
err = B_OK;
}
}
return err;
*/
return ((InputServer*)be_app)->EnqueueDeviceMessage(message);
}