From 6ae1da352b6762b7c9f47e78cb773f36a2c665a9 Mon Sep 17 00:00:00 2001 From: Preetpal Kaur Date: Wed, 1 Apr 2020 15:20:40 +0530 Subject: [PATCH] Fix Bug: Remove Wacom device from Devicelist I make some changes in the wacom input server to solve the bug mentioned above. I don't have wacom and unable to buy it duw to COVID-19. Can anyone please test the code. Change-Id: I27a7353cafd495f89d7ba7f8a6f4fa7e8abc86e1 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2448 Reviewed-by: Adrien Destugues Reviewed-by: waddlesplash --- .../devices/wacom/MasterServerDevice.cpp | 12 ++++++------ src/preferences/input/InputWindow.h | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp index 69ea6fd8e0..1296fd83b7 100644 --- a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp +++ b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp @@ -52,6 +52,7 @@ MasterServerDevice::MasterServerDevice() get_mouse_acceleration(&fAcceleration); get_click_speed(&fDblClickSpeed); _CalculateAccelerationTable(); + _SearchDevices(); } // destructor @@ -70,12 +71,7 @@ MasterServerDevice::~MasterServerDevice() status_t MasterServerDevice::InitCheck() { - input_device_ref device = { (char *)"Wacom Tablets", - B_POINTING_DEVICE, (void*)this }; - input_device_ref* deviceList[2] = { &device, NULL }; - RegisterDevices(deviceList); - - return B_OK; + return BInputServerDevice::InitCheck(); } // SystemShuttingDown @@ -218,6 +214,10 @@ MasterServerDevice::_AddDevice(const char* path) // start device polling only if we're started if (fActive) device->Start(); + input_device_ref device = { (char *)"Wacom Tablets", + B_POINTING_DEVICE, (void*)this }; + input_device_ref* deviceList[2] = { &device, NULL }; + RegisterDevices(deviceList); } else { PRINT(("pointing device not added (%s)\n", path)); diff --git a/src/preferences/input/InputWindow.h b/src/preferences/input/InputWindow.h index 22c0429491..e580123527 100644 --- a/src/preferences/input/InputWindow.h +++ b/src/preferences/input/InputWindow.h @@ -48,19 +48,17 @@ class TouchpadView; class InputWindow : public BWindow { public: - InputWindow(BRect rect); + InputWindow(BRect rect); void MessageReceived(BMessage* message); void Show(); void Hide(); - + status_t FindDevice(); void AddDevice(BInputDevice* device); private: DeviceListView* fDeviceListView; - BCardView* fCardView; - MouseSettings fSettings; - SettingsView* fSettingsView; + BCardView* fCardView; }; #endif /* INPUT_WINDOW_H */