From 40b1f0bee89bf726e1d0fd65e8aa2223b562f6e6 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 25 Nov 2021 03:02:50 +0800 Subject: [PATCH] libc: Add include/nuttx/input/x11_keysym.h to enable more key group inside x11_keysym.h Signed-off-by: Xiang Xiao --- LICENSE | 1 + drivers/video/vnc/vnc_keymap.c | 7 +-- include/nuttx/input/x11_keysym.h | 89 ++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 include/nuttx/input/x11_keysym.h diff --git a/LICENSE b/LICENSE index d25a1a6f53..b9fe75baf4 100644 --- a/LICENSE +++ b/LICENSE @@ -443,6 +443,7 @@ include/nuttx/lcd/ili9488.h EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +include/nuttx/input/x11_keysym.h include/nuttx/input/x11_keysymdef.h =================================== diff --git a/drivers/video/vnc/vnc_keymap.c b/drivers/video/vnc/vnc_keymap.c index 47d419d154..911f7f7c47 100644 --- a/drivers/video/vnc/vnc_keymap.c +++ b/drivers/video/vnc/vnc_keymap.c @@ -29,13 +29,8 @@ #include #include - -#define XK_MISCELLANY 1 /* Select X11 character set */ -#define XK_LATIN1 1 -#define XK_XKB_KEYS 1 - #include -#include +#include #include #include "vnc_server.h" diff --git a/include/nuttx/input/x11_keysym.h b/include/nuttx/input/x11_keysym.h new file mode 100644 index 0000000000..f71b4a30fd --- /dev/null +++ b/include/nuttx/input/x11_keysym.h @@ -0,0 +1,89 @@ +/**************************************************************************** + * include/nuttx/input/x11_keysym.h + * + * Copyright 1987, 1994, 1998 The Open Group + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation. + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of The Open Group shall + * not be used in advertising or otherwise to promote the sale, use or + * other dealings in this Software without prior written authorization + * from The Open Group. + * + * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts + * + * All Rights Reserved + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, + * provided that the above copyright notice appear in all copies and that + * both that copyright notice and this permission notice appear in + * supporting documentation, and that the name of Digital not be + * used in advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * + ****************************************************************************/ + +#ifndef __INCLUDE_NUTTX_INPUT_X11_KEYSYM_H +#define __INCLUDE_NUTTX_INPUT_X11_KEYSYM_H + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Default keysyms */ + +#define XK_MISCELLANY +#define XK_XKB_KEYS +#define XK_LATIN1 +#define XK_LATIN2 +#define XK_LATIN3 +#define XK_LATIN4 +#define XK_LATIN8 +#define XK_LATIN9 +#define XK_CAUCASUS +#define XK_GREEK +#define XK_KATAKANA +#define XK_ARABIC +#define XK_CYRILLIC +#define XK_HEBREW +#define XK_THAI +#define XK_KOREAN +#define XK_ARMENIAN +#define XK_GEORGIAN +#define XK_VIETNAMESE +#define XK_CURRENCY +#define XK_MATHEMATICAL +#define XK_BRAILLE +#define XK_SINHALA + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#endif /* __INCLUDE_NUTTX_INPUT_X11_KEYSYM_H */