frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input: don't use typecasts to access members of InternalEvent. 

To avoid confusion, the member names are now postfixed with _event.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-09-18 10:03:02 +10:00
parent 693d4fdb1c
commit 90aa0e4a49
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xi/exevents.c
View File

@ -944,7 +944,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
int ret = 0; int ret = 0;
int state, i; int state, i;
DeviceIntPtr mouse = NULL, kbd = NULL; DeviceIntPtr mouse = NULL, kbd = NULL;
DeviceEvent *event = (DeviceEvent*)ev; DeviceEvent *event = &ev->device_event;
CHECKEVENT(ev); CHECKEVENT(ev);
@ -954,7 +954,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
ev->any.type == ET_RawButtonRelease || ev->any.type == ET_RawButtonRelease ||
ev->any.type == ET_RawMotion) ev->any.type == ET_RawMotion)
{ {
ProcessRawEvent((RawDeviceEvent*)ev, device); ProcessRawEvent(&ev->raw_event, device);
return; return;
} }

10
dix/eventconvert.c
View File

@ -107,7 +107,7 @@ EventToCore(InternalEvent *event, xEvent *core)
case ET_KeyPress: case ET_KeyPress:
case ET_KeyRelease: case ET_KeyRelease:
{ {
DeviceEvent *e = (DeviceEvent*)event; DeviceEvent *e = &event->device_event;
if (e->detail.key > 0xFF) if (e->detail.key > 0xFF)
return BadMatch; return BadMatch;
@ -167,7 +167,7 @@ EventToXI(InternalEvent *ev, xEvent **xi, int *count)
case ET_KeyRelease: case ET_KeyRelease:
case ET_ProximityIn: case ET_ProximityIn:
case ET_ProximityOut: case ET_ProximityOut:
return eventToKeyButtonPointer((DeviceEvent*)ev, xi, count); return eventToKeyButtonPointer(&ev->device_event, xi, count);
case ET_DeviceChanged: case ET_DeviceChanged:
case ET_RawKeyPress: case ET_RawKeyPress:
case ET_RawKeyRelease: case ET_RawKeyRelease:
@ -215,19 +215,19 @@ EventToXI2(InternalEvent *ev, xEvent **xi)
case ET_ButtonRelease: case ET_ButtonRelease:
case ET_KeyPress: case ET_KeyPress:
case ET_KeyRelease: case ET_KeyRelease:
return eventToDeviceEvent((DeviceEvent*)ev, xi); return eventToDeviceEvent(&ev->device_event, xi);
case ET_ProximityIn: case ET_ProximityIn:
case ET_ProximityOut: case ET_ProximityOut:
*xi = NULL; *xi = NULL;
return BadMatch; return BadMatch;
case ET_DeviceChanged: case ET_DeviceChanged:
return eventToDeviceChanged((DeviceChangedEvent*)ev, xi); return eventToDeviceChanged(&ev->changed_event, xi);
case ET_RawKeyPress: case ET_RawKeyPress:
case ET_RawKeyRelease: case ET_RawKeyRelease:
case ET_RawButtonPress: case ET_RawButtonPress:
case ET_RawButtonRelease: case ET_RawButtonRelease:
case ET_RawMotion: case ET_RawMotion:
return eventToRawEvent((RawDeviceEvent*)ev, xi); return eventToRawEvent(&ev->raw_event, xi);
default: default:
break; break;
} }

10
dix/events.c
View File

@ -809,7 +809,7 @@ CheckVirtualMotion(
if (qe) if (qe)
{ {
ev = (DeviceEvent*)qe->event; ev = &qe->event->device_event;
switch(ev->type) switch(ev->type)
{ {
case ET_Motion: case ET_Motion:
@ -1130,7 +1130,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
QdEventPtr qe; QdEventPtr qe;
SpritePtr pSprite = device->spriteInfo->sprite; SpritePtr pSprite = device->spriteInfo->sprite;
int eventlen; int eventlen;
DeviceEvent *event = (DeviceEvent*)ev; DeviceEvent *event = &ev->device_event;
NoticeTime((InternalEvent*)event); NoticeTime((InternalEvent*)event);
@ -1179,7 +1179,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
(tail->device == device) && (tail->device == device) &&
(tail->pScreen == pSprite->hotPhys.pScreen)) (tail->pScreen == pSprite->hotPhys.pScreen))
{ {
DeviceEvent *tailev = (DeviceEvent*)tail->event; DeviceEvent *tailev = &tail->event->device_event;
tailev->root_x = pSprite->hotPhys.x; tailev->root_x = pSprite->hotPhys.x;
tailev->root_y = pSprite->hotPhys.y; tailev->root_y = pSprite->hotPhys.y;
tailev->time = event->time; tailev->time = event->time;
@ -1238,7 +1238,7 @@ PlayReleasedEvents(void)
will translate from sprite screen to screen 0 upon reentry will translate from sprite screen to screen 0 upon reentry
to the DIX layer */ to the DIX layer */
if(!noPanoramiXExtension) { if(!noPanoramiXExtension) {
DeviceEvent *ev = (DeviceEvent*)(qe->event); DeviceEvent *ev = &qe->event->device_event;
switch(ev->type) switch(ev->type)
{ {
case ET_Motion: case ET_Motion:
@ -3993,7 +3993,7 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
FreezeThaw(thisDev, TRUE); FreezeThaw(thisDev, TRUE);
if (!grabinfo->sync.event) if (!grabinfo->sync.event)
grabinfo->sync.event = xcalloc(1, sizeof(InternalEvent)); grabinfo->sync.event = xcalloc(1, sizeof(InternalEvent));
*grabinfo->sync.event = *(DeviceEvent*)event; *grabinfo->sync.event = event->device_event;
break; break;
} }
} }

2
hw/xfree86/common/xf86DGA.c
View File

@ -1193,7 +1193,7 @@ DGAGetOldDGAMode(int index)
static void static void
DGAHandleEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device) DGAHandleEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{ {
DGAEvent *event= (DGAEvent*)ev; DGAEvent *event= &ev->dga_event;
ScreenPtr pScreen = screenInfo.screens[screen_num]; ScreenPtr pScreen = screenInfo.screens[screen_num];
DGAScreenPtr pScreenPriv; DGAScreenPtr pScreenPriv;

8
include/eventstr.h
View File

@ -221,12 +221,12 @@ union _InternalEvent {
int length; /**< Length in bytes */ int length; /**< Length in bytes */
Time time; /**< Time in ms. */ Time time; /**< Time in ms. */
} any; } any;
DeviceEvent device; DeviceEvent device_event;
DeviceChangedEvent changed; DeviceChangedEvent changed_event;
#if XFreeXDGA #if XFreeXDGA
DGAEvent dga; DGAEvent dga_event;
#endif #endif
RawDeviceEvent raw; RawDeviceEvent raw_event;
}; };
#endif #endif

12
mi/mieq.c
View File

@ -269,7 +269,7 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent* event)
case ET_ProximityOut: case ET_ProximityOut:
case ET_Hierarchy: case ET_Hierarchy:
case ET_DeviceChanged: case ET_DeviceChanged:
event->device.deviceid = dev->id; event->device_event.deviceid = dev->id;
break; break;
#if XFreeXDGA #if XFreeXDGA
case ET_DGAEvent: case ET_DGAEvent:
@ -280,7 +280,7 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent* event)
case ET_RawButtonPress: case ET_RawButtonPress:
case ET_RawButtonRelease: case ET_RawButtonRelease:
case ET_RawMotion: case ET_RawMotion:
event->raw.deviceid = dev->id; event->raw_event.deviceid = dev->id;
break; break;
default: default:
ErrorF("[mi] Unknown event type (%d), cannot change id.\n", ErrorF("[mi] Unknown event type (%d), cannot change id.\n",
@ -299,11 +299,11 @@ FixUpEventForMaster(DeviceIntPtr mdev, DeviceIntPtr sdev,
if (original->any.type == ET_ButtonPress || if (original->any.type == ET_ButtonPress ||
original->any.type == ET_ButtonRelease) original->any.type == ET_ButtonRelease)
{ {
int btn = original->device.detail.button; int btn = original->device_event.detail.button;
if (!sdev->button) if (!sdev->button)
return; /* Should never happen */ return; /* Should never happen */
master->device.detail.button = sdev->button->map[btn]; master->device_event.detail.button = sdev->button->map[btn];
} }
} }
@ -382,8 +382,8 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
case ET_ButtonRelease: case ET_ButtonRelease:
if (dev && screen && screen != DequeueScreen(dev) && !handler) { if (dev && screen && screen != DequeueScreen(dev) && !handler) {
DequeueScreen(dev) = screen; DequeueScreen(dev) = screen;
x = event->device.root_x; x = event->device_event.root_x;
y = event->device.root_y; y = event->device_event.root_y;
NewCurrentScreen (dev, DequeueScreen(dev), x, y); NewCurrentScreen (dev, DequeueScreen(dev), x, y);
} }
break; break;

2
xkb/xkbAccessX.c
View File

@ -690,7 +690,7 @@ XkbSrvInfoPtr xkbi = NULL;
unsigned changed = 0; unsigned changed = 0;
ProcessInputProc backupproc; ProcessInputProc backupproc;
xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse); xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
DeviceEvent *event = (DeviceEvent*)ev; DeviceEvent *event = &ev->device_event;
dev = (IsMaster(mouse) || mouse->u.master) ? GetMaster(mouse, MASTER_KEYBOARD) : mouse; dev = (IsMaster(mouse) || mouse->u.master) ? GetMaster(mouse, MASTER_KEYBOARD) : mouse;

2
xkb/xkbPrKeyEv.c
View File

@ -148,7 +148,7 @@ ProcessKeyboardEvent(InternalEvent *ev, DeviceIntPtr keybd)
XkbSrvInfoPtr xkbi = NULL; XkbSrvInfoPtr xkbi = NULL;
ProcessInputProc backup_proc; ProcessInputProc backup_proc;
xkbDeviceInfoPtr xkb_priv = XKBDEVICEINFO(keybd); xkbDeviceInfoPtr xkb_priv = XKBDEVICEINFO(keybd);
DeviceEvent *event = (DeviceEvent*)ev; DeviceEvent *event = &ev->device_event;
int is_press = (event->type == ET_KeyPress); int is_press = (event->type == ET_KeyPress);
int is_release = (event->type == ET_KeyRelease); int is_release = (event->type == ET_KeyRelease);