mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Allow "F1" - "F24" in accelerator.

Browse source
This commit is contained in:
Cheng Zhao 2013-10-21 15:33:19 +08:00
parent a6eb261af0
commit 30eabfb9f6
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
browser/ui/accelerator_util.cc
View file

@ -4,6 +4,8 @@
#include "browser/ui/accelerator_util.h" #include "browser/ui/accelerator_util.h"
#include <stdio.h>
#include <string> #include <string>
#include "base/string_util.h" #include "base/string_util.h"
@ -15,6 +17,13 @@ namespace accelerator_util {
namespace { namespace {
// The sscanf is deprecated in Windows.
#if defined(OS_WIN)
#define SSCANF sscanf_s
#else
#define SSCANF sscanf
#endif
// Return key code of the char. // Return key code of the char.
ui::KeyboardCode KeyboardCodeFromCharCode(char c, bool* shifted) { ui::KeyboardCode KeyboardCodeFromCharCode(char c, bool* shifted) {
*shifted = false; *shifted = false;
@ -161,6 +170,15 @@ bool StringToAccelerator(const std::string& description,
key = ui::VKEY_MEDIA_STOP; key = ui::VKEY_MEDIA_STOP;
} else if (tokens[i] == "mediaplaypause") { } else if (tokens[i] == "mediaplaypause") {
key = ui::VKEY_MEDIA_PLAY_PAUSE; key = ui::VKEY_MEDIA_PLAY_PAUSE;
} else if (tokens[i].size() > 1 && tokens[i][0] == 'f') {
// F1 - F24.
int n;
if (SSCANF(tokens[i].c_str(), "f%d", &n) == 1 && n > 0 && n < 25) {
key = static_cast<ui::KeyboardCode>(ui::VKEY_F1 + n - 1);
} else {
LOG(WARNING) << tokens[i] << "is not available on keyboard";
return false;
}
} else { } else {
LOG(WARNING) << "Invalid accelerator token: " << tokens[i]; LOG(WARNING) << "Invalid accelerator token: " << tokens[i];
return false; return false;