Index: uspace/lib/c/generic/clipboard.c =================================================================== --- uspace/lib/c/generic/clipboard.c (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ (revision ) @@ -1,210 +1,0 @@ -/* - * Copyright (c) 2009 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - * @brief System clipboard API. - * - * The clipboard data is managed by the clipboard service and it is shared by - * the entire system. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static FIBRIL_MUTEX_INITIALIZE(clip_mutex); -static async_sess_t *clip_sess = NULL; - -/** Start an async exchange on the clipboard session. - * - * @return New exchange. - * - */ -static async_exch_t *clip_exchange_begin(void) -{ - service_id_t sid; - errno_t rc; - - fibril_mutex_lock(&clip_mutex); - - while (clip_sess == NULL) { - rc = loc_service_get_id(SERVICE_NAME_CLIPBOARD, &sid, - IPC_FLAG_BLOCKING); - if (rc != EOK) - continue; - - clip_sess = loc_service_connect(sid, INTERFACE_CLIPBOARD, - IPC_FLAG_BLOCKING); - } - - fibril_mutex_unlock(&clip_mutex); - - return async_exchange_begin(clip_sess); -} - -/** Finish an async exchange on the clipboard session. - * - * @param exch Exchange to be finished. - * - */ -static void clip_exchange_end(async_exch_t *exch) -{ - async_exchange_end(exch); -} - -/** Copy string to clipboard. - * - * Sets the clipboard contents to @a str. Passing an empty string or NULL - * makes the clipboard empty. - * - * @param str String to put to clipboard or NULL. - * - * @return Zero on success or an error code. - * - */ -errno_t clipboard_put_str(const char *str) -{ - size_t size = str_size(str); - - if (size == 0) { - async_exch_t *exch = clip_exchange_begin(); - errno_t rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA, - CLIPBOARD_TAG_NONE); - clip_exchange_end(exch); - - return (errno_t) rc; - } else { - async_exch_t *exch = clip_exchange_begin(); - aid_t req = async_send_1(exch, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA, - NULL); - errno_t rc = async_data_write_start(exch, (void *) str, size); - clip_exchange_end(exch); - - if (rc != EOK) { - errno_t rc_orig; - async_wait_for(req, &rc_orig); - if (rc_orig == EOK) - return (errno_t) rc; - else - return (errno_t) rc_orig; - } - - async_wait_for(req, &rc); - - return (errno_t) rc; - } -} - -/** Get a copy of clipboard contents. - * - * 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 an error code. - * - */ -errno_t clipboard_get_str(char **str) -{ - /* Loop until clipboard read succesful */ - while (true) { - async_exch_t *exch = clip_exchange_begin(); - - sysarg_t size; - sysarg_t tag; - errno_t rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag); - - clip_exchange_end(exch); - - if (rc != EOK) - return (errno_t) 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_DATA: - sbuf = malloc(size + 1); - if (sbuf == NULL) - return ENOMEM; - - exch = clip_exchange_begin(); - aid_t req = async_send_1(exch, CLIPBOARD_GET_DATA, tag, NULL); - rc = async_data_read_start(exch, (void *) sbuf, size); - clip_exchange_end(exch); - - if ((errno_t) rc == EOVERFLOW) { - /* - * The data in the clipboard has changed since - * the last call of CLIPBOARD_CONTENT - */ - break; - } - - if (rc != EOK) { - errno_t rc_orig; - async_wait_for(req, &rc_orig); - if (rc_orig == EOK) - return (errno_t) rc; - else - return (errno_t) rc_orig; - } - - async_wait_for(req, &rc); - - if (rc == EOK) { - sbuf[size] = 0; - *str = sbuf; - } - - return rc; - default: - return EINVAL; - } - } -} - -/** @} - */ Index: uspace/lib/c/include/clipboard.h =================================================================== --- uspace/lib/c/include/clipboard.h (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2009 Jiri Svoboda - * 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 libc - * @{ - */ -/** @file - */ - -#ifndef _LIBC_CLIPBOARD_H_ -#define _LIBC_CLIPBOARD_H_ - -#include - -extern errno_t clipboard_put_str(const char *); -extern errno_t clipboard_get_str(char **); - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/clipboard.h =================================================================== --- uspace/lib/c/include/ipc/clipboard.h (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * 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_DATA -} clipboard_tag_t; - -#endif - -/** @} - */ Index: uspace/lib/c/meson.build =================================================================== --- uspace/lib/c/meson.build (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ uspace/lib/c/meson.build (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -80,5 +80,4 @@ 'generic/perm.c', 'generic/capa.c', - 'generic/clipboard.c', 'generic/config.c', 'generic/context.c', Index: uspace/lib/clipboard/doc/doxygroups.h =================================================================== --- uspace/lib/clipboard/doc/doxygroups.h (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) +++ uspace/lib/clipboard/doc/doxygroups.h (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -0,0 +1,3 @@ +/** @addtogroup libclipboard libclipboard + * @ingroup libs + */ Index: uspace/lib/clipboard/include/clipboard.h =================================================================== --- uspace/lib/clipboard/include/clipboard.h (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) +++ uspace/lib/clipboard/include/clipboard.h (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2023 Jiri Svoboda + * 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 libclipboard + * @{ + */ +/** @file + */ + +#ifndef _LIBCLIPBOARD_CLIPBOARD_H_ +#define _LIBCLIPBOARD_CLIPBOARD_H_ + +#include + +extern errno_t clipboard_put_str(const char *); +extern errno_t clipboard_get_str(char **); + +#endif + +/** @} + */ Index: uspace/lib/clipboard/include/ipc/clipboard.h =================================================================== --- uspace/lib/clipboard/include/ipc/clipboard.h (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) +++ uspace/lib/clipboard/include/ipc/clipboard.h (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -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 _LIBCLIPBOARD_IPC_CLIPBOARD_H_ +#define _LIBCLIPBOARD_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_DATA +} clipboard_tag_t; + +#endif + +/** @} + */ Index: uspace/lib/clipboard/meson.build =================================================================== --- uspace/lib/clipboard/meson.build (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) +++ uspace/lib/clipboard/meson.build (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -0,0 +1,29 @@ +# +# Copyright (c) 2023 Jiri Svoboda +# 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. +# + +src = files('src/clipboard.c') Index: uspace/lib/clipboard/src/clipboard.c =================================================================== --- uspace/lib/clipboard/src/clipboard.c (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) +++ uspace/lib/clipboard/src/clipboard.c (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -0,0 +1,210 @@ +/* + * Copyright (c) 2023 Jiri Svoboda + * 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 libclipboard + * @{ + */ +/** @file + * @brief System clipboard API. + * + * The clipboard data is managed by the clipboard service and it is shared by + * the entire system. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static FIBRIL_MUTEX_INITIALIZE(clip_mutex); +static async_sess_t *clip_sess = NULL; + +/** Start an async exchange on the clipboard session. + * + * @return New exchange. + * + */ +static async_exch_t *clip_exchange_begin(void) +{ + service_id_t sid; + errno_t rc; + + fibril_mutex_lock(&clip_mutex); + + while (clip_sess == NULL) { + rc = loc_service_get_id(SERVICE_NAME_CLIPBOARD, &sid, + IPC_FLAG_BLOCKING); + if (rc != EOK) + continue; + + clip_sess = loc_service_connect(sid, INTERFACE_CLIPBOARD, + IPC_FLAG_BLOCKING); + } + + fibril_mutex_unlock(&clip_mutex); + + return async_exchange_begin(clip_sess); +} + +/** Finish an async exchange on the clipboard session. + * + * @param exch Exchange to be finished. + * + */ +static void clip_exchange_end(async_exch_t *exch) +{ + async_exchange_end(exch); +} + +/** Copy string to clipboard. + * + * Sets the clipboard contents to @a str. Passing an empty string or NULL + * makes the clipboard empty. + * + * @param str String to put to clipboard or NULL. + * + * @return Zero on success or an error code. + * + */ +errno_t clipboard_put_str(const char *str) +{ + size_t size = str_size(str); + + if (size == 0) { + async_exch_t *exch = clip_exchange_begin(); + errno_t rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA, + CLIPBOARD_TAG_NONE); + clip_exchange_end(exch); + + return (errno_t) rc; + } else { + async_exch_t *exch = clip_exchange_begin(); + aid_t req = async_send_1(exch, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA, + NULL); + errno_t rc = async_data_write_start(exch, (void *) str, size); + clip_exchange_end(exch); + + if (rc != EOK) { + errno_t rc_orig; + async_wait_for(req, &rc_orig); + if (rc_orig == EOK) + return (errno_t) rc; + else + return (errno_t) rc_orig; + } + + async_wait_for(req, &rc); + + return (errno_t) rc; + } +} + +/** Get a copy of clipboard contents. + * + * 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 an error code. + * + */ +errno_t clipboard_get_str(char **str) +{ + /* Loop until clipboard read succesful */ + while (true) { + async_exch_t *exch = clip_exchange_begin(); + + sysarg_t size; + sysarg_t tag; + errno_t rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag); + + clip_exchange_end(exch); + + if (rc != EOK) + return (errno_t) 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_DATA: + sbuf = malloc(size + 1); + if (sbuf == NULL) + return ENOMEM; + + exch = clip_exchange_begin(); + aid_t req = async_send_1(exch, CLIPBOARD_GET_DATA, tag, NULL); + rc = async_data_read_start(exch, (void *) sbuf, size); + clip_exchange_end(exch); + + if ((errno_t) rc == EOVERFLOW) { + /* + * The data in the clipboard has changed since + * the last call of CLIPBOARD_CONTENT + */ + break; + } + + if (rc != EOK) { + errno_t rc_orig; + async_wait_for(req, &rc_orig); + if (rc_orig == EOK) + return (errno_t) rc; + else + return (errno_t) rc_orig; + } + + async_wait_for(req, &rc); + + if (rc == EOK) { + sbuf[size] = 0; + *str = sbuf; + } + + return rc; + default: + return EINVAL; + } + } +} + +/** @} + */ Index: uspace/lib/clui/meson.build =================================================================== --- uspace/lib/clui/meson.build (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ uspace/lib/clui/meson.build (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -1,4 +1,4 @@ # -# Copyright (c) 2010 Jiri Svoboda +# Copyright (c) 2023 Jiri Svoboda # All rights reserved. # @@ -27,4 +27,5 @@ # +deps = [ 'clipboard' ] src = files( 'nchoice.c', Index: uspace/lib/meson.build =================================================================== --- uspace/lib/meson.build (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ uspace/lib/meson.build (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -56,4 +56,5 @@ 'block', + 'clipboard', 'clui', 'codepage', Index: uspace/lib/ui/meson.build =================================================================== --- uspace/lib/ui/meson.build (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ uspace/lib/ui/meson.build (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -27,5 +27,5 @@ # -deps = [ 'gfx', 'gfxfont', 'memgfx', 'display', 'congfx' ] +deps = [ 'gfx', 'gfxfont', 'memgfx', 'display', 'congfx', 'clipboard' ] src = files( 'src/accel.c', Index: uspace/srv/clipboard/meson.build =================================================================== --- uspace/srv/clipboard/meson.build (revision 8f049928445f06042a36af4db46b4151cc5b20aa) +++ uspace/srv/clipboard/meson.build (revision cad7b7e39ca70d44e5a6c1bbca2a247c8ce1010d) @@ -1,3 +1,4 @@ # +# Copyright (c) 2023 Jiri Svoboda # Copyright (c) 2005 Martin Decky # Copyright (c) 2007 Jakub Jermar @@ -28,3 +29,4 @@ # +deps = [ 'clipboard' ] src = files('clipboard.c')