curses: assert get_wch return value is okay
input-linux: add shift+shift as a grab toggle -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJdXh0IAAoJEEy22O7T6HE4q7oP/iFa30rrobnmIJx9iUpZdM5k PMorSipenRUxr8FCPUDTk+vPRX8ZusnCoqx2OI/nn6R2jhXQyk/NNbCK55M8HGLL Iu3KFata4R0PkSlIcwvXg8knwLZv+7M4jWGhjKyNfsmpXS1niqAEHZoHty2/nR6+ 3aKfsHhNiSV0VeAEfrJwj/o0kWgDNtTffxIiOBvdQRDblMsV56vsjzKhlEoeA2zk krgkUAUWgRmHIVHHr1eky35v7N8qFK8/h/0DrHnvEhdEnMnNkthgZ2cJqSrKEFbU sxvigmTDo5/cmVqWeBxgq/MhEXMr804DxAShMj7RQ9qr5KBixB1g/m1iRWwIPOEV EgDqhJ2ugthp3/96imlJviHnq1Yl1YLye+Keh12P30zN24jXf7RaCEaZM4UZYTmM 8FzlDmeMELI+ZlgXbXPgcPrIiiNXi0O+Gb9AhYr82hE0bS3UZuWwSzJjf3I6tu13 3TlujdRBE67w0sBy+qwLeEBgrXZcmbdi3pLvrTxA06PCxBgaLTYfv+dpUCzj5YYQ 9RomjmyFBVDWV5t+TZQNswiFaJLPsjyBx11buLwikyhfPf0z1RzO2G3vlNAYej9b 7jdgU9fq1W0YD7gNooXlF24dCwx7OAQd1czw24flP7bgXJCDPcJ+C4TmjwnqkLsn +UEo2iZE3A1495KU0B0T =m5o3 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190822-pull-request' into staging curses: assert get_wch return value is okay input-linux: add shift+shift as a grab toggle # gpg: Signature made Thu 22 Aug 2019 05:41:44 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20190822-pull-request: input-linux: add shift+shift as a grab toggle curses: assert get_wch return value is okay Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
d86766a9d0
@ -1025,7 +1025,8 @@
|
||||
#
|
||||
##
|
||||
{ 'enum': 'GrabToggleKeys',
|
||||
'data': [ 'ctrl-ctrl', 'alt-alt', 'meta-meta', 'scrolllock', 'ctrl-scrolllock' ] }
|
||||
'data': [ 'ctrl-ctrl', 'alt-alt', 'shift-shift','meta-meta', 'scrolllock',
|
||||
'ctrl-scrolllock' ] }
|
||||
|
||||
##
|
||||
# @DisplayGTK:
|
||||
|
@ -225,6 +225,8 @@ static wint_t console_getch(enum maybe_keycode *maybe_keycode)
|
||||
case ERR:
|
||||
ret = -1;
|
||||
break;
|
||||
default:
|
||||
abort();
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
@ -113,6 +113,10 @@ static bool input_linux_check_toggle(InputLinux *il)
|
||||
return il->keydown[KEY_LEFTALT] &&
|
||||
il->keydown[KEY_RIGHTALT];
|
||||
|
||||
case GRAB_TOGGLE_KEYS_SHIFT_SHIFT:
|
||||
return il->keydown[KEY_LEFTSHIFT] &&
|
||||
il->keydown[KEY_RIGHTSHIFT];
|
||||
|
||||
case GRAB_TOGGLE_KEYS_META_META:
|
||||
return il->keydown[KEY_LEFTMETA] &&
|
||||
il->keydown[KEY_RIGHTMETA];
|
||||
|
Loading…
Reference in New Issue
Block a user