Index: uspace/lib/libc/generic/clipboard.c =================================================================== --- uspace/lib/libc/generic/clipboard.c (revision 63c4e28590ddd3354a8fbb6cccd0152182aac409) +++ uspace/lib/libc/generic/clipboard.c (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) @@ -33,65 +33,72 @@ * @brief System clipboard API. * - * The clipboard data is stored in a file and it is shared by the entire - * system. + * The clipboard data is managed by the clipboard service and it is shared by + * the entire system. * - * @note Synchronization is missing. File locks would be ideal for the job. */ -#include +#include +#include +#include +#include #include -#include -#include -#include -#include #include -#include +#include -/** File used to store clipboard data */ -#define CLIPBOARD_FILE "/data/clip" +static int clip_phone = -1; -#define CHUNK_SIZE 4096 +/** Connect to clipboard server + * + */ +static void clip_connect(void) +{ + while (clip_phone < 0) + clip_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_CLIPBOARD, 0, 0); +} /** Copy string to clipboard. * * Sets the clipboard contents to @a str. Passing an empty string or NULL - * makes the clipboard empty. + * makes the clipboard empty. * - * @param str String to put to clipboard or NULL. - * @return Zero on success or negative error code. + * @param str String to put to clipboard or NULL. + * + * @return Zero on success or negative error code. + * */ int clipboard_put_str(const char *str) { - int fd; - const char *sp; - ssize_t to_write, written, left; - - fd = open(CLIPBOARD_FILE, O_CREAT | O_TRUNC | O_WRONLY, 0666); - if (fd < 0) - return EIO; - - left = str_size(str); - sp = str; - - while (left > 0) { - to_write = min(left, CHUNK_SIZE); - written = write(fd, sp, to_write); - - if (written < 0) { - close(fd); - unlink(CLIPBOARD_FILE); - return EIO; + size_t size = str_size(str); + + if (size == 0) { + async_serialize_start(); + clip_connect(); + + ipcarg_t rc = async_req_1_0(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_NONE); + + async_serialize_end(); + + return (int) rc; + } else { + async_serialize_start(); + clip_connect(); + + aid_t req = async_send_1(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_BLOB, NULL); + ipcarg_t rc = async_data_write_start(clip_phone, (void *) str, size); + if (rc != EOK) { + ipcarg_t rc_orig; + async_wait_for(req, &rc_orig); + async_serialize_end(); + if (rc_orig == EOK) + return (int) rc; + else + return (int) rc_orig; } - - sp += written; - left -= written; + + async_wait_for(req, &rc); + async_serialize_end(); + + return (int) rc; } - - if (close(fd) != EOK) { - unlink(CLIPBOARD_FILE); - return EIO; - } - - return EOK; } @@ -100,50 +107,77 @@ * Returns a new string that can be deallocated with free(). * - * @param str Here pointer to the newly allocated string is stored. - * @return Zero on success or negative error code. + * @param str Here pointer to the newly allocated string is stored. + * + * @return Zero on success or negative error code. + * */ int clipboard_get_str(char **str) { - int fd; - char *sbuf, *sp; - ssize_t to_read, n_read, left; - struct stat cbs; - - if (stat(CLIPBOARD_FILE, &cbs) != EOK) - return EIO; - - sbuf = malloc(cbs.size + 1); - if (sbuf == NULL) - return ENOMEM; - - fd = open(CLIPBOARD_FILE, O_RDONLY); - if (fd < 0) { - free(sbuf); - return EIO; + /* Loop until clipboard read succesful */ + while (true) { + async_serialize_start(); + clip_connect(); + + ipcarg_t size; + ipcarg_t tag; + ipcarg_t rc = async_req_0_2(clip_phone, CLIPBOARD_CONTENT, &size, &tag); + + async_serialize_end(); + + if (rc != EOK) + return (int) rc; + + char *sbuf; + + switch (tag) { + case CLIPBOARD_TAG_NONE: + sbuf = malloc(1); + if (sbuf == NULL) + return ENOMEM; + + sbuf[0] = 0; + *str = sbuf; + return EOK; + case CLIPBOARD_TAG_BLOB: + sbuf = malloc(size + 1); + if (sbuf == NULL) + return ENOMEM; + + async_serialize_start(); + + aid_t req = async_send_1(clip_phone, CLIPBOARD_GET_DATA, tag, NULL); + rc = async_data_read_start(clip_phone, (void *) sbuf, size); + if (rc == EOVERFLOW) { + /* + * The data in the clipboard has changed since + * the last call of CLIPBOARD_CONTENT + */ + async_serialize_end(); + break; + } + + if (rc != EOK) { + ipcarg_t rc_orig; + async_wait_for(req, &rc_orig); + async_serialize_end(); + if (rc_orig == EOK) + return (int) rc; + else + return (int) rc_orig; + } + + async_wait_for(req, &rc); + async_serialize_end(); + + if (rc == EOK) { + sbuf[size] = 0; + *str = sbuf; + } + + return rc; + default: + return EINVAL; + } } - - sp = sbuf; - left = cbs.size; - - while (left > 0) { - to_read = min(left, CHUNK_SIZE); - n_read = read(fd, sp, to_read); - - if (n_read < 0) { - close(fd); - free(sbuf); - return EIO; - } - - sp += n_read; - left -= n_read; - } - - close(fd); - - *sp = '\0'; - *str = sbuf; - - return EOK; } Index: uspace/lib/libc/include/ipc/clipboard.h =================================================================== --- uspace/lib/libc/include/ipc/clipboard.h (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) +++ uspace/lib/libc/include/ipc/clipboard.h (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2009 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcipc + * @{ + */ +/** @file + */ + +#ifndef LIBC_IPC_CLIPBOARD_H_ +#define LIBC_IPC_CLIPBOARD_H_ + +#include + +typedef enum { + CLIPBOARD_PUT_DATA = IPC_FIRST_USER_METHOD, + CLIPBOARD_GET_DATA, + CLIPBOARD_CONTENT +} clipboard_request_t; + +typedef enum { + CLIPBOARD_TAG_NONE, + CLIPBOARD_TAG_BLOB +} clipboard_tag_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/ipc/services.h =================================================================== --- uspace/lib/libc/include/ipc/services.h (revision 63c4e28590ddd3354a8fbb6cccd0152182aac409) +++ uspace/lib/libc/include/ipc/services.h (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) @@ -47,5 +47,6 @@ SERVICE_DEVMAP, SERVICE_FHC, - SERVICE_OBIO + SERVICE_OBIO, + SERVICE_CLIPBOARD } services_t;