i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cut off the trailing spaces from the key dump.

Browse Source 
* Noticed these on the keymap changes made by John, however, I have no
  idea how they did get there (the keymap command doesn't use this code).
This commit is contained in:
Axel Dörfler
2012-11-05 13:34:58 +01:00
parent 095d038578
commit 634feff0e9
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/devices/keyboard/Keymap.cpp
+5 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2010, Haiku, Inc. All rights reserved. * Copyright 2004-2012, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -23,7 +23,7 @@
static void static void
print_key(char* chars, int32 offset) print_key(char* chars, int32 offset, bool last = false)
{ {
int size = chars[offset++]; int size = chars[offset++];
@@ -53,7 +53,8 @@ print_key(char* chars, int32 offset)
} }
} }
fputs("\t", stdout); if (!last)
fputs("\t", stdout);
} }
@@ -91,7 +92,7 @@ Keymap::DumpKeymap()
print_key(fChars, fKeys.caps_map[i]); print_key(fChars, fKeys.caps_map[i]);
print_key(fChars, fKeys.caps_shift_map[i]); print_key(fChars, fKeys.caps_shift_map[i]);
print_key(fChars, fKeys.option_caps_map[i]); print_key(fChars, fKeys.option_caps_map[i]);
print_key(fChars, fKeys.option_caps_shift_map[i]); print_key(fChars, fKeys.option_caps_shift_map[i], true);
fputs("\n", stdout); fputs("\n", stdout);
} }
} }
src/preferences/keymap/Keymap.cpp
+4 -3
View File
@@ -26,7 +26,7 @@ static const uint32 kModifierKeys = B_SHIFT_KEY | B_CAPS_LOCK | B_CONTROL_KEY
static void static void
print_key(char *chars, int32 offset) print_key(char *chars, int32 offset, bool last = false)
{ {
int size = chars[offset++]; int size = chars[offset++];
@@ -53,7 +53,8 @@ print_key(char *chars, int32 offset)
} }
} }
fputs("\t", stdout); if (!last)
fputs("\t", stdout);
} }
@@ -110,7 +111,7 @@ Keymap::DumpKeymap()
print_key(fChars, fKeys.caps_map[i]); print_key(fChars, fKeys.caps_map[i]);
print_key(fChars, fKeys.caps_shift_map[i]); print_key(fChars, fKeys.caps_shift_map[i]);
print_key(fChars, fKeys.option_caps_map[i]); print_key(fChars, fKeys.option_caps_map[i]);
print_key(fChars, fKeys.option_caps_shift_map[i]); print_key(fChars, fKeys.option_caps_shift_map[i], true);
fputs("\n", stdout); fputs("\n", stdout);
} }
} }