From 634feff0e97e3d0e60976eb7a27938743440506b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 5 Nov 2012 13:32:51 +0100 Subject: [PATCH] Cut off the trailing spaces from the key dump. * 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). --- src/add-ons/input_server/devices/keyboard/Keymap.cpp | 9 +++++---- src/preferences/keymap/Keymap.cpp | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/add-ons/input_server/devices/keyboard/Keymap.cpp b/src/add-ons/input_server/devices/keyboard/Keymap.cpp index 86afbe0178..f003b02c03 100644 --- a/src/add-ons/input_server/devices/keyboard/Keymap.cpp +++ b/src/add-ons/input_server/devices/keyboard/Keymap.cpp @@ -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. * * Authors: @@ -23,7 +23,7 @@ static void -print_key(char* chars, int32 offset) +print_key(char* chars, int32 offset, bool last = false) { 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_shift_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); } } diff --git a/src/preferences/keymap/Keymap.cpp b/src/preferences/keymap/Keymap.cpp index 817d86ef2c..e2225f9be4 100644 --- a/src/preferences/keymap/Keymap.cpp +++ b/src/preferences/keymap/Keymap.cpp @@ -26,7 +26,7 @@ static const uint32 kModifierKeys = B_SHIFT_KEY | B_CAPS_LOCK | B_CONTROL_KEY static void -print_key(char *chars, int32 offset) +print_key(char *chars, int32 offset, bool last = false) { 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_shift_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); } }