Index: uspace/srv/hid/display/display.c =================================================================== --- uspace/srv/hid/display/display.c (revision bf22cb789a912e54c57c2e0f27f7785edfc5cd17) +++ uspace/srv/hid/display/display.c (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) @@ -31,8 +31,7 @@ */ /** - * @file Display management + * @file Display server display */ -#include #include #include @@ -42,69 +41,4 @@ #include "window.h" #include "display.h" - -static errno_t disp_window_create(void *, sysarg_t *); -static errno_t disp_window_destroy(void *, sysarg_t); -static errno_t disp_get_event(void *, sysarg_t *, display_wnd_ev_t *); - -display_ops_t display_srv_ops = { - .window_create = disp_window_create, - .window_destroy = disp_window_destroy, - .get_event = disp_get_event -}; - -static errno_t disp_window_create(void *arg, sysarg_t *rwnd_id) -{ - errno_t rc; - ds_client_t *client = (ds_client_t *) arg; - ds_window_t *wnd; - - log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create()"); - - rc = ds_window_create(client, &wnd); - log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create() - ds_window_create -> %d", rc); - if (rc != EOK) - return rc; - - log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create() -> EOK, id=%zu", - wnd->id); - - wnd->dpos.x = ((wnd->id - 1) & 1) * 400; - wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300; - - *rwnd_id = wnd->id; - return EOK; -} - -static errno_t disp_window_destroy(void *arg, sysarg_t wnd_id) -{ - ds_client_t *client = (ds_client_t *) arg; - ds_window_t *wnd; - - wnd = ds_client_find_window(client, wnd_id); - if (wnd == NULL) - return ENOENT; - - log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_destroy()"); - ds_client_remove_window(wnd); - ds_window_destroy(wnd); - return EOK; -} - -static errno_t disp_get_event(void *arg, sysarg_t *wnd_id, - display_wnd_ev_t *event) -{ - ds_client_t *client = (ds_client_t *) arg; - ds_window_t *wnd; - errno_t rc; - - log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_event()"); - - rc = ds_client_get_event(client, &wnd, event); - if (rc != EOK) - return rc; - - *wnd_id = wnd->id; - return EOK; -} /** Create display. Index: uspace/srv/hid/display/display.h =================================================================== --- uspace/srv/hid/display/display.h (revision bf22cb789a912e54c57c2e0f27f7785edfc5cd17) +++ uspace/srv/hid/display/display.h (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) @@ -31,6 +31,5 @@ */ /** - * @file - * @brief + * @file Display server display */ @@ -38,5 +37,4 @@ #define DISPLAY_H -#include #include #include @@ -44,6 +42,4 @@ #include "types/display/client.h" #include "types/display/display.h" - -extern display_ops_t display_srv_ops; extern errno_t ds_display_create(gfx_context_t *, ds_display_t **); Index: uspace/srv/hid/display/dsops.c =================================================================== --- uspace/srv/hid/display/dsops.c (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) +++ uspace/srv/hid/display/dsops.c (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) @@ -0,0 +1,109 @@ +/* + * 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 ops implementation + */ + +#include +#include +#include +#include "client.h" +#include "window.h" +#include "dsops.h" + +static errno_t disp_window_create(void *, sysarg_t *); +static errno_t disp_window_destroy(void *, sysarg_t); +static errno_t disp_get_event(void *, sysarg_t *, display_wnd_ev_t *); + +display_ops_t display_srv_ops = { + .window_create = disp_window_create, + .window_destroy = disp_window_destroy, + .get_event = disp_get_event +}; + +static errno_t disp_window_create(void *arg, sysarg_t *rwnd_id) +{ + errno_t rc; + ds_client_t *client = (ds_client_t *) arg; + ds_window_t *wnd; + + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create()"); + + rc = ds_window_create(client, &wnd); + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create() - ds_window_create -> %d", rc); + if (rc != EOK) + return rc; + + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_create() -> EOK, id=%zu", + wnd->id); + + wnd->dpos.x = ((wnd->id - 1) & 1) * 400; + wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300; + + *rwnd_id = wnd->id; + return EOK; +} + +static errno_t disp_window_destroy(void *arg, sysarg_t wnd_id) +{ + ds_client_t *client = (ds_client_t *) arg; + ds_window_t *wnd; + + wnd = ds_client_find_window(client, wnd_id); + if (wnd == NULL) + return ENOENT; + + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_destroy()"); + ds_client_remove_window(wnd); + ds_window_destroy(wnd); + return EOK; +} + +static errno_t disp_get_event(void *arg, sysarg_t *wnd_id, + display_wnd_ev_t *event) +{ + ds_client_t *client = (ds_client_t *) arg; + ds_window_t *wnd; + errno_t rc; + + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_event()"); + + rc = ds_client_get_event(client, &wnd, event); + if (rc != EOK) + return rc; + + *wnd_id = wnd->id; + return EOK; +} + +/** @} + */ Index: uspace/srv/hid/display/dsops.h =================================================================== --- uspace/srv/hid/display/dsops.h (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) +++ uspace/srv/hid/display/dsops.h (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) @@ -0,0 +1,46 @@ +/* + * 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 ops implementation + */ + +#ifndef DSOPS_H +#define DSOPS_H + +#include + +extern display_ops_t display_srv_ops; + +#endif + +/** @} + */ Index: uspace/srv/hid/display/main.c =================================================================== --- uspace/srv/hid/display/main.c (revision bf22cb789a912e54c57c2e0f27f7785edfc5cd17) +++ uspace/srv/hid/display/main.c (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) @@ -47,4 +47,5 @@ #include "client.h" #include "display.h" +#include "dsops.h" #include "main.h" #include "output.h" Index: uspace/srv/hid/display/meson.build =================================================================== --- uspace/srv/hid/display/meson.build (revision bf22cb789a912e54c57c2e0f27f7785edfc5cd17) +++ uspace/srv/hid/display/meson.build (revision 38e5f36caa4aaa59cfd863a6deeaa4427a3f7789) @@ -32,4 +32,5 @@ 'client.c', 'display.c', + 'dsops.c', 'main.c', 'output.c',