mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-11 21:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Close fd in clipboard request

Browse Source
This commit is contained in:
nyorain 2017-07-11 17:12:53 +02:00
parent 727215c907
commit 20888fbb5e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sway/ipc-server.c
View File

@ -59,6 +59,7 @@ struct get_pixels_request {
struct get_clipboard_request { struct get_clipboard_request {
struct ipc_client *client; struct ipc_client *client;
json_object *json; json_object *json;
int fd;
struct wlc_event_source *fd_event_source; struct wlc_event_source *fd_event_source;
struct wlc_event_source *timer_event_source; struct wlc_event_source *timer_event_source;
char *type; char *type;
@ -354,6 +355,7 @@ static void release_clipboard_request(struct get_clipboard_request *req) {
free(req->buf); free(req->buf);
wlc_event_source_remove(req->fd_event_source); wlc_event_source_remove(req->fd_event_source);
wlc_event_source_remove(req->timer_event_source); wlc_event_source_remove(req->timer_event_source);
close(req->fd);
free(req); free(req);
} }
@ -534,6 +536,7 @@ void ipc_get_clipboard(struct ipc_client *client, char *buf) {
req->pending = pending; req->pending = pending;
req->buf_position = 0; req->buf_position = 0;
req->buf_size = 512; req->buf_size = 512;
req->fd = pipes[0];
req->timer_event_source = wlc_event_loop_add_timer(ipc_selection_timer_cb, req); req->timer_event_source = wlc_event_loop_add_timer(ipc_selection_timer_cb, req);
req->fd_event_source = wlc_event_loop_add_fd(pipes[0], req->fd_event_source = wlc_event_loop_add_fd(pipes[0],
WLC_EVENT_READABLE | WLC_EVENT_ERROR | WLC_EVENT_HANGUP, WLC_EVENT_READABLE | WLC_EVENT_ERROR | WLC_EVENT_HANGUP,