Index: uspace/lib/c/include/io/mode.h =================================================================== --- uspace/lib/c/include/io/mode.h (revision ddb844e7f3c7c26ca821db9add6e4c048aaf9a7b) +++ (revision ) @@ -1,75 +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_MODE_H_ -#define _LIBC_IO_MODE_H_ - -#include -#include -#include -#include - -typedef struct { - sysarg_t width; - sysarg_t height; -} aspect_ratio_t; - -typedef union { - visual_t pixel_visual; - char_attr_type_t field_visual; -} cell_visual_t; - -typedef struct { - sysarg_t index; - sysarg_t version; - - sysarg_t refresh_rate; - aspect_ratio_t screen_aspect; - sysarg_t screen_width; - sysarg_t screen_height; - - aspect_ratio_t cell_aspect; - cell_visual_t cell_visual; -} vslmode_t; - -typedef struct { - link_t link; - vslmode_t mode; -} vslmode_list_element_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/pixelmap.h =================================================================== --- uspace/lib/c/include/io/pixelmap.h (revision ddb844e7f3c7c26ca821db9add6e4c048aaf9a7b) +++ uspace/lib/c/include/io/pixelmap.h (revision 06d0c81437c83c6c3cef6766e8e582c877832b47) @@ -42,22 +42,4 @@ #include #include - -/* Defines how a pixel outside of pixmap rectangle shall be treated */ -typedef enum { - /* Pixels outside of a pixmap are PIXEL(0, 0, 0, 0) */ - PIXELMAP_EXTEND_TRANSPARENT_BLACK = 0, - - /* The pixmap is repeated infinetely */ - PIXELMAP_EXTEND_TILE, - - /* If outside of a pixmap, return closest pixel from the edge */ - PIXELMAP_EXTEND_SIDES, - - /* - * If outside of a pixmap, return closest pixel from the edge, - * with alpha = 0 - */ - PIXELMAP_EXTEND_TRANSPARENT_SIDES -} pixelmap_extend_t; typedef struct { @@ -106,44 +88,4 @@ } -static inline pixel_t pixelmap_get_extended_pixel(pixelmap_t *pixmap, - native_t x, native_t y, pixelmap_extend_t extend) -{ - bool transparent = false; - if (extend == PIXELMAP_EXTEND_TILE) { - x %= pixmap->width; - y %= pixmap->height; - } else if (extend == PIXELMAP_EXTEND_SIDES || - extend == PIXELMAP_EXTEND_TRANSPARENT_SIDES) { - bool transparent_outside = - (extend == PIXELMAP_EXTEND_TRANSPARENT_SIDES); - if (x < 0) { - x = 0; - transparent = transparent_outside; - } else if (((sysarg_t) x) >= pixmap->width) { - x = pixmap->width - 1; - transparent = transparent_outside; - } - - if (y < 0) { - y = 0; - transparent = transparent_outside; - } else if (((sysarg_t) y) >= pixmap->height) { - y = pixmap->height - 1; - transparent = transparent_outside; - } - } - - if (x < 0 || ((sysarg_t) x) >= pixmap->width || - y < 0 || ((sysarg_t) y) >= pixmap->height) - return PIXEL(0, 0, 0, 0); - - pixel_t pixel = pixelmap_get_pixel(pixmap, x, y); - - if (transparent) - pixel = PIXEL(0, RED(pixel), GREEN(pixel), BLUE(pixel)); - - return pixel; -} - #endif Index: uspace/lib/c/include/io/window.h =================================================================== --- uspace/lib/c/include/io/window.h (revision ddb844e7f3c7c26ca821db9add6e4c048aaf9a7b) +++ (revision ) @@ -1,116 +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 - */ - -#ifndef _LIBC_IO_WINDOW_H_ -#define _LIBC_IO_WINDOW_H_ - -#include -#include -#include - -typedef enum { - WINDOW_MAIN = 1, - WINDOW_DECORATED = 2, - WINDOW_RESIZEABLE = 4 -} window_flags_t; - -typedef enum { - GF_EMPTY = 0, - GF_MOVE_X = 1, - GF_MOVE_Y = 2, - GF_RESIZE_X = 4, - GF_RESIZE_Y = 8, - GF_SCALE_X = 16, - GF_SCALE_Y = 32 -} window_grab_flags_t; - -typedef enum { - WINDOW_PLACEMENT_ANY = 0, - WINDOW_PLACEMENT_CENTER_X = 1, - WINDOW_PLACEMENT_CENTER_Y = 2, - WINDOW_PLACEMENT_CENTER = - WINDOW_PLACEMENT_CENTER_X | WINDOW_PLACEMENT_CENTER_Y, - WINDOW_PLACEMENT_LEFT = 4, - WINDOW_PLACEMENT_RIGHT = 8, - WINDOW_PLACEMENT_TOP = 16, - WINDOW_PLACEMENT_BOTTOM = 32, - WINDOW_PLACEMENT_ABSOLUTE_X = 64, - WINDOW_PLACEMENT_ABSOLUTE_Y = 128, - WINDOW_PLACEMENT_ABSOLUTE = - WINDOW_PLACEMENT_ABSOLUTE_X | WINDOW_PLACEMENT_ABSOLUTE_Y -} window_placement_flags_t; - -typedef struct { - sysarg_t object; - sysarg_t slot; - sysarg_t argument; -} signal_event_t; - -typedef struct { - sysarg_t offset_x; - sysarg_t offset_y; - sysarg_t width; - sysarg_t height; - window_placement_flags_t placement_flags; -} resize_event_t; - -typedef enum { - ET_KEYBOARD_EVENT, - ET_POSITION_EVENT, - ET_SIGNAL_EVENT, - ET_WINDOW_FOCUS, - ET_WINDOW_UNFOCUS, - ET_WINDOW_RESIZE, - ET_WINDOW_REFRESH, - ET_WINDOW_DAMAGE, - ET_WINDOW_CLOSE -} window_event_type_t; - -typedef union { - kbd_event_t kbd; - pos_event_t pos; - signal_event_t signal; - resize_event_t resize; -} window_event_data_t; - -typedef struct { - link_t link; - window_event_type_t type; - window_event_data_t data; -} window_event_t; - -#endif - -/** @} - */