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

mouse: get/set acceleration factor by mouse name

Browse Source 
* Create and use *_mouse_acceleration_by_name functions to replace older *_mouse_acceleration functions. Now consistent with related functions (such as *_mouse_speed_by_name).
* Passing mouse_name to HandleGetSetMouseAcceleration in the BMessage fixes mouse acceleration changes not applying properly.

Change-Id: I668cdbbbb81e3cb9069a3fc2ce77e6ef75ba8476
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5189
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
scph
2022-04-12 11:24:12 +00:00
committed by Adrien Destugues
parent c0b591c58f
commit 84d27c6508
4 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/InterfaceDefs.h
+2
View File
@@ -432,6 +432,8 @@ status_t get_mouse_speed_by_name(BString mouse_name, int32* speed);
status_t set_mouse_speed_by_name(BString mouse_name, int32 speed); status_t set_mouse_speed_by_name(BString mouse_name, int32 speed);
status_t get_mouse_acceleration(int32* speed); status_t get_mouse_acceleration(int32* speed);
status_t set_mouse_acceleration(int32 speed); status_t set_mouse_acceleration(int32 speed);
status_t get_mouse_acceleration_by_name(BString mouse_name, int32* speed);
status_t set_mouse_acceleration_by_name(BString mouse_name, int32 speed);
status_t get_key_repeat_rate(int32* rate); status_t get_key_repeat_rate(int32* rate);
status_t set_key_repeat_rate(int32 rate); status_t set_key_repeat_rate(int32 rate);
src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
+1 -1
View File
@@ -532,7 +532,7 @@ MouseDevice::_UpdateSettings()
if (get_mouse_speed_by_name(fDeviceRef.name, &fSettings.accel.speed) != B_OK) if (get_mouse_speed_by_name(fDeviceRef.name, &fSettings.accel.speed) != B_OK)
LOG_ERR("error when get_mouse_speed\n"); LOG_ERR("error when get_mouse_speed\n");
else { else {
if (get_mouse_acceleration(&fSettings.accel.accel_factor) != B_OK) if (get_mouse_acceleration_by_name(fDeviceRef.name, &fSettings.accel.accel_factor) != B_OK)
LOG_ERR("error when get_mouse_acceleration\n"); LOG_ERR("error when get_mouse_acceleration\n");
else { else {
mouse_accel accel; mouse_accel accel;
src/kits/interface/InterfaceDefs.cpp
+29
View File
@@ -683,6 +683,35 @@ set_mouse_acceleration(int32 speed)
} }
status_t
get_mouse_acceleration_by_name(BString mouse_name, int32 *speed)
{
BMessage command(IS_GET_MOUSE_ACCELERATION);
BMessage reply;
command.AddString("mouse_name", mouse_name.String());
_control_input_server_(&command, &reply);
if (reply.FindInt32("speed", speed) != B_OK)
*speed = 65536;
return B_OK;
}
status_t
set_mouse_acceleration_by_name(BString mouse_name, int32 speed)
{
BMessage command(IS_SET_MOUSE_ACCELERATION);
BMessage reply;
command.AddString("mouse_name", mouse_name.String());
command.AddInt32("speed", speed);
return _control_input_server_(&command, &reply);
}
status_t status_t
get_key_repeat_rate(int32 *rate) get_key_repeat_rate(int32 *rate)
{ {
src/preferences/input/MouseSettings.cpp
+2 -2
View File
@@ -95,7 +95,7 @@ MouseSettings::_RetrieveSettings()
return B_ERROR; return B_ERROR;
if (get_mouse_speed_by_name(fName, &fSettings.accel.speed) != B_OK) if (get_mouse_speed_by_name(fName, &fSettings.accel.speed) != B_OK)
return B_ERROR; return B_ERROR;
if (get_mouse_acceleration(&fSettings.accel.accel_factor) != B_OK) if (get_mouse_acceleration_by_name(fName, &fSettings.accel.accel_factor) != B_OK)
return B_ERROR; return B_ERROR;
if (get_mouse_type_by_name(fName, &fSettings.type) != B_OK) if (get_mouse_type_by_name(fName, &fSettings.type) != B_OK)
return B_ERROR; return B_ERROR;
@@ -294,7 +294,7 @@ MouseSettings::SetMouseSpeed(int32 speed)
void void
MouseSettings::SetAccelerationFactor(int32 factor) MouseSettings::SetAccelerationFactor(int32 factor)
{ {
if (set_mouse_acceleration(factor) == B_OK) if (set_mouse_acceleration_by_name(fName, factor) == B_OK)
fSettings.accel.accel_factor = factor; fSettings.accel.accel_factor = factor;
} }