TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix remaing kcm mouse module crashes

Browse Source
pull/2/head
Slávek Banko 11 years ago
parent 853f2558ab
commit a60f9a1145
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File

36
kcontrol/input/logitechmouse.cpp
Unescape View File

@ -132,13 +132,15 @@ void LogitechMouse::updateCordlessStatus()
{ {
TQByteArray status(8); TQByteArray status(8);
int result = usb_control_msg( m_usbDeviceHandle, int result = (m_usbDeviceHandle != 0
? usb_control_msg( m_usbDeviceHandle,
USB_TYPE_VENDOR | USB_ENDPOINT_IN,0x09, USB_TYPE_VENDOR | USB_ENDPOINT_IN,0x09,
(0x0003 | m_useSecondChannel), (0x0003 | m_useSecondChannel),
(0x0000 | m_useSecondChannel), (0x0000 | m_useSecondChannel),
status.data(), status.data(),
0x0008, 0x0008,
1000); 1000)
: -1);
if (0 > result) { if (0 > result) {
// We probably have a permission problem // We probably have a permission problem
@ -253,14 +255,16 @@ void LogitechMouse::updateResolution()
{ {
char resolution; char resolution;
int result = usb_control_msg( m_usbDeviceHandle, int result = (m_usbDeviceHandle != 0
? usb_control_msg( m_usbDeviceHandle,
USB_TYPE_VENDOR | USB_ENDPOINT_IN, USB_TYPE_VENDOR | USB_ENDPOINT_IN,
0x01, 0x01,
0x000E, 0x000E,
0x0000, 0x0000,
&resolution, &resolution,
0x0001, 0x0001,
100); 100)
: -1);
// kdDebug() << "resolution is: " << resolution << endl; // kdDebug() << "resolution is: " << resolution << endl;
if (0 > result) { if (0 > result) {
@ -273,14 +277,16 @@ void LogitechMouse::updateResolution()
void LogitechMouse::setLogitechTo800() void LogitechMouse::setLogitechTo800()
{ {
int result = usb_control_msg( m_usbDeviceHandle, int result = (m_usbDeviceHandle != 0
? usb_control_msg( m_usbDeviceHandle,
USB_TYPE_VENDOR, USB_TYPE_VENDOR,
0x02, 0x02,
0x000E, 0x000E,
4, 4,
NULL, NULL,
0x0000, 0x0000,
100); 100)
: -1);
if (0 > result) { if (0 > result) {
kdWarning() << "Error setting resolution on device: " << usb_strerror() << endl; kdWarning() << "Error setting resolution on device: " << usb_strerror() << endl;
} }
@ -288,14 +294,16 @@ void LogitechMouse::setLogitechTo800()
void LogitechMouse::setLogitechTo400() void LogitechMouse::setLogitechTo400()
{ {
int result = usb_control_msg( m_usbDeviceHandle, int result = (m_usbDeviceHandle != 0
? usb_control_msg( m_usbDeviceHandle,
USB_TYPE_VENDOR, USB_TYPE_VENDOR,
0x02, 0x02,
0x000E, 0x000E,
3, 3,
NULL, NULL,
0x0000, 0x0000,
100); 100)
: -1);
if (0 > result) { if (0 > result) {
kdWarning() << "Error setting resolution on device: " << usb_strerror() << endl; kdWarning() << "Error setting resolution on device: " << usb_strerror() << endl;
} }
@ -319,14 +327,16 @@ bool LogitechMouse::isDualChannelCapable()
void LogitechMouse::setChannel1() void LogitechMouse::setChannel1()
{ {
int result = usb_control_msg( m_usbDeviceHandle, int result = (m_usbDeviceHandle != 0
? usb_control_msg( m_usbDeviceHandle,
USB_TYPE_VENDOR, USB_TYPE_VENDOR,
0x02, 0x02,
(0x0008 | m_useSecondChannel), (0x0008 | m_useSecondChannel),
(0x0000 | m_useSecondChannel), (0x0000 | m_useSecondChannel),
NULL, NULL,
0x0000, 0x0000,
1000); 1000)
: -1);
if (0 > result) { if (0 > result) {
kdWarning() << "Error setting mouse to channel 1 : " << usb_strerror() << endl; kdWarning() << "Error setting mouse to channel 1 : " << usb_strerror() << endl;
@ -336,14 +346,16 @@ void LogitechMouse::setChannel1()
void LogitechMouse::setChannel2() void LogitechMouse::setChannel2()
{ {
int result = usb_control_msg( m_usbDeviceHandle, int result = (m_usbDeviceHandle != 0
? usb_control_msg( m_usbDeviceHandle,
USB_TYPE_VENDOR, USB_TYPE_VENDOR,
0x02, 0x02,
(0x0008 | m_useSecondChannel), (0x0008 | m_useSecondChannel),
(0x0001 | m_useSecondChannel), (0x0001 | m_useSecondChannel),
NULL, NULL,
0x0000, 0x0000,
1000); 1000)
: -1);
if (0 > result) { if (0 > result) {
kdWarning() << "Error setting mouse to channel 2 : " << usb_strerror() << endl; kdWarning() << "Error setting mouse to channel 2 : " << usb_strerror() << endl;

Write Preview
Loading…
Cancel
Save