From Preetpal Kaur <preetpalok123@xxxxxxxxx>:
Preetpal Kaur has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3138 ;)
Change subject: InterfaceDefs and Preferences: Muliple mouse speed
......................................................................
InterfaceDefs and Preferences: Muliple mouse speed
Change-Id: Iaccf919fe421ea92d2fd0983095c5007cd4ed68c
---
M headers/os/interface/InterfaceDefs.h
M src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
M src/kits/interface/InterfaceDefs.cpp
M src/preferences/input/MouseSettings.cpp
4 files changed, 56 insertions(+), 36 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/38/3138/1
diff --git a/headers/os/interface/InterfaceDefs.h
b/headers/os/interface/InterfaceDefs.h
index 3e4b25b..75f0c9b 100644
--- a/headers/os/interface/InterfaceDefs.h
+++ b/headers/os/interface/InterfaceDefs.h
@@ -428,6 +428,8 @@
status_t set_click_speed(bigtime_t speed);
status_t get_mouse_speed(int32* speed);
status_t set_mouse_speed(int32 speed);
+status_t get_multiple_mouse_speed(BString mouse_name, int32*
speed);
+status_t set_multiple_mouse_speed(BString mouse_name, int32
speed);
status_t get_mouse_acceleration(int32* speed);
status_t set_mouse_acceleration(int32 speed);
diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
index d4d7b78..87bd49b 100644
--- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
+++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
@@ -530,7 +530,7 @@
else
ioctl(fDevice, MS_SET_CLICKSPEED, &fSettings.click_speed);
- if (get_mouse_speed(&fSettings.accel.speed) != B_OK)
+ if (get_multiple_mouse_speed(fDeviceRef.name, &fSettings.accel.speed)
!= B_OK)
LOG_ERR("error when get_mouse_speed\n");
else {
if (get_mouse_acceleration(&fSettings.accel.accel_factor) !=
B_OK)
diff --git a/src/kits/interface/InterfaceDefs.cpp
b/src/kits/interface/InterfaceDefs.cpp
index 06e7a9f..7f87247 100644
--- a/src/kits/interface/InterfaceDefs.cpp
+++ b/src/kits/interface/InterfaceDefs.cpp
@@ -522,50 +522,27 @@
status_t
set_multiple_mouse_type(BString mouse_name, int32 type)
{
- // BString fName;
- // fName = mouse_name;
- fprintf(stderr, "DEBUG_MOUSE->INTERFACE->"
- "set_multiple_mouse_type: \t%" B_PRId32 "\n", type);
- fprintf(stderr, "DEBUG_MOUSE->INTERFACE->"
- "set_multiple_mouse_type-> MOUSE NAME: %s \n",
mouse_name.String());
-// fprintf(stderr, "DEBUG_MOUSE->INTERFACE->set_multiple_mouse_type:"
-// "MOUSE NAME: %s MOUSE TYPE: %d \n", mouse_name.String(), type);
BMessage command(IS_SET_MOUSE_TYPE);
BMessage reply;
status_t err_mouse_name = command.AddString("mouse_name",
mouse_name.String());
if (err_mouse_name != B_OK) {
- fprintf(stderr, "\nDEBUG_MOUSE->INTERFACE->set_multiple_mouse_type:"
+ fprintf(stderr, "\n DEBUG_MOUSE->INTERFACE->set_multiple_mouse_type:"
"If (err_mouse_name) \n");
return err_mouse_name;
}
- BString* name = new BString("PALO");
- // name = "PALO";
-
- command.AddString("palo", name->String());
- fprintf(stderr, "DEBUG_MOUSE_INTERFACE->"
- "set_multiple_mouse_type->Add Palo: %s \n", name->String());
-
- command.FindString("palo", name);
- fprintf(stderr, "DEBUG_MOUSE_INTERFACE->"
- "set_multiple_mouse_type->Find Palo: %s \n", name->String());
-
BString get_mouse_name;
command.FindString("mouse_name", &get_mouse_name);
- // fprintf(stderr, "chal pa, %s\n", c);
- // BString get_mouse_name;
if (mouse_name == get_mouse_name) {
fprintf(stderr, "Matched!!!!!!\n");
}
status_t err = command.AddInt32("mouse_type", type);
- fprintf(stderr, "DEBUG_MOUSE->INTERFACE->set_multiple_mouse_type->"
- "command.ADD \t%" B_PRId32 "\n", type);
- fprintf(stderr,
"DEBUG_MOUSE->INTERFACE->set_multiple_mouse_type->commmand."
- "Add: MOUSE NAME: %s MOUSE_TYPE: %d \n",
mouse_name.String(), type);
+ fprintf(stderr,
"DEBUG_MOUSE->INTERFACE->Ending->set_multiple_mouse_type->commmand."
+ "MOUSE NAME: %s MOUSE_TYPE: %d \n",
mouse_name.String(), type);
if (err != B_OK)
fprintf(stderr, "DEBUG_MOUSE->INTERFACE->set_multiple_mouse_type->"
"ERR \t%" B_PRId32 "\n", type);
@@ -663,6 +640,46 @@
status_t
+get_multiple_mouse_speed(BString mouse_name, int32 *speed)
+{
+ BMessage command(IS_GET_MOUSE_SPEED);
+ BMessage reply;
+
+ status_t err = _control_input_server_(&command, &reply);
+ if (err != B_OK)
+ return err;
+
+ if (reply.FindInt32("speed", speed) != B_OK)
+ *speed = 65536;
+
+ return B_OK;
+}
+
+
+status_t
+set_multiple_mouse_speed(BString mouse_name, int32 speed)
+{
+ BMessage command(IS_SET_MOUSE_SPEED);
+ BMessage reply;
+ command.AddString("mouse_name", mouse_name.String());
+
+ BString get_mouse_name;
+ command.FindString("mouse_name", &get_mouse_name);
+
+ if(mouse_name == get_mouse_name)
+ {
+ fprintf(stderr, "Name Matched \n");
+ }
+ command.AddInt32("speed", speed);
+
+ fprintf(stderr, "DEBUG_MOUSE->INTERFACE->set_multiple_mouse_speed:"
+ "Add: MOUSE NAME: %s MOUSE_SPEED: %d \n", mouse_name.String(),
speed);
+
+ return _control_input_server_(&command, &reply);
+}
+
+
+status_t
get_mouse_acceleration(int32 *speed)
{
BMessage command(IS_GET_MOUSE_ACCELERATION);
diff --git a/src/preferences/input/MouseSettings.cpp
b/src/preferences/input/MouseSettings.cpp
index b214195..ac95c13 100644
--- a/src/preferences/input/MouseSettings.cpp
+++ b/src/preferences/input/MouseSettings.cpp
@@ -85,8 +85,8 @@
fprintf(stderr, "error when get_mouse_map\n");
if (get_click_speed(&fSettings.click_speed) != B_OK)
fprintf(stderr, "error when get_click_speed\n");
- if (get_mouse_speed(&fSettings.accel.speed) != B_OK)
- fprintf(stderr, "error when get_mouse_speed\n");
+ if (get_multiple_mouse_speed(fname, &fSettings.accel.speed) != B_OK)
+ fprintf(stderr, "error when get_multiple_mouse_speed\n");
if (get_mouse_acceleration(&fSettings.accel.accel_factor) != B_OK)
fprintf(stderr, "error when get_mouse_acceleration\n");
if (get_multiple_mouse_type(fname, &fSettings.type) != B_OK)
@@ -272,9 +272,7 @@
"Mouse Name: %s MouseType: %d \n", fname.String(), type);
fSettings.type = type; }
else
- fprintf(stderr, "error when set_mouse_type\n");
- fprintf(stderr, "DEBUG_MOUSE->PREF->SetMouseType:"
- "error when set_mouse_tye \n");
+ fprintf(stderr, "error when set_multiple_mouse_type\n");
}
@@ -301,10 +299,13 @@
void
MouseSettings::SetMouseSpeed(int32 speed)
{
- if (set_mouse_speed(speed) == B_OK)
+ fprintf(stderr, "DEBUG_MOUSE->PREF->SetMouseSpeed:\t%" B_PRId32 "\n",
speed);
+ if (set_multiple_mouse_speed(fname, speed) == B_OK) {
+ fprintf(stderr, "DEBUG_MOUSE->PREF->SetMouseSepeed:"
+ "Mouse Name: %s MouseType: %d \n", fname.String(), speed);
fSettings.accel.speed = speed;
- else
- fprintf(stderr, "error when set_mouse_speed\n");
+ } else
+ fprintf(stderr, "error when set_multiple_mouse_speed\n");
}
@@ -451,7 +452,7 @@
(deviceName, mouseSettings));
i++;
}
- } if (message.Unflatten(&file) != B_OK) {
+ } else {
// Does not look like a BMessage, try loading using the old
format
fDeprecatedMouseSettings = new MouseSettings("");
fDeprecatedMouseSettings->_RetrieveSettings();
--
To view, visit https://review.haiku-os.org/c/haiku/+/3138
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Iaccf919fe421ea92d2fd0983095c5007cd4ed68c
Gerrit-Change-Number: 3138
Gerrit-PatchSet: 1
Gerrit-Owner: Preetpal Kaur <preetpalok123@xxxxxxxxx>
Gerrit-MessageType: newchange
