frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display more friendly mouse protocol names. Enable mouse wheel mapping by 

default.
This commit is contained in:
Alan Coopersmith 2005-08-23 20:58:29 +00:00
parent cff4b1c216
commit 9f498a37dd
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/xfree86/utils/xorgconfig/xorgconfig.c
View File

@ -416,7 +416,7 @@ struct {
}, },
#ifdef sun #ifdef sun
{"VUID", &M_VUID, {"VUID", &M_VUID,
"Solaris VUID" "Solaris VUID protocol (SPARC, USB, or virtual mouse)"
}, },
#endif #endif
{"SysMouse", &M_SYSMOUSE, {"SysMouse", &M_SYSMOUSE,
@ -562,7 +562,8 @@ mouse_configuration(void) {
emptylines(); emptylines();
printf("%s", mouseintro_text); printf("%s", mouseintro_text);
for (j = i; j < i + 14 && j < MOUSETYPE_COUNT; j++) for (j = i; j < i + 14 && j < MOUSETYPE_COUNT; j++)
printf("%2d. %s\n", j + 1, mouse_info[j].name); printf("%2d. %s [%s]\n", j + 1,
mouse_info[j].name, mouse_info[j].desc);
printf("\n"); printf("\n");
printf("%s", mousecomment_text); printf("%s", mousecomment_text);
printf("Enter a protocol number: "); printf("Enter a protocol number: ");
@ -2130,25 +2131,33 @@ static char *pointersection_text1 =
static char *pointersection_text2 = static char *pointersection_text2 =
"\n" "\n"
"# Mouse-speed setting for PS/2 mouse.\n"
"\n"
"# Option \"Resolution\" \"256\"\n"
"\n"
"# When using XQUEUE, comment out the above two lines, and uncomment\n" "# When using XQUEUE, comment out the above two lines, and uncomment\n"
"# the following line.\n" "# the following line.\n"
"\n" "\n"
"# Option \"Protocol\" \"Xqueue\"\n" "# Option \"Protocol\" \"Xqueue\"\n"
"\n" "\n"
"# Mouse-speed setting for PS/2 mouse.\n"
"\n"
"# Option \"Resolution\" \"256\"\n"
"\n"
"# Baudrate and SampleRate are only for some Logitech mice. In\n" "# Baudrate and SampleRate are only for some Logitech mice. In\n"
"# almost every case these lines should be omitted.\n" "# almost every case these lines should be omitted.\n"
"\n" "\n"
"# Option \"BaudRate\" \"9600\"\n" "# Option \"BaudRate\" \"9600\"\n"
"# Option \"SampleRate\" \"150\"\n" "# Option \"SampleRate\" \"150\"\n"
"\n" "\n"
"# Emulate3Buttons is an option for 2-button Microsoft mice\n" "# Mouse wheel mapping. Default is to map vertical wheel to buttons 4 & 5,\n"
"# horizontal wheel to buttons 6 & 7. Change if your mouse has more than\n"
"# 3 buttons and you need to map the wheel to different button ids to avoid\n"
"# conflicts.\n"
"\n"
" Option \"ZAxisMapping\" \"4 5 6 7\"\n"
"\n"
"# Emulate3Buttons is an option for 2-button mice\n"
"# Emulate3Timeout is the timeout in milliseconds (default is 50ms)\n" "# Emulate3Timeout is the timeout in milliseconds (default is 50ms)\n"
"\n"; "\n";
static char *xinputsection_text = static char *xinputsection_text =
"# **********************************************************************\n" "# **********************************************************************\n"
"# Other input device sections \n" "# Other input device sections \n"
@ -2600,8 +2609,9 @@ write_XF86Config(char *filename)
* Write pointer section. * Write pointer section.
*/ */
fprintf(f, "%s", pointersection_text1); fprintf(f, "%s", pointersection_text1);
fprintf(f, " Option \"Protocol\" \"%s\"\n", fprintf(f, " Option \"Protocol\" \"%s\"\t# %s\n",
mouse_info[config_mousetype].name); mouse_info[config_mousetype].name,
mouse_info[config_mousetype].desc);
#if !defined(__UNIXOS2__) && !defined(QNX4) #if !defined(__UNIXOS2__) && !defined(QNX4)
fprintf(f, " Option \"Device\" \"%s\"\n", config_pointerdevice); fprintf(f, " Option \"Device\" \"%s\"\n", config_pointerdevice);
#endif #endif