On Fri, 14 Feb 2014, Antonis Tsolomitis wrote:
Hi, I verify that the patch works fine. I applied it to the source tree I downloaded with git apply path/to/patch recompiled CDE and no more freeze with xkb toggle. So if Jon applies the patch to the source on sourceforge the ticket #8 can be tagged closed.
Hi, sorry for my absense of late. I will try to catch up in the coming days. The only issue I had with the patch is that I think there must be a macro defined somewhere in one of the XKB headers that specifies this mask, and that should be used instead of the hardcoded '(3<<13)' value. I just haven't had time to look -- if one of you could, I'd appreciate it. I'd look myself, but don't have the time ATM.
Thank you Eugene,
Yes, thanks -- good catch! Though in the future, please use git 'format-patch' format patches in the future, it makes it much easier/quicker to apply submitted patches. With a simple diff there is much more manual labor involved, and therefore I tend to put it off :) -Jon
Antonis. Στις 14/02/2014 02:13 πμ, ο/η 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 0995c7e..944b4b3 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
-- Jon Trulson "It is a truism that almost any sect, cult, or religion will legislate its creed into law if it acquires the political power to do so." —Robert A. Heinlein, science-fiction author (1907-1988)
------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
