Remove "get clipboard" call

Now that every device clipboard change is automatically synchronized to
the computer, the "get clipboard" request (bound to MOD+c) is useless.
This commit is contained in:
Romain Vimont 2020-07-17 00:00:42 +02:00
parent 20d3925099
commit bccd12bf5c
4 changed files with 0 additions and 24 deletions

View file

@ -504,7 +504,6 @@ requested orientation.
It is possible to synchronize clipboards between the computer and the device, in It is possible to synchronize clipboards between the computer and the device, in
both directions: both directions:
- `MOD`+`c` copies the device clipboard to the computer clipboard;
- `MOD`+`Shift`+`v` copies the computer clipboard to the device clipboard (and - `MOD`+`Shift`+`v` copies the computer clipboard to the device clipboard (and
pastes if the device runs Android >= 7); pastes if the device runs Android >= 7);
- `MOD`+`v` _pastes_ the computer clipboard as a sequence of text events (but - `MOD`+`v` _pastes_ the computer clipboard as a sequence of text events (but
@ -609,7 +608,6 @@ _[Super] is typically the "Windows" or "Cmd" key._
| Rotate device screen | `MOD`+`r` | Rotate device screen | `MOD`+`r`
| Expand notification panel | `MOD`+`n` | Expand notification panel | `MOD`+`n`
| Collapse notification panel | `MOD`+`Shift`+`n` | Collapse notification panel | `MOD`+`Shift`+`n`
| Copy device clipboard to computer | `MOD`+`c`
| Paste computer clipboard to device | `MOD`+`v` | Paste computer clipboard to device | `MOD`+`v`
| Copy computer clipboard to device and paste | `MOD`+`Shift`+`v` | Copy computer clipboard to device and paste | `MOD`+`Shift`+`v`
| Enable/disable FPS counter (on stdout) | `MOD`+`i` | Enable/disable FPS counter (on stdout) | `MOD`+`i`

View file

@ -292,10 +292,6 @@ Expand notification panel
.B MOD+Shift+n .B MOD+Shift+n
Collapse notification panel Collapse notification panel
.TP
.B MOD+c
Copy device clipboard to computer
.TP .TP
.B MOD+v .B MOD+v
Paste computer clipboard to device Paste computer clipboard to device

View file

@ -260,9 +260,6 @@ scrcpy_print_usage(const char *arg0) {
" MOD+Shift+n\n" " MOD+Shift+n\n"
" Collapse notification panel\n" " Collapse notification panel\n"
"\n" "\n"
" MOD+c\n"
" Copy device clipboard to computer\n"
"\n"
" MOD+v\n" " MOD+v\n"
" Paste computer clipboard to device\n" " Paste computer clipboard to device\n"
"\n" "\n"

View file

@ -160,16 +160,6 @@ collapse_notification_panel(struct controller *controller) {
} }
} }
static void
request_device_clipboard(struct controller *controller) {
struct control_msg msg;
msg.type = CONTROL_MSG_TYPE_GET_CLIPBOARD;
if (!controller_push_msg(controller, &msg)) {
LOGW("Could not request device clipboard");
}
}
static void static void
set_device_clipboard(struct controller *controller, bool paste) { set_device_clipboard(struct controller *controller, bool paste) {
char *text = SDL_GetClipboardText(); char *text = SDL_GetClipboardText();
@ -392,11 +382,6 @@ input_manager_process_key(struct input_manager *im,
rotate_client_right(im->screen); rotate_client_right(im->screen);
} }
return; return;
case SDLK_c:
if (control && !shift && !repeat && down) {
request_device_clipboard(controller);
}
return;
case SDLK_v: case SDLK_v:
if (control && !repeat && down) { if (control && !repeat && down) {
if (shift) { if (shift) {