mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2025-12-20 04:40:02 +01:00
Consider the following keymap:
```xkb
xkb_keymap {
xkb_keycodes {
<compose> = 135;
};
xkb_symbols {
key <compose> {
[ SetGroup(group = +1) ]
};
};
};
```
When the user presses the compose key, the following happens:
1. The compositor forwards the key to Xwayland.
2. Xwayland executes the SetGroup action and sets the base_group to 1
and the effective group to 1.
3. The compositor updates its own state and sends the effective group,
1, to Xwayland.
4. Xwayland sets the locked group to 1 and the effective group to
1 + 1 = 2.
This is wrong since pressing compose should set the effective group to 1
but to X applications the effective group appears to be 2.
This commit makes it so that Xwayland completely ignores the key
behaviors and actions of the keymap and only updates the modifier and
group components in response to the wayland modifiers events.
Signed-off-by: Julian Orth <ju.orth@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1758>
203 lines
7.1 KiB
C
203 lines
7.1 KiB
C
/************************************************************
|
|
Copyright (c) 1993 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.
|
|
|
|
********************************************************/
|
|
|
|
#include <dix-config.h>
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <math.h>
|
|
#include <X11/X.h>
|
|
#include <X11/Xproto.h>
|
|
#include <X11/keysym.h>
|
|
|
|
#include "dix/input_priv.h"
|
|
#include "xkb/xkbsrv_priv.h"
|
|
|
|
#include "misc.h"
|
|
#include "inputstr.h"
|
|
#include "exevents.h"
|
|
#include "eventstr.h"
|
|
#include "events.h"
|
|
|
|
void
|
|
XkbProcessKeyboardEvent(DeviceEvent *event, DeviceIntPtr keybd)
|
|
{
|
|
KeyClassPtr keyc = keybd->key;
|
|
XkbSrvInfoPtr xkbi;
|
|
int key;
|
|
XkbBehavior behavior;
|
|
unsigned ndx;
|
|
|
|
xkbi = keyc->xkbInfo;
|
|
key = event->detail.key;
|
|
if (xkbDebugFlags & 0x8)
|
|
DebugF("[xkb] XkbPKE: Key %d %s\n", key,
|
|
(event->type == ET_KeyPress ? "down" : "up"));
|
|
|
|
if (xkbi->repeatKey == key && event->type == ET_KeyRelease &&
|
|
!(xkbi->desc->ctrls->enabled_ctrls & XkbRepeatKeysMask))
|
|
AccessXCancelRepeatKey(xkbi, key);
|
|
|
|
behavior = xkbi->desc->server->behaviors[key];
|
|
/* The "permanent" flag indicates a hard-wired behavior that occurs */
|
|
/* below XKB, such as a key that physically locks. XKB does not */
|
|
/* do anything to implement the behavior, but it *does* report that */
|
|
/* key is hardwired */
|
|
|
|
if (!keybd->ignoreXkbActionsBehaviors && !(behavior.type & XkbKB_Permanent)) {
|
|
switch (behavior.type) {
|
|
case XkbKB_Default:
|
|
/* Neither of these should happen in practice, but ignore them
|
|
anyway. */
|
|
if (event->type == ET_KeyPress && !event->key_repeat &&
|
|
key_is_down(keybd, key, KEY_PROCESSED))
|
|
return;
|
|
else if (event->type == ET_KeyRelease &&
|
|
!key_is_down(keybd, key, KEY_PROCESSED))
|
|
return;
|
|
break;
|
|
case XkbKB_Lock:
|
|
if (event->type == ET_KeyRelease)
|
|
return;
|
|
else if (key_is_down(keybd, key, KEY_PROCESSED))
|
|
event->type = ET_KeyRelease;
|
|
break;
|
|
case XkbKB_RadioGroup:
|
|
ndx = (behavior.data & (~XkbKB_RGAllowNone));
|
|
if (ndx < xkbi->nRadioGroups) {
|
|
XkbRadioGroupPtr rg;
|
|
|
|
if (event->type == ET_KeyRelease)
|
|
return;
|
|
|
|
rg = &xkbi->radioGroups[ndx];
|
|
if (rg->currentDown == event->detail.key) {
|
|
if (behavior.data & XkbKB_RGAllowNone) {
|
|
event->type = ET_KeyRelease;
|
|
XkbHandleActions(keybd, keybd, event);
|
|
rg->currentDown = 0;
|
|
}
|
|
return;
|
|
}
|
|
if (rg->currentDown != 0) {
|
|
int tmpkey = event->detail.key;
|
|
|
|
event->type = ET_KeyRelease;
|
|
event->detail.key = rg->currentDown;
|
|
XkbHandleActions(keybd, keybd, event);
|
|
event->type = ET_KeyPress;
|
|
event->detail.key = tmpkey;
|
|
}
|
|
rg->currentDown = key;
|
|
}
|
|
else
|
|
ErrorF("[xkb] InternalError! Illegal radio group %d\n", ndx);
|
|
break;
|
|
case XkbKB_Overlay1:
|
|
case XkbKB_Overlay2:
|
|
{
|
|
unsigned which;
|
|
unsigned overlay_active_now;
|
|
unsigned is_keyrelease = (event->type == ET_KeyRelease) ? 1 : 0;
|
|
/* Remembers whether the key was pressed while overlay was down,
|
|
* for when overlay is already released, but the key is not. */
|
|
unsigned key_was_overlaid = 0;
|
|
|
|
if (behavior.type == XkbKB_Overlay1)
|
|
which = XkbOverlay1Mask;
|
|
else
|
|
which = XkbOverlay2Mask;
|
|
overlay_active_now = (xkbi->desc->ctrls->enabled_ctrls & which) ? 1 : 0;
|
|
|
|
if ((unsigned char)key == key) {
|
|
key_was_overlaid = BitIsOn(xkbi->overlay_perkey_state, key);
|
|
if (!is_keyrelease) {
|
|
if (overlay_active_now)
|
|
SetBit(xkbi->overlay_perkey_state, key);
|
|
} else {
|
|
if (key_was_overlaid)
|
|
ClearBit(xkbi->overlay_perkey_state, key);
|
|
}
|
|
}
|
|
|
|
if ((overlay_active_now || key_was_overlaid) &&
|
|
(behavior.data >= xkbi->desc->min_key_code) &&
|
|
(behavior.data <= xkbi->desc->max_key_code)) {
|
|
event->detail.key = behavior.data;
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
ErrorF("[xkb] unknown key behavior 0x%04x\n", behavior.type);
|
|
break;
|
|
}
|
|
}
|
|
XkbHandleActions(keybd, keybd, event);
|
|
return;
|
|
}
|
|
|
|
void
|
|
ProcessKeyboardEvent(InternalEvent *ev, DeviceIntPtr keybd)
|
|
{
|
|
|
|
KeyClassPtr keyc = keybd->key;
|
|
XkbSrvInfoPtr xkbi = NULL;
|
|
ProcessInputProc backup_proc;
|
|
xkbDeviceInfoPtr xkb_priv = XKBDEVICEINFO(keybd);
|
|
DeviceEvent *event = &ev->device_event;
|
|
int is_press = (event->type == ET_KeyPress);
|
|
int is_release = (event->type == ET_KeyRelease);
|
|
|
|
/* We're only interested in key events. */
|
|
if (!is_press && !is_release) {
|
|
UNWRAP_PROCESS_INPUT_PROC(keybd, xkb_priv, backup_proc);
|
|
keybd->public.processInputProc(ev, keybd);
|
|
COND_WRAP_PROCESS_INPUT_PROC(keybd, xkb_priv, backup_proc,
|
|
xkbUnwrapProc);
|
|
return;
|
|
}
|
|
|
|
xkbi = keyc->xkbInfo;
|
|
|
|
/* If AccessX filters are active, then pass it through to
|
|
* AccessXFilter{Press,Release}Event; else, punt to
|
|
* XkbProcessKeyboardEvent.
|
|
*
|
|
* If AXF[PK]E don't intercept anything (which they probably won't),
|
|
* they'll punt through XPKE anyway. */
|
|
if ((xkbi->desc->ctrls->enabled_ctrls & XkbAllFilteredEventsMask)) {
|
|
if (is_press)
|
|
AccessXFilterPressEvent(event, keybd);
|
|
else if (is_release)
|
|
AccessXFilterReleaseEvent(event, keybd);
|
|
return;
|
|
}
|
|
else {
|
|
XkbProcessKeyboardEvent(event, keybd);
|
|
}
|
|
|
|
return;
|
|
}
|