andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xkb: restore XKB PtrBtn actions.

Browse Source 
Ifdef'd out since the switch to internal events. PtrBtn actions now work
again. Instead of generating the event directly, GPE generates the event and
it is then posted through the usual event processing routines
(mieqProcessDeviceEvent).

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-07-28 16:53:51 +10:00
parent 3d3b8babd1
commit a148d40742
1 changed files with 26 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
xkb/ddxDevBtn.c
View File

@ -35,98 +35,43 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
#include "eventstr.h"
#include <xkbsrv.h>
#include "mi.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
extern int DeviceValuator;
static EventListPtr masterEvents = NULL;
void
XkbDDXFakeDeviceButton(DeviceIntPtr dev,Bool press,int button)
{
int * devVal;
INT32 * evVal;
xEvent events[2];
deviceKeyButtonPointer *btn;
deviceValuator * val;
int x,y;
int nAxes, i, count;
DeviceIntPtr master = NULL;
EventListPtr events;
int nevents, i;
DeviceIntPtr ptr;
if (dev == inputInfo.pointer || !dev->public.on)
return;
ErrorF("[xkb] XkbDDXFakeDeviceButton. If you read this message in your "
"log file, Please file a bug on bugs.freedesktop.org.\n");
#if 0
nAxes = (dev->valuator?dev->valuator->numAxes:0);
if (nAxes > 6)
nAxes = 6;
GetSpritePosition(dev, &x,&y);
btn= (deviceKeyButtonPointer *) &events[0];
val= (deviceValuator *) &events[1];
if (press) btn->type= DeviceButtonPress;
else btn->type= DeviceButtonRelease;
btn->detail= button;
btn->time= GetTimeInMillis();
btn->root_x= x;
btn->root_y= y;
btn->deviceid= dev->id;
count= 1;
if (nAxes>0) {
btn->deviceid|= 0x80;
val->type = DeviceValuator;
val->deviceid = dev->id;
val->first_valuator = 0;
evVal= &val->valuator0;
devVal= dev->valuator->axisVal;
for (i=nAxes;i>0;i--) {
*evVal++ = *devVal++;
if (evVal > &val->valuator5) {
int tmp = val->first_valuator+6;
val->num_valuators = 6;
val++;
evVal= &val->valuator0;
val->first_valuator= tmp;
}
}
if ((nAxes % 6) != 0) {
val->num_valuators = (nAxes % 6);
}
count= 1+((nAxes+5)/6);
}
/* XXX: This is obnoxious. ProcessOtherEvent updates the DIX device state,
* but may not do anything if the device state is invalid. This happens if
* we post a mouse event from a pure keyboard device. So we need to hack
* around that by getting the master, then posting the event for the
* pointer paired with the master.
/* If dev is a slave device, and the SD is attached, do nothing. If we'd
* post through the attached master pointer we'd get duplicate events.
*
* Note:the DeviceButtonEvent on the SD itself will do nothing in most
* cases, unless dev is both a keyboard and a mouse.
* if dev is a master keyboard, post through the master pointer.
*
* if dev is a floating slave, post through the device itself.
*/
if (!dev->isMaster && dev->u.master) {
if (!masterEvents)
{
masterEvents = InitEventList(1);
SetMinimumEventSize(masterEvents, 1, (1 + MAX_VALUATOR_EVENTS) * sizeof(xEvent));
}
master = dev->u.master;
if (!IsPointerDevice(master))
master = GetPairedDevice(dev->u.master);
CopyGetMasterEvent(master, dev, events, masterEvents, count);
}
if (IsMaster(dev))
ptr = GetMaster(dev, MASTER_POINTER);
else if (!dev->u.master)
ptr = dev;
else
return;
(*dev->public.processInputProc)((xEventPtr)btn, dev, count);
events = InitEventList(GetMaximumEventsNum());
nevents = GetPointerEvents(events, ptr,
press ? ButtonPress : ButtonRelease, button,
0 /* flags */, 0 /* first */,
0 /* num_val */, NULL);
if (master) {
(*master->public.processInputProc)(masterEvents->event, master, count);
}
return;
#endif
for (i = 0; i < nevents; i++)
mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL);
FreeEventList(events, GetMaximumEventsNum());
}