From 767560b14ef4172fd72c728c856eccf2aa8912d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Thu, 23 Sep 2004 15:35:37 +0000
Subject: [PATCH] Splitted kb_mouse_driver.h to avoid mixing driver and
 settings

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9043 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/input/kb_mouse_driver.h   | 39 -------------------
 headers/private/input/kb_mouse_settings.h | 47 +++++++++++++++++++++++
 2 files changed, 47 insertions(+), 39 deletions(-)
 create mode 100644 headers/private/input/kb_mouse_settings.h

diff --git a/headers/private/input/kb_mouse_driver.h b/headers/private/input/kb_mouse_driver.h
index 8cc0d4f77f..d3eb94bc9f 100644
--- a/headers/private/input/kb_mouse_driver.h
+++ b/headers/private/input/kb_mouse_driver.h
@@ -77,17 +77,6 @@ enum {
 };
 
 
-// keyboard settings info, as kept in settings file
-
-
-typedef struct {
-	bigtime_t       key_repeat_delay;
-	int32           key_repeat_rate;
-} kb_settings;
-
-#define kb_settings_file "Keyboard_settings"
-
-
 // structure passed to KB_READ
 
 typedef struct {                        // USB, ADB keyboards
@@ -112,34 +101,6 @@ typedef struct {
 } led_info;
 
 
-
-// mouse settings info
-
-typedef enum {
-	MOUSE_1_BUTTON = 1,
-	MOUSE_2_BUTTON,
-	MOUSE_3_BUTTON
-} mouse_type;
-
-typedef struct {
-	int32           left;
-	int32           right;
-	int32           middle;
-} map_mouse;
-
-typedef struct {
-	bool    enabled;        // Acceleration on / off
-	int32   accel_factor;   // accel factor: 256 = step by 1, 128 = step by 1/2
-	int32   speed;          // speed accelerator (1=1X, 2 = 2x)...
-} mouse_accel;
-
-typedef struct {
-	mouse_type      type;
-	map_mouse       map;
-	mouse_accel     accel;
-	bigtime_t       click_speed;
-} mouse_settings;
-
 #define mouse_settings_file "Mouse_settings"
 
 typedef struct {
diff --git a/headers/private/input/kb_mouse_settings.h b/headers/private/input/kb_mouse_settings.h
new file mode 100644
index 0000000000..8e3801be19
--- /dev/null
+++ b/headers/private/input/kb_mouse_settings.h
@@ -0,0 +1,47 @@
+//
+// kb_mouse_settings.h
+//
+
+
+#ifndef _KB_MOUSE_SETTINGS_H
+#define _KB_MOUSE_SETTINGS_H
+
+#include <SupportDefs.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+// keyboard settings info, as kept in settings file
+
+
+typedef struct {
+	bigtime_t       key_repeat_delay;
+	int32           key_repeat_rate;
+} kb_settings;
+
+#define kb_settings_file "Keyboard_settings"
+
+// mouse settings info
+
+typedef struct {
+	bool    enabled;        // Acceleration on / off
+	int32   accel_factor;   // accel factor: 256 = step by 1, 128 = step by 1/2
+	int32   speed;          // speed accelerator (1=1X, 2 = 2x)...
+} mouse_accel;
+
+typedef struct {
+	int32		type;
+	mouse_map	map;
+	mouse_accel     accel;
+	bigtime_t       click_speed;
+} mouse_settings;
+
+#define mouse_settings_file "Mouse_settings"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif