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

Implement a minor hack in dmxCheckFunctionKeys() to detect special keys. 

Keep track of status of (left) alt/ctrl keys so that ctrl-alt-q to exit
can be detected.  Not ideal, but works for now.
This commit is contained in:
Brian 2007-04-03 11:21:50 -06:00
parent 0ee40c9357
commit e1dea151db
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/dmx/input/dmxevents.c
View File

@ -104,16 +104,35 @@ static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx]; DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];
unsigned short state = 0; unsigned short state = 0;
#if 1 /* hack to detect ctrl-alt-q, etc */
static int ctrl = 0, alt = 0;
/* keep track of ctrl/alt key status */
if (type == KeyPress && keySym == 0xffe3) {
ctrl = 1;
}
else if (type == KeyRelease && keySym == 0xffe3) {
ctrl = 0;
}
else if (type == KeyPress && keySym == 0xffe9) {
alt = 1;
}
else if (type == KeyRelease && keySym == 0xffe9) {
alt = 0;
}
if (!ctrl || !alt)
return 0;
#else
if (dmxLocal->sendsCore) if (dmxLocal->sendsCore)
state = dmxLocalCoreKeyboard->pDevice->key->state; state = dmxLocalCoreKeyboard->pDevice->key->state;
else if (dmxLocal->pDevice->key) else if (dmxLocal->pDevice->key)
state = dmxLocal->pDevice->key->state; state = dmxLocal->pDevice->key->state;
ErrorF/*DMXDBG3*/("dmxCheckFunctionKeys: keySym=0x%04x %s state=0x%04x\n", DMXDBG3("dmxCheckFunctionKeys: keySym=0x%04x %s state=0x%04x\n",
keySym, type == KeyPress ? "press" : "release", state); keySym, type == KeyPress ? "press" : "release", state);
if ((state & (ControlMask|Mod1Mask)) != (ControlMask|Mod1Mask)) if ((state & (ControlMask|Mod1Mask)) != (ControlMask|Mod1Mask))
return 0; return 0;
#endif
switch (keySym) { switch (keySym) {
case XK_g: case XK_g:
@ -679,7 +698,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
xE.u.u.detail = dmxFixup(pDev, detail, keySym); xE.u.u.detail = dmxFixup(pDev, detail, keySym);
events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum()); events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum());
ErrorF("KEY %d sym %d\n", detail, (int) keySym); /*ErrorF("KEY %d sym %d\n", detail, (int) keySym);*/
nevents = GetKeyboardEvents(events, p, type, detail); nevents = GetKeyboardEvents(events, p, type, detail);
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(p, events + i); mieqEnqueue(p, events + i);