Attachment 33142 Details for Bug 865 – This patch is to resolve the issue; it is for "trunk" Xorg sources.

[patch] This patch is to resolve the issue; it is for "trunk" Xorg sources.

switch_on_release.diff (text/plain), 3.14 KB, created by Ilya Murav'jov on 2010-02-07 14:17:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilya Murav'jov

Created: 2010-02-07 14:17:20 UTC

Size: 3.14 KB

patch

obsolete

>diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
>index 2cdb6fc..3ed6263 100644
>--- a/xkb/xkbActions.c
>+++ b/xkb/xkbActions.c
>@@ -325,24 +325,83 @@ _XkbFilterLatchState(	XkbSrvInfoPtr	xkbi,
>     return 1;
> }
> 
>+static int xkbSwitchGroupOnRelease(void)
>+{
>+    /* TODO: user configuring */
>+    return TRUE;
>+}
>+
>+static void xkbUpdateLockedGroup(XkbSrvInfoPtr xkbi, XkbAction* pAction)
>+{
>+    XkbGroupAction ga = pAction->group;
>+    if (ga.flags&XkbSA_GroupAbsolute)
>+	xkbi->state.locked_group= XkbSAGroup(&ga);
>+    else xkbi->state.locked_group+= XkbSAGroup(&ga);
>+}
>+
>+static XkbFilterPtr _XkbNextFreeFilter(XkbSrvInfoPtr xkbi);
>+
> static int
>-_XkbFilterLockState(	XkbSrvInfoPtr	xkbi,
>+_XkbFilterLockGroup(	XkbSrvInfoPtr	xkbi,
> 			XkbFilterPtr	filter,
> 			unsigned	keycode,
> 			XkbAction *	pAction)
> {
>-    if (pAction&&(pAction->type==XkbSA_LockGroup)) {
>-	if (pAction->group.flags&XkbSA_GroupAbsolute)
>-	     xkbi->state.locked_group= XkbSAGroup(&pAction->group);
>-	else xkbi->state.locked_group+= XkbSAGroup(&pAction->group);
>-	return 1;
>+    int sendEvent = 1;
>+
>+    if (!xkbSwitchGroupOnRelease()) {
>+	xkbUpdateLockedGroup(xkbi, pAction);
>+	return sendEvent;
>+    }
>+    
>+    /* Delay switch till button release */
>+    if (filter->keycode==0) {		/* initial press */
>+	filter->keycode = keycode;
>+	filter->active = 1;
>+	filter->filterOthers = 0; /* for what? */
>+	filter->filter = _XkbFilterLockGroup;
>+
>+	/* filter->priv = 0; */
>+	filter->upAction = *pAction;
>+
>+	/* Ok, now we need to simulate the action which would go if this action didn't block it.
>+	   XkbSA_SetMods is the one: it is to set modifier' flag up. */
>+	{
>+	    XkbStateRec	fake_state = xkbi->state;
>+	    XkbAction act;
>+
>+	    fake_state.mods = 0;
>+	    act = XkbGetKeyAction(xkbi, &fake_state, keycode);
>+
>+	    /* KLUDGE: XkbSA_SetMods only? */
>+	    if (act.type == XkbSA_SetMods) { 
>+		XkbFilterPtr filter = _XkbNextFreeFilter(xkbi);
>+		sendEvent = _XkbFilterSetState(xkbi,filter,keycode,&act);
>+	    }
>+	}
>     }
>+    else {
>+  	/* do nothing if some button else is pressed */
>+	if (!pAction)
>+	    xkbUpdateLockedGroup(xkbi, &filter->upAction);
>+	filter->active = 0;
>+    }
>+
>+    return sendEvent;
>+}
>+
>+static int
>+_XkbFilterLockMods(	XkbSrvInfoPtr	xkbi,
>+			XkbFilterPtr	filter,
>+			unsigned	keycode,
>+			XkbAction *	pAction)
>+{
>     if (filter->keycode==0) {		/* initial press */
> 	filter->keycode = keycode;
> 	filter->active = 1;
> 	filter->filterOthers = 0;
> 	filter->priv = 0;
>-	filter->filter = _XkbFilterLockState;
>+	filter->filter = _XkbFilterLockMods;
> 	filter->upAction = *pAction;
> 	xkbi->state.locked_mods^= pAction->mods.mask;
> 	xkbi->setMods = pAction->mods.mask;
>@@ -1104,9 +1163,12 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
> 		    sendEvent=_XkbFilterLatchState(xkbi,filter,key,&act);
> 		    break;
> 		case XkbSA_LockMods:
>+		    filter = _XkbNextFreeFilter(xkbi);
>+		    sendEvent=_XkbFilterLockMods(xkbi,filter,key,&act);
>+		    break;
> 		case XkbSA_LockGroup:
> 		    filter = _XkbNextFreeFilter(xkbi);
>-		    sendEvent=_XkbFilterLockState(xkbi,filter,key,&act);
>+		    sendEvent=_XkbFilterLockGroup(xkbi,filter,key,&act);
> 		    break;
> 		case XkbSA_ISOLock:
> 		    filter = _XkbNextFreeFilter(xkbi);

Actions: View | Splinter Review

Attachments on bug 865: 33142 | 59741 | 63378 | 69198 | 69213 | 122717 | 126752 | 126753 | 129860 | 129861 | 131147 | 134843

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.