Index: uspace/drv/fb/amdm37x_dispc/main.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/main.c (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ uspace/drv/fb/amdm37x_dispc/main.c (revision de19d4adc0334d6906982d38962b3f8ec0050aba) @@ -91,5 +91,5 @@ ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "a"); if (!fun) { - ddf_log_error("Failed to create visualizer function."); + ddf_log_error("Failed to create display device function."); return ENOMEM; } @@ -124,5 +124,5 @@ rc = ddf_fun_add_to_category(fun, "display-device"); if (rc != EOK) { - ddf_log_error("Failed to add function: %s to visualizer " + ddf_log_error("Failed to add function: %s to display device " "category.", str_error(rc)); amdm37x_dispc_fini(dispc); Index: uspace/lib/c/generic/io/visualizer.c =================================================================== --- uspace/lib/c/generic/io/visualizer.c (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ (revision ) @@ -1,210 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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 - */ - -#include -#include -#include -#include -#include - -errno_t visualizer_claim(async_sess_t *sess, sysarg_t notif_callback_id) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_1_0(exch, VISUALIZER_CLAIM, notif_callback_id); - async_exchange_end(exch); - - return ret; -} - -errno_t visualizer_yield(async_sess_t *sess) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_0_0(exch, VISUALIZER_YIELD); - async_exchange_end(exch); - - return ret; -} - -errno_t visualizer_enumerate_modes(async_sess_t *sess, vslmode_t *mode, sysarg_t nth) -{ - async_exch_t *exch = async_exchange_begin(sess); - - ipc_call_t answer; - aid_t req = async_send_1(exch, VISUALIZER_ENUMERATE_MODES, nth, &answer); - - errno_t rc = async_data_read_start(exch, mode, sizeof(vslmode_t)); - - async_exchange_end(exch); - - errno_t ret; - async_wait_for(req, &ret); - - if (rc != EOK) { - return rc; - } else if (ret != EOK) { - return ret; - } else { - return EOK; - } -} - -errno_t visualizer_get_default_mode(async_sess_t *sess, vslmode_t *mode) -{ - async_exch_t *exch = async_exchange_begin(sess); - - ipc_call_t answer; - aid_t req = async_send_0(exch, VISUALIZER_GET_DEFAULT_MODE, &answer); - - errno_t rc = async_data_read_start(exch, mode, sizeof(vslmode_t)); - - async_exchange_end(exch); - - errno_t ret; - async_wait_for(req, &ret); - - if (rc != EOK) { - return rc; - } else if (ret != EOK) { - return ret; - } else { - return EOK; - } -} - -errno_t visualizer_get_current_mode(async_sess_t *sess, vslmode_t *mode) -{ - async_exch_t *exch = async_exchange_begin(sess); - - ipc_call_t answer; - aid_t req = async_send_0(exch, VISUALIZER_GET_CURRENT_MODE, &answer); - - errno_t rc = async_data_read_start(exch, mode, sizeof(vslmode_t)); - - async_exchange_end(exch); - - errno_t ret; - async_wait_for(req, &ret); - - if (rc != EOK) { - return rc; - } else if (ret != EOK) { - return ret; - } else { - return EOK; - } -} - -errno_t visualizer_get_mode(async_sess_t *sess, vslmode_t *mode, sysarg_t index) -{ - async_exch_t *exch = async_exchange_begin(sess); - - ipc_call_t answer; - aid_t req = async_send_1(exch, VISUALIZER_GET_MODE, index, &answer); - - errno_t rc = async_data_read_start(exch, mode, sizeof(vslmode_t)); - - async_exchange_end(exch); - - errno_t ret; - async_wait_for(req, &ret); - - if (rc != EOK) { - return rc; - } else if (ret != EOK) { - return ret; - } else { - return EOK; - } -} - -errno_t visualizer_set_mode(async_sess_t *sess, sysarg_t index, sysarg_t version, void *cells) -{ - async_exch_t *exch = async_exchange_begin(sess); - - ipc_call_t answer; - aid_t req = async_send_2(exch, VISUALIZER_SET_MODE, index, version, &answer); - - errno_t rc = async_share_out_start(exch, cells, AS_AREA_READ | AS_AREA_CACHEABLE); - - async_exchange_end(exch); - - errno_t ret; - async_wait_for(req, &ret); - - if (rc != EOK) { - return rc; - } else if (ret != EOK) { - return ret; - } else { - return EOK; - } -} - -errno_t visualizer_update_damaged_region(async_sess_t *sess, - sysarg_t x, sysarg_t y, sysarg_t width, sysarg_t height, - sysarg_t x_offset, sysarg_t y_offset) -{ - assert(x_offset <= UINT16_MAX); - assert(y_offset <= UINT16_MAX); - - sysarg_t offsets = ((x_offset << 16) | (y_offset & 0x0000ffff)); - - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_5_0(exch, VISUALIZER_UPDATE_DAMAGED_REGION, - x, y, width, height, offsets); - async_exchange_end(exch); - - return ret; -} - -errno_t visualizer_suspend(async_sess_t *sess) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_0_0(exch, VISUALIZER_SUSPEND); - async_exchange_end(exch); - - return ret; -} - -errno_t visualizer_wakeup(async_sess_t *sess) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_0_0(exch, VISUALIZER_WAKE_UP); - async_exchange_end(exch); - - return ret; -} - -/** @} - */ Index: uspace/lib/c/include/io/visualizer.h =================================================================== --- uspace/lib/c/include/io/visualizer.h (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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_IO_VISUALIZER_H_ -#define _LIBC_IO_VISUALIZER_H_ - -#include -#include - -extern errno_t visualizer_claim(async_sess_t *, sysarg_t); -extern errno_t visualizer_yield(async_sess_t *); - -extern errno_t visualizer_enumerate_modes(async_sess_t *, vslmode_t *, sysarg_t); -extern errno_t visualizer_get_default_mode(async_sess_t *, vslmode_t *); -extern errno_t visualizer_get_current_mode(async_sess_t *, vslmode_t *); -extern errno_t visualizer_get_mode(async_sess_t *, vslmode_t *, sysarg_t); -extern errno_t visualizer_set_mode(async_sess_t *, sysarg_t, sysarg_t, void *); - -extern errno_t visualizer_update_damaged_region(async_sess_t *, - sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); - -extern errno_t visualizer_suspend(async_sess_t *); -extern errno_t visualizer_wakeup(async_sess_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/graph.h =================================================================== --- uspace/lib/c/include/ipc/graph.h (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ (revision ) @@ -1,74 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * 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_IPC_GRAPH_H_ -#define _LIBC_IPC_GRAPH_H_ - -#include - -typedef enum { - VISUALIZER_CLAIM = IPC_FIRST_USER_METHOD, - VISUALIZER_YIELD, - - VISUALIZER_ENUMERATE_MODES, - VISUALIZER_GET_DEFAULT_MODE, - VISUALIZER_GET_CURRENT_MODE, - VISUALIZER_GET_MODE, - VISUALIZER_SET_MODE, - - VISUALIZER_UPDATE_DAMAGED_REGION, - - VISUALIZER_SUSPEND, - VISUALIZER_WAKE_UP, -} visualizer_request_t; - -typedef enum { - VISUALIZER_MODE_CHANGE = IPC_FIRST_USER_METHOD, - VISUALIZER_DISCONNECT -} visualizer_notif_t; - -typedef enum { - RENDERER_REQ_NONE = IPC_FIRST_USER_METHOD, - // TODO: similar interface as provides libsoftrend -} renderer_request_t; - -typedef enum { - RENDERER_NOTIF_NONE = IPC_FIRST_USER_METHOD, - // TODO: similar interface as provides libsoftrend -} renderer_notif_t; - -#endif - -/** @} - */ Index: uspace/lib/c/meson.build =================================================================== --- uspace/lib/c/meson.build (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ uspace/lib/c/meson.build (revision de19d4adc0334d6906982d38962b3f8ec0050aba) @@ -131,5 +131,4 @@ 'generic/io/console.c', 'generic/io/table.c', - 'generic/io/visualizer.c', 'generic/iplink.c', 'generic/iplink_srv.c', Index: uspace/lib/gui/window.c =================================================================== --- uspace/lib/gui/window.c (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ uspace/lib/gui/window.c (revision de19d4adc0334d6906982d38962b3f8ec0050aba) @@ -405,13 +405,9 @@ errno_t rc; - if (width < 2 * border_thickness + header_min_width) { - //win_damage(win->osess, 0, 0, 0, 0); - return; - } - - if (height < 2 * border_thickness + header_height) { - //win_damage(win->osess, 0, 0, 0, 0); - return; - } + if (width < 2 * border_thickness + header_min_width) + return; + + if (height < 2 * border_thickness + header_height) + return; fibril_mutex_lock(&win->guard); Index: uspace/srv/hid/rfb/main.c =================================================================== --- uspace/srv/hid/rfb/main.c (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ uspace/srv/hid/rfb/main.c (revision de19d4adc0334d6906982d38962b3f8ec0050aba) @@ -427,5 +427,5 @@ rc = loc_category_get_id("display-device", &ddev_cid, IPC_FLAG_BLOCKING); if (rc != EOK) { - fprintf(stderr, NAME ": Unable to get visualizer category id.\n"); + fprintf(stderr, NAME ": Unable to get display device category id.\n"); return 1; } @@ -433,5 +433,5 @@ rc = loc_service_add_to_cat(service_id, ddev_cid); if (rc != EOK) { - fprintf(stderr, NAME ": Unable to add service to visualizer category.\n"); + fprintf(stderr, NAME ": Unable to add service to display device category.\n"); return 1; } Index: uspace/srv/locsrv/locsrv.c =================================================================== --- uspace/srv/locsrv/locsrv.c (revision 78445be832110853ba497f8bd9b39e688f455fc7) +++ uspace/srv/locsrv/locsrv.c (revision de19d4adc0334d6906982d38962b3f8ec0050aba) @@ -1378,7 +1378,4 @@ categ_dir_add_cat(&cdir, cat); - cat = category_new("visualizer"); - categ_dir_add_cat(&cdir, cat); - cat = category_new("renderer"); categ_dir_add_cat(&cdir, cat);