Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-1' int…
Browse files Browse the repository at this point in the history
…o staging

console: multiwindow support for text terminal QemuConsoles
console: small fixes

# gpg: Signature made Mon 26 May 2014 09:17:27 BST using RSA key ID D3E87138
# gpg: Can't check signature: public key not found

* remotes/kraxel/tags/pull-console-1:
  console: add kbd_put_keysym_console
  console: rework text terminal cursor logic
  console: update text terminal surface unconditionally
  console: nicer initial screen
  console: Abort on property access errors

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
pm215 committed May 28, 2014
2 parents 109519f + 3f9a6e8 commit 53651ec
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 116 deletions.
1 change: 1 addition & 0 deletions include/ui/console.h
Expand Up @@ -81,6 +81,7 @@ void do_mouse_set(Monitor *mon, const QDict *qdict);
#define QEMU_KEY_CTRL_PAGEUP 0xe406
#define QEMU_KEY_CTRL_PAGEDOWN 0xe407

void kbd_put_keysym_console(QemuConsole *s, int keysym);
void kbd_put_keysym(int keysym);

/* consoles */
Expand Down

0 comments on commit 53651ec

Please sign in to comment.