From: Markus Armbruster Subject: Re: Re: PVFB wheel events (z-axis) Date: Thu, 28 Feb 2008 13:59:14 +0100 Message-ID: <87bq61z17h.fsf@pike.pond.sub.org> References: <87tzk19xqf.fsf@pike.pond.sub.org> <47C0287F.5070901@novell.com> <87bq656tzb.fsf@pike.pond.sub.org> <47C2FE4D.1030502@novell.com> <87prui1j8n.fsf@pike.pond.sub.org> <87pruhzc6j.fsf@pike.pond.sub.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: In-Reply-To: <87pruhzc6j.fsf@pike.pond.sub.org> (Markus Armbruster's message of "Thu\, 28 Feb 2008 10\:02\:12 +0100") List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Pat Campbell Cc: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Buddy patch for ioemu: Rename struct xenkbd_position member abs_z to rel_z Z-axis motion is relative, not absolute. diff -r 2a8eaba24bf0 tools/ioemu/hw/xenfb.c --- a/tools/ioemu/hw/xenfb.c Tue Feb 26 15:11:51 2008 +0000 +++ b/tools/ioemu/hw/xenfb.c Thu Feb 28 13:57:13 2008 +0100 @@ -592,7 +592,8 @@ static int xenfb_send_key(struct xenfb * } /* Send a relative mouse movement event */ -static int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y, int rel_z) +static int xenfb_send_motion(struct xenfb *xenfb, + int rel_x, int rel_y, int rel_z) { union xenkbd_in_event event; @@ -606,7 +607,8 @@ static int xenfb_send_motion(struct xenf } /* Send an absolute mouse movement event */ -static int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y, int abs_z) +static int xenfb_send_position(struct xenfb *xenfb, + int abs_x, int abs_y, int rel_z) { union xenkbd_in_event event; @@ -614,7 +616,7 @@ static int xenfb_send_position(struct xe event.type = XENKBD_TYPE_POS; event.pos.abs_x = abs_x; event.pos.abs_y = abs_y; - event.pos.abs_z = abs_z; + event.pos.rel_z = rel_z; return xenfb_kbd_event(xenfb, &event); } diff -r 2a8eaba24bf0 xen/include/public/io/kbdif.h --- a/xen/include/public/io/kbdif.h Tue Feb 26 15:11:51 2008 +0000 +++ b/xen/include/public/io/kbdif.h Thu Feb 28 13:57:13 2008 +0100 @@ -65,7 +65,7 @@ struct xenkbd_position uint8_t type; /* XENKBD_TYPE_POS */ int32_t abs_x; /* absolute X position (in FB pixels) */ int32_t abs_y; /* absolute Y position (in FB pixels) */ - int32_t abs_z; /* absolute Z position (wheel) */ + int32_t rel_z; /* relative Z motion (wheel) */ }; #define XENKBD_IN_EVENT_SIZE 40