wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 672175 part.17 System settings of mouse wheel on Windows should be able to be overridden by prefs for testing r=jimm

Browse Source
This commit is contained in:
Masayuki Nakano 2012-03-22 09:59:12 +09:00
parent 13041ff659
commit b65d0bd050
2 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
widget/windows/WinMouseScrollHandler.cpp
View File

@ -865,13 +865,16 @@ bool
MouseScrollHandler::LastEventInfo::CanContinueTransaction(
const EventInfo& aNewEvent)
{
PRInt32 timeout = MouseScrollHandler::sInstance->
mUserPrefs.GetMouseScrollTransactionTimeout();
return !mWnd ||
(mWnd == aNewEvent.GetWindowHandle() &&
IsPositive() == aNewEvent.IsPositive() &&
mIsVertical == aNewEvent.IsVertical() &&
mIsPage == aNewEvent.IsPage() &&
TimeStamp::Now() - mTimeStamp <=
TimeDuration::FromMilliseconds(DEFAULT_TIMEOUT_DURATION));
(timeout < 0 ||
TimeStamp::Now() - mTimeStamp <=
TimeDuration::FromMilliseconds(timeout)));
}
void
@ -1053,12 +1056,25 @@ MouseScrollHandler::SystemSettings::Init()
mInitialized = true;
if (!::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &mScrollLines, 0)) {
MouseScrollHandler::UserPrefs& userPrefs =
MouseScrollHandler::sInstance->mUserPrefs;
mScrollLines = userPrefs.GetOverriddenVerticalScrollAmout();
if (mScrollLines >= 0) {
// overridden by the pref.
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScroll::SystemSettings::Init(): mScrollLines is overridden by "
"the pref: %d",
mScrollLines));
} else if (!::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
&mScrollLines, 0)) {
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScroll::SystemSettings::Init(): ::SystemParametersInfo("
"SPI_GETWHEELSCROLLLINES) failed"));
mScrollLines = 3;
} else if (mScrollLines > WHEEL_DELTA) {
}
if (mScrollLines > WHEEL_DELTA) {
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScroll::SystemSettings::Init(): the result of "
"::SystemParametersInfo(SPI_GETWHEELSCROLLLINES) is too large: %d",
@ -1072,7 +1088,15 @@ MouseScrollHandler::SystemSettings::Init()
mScrollLines = WHEEL_PAGESCROLL;
}
if (!::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0, &mScrollChars, 0)) {
mScrollChars = userPrefs.GetOverriddenHorizontalScrollAmout();
if (mScrollChars >= 0) {
// overridden by the pref.
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScroll::SystemSettings::Init(): mScrollChars is overridden by "
"the pref: %d",
mScrollChars));
} else if (!::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0,
&mScrollChars, 0)) {
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScroll::SystemSettings::Init(): ::SystemParametersInfo("
"SPI_GETWHEELSCROLLCHARS) failed, %s",
@ -1080,7 +1104,9 @@ MouseScrollHandler::SystemSettings::Init()
"this is unexpected on Vista or later" :
"but on XP or earlier, this is not a problem"));
mScrollChars = 1;
} else if (mScrollChars > WHEEL_DELTA) {
}
if (mScrollChars > WHEEL_DELTA) {
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScroll::SystemSettings::Init(): the result of "
"::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS) is too large: %d",
@ -1146,12 +1172,24 @@ MouseScrollHandler::UserPrefs::Init()
Preferences::GetBool("mousewheel.enable_pixel_scrolling", true);
mScrollMessageHandledAsWheelMessage =
Preferences::GetBool("mousewheel.emulate_at_wm_scroll", false);
mOverriddenVerticalScrollAmount =
Preferences::GetInt("mousewheel.windows.vertical_amount_override", -1);
mOverriddenHorizontalScrollAmount =
Preferences::GetInt("mousewheel.windows.horizontal_amount_override", -1);
mMouseScrollTransactionTimeout =
Preferences::GetInt("mousewheel.windows.transaction.timeout",
DEFAULT_TIMEOUT_DURATION);
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScroll::UserPrefs::Init(): initialized, "
"mPixelScrollingEnabled=%s, mScrollMessageHandledAsWheelMessage=%s",
"mPixelScrollingEnabled=%s, mScrollMessageHandledAsWheelMessage=%s, "
"mOverriddenVerticalScrollAmount=%d, "
"mOverriddenHorizontalScrollAmount=%d, "
"mMouseScrollTransactionTimeout=%d",
GetBoolName(mPixelScrollingEnabled),
GetBoolName(mScrollMessageHandledAsWheelMessage)));
GetBoolName(mScrollMessageHandledAsWheelMessage),
mOverriddenVerticalScrollAmount, mOverriddenHorizontalScrollAmount,
mMouseScrollTransactionTimeout));
}
void
@ -1160,6 +1198,8 @@ MouseScrollHandler::UserPrefs::MarkDirty()
PR_LOG(gMouseScrollLog, PR_LOG_ALWAYS,
("MouseScrollHandler::UserPrefs::MarkDirty(): Marking UserPrefs dirty"));
mInitialized = false;
// Some prefs might override system settings, so, we should mark them dirty.
MouseScrollHandler::sInstance->mSystemSettings.MarkDirty();
// When user prefs for mousewheel are changed, we should reset current
// transaction.
MOZ_ASSERT(sInstance,

22
widget/windows/WinMouseScrollHandler.h
View File

@ -333,6 +333,7 @@ private:
void Init();
void MarkDirty();
void NotifyUserPrefsMayOverrideSystemSettings();
PRInt32 GetScrollAmount(bool aForVertical) const
{
@ -374,6 +375,24 @@ private:
return mScrollMessageHandledAsWheelMessage;
}
PRInt32 GetOverriddenVerticalScrollAmout()
{
Init();
return mOverriddenVerticalScrollAmount;
}
PRInt32 GetOverriddenHorizontalScrollAmout()
{
Init();
return mOverriddenHorizontalScrollAmount;
}
PRInt32 GetMouseScrollTransactionTimeout()
{
Init();
return mMouseScrollTransactionTimeout;
}
private:
void Init();
@ -386,6 +405,9 @@ private:
bool mInitialized;
bool mPixelScrollingEnabled;
bool mScrollMessageHandledAsWheelMessage;
PRInt32 mOverriddenVerticalScrollAmount;
PRInt32 mOverriddenHorizontalScrollAmount;
PRInt32 mMouseScrollTransactionTimeout;
};
UserPrefs mUserPrefs;