Index: uspace/lib/c/generic/io/window.c =================================================================== --- uspace/lib/c/generic/io/window.c (revision 84876aa4f80a43fe7bb9c01fbe376d900db1cbe4) +++ (revision ) @@ -1,137 +1,0 @@ -/* - * Copyright (c) 2012 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 win_register(async_sess_t *sess, window_flags_t flags, service_id_t *in, - service_id_t *out) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_1_2(exch, WINDOW_REGISTER, flags, in, out); - async_exchange_end(exch); - - return ret; -} - -errno_t win_get_event(async_sess_t *sess, window_event_t *event) -{ - async_exch_t *exch = async_exchange_begin(sess); - - ipc_call_t answer; - aid_t req = async_send_0(exch, WINDOW_GET_EVENT, &answer); - - errno_t rc = async_data_read_start(exch, event, sizeof(window_event_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 win_damage(async_sess_t *sess, - sysarg_t x, sysarg_t y, sysarg_t width, sysarg_t height) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_4_0(exch, WINDOW_DAMAGE, x, y, width, height); - async_exchange_end(exch); - - return ret; -} - -errno_t win_grab(async_sess_t *sess, sysarg_t pos_id, sysarg_t grab_flags) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_2_0(exch, WINDOW_GRAB, pos_id, grab_flags); - async_exchange_end(exch); - - return ret; -} - -errno_t win_resize(async_sess_t *sess, sysarg_t x, sysarg_t y, sysarg_t width, - sysarg_t height, window_placement_flags_t placement_flags, void *cells) -{ - async_exch_t *exch = async_exchange_begin(sess); - - ipc_call_t answer; - aid_t req = async_send_5(exch, WINDOW_RESIZE, x, y, width, height, - (sysarg_t) placement_flags, &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; - - return EOK; -} - -errno_t win_close(async_sess_t *sess) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_0_0(exch, WINDOW_CLOSE); - async_exchange_end(exch); - - return ret; -} - -errno_t win_close_request(async_sess_t *sess) -{ - async_exch_t *exch = async_exchange_begin(sess); - errno_t ret = async_req_0_0(exch, WINDOW_CLOSE_REQUEST); - async_exchange_end(exch); - - return ret; -} - -/** @} - */ Index: uspace/lib/c/include/io/window.h =================================================================== --- uspace/lib/c/include/io/window.h (revision 84876aa4f80a43fe7bb9c01fbe376d900db1cbe4) +++ uspace/lib/c/include/io/window.h (revision dbef30fb1faefbb940d9c7275e085e71216fe08b) @@ -36,9 +36,7 @@ #define _LIBC_IO_WINDOW_H_ -#include -#include -#include #include #include +#include typedef enum { @@ -113,16 +111,4 @@ } window_event_t; -extern errno_t win_register(async_sess_t *, window_flags_t, service_id_t *, - service_id_t *); - -extern errno_t win_get_event(async_sess_t *, window_event_t *); - -extern errno_t win_damage(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -extern errno_t win_grab(async_sess_t *, sysarg_t, sysarg_t); -extern errno_t win_resize(async_sess_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, - window_placement_flags_t, void *); -extern errno_t win_close(async_sess_t *); -extern errno_t win_close_request(async_sess_t *); - #endif Index: uspace/lib/c/meson.build =================================================================== --- uspace/lib/c/meson.build (revision 84876aa4f80a43fe7bb9c01fbe376d900db1cbe4) +++ uspace/lib/c/meson.build (revision dbef30fb1faefbb940d9c7275e085e71216fe08b) @@ -132,5 +132,4 @@ 'generic/io/table.c', 'generic/io/visualizer.c', - 'generic/io/window.c', 'generic/iplink.c', 'generic/iplink_srv.c',