xserver: Branch 'xorg-server-1.2-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sat Nov 24 03:04:35 PST 2007
hw/darwin/darwinKeyboard.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 9079e43f9ec2f1cdbcddc62eaa8ed626a9adbc95
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Sat Nov 24 03:02:42 2007 -0800
Darwin: Cleaned up debug logging.
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 25ce9d1..237ea0c 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -461,7 +461,7 @@ Bool DarwinParseNXKeyMapping(
}
}
- DEBUG_LOG("DarwinParseNXKeyMapping: Parsing keymap file: %s.", darwinKeymapFile);
+ DEBUG_LOG("DarwinParseNXKeyMapping: Parsing keymap file: %s.\n", darwinKeymapFile);
if (!haveKeymap) {
// get the Darwin keyboard map
@@ -656,7 +656,7 @@ static CARD8 strToXModMask(const char *str) {
} else if(!strcmp(str, "mod5")) {
return Mod5Mask;
}
- DEBUG_LOG("strToXModMask: Invalid str: %s", str);
+ DEBUG_LOG("Invalid str: %s\n", str);
return -1;
}
@@ -685,7 +685,7 @@ static KeySym strToXKeySym(const char *str) {
} else if(!strcmp(str, "Multi_key")) {
return XK_Multi_key;
}
- DEBUG_LOG("strToXKeySym: Invalid str: %s", str);
+ DEBUG_LOG("Invalid str: %s\n", str);
return -1;
}
@@ -702,7 +702,7 @@ Bool DarwinKeyboardModMaskRemapStr(const char *keyS, const char *mask) {
m = (ModMaskRemapList *)xalloc(sizeof(ModMaskRemapList));
if(!m) {
- DEBUG_LOG("DarwinKeyboardModMaskRemapStr: Error allocating memory.");
+ DEBUG_LOG("Error allocating memory.\n");
return 0;
}
@@ -727,7 +727,7 @@ Bool DarwinKeyboardKeySymRemapStr(const char *fromS, const char *toS) {
m = (KeySymRemapList *)xalloc(sizeof(KeySymRemapList));
if(!m) {
- DEBUG_LOG("DarwinKeyboardKeySymRemapStr: Error allocating memory.");
+ DEBUG_LOG("Error allocating memory.\n");
return 0;
}
@@ -852,7 +852,7 @@ DarwinLoadKeyboardMapping(KeySymsRec *keySyms)
* DarwinParseNXKeyMapping is here
*/
if (!DarwinParseNXKeyMapping(&keyInfo)) {
- DEBUG_LOG("DarwinParseNXKeyMapping returned 0... running DarwinModeReadSystemKeymap().");
+ DEBUG_LOG("DarwinParseNXKeyMapping returned 0... running DarwinModeReadSystemKeymap().\n");
if (!DarwinModeReadSystemKeymap(&keyInfo)) {
FatalError("Could not build a valid keymap.");
}
@@ -879,15 +879,13 @@ DarwinLoadKeyboardMapping(KeySymsRec *keySyms)
i++, k += GLYPHS_PER_KEY)
{
int j;
- DEBUG_LOG("0x%02x:", i);
for (j = 0; j < GLYPHS_PER_KEY; j++) {
if (k[j] == NoSymbol) {
- DEBUG_LOG("\tNoSym");
+ DEBUG_LOG("0x%02x:\tNoSym\n", i);
} else {
- DEBUG_LOG("\t0x%lx", k[j]);
+ DEBUG_LOG("0x%02x:\t0x%lx\n", i, k[j]);
}
}
- DEBUG_LOG("\n");
}
#endif
More information about the xorg-commit
mailing list