Commit 0b85d735 authored Mar 01, 2016 by Peter Maydell

Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160301-1' into staging



qapi: fix input-send-event and promote to stable

# gpg: Signature made Tue 01 Mar 2016 08:19:52 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-input-20160301-1:
  qapi: promote input-send-event to stable
  qapi: rename InputAxis values.
  qapi: rename input buttons
  qapi: switch x-input-send-event from console to device+head
  console: add & use qemu_console_lookup_by_device_name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents d9c7737e 6575ccdd

hw/input/hid.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -140,9 +140,9 @@ static void hid_pointer_event(DeviceState dev, QemuConsole src,
		case INPUT_EVENT_KIND_BTN:
		if (evt->u.btn->down) {
		e->buttons_state \|= bmap[evt->u.btn->button];
		if (evt->u.btn->button == INPUT_BUTTON_WHEELUP) {
		if (evt->u.btn->button == INPUT_BUTTON_WHEEL_UP) {
		e->dz--;
		} else if (evt->u.btn->button == INPUT_BUTTON_WHEELDOWN) {
		} else if (evt->u.btn->button == INPUT_BUTTON_WHEEL_DOWN) {
		e->dz++;
		}
		} else {

hw/input/ps2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -406,9 +406,9 @@ static void ps2_mouse_event(DeviceState dev, QemuConsole src,
		case INPUT_EVENT_KIND_BTN:
		if (evt->u.btn->down) {
		s->mouse_buttons \|= bmap[evt->u.btn->button];
		if (evt->u.btn->button == INPUT_BUTTON_WHEELUP) {
		if (evt->u.btn->button == INPUT_BUTTON_WHEEL_UP) {
		s->mouse_dz--;
		} else if (evt->u.btn->button == INPUT_BUTTON_WHEELDOWN) {
		} else if (evt->u.btn->button == INPUT_BUTTON_WHEEL_DOWN) {
		s->mouse_dz++;
		}
		} else {

hw/input/virtio-input-hid.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -143,8 +143,8 @@ static const unsigned int keymap_button[INPUT_BUTTON__MAX] = {
		[INPUT_BUTTON_LEFT] = BTN_LEFT,
		[INPUT_BUTTON_RIGHT] = BTN_RIGHT,
		[INPUT_BUTTON_MIDDLE] = BTN_MIDDLE,
		[INPUT_BUTTON_WHEELUP] = BTN_GEAR_UP,
		[INPUT_BUTTON_WHEELDOWN] = BTN_GEAR_DOWN,
		[INPUT_BUTTON_WHEEL_UP] = BTN_GEAR_UP,
		[INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN,
		};

		static const unsigned int axismap_rel[INPUT_AXIS__MAX] = {

include/ui/console.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -378,6 +378,8 @@ void graphic_hw_gl_block(QemuConsole *con, bool block);

		QemuConsole *qemu_console_lookup_by_index(unsigned int index);
		QemuConsole qemu_console_lookup_by_device(DeviceState dev, uint32_t head);
		QemuConsole qemu_console_lookup_by_device_name(const char device_id,
		uint32_t head, Error **errp);
		bool qemu_console_is_visible(QemuConsole *con);
		bool qemu_console_is_graphic(QemuConsole *con);
		bool qemu_console_is_fixedsize(QemuConsole *con);

monitor.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1375,7 +1375,7 @@ static void hmp_mouse_move(Monitor mon, const QDict qdict)
		if (dz_str) {
		dz = strtol(dz_str, NULL, 0);
		if (dz != 0) {
		button = (dz > 0) ? INPUT_BUTTON_WHEELUP : INPUT_BUTTON_WHEELDOWN;
		button = (dz > 0) ? INPUT_BUTTON_WHEEL_UP : INPUT_BUTTON_WHEEL_DOWN;
		qemu_input_queue_btn(NULL, button, true);
		qemu_input_event_sync();
		qemu_input_queue_btn(NULL, button, false);