Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Reactivate "turn device screen on" feature

Browse source 
This reverts commit 8c8649cfcd.

I cannot reproduce the issue with Ctrl+Shift+o on any device, so in
practice it works, it's too bad to remove the feature for a random bug
on some Android versions on some devices.
This commit is contained in:
Romain Vimont 2020-05-27 18:18:39 +02:00
parent 93a5c5149d
commit dcde578a50
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -576,6 +576,7 @@ Also see [issue #14].
| Click on `POWER` | `Ctrl`+`p` | `Cmd`+`p` | Click on `POWER` | `Ctrl`+`p` | `Cmd`+`p`
| Power on | _Right-click²_ | _Right-click²_ | Power on | _Right-click²_ | _Right-click²_
| Turn device screen off (keep mirroring) | `Ctrl`+`o` | `Cmd`+`o` | Turn device screen off (keep mirroring) | `Ctrl`+`o` | `Cmd`+`o`
| Turn device screen on | `Ctrl`+`Shift`+`o` | `Cmd`+`Shift`+`o`
| Rotate device screen | `Ctrl`+`r` | `Cmd`+`r` | Rotate device screen | `Ctrl`+`r` | `Cmd`+`r`
| Expand notification panel | `Ctrl`+`n` | `Cmd`+`n` | Expand notification panel | `Ctrl`+`n` | `Cmd`+`n`
| Collapse notification panel | `Ctrl`+`Shift`+`n` | `Cmd`+`Shift`+`n` | Collapse notification panel | `Ctrl`+`Shift`+`n` | `Cmd`+`Shift`+`n`

4
app/scrcpy.1
View file

@ -259,6 +259,10 @@ Turn screen on
.B Ctrl+o .B Ctrl+o
Turn device screen off (keep mirroring) Turn device screen off (keep mirroring)
.TP
.B Ctrl+Shift+o
Turn device screen on
.TP .TP
.B Ctrl+r .B Ctrl+r
Rotate device screen Rotate device screen

3
app/src/cli.c
View file

@ -231,6 +231,9 @@ scrcpy_print_usage(const char *arg0) {
" " CTRL_OR_CMD "+o\n" " " CTRL_OR_CMD "+o\n"
" Turn device screen off (keep mirroring)\n" " Turn device screen off (keep mirroring)\n"
"\n" "\n"
" " CTRL_OR_CMD "+Shift+o\n"
" Turn device screen on\n"
"\n"
" " CTRL_OR_CMD "+r\n" " " CTRL_OR_CMD "+r\n"
" Rotate device screen\n" " Rotate device screen\n"
"\n" "\n"

7
app/src/input_manager.c
View file

@ -321,8 +321,11 @@ input_manager_process_key(struct input_manager *im,
} }
return; return;
case SDLK_o: case SDLK_o:
if (control && cmd && !shift && down) { if (control && cmd && down) {
set_screen_power_mode(controller, SCREEN_POWER_MODE_OFF); enum screen_power_mode mode = shift
? SCREEN_POWER_MODE_NORMAL
: SCREEN_POWER_MODE_OFF;
set_screen_power_mode(controller, mode);
} }
return; return;
case SDLK_DOWN: case SDLK_DOWN: