Skip to content

Commit 036f4ff

Browse files
rogerwangrogerwang
committed
Merge pull request nwjs#2128 from bwegh/master
Add F-Keys to global shortcuts
2 parents b05ed8a + c385bcf commit 036f4ff

4 files changed

Lines changed: 122 additions & 0 deletions

File tree

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ Lukas Benes <bender@false.cz>
2727
Lithare Emileit <litharemilit@gmail.com>
2828
Jefry Tedjokusumo <jtg_gg@yahoo.com.sg>
2929
Wu Haojian <hokein.wu@gmail.com>
30+
Bas Wegh <BasWegh@gmx.de>

‎src/api/shortcut/shortcut.cc‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,30 @@ ui::Accelerator Parse(const std::string& shortcut) {
6868
tokens[i] == kKeyPgUp ||
6969
tokens[i] == kKeyPgDwn ||
7070
tokens[i] == kKeyTab ||
71+
tokens[i] == kKeyF1 ||
72+
tokens[i] == kKeyF2 ||
73+
tokens[i] == kKeyF3 ||
74+
tokens[i] == kKeyF4 ||
75+
tokens[i] == kKeyF5 ||
76+
tokens[i] == kKeyF6 ||
77+
tokens[i] == kKeyF7 ||
78+
tokens[i] == kKeyF8 ||
79+
tokens[i] == kKeyF9 ||
80+
tokens[i] == kKeyF10 ||
81+
tokens[i] == kKeyF11 ||
82+
tokens[i] == kKeyF12 ||
83+
tokens[i] == kKeyF13 ||
84+
tokens[i] == kKeyF14 ||
85+
tokens[i] == kKeyF15 ||
86+
tokens[i] == kKeyF16 ||
87+
tokens[i] == kKeyF17 ||
88+
tokens[i] == kKeyF18 ||
89+
tokens[i] == kKeyF19 ||
90+
tokens[i] == kKeyF20 ||
91+
tokens[i] == kKeyF21 ||
92+
tokens[i] == kKeyF22 ||
93+
tokens[i] == kKeyF23 ||
94+
tokens[i] == kKeyF24 ||
7195
tokens[i] == kKeyMediaNextTrack ||
7296
tokens[i] == kKeyMediaPlayPause ||
7397
tokens[i] == kKeyMediaPrevTrack ||
@@ -104,6 +128,54 @@ ui::Accelerator Parse(const std::string& shortcut) {
104128
key = ui::VKEY_NEXT;
105129
} else if (tokens[i] == kKeyTab) {
106130
key = ui::VKEY_TAB;
131+
} else if (tokens[i] == kKeyF1) {
132+
key = ui::VKEY_F1;
133+
} else if (tokens[i] == kKeyF2) {
134+
key = ui::VKEY_F2;
135+
} else if (tokens[i] == kKeyF3) {
136+
key = ui::VKEY_F3;
137+
} else if (tokens[i] == kKeyF4) {
138+
key = ui::VKEY_F4;
139+
} else if (tokens[i] == kKeyF5) {
140+
key = ui::VKEY_F5;
141+
} else if (tokens[i] == kKeyF6) {
142+
key = ui::VKEY_F6;
143+
} else if (tokens[i] == kKeyF7) {
144+
key = ui::VKEY_F7;
145+
} else if (tokens[i] == kKeyF8) {
146+
key = ui::VKEY_F8;
147+
} else if (tokens[i] == kKeyF9) {
148+
key = ui::VKEY_F9;
149+
} else if (tokens[i] == kKeyF10) {
150+
key = ui::VKEY_F10;
151+
} else if (tokens[i] == kKeyF11) {
152+
key = ui::VKEY_F11;
153+
} else if (tokens[i] == kKeyF12) {
154+
key = ui::VKEY_F12;
155+
} else if (tokens[i] == kKeyF13) {
156+
key = ui::VKEY_F13;
157+
} else if (tokens[i] == kKeyF14) {
158+
key = ui::VKEY_F14;
159+
} else if (tokens[i] == kKeyF15) {
160+
key = ui::VKEY_F15;
161+
} else if (tokens[i] == kKeyF16) {
162+
key = ui::VKEY_F16;
163+
} else if (tokens[i] == kKeyF17) {
164+
key = ui::VKEY_F17;
165+
} else if (tokens[i] == kKeyF18) {
166+
key = ui::VKEY_F18;
167+
} else if (tokens[i] == kKeyF19) {
168+
key = ui::VKEY_F19;
169+
} else if (tokens[i] == kKeyF20) {
170+
key = ui::VKEY_F20;
171+
} else if (tokens[i] == kKeyF21) {
172+
key = ui::VKEY_F21;
173+
} else if (tokens[i] == kKeyF22) {
174+
key = ui::VKEY_F22;
175+
} else if (tokens[i] == kKeyF23) {
176+
key = ui::VKEY_F23;
177+
} else if (tokens[i] == kKeyF24) {
178+
key = ui::VKEY_F24;
107179
} else if (tokens[i] == kKeyMediaNextTrack) {
108180
key = ui::VKEY_MEDIA_NEXT_TRACK;
109181
} else if (tokens[i] == kKeyMediaPlayPause) {

‎src/api/shortcut/shortcut_constants.cc‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,29 @@ const char kKeySeparator[] = "+";
4444
const char kKeyShift[] = "shift";
4545
const char kKeyTab[] = "tab";
4646
const char kKeyUp[] = "up";
47+
const char kKeyF1[] = "f1";
48+
const char kKeyF2[] = "f2";
49+
const char kKeyF3[] = "f3";
50+
const char kKeyF4[] = "f4";
51+
const char kKeyF5[] = "f5";
52+
const char kKeyF6[] = "f6";
53+
const char kKeyF7[] = "f7";
54+
const char kKeyF8[] = "f8";
55+
const char kKeyF9[] = "f9";
56+
const char kKeyF10[] = "f10";
57+
const char kKeyF11[] = "f11";
58+
const char kKeyF12[] = "f12";
59+
const char kKeyF13[] = "f13";
60+
const char kKeyF14[] = "f14";
61+
const char kKeyF15[] = "f15";
62+
const char kKeyF16[] = "f16";
63+
const char kKeyF17[] = "f17";
64+
const char kKeyF18[] = "f18";
65+
const char kKeyF19[] = "f19";
66+
const char kKeyF20[] = "f20";
67+
const char kKeyF21[] = "f21";
68+
const char kKeyF22[] = "f22";
69+
const char kKeyF23[] = "f23";
70+
const char kKeyF24[] = "f24";
4771

4872
} // namespace nwapi

‎src/api/shortcut/shortcut_constants.h‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,31 @@ extern const char kKeySeparator[];
4545
extern const char kKeyShift[];
4646
extern const char kKeyTab[];
4747
extern const char kKeyUp[];
48+
extern const char kKeyF1[];
49+
extern const char kKeyF2[];
50+
extern const char kKeyF3[];
51+
extern const char kKeyF4[];
52+
extern const char kKeyF5[];
53+
extern const char kKeyF6[];
54+
extern const char kKeyF7[];
55+
extern const char kKeyF8[];
56+
extern const char kKeyF9[];
57+
extern const char kKeyF10[];
58+
extern const char kKeyF11[];
59+
extern const char kKeyF12[];
60+
extern const char kKeyF13[];
61+
extern const char kKeyF14[];
62+
extern const char kKeyF15[];
63+
extern const char kKeyF16[];
64+
extern const char kKeyF17[];
65+
extern const char kKeyF18[];
66+
extern const char kKeyF19[];
67+
extern const char kKeyF20[];
68+
extern const char kKeyF21[];
69+
extern const char kKeyF22[];
70+
extern const char kKeyF23[];
71+
extern const char kKeyF24[];
72+
4873

4974
} // namespace nwapi
5075

0 commit comments

Comments
 (0)