andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'whot/for-keith'

Browse Source
This commit is contained in:
Keith Packard 2014-04-29 09:37:37 -07:00
commit 6bd7ad9144
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dix/devices.c
View File

@ -1475,7 +1475,6 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
PtrFeedbackPtr feedc;
BUG_RETURN_VAL(dev == NULL, FALSE);
BUG_RETURN_VAL(dev->ptrfeed != NULL, FALSE);
feedc = malloc(sizeof(PtrFeedbackClassRec));
if (!feedc)
@ -1519,7 +1518,6 @@ InitStringFeedbackClassDeviceStruct(DeviceIntPtr dev,
StringFeedbackPtr feedc;
BUG_RETURN_VAL(dev == NULL, FALSE);
BUG_RETURN_VAL(dev->stringfeed != NULL, FALSE);
feedc = malloc(sizeof(StringFeedbackClassRec));
if (!feedc)
@ -1556,7 +1554,6 @@ InitBellFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
BellFeedbackPtr feedc;
BUG_RETURN_VAL(dev == NULL, FALSE);
BUG_RETURN_VAL(dev->bell != NULL, FALSE);
feedc = malloc(sizeof(BellFeedbackClassRec));
if (!feedc)
@ -1578,7 +1575,6 @@ InitLedFeedbackClassDeviceStruct(DeviceIntPtr dev, LedCtrlProcPtr controlProc)
LedFeedbackPtr feedc;
BUG_RETURN_VAL(dev == NULL, FALSE);
BUG_RETURN_VAL(dev->leds != NULL, FALSE);
feedc = malloc(sizeof(LedFeedbackClassRec));
if (!feedc)
@ -1601,7 +1597,6 @@ InitIntegerFeedbackClassDeviceStruct(DeviceIntPtr dev,
IntegerFeedbackPtr feedc;
BUG_RETURN_VAL(dev == NULL, FALSE);
BUG_RETURN_VAL(dev->intfeed != NULL, FALSE);
feedc = malloc(sizeof(IntegerFeedbackClassRec));
if (!feedc)

6
dix/events.c
View File

@ -4260,12 +4260,6 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
thisDev);
}
if (!deliveries) {
/* XXX: In theory, we could pass the internal events through to
* everything and only convert just before hitting the wire. We can't
* do that yet, so DGE is the last stop for internal events. From here
* onwards, we deal with core/XI events.
*/
sendCore = (IsMaster(thisDev) && thisDev->coreEvents);
/* try core event */
if ((sendCore && grab->grabtype == CORE) || grab->grabtype != CORE)