Index: uspace/srv/hid/display/display.c =================================================================== --- uspace/srv/hid/display/display.c (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/display.c (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2019 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 display + * @{ + */ +/** + * @file Display management + */ + +#include +#include +#include + +static errno_t disp_window_create(void *, sysarg_t *); +static errno_t disp_window_destroy(void *, sysarg_t); + +display_ops_t display_srv_ops = { + .window_create = disp_window_create, + .window_destroy = disp_window_destroy +}; + +static errno_t disp_window_create(void *arg, sysarg_t *rwnd_id) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create()"); + *rwnd_id = 42; + return EOK; +} + +static errno_t disp_window_destroy(void *arg, sysarg_t wnd_id) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_destroy()"); + return EOK; +} + +/** @} + */ Index: uspace/srv/hid/display/display.h =================================================================== --- uspace/srv/hid/display/display.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/display.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2019 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 inet + * @{ + */ +/** + * @file + * @brief + */ + +#ifndef DISPLAY_H +#define DISPLAY_H + +#include + +extern display_ops_t display_srv_ops; + +#endif + +/** @} + */ Index: uspace/srv/hid/display/doc/doxygroups.h =================================================================== --- uspace/srv/hid/display/doc/doxygroups.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/doc/doxygroups.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,4 @@ +/** @addtogroup display display + * @ingroup srvs + * @brief Display server + */ Index: uspace/srv/hid/display/main.c =================================================================== --- uspace/srv/hid/display/main.c (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/main.c (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2019 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 display + * @{ + */ +/** + * @file Display server main + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "display.h" +#include "wingc.h" + +#define NAME "display" + +static void display_client_conn(ipc_call_t *, void *); + +/** Initialize display server */ +static errno_t display_srv_init(void) +{ + errno_t rc; + + log_msg(LOG_DEFAULT, LVL_DEBUG, "display_srv_init()"); + + async_set_fallback_port_handler(display_client_conn, NULL/*parts*/); + + rc = loc_server_register(NAME); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc)); + rc = EEXIST; + } + + service_id_t sid; + rc = loc_service_register(SERVICE_NAME_DISPLAY, &sid); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc)); + rc = EEXIST; + goto error; + } + + return EOK; +error: + return rc; +} + +/** Handle client connection to display server */ +static void display_client_conn(ipc_call_t *icall, void *arg) +{ + display_srv_t srv; + sysarg_t wnd_id; + sysarg_t svc_id; + win_gc_t *wgc = NULL; + gfx_context_t *gc; + errno_t rc; + + log_msg(LOG_DEFAULT, LVL_NOTE, "display_client_conn arg1=%zu arg2=%zu arg3=%zu arg4=%zu.", + ipc_get_arg1(icall), ipc_get_arg2(icall), ipc_get_arg3(icall), + ipc_get_arg4(icall)); + + (void) icall; + (void) arg; + + svc_id = ipc_get_arg2(icall); + wnd_id = ipc_get_arg3(icall); + + if (svc_id != 0) { + /* Display management */ + srv.ops = &display_srv_ops; + srv.arg = NULL; + + display_conn(icall, &srv); + } else { + (void) wnd_id; + /* Window GC */ + rc = win_gc_create(&wgc); + if (rc != EOK) { + async_answer_0(icall, ENOMEM); + return; + } + + gc = win_gc_get_ctx(wgc); + gc_conn(icall, gc); + + win_gc_delete(wgc); + } +} + +int main(int argc, char *argv[]) +{ + errno_t rc; + + printf("%s: Display server\n", NAME); + + if (log_init(NAME) != EOK) { + printf(NAME ": Failed to initialize logging.\n"); + return 1; + } + + rc = display_srv_init(); + if (rc != EOK) + return 1; + + printf(NAME ": Accepting connections.\n"); + task_retval(0); + async_manager(); + + return 0; +} + +/** @} + */ Index: uspace/srv/hid/display/meson.build =================================================================== --- uspace/srv/hid/display/meson.build (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/meson.build (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,35 @@ +# +# Copyright (c) 2019 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. +# + +deps = [ 'ipcgfx', 'display' ] + +src = files( + 'display.c', + 'main.c', + 'wingc.c' +) Index: uspace/srv/hid/display/types/wingc.h =================================================================== --- uspace/srv/hid/display/types/wingc.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/types/wingc.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2019 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 libipcgfx + * @{ + */ +/** + * @file GFX IPC backend + */ + +#ifndef TYPES_WINGC_H +#define TYPES_WINGC_H + +#include + +typedef struct win_gc { + /** Base graphic context */ + gfx_context_t *gc; +} win_gc_t; + +#endif + +/** @} + */ Index: uspace/srv/hid/display/wingc.c =================================================================== --- uspace/srv/hid/display/wingc.c (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/wingc.c (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2019 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 display + * @{ + */ +/** + * @file GFX window backend + * + * This implements a graphics context over display server window. + */ + +#include +#include +#include +#include +#include +#include "wingc.h" + +static errno_t win_gc_set_color(void *, gfx_color_t *); +static errno_t win_gc_fill_rect(void *, gfx_rect_t *); + +gfx_context_ops_t win_gc_ops = { + .set_color = win_gc_set_color, + .fill_rect = win_gc_fill_rect +}; + +/** Set color on window GC. + * + * Set drawing color on window GC. + * + * @param arg Console GC + * @param color Color + * + * @return EOK on success or an error code + */ +static errno_t win_gc_set_color(void *arg, gfx_color_t *color) +{ + win_gc_t *wgc = (win_gc_t *) arg; + + (void) wgc; + log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color"); + return EOK; +} + +/** Fill rectangle on window GC. + * + * @param arg Console GC + * @param rect Rectangle + * + * @return EOK on success or an error code + */ +static errno_t win_gc_fill_rect(void *arg, gfx_rect_t *rect) +{ + win_gc_t *wgc = (win_gc_t *) arg; + + (void) wgc; + log_msg(LOG_DEFAULT, LVL_NOTE, "gc_fill_rect"); + return EOK; +} + +/** Create window GC. + * + * Create graphics context for rendering into a window. + * + * @param rgc Place to store pointer to new GC. + * + * @return EOK on success or an error code + */ +errno_t win_gc_create(win_gc_t **rgc) +{ + win_gc_t *wgc = NULL; + gfx_context_t *gc = NULL; + errno_t rc; + + wgc = calloc(1, sizeof(win_gc_t)); + if (wgc == NULL) { + rc = ENOMEM; + goto error; + } + + rc = gfx_context_new(&win_gc_ops, wgc, &gc); + if (rc != EOK) + goto error; + + wgc->gc = gc; + *rgc = wgc; + return EOK; +error: + if (wgc != NULL) + free(wgc); + gfx_context_delete(gc); + return rc; +} + +/** Delete window GC. + * + * @param wgc Console GC + */ +errno_t win_gc_delete(win_gc_t *wgc) +{ + errno_t rc; + + rc = gfx_context_delete(wgc->gc); + if (rc != EOK) + return rc; + + free(wgc); + return EOK; +} + +/** Get generic graphic context from window GC. + * + * @param wgc Console GC + * @return Graphic context + */ +gfx_context_t *win_gc_get_ctx(win_gc_t *wgc) +{ + return wgc->gc; +} + +/** @} + */ Index: uspace/srv/hid/display/wingc.h =================================================================== --- uspace/srv/hid/display/wingc.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) +++ uspace/srv/hid/display/wingc.h (revision c8cf261a450bf22fa6cc6e9872a1f07f9e7dccda) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2019 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 display + * @{ + */ +/** + * @file Window graphics context + */ + +#ifndef WINGC_H +#define WINGC_H + +#include +#include +#include "types/wingc.h" + +extern gfx_context_ops_t win_gc_ops; + +extern errno_t win_gc_create(win_gc_t **); +extern errno_t win_gc_delete(win_gc_t *); +extern gfx_context_t *win_gc_get_ctx(win_gc_t *); + +#endif + +/** @} + */