Commit d86766a9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 81092348 a923b471

qapi/ui.json

+2 −1
Original line number Diff line number Diff line
@@ -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:

ui/curses.c

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ static wint_t console_getch(enum maybe_keycode *maybe_keycode) 
    case ERR:

        ret = -1;

        break;

    default:

        abort();

    }

    return ret;

}

ui/input-linux.c

+4 −0
Original line number Diff line number Diff line
@@ -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];