From patchwork Mon Sep 28 23:41:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1372926 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=bLo6Pzr8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C0fDn5nqfz9sPB for ; Tue, 29 Sep 2020 09:41:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF74881F22; Tue, 29 Sep 2020 01:41:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="bLo6Pzr8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 43D528219C; Tue, 29 Sep 2020 01:41:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, UPPERCASE_75_100,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7CF2D81C2C for ; Tue, 29 Sep 2020 01:41:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1601336483; bh=eVsAyolad+mgRWFhiDjOLiugH1XzmNEei4cElAgqZ80=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=bLo6Pzr8fnFyT/+cj80H+UGcsUz/lDmR6RXiCyMi3nFv0hbwrhthV9rVcotF/BDy3 GhoqF7ip3KaFRWhPoBEm7KbcSukC/3HUXHjrwDhRCoE0aqF3v0lauUFHTfgtBpu5df DM5fb3JhY7oRa2mIt5/NPYaF9lgbQKmg1IFmyJfU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MGz1V-1k9WN61ISh-00E7UF; Tue, 29 Sep 2020 01:41:23 +0200 From: Heinrich Schuchardt To: Simon Glass Cc: Anatolij Gustschin , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] sandbox: add missing SDL key scan codes Date: Tue, 29 Sep 2020 01:41:18 +0200 Message-Id: <20200928234118.124795-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:zra3G84GRu1WipfhGj7Ytn3h0Ey/jSjbwLhpVeTIem3ixH1e21c rM+1bNRPobjns222qqoL4mTj0pYzvnSMVWpCXluQm82s9XYDDMrObyhfucWOFHwjmJuYC7b CLNLlU+f1a7id95+nEYkHzD33/WWWesNy3TpbmDQEIve85sH0oSljlX67wSASt3UFXZBKyL HTmkgsgdEMie6+1AAfKBg== X-UI-Out-Filterresults: notjunk:1;V03:K0:vvYrswY2rVQ=:qMNY6luxJbgxkkcqvBm9W7 q+kVK/y7ISw0BuU6uq/S1EoS/0/9qilcNtAYBv1c1u7B/w3uY0k9px9yOWeSk5S3TBt0aflLb pNGdRI1a4RuMV+7+yNvFqnjs6Y2dtJJaFGsAJzb4DsMdlhUcR4SncyYqs53LvngRrUWJnOOFL BZgOYzS/S7y0q6/3hDBrtpZso8kgd8qraCbwgOlLQwti7Pxu4gwf0x2puEvqP1u/yKQfF2Tje 3Gy4ZqIiz/z4l/rkVUr/o5cy1Pxb59uskWLeuZA2hGCoz3DnIQpnR12aIt9FcgShie9z52Igm hp2zy12YxmvNp109GSguieVNBv+hcHuxeIcV/lHGtQpRx6hOZ8iunQc9MjYQlXMfeeu3Iu+ex OqT46fnOUtQ80frfl2OdDwvKrJoPbl4s0NO/PRCRfltR5xcHBVON37r63jTTndUdA2ij7Z4iL KI+k0HKBwmrSPEtWRgxSpFRjT+sLT28QgAOvi080gwIUvPeGPQxak9NcxROMd0wKxDjSSbaPM ZWJ8ntKrSqwewdq9+8xSyfOrrB9x4kQS+TfdPoDYWowkrwFLqIkUn1DBlZQjNAixEoSm16ujY TUJ4d67xlQEoyJd9PjF2GwyYTF7iO/WwMsIpa/W0OX/VBroc92BGfUypRL7HzzsZxv/UcoqjF CBp5EYgIVc2Z0GIyFq2DTZkT2BujykhjeMR2ljgs1hfr5bvbtBtHcN8G/+EO3G6nkuehTXVUC doUTWBXWKFKJhO/MRIE0PYdM4ellv7Vl1ytIbSLsSqje+R4i6TuwnYodzaW+2SkSfLp+6/Icf uqeeJSgL59WwXV/Ncjxhf/B18ZMQLQY7bmubMIlvj1f0LbhmwxUrMyA2+IG7MFRMV8nYHX1G9 r9+l4oE37uaH7Xfz+IEnJoz0r7uTNvwSk+uSQvPK23QAuykCm26hZ+VVIdmQx/saT0QDmkwNW TocUG8MZh7YzgKzMvKqH1bWWud5NyhResGMtJIVrJGTkTRKfkqlI8/3FoNJ2YtBMHmVGUi8VA Ln8ascVgFPWLVj/qB9bvgfp8u/+i3pRz7a78AWOxuQfH3ohkSftdZZjl1S4mkrmlcFatSdGMe h0O9Qt+b6uGt3+EKuwyyoSGCsvuQ/UtmddXn6DF5znGfFfrYNsQX0JOIEl28q1Rjnw/It4vNm +R82vGSiLpC78vEOIRI7gXd7WbQpiknwm9ggG4YMXG9fOcpinnbb1WBYFUBHCM/3P/NJaWj9h 56j4X6PI2+HMb5eTDilpSuwnZH137YxnheGIIkw== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Add missing SDL key scan codes, e.g. * shift, ctrl, meta, alt * brace/bracket Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- arch/sandbox/cpu/sdl.c | 156 +++++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 67 deletions(-) -- 2.28.0 diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c index 6416cab96c..7dc3dab32e 100644 --- a/arch/sandbox/cpu/sdl.c +++ b/arch/sandbox/cpu/sdl.c @@ -172,33 +172,7 @@ int sandbox_sdl_sync(void *lcd_base) } static const unsigned short sdl_to_keycode[SDL_NUM_SCANCODES] = { - [SDL_SCANCODE_A] = KEY_A, - [SDL_SCANCODE_B] = KEY_B, - [SDL_SCANCODE_C] = KEY_C, - [SDL_SCANCODE_D] = KEY_D, - [SDL_SCANCODE_E] = KEY_E, - [SDL_SCANCODE_F] = KEY_F, - [SDL_SCANCODE_G] = KEY_G, - [SDL_SCANCODE_H] = KEY_H, - [SDL_SCANCODE_I] = KEY_I, - [SDL_SCANCODE_J] = KEY_J, - [SDL_SCANCODE_K] = KEY_K, - [SDL_SCANCODE_L] = KEY_L, - [SDL_SCANCODE_M] = KEY_M, - [SDL_SCANCODE_N] = KEY_N, - [SDL_SCANCODE_O] = KEY_O, - [SDL_SCANCODE_P] = KEY_P, - [SDL_SCANCODE_Q] = KEY_Q, - [SDL_SCANCODE_R] = KEY_R, - [SDL_SCANCODE_S] = KEY_S, - [SDL_SCANCODE_T] = KEY_T, - [SDL_SCANCODE_U] = KEY_U, - [SDL_SCANCODE_V] = KEY_V, - [SDL_SCANCODE_W] = KEY_W, - [SDL_SCANCODE_X] = KEY_X, - [SDL_SCANCODE_Y] = KEY_Y, - [SDL_SCANCODE_Z] = KEY_Z, - + [SDL_SCANCODE_ESCAPE] = KEY_ESC, [SDL_SCANCODE_1] = KEY_1, [SDL_SCANCODE_2] = KEY_2, [SDL_SCANCODE_3] = KEY_3, @@ -209,25 +183,53 @@ static const unsigned short sdl_to_keycode[SDL_NUM_SCANCODES] = { [SDL_SCANCODE_8] = KEY_8, [SDL_SCANCODE_9] = KEY_9, [SDL_SCANCODE_0] = KEY_0, - - [SDL_SCANCODE_RETURN] = KEY_ENTER, - [SDL_SCANCODE_ESCAPE] = KEY_ESC, - [SDL_SCANCODE_BACKSPACE] = KEY_BACKSPACE, - [SDL_SCANCODE_TAB] = KEY_TAB, - [SDL_SCANCODE_SPACE] = KEY_SPACE, - [SDL_SCANCODE_MINUS] = KEY_MINUS, [SDL_SCANCODE_EQUALS] = KEY_EQUAL, - [SDL_SCANCODE_BACKSLASH] = KEY_BACKSLASH, + [SDL_SCANCODE_BACKSPACE] = KEY_BACKSPACE, + [SDL_SCANCODE_TAB] = KEY_TAB, + [SDL_SCANCODE_Q] = KEY_Q, + [SDL_SCANCODE_W] = KEY_W, + [SDL_SCANCODE_E] = KEY_E, + [SDL_SCANCODE_R] = KEY_R, + [SDL_SCANCODE_T] = KEY_T, + [SDL_SCANCODE_Y] = KEY_Y, + [SDL_SCANCODE_U] = KEY_U, + [SDL_SCANCODE_I] = KEY_I, + [SDL_SCANCODE_O] = KEY_O, + [SDL_SCANCODE_P] = KEY_P, + [SDL_SCANCODE_LEFTBRACKET] = KEY_LEFTBRACE, + [SDL_SCANCODE_RIGHTBRACKET] = KEY_RIGHTBRACE, + [SDL_SCANCODE_RETURN] = KEY_ENTER, + [SDL_SCANCODE_LCTRL] = KEY_LEFTCTRL, + [SDL_SCANCODE_A] = KEY_A, + [SDL_SCANCODE_S] = KEY_S, + [SDL_SCANCODE_D] = KEY_D, + [SDL_SCANCODE_F] = KEY_F, + [SDL_SCANCODE_G] = KEY_G, + [SDL_SCANCODE_H] = KEY_H, + [SDL_SCANCODE_J] = KEY_J, + [SDL_SCANCODE_K] = KEY_K, + [SDL_SCANCODE_L] = KEY_L, [SDL_SCANCODE_SEMICOLON] = KEY_SEMICOLON, [SDL_SCANCODE_APOSTROPHE] = KEY_APOSTROPHE, [SDL_SCANCODE_GRAVE] = KEY_GRAVE, + [SDL_SCANCODE_LSHIFT] = KEY_LEFTSHIFT, + [SDL_SCANCODE_BACKSLASH] = KEY_BACKSLASH, + [SDL_SCANCODE_Z] = KEY_Z, + [SDL_SCANCODE_X] = KEY_X, + [SDL_SCANCODE_C] = KEY_C, + [SDL_SCANCODE_V] = KEY_V, + [SDL_SCANCODE_B] = KEY_B, + [SDL_SCANCODE_N] = KEY_N, + [SDL_SCANCODE_M] = KEY_M, [SDL_SCANCODE_COMMA] = KEY_COMMA, [SDL_SCANCODE_PERIOD] = KEY_DOT, [SDL_SCANCODE_SLASH] = KEY_SLASH, - + [SDL_SCANCODE_RSHIFT] = KEY_RIGHTSHIFT, + [SDL_SCANCODE_KP_MULTIPLY] = KEY_KPASTERISK, + [SDL_SCANCODE_LALT] = KEY_LEFTALT, + [SDL_SCANCODE_SPACE] = KEY_SPACE, [SDL_SCANCODE_CAPSLOCK] = KEY_CAPSLOCK, - [SDL_SCANCODE_F1] = KEY_F1, [SDL_SCANCODE_F2] = KEY_F2, [SDL_SCANCODE_F3] = KEY_F3, @@ -238,45 +240,65 @@ static const unsigned short sdl_to_keycode[SDL_NUM_SCANCODES] = { [SDL_SCANCODE_F8] = KEY_F8, [SDL_SCANCODE_F9] = KEY_F9, [SDL_SCANCODE_F10] = KEY_F10, - [SDL_SCANCODE_F11] = KEY_F11, - [SDL_SCANCODE_F12] = KEY_F12, - - [SDL_SCANCODE_PRINTSCREEN] = KEY_PRINT, - [SDL_SCANCODE_SCROLLLOCK] = KEY_SCROLLLOCK, - [SDL_SCANCODE_PAUSE] = KEY_PAUSE, - [SDL_SCANCODE_INSERT] = KEY_INSERT, - [SDL_SCANCODE_HOME] = KEY_HOME, - [SDL_SCANCODE_PAGEUP] = KEY_PAGEUP, - [SDL_SCANCODE_DELETE] = KEY_DELETE, - [SDL_SCANCODE_END] = KEY_END, - [SDL_SCANCODE_PAGEDOWN] = KEY_PAGEDOWN, - [SDL_SCANCODE_RIGHT] = KEY_RIGHT, - [SDL_SCANCODE_LEFT] = KEY_LEFT, - [SDL_SCANCODE_DOWN] = KEY_DOWN, - [SDL_SCANCODE_UP] = KEY_UP, - [SDL_SCANCODE_NUMLOCKCLEAR] = KEY_NUMLOCK, - [SDL_SCANCODE_KP_DIVIDE] = KEY_KPSLASH, - [SDL_SCANCODE_KP_MULTIPLY] = KEY_KPASTERISK, + [SDL_SCANCODE_SCROLLLOCK] = KEY_SCROLLLOCK, + [SDL_SCANCODE_KP_7] = KEY_KP7, + [SDL_SCANCODE_KP_8] = KEY_KP8, + [SDL_SCANCODE_KP_9] = KEY_KP9, [SDL_SCANCODE_KP_MINUS] = KEY_KPMINUS, + [SDL_SCANCODE_KP_4] = KEY_KP4, + [SDL_SCANCODE_KP_5] = KEY_KP5, + [SDL_SCANCODE_KP_6] = KEY_KP6, [SDL_SCANCODE_KP_PLUS] = KEY_KPPLUS, - [SDL_SCANCODE_KP_ENTER] = KEY_KPENTER, [SDL_SCANCODE_KP_1] = KEY_KP1, [SDL_SCANCODE_KP_2] = KEY_KP2, [SDL_SCANCODE_KP_3] = KEY_KP3, - [SDL_SCANCODE_KP_4] = KEY_KP4, - [SDL_SCANCODE_KP_5] = KEY_KP5, - [SDL_SCANCODE_KP_6] = KEY_KP6, - [SDL_SCANCODE_KP_7] = KEY_KP7, - [SDL_SCANCODE_KP_8] = KEY_KP8, - [SDL_SCANCODE_KP_9] = KEY_KP9, [SDL_SCANCODE_KP_0] = KEY_KP0, [SDL_SCANCODE_KP_PERIOD] = KEY_KPDOT, - - [SDL_SCANCODE_KP_EQUALS] = KEY_KPEQUAL, - [SDL_SCANCODE_KP_COMMA] = KEY_KPCOMMA, - + /* key 84 does not exist linux_input.h */ + [SDL_SCANCODE_LANG5] = KEY_ZENKAKUHANKAKU, + [SDL_SCANCODE_NONUSBACKSLASH] = KEY_102ND, + [SDL_SCANCODE_F11] = KEY_F11, + [SDL_SCANCODE_F12] = KEY_F12, + [SDL_SCANCODE_INTERNATIONAL1] = KEY_RO, + [SDL_SCANCODE_LANG3] = KEY_KATAKANA, + [SDL_SCANCODE_LANG4] = KEY_HIRAGANA, + [SDL_SCANCODE_INTERNATIONAL4] = KEY_HENKAN, + [SDL_SCANCODE_INTERNATIONAL2] = KEY_KATAKANAHIRAGANA, + [SDL_SCANCODE_INTERNATIONAL5] = KEY_MUHENKAN, + /* [SDL_SCANCODE_INTERNATIONAL5] -> [KEY_KPJPCOMMA] */ + [SDL_SCANCODE_KP_ENTER] = KEY_KPENTER, + [SDL_SCANCODE_RCTRL] = KEY_RIGHTCTRL, + [SDL_SCANCODE_KP_DIVIDE] = KEY_KPSLASH, [SDL_SCANCODE_SYSREQ] = KEY_SYSRQ, + [SDL_SCANCODE_RALT] = KEY_RIGHTALT, + /* KEY_LINEFEED */ + [SDL_SCANCODE_HOME] = KEY_HOME, + [SDL_SCANCODE_UP] = KEY_UP, + [SDL_SCANCODE_PAGEUP] = KEY_PAGEUP, + [SDL_SCANCODE_LEFT] = KEY_LEFT, + [SDL_SCANCODE_RIGHT] = KEY_RIGHT, + [SDL_SCANCODE_END] = KEY_END, + [SDL_SCANCODE_DOWN] = KEY_DOWN, + [SDL_SCANCODE_PAGEDOWN] = KEY_PAGEDOWN, + [SDL_SCANCODE_INSERT] = KEY_INSERT, + [SDL_SCANCODE_DELETE] = KEY_DELETE, + /* KEY_MACRO */ + [SDL_SCANCODE_MUTE] = KEY_MUTE, + [SDL_SCANCODE_VOLUMEDOWN] = KEY_VOLUMEDOWN, + [SDL_SCANCODE_VOLUMEUP] = KEY_VOLUMEUP, + [SDL_SCANCODE_POWER] = KEY_POWER, + [SDL_SCANCODE_KP_EQUALS] = KEY_KPEQUAL, + [SDL_SCANCODE_KP_PLUSMINUS] = KEY_KPPLUSMINUS, + [SDL_SCANCODE_PAUSE] = KEY_PAUSE, + /* KEY_SCALE */ + [SDL_SCANCODE_KP_COMMA] = KEY_KPCOMMA, + [SDL_SCANCODE_LANG1] = KEY_HANGUEL, + [SDL_SCANCODE_LANG2] = KEY_HANJA, + [SDL_SCANCODE_INTERNATIONAL3] = KEY_YEN, + [SDL_SCANCODE_LGUI] = KEY_LEFTMETA, + [SDL_SCANCODE_RGUI] = KEY_RIGHTMETA, + [SDL_SCANCODE_APPLICATION] = KEY_COMPOSE, }; int sandbox_sdl_scan_keys(int key[], int max_keys)