[haiku-commits] r33451 - haiku/trunk/src/add-ons/input_server/devices/mouse
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 6 Oct 2009 10:56:18 +0200 (CEST)
Author: axeld
Date: 2009-10-06 10:56:18 +0200 (Tue, 06 Oct 2009)
New Revision: 33451
Changeset: http://dev.haiku-os.org/changeset/33451/haiku
Modified:
haiku/trunk/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
Log:
* Cleanup.
Modified:
haiku/trunk/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
2009-10-06 08:54:27 UTC (rev 33450)
+++ haiku/trunk/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
2009-10-06 08:56:18 UTC (rev 33451)
@@ -52,17 +52,17 @@
fFunctionDepth++;
fPrepend.Append(' ', fFunctionDepth * 2);
fFunctionName << className << "::" << functionName <<
"()";
-
+
debug_printf("%p -> %s%s {\n", fPointer,
fPrepend.String(),
fFunctionName.String());
}
-
+
~FunctionTracer()
{
debug_printf("%p -> %s}\n", fPointer,
fPrepend.String());
fFunctionDepth--;
}
-
+
private:
BString fFunctionName;
BString fPrepend;
@@ -319,7 +319,7 @@
} else {
if (string.FindFirst("intelli") >= 0)
name.Prepend("Extended ");
-
+
name << " Mouse ";
}
name << index;
@@ -357,7 +357,7 @@
fIsTouchpad = true;
fTouchpadSettings = kDefaultTouchpadSettings;
-
+
BPath path;
status_t status = _GetTouchpadSettingsPath(path);
BFile settingsFile(path.Path(), B_READ_ONLY);
@@ -402,7 +402,7 @@
fUpdateSettings = false;
if (fIsTouchpad) {
BAutolock _(fTouchpadSettingsLock);
- if (fTouchpadSettingsMessage) {
+ if (fTouchpadSettingsMessage != NULL) {
_ReadTouchpadSettingsMsg(fTouchpadSettingsMessage);
_UpdateTouchpadSettings();
delete fTouchpadSettingsMessage;
@@ -460,8 +460,10 @@
continue;
if (message->AddInt64("when", movements.timestamp) ==
B_OK
- && message->AddFloat("be:wheel_delta_x",
movements.wheel_xdelta) == B_OK
- && message->AddFloat("be:wheel_delta_y",
movements.wheel_ydelta) == B_OK)
+ && message->AddFloat("be:wheel_delta_x",
+ movements.wheel_xdelta) == B_OK
+ && message->AddFloat("be:wheel_delta_y",
+ movements.wheel_ydelta) == B_OK)
fTarget.EnqueueMessage(message);
else
delete message;
@@ -546,22 +548,22 @@
status_t
MouseDevice::_ReadTouchpadSettingsMsg(BMessage* message)
{
- message->FindBool("scroll_twofinger",
- &(fTouchpadSettings.scroll_twofinger));
+ message->FindBool("scroll_twofinger",
&fTouchpadSettings.scroll_twofinger);
message->FindBool("scroll_multifinger",
- &(fTouchpadSettings.scroll_multifinger));
+ &fTouchpadSettings.scroll_multifinger);
message->FindFloat("scroll_rightrange",
- &(fTouchpadSettings.scroll_rightrange));
+ &fTouchpadSettings.scroll_rightrange);
message->FindFloat("scroll_bottomrange",
- &(fTouchpadSettings.scroll_bottomrange));
+ &fTouchpadSettings.scroll_bottomrange);
+
message->FindInt16("scroll_xstepsize",
- (int16*)&(fTouchpadSettings.scroll_xstepsize));
+ (int16*)&fTouchpadSettings.scroll_xstepsize);
message->FindInt16("scroll_ystepsize",
- (int16*)&(fTouchpadSettings.scroll_ystepsize));
+ (int16*)&fTouchpadSettings.scroll_ystepsize);
message->FindInt8("scroll_acceleration",
- (int8*)&(fTouchpadSettings.scroll_acceleration));
+ (int8*)&fTouchpadSettings.scroll_acceleration);
message->FindInt8("tapgesture_sensibility",
- (int8*)&(fTouchpadSettings.tapgesture_sensibility));
+ (int8*)&fTouchpadSettings.tapgesture_sensibility);
return B_OK;
}
@@ -861,6 +863,3 @@
return B_OK;
}
-
-
-
Other related posts:
- » [haiku-commits] r33451 - haiku/trunk/src/add-ons/input_server/devices/mouse - axeld
