Fix #926 #1254
Fix #926 #1254
Conversation
sway/commands/clipboard.c
Outdated
| #include "stringop.h" | ||
|
|
||
| static void send_clipboard(void *data, const char *type, int fd) { | ||
| if (strcmp(type, "text/plain") != 0 && strcmp(type, "text/plain;charset=utf-8") != 0) { |
There was a problem hiding this comment.
Limit this to 80 columns please
|
This looks right, but I don't want to close #926 until we have the ability to read from the clipboard, too. |
sway/commands/clipboard.c
Outdated
|
|
||
| static void send_clipboard(void *data, const char *type, int fd) { | ||
| if ((strcmp(type, "text/plain") != 0) && | ||
| (strcmp(type, "text/plain;charset=utf-8") != 0)) { |
There was a problem hiding this comment.
Sorry, more style nits. You don't need these extra parens and you should put && on the next line.
There was a problem hiding this comment.
Oversaw this, is it ok now? Still getting used to this codestyle
| } | ||
|
|
||
| const char *str = data; | ||
| write(fd, str, strlen(str)); |
There was a problem hiding this comment.
I presume that you don't need to write the null delimiter?
There was a problem hiding this comment.
ugh... actually not sure it writes to the fd of a client, is there a null delimiter needed/expected?
There was a problem hiding this comment.
it works without at least for all common applications... the clients can determine the length from the number of bytes read
There was a problem hiding this comment.
It could work both ways and I'd err on the side of no null delimiter, but so long as you've tested it this way then I trust that it works.
sway/commands/clipboard.c
Outdated
| const char *str = join_args(argv, argc); | ||
| wlc_set_selection((void*) str, types, 2, &send_clipboard); | ||
|
|
||
| free((void*) current_data); |
There was a problem hiding this comment.
Casting to void* here is unneccessary and probably on wlc_set_selection as well.
There was a problem hiding this comment.
did it because str is a const pointer and wlc_set_selection/free require a non-const pointer
There was a problem hiding this comment.
Well why did you make it const then?
|
Looks good, thanks! Think you could squash the commits for me? |
Adds the 'clipboard' command that can currently only be used
like this: 'swaymsg clipboard Some clipboard text here'. In future it could be extended to set non-text data or read from the clipboard but this would require extensions to wlc (or has to wait for wlroots).
Note that due to sway command arguments passing this will
not preserve whitespace in the clipboard text correctly (i.e. two spaces will be interpreted as one).
Requires Cloudef/wlc#272 to work correctly.
Still not too familiar with the sway codebase, I am not sure this is the correct way to add new commands to sway, or if they have to be added somewhere else.