Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 50b581dfc7ce944b68546e5369c46eca4750ef38) +++ boot/Makefile.common (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) @@ -98,5 +98,5 @@ $(USPACE_PATH)/srv/bd/part/guid_part/g_part \ $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \ - $(USPACE_PATH)/srv/clip/clip \ + $(USPACE_PATH)/srv/clipboard/clipboard \ $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \ $(USPACE_PATH)/srv/fs/fat/fat \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 50b581dfc7ce944b68546e5369c46eca4750ef38) +++ uspace/Makefile (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) @@ -71,5 +71,5 @@ app/sysinfo \ app/mkbd \ - srv/clip \ + srv/clipboard \ srv/loc \ srv/devman \ Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 50b581dfc7ce944b68546e5369c46eca4750ef38) +++ uspace/app/init/init.c (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) @@ -315,5 +315,5 @@ console("hid/input", "hid/fb0"); - spawn("/srv/clip"); + spawn("/srv/clipboard"); spawn("/srv/remcons"); Index: pace/srv/clip/Makefile =================================================================== --- uspace/srv/clip/Makefile (revision 50b581dfc7ce944b68546e5369c46eca4750ef38) +++ (revision ) @@ -1,36 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# 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. -# - -USPACE_PREFIX = ../.. -BINARY = clip - -SOURCES = \ - clip.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/srv/clip/clip.c =================================================================== --- uspace/srv/clip/clip.c (revision 50b581dfc7ce944b68546e5369c46eca4750ef38) +++ (revision ) @@ -1,193 +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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NAME "clip" - -static char *clip_data = NULL; -static size_t clip_size = 0; -static clipboard_tag_t clip_tag = CLIPBOARD_TAG_NONE; -static FIBRIL_MUTEX_INITIALIZE(clip_mtx); - -static void clip_put_data(ipc_callid_t rid, ipc_call_t *request) -{ - char *data; - int rc; - size_t size; - - switch (IPC_GET_ARG1(*request)) { - case CLIPBOARD_TAG_NONE: - fibril_mutex_lock(&clip_mtx); - - if (clip_data) - free(clip_data); - - clip_data = NULL; - clip_size = 0; - clip_tag = CLIPBOARD_TAG_NONE; - - fibril_mutex_unlock(&clip_mtx); - async_answer_0(rid, EOK); - break; - case CLIPBOARD_TAG_DATA: - rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size); - if (rc != EOK) { - async_answer_0(rid, rc); - break; - } - - fibril_mutex_lock(&clip_mtx); - - if (clip_data) - free(clip_data); - - clip_data = data; - clip_size = size; - clip_tag = CLIPBOARD_TAG_DATA; - - fibril_mutex_unlock(&clip_mtx); - async_answer_0(rid, EOK); - break; - default: - async_answer_0(rid, EINVAL); - } -} - -static void clip_get_data(ipc_callid_t rid, ipc_call_t *request) -{ - fibril_mutex_lock(&clip_mtx); - - ipc_callid_t callid; - size_t size; - - /* Check for clipboard data tag compatibility */ - switch (IPC_GET_ARG1(*request)) { - case CLIPBOARD_TAG_DATA: - if (!async_data_read_receive(&callid, &size)) { - async_answer_0(callid, EINVAL); - async_answer_0(rid, EINVAL); - break; - } - - if (clip_tag != CLIPBOARD_TAG_DATA) { - /* So far we only understand binary data */ - async_answer_0(callid, EOVERFLOW); - async_answer_0(rid, EOVERFLOW); - break; - } - - if (clip_size != size) { - /* The client expects different size of data */ - async_answer_0(callid, EOVERFLOW); - async_answer_0(rid, EOVERFLOW); - break; - } - - sysarg_t retval = async_data_read_finalize(callid, clip_data, size); - if (retval != EOK) { - async_answer_0(rid, retval); - break; - } - - async_answer_0(rid, EOK); - default: - /* - * Sorry, we don't know how to get unknown or NONE - * data from the clipbard - */ - async_answer_0(rid, EINVAL); - break; - } - - fibril_mutex_unlock(&clip_mtx); -} - -static void clip_content(ipc_callid_t rid, ipc_call_t *request) -{ - fibril_mutex_lock(&clip_mtx); - - size_t size = clip_size; - clipboard_tag_t tag = clip_tag; - - fibril_mutex_unlock(&clip_mtx); - async_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag); -} - -static void clip_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) -{ - /* Accept connection */ - async_answer_0(iid, EOK); - - while (true) { - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - - if (!IPC_GET_IMETHOD(call)) - break; - - switch (IPC_GET_IMETHOD(call)) { - case CLIPBOARD_PUT_DATA: - clip_put_data(callid, &call); - break; - case CLIPBOARD_GET_DATA: - clip_get_data(callid, &call); - break; - case CLIPBOARD_CONTENT: - clip_content(callid, &call); - break; - default: - async_answer_0(callid, ENOENT); - } - } -} - -int main(int argc, char *argv[]) -{ - printf("%s: HelenOS clipboard service\n", NAME); - - async_set_client_connection(clip_connection); - - if (service_register(SERVICE_CLIPBOARD) != EOK) - return -1; - - printf("%s: Accepting connections\n", NAME); - task_retval(0); - async_manager(); - - /* Never reached */ - return 0; -} Index: pace/srv/clip/clip.h =================================================================== --- uspace/srv/clip/clip.h (revision 50b581dfc7ce944b68546e5369c46eca4750ef38) +++ (revision ) @@ -1,32 +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. - */ - -#ifndef CLIP_MAIN_H_ -#define CLIP_MAIN_H_ - -#endif Index: uspace/srv/clipboard/Makefile =================================================================== --- uspace/srv/clipboard/Makefile (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) +++ uspace/srv/clipboard/Makefile (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# 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. +# + +USPACE_PREFIX = ../.. +BINARY = clipboard + +SOURCES = \ + clipboard.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/clipboard/clip.h =================================================================== --- uspace/srv/clipboard/clip.h (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) +++ uspace/srv/clipboard/clip.h (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) @@ -0,0 +1,32 @@ +/* + * 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. + */ + +#ifndef CLIP_MAIN_H_ +#define CLIP_MAIN_H_ + +#endif Index: uspace/srv/clipboard/clipboard.c =================================================================== --- uspace/srv/clipboard/clipboard.c (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) +++ uspace/srv/clipboard/clipboard.c (revision d3a8e4708be5fbbee0c7e49a33f622d33bd561ea) @@ -0,0 +1,193 @@ +/* + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "clipboard" + +static char *clip_data = NULL; +static size_t clip_size = 0; +static clipboard_tag_t clip_tag = CLIPBOARD_TAG_NONE; +static FIBRIL_MUTEX_INITIALIZE(clip_mtx); + +static void clip_put_data(ipc_callid_t rid, ipc_call_t *request) +{ + char *data; + int rc; + size_t size; + + switch (IPC_GET_ARG1(*request)) { + case CLIPBOARD_TAG_NONE: + fibril_mutex_lock(&clip_mtx); + + if (clip_data) + free(clip_data); + + clip_data = NULL; + clip_size = 0; + clip_tag = CLIPBOARD_TAG_NONE; + + fibril_mutex_unlock(&clip_mtx); + async_answer_0(rid, EOK); + break; + case CLIPBOARD_TAG_DATA: + rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size); + if (rc != EOK) { + async_answer_0(rid, rc); + break; + } + + fibril_mutex_lock(&clip_mtx); + + if (clip_data) + free(clip_data); + + clip_data = data; + clip_size = size; + clip_tag = CLIPBOARD_TAG_DATA; + + fibril_mutex_unlock(&clip_mtx); + async_answer_0(rid, EOK); + break; + default: + async_answer_0(rid, EINVAL); + } +} + +static void clip_get_data(ipc_callid_t rid, ipc_call_t *request) +{ + fibril_mutex_lock(&clip_mtx); + + ipc_callid_t callid; + size_t size; + + /* Check for clipboard data tag compatibility */ + switch (IPC_GET_ARG1(*request)) { + case CLIPBOARD_TAG_DATA: + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EINVAL); + async_answer_0(rid, EINVAL); + break; + } + + if (clip_tag != CLIPBOARD_TAG_DATA) { + /* So far we only understand binary data */ + async_answer_0(callid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); + break; + } + + if (clip_size != size) { + /* The client expects different size of data */ + async_answer_0(callid, EOVERFLOW); + async_answer_0(rid, EOVERFLOW); + break; + } + + sysarg_t retval = async_data_read_finalize(callid, clip_data, size); + if (retval != EOK) { + async_answer_0(rid, retval); + break; + } + + async_answer_0(rid, EOK); + default: + /* + * Sorry, we don't know how to get unknown or NONE + * data from the clipbard + */ + async_answer_0(rid, EINVAL); + break; + } + + fibril_mutex_unlock(&clip_mtx); +} + +static void clip_content(ipc_callid_t rid, ipc_call_t *request) +{ + fibril_mutex_lock(&clip_mtx); + + size_t size = clip_size; + clipboard_tag_t tag = clip_tag; + + fibril_mutex_unlock(&clip_mtx); + async_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag); +} + +static void clip_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + /* Accept connection */ + async_answer_0(iid, EOK); + + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) + break; + + switch (IPC_GET_IMETHOD(call)) { + case CLIPBOARD_PUT_DATA: + clip_put_data(callid, &call); + break; + case CLIPBOARD_GET_DATA: + clip_get_data(callid, &call); + break; + case CLIPBOARD_CONTENT: + clip_content(callid, &call); + break; + default: + async_answer_0(callid, ENOENT); + } + } +} + +int main(int argc, char *argv[]) +{ + printf("%s: HelenOS clipboard service\n", NAME); + + async_set_client_connection(clip_connection); + + if (service_register(SERVICE_CLIPBOARD) != EOK) + return -1; + + printf("%s: Accepting connections\n", NAME); + task_retval(0); + async_manager(); + + /* Never reached */ + return 0; +}