Index: uspace/lib/display/include/display/wndresize.h =================================================================== --- uspace/lib/display/include/display/wndresize.h (revision 9242ad96749c6886b0320f48e90dcb84d6e773cc) +++ uspace/lib/display/include/display/wndresize.h (revision 28f8f6f2876b18cdd1a463452ab1f7e872051b5f) @@ -36,5 +36,10 @@ #define _LIBDISPLAY_DISPLAY_WNDRESIZE_H_ +#include +#include "../types/display/cursor.h" #include "../types/display/wndresize.h" + +extern display_stock_cursor_t display_cursor_from_wrsz(display_wnd_rsztype_t); +extern bool display_wndrsz_valid(display_wnd_rsztype_t); #endif Index: uspace/lib/display/meson.build =================================================================== --- uspace/lib/display/meson.build (revision 9242ad96749c6886b0320f48e90dcb84d6e773cc) +++ uspace/lib/display/meson.build (revision 28f8f6f2876b18cdd1a463452ab1f7e872051b5f) @@ -31,4 +31,5 @@ 'src/display.c', 'src/disp_srv.c', + 'src/wndresize.c', ) @@ -36,3 +37,4 @@ 'test/display.c', 'test/main.c', + 'test/wndresize.c', ) Index: uspace/lib/display/src/wndresize.c =================================================================== --- uspace/lib/display/src/wndresize.c (revision 28f8f6f2876b18cdd1a463452ab1f7e872051b5f) +++ uspace/lib/display/src/wndresize.c (revision 28f8f6f2876b18cdd1a463452ab1f7e872051b5f) @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2020 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. + */ + +#include +#include +#include + +/** Get stock cursor to use for the specified window resize type. + * + * The resize type must be valid, otherwise behavior is undefined. + * Resize type can be validated using @c display_wndrsz_valid(). + * + * @param rsztype Resize type + * @return Cursor to use for this resize type + */ +display_stock_cursor_t display_cursor_from_wrsz(display_wnd_rsztype_t rsztype) +{ + switch (rsztype) { + case display_wr_top: + case display_wr_bottom: + return dcurs_size_ud; + + case display_wr_left: + case display_wr_right: + return dcurs_size_lr; + + case display_wr_top_left: + case display_wr_bottom_right: + return dcurs_size_uldr; + + case display_wr_top_right: + case display_wr_bottom_left: + return dcurs_size_urdl; + + default: + assert(false); + return dcurs_arrow; + } +} + +/** Determine if resize type is valid. + * + * Determine if the resize type has one of the valid values. This function + * should be used when the resize type comes from an untrusted source + * (such as from the client). + * + * @param rsztype Resize type + * @return @c true iff the resize type is valid + */ +bool display_wndrsz_valid(display_wnd_rsztype_t rsztype) +{ + bool valid; + + valid = false; + + switch (rsztype) { + case display_wr_top: + case display_wr_bottom: + case display_wr_left: + case display_wr_right: + case display_wr_top_left: + case display_wr_bottom_right: + case display_wr_top_right: + case display_wr_bottom_left: + valid = true; + break; + } + + return valid; +} + +/** @} + */ Index: uspace/lib/display/test/main.c =================================================================== --- uspace/lib/display/test/main.c (revision 9242ad96749c6886b0320f48e90dcb84d6e773cc) +++ uspace/lib/display/test/main.c (revision 28f8f6f2876b18cdd1a463452ab1f7e872051b5f) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2019 Jiri Svoboda + * Copyright (c) 2020 Jiri Svoboda * All rights reserved. * @@ -32,4 +32,5 @@ PCUT_IMPORT(display); +PCUT_IMPORT(wndresize); PCUT_MAIN(); Index: uspace/lib/display/test/wndresize.c =================================================================== --- uspace/lib/display/test/wndresize.c (revision 28f8f6f2876b18cdd1a463452ab1f7e872051b5f) +++ uspace/lib/display/test/wndresize.c (revision 28f8f6f2876b18cdd1a463452ab1f7e872051b5f) @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2020 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. + */ + +#include +#include +#include +#include + +PCUT_INIT; + +PCUT_TEST_SUITE(wndresize); + +/** display_cursor_from_wrsz() correctly translates resize type to cursor */ +PCUT_TEST(cursor_from_wrsz) +{ + PCUT_ASSERT_INT_EQUALS(dcurs_size_ud, + display_cursor_from_wrsz(display_wr_top)); + PCUT_ASSERT_INT_EQUALS(dcurs_size_ud, + display_cursor_from_wrsz(display_wr_bottom)); + PCUT_ASSERT_INT_EQUALS(dcurs_size_lr, + display_cursor_from_wrsz(display_wr_left)); + PCUT_ASSERT_INT_EQUALS(dcurs_size_lr, + display_cursor_from_wrsz(display_wr_right)); + PCUT_ASSERT_INT_EQUALS(dcurs_size_uldr, + display_cursor_from_wrsz(display_wr_top_left)); + PCUT_ASSERT_INT_EQUALS(dcurs_size_uldr, + display_cursor_from_wrsz(display_wr_bottom_right)); + PCUT_ASSERT_INT_EQUALS(dcurs_size_urdl, + display_cursor_from_wrsz(display_wr_top_right)); + PCUT_ASSERT_INT_EQUALS(dcurs_size_urdl, + display_cursor_from_wrsz(display_wr_bottom_left)); +} + +/** display_wndrsz_valid() correctly verifies window resize type */ +PCUT_TEST(wndrsz_valid) +{ + PCUT_ASSERT_FALSE(display_wndrsz_valid(INT_MIN)); + PCUT_ASSERT_FALSE(display_wndrsz_valid(display_wr_top - 1)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_top)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_left)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_bottom)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_right)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_top_left)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_top_right)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_bottom_left)); + PCUT_ASSERT_TRUE(display_wndrsz_valid(display_wr_bottom_right)); + PCUT_ASSERT_FALSE(display_wndrsz_valid(display_wr_bottom_right + 1)); + PCUT_ASSERT_FALSE(display_wndrsz_valid( + display_wr_top | display_wr_bottom)); + PCUT_ASSERT_FALSE(display_wndrsz_valid( + display_wr_left | display_wr_right)); + PCUT_ASSERT_FALSE(display_wndrsz_valid( + display_wr_top | display_wr_left | display_wr_right)); + PCUT_ASSERT_FALSE(display_wndrsz_valid( + display_wr_bottom | display_wr_left | display_wr_right)); + PCUT_ASSERT_FALSE(display_wndrsz_valid( + display_wr_top | display_wr_bottom | display_wr_left)); + PCUT_ASSERT_FALSE(display_wndrsz_valid( + display_wr_top | display_wr_bottom | display_wr_right)); + PCUT_ASSERT_FALSE(display_wndrsz_valid( + display_wr_top | display_wr_bottom | + display_wr_left | display_wr_right)); + PCUT_ASSERT_FALSE(display_wndrsz_valid(INT_MAX)); +} + +PCUT_EXPORT(wndresize);