fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-08 07:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'compose-super-hyper' into 'master'

Browse source 
Add Super and Hyper to XCompose modifier list

See merge request xorg/lib/libx11!157
This commit is contained in:
Daniel Nagy 2025-10-29 19:25:12 +00:00
commit d4e4cb1442
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
man/Compose.man
View file

@ -99,7 +99,7 @@ Each event consists of a specified input keysym, and optional modifier states:
If the modifier list is preceded by
.RB \*q "!" \*q
it must match exactly.
MODIFIER may be one of Ctrl, Lock, Caps, Shift, Alt or Meta.
MODIFIER may be one of Ctrl, Lock, Caps, Shift, Alt, Meta, Super or Hyper.
Each modifier may be preceded by a
.RB \*q "~" \*q
character to indicate that the modifier must not be present.

8
modules/im/ximcp/imLcPrs.c
View file

@ -70,7 +70,7 @@ static void parsestringfile(FILE *fp, Xim im, int depth);
* EVENT ::= [MODIFIER_LIST] "<" keysym ">"
* MODIFIER_LIST ::= (["!"] {MODIFIER} ) | "None"
* MODIFIER ::= ["~"] MODIFIER_NAME
* MODIFIER_NAME ::= ("Ctrl"|"Lock"|"Caps"|"Shift"|"Alt"|"Meta")
* MODIFIER_NAME ::= ("Ctrl"|"Lock"|"Caps"|"Shift"|"Alt"|"Meta"|"Super"|"Hyper")
* RHS ::= ( STRING | keysym | STRING keysym )
* STRING ::= '"' { CHAR } '"'
* CHAR ::= GRAPHIC_CHAR | ESCAPED_CHAR
@ -294,7 +294,9 @@ modmask(
{ "Caps", LockMask },
{ "Shift", ShiftMask },
{ "Alt", Mod1Mask },
{ "Meta", Mod1Mask }};
{ "Meta", Mod1Mask },
{ "Hyper", Mod3Mask },
{ "Super", Mod4Mask }};
int i, num_entries = sizeof (tbl) / sizeof (tbl[0]);
@ -441,7 +443,7 @@ get_mb_string (Xim im, char *buf, KeySym ks)
return len;
}
#define AllMask (ShiftMask | LockMask | ControlMask | Mod1Mask)
#define AllMask (ShiftMask | LockMask | ControlMask | Mod1Mask | Mod3Mask | Mod4Mask)
#define LOCAL_WC_BUFSIZE 128
#define LOCAL_UTF8_BUFSIZE 256
#define SEQUENCE_MAX 10