merge ^/branches/released .

3 files changed, 43 insertions, 55 deletions

diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index 136d3ac45..d6eddd0f4 100644
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -5586,6 +5586,7 @@ ProcXkbGetKbdByName(ClientPtr client)
 {

     DeviceIntPtr 		dev;

     DeviceIntPtr                tmpd;

+    DeviceIntPtr                master;

     xkbGetKbdByNameReply 	rep = {0};

     xkbGetMapReply		mrep = {0};

     xkbGetCompatMapReply	crep = {0};

@@ -5613,6 +5614,7 @@ ProcXkbGetKbdByName(ClientPtr client)
     memset(&mrep,0,sizeof(mrep));  //MH

     

     CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, access_mode);

+    master = GetMaster(dev, MASTER_KEYBOARD);

 

     xkb = dev->key->xkbInfo->desc;

     status= Success;

@@ -5871,25 +5873,6 @@ ProcXkbGetKbdByName(ClientPtr client)
 	}

 	xkb->ctrls->num_groups= nTG;

 

-        for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {

-            if ((tmpd == dev) || (!IsMaster(tmpd) && GetMaster(tmpd, MASTER_KEYBOARD) == dev)) {

-                if (tmpd != dev)

-                    XkbCopyDeviceKeymap(tmpd, dev);

-

-                if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {

-                    old_sli = tmpd->kbdfeed->xkb_sli;

-                    tmpd->kbdfeed->xkb_sli = NULL;

-                    sli = XkbAllocSrvLedInfo(tmpd, tmpd->kbdfeed, NULL, 0);

-                    if (sli) {

-                        sli->explicitState = old_sli->explicitState;

-                        sli->effectiveState = old_sli->effectiveState;

-                    }

-                    tmpd->kbdfeed->xkb_sli = sli;

-                    XkbFreeSrvLedInfo(old_sli);

-                }

-            }

-        }

-

 	nkn.deviceID= nkn.oldDeviceID= dev->id;

 	nkn.minKeyCode= new->min_key_code;

 	nkn.maxKeyCode= new->max_key_code;

@@ -5902,13 +5885,29 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    nkn.changed|= XkbNKN_GeometryMask;

 	XkbSendNewKeyboardNotify(dev,&nkn);

 

-	if (!IsMaster(dev)) {

-	    DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD);

-	    if (master && master->lastSlave == dev) {

-		XkbCopyDeviceKeymap(master, dev);

-		XkbSendNewKeyboardNotify(dev,&nkn);

-	    }

-	}

+        /* Update the map and LED info on the device itself, as well as

+         * any slaves if it's an MD, or its MD if it's an SD and was the

+         * last device used on that MD. */

+        for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {

+            if (tmpd != dev && GetMaster(tmpd, MASTER_KEYBOARD) != dev &&

+                (tmpd != master || dev != master->lastSlave))

+                continue;

+

+            if (tmpd != dev)

+                XkbCopyDeviceKeymap(tmpd, dev);

+

+            if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {

+                old_sli = tmpd->kbdfeed->xkb_sli;

+                tmpd->kbdfeed->xkb_sli = NULL;

+                sli = XkbAllocSrvLedInfo(tmpd, tmpd->kbdfeed, NULL, 0);

+                if (sli) {

+                    sli->explicitState = old_sli->explicitState;

+                    sli->effectiveState = old_sli->effectiveState;

+                }

+                tmpd->kbdfeed->xkb_sli = sli;

+                XkbFreeSrvLedInfo(old_sli);

+            }

+        }

     }

     if ((new!=NULL)&&(new!=xkb)) {

 	XkbFreeKeyboard(new,XkbAllComponentsMask,TRUE);

diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c
index 19d7a54f9..3c201ebd9 100644
--- a/xorg-server/xkb/xkbActions.c
+++ b/xorg-server/xkb/xkbActions.c
@@ -1351,7 +1351,7 @@ static void
 InjectPointerKeyEvents(DeviceIntPtr dev, int type, int button, int flags, ValuatorMask *mask)

 {

     ScreenPtr           pScreen;

-    EventListPtr        events;

+    InternalEvent*      events;

     int                 nevents, i;

     DeviceIntPtr        ptr, mpointer, lastSlave = NULL;

     Bool                saveWait;

@@ -1377,7 +1377,7 @@ InjectPointerKeyEvents(DeviceIntPtr dev, int type, int button, int flags, Valuat
     OsReleaseSignals();

 

     for (i = 0; i < nevents; i++)

-        mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL);

+        mieqProcessDeviceEvent(ptr, &events[i], NULL);

 

     FreeEventList(events, GetMaximumEventsNum());

 

diff --git a/xorg-server/xkb/xkbEvents.c b/xorg-server/xkb/xkbEvents.c
index de85f4f1f..132ccd302 100644
--- a/xorg-server/xkb/xkbEvents.c
+++ b/xorg-server/xkb/xkbEvents.c
@@ -88,11 +88,15 @@ XkbSendLegacyMapNotify(DeviceIntPtr kbd, CARD16 xkb_event, CARD16 changed,
         if (!clients[i] || clients[i]->clientState != ClientStateRunning)

             continue;

 

-        /* Ignore clients which will have already received this.

-         * Inconsistent with themselves, but consistent with previous

-         * behaviour.*/

-        if (xkb_event == XkbMapNotify && (clients[i]->mapNotifyMask & changed))

+        /* XKB allows clients to restrict the MappingNotify events sent to

+         * them.  This was broken for three years.  Sorry. */

+        if (xkb_event == XkbMapNotify &&

+            (clients[i]->xkbClientFlags & _XkbClientInitialized) &&

+            !(clients[i]->mapNotifyMask & changed))

             continue;

+        /* Emulate previous server behaviour: any client which has activated

+         * XKB will not receive core events emulated from a NewKeyboardNotify

+         * at all. */

         if (xkb_event == XkbNewKeyboardNotify &&

             (clients[i]->xkbClientFlags & _XkbClientInitialized))

             continue;

@@ -164,9 +168,6 @@ XkbSendNewKeyboardNotify(DeviceIntPtr kbd,xkbNewKeyboardNotify *pNKN)
         if (!(clients[i]->newKeyboardNotifyMask & changed))

             continue;

 

-        if (!XIShouldNotify(clients[i], kbd))

-            continue;

-

         pNKN->sequenceNumber = clients[i]->sequence;

         pNKN->time = time;

         pNKN->changed = changed;

@@ -232,8 +233,7 @@ register CARD16	changed,bState;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->stateNotifyMask&changed) &&

-            XIShouldNotify(interest->client,kbd)) {

+	    (interest->stateNotifyMask&changed)) {

 	    pSN->sequenceNumber = interest->client->sequence;

 	    pSN->time = time;

 	    pSN->changed = changed;

@@ -280,9 +280,6 @@ XkbSendMapNotify(DeviceIntPtr kbd, xkbMapNotify *pMN)
         if (!(clients[i]->mapNotifyMask & changed))

             continue;

 

-        if (!XIShouldNotify(clients[i], kbd))

-            continue;

-

         pMN->time = time;

         pMN->sequenceNumber = clients[i]->sequence;

         pMN->changed = changed;

@@ -401,8 +398,7 @@ Time 		 	time = 0;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->ctrlsNotifyMask&changedControls) &&

-            XIShouldNotify(interest->client, kbd)) {

+	    (interest->ctrlsNotifyMask&changedControls)) {

 	    if (!initialized) {

 		pCN->type = XkbEventCode + XkbEventBase;

 		pCN->xkbType = XkbControlsNotify;

@@ -450,7 +446,6 @@ CARD32		state,changed;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-            XIShouldNotify(interest->client, kbd) &&

 	    (((xkbType==XkbIndicatorStateNotify)&&

 				(interest->iStateNotifyMask&changed))||

 	     ((xkbType==XkbIndicatorMapNotify)&&

@@ -534,8 +529,7 @@ XID		winID = 0;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->bellNotifyMask) &&

-            XIShouldNotify(interest->client,kbd)) {

+	    (interest->bellNotifyMask)) {

 	    if (!initialized) {

 		time = GetTimeInMillis();

 		bn.type = XkbEventCode + XkbEventBase;

@@ -589,8 +583,7 @@ CARD16		sk_delay,db_delay;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->accessXNotifyMask&(1<<pEv->detail)) &&

-            XIShouldNotify(interest->client, kbd)) {

+	    (interest->accessXNotifyMask&(1<<pEv->detail))) {

 	    if (!initialized) {

 		pEv->type = XkbEventCode + XkbEventBase;

 		pEv->xkbType = XkbAccessXNotify;

@@ -637,8 +630,7 @@ CARD32		changedIndicators;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->namesNotifyMask&pEv->changed) &&

-            XIShouldNotify(interest->client, kbd)) {

+	    (interest->namesNotifyMask&pEv->changed)) {

 	    if (!initialized) {

 		pEv->type = XkbEventCode + XkbEventBase;

 		pEv->xkbType = XkbNamesNotify;

@@ -683,8 +675,7 @@ CARD16		firstSI = 0, nSI = 0, nTotalSI = 0;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->compatNotifyMask) &&

-            XIShouldNotify(interest->client, kbd)) {

+	    (interest->compatNotifyMask)) {

 	    if (!initialized) {

 		pEv->type = XkbEventCode + XkbEventBase;

 		pEv->xkbType = XkbCompatMapNotify;

@@ -736,8 +727,7 @@ Time 		 time = 0;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->actionMessageMask) &&

-            XIShouldNotify(interest->client, kbd)) {

+	    (interest->actionMessageMask)) {

 	    if (!initialized) {

 		pEv->type = XkbEventCode + XkbEventBase;

 		pEv->xkbType = XkbActionMessage;

@@ -783,8 +773,7 @@ CARD16		 reason;
 	if ((!interest->client->clientGone) &&

 	    (interest->client->requestVector != InitialVector) &&

 	    (interest->client->xkbClientFlags&_XkbClientInitialized) &&

-	    (interest->extDevNotifyMask&reason) &&

-            XIShouldNotify(interest->client, dev)) {

+	    (interest->extDevNotifyMask&reason)) {

 	    if (!initialized) {

 		pEv->type = XkbEventCode + XkbEventBase;

 		pEv->xkbType = XkbExtensionDeviceNotify;