From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Cc: xen-devel@lists.xensource.com, keir.fraser@eu.citrix.com
Subject: [PATCH] stubdom [Re: PVFB wheel events (z-axis)]
Date: Thu, 28 Feb 2008 13:59:36 +0000 [thread overview]
Message-ID: <20080228135936.GF4477@implementation.uk.xensource.com> (raw)
In-Reply-To: <87bq61z17h.fsf@pike.pond.sub.org>
stubdom: Fix compilation after abs_z to rel_z change
diff -r 5f7bfdeb8748 extras/mini-os/kernel.c
--- a/extras/mini-os/kernel.c Thu Feb 28 13:44:28 2008 +0000
+++ b/extras/mini-os/kernel.c Thu Feb 28 13:55:57 2008 +0000
@@ -360,13 +360,13 @@ static void kbdfront_thread(void *p)
refresh_cursor(x, y);
break;
case XENKBD_TYPE_POS:
- printk("pos x:%d y:%d z:%d\n",
+ printk("pos x:%d y:%d dz:%d\n",
event.pos.abs_x,
event.pos.abs_y,
- event.pos.abs_z);
+ event.pos.rel_z);
x = event.pos.abs_x;
y = event.pos.abs_y;
- z = event.pos.abs_z;
+ z = event.pos.rel_z;
clip_cursor(&x, &y);
refresh_cursor(x, y);
break;
diff -r 5f7bfdeb8748 tools/ioemu/hw/xenfb.c
--- a/tools/ioemu/hw/xenfb.c Thu Feb 28 13:44:28 2008 +0000
+++ b/tools/ioemu/hw/xenfb.c Thu Feb 28 13:55:57 2008 +0000
@@ -1230,7 +1230,7 @@ static void xenfb_kbd_handler(void *opaq
int n, i;
DisplayState *s = opaque;
static int buttons;
- static int x, y, z;
+ static int x, y;
n = kbdfront_receive(kbd_dev, buf, KBD_NUM_BATCH);
for (i = 0; i < n; i++) {
@@ -1244,7 +1244,6 @@ static void xenfb_kbd_handler(void *opaq
{
int new_x = buf[i].pos.abs_x;
int new_y = buf[i].pos.abs_y;
- int new_z = buf[i].pos.abs_z;
if (new_x >= s->width)
new_x = s->width - 1;
if (new_y >= s->height)
@@ -1253,18 +1252,17 @@ static void xenfb_kbd_handler(void *opaq
kbd_mouse_event(
new_x * 0x7FFF / (s->width - 1),
new_y * 0x7FFF / (s->height - 1),
- new_z,
+ buf[i].pos.rel_z,
buttons);
} else {
kbd_mouse_event(
new_x - x,
new_y - y,
- new_z - z,
+ buf[i].pos.rel_z,
buttons);
}
x = new_x;
y = new_y;
- z = new_z;
break;
}
@@ -1289,7 +1287,7 @@ static void xenfb_kbd_handler(void *opaq
kbd_mouse_event(
x * 0x7FFF / s->width,
y * 0x7FFF / s->height,
- z,
+ 0,
buttons);
else
kbd_mouse_event(0, 0, 0, buttons);
prev parent reply other threads:[~2008-02-28 13:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-22 8:55 PVFB wheel events (z-axis) Markus Armbruster
2008-02-23 14:06 ` Pat Campbell
2008-02-25 13:33 ` Markus Armbruster
2008-02-25 17:43 ` Pat Campbell
2008-02-27 16:01 ` Markus Armbruster
2008-02-28 9:02 ` Markus Armbruster
2008-02-28 10:35 ` Keir Fraser
2008-02-28 12:59 ` Markus Armbruster
2008-02-28 13:59 ` Samuel Thibault [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080228135936.GF4477@implementation.uk.xensource.com \
--to=samuel.thibault@eu.citrix.com \
--cc=keir.fraser@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.