Some minor visual improvements: the keyboard input device now reports
"AT Keyboard" and "USB Keyboard", instead of "at|usb Keyboard". Also, the mouse input device now reports a "PS/2 Mouse" instead of a "ps2 Mouse". Generally, both now capitalize the device name when reporting the name. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12465 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -792,6 +792,13 @@ KeyboardInputDevice::GetShortName(const char *longName)
|
|||||||
|
|
||||||
int32 previousSlash = string.FindLast("/", slash);
|
int32 previousSlash = string.FindLast("/", slash);
|
||||||
string.CopyInto(name, previousSlash + 1, slash - previousSlash - 1);
|
string.CopyInto(name, previousSlash + 1, slash - previousSlash - 1);
|
||||||
|
|
||||||
|
// some special handling so that we get "USB" and "AT" instead of "usb"/"at"
|
||||||
|
if (name.Length() < 4)
|
||||||
|
name.ToUpper();
|
||||||
|
else
|
||||||
|
name.Capitalize();
|
||||||
|
|
||||||
name << " Keyboard " << index;
|
name << " Keyboard " << index;
|
||||||
|
|
||||||
return strdup(name.String());
|
return strdup(name.String());
|
||||||
|
|||||||
@@ -405,6 +405,7 @@ void
|
|||||||
MouseInputDevice::RecursiveScan(const char *directory)
|
MouseInputDevice::RecursiveScan(const char *directory)
|
||||||
{
|
{
|
||||||
CALLED();
|
CALLED();
|
||||||
|
|
||||||
bool found_ps2 = false;
|
bool found_ps2 = false;
|
||||||
BEntry entry;
|
BEntry entry;
|
||||||
BDirectory dir(directory);
|
BDirectory dir(directory);
|
||||||
@@ -439,6 +440,12 @@ get_short_name(const char *longName)
|
|||||||
|
|
||||||
int32 previousSlash = string.FindLast("/", slash);
|
int32 previousSlash = string.FindLast("/", slash);
|
||||||
string.CopyInto(name, previousSlash + 1, slash - previousSlash - 1);
|
string.CopyInto(name, previousSlash + 1, slash - previousSlash - 1);
|
||||||
|
|
||||||
|
if (name == "ps2")
|
||||||
|
name = "PS/2";
|
||||||
|
else
|
||||||
|
name.Capitalize();
|
||||||
|
|
||||||
name << " Mouse " << index;
|
name << " Mouse " << index;
|
||||||
|
|
||||||
return strdup(name.String());
|
return strdup(name.String());
|
||||||
|
|||||||
Reference in New Issue
Block a user