diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-08 09:26:34 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-08 09:26:34 +0100 |
| commit | 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (patch) | |
| tree | a52e6d965bcb5f44858efaf1ab42c7f0a81a573a /xkbcomp | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987.tar.gz vcxsrv-5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987.tar.bz2 vcxsrv-5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987.zip | |
git update glproto libX11 libxcb mesa xserver 8 dec 2011
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/compat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c index 759535a38..2b0014244 100644 --- a/xkbcomp/compat.c +++ b/xkbcomp/compat.c @@ -50,6 +50,7 @@ typedef struct _GroupCompatInfo { unsigned char fileID; unsigned char merge; + Bool defined; unsigned char real_mods; unsigned short vmods; } GroupCompatInfo; @@ -280,8 +281,8 @@ AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC) ACTION1("Using %s definition\n", (merge == MergeAugment ? "old" : "new")); } - if (merge != MergeAugment) - *gc = *newGC; + if(newGC->defined && (merge != MergeAugment || !gc->defined)) + *gc = *newGC; return True; } @@ -715,6 +716,7 @@ HandleGroupCompatDef(GroupCompatDef * def, } tmp.real_mods = val.uval & 0xff; tmp.vmods = (val.uval >> 8) & 0xffff; + tmp.defined = True; return AddGroupCompat(info, def->group - 1, &tmp); } |