Skip to content

Commit

Permalink
Remove "get clipboard" call
Browse files Browse the repository at this point in the history
Now that every device clipboard change is automatically synchronized to
the computer, the "get clipboard" request (bound to MOD+c) is useless.
  • Loading branch information
rom1v committed Aug 1, 2020
1 parent 20d3925 commit bccd12b
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 24 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,6 @@ requested orientation.
It is possible to synchronize clipboards between the computer and the device, in
both directions:

- `MOD`+`c` copies the device clipboard to the computer clipboard;
- `MOD`+`Shift`+`v` copies the computer clipboard to the device clipboard (and
pastes if the device runs Android >= 7);
- `MOD`+`v` _pastes_ the computer clipboard as a sequence of text events (but
Expand Down Expand Up @@ -609,7 +608,6 @@ _[Super] is typically the "Windows" or "Cmd" key._
| Rotate device screen | `MOD`+`r`
| Expand notification panel | `MOD`+`n`
| Collapse notification panel | `MOD`+`Shift`+`n`
| Copy device clipboard to computer | `MOD`+`c`
| Paste computer clipboard to device | `MOD`+`v`
| Copy computer clipboard to device and paste | `MOD`+`Shift`+`v`
| Enable/disable FPS counter (on stdout) | `MOD`+`i`
Expand Down
4 changes: 0 additions & 4 deletions app/scrcpy.1
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,6 @@ Expand notification panel
.B MOD+Shift+n
Collapse notification panel

.TP
.B MOD+c
Copy device clipboard to computer

.TP
.B MOD+v
Paste computer clipboard to device
Expand Down
3 changes: 0 additions & 3 deletions app/src/cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,6 @@ scrcpy_print_usage(const char *arg0) {
" MOD+Shift+n\n"
" Collapse notification panel\n"
"\n"
" MOD+c\n"
" Copy device clipboard to computer\n"
"\n"
" MOD+v\n"
" Paste computer clipboard to device\n"
"\n"
Expand Down
15 changes: 0 additions & 15 deletions app/src/input_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
set_device_clipboard(struct controller *controller, bool paste) {
char *text = SDL_GetClipboardText();
Expand Down Expand Up @@ -392,11 +382,6 @@ input_manager_process_key(struct input_manager *im,
rotate_client_right(im->screen);
}
return;
case SDLK_c:
if (control && !shift && !repeat && down) {
request_device_clipboard(controller);
}
return;
case SDLK_v:
if (control && !repeat && down) {
if (shift) {
Expand Down

0 comments on commit bccd12b

Please sign in to comment.