diff options
| -rw-r--r-- | include/ipc.h | 1 | ||||
| -rw-r--r-- | include/sway/config.h | 3 | ||||
| -rw-r--r-- | sway/commands/ipc.c | 1 | ||||
| -rw-r--r-- | sway/ipc-server.c | 109 | ||||
| -rw-r--r-- | swaymsg/main.c | 22 |
5 files changed, 134 insertions, 2 deletions
diff --git a/include/ipc.h b/include/ipc.h index 98390335..2b16dc50 100644 --- a/include/ipc.h +++ b/include/ipc.h @@ -13,6 +13,7 @@ enum ipc_command_type { IPC_GET_BAR_CONFIG = 6, IPC_GET_VERSION = 7, IPC_GET_INPUTS = 8, + IPC_GET_CLIPBOARD = 9, // Events send from sway to clients. Events have the highest bits set. IPC_EVENT_WORKSPACE = ((1<<31) | 0), IPC_EVENT_OUTPUT = ((1<<31) | 1), diff --git a/include/sway/config.h b/include/sway/config.h index 999a471a..b0cd86eb 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -235,8 +235,9 @@ enum ipc_feature { IPC_FEATURE_EVENT_WINDOW = 2048, IPC_FEATURE_EVENT_BINDING = 4096, IPC_FEATURE_EVENT_INPUT = 8192, + IPC_FEATURE_GET_CLIPBOARD = 16384, - IPC_FEATURE_ALL_COMMANDS = 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + IPC_FEATURE_ALL_COMMANDS = 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 16384, IPC_FEATURE_ALL_EVENTS = 256 | 512 | 1024 | 2048 | 4096 | 8192, IPC_FEATURE_ALL = IPC_FEATURE_ALL_COMMANDS | IPC_FEATURE_ALL_EVENTS, diff --git a/sway/commands/ipc.c b/sway/commands/ipc.c index f0b3035a..0c678961 100644 --- a/sway/commands/ipc.c +++ b/sway/commands/ipc.c @@ -89,6 +89,7 @@ struct cmd_results *cmd_ipc_cmd(int argc, char **argv) { { "marks", IPC_FEATURE_GET_MARKS }, { "bar-config", IPC_FEATURE_GET_BAR_CONFIG }, { "inputs", IPC_FEATURE_GET_INPUTS }, + { "clipboard", IPC_FEATURE_GET_CLIPBOARD }, }; uint32_t type = 0; diff --git a/sway/ipc-server.c b/sway/ipc-server.c index dca881fa..5bc64b1f 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -55,6 +55,11 @@ struct get_pixels_request { struct wlc_geometry geo; }; +struct get_clipboard_request { + struct ipc_client *client; + struct wlc_event_source *event_source; +}; + struct sockaddr_un *ipc_user_sockaddr(void); int ipc_handle_connection(int fd, uint32_t mask, void *data); int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data); @@ -322,6 +327,46 @@ void ipc_get_pixels(wlc_handle output) { ipc_get_pixel_requests = unhandled; } +static int ipc_selection_data_cb(int fd, uint32_t mask, void *data) +{ + assert(data); + struct get_clipboard_request *req = (struct get_clipboard_request*) data; + + if (mask & WLC_EVENT_ERROR) { + sway_log(L_ERROR, "Selection data fd error"); + const char *error = "{ \"success\": false, \"error\": " + "\"Could not receive text data from clipboard\" }"; + ipc_send_reply(req->client, error, (uint32_t)strlen(error)); + goto cleanup; + } + + if (mask & WLC_EVENT_READABLE) { + char buf[512]; + int ret = read(fd, buf, 511); + if (ret < 0) { + sway_log_errno(L_ERROR, "Reading from selection data fd failed"); + const char *error = "{ \"success\": false, \"error\": " + "\"Could not receive text data from clipboard\" }"; + ipc_send_reply(req->client, error, (uint32_t)strlen(error)); + goto cleanup; + } + + buf[ret] = '\0'; + json_object *obj = json_object_new_object(); + json_object_object_add(obj, "success", json_object_new_boolean(true)); + json_object_object_add(obj, "content", json_object_new_string(buf)); + const char *str = json_object_to_json_string(obj); + ipc_send_reply(req->client, str, (uint32_t)strlen(str)); + json_object_put(obj); + } + +cleanup: + wlc_event_source_remove(req->event_source); + close(fd); + free(req); + return 0; +} + void ipc_client_handle_command(struct ipc_client *client) { if (!sway_assert(client != NULL, "client != NULL")) { return; @@ -565,6 +610,70 @@ void ipc_client_handle_command(struct ipc_client *client) { goto exit_cleanup; } + case IPC_GET_CLIPBOARD: + { + if (!(client->security_policy & IPC_FEATURE_GET_CLIPBOARD)) { + goto exit_denied; + } + + size_t size; + bool found = false; + const char **types = wlc_get_selection_types(&size); + if (types == NULL || size == 0) { + const char *error = "{ \"success\": false, \"error\": " + "\"Empty clipboard\" }"; + ipc_send_reply(client, error, (uint32_t)strlen(error)); + goto exit_cleanup; + } + + for (size_t i = 0; i < size; ++i) { + if (strcmp(types[i], "text/plain;charset=utf-8") != 0 + && strcmp(types[i], "text/plain") != 0) { + continue; + } + + struct get_clipboard_request *req = malloc(sizeof(*req)); + if (!req) { + sway_log(L_ERROR, "Unable to allocate get_clipboard_request"); + goto exit_cleanup; + } + + int pipes[2]; + if (pipe(pipes) == -1) { + sway_log_errno(L_ERROR, "pipe call failed"); + free(req); + break; + } + + fcntl(pipes[0], F_SETFD, FD_CLOEXEC | O_NONBLOCK); + fcntl(pipes[1], F_SETFD, FD_CLOEXEC | O_NONBLOCK); + if (!wlc_get_selection_data(types[i], pipes[1])) { + close(pipes[0]); + close(pipes[1]); + free(req); + sway_log(L_ERROR, "wlc_get_selection_data failed"); + break; + } + + req->client = client; + req->event_source = wlc_event_loop_add_fd(pipes[0], + WLC_EVENT_READABLE | WLC_EVENT_ERROR | WLC_EVENT_HANGUP, + &ipc_selection_data_cb, req); + found = true; + break; + } + + if (!found) { + sway_log(L_INFO, "Clipboard has to text data"); + const char *error = "{ \"success\": false, \"error\": " + "\"Could not receive text data from clipboard\" }"; + ipc_send_reply(client, error, (uint32_t)strlen(error)); + } + + free(types); + goto exit_cleanup; + } + default: sway_log(L_INFO, "Unknown IPC command type %i", client->current_command); goto exit_cleanup; diff --git a/swaymsg/main.c b/swaymsg/main.c index efd0ec25..fa28553b 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -144,10 +144,23 @@ static void pretty_print_version(json_object *v) { printf("sway version %s\n", json_object_get_string(ver)); } +static void pretty_print_clipboard(json_object *v) { + bool _success; + json_object *success; + json_object_object_get_ex(v, "success", &success); + _success = json_object_get_boolean(success); + + if (_success) { + json_object *ver; + json_object_object_get_ex(v, "content", &ver); + printf("%s\n", json_object_get_string(ver)); + } +} + static void pretty_print(int type, json_object *resp) { if (type != IPC_COMMAND && type != IPC_GET_WORKSPACES && type != IPC_GET_INPUTS && type != IPC_GET_OUTPUTS && - type != IPC_GET_VERSION) { + type != IPC_GET_VERSION && type != IPC_GET_CLIPBOARD) { printf("%s\n", json_object_to_json_string_ext(resp, JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED)); return; @@ -158,6 +171,11 @@ static void pretty_print(int type, json_object *resp) { return; } + if (type == IPC_GET_CLIPBOARD) { + pretty_print_clipboard(resp); + return; + } + json_object *obj; size_t len = json_object_array_length(resp); for (size_t i = 0; i < len; ++i) { @@ -267,6 +285,8 @@ int main(int argc, char **argv) { type = IPC_GET_BAR_CONFIG; } else if (strcasecmp(cmdtype, "get_version") == 0) { type = IPC_GET_VERSION; + } else if (strcasecmp(cmdtype, "get_clipboard") == 0) { + type = IPC_GET_CLIPBOARD; } else { sway_abort("Unknown message type %s", cmdtype); } |