From Preetpal Kaur <preetpalok123@xxxxxxxxx>:
Preetpal Kaur has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3127 ;)
Change subject: Added te get_set_mulitple_mouse_type() functions
......................................................................
Added te get_set_mulitple_mouse_type() functions
Change-Id: I95f85a15a77c3a548bb672cb966ae7b13fcefcc8
---
M headers/os/interface/InterfaceDefs.h
M src/kits/interface/InterfaceDefs.cpp
M src/preferences/input/MouseSettings.cpp
3 files changed, 82 insertions(+), 4 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/27/3127/1
diff --git a/headers/os/interface/InterfaceDefs.h
b/headers/os/interface/InterfaceDefs.h
index 3b66e1a..3e4b25b 100644
--- a/headers/os/interface/InterfaceDefs.h
+++ b/headers/os/interface/InterfaceDefs.h
@@ -8,6 +8,7 @@
#include <GraphicsDefs.h>
#include <OS.h>
+#include <String.h>
class BBitmap;
@@ -419,6 +420,8 @@
status_t get_mouse_type(int32* type);
status_t set_mouse_type(int32 type);
+status_t get_multiple_mouse_type(BString mouse_name, int32*
type);
+status_t set_multiple_mouse_type(BString mouse_name, int32 type);
status_t get_mouse_map(mouse_map* map);
status_t set_mouse_map(mouse_map* map);
status_t get_click_speed(bigtime_t* speed);
diff --git a/src/kits/interface/InterfaceDefs.cpp
b/src/kits/interface/InterfaceDefs.cpp
index c57ea88..06e7a9f 100644
--- a/src/kits/interface/InterfaceDefs.cpp
+++ b/src/kits/interface/InterfaceDefs.cpp
@@ -505,6 +505,76 @@
status_t
+get_multiple_mouse_type(BString mouse_name, int32 *type)
+{
+ fprintf(stderr, "DEBUG_MOUSE->INTERFACE->get_multiple_mouse_type: \n");
+ BMessage command(IS_GET_MOUSE_TYPE);
+ BMessage reply;
+
+ status_t err = _control_input_server_(&command, &reply);
+ if (err != B_OK)
+ return err;
+
+ return reply.FindInt32("mouse_type", type);
+}
+
+
+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:"
+ "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);
+ if (err != B_OK)
+ fprintf(stderr, "DEBUG_MOUSE->INTERFACE->set_multiple_mouse_type->"
+ "ERR \t%" B_PRId32 "\n", type);
+ return err;
+ return _control_input_server_(&command, &reply);
+}
+
+
+status_t
get_mouse_map(mouse_map *map)
{
BMessage command(IS_GET_MOUSE_MAP);
diff --git a/src/preferences/input/MouseSettings.cpp
b/src/preferences/input/MouseSettings.cpp
index 0d3d058..7313ff0 100644
--- a/src/preferences/input/MouseSettings.cpp
+++ b/src/preferences/input/MouseSettings.cpp
@@ -93,8 +93,8 @@
fprintf(stderr, "error when get_mouse_speed\n");
if (get_mouse_acceleration(&fSettings.accel.accel_factor) != B_OK)
fprintf(stderr, "error when get_mouse_acceleration\n");
- if (get_mouse_type(&fSettings.type) != B_OK)
- fprintf(stderr, "error when get_mouse_type\n");
+ if (get_multiple_mouse_type(fname, &fSettings.type) != B_OK)
+ fprintf(stderr, "error when get_multiple_mouse_type\n");
fMode = mouse_mode();
fFocusFollowsMouseMode = focus_follows_mouse_mode();
@@ -270,10 +270,15 @@
void
MouseSettings::SetMouseType(int32 type)
{
- if (set_mouse_type(type) == B_OK)
- fSettings.type = type;
+ fprintf(stderr, "DEBUG_MOUSE->PREF->SetMouseType:\t%" B_PRId32 "\n",
type);
+ if (set_multiple_mouse_type(fname, type) == B_OK) {
+ fprintf(stderr, "DEBUG_MOUSE->PREF->SetMouseType:"
+ "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");
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/3127
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I95f85a15a77c3a548bb672cb966ae7b13fcefcc8
Gerrit-Change-Number: 3127
Gerrit-PatchSet: 1
Gerrit-Owner: Preetpal Kaur <preetpalok123@xxxxxxxxx>
Gerrit-MessageType: newchange
