Changes from mercurial repository.

This commit is contained in:
Sorin Sbarnea 2009-10-21 16:25:08 +00:00
parent 44bb32f476
commit 98c68897d8
135 changed files with 2686 additions and 26965 deletions

View file

@ -891,6 +891,10 @@ CConfig::readSectionScreens(CConfigReadContext& s)
addOption(screen, kOptionScreenSwitchCornerSize,
s.parseInt(value));
}
else if (name == "preserveFocus") {
addOption(screen, kOptionScreenPreserveFocus,
s.parseBoolean(value));
}
else {
// unknown argument
throw XConfigRead(s, "unknown argument \"%{1}\"", name);
@ -1332,6 +1336,9 @@ CConfig::getOptionName(OptionID id)
if (id == kOptionWin32KeepForeground) {
return "win32KeepForeground";
}
if (id == kOptionScreenPreserveFocus) {
return "preserveFocus";
}
return NULL;
}
@ -1344,7 +1351,8 @@ CConfig::getOptionValue(OptionID id, OptionValue value)
id == kOptionScreenSaverSync ||
id == kOptionXTestXineramaUnaware ||
id == kOptionRelativeMouseMoves ||
id == kOptionWin32KeepForeground) {
id == kOptionWin32KeepForeground ||
id == kOptionScreenPreserveFocus) {
return (value != 0) ? "true" : "false";
}
if (id == kOptionModifierMapForShift ||