Mailing List Archive

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);

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel