From 0b3f253ba44e3f62d5c2e8a5e6a6e42ec147929a Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 17 Feb 2014 14:37:09 -0700 Subject: [PATCH] Fix for xorg-xkb partially freezes dtwm when keyboard layout is changed. Patch submitted by Eugene Doudine --- cde/programs/dtwm/WmGlobal.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cde/programs/dtwm/WmGlobal.h b/cde/programs/dtwm/WmGlobal.h index 0995c7eb4..944b4b394 100644 --- a/cde/programs/dtwm/WmGlobal.h +++ b/cde/programs/dtwm/WmGlobal.h @@ -2367,7 +2367,9 @@ typedef struct _WmGlobalData #define ACTIVE_ROOT (wmGD.pActiveSD->rootWindow) #define ACTIVE_ICON_TEXT_WIN (wmGD.pActiveSD->activeIconTextWin) -#define NOLOCKMOD(state) ((state) & ~wmGD.lockingModMask) +/* According to the xkb protocol bits 13 and 14 are interpreted as a */ +/* two-bit unsigned numeric value and report the state keyboard group */ +#define NOLOCKMOD(state) ((state) & ~wmGD.lockingModMask & ~(3 << 13)) #ifdef WSM /* absent map behavior policy values (absentMapBehavior): */ #define AMAP_BEHAVIOR_ADD 0