xserver: Branch 'master' - 7 commits
Peter Hutterer
whot at kemper.freedesktop.org
Thu Apr 9 04:05:28 PDT 2009
Xi/exevents.c | 9 +++++----
dix/devices.c | 6 +++---
hw/xfree86/common/xf86DGA.c | 7 +++++--
hw/xfree86/common/xf86Events.c | 2 +-
hw/xfree86/common/xf86Xinput.c | 10 +++++-----
mi/mi.h | 7 +++++++
mi/mipointer.c | 2 +-
mi/mipointer.h | 2 +-
8 files changed, 28 insertions(+), 17 deletions(-)
New commits:
commit fcc19e673e3ef33d64916dd933853f8aa667c4d7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Apr 9 20:27:00 2009 +1000
mi: fix wrong (*EnqueueEvent) declaration in miPointerScreenFuncRec.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 83277e4..8b13f08 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -82,7 +82,7 @@ typedef struct _miPointerScreenFuncRec {
);
void (*EnqueueEvent)(
DeviceIntPtr /* pDev */,
- xEventPtr /* event */
+ InternalEvent* /* event */
);
void (*NewEventScreen)(
DeviceIntPtr /* pDev */,
commit 4fee979d0632751d3d54d2115e84e9654edf0622
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Apr 9 19:11:27 2009 +1000
Xi: silence compiler warnings about "wrong" event types.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 29dceca..4788665 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1002,12 +1002,13 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
if (grab)
- DeliverGrabbedEvent(event, device, deactivateDeviceGrab);
+ DeliverGrabbedEvent((InternalEvent*)event, device, deactivateDeviceGrab);
else if (device->focus && !IsPointerEvent((InternalEvent*)ev))
- DeliverFocusedEvent(device, event, GetSpriteWindow(device));
+ DeliverFocusedEvent(device, (InternalEvent*)event,
+ GetSpriteWindow(device));
else
- DeliverDeviceEvents(GetSpriteWindow(device), event, NullGrab,
- NullWindow, device);
+ DeliverDeviceEvents(GetSpriteWindow(device), (InternalEvent*)event,
+ NullGrab, NullWindow, device);
if (deactivateDeviceGrab == TRUE)
(*device->deviceGrab.DeactivateGrab) (device);
commit 6b467bf879eeb77d167ef321e6dda97ca9d7010a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Apr 9 08:42:06 2009 +1000
xfree86: shut up compiler warnings - typecast to InternalEvent
Reported-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 4f84a4c..19120ce 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -428,7 +428,7 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
sigstate = xf86BlockSIGIO ();
nevents = GetKeyboardEvents(xf86Events, pDev, KeyRelease, i);
for (j = 0; j < nevents; j++)
- mieqEnqueue(pDev, (xf86Events + j)->event);
+ mieqEnqueue(pDev, (InternalEvent*)(xf86Events + j)->event);
xf86UnblockSIGIO(sigstate);
}
}
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 3a56b49..96aff15 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -792,7 +792,7 @@ xf86PostMotionEventP(DeviceIntPtr device,
/* Don't post core motion events for devices not registered to send
* drag events. */
if (xE->u.u.type != MotionNotify || drag) {
- mieqEnqueue(device, (xf86Events + i)->event);
+ mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
}
}
}
@@ -825,7 +825,7 @@ xf86PostProximityEvent(DeviceIntPtr device,
is_in ? ProximityIn : ProximityOut,
first_valuator, num_valuators, valuators);
for (i = 0; i < nevents; i++)
- mieqEnqueue(device, (xf86Events + i)->event);
+ mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
}
@@ -868,7 +868,7 @@ xf86PostButtonEvent(DeviceIntPtr device,
first_valuator, num_valuators, valuators);
for (i = 0; i < nevents; i++)
- mieqEnqueue(device, (xf86Events + i)->event);
+ mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
}
@@ -915,7 +915,7 @@ xf86PostKeyEvent(DeviceIntPtr device,
}
for (i = 0; i < nevents; i++)
- mieqEnqueue(device, (xf86Events + i)->event);
+ mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
}
void
@@ -944,7 +944,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device,
is_down ? KeyPress : KeyRelease, key_code);
for (i = 0; i < nevents; i++)
- mieqEnqueue(device, (xf86Events + i)->event);
+ mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
}
LocalDevicePtr
commit 8a2a184da78a3e9cbeae8290431f40d5ec7f3636
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Apr 9 08:06:32 2009 +1000
xfree86: fix use of uninitialized variable in DGAProcessPointerEvent.
Reported-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 4cc530a..f83bcd5 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -1088,7 +1088,6 @@ static void
DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
{
ButtonClassPtr butc = mouse->button;
- int coreEquiv;
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
DeviceEvent ev;
@@ -1107,7 +1106,11 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
if (pScreenPriv->client)
{
dgaEvent de;
- de.u.u.type = *XDGAEventBase + GetCoreType((InternalEvent*)&ev);
+ int coreEquiv;
+
+ coreEquiv = GetCoreType((InternalEvent*)&ev);
+
+ de.u.u.type = *XDGAEventBase + coreEquiv;
de.u.u.detail = event->detail;
de.u.event.time = event->time;
de.u.event.dx = 0;
commit 011cee3103c146c8096b7098a27993f99e07a824
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Apr 9 08:14:39 2009 +1000
dix: fix dev/keybd variable mixup.
Reported-by: Eric Anhold <eric at anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/devices.c b/dix/devices.c
index 4a36669..b9d1c85 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1925,14 +1925,14 @@ ProcBell(ClientPtr client)
else
newpercent = base - newpercent + stuff->percent;
- for (keybd = inputInfo.devices; keybd; keybd = keybd->next) {
+ for (dev = inputInfo.devices; dev; dev = dev->next) {
if ((dev == keybd || (!dev->isMaster && dev->u.master == keybd)) &&
- keybd->kbdfeed && keybd->kbdfeed->BellProc) {
+ dev->kbdfeed && dev->kbdfeed->BellProc) {
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);
if (rc != Success)
return rc;
- XkbHandleBell(FALSE, FALSE, keybd, newpercent,
+ XkbHandleBell(FALSE, FALSE, dev, newpercent,
&dev->kbdfeed->ctrl, 0, None, NULL, client);
}
}
commit 630a6e9d14ffbf036fa72f580c72c0172d7c20bd
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Apr 9 08:40:20 2009 +1000
mi: fix compiler warning - explicitly typecast to InternalEvent.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/mi/mipointer.c b/mi/mipointer.c
index e3a4656..3d34481 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -590,7 +590,7 @@ miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
darwinEvents_lock();
#endif
for (i = 0; i < nevents; i++)
- mieqEnqueue(pDev, events[i].event);
+ mieqEnqueue(pDev, (InternalEvent*)events[i].event);
#ifdef XQUARTZ
darwinEvents_unlock();
#endif
commit e3bb7dea06b9ab0e30d801bf6c3a59f94290aaed
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Apr 9 19:07:36 2009 +1000
mi: add prototype for CopyGetMasterEvent.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/mi/mi.h b/mi/mi.h
index 076cea7..182cea5 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -221,6 +221,13 @@ extern _X_EXPORT void mieqProcessInputEvents(
void
);
+extern void CopyGetMasterEvent(
+ DeviceIntPtr /* mdev */,
+ DeviceIntPtr /* sdev */,
+ InternalEvent* /* original */,
+ EventListPtr /* master */
+);
+
/**
* Custom input event handler. If you need to process input events in some
* other way than the default path, register an input event handler for the
More information about the xorg-commit
mailing list