Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use shift+ctrl+cmd+esc for emergency video safe mode

Browse Source 
Used to be just ctrl+cmd+esc. The added shift key should prevent accidental
video safe mode activation.
This commit is contained in:
Humdinger 2016-11-16 13:33:49 +01:00
parent a55deaea91
commit a07a1391f1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/screenmode/screenmode.cpp
View File

@ -334,8 +334,8 @@ main(int argc, char** argv)
if (fallbackMode) { if (fallbackMode) {
// display notification requester // display notification requester
BAlert* alert = new BAlert("screenmode", BAlert* alert = new BAlert("screenmode",
"You have used the shortcut <Command><Ctrl><Escape> to reset the " "You have used the shortcut <Shift><Command><Ctrl><Escape> to "
"screen mode to a safe fallback.", "Keep", "Revert"); "reset the screen mode to a safe fallback.", "Keep", "Revert");
alert->SetShortcut(1, B_ESCAPE); alert->SetShortcut(1, B_ESCAPE);
if (alert->Go() == 1) if (alert->Go() == 1)
screenMode.Revert(); screenMode.Revert();

5
src/servers/app/Desktop.cpp
View File

@ -186,9 +186,10 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target,
message->FindInt32("modifiers", &modifiers); message->FindInt32("modifiers", &modifiers);
if ((message->what == B_KEY_DOWN || message->what == B_UNMAPPED_KEY_DOWN)) { if ((message->what == B_KEY_DOWN || message->what == B_UNMAPPED_KEY_DOWN)) {
// Check for safe video mode (cmd + ctrl + escape) // Check for safe video mode (shift + cmd + ctrl + escape)
if (key == 0x01 && (modifiers & B_COMMAND_KEY) != 0 if (key == 0x01 && (modifiers & B_COMMAND_KEY) != 0
&& (modifiers & B_CONTROL_KEY) != 0) { && (modifiers & B_CONTROL_KEY) != 0
&& (modifiers & B_SHIFT_KEY) != 0){
system("screenmode --fall-back &"); system("screenmode --fall-back &");
return B_SKIP_MESSAGE; return B_SKIP_MESSAGE;
} }