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

Fix Bug: Remove Wacom device from Devicelist

Browse Source 
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 <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Preetpal Kaur
2020-04-18 18:18:39 +00:00
committed by waddlesplash
parent 296183eb6f
commit 6ae1da352b
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
+6 -6
View File
@@ -52,6 +52,7 @@ MasterServerDevice::MasterServerDevice()
get_mouse_acceleration(&fAcceleration); get_mouse_acceleration(&fAcceleration);
get_click_speed(&fDblClickSpeed); get_click_speed(&fDblClickSpeed);
_CalculateAccelerationTable(); _CalculateAccelerationTable();
_SearchDevices();
} }
// destructor // destructor
@@ -70,12 +71,7 @@ MasterServerDevice::~MasterServerDevice()
status_t status_t
MasterServerDevice::InitCheck() MasterServerDevice::InitCheck()
{ {
input_device_ref device = { (char *)"Wacom Tablets", return BInputServerDevice::InitCheck();
B_POINTING_DEVICE, (void*)this };
input_device_ref* deviceList[2] = { &device, NULL };
RegisterDevices(deviceList);
return B_OK;
} }
// SystemShuttingDown // SystemShuttingDown
@@ -218,6 +214,10 @@ MasterServerDevice::_AddDevice(const char* path)
// start device polling only if we're started // start device polling only if we're started
if (fActive) if (fActive)
device->Start(); device->Start();
input_device_ref device = { (char *)"Wacom Tablets",
B_POINTING_DEVICE, (void*)this };
input_device_ref* deviceList[2] = { &device, NULL };
RegisterDevices(deviceList);
} else { } else {
PRINT(("pointing device not added (%s)\n", path)); PRINT(("pointing device not added (%s)\n", path));
src/preferences/input/InputWindow.h
+3 -5
View File
@@ -48,19 +48,17 @@ class TouchpadView;
class InputWindow : public BWindow class InputWindow : public BWindow
{ {
public: public:
InputWindow(BRect rect); InputWindow(BRect rect);
void MessageReceived(BMessage* message); void MessageReceived(BMessage* message);
void Show(); void Show();
void Hide(); void Hide();
status_t FindDevice(); status_t FindDevice();
void AddDevice(BInputDevice* device); void AddDevice(BInputDevice* device);
private: private:
DeviceListView* fDeviceListView; DeviceListView* fDeviceListView;
BCardView* fCardView; BCardView* fCardView;
MouseSettings fSettings;
SettingsView* fSettingsView;
}; };
#endif /* INPUT_WINDOW_H */ #endif /* INPUT_WINDOW_H */