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 1192573 - Require tablet-mode (Win10+) to show the on-screen keyboard. r=masayuki

Browse Source
This commit is contained in:
Jared Wein 2015-08-13 14:23:54 -04:00
parent 0538bf89da
commit eb47923345
2 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/libpref/init/all.js
View File

@ -3240,6 +3240,9 @@ pref("ui.osk.enabled", true);
pref("ui.osk.detect_physical_keyboard", true);
// Path to TabTip.exe on local machine. Cached for performance reasons.
pref("ui.osk.on_screen_keyboard_path", "");
// Only show the on-screen keyboard when Windows is in Tablet mode. Setting
// this pref to false will allow the OSK to show in regular non-tablet mode.
pref("ui.osk.require_tablet_mode", true);
# XP_WIN
#endif

52
widget/windows/WinIMEHandler.cpp
View File

@ -16,6 +16,7 @@
#include "nsLookAndFeel.h"
#include "nsWindow.h"
#include "WinUtils.h"
#include "nsIWindowsUIUtils.h"
#include "shellapi.h"
#include "Shlobj.h"
@ -26,6 +27,7 @@
const char* kOskPathPrefName = "ui.osk.on_screen_keyboard_path";
const char* kOskEnabled = "ui.osk.enabled";
const char* kOskDetectPhysicalKeyboard = "ui.osk.detect_physical_keyboard";
const char* kOskRequireTabletMode = "ui.osk.require_tablet_mode";
namespace mozilla {
namespace widget {
@ -525,19 +527,44 @@ IMEHandler::SetInputScopeForIMM32(nsWindow* aWindow,
void
IMEHandler::MaybeShowOnScreenKeyboard()
{
if (sPluginHasFocus) {
if (sPluginHasFocus ||
!IsWin10OrLater() ||
!Preferences::GetBool(kOskEnabled, true) ||
sShowingOnScreenKeyboard ||
IMEHandler::IsKeyboardPresentOnSlate()) {
return;
}
IMEHandler::ShowOnScreenKeyboard();
if (Preferences::GetBool(kOskRequireTabletMode, true)) {
// Tablet Mode is only supported on Windows 10 and higher.
// When touch-event detection within IME is better supported
// this check may be removed, and ShowOnScreenKeyboard can
// run on Windows 8 and higher (adjusting the IsWin10OrLater
// guard above and within MaybeDismissOnScreenKeyboard).
nsCOMPtr<nsIWindowsUIUtils>
uiUtils(do_GetService("@mozilla.org/windows-ui-utils;1"));
if (uiUtils) {
bool isInTabletMode = false;
uiUtils->GetInTabletMode(&isInTabletMode);
if (!isInTabletMode) {
return;
}
}
}
IMEHandler::ShowOnScreenKeyboard();
}
// static
void
IMEHandler::MaybeDismissOnScreenKeyboard()
{
if (sPluginHasFocus) {
if (sPluginHasFocus ||
!IsWin10OrLater() ||
!sShowingOnScreenKeyboard) {
return;
}
IMEHandler::DismissOnScreenKeyboard();
}
@ -639,13 +666,12 @@ IMEHandler::IsKeyboardPresentOnSlate()
{ 0x4D36E96B, 0xE325, 0x11CE,
{ 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18 } };
bool result = false;
// Query for all the keyboard devices.
HDEVINFO device_info =
::SetupDiGetClassDevs(&KEYBOARD_CLASS_GUID, nullptr,
nullptr, DIGCF_PRESENT);
if (device_info == INVALID_HANDLE_VALUE) {
return result;
return false;
}
// Enumerate all keyboards and look for ACPI\PNP and HID\VID devices. If
@ -675,11 +701,11 @@ IMEHandler::IsKeyboardPresentOnSlate()
// return true if the API's report one or more keyboards. Please note
// that this will break for non keyboard devices which expose a
// keyboard PDO.
result = true;
return true;
}
}
}
return result;
return false;
}
// Based on DisplayVirtualKeyboard() in Chromium's base/win/win_util.cc.
@ -687,13 +713,6 @@ IMEHandler::IsKeyboardPresentOnSlate()
void
IMEHandler::ShowOnScreenKeyboard()
{
if (!IsWin8OrLater() ||
!Preferences::GetBool(kOskEnabled, true) ||
sShowingOnScreenKeyboard ||
IMEHandler::IsKeyboardPresentOnSlate()) {
return;
}
nsAutoString cachedPath;
nsresult result = Preferences::GetString(kOskPathPrefName, &cachedPath);
if (NS_FAILED(result) || cachedPath.IsEmpty()) {
@ -774,11 +793,6 @@ IMEHandler::ShowOnScreenKeyboard()
void
IMEHandler::DismissOnScreenKeyboard()
{
if (!IsWin8OrLater() ||
!sShowingOnScreenKeyboard) {
return;
}
sShowingOnScreenKeyboard = false;
// Dismiss the virtual keyboard by generating the ESC keystroke