xfree86/dga: Remove useless ifdefs
Move some variables to the scope where they are used. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
5c941c04ca
commit
9f09b62e59
|
@ -1011,11 +1011,6 @@ xf86PostMotionEventM(DeviceIntPtr device,
|
||||||
DeviceEvent *event;
|
DeviceEvent *event;
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
|
|
||||||
#if XFreeXDGA
|
|
||||||
int index;
|
|
||||||
int dx = 0, dy = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (valuator_mask_num_valuators(mask) > 0)
|
if (valuator_mask_num_valuators(mask) > 0)
|
||||||
{
|
{
|
||||||
if (is_absolute)
|
if (is_absolute)
|
||||||
|
@ -1029,7 +1024,9 @@ xf86PostMotionEventM(DeviceIntPtr device,
|
||||||
if (valuator_mask_isset(mask, 0) ||
|
if (valuator_mask_isset(mask, 0) ||
|
||||||
valuator_mask_isset(mask, 1))
|
valuator_mask_isset(mask, 1))
|
||||||
if (miPointerGetScreen(device)) {
|
if (miPointerGetScreen(device)) {
|
||||||
index = miPointerGetScreen(device)->myNum;
|
int index = miPointerGetScreen(device)->myNum;
|
||||||
|
int dx = 0, dy = 0;
|
||||||
|
|
||||||
if (valuator_mask_isset(mask, 0))
|
if (valuator_mask_isset(mask, 0))
|
||||||
{
|
{
|
||||||
dx = valuator_mask_get(mask, 0);
|
dx = valuator_mask_get(mask, 0);
|
||||||
|
@ -1160,10 +1157,6 @@ xf86PostButtonEventM(DeviceIntPtr device,
|
||||||
int i = 0, nevents = 0;
|
int i = 0, nevents = 0;
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
|
|
||||||
#if XFreeXDGA
|
|
||||||
int index;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (valuator_mask_num_valuators(mask) > 0)
|
if (valuator_mask_num_valuators(mask) > 0)
|
||||||
{
|
{
|
||||||
if (is_absolute)
|
if (is_absolute)
|
||||||
|
@ -1174,7 +1167,8 @@ xf86PostButtonEventM(DeviceIntPtr device,
|
||||||
|
|
||||||
#if XFreeXDGA
|
#if XFreeXDGA
|
||||||
if (miPointerGetScreen(device)) {
|
if (miPointerGetScreen(device)) {
|
||||||
index = miPointerGetScreen(device)->myNum;
|
int index = miPointerGetScreen(device)->myNum;
|
||||||
|
|
||||||
if (DGAStealButtonEvent(device, index, button, is_down))
|
if (DGAStealButtonEvent(device, index, button, is_down))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1241,13 +1235,13 @@ xf86PostKeyEventM(DeviceIntPtr device,
|
||||||
int i = 0, nevents = 0;
|
int i = 0, nevents = 0;
|
||||||
|
|
||||||
#if XFreeXDGA
|
#if XFreeXDGA
|
||||||
int index;
|
|
||||||
DeviceIntPtr pointer;
|
DeviceIntPtr pointer;
|
||||||
|
|
||||||
/* Some pointers send key events, paired device is wrong then. */
|
/* Some pointers send key events, paired device is wrong then. */
|
||||||
pointer = IsPointerDevice(device) ? device : GetPairedDevice(device);
|
pointer = IsPointerDevice(device) ? device : GetPairedDevice(device);
|
||||||
if (miPointerGetScreen(pointer)) {
|
if (miPointerGetScreen(pointer)) {
|
||||||
index = miPointerGetScreen(pointer)->myNum;
|
int index = miPointerGetScreen(pointer)->myNum;
|
||||||
|
|
||||||
if (DGAStealKeyEvent(device, index, key_code, is_down))
|
if (DGAStealKeyEvent(device, index, key_code, is_down))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user