dix: switch the dev->deviceGrab.activeGrab from GrabRec to GrabPtr
This breaks the input ABI. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
parent
b601ea769f
commit
4bc2761ad5
|
@ -73,6 +73,7 @@ SOFTWARE.
|
|||
#include "dixevents.h"
|
||||
#include "mipointer.h"
|
||||
#include "eventstr.h"
|
||||
#include "dixgrabs.h"
|
||||
|
||||
#include <X11/extensions/XI.h>
|
||||
#include <X11/extensions/XI2.h>
|
||||
|
@ -273,6 +274,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
|
|||
dev->deviceGrab.grabTime = currentTime;
|
||||
dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
|
||||
dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
|
||||
dev->deviceGrab.activeGrab = AllocGrab();
|
||||
|
||||
XkbSetExtension(dev, ProcessKeyboardEvent);
|
||||
|
||||
|
@ -941,6 +943,7 @@ CloseDevice(DeviceIntPtr dev)
|
|||
}
|
||||
}
|
||||
|
||||
FreeGrab(dev->deviceGrab.activeGrab);
|
||||
free(dev->deviceGrab.sync.event);
|
||||
free(dev->config_info); /* Allocated in xf86ActivateDevice. */
|
||||
free(dev->last.scroll);
|
||||
|
|
|
@ -1509,8 +1509,8 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
|
|||
grabinfo->grabTime = time;
|
||||
if (grab->cursor)
|
||||
grab->cursor->refcnt++;
|
||||
CopyGrab(&grabinfo->activeGrab, grab);
|
||||
grabinfo->grab = &grabinfo->activeGrab;
|
||||
CopyGrab(grabinfo->activeGrab, grab);
|
||||
grabinfo->grab = grabinfo->activeGrab;
|
||||
grabinfo->fromPassiveGrab = isPassive;
|
||||
grabinfo->implicitGrab = autoGrab & ImplicitGrabMask;
|
||||
PostNewCursor(mouse);
|
||||
|
@ -1586,8 +1586,8 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool pass
|
|||
grabinfo->grabTime = syncEvents.time;
|
||||
else
|
||||
grabinfo->grabTime = time;
|
||||
CopyGrab(&grabinfo->activeGrab, grab);
|
||||
grabinfo->grab = &grabinfo->activeGrab;
|
||||
CopyGrab(grabinfo->activeGrab, grab);
|
||||
grabinfo->grab = grabinfo->activeGrab;
|
||||
grabinfo->fromPassiveGrab = passive;
|
||||
grabinfo->implicitGrab = passive & ImplicitGrabMask;
|
||||
CheckGrabForSyncs(keybd, (Bool)grab->keyboardMode, (Bool)grab->pointerMode);
|
||||
|
|
|
@ -451,7 +451,7 @@ typedef struct _GrabInfoRec {
|
|||
TimeStamp grabTime;
|
||||
Bool fromPassiveGrab; /* true if from passive grab */
|
||||
Bool implicitGrab; /* implicit from ButtonPress */
|
||||
GrabRec activeGrab;
|
||||
GrabPtr activeGrab;
|
||||
GrabPtr grab;
|
||||
CARD8 activatingKey;
|
||||
void (*ActivateGrab) (
|
||||
|
|
Loading…
Reference in New Issue