d645721170
After copying the master event, flip the detail field to the mapped button of the SD, not the physical button. This way if the SD has a mapping 1:3 and the MD has a mapping of 3:4, a press on button 1 on the SD results in a core event on button 4. X.Org Bug 19282 <http://bugs.freedesktop.org/show_bug.cgi?id=19282> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
129 lines
3.9 KiB
C
129 lines
3.9 KiB
C
/************************************************************
|
|
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
|
|
|
|
Permission to use, copy, modify, and distribute this
|
|
software and its documentation for any purpose and without
|
|
fee is hereby granted, provided that the above copyright
|
|
notice appear in all copies and that both that copyright
|
|
notice and this permission notice appear in supporting
|
|
documentation, and that the name of Silicon Graphics not be
|
|
used in advertising or publicity pertaining to distribution
|
|
of the software without specific prior written permission.
|
|
Silicon Graphics makes no representation about the suitability
|
|
of this software for any purpose. It is provided "as is"
|
|
without any express or implied warranty.
|
|
|
|
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
|
|
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
|
|
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
|
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
********************************************************/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <X11/X.h>
|
|
#include <X11/Xproto.h>
|
|
#include <X11/keysym.h>
|
|
#include "inputstr.h"
|
|
#include "scrnintstr.h"
|
|
#include "windowstr.h"
|
|
#include <xkbsrv.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;
|
|
|
|
if (dev == inputInfo.pointer || !dev->public.on)
|
|
return;
|
|
|
|
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.
|
|
*
|
|
* Note:the DeviceButtonEvent on the SD itself will do nothing in most
|
|
* cases, unless dev is both a keyboard and a mouse.
|
|
*/
|
|
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);
|
|
}
|
|
|
|
(*dev->public.processInputProc)((xEventPtr)btn, dev, count);
|
|
|
|
if (master) {
|
|
(*master->public.processInputProc)(masterEvents->event, master, count);
|
|
}
|
|
return;
|
|
}
|