xserver: Branch 'master' - 6 commits
Peter Hutterer
whot at kemper.freedesktop.org
Wed Mar 11 18:04:48 PDT 2009
Xi/exevents.c | 18 ++++++++++--
dix/devices.c | 60 +++++++++++++----------------------------
dix/events.c | 10 +++---
dix/getevents.c | 8 ++---
hw/xfree86/common/xf86Xinput.c | 18 ------------
5 files changed, 45 insertions(+), 69 deletions(-)
New commits:
commit 7abb72c5c711a26a27a82604bd2398bcb6df0a99
Author: Simon Thum <simon.thum at gmx.de>
Date: Wed Feb 25 10:55:36 2009 +0100
xfree86: remove obsolete code
remove a few lines which redo part of the pointer acceleration
init. Properties is the way to go for them.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index dcec423..d260570 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -208,24 +208,6 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
s->average_accel);
s->reset_time = xf86SetIntOption(list, "VelocityReset", s->reset_time);
-
- tempf = xf86SetRealOption(list, "ExpectedRate", 0);
- if(tempf > 0){
- s->corr_mul = 1000.0 / tempf;
- }else{
- s->corr_mul = xf86SetRealOption(list, "VelocityScale", s->corr_mul);
- }
-
- /* select profile by number */
- tempi= xf86SetIntOption(list, "AccelerationProfile",
- s->statistics.profile_number);
-
- if(SetAccelerationProfile(s, tempi)){
- xf86Msg(X_CONFIG, "%s: (accel) set acceleration profile %i\n", devname, tempi);
- }else{
- xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",
- devname, tempi);
- }
}
static void
commit 97cb3cc28e4a5694d17f156276efd84555a96d18
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Mar 12 10:17:16 2009 +1000
dix: Merge DevicePresence notify events generation into a single function.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/devices.c b/dix/devices.c
index 51d7091..f89e8e7 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -239,6 +239,22 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
return dev;
}
+static void
+SendDevicePresenceEvent(int deviceid, int type)
+{
+ DeviceIntRec dummyDev;
+ devicePresenceNotify ev;
+
+ memset(&dummyDev, 0, sizeof(DeviceIntRec));
+ ev.type = DevicePresenceNotify;
+ ev.time = currentTime.milliseconds;
+ ev.devchange = type;
+ ev.deviceid = deviceid;
+ dummyDev.id = MAXDEVICES;
+ SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
+ (xEvent*)&ev, 1);
+}
+
/**
* Enable the device through the driver, add the device to the device list.
* Switch device ON through the driver and push it onto the global device
@@ -256,9 +272,7 @@ EnableDevice(DeviceIntPtr dev)
{
DeviceIntPtr *prev;
int ret;
- DeviceIntRec dummyDev;
DeviceIntPtr other;
- devicePresenceNotify ev;
int namelen = 0; /* dummy */
int evsize = sizeof(xEvent);
int listlen;
@@ -328,13 +342,7 @@ EnableDevice(DeviceIntPtr dev)
XA_INTEGER, 8, PropModeReplace, 1, &enabled,
TRUE);
- ev.type = DevicePresenceNotify;
- ev.time = currentTime.milliseconds;
- ev.devchange = DeviceEnabled;
- ev.deviceid = dev->id;
- dummyDev.id = MAXDEVICES;
- SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
- (xEvent *) &ev, 1);
+ SendDevicePresenceEvent(dev->id, DeviceEnabled);
return TRUE;
}
@@ -353,8 +361,6 @@ Bool
DisableDevice(DeviceIntPtr dev)
{
DeviceIntPtr *prev, other;
- DeviceIntRec dummyDev;
- devicePresenceNotify ev;
BOOL enabled;
for (prev = &inputInfo.devices;
@@ -406,14 +412,7 @@ DisableDevice(DeviceIntPtr dev)
XA_INTEGER, 8, PropModeReplace, 1, &enabled,
TRUE);
- ev.type = DevicePresenceNotify;
- ev.time = currentTime.milliseconds;
- ev.devchange = DeviceDisabled;
- ev.deviceid = dev->id;
- dummyDev.id = MAXDEVICES;
- SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
- (xEvent *) &ev, 1);
-
+ SendDevicePresenceEvent(dev->id, DeviceDisabled);
return TRUE;
}
@@ -430,8 +429,6 @@ int
ActivateDevice(DeviceIntPtr dev)
{
int ret = Success;
- devicePresenceNotify ev;
- DeviceIntRec dummyDev;
ScreenPtr pScreen = screenInfo.screens[0];
if (!dev || !dev->deviceProc)
@@ -446,16 +443,7 @@ ActivateDevice(DeviceIntPtr dev)
if (dev->isMaster && dev->spriteInfo->spriteOwner)
pScreen->DeviceCursorInitialize(dev, pScreen);
- ev.type = DevicePresenceNotify;
- ev.time = currentTime.milliseconds;
- ev.devchange = DeviceAdded;
- ev.deviceid = dev->id;
-
- memset(&dummyDev, 0, sizeof(DeviceIntRec));
- dummyDev.id = MAXDEVICES;
- SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
- (xEvent *) &ev, 1);
-
+ SendDevicePresenceEvent(dev->id, DeviceAdded);
return ret;
}
@@ -900,8 +888,6 @@ RemoveDevice(DeviceIntPtr dev)
{
DeviceIntPtr prev,tmp,next;
int ret = BadMatch;
- devicePresenceNotify ev;
- DeviceIntRec dummyDev;
ScreenPtr screen = screenInfo.screens[0];
int deviceid;
int initialized;
@@ -954,13 +940,7 @@ RemoveDevice(DeviceIntPtr dev)
if (ret == Success && initialized) {
inputInfo.numDevices--;
- ev.type = DevicePresenceNotify;
- ev.time = currentTime.milliseconds;
- ev.devchange = DeviceRemoved;
- ev.deviceid = deviceid;
- dummyDev.id = MAXDEVICES;
- SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
- (xEvent *) &ev, 1);
+ SendDevicePresenceEvent(deviceid, DeviceRemoved);
}
return ret;
commit 7f1ba804a1c1aef725e20a04e5f6ef74478ecf44
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue Mar 10 11:55:04 2009 +1000
dix: s/numEvents/num_events/ in GetKeyboardValuatorEvents
GPE and GProxE use the same.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/getevents.c b/dix/getevents.c
index f7306c1..0a81165 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -779,7 +779,7 @@ int
GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
int key_code, int first_valuator,
int num_valuators, int *valuators) {
- int numEvents = 0;
+ int num_events = 0;
CARD32 ms = 0;
DeviceEvent *event;
@@ -788,9 +788,9 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
(key_code < 8 || key_code > 255))
return 0;
- numEvents = 1;
+ num_events = 1;
- events = updateFromMaster(events, pDev, &numEvents);
+ events = updateFromMaster(events, pDev, &num_events);
/* Handle core repeating, via press/release/press/release. */
if (type == KeyPress && key_is_down(pDev, key_code, KEY_POSTED)) {
@@ -825,7 +825,7 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
set_valuators(pDev, event, first_valuator, num_valuators, valuators);
- return numEvents;
+ return num_events;
}
/**
commit 067f26f7ba4c8cf37af7ddf0eb204b7e1d06096d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Mar 6 19:42:27 2009 +1000
Xi: set the modifier + group state during POE.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 456e079..90005f4 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -911,6 +911,17 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
if (BitIsOn(mouse->button->down, i))
SetBit(event->buttons, i);
+ if (kbd && kbd->key)
+ {
+ event->mods.base = kbd->key->xkbInfo->state.base_mods;
+ event->mods.latched = kbd->key->xkbInfo->state.latched_mods;
+ event->mods.locked = kbd->key->xkbInfo->state.locked_mods;
+
+ event->group.base = kbd->key->xkbInfo->state.base_group;
+ event->group.latched = kbd->key->xkbInfo->state.latched_group;
+ event->group.locked = kbd->key->xkbInfo->state.locked_group;
+ }
+
ret = UpdateDeviceState(device, event);
if (ret == DONT_PROCESS)
return;
commit da724e8f1d1867c36c9550a153c58829939800fc
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Mar 6 15:50:05 2009 +1000
Xi: Set the button state on the event during POE.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 20e0fbb..456e079 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -885,7 +885,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
KeyClassPtr k;
ValuatorClassPtr v;
int ret = 0;
- int state;
+ int state, i;
DeviceIntPtr mouse = NULL, kbd = NULL;
DeviceEvent *event = (DeviceEvent*)ev;
@@ -907,11 +907,14 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
state = (kbd) ? XkbStateFieldFromRec(&kbd->key->xkbInfo->state) : 0;
state |= (mouse) ? (mouse->button->state) : 0;
+ for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
+ if (BitIsOn(mouse->button->down, i))
+ SetBit(event->buttons, i);
+
ret = UpdateDeviceState(device, event);
if (ret == DONT_PROCESS)
return;
-
v = device->valuator;
b = device->button;
k = device->key;
commit b368dd1720c708aaec492b4a67fb7e4f87569c11
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Mar 5 15:22:41 2009 +1000
dix: remove a few pointless (void) casts of return values.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/events.c b/dix/events.c
index fa6c469..68826c2 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3303,7 +3303,7 @@ CheckPassiveGrabsOnWindow(
FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
- (void) TryClientEvents(rClient(grab), device, xE, count,
+ TryClientEvents(rClient(grab), device, xE, count,
filters[device->id][xE->u.u.type],
filters[device->id][xE->u.u.type], grab);
@@ -4088,7 +4088,7 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
bzero((char *)&ke.map[0], 31);
ke.type = KeymapNotify;
- (void)DeliverEventsToWindow(dev, pWin, (xEvent *)&ke, 1,
+ DeliverEventsToWindow(dev, pWin, (xEvent *)&ke, 1,
KeymapStateMask, NullGrab, 0);
}
}
@@ -4837,7 +4837,7 @@ ProcSendEvent(ClientPtr client)
}
}
else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, &stuff->event, 1))
- (void)DeliverEventsToWindow(PickPointer(client), pWin, &stuff->event,
+ DeliverEventsToWindow(PickPointer(client), pWin, &stuff->event,
1, stuff->eventMask, NullGrab, 0);
return Success;
}
@@ -5410,7 +5410,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
(*EventSwapVector[eventFrom->u.u.type & 0177])
(eventFrom, eventTo);
- (void)WriteToClient(pClient, eventlength, (char *)eventTo);
+ WriteToClient(pClient, eventlength, (char *)eventTo);
}
}
else
@@ -5418,7 +5418,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
/* only one GenericEvent, remember? that means either count is 1 and
* eventlength is arbitrary or eventlength is 32 and count doesn't
* matter. And we're all set. Woohoo. */
- (void)WriteToClient(pClient, count * eventlength, (char *) events);
+ WriteToClient(pClient, count * eventlength, (char *) events);
}
}
More information about the xorg-commit
mailing list